acpx 0.13.2 → 0.14.0

package/dist/{live-checkpoint-Gw2oGjhe.js → live-checkpoint-BW9JivEG.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;
 	}
 };
@@ -711,19 +716,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 +1664,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 +2640,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) => {
@@ -3399,6 +3409,7 @@ function waitMs(ms) {
 		setTimeout(resolve, Math.max(0, ms));
 	});
 }
+function onStreamError() {}
 var TerminalManager = class {
 	cwd;
 	permissionMode;
@@ -3464,6 +3475,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 +3651,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 +3668,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 +3685,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 +3819,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 {
@@ -4361,9 +4371,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 +4406,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 +4418,7 @@ var AcpClient = class {
 				} finally {
 					writer.releaseLock();
 				}
+				if (activePrompt && promptOwner) onPromptRequestWritten(activePrompt, promptOwner);
 			} })
 		};
 	}
@@ -4498,17 +4508,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 +4538,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 +4557,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;
@@ -5055,7 +5073,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 +5088,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));
@@ -6471,7 +6484,7 @@ const SESSION_REPLY_IDLE_MS = 1e3;
 const SESSION_REPLY_DRAIN_TIMEOUT_MS = 5e3;
 async function runPromptTurn(params) {
 	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);
 		await params.onPromptStarted?.();
 		const response = await withTimeout(promptPromise, params.timeoutMs);
 		await params.client.waitForSessionUpdatesIdle?.({
@@ -6552,4 +6565,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-BW9JivEG.js.map