@nhtio/adk 1.20260924.0 → 1.20260928.0

package/batteries/llm/claude_code_cli/adapter.mjs

@@ -1,19 +1,20 @@
 import { i as __require } from "../../../chunk-Cf1989ZW.mjs";
 import { n as isInstanceOf, r as isObject, t as isError } from "../../../guards-BEpY7lBI.mjs";
-import { r as Tokenizable } from "../../../tokenizable-xPXj1AQX.mjs";
-import { d as ArtifactTool, h as canonicalStringify, t as SpooledArtifact } from "../../../spooled_artifact-BkOe4-j-.mjs";
-import { n as Message } from "../../../thought-BrQt6HAb.mjs";
-import { n as Media, t as ToolCall } from "../../../tool_call-8crmZsO8.mjs";
-import "../../../common-B5maOoF_.mjs";
+import { r as Tokenizable } from "../../../tokenizable-VB4Av8GF.mjs";
+import { f as ArtifactTool, h as canonicalStringify, t as SpooledArtifact } from "../../../spooled_artifact-Bw_7swIp.mjs";
+import { n as Message } from "../../../thought-CxSaF6Xf.mjs";
+import { n as Media, t as ToolCall } from "../../../tool_call-Cfaj-6zK.mjs";
+import "../../../common-oI1niK9Z.mjs";
 import "../../../guards.mjs";
 import { InMemorySpoolStore } from "../../storage/in_memory.mjs";
-import { C as looksLikeSpooledArtifact, D as renderArtifactHandleBody, _ as defaultRenderUntrustedContent, c as defaultRenderMemories, d as defaultRenderRetrievables, f as defaultRenderStandingInstructions, g as defaultRenderTrustedContent, h as defaultRenderThought, i as defaultFilterThoughts, l as defaultRenderRetrievableHandleBody, m as defaultRenderThirdPartyPublicRetrievables, o as defaultRenderChatCompletionsSystemPrompt, p as defaultRenderThirdPartyPrivateRetrievables, r as defaultDescriptionToChatCompletionsJsonSchema, s as defaultRenderFirstPartyRetrievables, u as defaultRenderRetrievableSafetyDirective, v as defaultToolsToChatCompletionsTools } from "../../../helpers-C1T0DV8Q.mjs";
-import { t as deCollideToolCallIds } from "../../../chat_common-CeoHwSsz.mjs";
+import { C as looksLikeSpooledArtifact, D as renderArtifactHandleBody, _ as defaultRenderUntrustedContent, c as defaultRenderMemories, d as defaultRenderRetrievables, f as defaultRenderStandingInstructions, g as defaultRenderTrustedContent, h as defaultRenderThought, i as defaultFilterThoughts, l as defaultRenderRetrievableHandleBody, m as defaultRenderThirdPartyPublicRetrievables, o as defaultRenderChatCompletionsSystemPrompt, p as defaultRenderThirdPartyPrivateRetrievables, r as defaultDescriptionToChatCompletionsJsonSchema, s as defaultRenderFirstPartyRetrievables, u as defaultRenderRetrievableSafetyDirective, v as defaultToolsToChatCompletionsTools } from "../../../helpers-mbn_EsDV.mjs";
+import { t as deCollideToolCallIds } from "../../../chat_common-DKw8FDol.mjs";
 import { E_CLAUDE_CODE_CLI_CONTEXT_OVERFLOW, E_CLAUDE_CODE_CLI_MCP_BRIDGE_STARTUP_FAILED, E_CLAUDE_CODE_CLI_PROCESS_EXITED_NONZERO, E_CLAUDE_CODE_CLI_STARTUP_TIMEOUT, E_CLAUDE_CODE_CLI_STREAM_ERROR, E_CLAUDE_CODE_CLI_STREAM_STALLED, E_CLAUDE_CODE_CLI_TURN_FAILED, E_CLAUDE_CODE_CLI_WRAPPER_CRASHED, E_CLAUDE_CODE_CLI_WRAPPER_NOT_FOUND, E_CLAUDE_CODE_CLI_WRAPPER_SPAWN_ERROR, E_INVALID_CLAUDE_CODE_CLI_OPTIONS } from "./exceptions.mjs";
 import { validateOptions } from "./validation.mjs";
 import { createNdjsonLineReader, encodeWrapperCommand } from "./wire.mjs";
 import { defaultBuildClaudeCodeCliPrompt, defaultRenderClaudeCodeCliTimelineMessage, defaultRenderClaudeCodeCliToolCallResult } from "./helpers.mjs";
 import { sha256 } from "js-sha256";
+import { v6 } from "uuid";
 //#region src/batteries/llm/claude_code_cli/adapter.ts
 /**
 * Cross-environment executor adapter that wraps the Claude Code CLI as a `DispatchExecutorFn`
@@ -568,9 +569,22 @@ var ClaudeCodeCliAdapter = class ClaudeCodeCliAdapter {
 				]);
 			}
 			const spoolStore = merged.spoolStore ?? new InMemorySpoolStore();
+			const wrapperExecPath = merged.wrapperExecPath ?? process.execPath;
+			const isElectronHost = process.versions.electron !== void 0;
+			const wantsElectronRunAsNode = (merged.autoDetectElectronHost ?? true) && isElectronHost;
+			const consumerOverridesElectronRunAsNode = merged.wrapperEnv !== void 0 && Object.prototype.hasOwnProperty.call(merged.wrapperEnv, "ELECTRON_RUN_AS_NODE");
+			const weInjectedElectronRunAsNode = wantsElectronRunAsNode && !consumerOverridesElectronRunAsNode;
+			const wrapperEnv = wantsElectronRunAsNode || merged.wrapperEnv !== void 0 ? {
+				...wantsElectronRunAsNode ? { ELECTRON_RUN_AS_NODE: "1" } : {},
+				...weInjectedElectronRunAsNode ? { ADK_CLAUDE_CODE_CLI_STRIP_RUN_AS_NODE_FROM_GRANDCHILD: "1" } : {},
+				...merged.wrapperEnv
+			} : void 0;
 			let child;
 			try {
-				child = execaFn(process.execPath, [wrapperPath], { cleanup: true });
+				child = execaFn(wrapperExecPath, [wrapperPath], wrapperEnv !== void 0 ? {
+					cleanup: true,
+					env: wrapperEnv
+				} : { cleanup: true });
 			} catch (err) {
 				ctx.nack(new E_CLAUDE_CODE_CLI_WRAPPER_SPAWN_ERROR([isError(err) ? err.message : String(err)]));
 				return;
@@ -585,10 +599,10 @@ var ClaudeCodeCliAdapter = class ClaudeCodeCliAdapter {
 			let idleTimer;
 			let settled = false;
 			let resolveIteration;
-			let currentMessageId;
-			let currentMessageBuffer = "";
-			let sealedMessage = false;
+			const dispatchNonce = v6();
+			const messageState = /* @__PURE__ */ new Map();
 			let inFlightToolCalls = 0;
+			let grandchildPid;
 			const clearStartupTimer = () => {
 				if (startupTimer) clearTimeout(startupTimer);
 				startupTimer = void 0;
@@ -607,16 +621,24 @@ var ClaudeCodeCliAdapter = class ClaudeCodeCliAdapter {
 			};
 			const gracefulShutdown = async () => {
 				writeCommand({ type: "shutdown" });
-				await new Promise((resolve) => {
-					const timer = setTimeout(resolve, disposeGraceMs);
+				const waitForChildExit = (timeoutMs) => new Promise((resolve) => {
+					const timer = setTimeout(resolve, timeoutMs);
 					Promise.resolve(child).finally(() => {
 						clearTimeout(timer);
 						resolve();
 					}).catch(() => {});
 				});
+				await waitForChildExit(disposeGraceMs);
 				try {
 					child.kill("SIGTERM");
 				} catch {}
+				await waitForChildExit(disposeGraceMs);
+				try {
+					child.kill("SIGKILL");
+				} catch {}
+				if (typeof grandchildPid === "number" && child.exitCode === null) try {
+					process.kill(-grandchildPid, "SIGKILL");
+				} catch {}
 			};
 			const shutdownInBackground = () => {
 				gracefulShutdown().catch((err) => {
@@ -689,18 +711,23 @@ var ClaudeCodeCliAdapter = class ClaudeCodeCliAdapter {
 					});
 				}, streamIdleTimeoutMs);
 			};
-			const sealCurrentMessage = async () => {
-				if (sealedMessage || currentMessageId === void 0) return;
-				sealedMessage = true;
+			const sealMessage = async (id) => {
+				if (id === void 0) return;
+				const entry = messageState.get(id);
+				if (entry === void 0 || entry.sealed) return;
+				entry.sealed = true;
 				await ctx.storeMessage(new Message({
-					id: currentMessageId,
+					id,
 					role: "assistant",
-					content: currentMessageBuffer,
+					content: entry.buffer,
 					identity: merged.selfIdentity ?? "assistant",
 					createdAt: nowIso(),
 					updatedAt: nowIso()
 				}));
 			};
+			const sealCurrentMessage = async () => {
+				for (const id of messageState.keys()) await sealMessage(id);
+			};
 			const handleToolCallRequest = async (requestId, toolName, rawArgs) => {
 				const tool = ctx.tools.get(toolName);
 				if (!tool) {
@@ -826,6 +853,14 @@ var ClaudeCodeCliAdapter = class ClaudeCodeCliAdapter {
 						});
 						return;
 					}
+					if (event.type === "grandchild_spawned") {
+						grandchildPid = event.pid;
+						return;
+					}
+					if (event.type === "grandchild_exited") {
+						grandchildPid = void 0;
+						return;
+					}
 					if (event.type === "init") {
 						sawInit = true;
 						maybeClearStartupTimer();
@@ -854,15 +889,21 @@ var ClaudeCodeCliAdapter = class ClaudeCodeCliAdapter {
 						return;
 					}
 					if (event.type === "message_delta") {
-						currentMessageId = event.id;
-						currentMessageBuffer += event.delta;
-						helpers.reportMessage(event.id, event.delta, { isComplete: event.isComplete });
-						if (event.isComplete) await sealCurrentMessage();
+						const id = `${dispatchNonce}:message:${event.id}`;
+						const entry = messageState.get(id) ?? {
+							buffer: "",
+							sealed: false
+						};
+						entry.buffer += event.delta;
+						messageState.set(id, entry);
+						helpers.reportMessage(id, event.delta, { isComplete: event.isComplete });
+						if (event.isComplete) await sealMessage(id);
 						armIdleTimer();
 						return;
 					}
 					if (event.type === "thought_delta") {
-						helpers.reportThought(event.id, event.delta, { isComplete: event.isComplete });
+						const id = `${dispatchNonce}:thought:${event.id}`;
+						helpers.reportThought(id, event.delta, { isComplete: event.isComplete });
 						armIdleTimer();
 						return;
 					}
@@ -881,6 +922,8 @@ var ClaudeCodeCliAdapter = class ClaudeCodeCliAdapter {
 						sawTerminalEvent = true;
 						await sealCurrentMessage();
 						settleOnce(() => {
+							finish();
+							shutdownInBackground();
 							if (event.isError && event.subtype !== "error_max_turns") {
 								ctx.nack(new E_CLAUDE_CODE_CLI_TURN_FAILED([event.stopReason ?? "unknown", event.resultText ?? ""]));
 								return;
@@ -897,8 +940,6 @@ var ClaudeCodeCliAdapter = class ClaudeCodeCliAdapter {
 							});
 							if (merged.autoAck) ctx.ack();
 						});
-						await Promise.resolve(child).catch(() => void 0);
-						finish();
 						return;
 					}
 					if (event.type === "error") {