acpx 0.6.0 → 0.7.0

package/dist/{prompt-turn-BOoZaDEq.js → prompt-turn-CVPMWdj1.js}

@@ -1,4 +1,4 @@
-import { B as PermissionPromptUnavailableError, C as isAcpResourceNotFoundError, F as AuthPolicyError, G as SessionModelReplayError, I as ClaudeAcpSessionCreateTimeoutError, J as SessionResumeRequiredError, K as SessionNotFoundError, L as CopilotAcpUnsupportedError, M as AgentDisconnectedError, N as AgentSpawnError, P as AgentStartupError, R as GeminiAcpStartupTimeoutError, S as extractAcpError, U as SessionConfigOptionReplayError, W as SessionModeReplayError, g as textPrompt, i as measurePerf, j as SESSION_RECORD_SCHEMA, l as extractRuntimeSessionId, q as SessionResolutionError, r as incrementPerfCounter, u as normalizeRuntimeSessionId, v as formatErrorMessage, y as isAcpQueryClosedBeforeResponseError, z as PermissionDeniedError } from "./perf-metrics-DvT_gvUh.js";
+import { B as PermissionDeniedError, C as isAcpResourceNotFoundError, F as AgentStartupError, G as SessionModeReplayError, I as AuthPolicyError, J as SessionResolutionError, K as SessionModelReplayError, L as ClaudeAcpSessionCreateTimeoutError, M as SESSION_RECORD_SCHEMA, N as AgentDisconnectedError, P as AgentSpawnError, R as CopilotAcpUnsupportedError, S as extractAcpError, V as PermissionPromptUnavailableError, W as SessionConfigOptionReplayError, Y as SessionResumeRequiredError, g as textPrompt, i as measurePerf, l as extractRuntimeSessionId, q as SessionNotFoundError, r as incrementPerfCounter, u as normalizeRuntimeSessionId, v as formatErrorMessage, y as isAcpQueryClosedBeforeResponseError, z as GeminiAcpStartupTimeoutError } from "./perf-metrics-C2pXfxvR.js";
 import { r as isSessionUpdateNotification } from "./jsonrpc-DSxh2w5R.js";
 import fs, { statSync } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -1290,9 +1290,10 @@ function isWsl(options) {
 	if ((options.platform ?? process.platform) !== "linux") return false;
 	return (options.existsSync ?? fs.existsSync)("/proc/sys/fs/binfmt_misc/WSLInterop");
 }
+const WINDOWS_EXECUTABLE_EXTENSION_RE = /\.(?:exe|cmd|bat)$/u;
 function isWindowsExecutableCommand(command) {
-	const normalized = command.replace(/\\/g, "/").toLowerCase();
-	return normalized.endsWith(".exe") || normalized.startsWith("/mnt/c/");
+	const normalized = command.toLowerCase();
+	return WINDOWS_EXECUTABLE_EXTENSION_RE.test(normalized);
 }
 async function runWslpath(cwd) {
 	const { stdout } = await execFileAsync("wslpath", ["-w", cwd], { encoding: "utf8" });
@@ -1399,46 +1400,8 @@ function compareVersionParts(left, right) {
 	return 0;
 }
 async function detectGeminiVersion(command) {
-	return await new Promise((resolve) => {
-		const child = spawn(command, ["--version"], 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);
-		}, GEMINI_VERSION_TIMEOUT_MS);
-		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(parseGeminiVersion(`${stdout}\n${stderr}`.split(/\r?\n/).map((line) => line.trim()).find((line) => /\d+\.\d+\.\d+/.test(line))));
-		});
-	});
+	const versionLine = (await readCommandOutput(command, ["--version"], GEMINI_VERSION_TIMEOUT_MS))?.split(/\r?\n/).map((line) => line.trim()).find((line) => /\d+\.\d+\.\d+/.test(line));
+	return parseGeminiVersion(versionLine);
 }
 async function resolveGeminiCommandArgs(command, args) {
 	if (basenameToken(command) !== "gemini" || !args.includes("--acp")) return [...args];
@@ -1528,6 +1491,13 @@ function buildClaudeCodeOptionsMeta(options) {
 	if (Object.keys(meta).length === 0) return;
 	return meta;
 }
+function resolveClaudeCodeExecutable(platform = process.platform, env = process.env) {
+	if (platform !== "win32") return;
+	if (readWindowsEnvValue(env, "CLAUDE_CODE_EXECUTABLE")) return;
+	const resolved = resolveWindowsCommand("claude", env);
+	if (!resolved) return;
+	return path.resolve(resolved);
+}
 //#endregion
 //#region src/acp/auth-env.ts
 const AUTH_ENV_PREFIX = "ACPX_AUTH_";
@@ -2102,7 +2072,15 @@ var AcpClient = class {
 		else this.log(`spawning agent: ${spawnCommand} ${args.join(" ")}`);
 		const geminiAcp = isGeminiAcpCommand(spawnCommand, args);
 		if (isCopilotAcpCommand(spawnCommand, args)) await ensureCopilotAcpSupport(spawnCommand);
-		const spawnedChild = spawn(spawnCommand, args, buildSpawnCommandOptions(spawnCommand, buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials)));
+		const agentSpawnOptions = buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials);
+		if (isClaudeAcpCommand(spawnCommand, args)) {
+			const claudeExe = resolveClaudeCodeExecutable(process.platform, agentSpawnOptions.env);
+			if (claudeExe) {
+				agentSpawnOptions.env.CLAUDE_CODE_EXECUTABLE = claudeExe;
+				this.log(`resolved system Claude Code executable: ${claudeExe}`);
+			}
+		}
+		const spawnedChild = spawn(spawnCommand, args, buildSpawnCommandOptions(spawnCommand, agentSpawnOptions));
 		try {
 			await waitForSpawn$1(spawnedChild);
 		} catch (error) {
@@ -2254,6 +2232,7 @@ var AcpClient = class {
 		return {
 			sessionId: result.sessionId,
 			agentSessionId: extractRuntimeSessionId(result._meta),
+			configOptions: result.configOptions ?? void 0,
 			models: result.models ?? void 0
 		};
 	}
@@ -2283,6 +2262,7 @@ var AcpClient = class {
 		this.loadedSessionId = sessionId;
 		return {
 			agentSessionId: extractRuntimeSessionId(response?._meta),
+			configOptions: response?.configOptions ?? void 0,
 			models: response?.models ?? void 0
 		};
 	}
@@ -2365,7 +2345,7 @@ var AcpClient = class {
 	}
 	async closeSession(sessionId) {
 		const connection = this.getConnection();
-		await this.runConnectionRequest(() => connection.unstable_closeNes({ sessionId }));
+		await this.runConnectionRequest(() => connection.closeSession({ sessionId }));
 		if (this.loadedSessionId === sessionId) this.loadedSessionId = void 0;
 	}
 	async requestCancelActivePrompt() {
@@ -3099,6 +3079,15 @@ function trimConversationForRuntime(conversation) {
 	if (requestUsageEntries.length > MAX_RUNTIME_REQUEST_TOKEN_USAGE) conversation.request_token_usage = Object.fromEntries(requestUsageEntries.slice(-MAX_RUNTIME_REQUEST_TOKEN_USAGE));
 }
 //#endregion
+//#region src/session/config-options.ts
+function applyConfigOptionsToRecord(record, result) {
+	const configOptions = result?.configOptions;
+	if (!configOptions) return;
+	const acpxState = cloneSessionAcpxState(record.acpx) ?? {};
+	acpxState.config_options = structuredClone(configOptions);
+	record.acpx = acpxState;
+}
+//#endregion
 //#region src/session/mode-preference.ts
 function ensureAcpxState(state) {
 	return state ?? {};
@@ -3170,6 +3159,30 @@ function syncAdvertisedModelState(record, models) {
 	record.acpx = acpx;
 }
 //#endregion
+//#region src/acp/model-support.ts
+var RequestedModelUnsupportedError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "RequestedModelUnsupportedError";
+	}
+};
+function supportsLegacyClaudeCodeModelMetadata(agentCommand) {
+	if (!agentCommand) return false;
+	const { command, args } = splitCommandLine(agentCommand);
+	return isClaudeAcpCommand(command, args);
+}
+function formatAvailableModelIds(models) {
+	const ids = models?.availableModels.map((model) => model.modelId.trim()).filter((modelId) => modelId.length > 0) ?? [];
+	return ids.length > 0 ? ids.join(", ") : "none advertised";
+}
+function assertRequestedModelSupported(params) {
+	if (!params.models) {
+		if (supportsLegacyClaudeCodeModelMetadata(params.agentCommand)) return;
+		throw new RequestedModelUnsupportedError(`Cannot ${params.context === "replay" ? "replay saved model" : "apply --model"} "${params.requestedModel}": the ACP agent did not advertise model support. Generic model selection requires ACP models plus session/set_model support, or an adapter-specific startup model flag.`);
+	}
+	if (!new Set(params.models.availableModels.map((model) => model.modelId)).has(params.requestedModel)) throw new RequestedModelUnsupportedError(`Cannot ${params.context === "replay" ? "replay saved model" : "apply --model"} "${params.requestedModel}": the ACP agent did not advertise that model. Available models: ${formatAvailableModelIds(params.models)}.`);
+}
+//#endregion
 //#region src/runtime/engine/lifecycle.ts
 function applyLifecycleSnapshotToRecord(record, snapshot) {
 	if (!snapshot) return;
@@ -3244,9 +3257,15 @@ async function replayDesiredMode(params) {
 	}
 }
 async function replayDesiredModel(params) {
-	if (!params.desiredModelId || !params.models) return;
-	if (params.models.currentModelId === params.desiredModelId) return;
+	if (!params.desiredModelId) return;
 	try {
+		assertRequestedModelSupported({
+			requestedModel: params.desiredModelId,
+			models: params.models,
+			agentCommand: params.record.agentCommand,
+			context: "replay"
+		});
+		if (!params.models || params.models.currentModelId === params.desiredModelId) return;
 		await withTimeout(params.client.setSessionModel(params.sessionId, params.desiredModelId), params.timeoutMs);
 		if (params.verbose) process.stderr.write(`[acpx] replayed desired model ${params.desiredModelId} on fresh ACP session ${params.sessionId} (previous ${params.previousSessionId})\n`);
 	} catch (error) {
@@ -3304,6 +3323,7 @@ async function connectAndLoadSession(options) {
 	else if (client.supportsLoadSession()) try {
 		const loadResult = await withTimeout(client.loadSessionWithOptions(record.acpSessionId, record.cwd, { suppressReplayUpdates: true }), options.timeoutMs);
 		reconcileAgentSessionId(record, loadResult.agentSessionId);
+		applyConfigOptionsToRecord(record, loadResult);
 		sessionModels = loadResult.models;
 		resumed = true;
 	} catch (error) {
@@ -3318,6 +3338,7 @@ async function connectAndLoadSession(options) {
 		sessionId = createdSession.sessionId;
 		createdFreshSession = true;
 		pendingAgentSessionId = createdSession.agentSessionId;
+		applyConfigOptionsToRecord(record, createdSession);
 		sessionModels = createdSession.models;
 	}
 	else {
@@ -3329,6 +3350,7 @@ async function connectAndLoadSession(options) {
 		sessionId = createdSession.sessionId;
 		createdFreshSession = true;
 		pendingAgentSessionId = createdSession.agentSessionId;
+		applyConfigOptionsToRecord(record, createdSession);
 		sessionModels = createdSession.models;
 	}
 	if (createdFreshSession) {
@@ -3346,6 +3368,7 @@ async function connectAndLoadSession(options) {
 				sessionId,
 				desiredModelId,
 				previousSessionId: originalSessionId,
+				record,
 				models: sessionModels,
 				timeoutMs: options.timeoutMs,
 				verbose: options.verbose
@@ -3539,6 +3562,6 @@ async function runPromptTurn(params) {
 	}
 }
 //#endregion
-export { listSessionsForAgent as A, sessionEventLockPath as B, DEFAULT_HISTORY_LIMIT as C, findSessionByDirectoryWalk as D, findSession as E, parseSessionRecord as F, TimeoutError as G, assertPersistedKeyPolicy as H, DEFAULT_EVENT_SEGMENT_MAX_BYTES as I, DEFAULT_AGENT_NAME as J, withInterrupt as K, defaultSessionEventLog as L, pruneSessions as M, resolveSessionRecord as N, isoNow$2 as O, writeSessionRecord as P, sessionBaseDir$1 as R, permissionModeSatisfies as S, findGitRepositoryRoot as T, serializeSessionRecordForDisk as U, sessionEventSegmentPath as V, InterruptedError as W, normalizeAgentName$1 as X, listBuiltInAgents as Y, resolveAgentCommand as Z, recordClientOperation as _, connectAndLoadSession as a, trimConversationForRuntime as b, reconcileAgentSessionId as c, setDesiredModeId as d, setDesiredModelId as f, createSessionConversation as g, cloneSessionConversation as h, sessionOptionsFromRecord as i, normalizeName as j, listSessions as k, setCurrentModelId as l, cloneSessionAcpxState as m, withConnectedSession as n, applyConversation as o, syncAdvertisedModelState as p, withTimeout as q, mergeSessionOptions as r, applyLifecycleSnapshotToRecord as s, runPromptTurn as t, setDesiredConfigOption as u, recordPromptSubmission as v, absolutePath as w, AcpClient as x, recordSessionUpdate as y, sessionEventActivePath as z };
+export { resolveAgentCommand as $, isoNow$2 as A, sessionBaseDir$1 as B, AcpClient as C, findGitRepositoryRoot as D, absolutePath as E, resolveSessionRecord as F, serializeSessionRecordForDisk as G, sessionEventLockPath as H, writeSessionRecord as I, withInterrupt as J, InterruptedError as K, parseSessionRecord as L, listSessionsForAgent as M, normalizeName as N, findSession as O, pruneSessions as P, normalizeAgentName$1 as Q, DEFAULT_EVENT_SEGMENT_MAX_BYTES as R, trimConversationForRuntime as S, DEFAULT_HISTORY_LIMIT as T, sessionEventSegmentPath as U, sessionEventActivePath as V, assertPersistedKeyPolicy as W, DEFAULT_AGENT_NAME as X, withTimeout as Y, listBuiltInAgents as Z, cloneSessionConversation as _, connectAndLoadSession as a, recordPromptSubmission as b, reconcileAgentSessionId as c, setDesiredConfigOption as d, setDesiredModeId as f, cloneSessionAcpxState as g, applyConfigOptionsToRecord as h, sessionOptionsFromRecord as i, listSessions as j, findSessionByDirectoryWalk as k, assertRequestedModelSupported as l, syncAdvertisedModelState as m, withConnectedSession as n, applyConversation as o, setDesiredModelId as p, TimeoutError as q, mergeSessionOptions as r, applyLifecycleSnapshotToRecord as s, runPromptTurn as t, setCurrentModelId as u, createSessionConversation as v, permissionModeSatisfies as w, recordSessionUpdate as x, recordClientOperation as y, defaultSessionEventLog as z };
 
-//# sourceMappingURL=prompt-turn-BOoZaDEq.js.map
+//# sourceMappingURL=prompt-turn-CVPMWdj1.js.map