acpx 0.19.0 → 0.19.1

package/dist/{queue-owner-runtime-CLwjMYNL.js → queue-owner-runtime-C4OOosbo.js}

@@ -1,5 +1,5 @@
-import { $ as measurePerf, A as findGitRepositoryRoot, B as writeSessionRecord, Bt as PermissionDeniedError, C as getUnsupportedPromptContentMessage, D as textPrompt, Dt as OUTPUT_ERROR_ORIGINS, E as promptToDisplayText, Et as OUTPUT_ERROR_CODES, Ft as AgentStartupError, G as normalizeAgentSessionId, Gt as SessionModelReplayError, Ht as QueueConnectionError, I as normalizeName, It as AuthPolicyError, Jt as UnsupportedPromptContentError, K as SESSION_JOURNAL_SCHEMA, Lt as ClaudeAcpSessionCreateTimeoutError, M as findSessionByDirectoryWalk, Mt as AcpxOperationalError, N as isoNow$1, Nt as AgentDisconnectedError, Pt as AgentSpawnError, Q as incrementPerfCounter, Rt as CopilotAcpUnsupportedError, St as isAcpResourceNotFoundError, Ut as SessionConfigOptionReplayError, Vt as PermissionPromptUnavailableError, W as extractAgentSessionId, Wt as SessionModeReplayError, X as formatPerfMetric, Z as getPerfMetricsSnapshot, _ as waitMs$1, a as trySetModelOnRunningOwner, at as isAcpJsonRpcMessage, b as lockOwnerPid, bt as extractAcpError, c as queueRequestExceedsLimit, et as recordPerfDuration, f as refreshQueueOwnerLease, ft as defaultSessionEventLog, g as tryAcquireQueueOwnerLease, gt as sessionEventSegmentPath, h as terminateQueueOwnerForSession, ht as sessionEventLockPath, i as trySetModeOnRunningOwner, k as absolutePath, l as parseQueueRequest, m as terminateProcess, mt as sessionEventActivePath, n as tryCloseSessionOnRunningOwner, nt as setPerfGauge, o as trySubmitToRunningOwner, ot as isAcpMessageObject, p as releaseQueueOwnerLease, pt as sessionBaseDir, q as SessionJournalReader, qt as SessionResumeRequiredError, r as trySetConfigOptionOnRunningOwner, rt as startPerfTimer, s as queueRequestByteLimit, st as isSessionUpdateNotification, t as tryCancelOnRunningOwner, tt as resetPerfMetrics, v as QueueLeaseGuardSettlementError, wt as EXIT_CODES, x as readProcessTable, xt as formatUnknownErrorMessage, y as createLockOwner, yt as isProcessAlive, z as resolveSessionRecord, zt as GeminiAcpStartupTimeoutError } from "./ipc-fMgj5vrO.js";
-import { A as resolveAgentCommandParts, C as asAbsoluteCwd, E as isoNow$2, F as waitForSpawn, M as runTimedExecFile, N as splitCommandLine, P as waitForChildExit, S as PROCESS_HELPER_TIMEOUT_MS, T as isChildProcessRunning, _ as buildSpawnCommandOptions, b as readWindowsEnvValue, f as resolveBuiltInAgentLaunch, g as buildAgentSpawnCommand, j as resolveAgentSessionCwd, k as requireAgentStdio, v as buildTerminalShellSpawnCommand, w as basenameToken, x as resolveWindowsExecutablePath, y as buildTerminalSpawnCommand } from "./agent-registry-Ct2yWPW7.js";
+import { $ as measurePerf, A as findGitRepositoryRoot, B as writeSessionRecord, Bt as PermissionDeniedError, C as getUnsupportedPromptContentMessage, D as textPrompt, Dt as OUTPUT_ERROR_ORIGINS, E as promptToDisplayText, Et as OUTPUT_ERROR_CODES, Ft as AgentStartupError, G as normalizeAgentSessionId, Gt as SessionModelReplayError, Ht as QueueConnectionError, I as normalizeName, It as AuthPolicyError, Jt as UnsupportedPromptContentError, K as SESSION_JOURNAL_SCHEMA, Lt as ClaudeAcpSessionCreateTimeoutError, M as findSessionByDirectoryWalk, Mt as AcpxOperationalError, N as isoNow$1, Nt as AgentDisconnectedError, Pt as AgentSpawnError, Q as incrementPerfCounter, Rt as CopilotAcpUnsupportedError, St as isAcpResourceNotFoundError, Ut as SessionConfigOptionReplayError, Vt as PermissionPromptUnavailableError, W as extractAgentSessionId, Wt as SessionModeReplayError, X as formatPerfMetric, Z as getPerfMetricsSnapshot, _ as waitMs$1, a as trySetModelOnRunningOwner, at as isAcpJsonRpcMessage, b as lockOwnerPid, bt as extractAcpError, c as queueRequestExceedsLimit, et as recordPerfDuration, f as refreshQueueOwnerLease, ft as defaultSessionEventLog, g as tryAcquireQueueOwnerLease, gt as sessionEventSegmentPath, h as terminateQueueOwnerForSession, ht as sessionEventLockPath, i as trySetModeOnRunningOwner, k as absolutePath, l as parseQueueRequest, m as terminateProcess, mt as sessionEventActivePath, n as tryCloseSessionOnRunningOwner, nt as setPerfGauge, o as trySubmitToRunningOwner, ot as isAcpMessageObject, p as releaseQueueOwnerLease, pt as sessionBaseDir, q as SessionJournalReader, qt as SessionResumeRequiredError, r as trySetConfigOptionOnRunningOwner, rt as startPerfTimer, s as queueRequestByteLimit, st as isSessionUpdateNotification, t as tryCancelOnRunningOwner, tt as resetPerfMetrics, v as QueueLeaseGuardSettlementError, wt as EXIT_CODES, x as ProcessDescendants, xt as formatUnknownErrorMessage, y as createLockOwner, yt as isProcessAlive, z as resolveSessionRecord, zt as GeminiAcpStartupTimeoutError } from "./ipc-DAApJ5mi.js";
+import { A as requireAgentStdio, C as PROCESS_HELPER_TIMEOUT_MS, D as isoNow$2, E as isChildProcessRunning, F as waitForChildExit, I as waitForSpawn, M as resolveAgentSessionCwd, N as runTimedExecFile, P as splitCommandLine, T as basenameToken, _ as buildSpawnCommandOptions, b as readWindowsEnvValue, f as resolveBuiltInAgentLaunch, g as buildAgentSpawnCommand, j as resolveAgentCommandParts, v as buildTerminalShellSpawnCommand, w as asAbsoluteCwd, x as resolveWindowsExecutablePath, y as buildTerminalSpawnCommand } from "./agent-registry-DWlx5BQ4.js";
 import fs, { readFileSync, realpathSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
@@ -1080,63 +1080,22 @@ function compareVersionParts(left, right) {
 	}
 	return 0;
 }
-async function detectGeminiVersion(command) {
-	const versionLine = (await readCommandOutput(command, ["--version"], GEMINI_VERSION_TIMEOUT_MS))?.split(/\r?\n/).map((line) => line.trim()).find((line) => /\d+\.\d+\.\d+/.test(line));
+async function detectGeminiVersion(command, context, diagnostic = false) {
+	const versionLine = (await context.readOutput(command, ["--version"], GEMINI_VERSION_TIMEOUT_MS, diagnostic))?.split(/\r?\n/).map((line) => line.trim()).find((line) => /\d+\.\d+\.\d+/.test(line));
 	return parseGeminiVersion(versionLine);
 }
-async function resolveGeminiCommandArgs(command, args) {
+async function resolveGeminiCommandArgs(command, args, context) {
 	if (basenameToken(command) !== "gemini" || !args.includes("--acp")) return [...args];
-	const version = await detectGeminiVersion(command);
+	const version = await detectGeminiVersion(command, context);
 	if (version && compareVersionParts(version.parts, GEMINI_ACP_FLAG_VERSION) < 0) return args.map((arg) => arg === "--acp" ? "--experimental-acp" : arg);
 	return [...args];
 }
-async function readCommandOutput(command, args, timeoutMs) {
-	return await new Promise((resolve) => {
-		const child = spawn(command, [...args], buildSpawnCommandOptions(command, {
-			stdio: [
-				"ignore",
-				"pipe",
-				"pipe"
-			],
-			windowsHide: true
-		}));
-		let stdout = "";
-		let stderr = "";
-		let settled = false;
-		const finish = (value) => {
-			if (settled) return;
-			settled = true;
-			clearTimeout(timer);
-			child.removeAllListeners();
-			child.stdout?.removeAllListeners();
-			child.stderr?.removeAllListeners();
-			resolve(value);
-		};
-		const timer = setTimeout(() => {
-			child.kill("SIGKILL");
-			finish(void 0);
-		}, timeoutMs);
-		child.stdout?.setEncoding("utf8");
-		child.stderr?.setEncoding("utf8");
-		child.stdout?.on("data", (chunk) => {
-			stdout += chunk;
-		});
-		child.stderr?.on("data", (chunk) => {
-			stderr += chunk;
-		});
-		child.once("error", () => {
-			finish(void 0);
-		});
-		child.once("close", () => {
-			finish(`${stdout}\n${stderr}`);
-		});
-	});
-}
-async function buildGeminiAcpStartupTimeoutMessage(command) {
+async function buildGeminiAcpStartupTimeoutMessage(command, context) {
 	const parts = ["Gemini CLI ACP startup timed out before initialize completed.", "This usually means the local Gemini CLI is waiting on interactive OAuth or has incompatible ACP subprocess behavior."];
-	const version = await detectGeminiVersion(command);
+	const version = await detectGeminiVersion(command, context, true);
 	if (version) parts.push(`Detected Gemini CLI version: ${version.raw}.`);
-	if (!process.env.GEMINI_API_KEY && !process.env.GOOGLE_API_KEY) parts.push("No GEMINI_API_KEY or GOOGLE_API_KEY was set for non-interactive auth.");
+	const env = context.env;
+	if (!env.GEMINI_API_KEY && !env.GOOGLE_API_KEY) parts.push("No GEMINI_API_KEY or GOOGLE_API_KEY was set for non-interactive auth.");
 	parts.push("Try upgrading Gemini CLI and using API-key-based auth for non-interactive ACP runs.");
 	return parts.join(" ");
 }
@@ -1147,16 +1106,17 @@ function buildClaudeAcpSessionCreateTimeoutMessage() {
 		"In harnessed or non-interactive runs, prefer --approve-all with nonInteractivePermissions=deny, upgrade Claude Code and the Claude ACP adapter, or use acpx claude exec as a one-shot fallback."
 	].join(" ");
 }
-async function buildCopilotAcpUnsupportedMessage(command) {
-	const parts = ["GitHub Copilot CLI ACP stdio mode is not available in the installed copilot binary.", "acpx copilot expects a Copilot CLI release that supports --acp --stdio."];
-	const helpOutput = await readCommandOutput(command, ["--help"], COPILOT_HELP_TIMEOUT_MS);
-	if (typeof helpOutput === "string" && !helpOutput.includes("--acp")) parts.push("Detected copilot --help output without --acp support.");
-	parts.push("Upgrade GitHub Copilot CLI to a release with ACP stdio support, or use --agent with another ACP-compatible adapter in the meantime.");
-	return parts.join(" ");
+function buildCopilotAcpUnsupportedMessage() {
+	return [
+		"GitHub Copilot CLI ACP stdio mode is not available in the installed copilot binary.",
+		"acpx copilot expects a Copilot CLI release that supports --acp --stdio.",
+		"Detected copilot --help output without --acp support.",
+		"Upgrade GitHub Copilot CLI to a release with ACP stdio support, or use --agent with another ACP-compatible adapter in the meantime."
+	].join(" ");
 }
-async function ensureCopilotAcpSupport(command) {
-	const helpOutput = await readCommandOutput(command, ["--help"], COPILOT_HELP_TIMEOUT_MS);
-	if (typeof helpOutput === "string" && !helpOutput.includes("--acp")) throw new CopilotAcpUnsupportedError(await buildCopilotAcpUnsupportedMessage(command), { retryable: false });
+async function ensureCopilotAcpSupport(command, context) {
+	const helpOutput = await context.readOutput(command, ["--help"], COPILOT_HELP_TIMEOUT_MS);
+	if (typeof helpOutput === "string" && !helpOutput.includes("--acp")) throw new CopilotAcpUnsupportedError(buildCopilotAcpUnsupportedMessage(), { retryable: false });
 }
 function buildClaudeCodeOptionsMeta(options, isolateUserSettings = false) {
 	const claudeCodeOptions = {};
@@ -1377,6 +1337,73 @@ function resolveClientCapabilities(params) {
 	};
 }
 //#endregion
+//#region src/acp/command-probe.ts
+var CommandProbeAdmissionError = class extends Error {
+	reason;
+	constructor(reason) {
+		super("Agent command admission rejected", { cause: reason });
+		this.reason = reason;
+		this.name = "CommandProbeAdmissionError";
+	}
+};
+async function admitCommandProbe(admit) {
+	try {
+		return await admit();
+	} catch (error) {
+		throw new CommandProbeAdmissionError(error);
+	}
+}
+/** Collect only this short adapter command; its client owns process retirement. */
+function captureCommandProbeOutput(child, timeoutMs, retire) {
+	let stdout = "";
+	let stderr = "";
+	let settled = false;
+	let disposed = false;
+	let timer;
+	let resolveResult;
+	const result = new Promise((resolve) => {
+		resolveResult = resolve;
+	});
+	const finish = (value) => {
+		if (settled) return;
+		settled = true;
+		clearTimeout(timer);
+		resolveResult(value);
+	};
+	const fail = () => {
+		if (disposed) return;
+		finish(void 0);
+		retire().catch(() => {});
+	};
+	const onStdout = (chunk) => {
+		if (!settled) stdout += chunk;
+	};
+	const onStderr = (chunk) => {
+		if (!settled) stderr += chunk;
+	};
+	const onClose = () => finish(`${stdout}\n${stderr}`);
+	child.stdout?.setEncoding("utf8");
+	child.stderr?.setEncoding("utf8");
+	child.stdout?.on("data", onStdout);
+	child.stderr?.on("data", onStderr);
+	child.on("error", fail);
+	child.stdout?.on("error", fail);
+	child.stderr?.on("error", fail);
+	child.once("close", onClose);
+	timer = setTimeout(fail, timeoutMs);
+	return {
+		result,
+		dispose: () => {
+			disposed = true;
+			finish(void 0);
+			clearTimeout(timer);
+			child.stdout?.off("data", onStdout);
+			child.stderr?.off("data", onStderr);
+			child.off("close", onClose);
+		}
+	};
+}
+//#endregion
 //#region src/acp/model-support.ts
 const REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE = "ACP_MODEL_UNSUPPORTED";
 const REQUESTED_MODEL_UNSUPPORTED_REASONS = ["missing-capability", "unadvertised-model"];
@@ -1672,116 +1699,6 @@ function promptRequestOwner(message) {
 	} : void 0;
 }
 //#endregion
-//#region src/acp/process-descendants.ts
-function includeDescendants(table, owned) {
-	let expanded;
-	do {
-		expanded = false;
-		for (const identity of table.values()) {
-			const parent = table.get(identity.parentPid);
-			if (process.platform === "win32" && (!parent || parent.birth > identity.birth)) continue;
-			if (owned.has(identity.parentPid) && !owned.has(identity.pid)) {
-				owned.add(identity.pid);
-				expanded = true;
-			}
-		}
-	} while (expanded);
-}
-/** Best-effort cleanup for descendants witnessed during this child launch. */
-var ProcessDescendants = class {
-	child;
-	identities = /* @__PURE__ */ new Map();
-	rootBirth;
-	pending;
-	retired = false;
-	ownProcessGroup;
-	captureGroupAfterExit;
-	groupExitedAt;
-	onRootExit = () => {
-		this.groupExitedAt = Date.now();
-	};
-	constructor(child, options = {}) {
-		this.child = child;
-		this.ownProcessGroup = process.platform !== "win32" && Boolean(options.ownProcessGroup);
-		this.captureGroupAfterExit = this.ownProcessGroup && isChildProcessRunning(child);
-		if (this.ownProcessGroup) child.once("exit", this.onRootExit);
-	}
-	capture(timeoutMs = PROCESS_HELPER_TIMEOUT_MS) {
-		if (this.retired) return Promise.resolve(true);
-		this.pending ??= this.readSnapshot(timeoutMs).finally(() => {
-			this.pending = void 0;
-		});
-		return this.pending;
-	}
-	async readSnapshot(timeoutMs) {
-		const deadline = performance.now() + timeoutMs;
-		const rootWasRunning = isChildProcessRunning(this.child);
-		const captureRootGroup = rootWasRunning || this.captureGroupAfterExit;
-		if (!rootWasRunning) this.captureGroupAfterExit = false;
-		try {
-			const table = await readProcessTable(timeoutMs);
-			if (!this.retired) {
-				table.delete(1);
-				table.delete(process.pid);
-				this.refresh(table, captureRootGroup);
-				if (this.captureGroupAfterExit && !isChildProcessRunning(this.child)) return await this.readSnapshot(Math.max(1, deadline - performance.now()));
-			}
-			return true;
-		} catch {
-			if (!isChildProcessRunning(this.child)) this.captureGroupAfterExit = false;
-			return false;
-		}
-	}
-	refresh(table, rootWasRunning) {
-		const owned = /* @__PURE__ */ new Set();
-		for (const [pid, identity] of this.identities) if (table.get(pid)?.birth === identity.birth) owned.add(pid);
-		this.includeRoot(table, owned);
-		if (this.ownProcessGroup) this.includeProcessGroup(table, owned, rootWasRunning);
-		includeDescendants(table, owned);
-		owned.delete(this.child.pid ?? 0);
-		this.identities = new Map([...table].filter(([pid]) => owned.has(pid)));
-	}
-	includeRoot(table, owned) {
-		const root = this.child.pid;
-		const rootIdentity = root && table.get(root);
-		if (rootIdentity && isChildProcessRunning(this.child)) {
-			this.rootBirth ??= rootIdentity.birth;
-			if (rootIdentity.birth === this.rootBirth) owned.add(rootIdentity.pid);
-		}
-	}
-	includeProcessGroup(table, owned, rootWasRunning) {
-		const root = this.child.pid;
-		if (root && (rootWasRunning || [...owned].some((pid) => table.get(pid)?.groupPid === root))) {
-			for (const identity of table.values()) if (identity.groupPid === root && (this.groupExitedAt === void 0 || Date.parse(identity.birth) <= this.groupExitedAt)) owned.add(identity.pid);
-		}
-	}
-	async signal(signal, timeoutMs) {
-		if (!await this.capture(timeoutMs) || this.retired) return;
-		for (const pid of this.identities.keys()) try {
-			process.kill(pid, signal);
-		} catch {
-			this.identities.delete(pid);
-		}
-	}
-	hasTrackedProcesses() {
-		return this.identities.size > 0;
-	}
-	async waitForExit(timeoutMs) {
-		const deadline = Date.now() + timeoutMs;
-		do {
-			if (!await this.capture(Math.max(1, deadline - Date.now()))) return false;
-			if (this.identities.size === 0) return true;
-			await setTimeout$1(Math.min(100, Math.max(0, deadline - Date.now())));
-		} while (Date.now() < deadline);
-		return false;
-	}
-	retire() {
-		this.retired = true;
-		this.child.off("exit", this.onRootExit);
-		this.identities.clear();
-	}
-};
-//#endregion
 //#region src/acp/session-control-errors.ts
 const SESSION_CONTROL_UNSUPPORTED_ACP_CODES = /* @__PURE__ */ new Set([-32601, -32602]);
 function asRecord$1(value) {
@@ -2403,26 +2320,13 @@ function childProcessIsRunning(agent) {
 function cancelledPermissionResponse() {
 	return { outcome: { outcome: "cancelled" } };
 }
-function shouldSuppressSdkConsoleError(args) {
-	if (args.length === 0) return false;
-	return typeof args[0] === "string" && args[0] === "Error handling request";
-}
-function installSdkConsoleErrorSuppression() {
-	const originalConsoleError = console.error;
-	console.error = (...args) => {
-		if (shouldSuppressSdkConsoleError(args)) return;
-		originalConsoleError(...args);
-	};
-	return () => {
-		console.error = originalConsoleError;
-	};
-}
 var AcpClient = class {
 	options;
 	connection;
 	agent;
 	agentDescendants = /* @__PURE__ */ new WeakMap();
 	agentCleanups = /* @__PURE__ */ new WeakMap();
+	commandProbes = /* @__PURE__ */ new Set();
 	initResult;
 	loadedSessionId;
 	eventHandlers;
@@ -2569,11 +2473,11 @@ var AcpClient = class {
 		if (this.hasLiveConnection()) return;
 		const epoch = await this.waitForPreviousClose();
 		const maxMessageBytes = readMaxAcpMessageBytes();
-		const launch = await this.resolveAgentLaunchPlan();
-		assertControlAuthority(authority);
+		const launch = await this.resolveAgentLaunchPlan(epoch, authority);
+		this.assertCommandProbeActive(epoch, authority);
 		this.logAgentLaunch(launch);
 		await this.ensureLaunchSupport(launch);
-		assertControlAuthority(authority);
+		this.assertCommandProbeActive(epoch, authority);
 		const { child, process: startedProcess } = await this.spawnAgentProcess(launch, authority);
 		if (this.closeEpoch === epoch) {
 			this.agent = child;
@@ -2633,12 +2537,29 @@ var AcpClient = class {
 		if (this.closeEpoch !== epoch) throw new Error("ACP client was closed while the agent was starting");
 		return epoch;
 	}
-	async resolveAgentLaunchPlan() {
+	async resolveAgentLaunchPlan(epoch, authority) {
 		const configuredCommand = resolveAgentCommandParts(this.options.agentCommand, this.options.agentArgv);
 		const resolvedBuiltInLaunch = resolveBuiltInAgentLaunch(this.options.agentCommand);
 		const spawnCommand = resolvedBuiltInLaunch?.command ?? configuredCommand.command;
+		const spawnOptions = buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials, this.options.sessionOptions?.env, this.options.agentProcessEnv);
+		const commandContext = {
+			env: spawnOptions.env,
+			readOutput: async (command, args, timeoutMs, diagnostic = false) => {
+				try {
+					const output = await this.readAgentCommandOutput(command, args, timeoutMs, spawnOptions, epoch, authority);
+					await admitCommandProbe(() => this.assertCommandProbeActive(epoch, authority));
+					return output;
+				} catch (error) {
+					if (error instanceof CommandProbeAdmissionError) {
+						if (diagnostic) return;
+						throw error.reason;
+					}
+					throw error;
+				}
+			}
+		};
 		let args = resolvedBuiltInLaunch?.args ?? configuredCommand.args;
-		args = await resolveGeminiCommandArgs(spawnCommand, args);
+		args = await resolveGeminiCommandArgs(spawnCommand, args, commandContext);
 		if (isQoderAcpCommand(spawnCommand, args)) args = buildQoderAcpCommandArgs(args, this.options);
 		return {
 			spawnCommand,
@@ -2648,7 +2569,8 @@ 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, this.options.agentProcessEnv)
+			spawnOptions,
+			commandContext
 		};
 	}
 	logAgentLaunch(plan) {
@@ -2664,7 +2586,7 @@ var AcpClient = class {
 		this.log(`spawning agent: ${plan.spawnCommand} ${plan.args.join(" ")}`);
 	}
 	async ensureLaunchSupport(plan) {
-		if (plan.copilotAcp) await ensureCopilotAcpSupport(plan.spawnCommand);
+		if (plan.copilotAcp) await ensureCopilotAcpSupport(plan.spawnCommand, plan.commandContext);
 		if (!plan.claudeAcp) return;
 		const claudeExe = resolveClaudeCodeExecutable(process.platform, plan.spawnOptions.env);
 		if (claudeExe) {
@@ -2672,22 +2594,36 @@ var AcpClient = class {
 			this.log(`resolved system Claude Code executable: ${claudeExe}`);
 		}
 	}
-	async spawnAgentProcess(plan, authority) {
-		const spawnCommand = buildAgentSpawnCommand(plan.spawnCommand, plan.args, process.platform, plan.spawnOptions.env);
-		const launch = Object.freeze({
-			launchId: randomUUID(),
-			scope: snapshotProcessLaunchScope(this.options.processLaunchScope),
-			command: spawnCommand.command,
-			args: Object.freeze([...spawnCommand.args]),
-			cwd: this.options.cwd
+	prepareProcessLaunch(command, args, options) {
+		const resolved = buildAgentSpawnCommand(command, args, process.platform, options.env);
+		return {
+			launch: Object.freeze({
+				launchId: randomUUID(),
+				scope: snapshotProcessLaunchScope(this.options.processLaunchScope),
+				command: resolved.command,
+				args: Object.freeze([...resolved.args]),
+				cwd: options.cwd
+			}),
+			windowsVerbatimArguments: resolved.windowsVerbatimArguments
+		};
+	}
+	startedProcess(launch, pid) {
+		return Object.freeze({
+			...launch,
+			pid,
+			startedAt: isoNow$2()
 		});
+	}
+	async spawnAgentProcess(plan, authority) {
+		const prepared = this.prepareProcessLaunch(plan.spawnCommand, plan.args, plan.spawnOptions);
+		const { launch } = prepared;
 		await this.options.processLifecycle?.onBeforeSpawn?.(launch);
 		assertControlAuthority(authority);
 		let spawnedChild;
 		try {
-			spawnedChild = spawn(spawnCommand.command, spawnCommand.args, {
+			spawnedChild = spawn(launch.command, [...launch.args], {
 				...plan.spawnOptions,
-				windowsVerbatimArguments: spawnCommand.windowsVerbatimArguments
+				windowsVerbatimArguments: prepared.windowsVerbatimArguments
 			});
 			await waitForSpawn(spawnedChild);
 		} catch (error) {
@@ -2706,21 +2642,86 @@ var AcpClient = class {
 		}
 		return {
 			child,
-			process: Object.freeze({
-				...launch,
-				pid,
-				startedAt: isoNow$2()
-			})
+			process: this.startedProcess(launch, pid)
 		};
 	}
+	assertCommandProbeActive(epoch, authority) {
+		assertControlAuthority(authority);
+		if (this.closeEpoch !== epoch) throw new Error("ACP client was closed while the agent was starting");
+	}
+	async readAgentCommandOutput(command, args, timeoutMs, options, epoch, authority) {
+		const prepared = this.prepareProcessLaunch(command, args, options);
+		const { launch } = prepared;
+		await admitCommandProbe(async () => {
+			this.assertCommandProbeActive(epoch, authority);
+			await this.options.processLifecycle?.onBeforeSpawn?.(launch);
+		});
+		try {
+			this.assertCommandProbeActive(epoch, authority);
+		} catch (error) {
+			throw new CommandProbeAdmissionError(error);
+		}
+		let child;
+		try {
+			child = spawn(launch.command, [...launch.args], {
+				cwd: options.cwd,
+				env: options.env,
+				stdio: [
+					"ignore",
+					"pipe",
+					"pipe"
+				],
+				windowsHide: true,
+				windowsVerbatimArguments: prepared.windowsVerbatimArguments,
+				detached: process.platform !== "win32"
+			});
+		} catch (error) {
+			this.notifyProcessSpawnFailure(launch, new AgentSpawnError(command, error));
+			return;
+		}
+		this.commandProbes.add(child);
+		this.agentDescendants.set(child, new ProcessDescendants(child, { ownProcessGroup: true }));
+		const capture = captureCommandProbeOutput(child, timeoutMs, () => this.terminateAgentProcess(child));
+		try {
+			try {
+				await waitForSpawn(child);
+			} catch (error) {
+				this.notifyProcessSpawnFailure(launch, new AgentSpawnError(command, error));
+				return;
+			}
+			if (child.pid === void 0) {
+				this.notifyProcessSpawnFailure(launch, new AgentSpawnError(command, /* @__PURE__ */ new Error("spawned probe did not expose a PID")));
+				return;
+			}
+			const started = this.startedProcess(launch, child.pid);
+			await this.admitSpawnedProcess(child, (barrier) => this.attachProcessExitObserver(child, started, barrier), () => admitCommandProbe(async () => {
+				await this.options.processLifecycle?.onSpawned?.(started);
+				this.assertCommandProbeActive(epoch, authority);
+			}));
+			const output = await capture.result;
+			await admitCommandProbe(() => this.assertCommandProbeActive(epoch, authority));
+			return output;
+		} finally {
+			try {
+				await this.terminateAgentProcess(child);
+			} finally {
+				capture.dispose();
+				this.commandProbes.delete(child);
+			}
+		}
+	}
 	async admitAndObserveSpawnedProcess(child, process) {
+		await this.admitSpawnedProcess(child, (barrier) => this.attachAgentLifecycleObservers(child, process, barrier), async () => {
+			await this.options.processLifecycle?.onSpawned?.(process);
+		});
+	}
+	async admitSpawnedProcess(child, observe, admit) {
 		let releaseExitNotification = () => {};
-		const exitNotificationBarrier = new Promise((resolve) => {
+		observe(new Promise((resolve) => {
 			releaseExitNotification = resolve;
-		});
-		this.attachAgentLifecycleObservers(child, process, exitNotificationBarrier);
+		}));
 		try {
-			await this.options.processLifecycle?.onSpawned?.(process);
+			await admit();
 		} catch (error) {
 			await this.terminateAgentProcess(child);
 			throw error;
@@ -2786,7 +2787,7 @@ var AcpClient = class {
 		await this.captureAgentDescendants(params.child);
 		const normalizedError = error instanceof AcpMessageLimitError ? error : await this.normalizeInitializeError(error, params.child, params.startupStderr);
 		await this.terminateAgentProcess(params.child);
-		if (params.launch.geminiAcp && error instanceof TimeoutError) throw new GeminiAcpStartupTimeoutError(await buildGeminiAcpStartupTimeoutMessage(params.launch.spawnCommand), {
+		if (params.launch.geminiAcp && error instanceof TimeoutError) throw new GeminiAcpStartupTimeoutError(await buildGeminiAcpStartupTimeoutMessage(params.launch.spawnCommand, params.launch.commandContext), {
 			cause: error,
 			retryable: true
 		});
@@ -2896,7 +2897,6 @@ var AcpClient = class {
 	async prompt(sessionId, prompt, onRequestWritten, onElicitation, onPermissionRequest, authority) {
 		const connection = this.getConnection();
 		const normalizedPrompt = this.normalizePromptForAgent(prompt);
-		const restoreConsoleError = this.options.suppressSdkConsoleErrors ? installSdkConsoleErrorSuppression() : void 0;
 		const previousActivePrompt = this.activePrompt;
 		const replacedOwners = this.pendingPromptOwners.filter((owner) => owner.sessionId === sessionId);
 		const activePrompt = this.beginActivePrompt(sessionId, onRequestWritten, onElicitation, onPermissionRequest, authority);
@@ -2914,7 +2914,6 @@ var AcpClient = class {
 			this.throwPromptPermissionFailureIfPresent(sessionId);
 			throw error;
 		} finally {
-			restoreConsoleError?.();
 			this.clearActivePrompt(activePrompt);
 		}
 	}
@@ -3133,18 +3132,15 @@ var AcpClient = class {
 		this.agent = void 0;
 	}
 	async retireNativeResources() {
-		const agent = this.agent;
+		const owned = [...this.commandProbes, ...this.agent ? [this.agent] : []];
 		const failures = [];
 		try {
 			await this.terminalManager.shutdown();
 		} catch (error) {
 			failures.push(error);
 		}
-		try {
-			if (agent) await this.terminateAgentProcess(agent);
-		} catch (error) {
-			failures.push(error);
-		}
+		const retired = await Promise.allSettled(owned.map((child) => this.terminateAgentProcess(child)));
+		for (const result of retired) if (result.status === "rejected") failures.push(result.reason);
 		try {
 			this.closeConnection();
 		} finally {
@@ -3170,6 +3166,11 @@ var AcpClient = class {
 		if (descendants && !await descendants.capture()) this.log("could not verify agent descendants; skipping unverified process cleanup");
 	}
 	terminateAgentProcess(child) {
+		if (child.pid === void 0) {
+			this.agentDescendants.get(child)?.retire();
+			this.detachAgentHandles(child, true);
+			return Promise.resolve();
+		}
 		let cleanup = this.agentCleanups.get(child);
 		if (!cleanup) {
 			cleanup = Promise.resolve().then(() => this.cleanupAgentProcess(child));
@@ -3179,12 +3180,12 @@ var AcpClient = class {
 	}
 	async cleanupAgentProcess(child) {
 		const descendants = this.agentDescendants.get(child);
-		const deadline = Date.now() + AGENT_CLEANUP_BUDGET_MS;
+		const deadline = performance.now() + AGENT_CLEANUP_BUDGET_MS;
 		const stdinCloseGraceMs = resolveAgentCloseAfterStdinEndMs(this.options.agentCommand);
 		try {
-			if (descendants) await descendants.capture(Math.max(1, deadline - Date.now()));
+			if (descendants) await descendants.capture(Math.max(1, deadline - performance.now()));
 			this.endAgentStdin(child);
-			await waitForChildExit(child, Math.min(stdinCloseGraceMs, Math.max(0, deadline - Date.now())));
+			await waitForChildExit(child, Math.min(stdinCloseGraceMs, Math.max(0, deadline - performance.now())));
 			if (!await this.signalAgentAndDescendants(child, "SIGTERM", AGENT_CLOSE_TERM_GRACE_MS, deadline)) {
 				this.log("agent processes did not exit after SIGTERM; forcing SIGKILL");
 				await this.signalAgentAndDescendants(child, "SIGKILL", AGENT_CLOSE_KILL_GRACE_MS, deadline);
@@ -3195,18 +3196,18 @@ var AcpClient = class {
 		}
 	}
 	endAgentStdin(child) {
-		if (child.stdin.destroyed) return;
+		if (!child.stdin || child.stdin.destroyed) return;
 		try {
 			child.stdin.end();
 		} catch {}
 	}
 	async signalAgentAndDescendants(child, signal, waitMs, deadline) {
 		const descendants = this.agentDescendants.get(child);
-		if (descendants && Date.now() < deadline) await descendants.signal(signal, deadline - Date.now());
+		if (descendants && performance.now() < deadline) await descendants.signal(signal, deadline - performance.now());
 		if (isChildProcessRunning(child)) try {
 			child.kill(signal);
 		} catch {}
-		const remaining = Math.min(waitMs, Math.max(0, deadline - Date.now()));
+		const remaining = Math.min(waitMs, Math.max(0, deadline - performance.now()));
 		const [exited, descendantsExited] = await Promise.all([waitForChildExit(child, remaining), descendants ? descendants.waitForExit(remaining) : Promise.resolve(true)]);
 		return exited && descendantsExited;
 	}
@@ -3516,19 +3517,10 @@ var AcpClient = class {
 		return cancelledPermissionResponse();
 	}
 	attachAgentLifecycleObservers(child, startedProcess, exitNotificationBarrier) {
-		const onExit = (exitCode, signal) => {
-			const exitedAt = isoNow$2();
+		this.attachProcessExitObserver(child, startedProcess, exitNotificationBarrier, (exitCode, signal) => {
 			this.handleAgentDisconnect(child, "process_exit", exitCode, signal);
 			this.terminateAgentProcess(child);
-			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.handleAgentDisconnect(child, "process_close", exitCode, signal);
 		});
@@ -3536,6 +3528,18 @@ var AcpClient = class {
 			this.handleAgentDisconnect(child, "pipe_close", child.exitCode ?? null, child.signalCode ?? null);
 		});
 	}
+	attachProcessExitObserver(child, started, barrier, onProcessExit) {
+		const onExit = (exitCode, signal) => {
+			const exitedAt = isoNow$2();
+			onProcessExit?.(exitCode, signal);
+			barrier.then(() => this.notifyProcessExit(started, exitCode, signal, exitedAt));
+		};
+		child.once("exit", onExit);
+		if (child.exitCode !== null || child.signalCode !== null) {
+			child.off("exit", onExit);
+			onExit(child.exitCode, child.signalCode);
+		}
+	}
 	handleAgentDisconnect(child, reason, exitCode, signal) {
 		this.recordAgentExit(child, reason, exitCode, signal);
 		if (this.agent !== child || this.closing || !this.connection) return;
@@ -4353,6 +4357,11 @@ function mergeSessionOptions(preferred, fallback) {
 	assignDefinedOption(merged, "env", mergeEnvRecords(fallback?.env, preferred?.env));
 	return Object.keys(merged).length > 0 ? merged : void 0;
 }
+function normalizeSessionOptionShape(options) {
+	const normalized = mergeSessionOptions(options, void 0);
+	if (normalized?.env !== void 0 && Object.keys(normalized.env).length === 0) delete normalized.env;
+	return normalized && Object.keys(normalized).length > 0 ? normalized : void 0;
+}
 function mergeEnvRecords(fallback, preferred) {
 	if (!fallback && !preferred) return;
 	return {
@@ -6964,10 +6973,11 @@ var QueueTaskOutputFormatter = class {
 		this.send = task.send;
 	}
 	setContext(_context) {}
-	onAcpMessage(message) {
+	onAcpMessage(message, direction) {
 		this.send({
 			type: "event",
 			requestId: this.requestId,
+			...direction === void 0 ? {} : { direction },
 			message
 		});
 	}
@@ -7024,7 +7034,7 @@ var AcpErrorTracker = class {
 		this.outbound.length = 0;
 	}
 	observe(output, direction, message) {
-		output.onAcpMessage(message);
+		output.onAcpMessage(message, direction);
 		const acp = extractAcpError(message);
 		if (!acp) return;
 		if (direction === "inbound") {
@@ -7852,6 +7862,9 @@ async function runOnce(options, control) {
 		try {
 			await closeOwnedClient();
 		} finally {
+			try {
+				options.onPermissionStats?.(client.getPermissionStats());
+			} catch {}
 			output.flush();
 		}
 	}
@@ -8291,6 +8304,6 @@ async function sendSession(options) {
 }
 const queueOwnerRuntimeTestInternals = { queueOwnerExitIsFatal };
 //#endregion
-export { getAcpxVersion as $, applyInitialModelSelection as A, cloneSessionAcpxState as B, setSessionModeOnOwner as C, connectAndLoadSession as D, withConnectedSession as E, sessionOptionsFromRecord as F, recordSessionUpdate as G, createSessionConversation as H, applyConversation as I, AcpClient as J, trimConversationForRuntime as K, applyLifecycleSnapshotToRecord as L, applyRequestedModelIfAdvertised as M, setDesiredModeId as N, applyConfigOptionSelection as O, persistSessionOptions as P, isRequestedModelUnsupportedError as Q, createInitialSessionRecord as R, setSessionMode as S, setSessionModelOnOwner as T, recordClientOperation as U, cloneSessionConversation as V, recordPromptSubmission as W, REQUESTED_MODEL_UNSUPPORTED_REASONS as X, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as Y, RequestedModelUnsupportedError as Z, cancelSessionPrompt as _, runQueuedTask as a, InterruptedError as at, setSessionConfigOption as b, LiveSessionCheckpoint as c, withInterrupt as ct, flushPerfMetricsCapture as d, normalizeOutputError as dt, permissionModeSatisfies as et, installPerfMetricsCapture as f, listAgentSessions as g, ensureSession as h, runOnce as i, isLegacyZedCodexAcpInvocation as it, applyModelSelection as j, applyConfigOptionsToRecord as k, runPromptTurn as l, withTimeout as lt, createSessionWithClient as m, runSessionQueueOwner as n, normalizeQueueOwnerTtlMs as nt, sendSessionDirect as o, TimeoutError as ot, createSession as p, advertisedModelState as q, sendSession as r, listSessionEvents as rt, DISCARD_OUTPUT_FORMATTER as s, assertControlAuthority as st, queueOwnerRuntimeTestInternals as t, DEFAULT_QUEUE_OWNER_TTL_MS as tt, buildQueueOwnerArgOverride as u, exitCodeForOutputErrorCode as ut, closeSession as v, setSessionModel as w, setSessionConfigOptionOnOwner as x, sessionControlTestInternals as y, reconcileAgentSessionId as z };
+export { isRequestedModelUnsupportedError as $, applyInitialModelSelection as A, reconcileAgentSessionId as B, setSessionModeOnOwner as C, connectAndLoadSession as D, withConnectedSession as E, persistSessionOptions as F, recordPromptSubmission as G, cloneSessionConversation as H, sessionOptionsFromRecord as I, advertisedModelState as J, recordSessionUpdate as K, applyConversation as L, applyRequestedModelIfAdvertised as M, setDesiredModeId as N, applyConfigOptionSelection as O, normalizeSessionOptionShape as P, RequestedModelUnsupportedError as Q, applyLifecycleSnapshotToRecord as R, setSessionMode as S, setSessionModelOnOwner as T, createSessionConversation as U, cloneSessionAcpxState as V, recordClientOperation as W, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as X, AcpClient as Y, REQUESTED_MODEL_UNSUPPORTED_REASONS as Z, cancelSessionPrompt as _, runQueuedTask as a, isLegacyZedCodexAcpInvocation as at, setSessionConfigOption as b, LiveSessionCheckpoint as c, assertControlAuthority as ct, flushPerfMetricsCapture as d, exitCodeForOutputErrorCode as dt, getAcpxVersion as et, installPerfMetricsCapture as f, normalizeOutputError as ft, listAgentSessions as g, ensureSession as h, runOnce as i, listSessionEvents as it, applyModelSelection as j, applyConfigOptionsToRecord as k, runPromptTurn as l, withInterrupt as lt, createSessionWithClient as m, runSessionQueueOwner as n, DEFAULT_QUEUE_OWNER_TTL_MS as nt, sendSessionDirect as o, InterruptedError as ot, createSession as p, trimConversationForRuntime as q, sendSession as r, normalizeQueueOwnerTtlMs as rt, DISCARD_OUTPUT_FORMATTER as s, TimeoutError as st, queueOwnerRuntimeTestInternals as t, permissionModeSatisfies as tt, buildQueueOwnerArgOverride as u, withTimeout as ut, closeSession as v, setSessionModel as w, setSessionConfigOptionOnOwner as x, sessionControlTestInternals as y, createInitialSessionRecord as z };
 
-//# sourceMappingURL=queue-owner-runtime-CLwjMYNL.js.map
+//# sourceMappingURL=queue-owner-runtime-C4OOosbo.js.map