acpx 0.17.0 → 0.17.1

package/dist/{queue-owner-runtime--IbbndGz.js → queue-owner-runtime-Dgv3e2Tp.js}

@@ -1,5 +1,5 @@
-import { $ as startPerfTimer, At as AgentSpawnError, B as extractAgentSessionId, Bt as SessionModeReplayError, C as textPrompt, Ct as OUTPUT_ERROR_ORIGINS, E as findGitRepositoryRoot, F as resolveSessionRecord, Ft as GeminiAcpStartupTimeoutError, H as SESSION_JOURNAL_SCHEMA, I as writeSessionRecord, It as PermissionDeniedError, J as incrementPerfCounter, K as formatPerfMetric, Lt as PermissionPromptUnavailableError, M as normalizeName, Mt as AuthPolicyError, Nt as ClaudeAcpSessionCreateTimeoutError, O as findSessionByDirectoryWalk, Ot as AcpxOperationalError, Pt as CopilotAcpUnsupportedError, Q as setPerfGauge, Rt as QueueConnectionError, S as promptToDisplayText, St as OUTPUT_ERROR_CODES, T as absolutePath, U as SessionJournalReader, Ut as SessionResumeRequiredError, V as normalizeAgentSessionId, Vt as SessionModelReplayError, Wt as UnsupportedPromptContentError, X as recordPerfDuration, Y as measurePerf, Z as resetPerfMetrics, _ as waitMs$1, _t as formatUnknownErrorMessage, a as trySetModelOnRunningOwner, bt as EXIT_CODES, c as queueRequestExceedsLimit, ct as defaultSessionEventLog, dt as sessionEventLockPath, f as refreshQueueOwnerLease, ft as sessionEventSegmentPath, g as tryAcquireQueueOwnerLease, gt as extractAcpError, h as terminateQueueOwnerForSession, ht as isProcessAlive, i as trySetModeOnRunningOwner, jt as AgentStartupError, k as isoNow$1, kt as AgentDisconnectedError, l as parseQueueRequest, lt as sessionBaseDir, m as terminateProcess, n as tryCloseSessionOnRunningOwner, nt as isAcpMessageObject, o as trySubmitToRunningOwner, p as releaseQueueOwnerLease, q as getPerfMetricsSnapshot, r as trySetConfigOptionOnRunningOwner, rt as isSessionUpdateNotification, s as queueRequestByteLimit, t as tryCancelOnRunningOwner, tt as isAcpJsonRpcMessage, ut as sessionEventActivePath, vt as isAcpResourceNotFoundError, y as getUnsupportedPromptContentMessage, zt as SessionConfigOptionReplayError } from "./ipc-D3akHMEq.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-DU6mhZBL.js";
+import { $ as startPerfTimer, At as AgentSpawnError, B as extractAgentSessionId, Bt as SessionModeReplayError, C as textPrompt, Ct as OUTPUT_ERROR_ORIGINS, E as findGitRepositoryRoot, F as resolveSessionRecord, Ft as GeminiAcpStartupTimeoutError, H as SESSION_JOURNAL_SCHEMA, I as writeSessionRecord, It as PermissionDeniedError, J as incrementPerfCounter, K as formatPerfMetric, Lt as PermissionPromptUnavailableError, M as normalizeName, Mt as AuthPolicyError, Nt as ClaudeAcpSessionCreateTimeoutError, O as findSessionByDirectoryWalk, Ot as AcpxOperationalError, Pt as CopilotAcpUnsupportedError, Q as setPerfGauge, Rt as QueueConnectionError, S as promptToDisplayText, St as OUTPUT_ERROR_CODES, T as absolutePath, U as SessionJournalReader, Ut as SessionResumeRequiredError, V as normalizeAgentSessionId, Vt as SessionModelReplayError, Wt as UnsupportedPromptContentError, X as recordPerfDuration, Y as measurePerf, Z as resetPerfMetrics, _ as waitMs$1, _t as formatUnknownErrorMessage, a as trySetModelOnRunningOwner, bt as EXIT_CODES, c as queueRequestExceedsLimit, ct as defaultSessionEventLog, dt as sessionEventLockPath, f as refreshQueueOwnerLease, ft as sessionEventSegmentPath, g as tryAcquireQueueOwnerLease, gt as extractAcpError, h as terminateQueueOwnerForSession, ht as isProcessAlive, i as trySetModeOnRunningOwner, jt as AgentStartupError, k as isoNow$1, kt as AgentDisconnectedError, l as parseQueueRequest, lt as sessionBaseDir, m as terminateProcess, n as tryCloseSessionOnRunningOwner, nt as isAcpMessageObject, o as trySubmitToRunningOwner, p as releaseQueueOwnerLease, q as getPerfMetricsSnapshot, r as trySetConfigOptionOnRunningOwner, rt as isSessionUpdateNotification, s as queueRequestByteLimit, t as tryCancelOnRunningOwner, tt as isAcpJsonRpcMessage, ut as sessionEventActivePath, vt as isAcpResourceNotFoundError, y as getUnsupportedPromptContentMessage, zt as SessionConfigOptionReplayError } from "./ipc-D2rstexT.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-evUoJINz.js";
 import fs, { readFileSync, realpathSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
@@ -1571,6 +1571,7 @@ function observeAcpStream(base, options) {
 			const activePrompt = promptOwner ? options.bindPromptOwner(promptOwner) : void 0;
 			const id = responseId(message);
 			if (!(id !== void 0 && elicitationRequestIds.delete(id))) options.onMessage("outbound", message);
+			if (activePrompt) options.assertPromptActive(activePrompt);
 			const writer = base.writable.getWriter();
 			try {
 				await writer.write(message);
@@ -2361,6 +2362,7 @@ var AcpClient = class {
 	cancellingSessionIds = /* @__PURE__ */ new Set();
 	permissionAbortControllers = /* @__PURE__ */ new Map();
 	closing = false;
+	closeEpoch = 0;
 	agentStartedAt;
 	lastAgentExit;
 	lastKnownPid;
@@ -2457,8 +2459,11 @@ var AcpClient = class {
 		this.filesystem.updatePermissionPolicy(this.options.permissionMode, this.options.nonInteractivePermissions);
 		this.terminalManager.updatePermissionPolicy(this.options.permissionMode, this.options.nonInteractivePermissions);
 	}
+	hasLiveConnection() {
+		return this.connection != null && !this.connection.signal.aborted && this.agent != null && isChildProcessRunning(this.agent);
+	}
 	hasReusableSession(sessionId) {
-		return this.connection != null && this.agent != null && isChildProcessRunning(this.agent) && this.loadedSessionId === sessionId;
+		return this.hasLiveConnection() && this.loadedSessionId === sessionId;
 	}
 	hasActivePrompt(sessionId) {
 		if (!this.activePrompt) return false;
@@ -2475,18 +2480,21 @@ var AcpClient = class {
 		active.elicitationController.abort();
 	}
 	async start() {
-		if (this.connection && this.agent && isChildProcessRunning(this.agent)) return;
+		if (this.hasLiveConnection()) return;
 		if (this.connection || this.agent) await this.close();
+		const epoch = this.closeEpoch;
 		const maxMessageBytes = readMaxAcpMessageBytes();
 		const launch = await this.resolveAgentLaunchPlan();
 		this.logAgentLaunch(launch);
 		await this.ensureLaunchSupport(launch);
 		const { child, process: startedProcess } = await this.spawnAgentProcess(launch);
-		this.agent = child;
-		this.closing = false;
-		this.agentStartedAt = startedProcess.startedAt;
-		this.lastAgentExit = void 0;
-		this.lastKnownPid = startedProcess.pid;
+		if (this.closeEpoch === epoch) {
+			this.agent = child;
+			this.closing = false;
+			this.agentStartedAt = startedProcess.startedAt;
+			this.lastAgentExit = void 0;
+			this.lastKnownPid = startedProcess.pid;
+		}
 		const startupStderr = [];
 		child.stderr.on("data", (chunk) => {
 			this.captureStartupStderr(startupStderr, chunk);
@@ -2502,6 +2510,7 @@ var AcpClient = class {
 			startupFailure.dispose();
 			throw error;
 		}
+		await this.stopIfClosedDuringLaunch(epoch, child, startupFailure);
 		const input = Writable.toWeb(child.stdin);
 		const output = Readable.toWeb(child.stdout);
 		let connection;
@@ -2509,7 +2518,13 @@ var AcpClient = class {
 			this.rejectPendingConnectionRequests(error);
 			connection?.close(error);
 		}));
-		connection = this.createConnection(stream, launch);
+		const capabilities = resolveClientCapabilities({
+			devinAcp: launch.devinAcp,
+			fs: this.options.fs !== false,
+			terminal: this.options.terminal !== false,
+			elicitationModes: this.options.elicitationModes
+		});
+		connection = this.createConnection(stream, launch, capabilities);
 		connection.signal.addEventListener("abort", () => {
 			this.recordAgentExit(child, "connection_close", child.exitCode ?? null, child.signalCode ?? null);
 		}, { once: true });
@@ -2518,7 +2533,8 @@ var AcpClient = class {
 			connection,
 			startupFailure,
 			startupStderr,
-			launch
+			launch,
+			capabilities
 		});
 	}
 	async resolveAgentLaunchPlan() {
@@ -2615,18 +2631,21 @@ var AcpClient = class {
 			releaseExitNotification();
 		}
 	}
-	createConnection(stream, launch) {
+	createConnection(stream, launch, capabilities) {
 		const app = client({ name: "acpx" }).onNotification(methods.client.session.update, async ({ params }) => {
 			await this.handleSessionUpdate(params);
 		}).onNotification(methods.client.elicitation.complete, async () => {}).onRequest(methods.client.session.requestPermission, async ({ params }) => {
 			return await this.handlePermissionRequest(params);
 		}).onRequest(methods.client.elicitation.create, async ({ params, requestId, signal }) => {
 			return await this.handleElicitationRequest(params, requestId, signal);
-		}).onRequest(methods.client.fs.readTextFile, async ({ params }) => {
+		});
+		if (capabilities.fs?.readTextFile) app.onRequest(methods.client.fs.readTextFile, async ({ params }) => {
 			return await this.handleReadTextFile(params);
-		}).onRequest(methods.client.fs.writeTextFile, async ({ params }) => {
+		});
+		if (capabilities.fs?.writeTextFile) app.onRequest(methods.client.fs.writeTextFile, async ({ params }) => {
 			return await this.handleWriteTextFile(params);
-		}).onRequest(methods.client.terminal.create, async ({ params }) => {
+		});
+		if (capabilities.terminal) app.onRequest(methods.client.terminal.create, async ({ params }) => {
 			return await this.handleCreateTerminal(params);
 		}).onRequest(methods.client.terminal.output, async ({ params }) => {
 			return await this.terminalManager.terminalOutput(params);
@@ -2644,7 +2663,7 @@ var AcpClient = class {
 	}
 	async initializeAgentConnection(params) {
 		try {
-			const initResult = await Promise.race([this.initializeProtocolConnection(params.connection, params.launch), params.startupFailure.promise]);
+			const initResult = await Promise.race([this.initializeProtocolConnection(params.connection, params.launch, params.capabilities), params.startupFailure.promise]);
 			params.startupFailure.dispose();
 			this.connection = params.connection;
 			this.initResult = initResult;
@@ -2655,15 +2674,10 @@ var AcpClient = class {
 			await this.handleInitializeFailure(params, error);
 		}
 	}
-	async initializeProtocolConnection(connection, launch) {
+	async initializeProtocolConnection(connection, launch, capabilities) {
 		const initializePromise = connection.agent.request(methods.agent.initialize, {
 			protocolVersion: PROTOCOL_VERSION,
-			clientCapabilities: resolveClientCapabilities({
-				devinAcp: launch.devinAcp,
-				fs: this.options.fs !== false,
-				terminal: this.options.terminal !== false,
-				elicitationModes: this.options.elicitationModes ?? []
-			}),
+			clientCapabilities: capabilities,
 			clientInfo: resolveClientInfo(launch.devinAcp)
 		});
 		const initialized = launch.geminiAcp ? await withTimeout(initializePromise, resolveGeminiAcpStartupTimeoutMs()) : await initializePromise;
@@ -2689,6 +2703,7 @@ var AcpClient = class {
 			},
 			suppressReplaySessionUpdates: () => this.suppressReplaySessionUpdateMessages,
 			bindPromptOwner: (owner) => this.bindPromptOwner(owner),
+			assertPromptActive: (active) => this.assertPromptActive(active),
 			onPromptRequestWritten: (active, owner) => this.onPromptRequestWritten(active, owner)
 		});
 	}
@@ -2781,28 +2796,22 @@ var AcpClient = class {
 		this.suppressSessionUpdates = previous.suppressSessionUpdates;
 		this.suppressReplaySessionUpdateMessages = previous.suppressReplaySessionUpdateMessages;
 	}
-	async prompt(sessionId, prompt, onRequestWritten, onElicitation, onPermissionRequest) {
+	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 activePrompt = this.beginActivePrompt(sessionId, onRequestWritten, onElicitation, onPermissionRequest);
-		let promptPromise;
+		const activePrompt = this.beginActivePrompt(sessionId, onRequestWritten, onElicitation, onPermissionRequest, authority);
 		try {
-			promptPromise = this.runConnectionRequest(() => connection.agent.request(methods.agent.session.prompt, {
+			const promptPromise = this.runConnectionRequest(() => connection.agent.request(methods.agent.session.prompt, {
 				sessionId,
 				prompt: normalizedPrompt
-			}));
-		} catch (error) {
-			this.clearActivePrompt(activePrompt);
-			restoreConsoleError?.();
-			throw error;
-		}
-		activePrompt.promise = promptPromise;
-		try {
+			}), authority);
+			activePrompt.promise = promptPromise;
 			previousActivePrompt?.elicitationController?.abort();
 			return this.returnPromptResponseOrPermissionFailure(sessionId, await promptPromise);
 		} catch (error) {
+			if (activePrompt.admissionFailure) throw activePrompt.admissionFailure.error;
 			this.throwPromptPermissionFailureIfPresent(sessionId);
 			throw error;
 		} finally {
@@ -2810,11 +2819,12 @@ var AcpClient = class {
 			this.clearActivePrompt(activePrompt);
 		}
 	}
-	beginActivePrompt(sessionId, onRequestWritten, elicitationHandler, permissionHandler) {
+	beginActivePrompt(sessionId, onRequestWritten, elicitationHandler, permissionHandler, authority) {
 		this.cancellingSessionIds.delete(sessionId);
 		const active = {
 			sessionId,
 			onRequestWritten,
+			authority,
 			elicitationHandler,
 			permissionHandler,
 			elicitationController: new AbortController()
@@ -2830,6 +2840,14 @@ var AcpClient = class {
 		if (active) active.requestId = owner.requestId;
 		return active;
 	}
+	assertPromptActive(active) {
+		try {
+			assertControlAuthority(active.authority);
+		} catch (error) {
+			active.admissionFailure = { error };
+			throw error;
+		}
+	}
 	onPromptRequestWritten(active, owner) {
 		if (active.requestId !== owner.requestId || active.sessionId !== owner.sessionId) return;
 		try {
@@ -3002,6 +3020,7 @@ var AcpClient = class {
 	}
 	async close() {
 		this.closing = true;
+		this.closeEpoch += 1;
 		this.abortActiveElicitation();
 		await this.terminalManager.shutdown();
 		const agent = this.agent;
@@ -3026,6 +3045,12 @@ var AcpClient = class {
 		this.connection = void 0;
 		this.agent = void 0;
 	}
+	async stopIfClosedDuringLaunch(epoch, child, startupFailure) {
+		if (this.closeEpoch === epoch) return;
+		startupFailure.dispose();
+		await this.terminateAgentProcess(child);
+		throw new Error("ACP client was closed while the agent was starting");
+	}
 	abortActiveElicitation() {
 		this.activePrompt?.elicitationController?.abort();
 	}
@@ -3232,6 +3257,7 @@ var AcpClient = class {
 	}
 	async handlePermissionRequest(params) {
 		if (this.cancellingSessionIds.has(params.sessionId)) return cancelledPermissionResponse();
+		if (this.initResult?.agentInfo?.name === "antigravity-acp" && params.toolCall.toolCallId.startsWith("interaction_")) return this.handleModePermissionError(params.sessionId, new PermissionPromptUnavailableError("Antigravity requested a user answer. acpx cannot answer Antigravity interaction questions; continue in an interactive client.")).response;
 		const hostResponse = await this.tryHandlePermissionRequestWithHost(params);
 		if (hostResponse) return hostResponse;
 		const { response, recorded } = await this.resolvePermissionRequestFromMode(params);
@@ -6210,7 +6236,7 @@ function abortTimedOutRequests(error, client, sessionId) {
 async function runPromptTurn(params) {
 	let settledResponse;
 	try {
-		const promptPromise = params.client.prompt(params.sessionId, params.prompt, params.onPromptRequestWritten, params.onElicitation, params.onPermissionRequest);
+		const promptPromise = params.client.prompt(params.sessionId, params.prompt, params.onPromptRequestWritten, params.onElicitation, params.onPermissionRequest, params.authority);
 		promptPromise.then((response) => {
 			settledResponse = response;
 		}, () => {});
@@ -7536,4 +7562,4 @@ const queueOwnerRuntimeTestInternals = { queueOwnerExitIsFatal };
 //#endregion
 export { normalizeQueueOwnerTtlMs as $, setDesiredModeId as A, recordClientOperation as B, withConnectedSession as C, applyInitialModelSelection as D, applyConfigOptionsToRecord as E, createInitialSessionRecord as F, AcpClient as G, recordSessionUpdate as H, reconcileAgentSessionId as I, RequestedModelUnsupportedError as J, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as K, cloneSessionAcpxState as L, sessionOptionsFromRecord as M, applyConversation as N, applyModelSelection as O, applyLifecycleSnapshotToRecord as P, DEFAULT_QUEUE_OWNER_TTL_MS as Q, cloneSessionConversation as R, setSessionModel as S, applyConfigOptionSelection as T, trimConversationForRuntime as U, recordPromptSubmission as V, advertisedModelState as W, getAcpxVersion as X, isRequestedModelUnsupportedError as Y, permissionModeSatisfies as Z, cancelSessionPrompt as _, runQueuedTask as a, withInterrupt as at, setSessionConfigOption as b, LiveSessionCheckpoint as c, normalizeOutputError as ct, flushPerfMetricsCapture as d, listSessionEvents as et, installPerfMetricsCapture as f, listAgentSessions as g, ensureSession as h, runOnce as i, assertControlAuthority as it, persistSessionOptions as j, applyRequestedModelIfAdvertised as k, runPromptTurn as l, createSessionWithClient as m, runSessionQueueOwner as n, InterruptedError as nt, sendSessionDirect as o, withTimeout as ot, createSession as p, REQUESTED_MODEL_UNSUPPORTED_REASONS as q, sendSession as r, TimeoutError as rt, DISCARD_OUTPUT_FORMATTER as s, exitCodeForOutputErrorCode as st, queueOwnerRuntimeTestInternals as t, isLegacyZedCodexAcpInvocation as tt, buildQueueOwnerArgOverride as u, closeSession as v, connectAndLoadSession as w, setSessionMode as x, sessionControlTestInternals as y, createSessionConversation as z };
 
-//# sourceMappingURL=queue-owner-runtime--IbbndGz.js.map
+//# sourceMappingURL=queue-owner-runtime-Dgv3e2Tp.js.map