acpx 0.13.2 → 0.15.0

package/dist/{live-checkpoint-Gw2oGjhe.js → live-checkpoint-CYRs-D9t.js}

@@ -38,7 +38,12 @@ var SessionResolutionError = class extends AcpxOperationalError {};
 var AgentSpawnError = class extends AcpxOperationalError {
 	agentCommand;
 	constructor(agentCommand, cause) {
-		super(`Failed to spawn agent command: ${agentCommand}`, { cause: cause instanceof Error ? cause : void 0 });
+		const spawnEnoent = (cause instanceof Error ? cause.code : void 0) === "ENOENT";
+		const message = spawnEnoent ? `Failed to spawn agent command: ${agentCommand}. The agent process could not start because a required executable, interpreter, working directory, or other launch path was not found. Check the command, effective PATH, and working directory, or verify the custom agent's configured argv.` : `Failed to spawn agent command: ${agentCommand}`;
+		super(message, {
+			cause: cause instanceof Error ? cause : void 0,
+			...spawnEnoent ? { detailCode: "AGENT_SPAWN_ENOENT" } : {}
+		});
 		this.agentCommand = agentCommand;
 	}
 };
@@ -449,6 +454,7 @@ const AGENT_REGISTRY = {
 	kilocode: "npx -y @kilocode/cli acp",
 	kimi: "kimi acp",
 	kiro: "kiro-cli-chat acp",
+	mcode: "mcode acp",
 	mux: `npx -y mux@${ACP_ADAPTER_PACKAGE_RANGES.mux} acp`,
 	opencode: "npx -y opencode-ai acp",
 	pool: "pool acp",
@@ -502,6 +508,7 @@ const AGENT_ARGV_REGISTRY = {
 	],
 	kimi: ["kimi", "acp"],
 	kiro: ["kiro-cli-chat", "acp"],
+	mcode: ["mcode", "acp"],
 	mux: [
 		"npx",
 		"-y",
@@ -711,19 +718,17 @@ async function withInterrupt(run, onInterrupt) {
 			process.off("SIGHUP", onSighup);
 			cb();
 		};
-		const rejectInterrupted = () => {
-			onInterrupt().finally(() => {
-				finish(() => reject(new InterruptedError()));
-			});
+		const rejectInterrupted = (signal) => {
+			onInterrupt(signal).then(() => finish(() => reject(new InterruptedError())), (error) => finish(() => reject(error)));
 		};
 		const onSigint = () => {
-			rejectInterrupted();
+			rejectInterrupted("SIGINT");
 		};
 		const onSigterm = () => {
-			rejectInterrupted();
+			rejectInterrupted("SIGTERM");
 		};
 		const onSighup = () => {
-			rejectInterrupted();
+			rejectInterrupted("SIGHUP");
 		};
 		process.once("SIGINT", onSigint);
 		process.once("SIGTERM", onSigterm);
@@ -1661,7 +1666,11 @@ const ZED_TAG_KEYS = /* @__PURE__ */ new Set([
 	"RedactedThinking",
 	"ToolUse"
 ]);
-const MAP_OBJECT_PATHS = /* @__PURE__ */ new Set(["request_token_usage", "messages.Agent.tool_results"]);
+const MAP_OBJECT_PATHS = /* @__PURE__ */ new Set([
+	"request_token_usage",
+	"messages.Agent.tool_results",
+	"acpx.session_options.env"
+]);
 const OPAQUE_VALUE_PATHS = /* @__PURE__ */ new Set([
 	"agent_capabilities",
 	"messages.Agent.content.ToolUse.input",
@@ -2633,6 +2642,9 @@ function getAcpxVersion() {
 	cachedVersion = resolveAcpxVersion();
 	return cachedVersion;
 }
+//#endregion
+//#region src/acp/client-process.ts
+const PROCESS_HELPER_TIMEOUT_MS = 8e3;
 async function runTimedExecFile(command, args, options = {}) {
 	const timeoutMs = Math.max(1, Math.round(options.timeoutMs ?? 8e3));
 	return await new Promise((resolve, reject) => {
@@ -3135,14 +3147,18 @@ function promotePrefixedAuthEnvironment(env) {
 	}
 	return protectedKeys;
 }
-function buildAgentEnvironment(authCredentials, sessionEnv) {
+function validateAgentProcessEnv(agentProcessEnv) {
+	for (const [key, value] of Object.entries(agentProcessEnv ?? {})) if (typeof value !== "string" || key.includes("=") || key.includes("\0") || value.includes("\0")) throw new Error("Invalid agentProcessEnv: environment entries cannot contain NUL or names with '='");
+}
+function buildAgentEnvironment(authCredentials, sessionEnv, agentProcessEnv) {
+	validateAgentProcessEnv(agentProcessEnv);
 	const env = { ...process.env };
 	const protectedAuthEnvKeys = promotePrefixedAuthEnvironment(env);
 	if (authCredentials) for (const [methodId, credential] of Object.entries(authCredentials)) {
 		addAuthCredentialEnvKeys(protectedAuthEnvKeys, methodId, credential);
 		assignAuthCredentialEnv(env, methodId, credential);
 	}
-	if (sessionEnv) for (const [key, value] of Object.entries(sessionEnv)) {
+	for (const overlay of [sessionEnv, agentProcessEnv]) for (const [key, value] of Object.entries(overlay ?? {})) {
 		if (typeof value !== "string" || protectedAuthEnvKeys.has(protectedEnvKey(key))) continue;
 		assignSessionEnv(env, key, value);
 	}
@@ -3178,10 +3194,10 @@ function resolveConfiguredAuthCredential(methodId, authCredentials) {
 	const configCredentials = authCredentials ?? {};
 	return configCredentials[methodId] ?? configCredentials[toEnvToken(methodId)];
 }
-function buildAgentSpawnOptions(cwd, authCredentials, sessionEnv) {
+function buildAgentSpawnOptions(cwd, authCredentials, sessionEnv, agentProcessEnv) {
 	return {
 		cwd,
-		env: buildAgentEnvironment(authCredentials, sessionEnv),
+		env: buildAgentEnvironment(authCredentials, sessionEnv, agentProcessEnv),
 		stdio: [
 			"pipe",
 			"pipe",
@@ -3310,6 +3326,93 @@ function assertRequestedModelSupported(params) {
 	}
 }
 //#endregion
+//#region src/acp/ndjson-stream.ts
+var AcpMessageLimitError = class extends AcpxOperationalError {
+	constructor(limit) {
+		super(`ACP message exceeded ACPX_MAX_ACP_MESSAGE_BYTES (${limit} bytes)`, {
+			outputCode: "RUNTIME",
+			detailCode: "ACP_MESSAGE_TOO_LARGE",
+			origin: "acp",
+			retryable: false
+		});
+	}
+};
+function readMaxAcpMessageBytes(raw = process.env.ACPX_MAX_ACP_MESSAGE_BYTES) {
+	const value = raw?.trim();
+	if (!value) return;
+	const bytes = Number(value);
+	if (!/^\d+$/.test(value) || !Number.isSafeInteger(bytes)) throw new Error("ACPX_MAX_ACP_MESSAGE_BYTES must be a non-negative safe integer; zero is unlimited");
+	return bytes === 0 ? void 0 : bytes;
+}
+function countLineBytes(chunk, retained, limit) {
+	let start = 0;
+	while (start < chunk.length) {
+		const newline = chunk.indexOf(10, start);
+		const end = newline < 0 ? chunk.length : newline;
+		retained += end - start;
+		if (retained > limit) throw new AcpMessageLimitError(limit);
+		if (newline < 0) return retained;
+		retained = 0;
+		start = end + 1;
+	}
+	return retained;
+}
+function parseAcpJsonMessageLine(line) {
+	const message = JSON.parse(line);
+	return isAcpMessageObject(message) ? message : void 0;
+}
+function enqueueNdJsonLine(agentCommand, line, controller) {
+	const trimmedLine = line.trim();
+	if (!trimmedLine || shouldIgnoreNonJsonAgentOutputLine(agentCommand, trimmedLine)) return;
+	try {
+		const message = parseAcpJsonMessageLine(trimmedLine);
+		if (message) controller.enqueue(message);
+	} catch (err) {
+		console.error("Failed to parse JSON message:", trimmedLine, err);
+	}
+}
+function enqueueNdJsonLines(agentCommand, lines, controller) {
+	for (const line of lines) enqueueNdJsonLine(agentCommand, line, controller);
+}
+function createNdJsonMessageStream(agentCommand, output, input, maxMessageBytes, onReadError) {
+	const textEncoder = new TextEncoder();
+	const textDecoder = new TextDecoder();
+	return {
+		readable: new ReadableStream({ async start(controller) {
+			let content = "";
+			let retainedBytes = 0;
+			const reader = input.getReader();
+			try {
+				while (true) {
+					const { value, done } = await reader.read();
+					if (done) break;
+					if (maxMessageBytes !== void 0) retainedBytes = countLineBytes(value, retainedBytes, maxMessageBytes);
+					content += textDecoder.decode(value, { stream: true });
+					const lines = content.split("\n");
+					content = lines.pop() || "";
+					enqueueNdJsonLines(agentCommand, lines, controller);
+				}
+				controller.close();
+			} catch (err) {
+				const error = err instanceof Error ? err : new Error(String(err));
+				controller.error(error);
+				onReadError?.(error);
+			} finally {
+				reader.releaseLock();
+			}
+		} }),
+		writable: new WritableStream({ async write(message) {
+			const content = JSON.stringify(message) + "\n";
+			const writer = output.getWriter();
+			try {
+				await writer.write(textEncoder.encode(content));
+			} finally {
+				writer.releaseLock();
+			}
+		} })
+	};
+}
+//#endregion
 //#region src/acp/session-control-errors.ts
 const SESSION_CONTROL_UNSUPPORTED_ACP_CODES = /* @__PURE__ */ new Set([-32601, -32602]);
 function asRecord$1(value) {
@@ -3399,6 +3502,7 @@ function waitMs(ms) {
 		setTimeout(resolve, Math.max(0, ms));
 	});
 }
+function onStreamError() {}
 var TerminalManager = class {
 	cwd;
 	permissionMode;
@@ -3464,6 +3568,8 @@ var TerminalManager = class {
 			};
 			proc.stdout.on("data", appendOutput);
 			proc.stderr.on("data", appendOutput);
+			proc.stdout.on("error", onStreamError);
+			proc.stderr.on("error", onStreamError);
 			proc.once("exit", (exitCode, signal) => {
 				terminal.exitCode = exitCode;
 				terminal.signal = signal;
@@ -3638,7 +3744,7 @@ var TerminalManager = class {
 		} catch {
 			return;
 		}
-		await this.waitForCleanupAfterSignal(terminal);
+		await this.waitForFinalCleanup(terminal);
 	}
 	async signalProcess(terminal, signal) {
 		const pid = terminal.process.pid;
@@ -3655,10 +3761,10 @@ var TerminalManager = class {
 	async signalWindowsProcessGroup(terminal, pid, signal) {
 		await this.captureDescendantPids(terminal, pid);
 		if (this.isRunning(terminal)) {
-			await killWindowsProcessTree(pid, signal);
+			await killWindowsProcessTree(pid, signal, terminal.processHelperTimeoutMs);
 			return;
 		}
-		for (const descendantPid of terminal.descendantPids) await killWindowsProcessTree(descendantPid, signal);
+		for (const descendantPid of terminal.descendantPids) await killWindowsProcessTree(descendantPid, signal, terminal.processHelperTimeoutMs);
 	}
 	async signalPosixProcessGroup(terminal, pid, signal) {
 		await this.captureDescendantPids(terminal, pid);
@@ -3672,6 +3778,9 @@ var TerminalManager = class {
 		if (!this.isRunning(terminal)) await terminal.processGroupSnapshotPromise?.catch(() => {});
 		for (const descendantPid of await listDescendantPids(pid, terminal.processHelperTimeoutMs)) terminal.descendantPids.add(descendantPid);
 	}
+	async waitForFinalCleanup(terminal) {
+		if (!await this.waitForCleanupAfterSignal(terminal) && process.platform === "win32") throw new Error("Terminal process cleanup did not finish after SIGKILL");
+	}
 	async waitForCleanupAfterSignal(terminal) {
 		return await Promise.race([this.waitForTerminalAndTrackedDescendants(terminal).then(() => true), waitMs(this.killGraceMs).then(() => false)]);
 	}
@@ -3803,25 +3912,19 @@ async function runWindowsProcessListCommand(timeoutMs) {
 		windowsHide: true
 	});
 }
-async function killWindowsProcessTree(pid, signal) {
+async function killWindowsProcessTree(pid, signal, timeoutMs = PROCESS_HELPER_TIMEOUT_MS) {
 	const args = [
 		"/pid",
 		String(pid),
 		"/t"
 	];
 	if (signal === "SIGKILL") args.push("/f");
-	await new Promise((resolve) => {
-		const child = spawn("taskkill", args, {
-			stdio: [
-				"ignore",
-				"ignore",
-				"ignore"
-			],
+	try {
+		await runTimedExecFile("taskkill", args, {
+			timeoutMs,
 			windowsHide: true
 		});
-		child.once("error", () => resolve());
-		child.once("close", () => resolve());
-	});
+	} catch {}
 }
 function sendSignal(pid, signal) {
 	try {
@@ -3996,6 +4099,17 @@ function snapshotPermissionPolicy(policy) {
 		...policy.defaultAction ? { defaultAction: policy.defaultAction } : {}
 	};
 }
+function snapshotProcessLaunchScope(scope) {
+	if (!scope || scope.kind === "client") return Object.freeze({ kind: "client" });
+	if (scope.kind === "runtime-session") return Object.freeze({
+		kind: "runtime-session",
+		sessionKey: scope.sessionKey
+	});
+	return Object.freeze({
+		kind: "runtime-probe",
+		agent: scope.agent
+	});
+}
 function childProcessIsRunning(agent) {
 	if (!agent) return false;
 	return agent.exitCode == null && agent.signalCode == null && !agent.killed;
@@ -4017,56 +4131,6 @@ function installSdkConsoleErrorSuppression() {
 		console.error = originalConsoleError;
 	};
 }
-function enqueueNdJsonLine(agentCommand, line, controller) {
-	const trimmedLine = line.trim();
-	if (!trimmedLine || shouldIgnoreNonJsonAgentOutputLine(agentCommand, trimmedLine)) return;
-	try {
-		const message = parseAcpJsonMessageLine(trimmedLine);
-		if (message) controller.enqueue(message);
-	} catch (err) {
-		console.error("Failed to parse JSON message:", trimmedLine, err);
-	}
-}
-function parseAcpJsonMessageLine(line) {
-	const message = JSON.parse(line);
-	return isAcpMessageObject(message) ? message : void 0;
-}
-function enqueueNdJsonLines(agentCommand, lines, controller) {
-	for (const line of lines) enqueueNdJsonLine(agentCommand, line, controller);
-}
-function createNdJsonMessageStream(agentCommand, output, input) {
-	const textEncoder = new TextEncoder();
-	const textDecoder = new TextDecoder();
-	return {
-		readable: new ReadableStream({ async start(controller) {
-			let content = "";
-			const reader = input.getReader();
-			try {
-				while (true) {
-					const { value, done } = await reader.read();
-					if (done) break;
-					if (!value) continue;
-					content += textDecoder.decode(value, { stream: true });
-					const lines = content.split("\n");
-					content = lines.pop() || "";
-					enqueueNdJsonLines(agentCommand, lines, controller);
-				}
-			} finally {
-				reader.releaseLock();
-				controller.close();
-			}
-		} }),
-		writable: new WritableStream({ async write(message) {
-			const content = JSON.stringify(message) + "\n";
-			const writer = output.getWriter();
-			try {
-				await writer.write(textEncoder.encode(content));
-			} finally {
-				writer.releaseLock();
-			}
-		} })
-	};
-}
 var AcpClient = class {
 	options;
 	connection;
@@ -4103,6 +4167,7 @@ var AcpClient = class {
 		this.options = {
 			...options,
 			cwd: asAbsoluteCwd(options.cwd),
+			agentProcessEnv: options.agentProcessEnv ? { ...options.agentProcessEnv } : void 0,
 			authPolicy: options.authPolicy ?? "skip",
 			permissionPolicy: snapshotPermissionPolicy(options.permissionPolicy),
 			elicitationModes: normalizeElicitationModes(options.elicitationModes)
@@ -4207,29 +4272,41 @@ var AcpClient = class {
 	async start() {
 		if (this.connection && this.agent && isChildProcessRunning(this.agent)) return;
 		if (this.connection || this.agent) await this.close();
+		const maxMessageBytes = readMaxAcpMessageBytes();
 		const launch = await this.resolveAgentLaunchPlan();
 		this.logAgentLaunch(launch);
 		await this.ensureLaunchSupport(launch);
-		const child = await this.spawnAgentProcess(launch);
+		const { child, process: startedProcess } = await this.spawnAgentProcess(launch);
 		this.closing = false;
-		this.agentStartedAt = isoNow$1();
+		this.agentStartedAt = startedProcess.startedAt;
 		this.lastAgentExit = void 0;
-		this.lastKnownPid = child.pid ?? void 0;
-		this.attachAgentLifecycleObservers(child);
+		this.lastKnownPid = startedProcess.pid;
 		const startupStderr = [];
 		child.stderr.on("data", (chunk) => {
 			this.captureStartupStderr(startupStderr, chunk);
 			if (!this.options.verbose) return;
 			process.stderr.write(chunk);
 		});
+		const startupFailure = this.createStartupFailureWatcher(child, startupStderr);
+		try {
+			await this.admitAndObserveSpawnedProcess(child, startedProcess);
+			const admissionExit = startupFailure.getError();
+			if (admissionExit) throw admissionExit;
+		} catch (error) {
+			startupFailure.dispose();
+			throw error;
+		}
 		const input = Writable.toWeb(child.stdin);
 		const output = Readable.toWeb(child.stdout);
-		const stream = this.createTappedStream(createNdJsonMessageStream(this.options.agentCommand, input, output));
-		const connection = this.createConnection(stream, launch);
+		let connection;
+		const stream = this.createTappedStream(createNdJsonMessageStream(this.options.agentCommand, input, output, maxMessageBytes, (error) => {
+			this.rejectPendingConnectionRequests(error);
+			connection?.close?.(error);
+		}));
+		connection = this.createConnection(stream, launch);
 		connection.signal.addEventListener("abort", () => {
 			this.recordAgentExit("connection_close", child.exitCode ?? null, child.signalCode ?? null);
 		}, { once: true });
-		const startupFailure = this.createStartupFailureWatcher(child, startupStderr);
 		await this.initializeAgentConnection({
 			child,
 			connection,
@@ -4253,7 +4330,7 @@ var AcpClient = class {
 			geminiAcp: isGeminiAcpCommand(spawnCommand, args),
 			copilotAcp: isCopilotAcpCommand(spawnCommand, args),
 			claudeAcp: isClaudeAcpCommand(spawnCommand, args),
-			spawnOptions: buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials, this.options.sessionOptions?.env)
+			spawnOptions: buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials, this.options.sessionOptions?.env, this.options.agentProcessEnv)
 		};
 	}
 	logAgentLaunch(plan) {
@@ -4279,16 +4356,57 @@ var AcpClient = class {
 	}
 	async spawnAgentProcess(plan) {
 		const spawnCommand = buildAgentSpawnCommand(plan.spawnCommand, plan.args, process.platform, plan.spawnOptions.env);
-		const spawnedChild = spawn(spawnCommand.command, spawnCommand.args, {
-			...plan.spawnOptions,
-			windowsVerbatimArguments: spawnCommand.windowsVerbatimArguments
+		const launch = Object.freeze({
+			launchId: randomUUID(),
+			scope: snapshotProcessLaunchScope(this.options.processLaunchScope),
+			command: spawnCommand.command,
+			args: Object.freeze([...spawnCommand.args]),
+			cwd: this.options.cwd
 		});
+		await this.options.processLifecycle?.onBeforeSpawn?.(launch);
+		let spawnedChild;
 		try {
+			spawnedChild = spawn(spawnCommand.command, spawnCommand.args, {
+				...plan.spawnOptions,
+				windowsVerbatimArguments: spawnCommand.windowsVerbatimArguments
+			});
 			await waitForSpawn$1(spawnedChild);
 		} catch (error) {
-			throw new AgentSpawnError(this.options.agentCommand, error);
+			const spawnError = new AgentSpawnError(this.options.agentCommand, error);
+			this.notifyProcessSpawnFailure(launch, spawnError);
+			throw spawnError;
+		}
+		const child = requireAgentStdio(spawnedChild);
+		const pid = child.pid;
+		if (pid === void 0) {
+			const spawnError = new AgentSpawnError(this.options.agentCommand, /* @__PURE__ */ new Error("spawned agent process did not expose a PID"));
+			this.notifyProcessSpawnFailure(launch, spawnError);
+			await this.terminateAgentProcess(child);
+			throw spawnError;
+		}
+		return {
+			child,
+			process: Object.freeze({
+				...launch,
+				pid,
+				startedAt: isoNow$1()
+			})
+		};
+	}
+	async admitAndObserveSpawnedProcess(child, process) {
+		let releaseExitNotification = () => {};
+		const exitNotificationBarrier = new Promise((resolve) => {
+			releaseExitNotification = resolve;
+		});
+		this.attachAgentLifecycleObservers(child, process, exitNotificationBarrier);
+		try {
+			await this.options.processLifecycle?.onSpawned?.(process);
+		} catch (error) {
+			await this.terminateAgentProcess(child);
+			throw error;
+		} finally {
+			releaseExitNotification();
 		}
-		return requireAgentStdio(spawnedChild);
 	}
 	createConnection(stream, launch) {
 		const app = client({ name: "acpx" }).onNotification(methods.client.session.update, async ({ params }) => {
@@ -4347,7 +4465,7 @@ var AcpClient = class {
 	}
 	async handleInitializeFailure(params, error) {
 		params.startupFailure.dispose();
-		const normalizedError = await this.normalizeInitializeError(error, params.child, params.startupStderr);
+		const normalizedError = error instanceof AcpMessageLimitError ? error : await this.normalizeInitializeError(error, params.child, params.startupStderr);
 		try {
 			params.child.kill();
 		} catch {}
@@ -4361,9 +4479,8 @@ var AcpClient = class {
 		const onAcpMessage = () => this.eventHandlers.onAcpMessage;
 		const onAcpOutputMessage = () => this.eventHandlers.onAcpOutputMessage;
 		const elicitationRequestIds = /* @__PURE__ */ new Set();
-		const bindPromptOwner = (owner) => {
-			this.bindPromptOwner(owner);
-		};
+		const bindPromptOwner = (owner) => this.bindPromptOwner(owner);
+		const onPromptRequestWritten = (active, owner) => this.onPromptRequestWritten(active, owner);
 		const shouldSuppressInboundReplaySessionUpdate = (message) => {
 			return this.suppressReplaySessionUpdateMessages && isSessionUpdateNotification(message);
 		};
@@ -4397,7 +4514,7 @@ var AcpClient = class {
 			} }),
 			writable: new WritableStream({ async write(message) {
 				const promptOwner = promptRequestOwner(message);
-				if (promptOwner) bindPromptOwner(promptOwner);
+				const activePrompt = promptOwner ? bindPromptOwner(promptOwner) : void 0;
 				const id = responseId(message);
 				if (!(id !== void 0 && elicitationRequestIds.delete(id))) {
 					onAcpOutputMessage()?.("outbound", message);
@@ -4409,6 +4526,7 @@ var AcpClient = class {
 				} finally {
 					writer.releaseLock();
 				}
+				if (activePrompt && promptOwner) onPromptRequestWritten(activePrompt, promptOwner);
 			} })
 		};
 	}
@@ -4498,17 +4616,17 @@ var AcpClient = class {
 		this.suppressSessionUpdates = previous.suppressSessionUpdates;
 		this.suppressReplaySessionUpdateMessages = previous.suppressReplaySessionUpdateMessages;
 	}
-	async prompt(sessionId, prompt, onRequestStarted, onElicitation) {
+	async prompt(sessionId, prompt, onRequestWritten, onElicitation) {
 		const connection = this.getConnection();
 		const normalizedPrompt = this.normalizePromptForAgent(prompt);
 		const restoreConsoleError = this.options.suppressSdkConsoleErrors ? installSdkConsoleErrorSuppression() : void 0;
-		const activePrompt = this.beginActivePrompt(sessionId, onElicitation);
+		const activePrompt = this.beginActivePrompt(sessionId, onRequestWritten, onElicitation);
 		let promptPromise;
 		try {
 			promptPromise = this.runConnectionRequest(() => connection.prompt({
 				sessionId,
 				prompt: normalizedPrompt
-			}), onRequestStarted, () => !connection.signal?.aborted);
+			}));
 		} catch (error) {
 			this.clearActivePrompt(activePrompt);
 			restoreConsoleError?.();
@@ -4528,11 +4646,12 @@ var AcpClient = class {
 			this.promptPermissionFailures.delete(sessionId);
 		}
 	}
-	beginActivePrompt(sessionId, elicitationHandler) {
+	beginActivePrompt(sessionId, onRequestWritten, elicitationHandler) {
 		const previous = this.activePrompt;
 		this.cancellingSessionIds.delete(sessionId);
 		const active = {
 			sessionId,
+			onRequestWritten,
 			elicitationHandler,
 			elicitationController: new AbortController()
 		};
@@ -4546,6 +4665,13 @@ var AcpClient = class {
 			return candidate.requestId === void 0 && candidate.sessionId === owner.sessionId;
 		});
 		if (active) active.requestId = owner.requestId;
+		return active;
+	}
+	onPromptRequestWritten(active, owner) {
+		if (active.requestId !== owner.requestId || active.sessionId !== owner.sessionId) return;
+		try {
+			Promise.resolve(active.onRequestWritten?.()).catch(() => {});
+		} catch {}
 	}
 	clearActivePrompt(active) {
 		if (this.activePrompt === active) this.activePrompt = void 0;
@@ -4804,6 +4930,7 @@ var AcpClient = class {
 	}
 	createStartupFailureWatcher(child, startupStderr) {
 		let settled = false;
+		let failure;
 		let rejectPromise;
 		const cleanup = () => {
 			child.off("error", onError);
@@ -4814,7 +4941,10 @@ var AcpClient = class {
 			if (settled) return;
 			settled = true;
 			cleanup();
-			if (error) rejectPromise(error);
+			if (error) {
+				failure = error;
+				rejectPromise(error);
+			}
 		};
 		const createError = (params) => new AgentStartupError({
 			agentCommand: this.options.agentCommand,
@@ -4838,14 +4968,18 @@ var AcpClient = class {
 				signal
 			}));
 		};
+		const promise = new Promise((_resolve, reject) => {
+			rejectPromise = reject;
+			child.once("error", onError);
+			child.once("exit", onExit);
+			child.once("close", onClose);
+			if (child.exitCode !== null || child.signalCode !== null) onExit(child.exitCode, child.signalCode);
+		});
+		promise.catch(() => {});
 		return {
-			promise: new Promise((_resolve, reject) => {
-				rejectPromise = reject;
-				child.once("error", onError);
-				child.once("exit", onExit);
-				child.once("close", onClose);
-			}),
-			dispose: () => finish()
+			promise,
+			dispose: () => finish(),
+			getError: () => failure
 		};
 	}
 	async normalizeInitializeError(error, child, startupStderr) {
@@ -5025,10 +5159,19 @@ var AcpClient = class {
 			recorded: true
 		};
 	}
-	attachAgentLifecycleObservers(child) {
-		child.once("exit", (exitCode, signal) => {
+	attachAgentLifecycleObservers(child, startedProcess, exitNotificationBarrier) {
+		const onExit = (exitCode, signal) => {
+			const exitedAt = isoNow$1();
 			this.recordAgentExit("process_exit", exitCode, signal);
-		});
+			exitNotificationBarrier.then(() => {
+				this.notifyProcessExit(startedProcess, exitCode, signal, exitedAt);
+			});
+		};
+		child.once("exit", onExit);
+		if (child.exitCode !== null || child.signalCode !== null) {
+			child.off("exit", onExit);
+			onExit(child.exitCode, child.signalCode);
+		}
 		child.once("close", (exitCode, signal) => {
 			this.recordAgentExit("process_close", exitCode, signal);
 		});
@@ -5036,6 +5179,43 @@ var AcpClient = class {
 			this.recordAgentExit("pipe_close", child.exitCode ?? null, child.signalCode ?? null);
 		});
 	}
+	notifyProcessSpawnFailure(launch, error) {
+		const handler = this.options.processLifecycle?.onSpawnFailed;
+		if (!handler) return;
+		const event = Object.freeze({
+			...launch,
+			error,
+			failedAt: isoNow$1()
+		});
+		try {
+			Promise.resolve(handler(event)).catch((observerError) => {
+				this.logProcessLifecycleError("onSpawnFailed", observerError);
+			});
+		} catch (observerError) {
+			this.logProcessLifecycleError("onSpawnFailed", observerError);
+		}
+	}
+	notifyProcessExit(startedProcess, exitCode, signal, exitedAt) {
+		const handler = this.options.processLifecycle?.onExit;
+		if (!handler) return;
+		const event = Object.freeze({
+			...startedProcess,
+			exitCode,
+			signal,
+			exitedAt
+		});
+		try {
+			Promise.resolve(handler(event)).catch((error) => {
+				this.logProcessLifecycleError("onExit", error);
+			});
+		} catch (error) {
+			this.logProcessLifecycleError("onExit", error);
+		}
+	}
+	logProcessLifecycleError(hook, error) {
+		const message = error instanceof Error ? error.message : String(error);
+		this.log(`process lifecycle ${hook} hook failed: ${message}`);
+	}
 	recordAgentExit(reason, exitCode, signal) {
 		if (this.lastAgentExit) return;
 		this.lastAgentExit = {
@@ -5055,7 +5235,7 @@ var AcpClient = class {
 		if (error) this.promptPermissionFailures.delete(sessionId);
 		return error;
 	}
-	async runConnectionRequest(run, onRequestStarted, canStartRequest = () => true) {
+	async runConnectionRequest(run) {
 		return await new Promise((resolve, reject) => {
 			const pending = {
 				settled: false,
@@ -5070,14 +5250,9 @@ var AcpClient = class {
 			this.pendingConnectionRequests.add(pending);
 			Promise.resolve().then(async () => {
 				if (pending.settled) return { started: false };
-				const requestCanStart = canStartRequest();
-				const request = run();
-				if (requestCanStart) try {
-					Promise.resolve(onRequestStarted?.()).catch(() => {});
-				} catch {}
 				return {
 					started: true,
-					value: await request
+					value: await run()
 				};
 			}).then((outcome) => {
 				if (outcome.started) finish(() => resolve(outcome.value));
@@ -6469,9 +6644,24 @@ async function withConnectedSession(options) {
 //#region src/runtime/engine/prompt-turn.ts
 const SESSION_REPLY_IDLE_MS = 1e3;
 const SESSION_REPLY_DRAIN_TIMEOUT_MS = 5e3;
+function responseMetaField(meta) {
+	return meta === void 0 ? {} : { _meta: meta };
+}
+function recoveredSessionResult(response, conversation, promptMessageId) {
+	recordPromptResponseUsage(conversation, response?.usage, promptMessageId);
+	return {
+		stopReason: "end_turn",
+		source: "session",
+		...responseMetaField(response?._meta)
+	};
+}
 async function runPromptTurn(params) {
+	let settledResponse;
 	try {
-		const promptPromise = params.client.prompt(params.sessionId, params.prompt, params.onPromptRequestStarted, params.onElicitation);
+		const promptPromise = params.client.prompt(params.sessionId, params.prompt, params.onPromptRequestWritten, params.onElicitation);
+		promptPromise.then((response) => {
+			settledResponse = response;
+		}, () => {});
 		await params.onPromptStarted?.();
 		const response = await withTimeout(promptPromise, params.timeoutMs);
 		await params.client.waitForSessionUpdatesIdle?.({
@@ -6481,7 +6671,8 @@ async function runPromptTurn(params) {
 		recordPromptResponseUsage(params.conversation, response.usage, params.promptMessageId);
 		return {
 			stopReason: response.stopReason,
-			source: "rpc"
+			source: "rpc",
+			...responseMetaField(response._meta)
 		};
 	} catch (error) {
 		if (!(error instanceof TimeoutError) || !params.promptMessageId) throw error;
@@ -6489,10 +6680,7 @@ async function runPromptTurn(params) {
 			idleMs: SESSION_REPLY_IDLE_MS,
 			timeoutMs: SESSION_REPLY_DRAIN_TIMEOUT_MS
 		}).catch(() => {});
-		if (hasAgentReplyAfterPrompt(params.conversation, params.promptMessageId)) return {
-			stopReason: "end_turn",
-			source: "session"
-		};
+		if (hasAgentReplyAfterPrompt(params.conversation, params.promptMessageId)) return recoveredSessionResult(settledResponse, params.conversation, params.promptMessageId);
 		throw error;
 	}
 }
@@ -6552,4 +6740,4 @@ var LiveSessionCheckpoint = class {
 //#endregion
 export { formatPerfMetric as $, AgentSpawnError as $t, RequestedModelUnsupportedError as A, DEFAULT_AGENT_NAME as At, absolutePath as B, extractAcpError as Bt, sessionOptionsFromRecord as C, parsePromptSource as Ct, AcpClient as D, TimeoutError as Dt, reconcileAgentSessionId as E, InterruptedError as Et, runTimedExecFile as F, resolveCanonicalAgentName as Ft, listSessions as G, NON_INTERACTIVE_PERMISSION_POLICIES as Gt, findSession as H, toAcpErrorPayload as Ht, splitCommandLine as I, exitCodeForOutputErrorCode as It, pruneSessions as J, OUTPUT_FORMATS as Jt, listSessionsForAgent as K, OUTPUT_ERROR_CODES as Kt, getAcpxVersion as L, formatErrorMessage as Lt, modelStateFromConfigOptions as M, normalizeAgentName$1 as Mt, normalizeAgentCommandInput as N, resolveAgentArgv as Nt, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as O, withInterrupt as Ot, renderArgvIdentity as P, resolveAgentCommand as Pt, assertPersistedKeyPolicy as Q, AcpxOperationalError as Qt, permissionModeSatisfies as R, isRetryablePromptError as Rt, persistSessionOptions as S, mergePromptSourceWithText as St, applyLifecycleSnapshotToRecord as T, textPrompt as Tt, findSessionByDirectoryWalk as U, AUTH_POLICIES as Ut, findGitRepositoryRoot as V, isAcpResourceNotFoundError as Vt, isoNow$2 as W, EXIT_CODES as Wt, writeSessionRecord as X, PERMISSION_POLICY_ACTIONS as Xt, resolveSessionRecord as Y, PERMISSION_MODES as Yt, createAtomicWriteTempPath as Z, SESSION_RECORD_SCHEMA as Zt, recordPromptSubmission as _, isAcpJsonRpcMessage as _t, applyConfigOptionSelection as a, setPerfGauge as at, advertisedModelState as b, PromptInputValidationError as bt, applyRequestedModelIfAdvertised as c, serializeSessionRecordForDisk as ct, setDesiredModeId as d, defaultSessionEventLog as dt, QueueConnectionError as en, getPerfMetricsSnapshot as et, syncAdvertisedModelState as f, sessionBaseDir$1 as ft, recordClientOperation as g, extractSessionUpdateNotification as gt, createSessionConversation as h, sessionEventSegmentPath as ht, connectAndLoadSession as i, resetPerfMetrics as it, isRequestedModelUnsupportedError as j, listBuiltInAgents as jt, REQUESTED_MODEL_UNSUPPORTED_REASONS as k, withTimeout as kt, currentModelIdFromSetModelResponse as l, normalizeRuntimeSessionId as lt, cloneSessionConversation as m, sessionEventLockPath as mt, runPromptTurn as n, measurePerf as nt, applyConfigOptionsToRecord as o, startPerfTimer as ot, cloneSessionAcpxState as p, sessionEventActivePath as pt, normalizeName as q, OUTPUT_ERROR_ORIGINS as qt, withConnectedSession as r, recordPerfDuration as rt, applyModelSelection as s, parseSessionRecord as st, LiveSessionCheckpoint as t, QueueProtocolError as tn, incrementPerfCounter as tt, setCurrentModelId as u, DEFAULT_EVENT_SEGMENT_MAX_BYTES as ut, recordSessionUpdate as v, parseJsonRpcErrorMessage as vt, applyConversation as w, promptToDisplayText as wt, mergeSessionOptions as x, isPromptInput as xt, trimConversationForRuntime as y, parsePromptStopReason as yt, DEFAULT_HISTORY_LIMIT as z, normalizeOutputError as zt };
 
-//# sourceMappingURL=live-checkpoint-Gw2oGjhe.js.map
+//# sourceMappingURL=live-checkpoint-CYRs-D9t.js.map