@clinebot/core 0.0.36 → 0.0.37

package/src/transports/hub.ts

@@ -1,16 +1,25 @@
-import { readFileSync } from "node:fs";
-import { basename } from "node:path";
 import type {
+	AgentEvent,
+	AgentFinishReason,
 	AgentResult,
+	AgentUsage,
+	HubEventEnvelope,
 	SessionRecord as HubSessionRecord,
 	HubToolExecutorName,
 	JsonValue,
+	ToolApprovalRequest,
+	ToolApprovalResult,
 	ToolContext,
 } from "@clinebot/shared";
 import type { ToolExecutors } from "../extensions/tools";
 import type { HookEventPayload } from "../hooks";
 import { NodeHubClient } from "../hub/client";
 import type {
+	PendingPromptMutationResult,
+	PendingPromptsAction,
+	PendingPromptsDeleteInput,
+	PendingPromptsListInput,
+	PendingPromptsUpdateInput,
 	RuntimeHost,
 	RuntimeHostSubscribeOptions,
 	SendSessionInput,
@@ -23,12 +32,9 @@ import {
 	SessionManifestSchema,
 } from "../session/session-manifest";
 import { SessionSource, type SessionStatus } from "../types/common";
-import type { CoreSessionEvent } from "../types/events";
+import type { CoreSessionEvent, SessionPendingPrompt } from "../types/events";
 import type { SessionRecord } from "../types/sessions";
-import {
-	RuntimeHostEventBus,
-	readPersistedMessagesFile,
-} from "./runtime-host-support";
+import { RuntimeHostEventBus } from "./runtime-host-support";
 
 function toJsonRecord(
 	value: Record<string, unknown> | undefined,
@@ -75,11 +81,102 @@ function parseToolContext(value: unknown): ToolContext {
 	};
 }
 
+function parseApprovalInput(value: unknown): unknown {
+	if (typeof value !== "string") {
+		return value;
+	}
+	try {
+		return JSON.parse(value);
+	} catch {
+		return value;
+	}
+}
+
+function isAgentFinishReason(value: unknown): value is AgentFinishReason {
+	return (
+		value === "completed" ||
+		value === "max_iterations" ||
+		value === "aborted" ||
+		value === "mistake_limit" ||
+		value === "error"
+	);
+}
+
+function parseDoneUsage(value: unknown): AgentUsage | undefined {
+	if (!value || typeof value !== "object" || Array.isArray(value)) {
+		return undefined;
+	}
+	const payload = value as Record<string, unknown>;
+	const inputTokens =
+		typeof payload.inputTokens === "number" ? payload.inputTokens : undefined;
+	const outputTokens =
+		typeof payload.outputTokens === "number" ? payload.outputTokens : undefined;
+	if (inputTokens === undefined || outputTokens === undefined) {
+		return undefined;
+	}
+	return {
+		inputTokens,
+		outputTokens,
+		cacheReadTokens:
+			typeof payload.cacheReadTokens === "number" ? payload.cacheReadTokens : 0,
+		cacheWriteTokens:
+			typeof payload.cacheWriteTokens === "number"
+				? payload.cacheWriteTokens
+				: 0,
+		totalCost: typeof payload.totalCost === "number" ? payload.totalCost : 0,
+	};
+}
+
+function doneEventFromPayload(
+	payload: Record<string, unknown> | undefined,
+): AgentEvent {
+	const result =
+		payload?.result &&
+		typeof payload.result === "object" &&
+		!Array.isArray(payload.result)
+			? (payload.result as Record<string, unknown>)
+			: undefined;
+	const reasonCandidate = payload?.reason ?? result?.finishReason;
+	const reason = isAgentFinishReason(reasonCandidate)
+		? reasonCandidate
+		: reasonCandidate === "failed"
+			? "error"
+			: "completed";
+	const usage = parseDoneUsage(payload?.usage ?? result?.usage);
+	return {
+		type: "done",
+		reason,
+		text:
+			typeof payload?.text === "string"
+				? payload.text
+				: typeof result?.text === "string"
+					? result.text
+					: "",
+		iterations:
+			typeof payload?.iterations === "number"
+				? payload.iterations
+				: typeof result?.iterations === "number"
+					? result.iterations
+					: 0,
+		usage,
+	};
+}
+
+function hubReplyErrorMessage(
+	reply: { error?: { message?: string } },
+	command: string,
+): string {
+	return reply.error?.message ?? `hub command failed: ${command}`;
+}
+
 export interface HubRuntimeHostOptions {
 	url: string;
 	authToken?: string;
 	clientType?: string;
 	displayName?: string;
+	requestToolApproval?: (
+		request: ToolApprovalRequest,
+	) => Promise<ToolApprovalResult> | ToolApprovalResult;
 }
 
 function mapStatus(
@@ -207,11 +304,16 @@ export class HubRuntimeHost implements RuntimeHost {
 		Partial<ToolExecutors>
 	>();
 	private readonly sessionSubscriptions = new Map<string, () => void>();
+	private readonly pendingApprovalToolCallIds = new Set<string>();
+	private readonly requestToolApproval:
+		| HubRuntimeHostOptions["requestToolApproval"]
+		| undefined;
 
 	constructor(
 		options: HubRuntimeHostOptions,
 		clientContext?: { workspaceRoot?: string; cwd?: string },
 	) {
+		this.requestToolApproval = options.requestToolApproval;
 		this.runtimeAddress = options.url;
 		this.client = new NodeHubClient({
 			url: options.url,
@@ -293,20 +395,104 @@ export class HubRuntimeHost implements RuntimeHost {
 									: {}),
 								...(input.userFiles?.length
 									? {
-											userFiles: input.userFiles.map((filePath) => ({
-												name: basename(filePath),
-												content: readFileSync(filePath, "utf8"),
-											})),
+											userFiles: input.userFiles,
 										}
 									: {}),
 							}
 						: undefined,
+				delivery: input.delivery,
 			},
 			input.sessionId,
+			{ timeoutMs: null },
 		);
 		return reply.payload?.result as AgentResult | undefined;
 	}
 
+	async pendingPrompts(
+		action: "list",
+		input: PendingPromptsListInput,
+	): Promise<SessionPendingPrompt[]>;
+	async pendingPrompts(
+		action: "update",
+		input: PendingPromptsUpdateInput,
+	): Promise<PendingPromptMutationResult>;
+	async pendingPrompts(
+		action: "delete",
+		input: PendingPromptsDeleteInput,
+	): Promise<PendingPromptMutationResult>;
+	async pendingPrompts(
+		action: PendingPromptsAction,
+		input:
+			| PendingPromptsListInput
+			| PendingPromptsUpdateInput
+			| PendingPromptsDeleteInput,
+	): Promise<SessionPendingPrompt[] | PendingPromptMutationResult> {
+		switch (action) {
+			case "list":
+				return await this.listPendingPromptEntries(input);
+			case "update":
+				return await this.editPendingPromptEntry(
+					input as PendingPromptsUpdateInput,
+				);
+			case "delete":
+				return await this.deletePendingPromptEntry(
+					input as PendingPromptsDeleteInput,
+				);
+		}
+	}
+
+	private async listPendingPromptEntries(
+		input: PendingPromptsListInput,
+	): Promise<SessionPendingPrompt[]> {
+		this.ensureSessionSubscription(input.sessionId);
+		const reply = await this.client.command(
+			"session.pending_prompts",
+			{ sessionId: input.sessionId },
+			input.sessionId,
+		);
+		return Array.isArray(reply.payload?.prompts)
+			? (reply.payload.prompts as SessionPendingPrompt[])
+			: [];
+	}
+
+	private async editPendingPromptEntry(
+		input: PendingPromptsUpdateInput,
+	): Promise<PendingPromptMutationResult> {
+		this.ensureSessionSubscription(input.sessionId);
+		const reply = await this.client.command(
+			"session.update_pending_prompt",
+			{ ...input },
+			input.sessionId,
+		);
+		return {
+			sessionId: input.sessionId,
+			prompts: Array.isArray(reply.payload?.prompts)
+				? (reply.payload.prompts as SessionPendingPrompt[])
+				: [],
+			prompt: reply.payload?.prompt as SessionPendingPrompt | undefined,
+			updated: reply.payload?.updated === true,
+		};
+	}
+
+	private async deletePendingPromptEntry(
+		input: PendingPromptsDeleteInput,
+	): Promise<PendingPromptMutationResult> {
+		this.ensureSessionSubscription(input.sessionId);
+		const reply = await this.client.command(
+			"session.remove_pending_prompt",
+			{ ...input },
+			input.sessionId,
+		);
+		return {
+			sessionId: input.sessionId,
+			prompts: Array.isArray(reply.payload?.prompts)
+				? (reply.payload.prompts as SessionPendingPrompt[])
+				: [],
+			prompt: reply.payload?.prompt as SessionPendingPrompt | undefined,
+			removed: reply.payload?.removed === true,
+		};
+	}
+
 	async getAccumulatedUsage(
 		sessionId: string,
 	): Promise<SessionAccumulatedUsage | undefined> {
@@ -346,7 +532,7 @@ export class HubRuntimeHost implements RuntimeHost {
 		}
 		this.sessionSubscriptions.clear();
 		this.sessionToolExecutors.clear();
-		this.client.close();
+		await this.client.dispose();
 	}
 
 	async get(sessionId: string): Promise<SessionRecord | undefined> {
@@ -400,8 +586,22 @@ export class HubRuntimeHost implements RuntimeHost {
 	async readMessages(
 		sessionId: string,
 	): Promise<import("@clinebot/llms").Message[]> {
-		const session = await this.get(sessionId);
-		return readPersistedMessagesFile(session?.messagesPath);
+		const target = sessionId.trim();
+		if (!target) {
+			return [];
+		}
+		const reply = await this.client.command(
+			"session.messages",
+			{ sessionId: target },
+			target,
+		);
+		if (!reply.ok) {
+			throw new Error(hubReplyErrorMessage(reply, "session.messages"));
+		}
+		const messages = reply.payload?.messages;
+		return Array.isArray(messages)
+			? (messages as import("@clinebot/llms").Message[])
+			: [];
 	}
 
 	async handleHookEvent(_payload: HookEventPayload): Promise<void> {
@@ -441,19 +641,79 @@ export class HubRuntimeHost implements RuntimeHost {
 		this.sessionSubscriptions.delete(target);
 	}
 
-	private handleHubEvent(
-		event: import("@clinebot/shared").HubEventEnvelope,
-	): void {
+	private emitToolCallContentStart(input: {
+		sessionId: string;
+		toolCallId?: string;
+		toolName?: string;
+		toolInput?: unknown;
+	}): void {
+		this.events.emit({
+			type: "agent_event",
+			payload: {
+				sessionId: input.sessionId,
+				event: {
+					type: "content_start",
+					contentType: "tool",
+					toolCallId: input.toolCallId,
+					toolName: input.toolName,
+					input: input.toolInput,
+				},
+			},
+		});
+	}
+
+	private handleHubEvent(event: HubEventEnvelope): void {
 		const sessionId = event.sessionId?.trim();
 		if (event.event === "capability.requested") {
 			void this.handleCapabilityRequest(event);
 			return;
 		}
+		if (event.event === "approval.requested") {
+			void this.handleApprovalRequested(event);
+			return;
+		}
 		if (!sessionId) {
 			return;
 		}
 
 		switch (event.event) {
+			case "iteration.started": {
+				this.events.emit({
+					type: "agent_event",
+					payload: {
+						sessionId,
+						event: {
+							type: "iteration_start",
+							iteration:
+								typeof event.payload?.iteration === "number"
+									? event.payload.iteration
+									: 0,
+						},
+					},
+				});
+				return;
+			}
+			case "iteration.finished": {
+				this.events.emit({
+					type: "agent_event",
+					payload: {
+						sessionId,
+						event: {
+							type: "iteration_end",
+							iteration:
+								typeof event.payload?.iteration === "number"
+									? event.payload.iteration
+									: 0,
+							hadToolCalls: event.payload?.hadToolCalls === true,
+							toolCallCount:
+								typeof event.payload?.toolCallCount === "number"
+									? event.payload.toolCallCount
+									: 0,
+						},
+					},
+				});
+				return;
+			}
 			case "assistant.delta": {
 				const text =
 					typeof event.payload?.text === "string" ? event.payload.text : "";
@@ -473,6 +733,23 @@ export class HubRuntimeHost implements RuntimeHost {
 				});
 				return;
 			}
+			case "assistant.finished": {
+				this.events.emit({
+					type: "agent_event",
+					payload: {
+						sessionId,
+						event: {
+							type: "content_end",
+							contentType: "text",
+							text:
+								typeof event.payload?.text === "string"
+									? event.payload.text
+									: undefined,
+						},
+					},
+				});
+				return;
+			}
 			case "reasoning.delta": {
 				const text =
 					typeof event.payload?.text === "string" ? event.payload.text : "";
@@ -494,29 +771,60 @@ export class HubRuntimeHost implements RuntimeHost {
 				});
 				return;
 			}
-			case "tool.started": {
+			case "reasoning.finished": {
 				this.events.emit({
 					type: "agent_event",
 					payload: {
 						sessionId,
 						event: {
-							type: "content_start",
-							contentType: "tool",
-							toolCallId:
-								typeof event.payload?.toolCallId === "string"
-									? event.payload.toolCallId
-									: undefined,
-							toolName:
-								typeof event.payload?.toolName === "string"
-									? event.payload.toolName
+							type: "content_end",
+							contentType: "reasoning",
+							reasoning:
+								typeof event.payload?.reasoning === "string"
+									? event.payload.reasoning
 									: undefined,
-							input: event.payload?.input,
 						},
 					},
 				});
 				return;
 			}
+			case "agent.done": {
+				this.events.emit({
+					type: "agent_event",
+					payload: {
+						sessionId,
+						event: doneEventFromPayload(event.payload),
+					},
+				});
+				return;
+			}
+			case "tool.started": {
+				const toolCallId =
+					typeof event.payload?.toolCallId === "string"
+						? event.payload.toolCallId
+						: undefined;
+				if (toolCallId && this.pendingApprovalToolCallIds.delete(toolCallId)) {
+					return;
+				}
+				this.emitToolCallContentStart({
+					sessionId,
+					toolCallId,
+					toolName:
+						typeof event.payload?.toolName === "string"
+							? event.payload.toolName
+							: undefined,
+					toolInput: event.payload?.input,
+				});
+				return;
+			}
 			case "tool.finished": {
+				const toolCallId =
+					typeof event.payload?.toolCallId === "string"
+						? event.payload.toolCallId
+						: undefined;
+				if (toolCallId) {
+					this.pendingApprovalToolCallIds.delete(toolCallId);
+				}
 				this.events.emit({
 					type: "agent_event",
 					payload: {
@@ -524,10 +832,7 @@ export class HubRuntimeHost implements RuntimeHost {
 						event: {
 							type: "content_end",
 							contentType: "tool",
-							toolCallId:
-								typeof event.payload?.toolCallId === "string"
-									? event.payload.toolCallId
-									: undefined,
+							toolCallId,
 							toolName:
 								typeof event.payload?.toolName === "string"
 									? event.payload.toolName
@@ -557,9 +862,55 @@ export class HubRuntimeHost implements RuntimeHost {
 				});
 				return;
 			}
+			case "session.pending_prompts": {
+				this.events.emit({
+					type: "pending_prompts",
+					payload: {
+						sessionId,
+						prompts: Array.isArray(event.payload?.prompts)
+							? (event.payload.prompts as SessionPendingPrompt[])
+							: [],
+					},
+				});
+				return;
+			}
+			case "session.pending_prompt_submitted": {
+				const prompt = event.payload?.prompt as
+					| SessionPendingPrompt
+					| undefined;
+				if (!prompt) {
+					return;
+				}
+				this.events.emit({
+					type: "pending_prompt_submitted",
+					payload: {
+						sessionId,
+						id: prompt.id,
+						prompt: prompt.prompt,
+						delivery: prompt.delivery,
+						attachmentCount: prompt.attachmentCount,
+					},
+				});
+				return;
+			}
 			case "run.completed":
 			case "run.aborted": {
 				this.sessionToolExecutors.delete(sessionId);
+				this.events.emit({
+					type: "agent_event",
+					payload: {
+						sessionId,
+						event: doneEventFromPayload({
+							...event.payload,
+							reason:
+								typeof event.payload?.reason === "string"
+									? event.payload.reason
+									: event.event === "run.aborted"
+										? "aborted"
+										: "completed",
+						}),
+					},
+				});
 				this.events.emit({
 					type: "ended",
 					payload: {
@@ -581,7 +932,7 @@ export class HubRuntimeHost implements RuntimeHost {
 	}
 
 	private async handleCapabilityRequest(
-		event: import("@clinebot/shared").HubEventEnvelope,
+		event: HubEventEnvelope,
 	): Promise<void> {
 		const sessionId = event.sessionId?.trim();
 		if (!sessionId) {
@@ -653,4 +1004,78 @@ export class HubRuntimeHost implements RuntimeHost {
 			);
 		}
 	}
+
+	private async handleApprovalRequested(
+		event: HubEventEnvelope,
+	): Promise<void> {
+		const sessionId = event.sessionId?.trim();
+		if (!sessionId || !this.requestToolApproval) {
+			return;
+		}
+		const approvalId =
+			typeof event.payload?.approvalId === "string"
+				? event.payload.approvalId.trim()
+				: "";
+		const toolCallId =
+			typeof event.payload?.toolCallId === "string"
+				? event.payload.toolCallId
+				: "";
+		const toolName =
+			typeof event.payload?.toolName === "string" ? event.payload.toolName : "";
+		if (!approvalId || !toolCallId || !toolName) {
+			return;
+		}
+		const policy =
+			event.payload?.policy &&
+			typeof event.payload.policy === "object" &&
+			!Array.isArray(event.payload.policy)
+				? (event.payload.policy as ToolApprovalRequest["policy"])
+				: { autoApprove: false };
+		const input = parseApprovalInput(event.payload?.inputJson);
+		this.pendingApprovalToolCallIds.add(toolCallId);
+		this.emitToolCallContentStart({
+			sessionId,
+			toolCallId,
+			toolName,
+			toolInput: input,
+		});
+		const result = await Promise.resolve(
+			this.requestToolApproval({
+				sessionId,
+				agentId:
+					typeof event.payload?.agentId === "string"
+						? event.payload.agentId
+						: "",
+				conversationId:
+					typeof event.payload?.conversationId === "string"
+						? event.payload.conversationId
+						: sessionId,
+				iteration:
+					typeof event.payload?.iteration === "number"
+						? event.payload.iteration
+						: 0,
+				toolCallId,
+				toolName,
+				input,
+				policy,
+			}),
+		).catch((error) => ({
+			approved: false,
+			reason:
+				error instanceof Error
+					? error.message
+					: `Tool approval request failed: ${String(error)}`,
+		}));
+		await this.client
+			.command(
+				"approval.respond",
+				{
+					approvalId,
+					approved: result.approved,
+					reason: result.reason,
+				},
+				sessionId,
+			)
+			.catch(() => {});
+	}
 }