acpx 0.11.0 → 0.11.2

package/dist/flows.d.ts

@@ -1,4 +1,4 @@
-import { c as NonInteractivePermissionPolicy, l as PermissionMode, o as AuthPolicy, p as PromptInput, s as McpServer$1, t as SessionAgentOptions, u as PermissionPolicy } from "./session-options-Co1oGEK8.js";
+import { c as NonInteractivePermissionPolicy, l as PermissionMode, o as AuthPolicy, p as PromptInput, s as McpServer$1, t as SessionAgentOptions, u as PermissionPolicy } from "./session-options-jkYbBxGE.js";
 import { SetSessionConfigOptionResponse } from "@agentclientprotocol/sdk";
 
 //#region src/flows/types.d.ts

package/dist/flows.js

@@ -1,2 +1,2 @@
-import { a as parseStrictJsonObject, d as checkpoint, f as compute, i as parseJsonObject, l as acp, m as shell, n as decisionEdge, o as FlowRunner, p as defineFlow, r as extractJsonObject, s as flowRunsBaseDir, t as decision, u as action } from "./flows-BabqiU0u.js";
+import { a as parseStrictJsonObject, d as checkpoint, f as compute, i as parseJsonObject, l as acp, m as shell, n as decisionEdge, o as FlowRunner, p as defineFlow, r as extractJsonObject, s as flowRunsBaseDir, t as decision, u as action } from "./flows-7OHjgEgq.js";
 export { FlowRunner, acp, action, checkpoint, compute, decision, decisionEdge, defineFlow, extractJsonObject, flowRunsBaseDir, parseJsonObject, parseStrictJsonObject, shell };

package/dist/{live-checkpoint-BZrk9Mjz.js → live-checkpoint-mdAaF3qJ.js}

@@ -222,7 +222,7 @@ const OUTPUT_ERROR_ORIGINS = [
 const SESSION_RECORD_SCHEMA = "acpx.session.v1";
 //#endregion
 //#region src/acp/error-shapes.ts
-const RESOURCE_NOT_FOUND_ACP_CODES = new Set([-32001, -32002]);
+const RESOURCE_NOT_FOUND_ACP_CODES = /* @__PURE__ */ new Set([-32001, -32002]);
 function asRecord$8(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
@@ -295,7 +295,7 @@ function isAcpResourceNotFoundError(error) {
 }
 //#endregion
 //#region src/acp/error-normalization.ts
-const AUTH_REQUIRED_ACP_CODES = new Set([-32e3]);
+const AUTH_REQUIRED_ACP_CODES = /* @__PURE__ */ new Set([-32e3]);
 const QUERY_CLOSED_BEFORE_RESPONSE_DETAIL = "query closed before response received";
 function asRecord$7(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
@@ -835,6 +835,9 @@ function asRecord$5(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
 	return value;
 }
+function isAcpMessageObject(value) {
+	return asRecord$5(value) !== null;
+}
 function hasValidId(value) {
 	return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
 }
@@ -1263,6 +1266,7 @@ function assignParsedSessionOptions(state, raw) {
 	assignSessionOptionAllowedTools(parsedSessionOptions, sessionOptions.allowed_tools);
 	assignSessionOptionMaxTurns(parsedSessionOptions, sessionOptions.max_turns);
 	assignSessionOptionSystemPrompt(parsedSessionOptions, sessionOptions.system_prompt);
+	assignSessionOptionEnv(parsedSessionOptions, sessionOptions.env);
 	if (Object.keys(parsedSessionOptions).length > 0) state.session_options = parsedSessionOptions;
 }
 function assignSessionOptionModel(options, value) {
@@ -1282,6 +1286,15 @@ function assignSessionOptionSystemPrompt(options, value) {
 	const appendRecord = asRecord$4(value);
 	if (appendRecord && typeof appendRecord.append === "string" && appendRecord.append.length > 0) options.system_prompt = { append: appendRecord.append };
 }
+function assignSessionOptionEnv(options, value) {
+	const env = asRecord$4(value);
+	if (!env) return;
+	const parsed = Object.fromEntries(Object.entries(env).filter((entry) => {
+		const [, raw] = entry;
+		return typeof raw === "string";
+	}));
+	if (Object.keys(parsed).length > 0) options.env = parsed;
+}
 function parseEventLog(raw, sessionId) {
 	const record = asRecord$4(raw);
 	if (!record || !hasValidEventLogCore(record)) return defaultSessionEventLog(sessionId);
@@ -1506,7 +1519,7 @@ function formatPerfMetric(name, durationMsValue) {
 //#endregion
 //#region src/persisted-key-policy.ts
 const SNAKE_CASE_KEY = /^[a-z][a-z0-9_]*$/;
-const ZED_TAG_KEYS = new Set([
+const ZED_TAG_KEYS = /* @__PURE__ */ new Set([
 	"User",
 	"Agent",
 	"Resume",
@@ -1518,8 +1531,8 @@ const ZED_TAG_KEYS = new Set([
 	"RedactedThinking",
 	"ToolUse"
 ]);
-const MAP_OBJECT_PATHS = new Set(["request_token_usage", "messages.Agent.tool_results"]);
-const OPAQUE_VALUE_PATHS = new Set([
+const MAP_OBJECT_PATHS = /* @__PURE__ */ new Set(["request_token_usage", "messages.Agent.tool_results"]);
+const OPAQUE_VALUE_PATHS = /* @__PURE__ */ new Set([
 	"agent_capabilities",
 	"messages.Agent.content.ToolUse.input",
 	"acpx.desired_config_options",
@@ -1724,7 +1737,7 @@ async function writeSessionRecord(record) {
 		const entries = index.entries.filter((entry) => entry.file !== fileName);
 		entries.push(toSessionIndexEntry(record, fileName));
 		await writeSessionIndex(sessionDir, {
-			files: [...new Set([...index.files.filter((entry) => entry !== fileName), fileName])],
+			files: [.../* @__PURE__ */ new Set([...index.files.filter((entry) => entry !== fileName), fileName])],
 			entries
 		});
 	});
@@ -2338,11 +2351,42 @@ function findExistingCommandInDirectory(directory, candidates) {
 	if (trimmedDirectory.length === 0) return;
 	return candidates.map((candidate) => path.join(trimmedDirectory, candidate)).find((resolved) => fs.existsSync(resolved));
 }
+function resolveWindowsWrapperToken(token, wrapperPath) {
+	const relative = token.match(/%~?dp0%?\s*[\\/]*(.*)$/i)?.[1]?.trim();
+	if (!relative) return;
+	const candidate = path.resolve(path.dirname(wrapperPath), relative.replace(/[\\/]+/g, path.sep).replace(/^[\\/]+/, ""));
+	return path.extname(candidate).toLowerCase() === ".exe" && fs.existsSync(candidate) ? candidate : void 0;
+}
+function resolveWindowsWrapperExecutable(wrapperPath) {
+	if (!fs.existsSync(wrapperPath)) return;
+	try {
+		return [...fs.readFileSync(wrapperPath, "utf8").matchAll(/"([^"\r\n]*)"/g)].map((match) => resolveWindowsWrapperToken(match[1] ?? "", wrapperPath)).find((candidate) => candidate !== void 0);
+	} catch {
+		return;
+	}
+}
 function resolveWindowsCommand(command, env = process.env) {
 	const candidates = commandCandidates(command, env);
 	if (commandHasPath(command)) return candidates.find((candidate) => fs.existsSync(candidate));
 	return resolveWindowsPathCommand(command, env);
 }
+/**
+* Resolve a Windows command to a native executable suitable for direct spawn.
+*
+* Batch and PowerShell shims are intentionally rejected unless they point at a
+* real `.exe` entrypoint. Callers that need shell execution should use the
+* command-specific shell policy instead.
+*/
+function resolveWindowsExecutablePath(command, env = process.env) {
+	const resolved = resolveWindowsCommand(command, env);
+	if (!resolved) return;
+	const absolute = path.resolve(resolved);
+	const extension = path.extname(absolute).toLowerCase();
+	if (extension === ".exe") return absolute;
+	if (extension !== ".cmd" && extension !== ".bat" && extension !== ".ps1") return;
+	const siblingExecutable = `${absolute.slice(0, -extension.length)}.exe`;
+	return fs.existsSync(siblingExecutable) ? siblingExecutable : resolveWindowsWrapperExecutable(absolute);
+}
 function shouldUseWindowsBatchShell(command, platform = process.platform, env = process.env) {
 	if (platform !== "win32") return false;
 	const resolvedCommand = resolveWindowsCommand(command, env) ?? command;
@@ -2477,22 +2521,29 @@ function splitCommandLine(value) {
 	let current = "";
 	let quote = null;
 	let escaping = false;
+	let hasPart = false;
 	for (const ch of value) {
 		const next = readCommandLineChar({
 			ch,
 			current,
 			quote,
 			escaping,
-			parts
+			parts,
+			hasPart
 		});
 		current = next.current;
 		quote = next.quote;
 		escaping = next.escaping;
+		hasPart = next.hasPart;
+	}
+	if (escaping) {
+		current += "\\";
+		hasPart = true;
 	}
-	if (escaping) current += "\\";
 	if (quote) throw new Error("Invalid --agent command: unterminated quote");
-	if (current.length > 0) parts.push(current);
+	if (hasPart) parts.push(current);
 	if (parts.length === 0) throw new Error("Invalid --agent command: empty command");
+	if (parts[0] === "") throw new Error("Invalid --agent command: empty command");
 	return {
 		command: parts[0],
 		args: parts.slice(1)
@@ -2502,17 +2553,20 @@ function readCommandLineChar(state) {
 	if (state.escaping) return {
 		current: state.current + state.ch,
 		quote: state.quote,
-		escaping: false
+		escaping: false,
+		hasPart: true
 	};
 	if (state.ch === "\\" && state.quote !== "'") return {
 		current: state.current,
 		quote: state.quote,
-		escaping: true
+		escaping: true,
+		hasPart: state.hasPart
 	};
 	if (state.quote) return readQuotedCommandLineChar({
 		ch: state.ch,
 		current: state.current,
-		quote: state.quote
+		quote: state.quote,
+		hasPart: state.hasPart
 	});
 	return readUnquotedCommandLineChar(state);
 }
@@ -2520,36 +2574,41 @@ function readQuotedCommandLineChar(state) {
 	if (state.ch === state.quote) return {
 		current: state.current,
 		quote: null,
-		escaping: false
+		escaping: false,
+		hasPart: true
 	};
 	return {
 		current: state.current + state.ch,
 		quote: state.quote,
-		escaping: false
+		escaping: false,
+		hasPart: true
 	};
 }
 function readUnquotedCommandLineChar(state) {
 	if (state.ch === "'" || state.ch === "\"") return {
 		current: state.current,
 		quote: state.ch,
-		escaping: false
+		escaping: false,
+		hasPart: true
 	};
 	if (/\s/.test(state.ch)) {
-		flushCommandLinePart(state.parts, state.current);
+		flushCommandLinePart(state.parts, state.current, state.hasPart);
 		return {
 			current: "",
 			quote: null,
-			escaping: false
+			escaping: false,
+			hasPart: false
 		};
 	}
 	return {
 		current: state.current + state.ch,
 		quote: null,
-		escaping: false
+		escaping: false,
+		hasPart: true
 	};
 }
-function flushCommandLinePart(parts, current) {
-	if (current.length > 0) parts.push(current);
+function flushCommandLinePart(parts, current, hasPart) {
+	if (hasPart) parts.push(current);
 }
 function asAbsoluteCwd(cwd) {
 	return path.resolve(cwd);
@@ -2600,7 +2659,7 @@ const GEMINI_ACP_FLAG_VERSION = [
 ];
 const COPILOT_HELP_TIMEOUT_MS = 2e3;
 const CLAUDE_CODE_DEFAULT_SETTING_SOURCES = ["project", "local"];
-const QODER_BENIGN_STDOUT_LINES = new Set(["Received interrupt signal. Cleaning up resources...", "Cleanup completed. Exiting..."]);
+const QODER_BENIGN_STDOUT_LINES = /* @__PURE__ */ new Set(["Received interrupt signal. Cleaning up resources...", "Cleanup completed. Exiting..."]);
 function resolveAgentCloseAfterStdinEndMs(agentCommand) {
 	const { command } = splitCommandLine(agentCommand);
 	return basenameToken(command) === "qodercli" ? QODER_AGENT_CLOSE_AFTER_STDIN_END_MS : DEFAULT_AGENT_CLOSE_AFTER_STDIN_END_MS;
@@ -2622,6 +2681,10 @@ function isCopilotAcpCommand(command, args) {
 function isQoderAcpCommand(command, args) {
 	return basenameToken(command) === "qodercli" && args.includes("--acp");
 }
+function isCursorAcpCommand(command, args) {
+	const commandToken = basenameToken(command);
+	return commandToken === "cursor-agent" || commandToken === "agent" && args.includes("acp");
+}
 function isDevinAcpCommand(command, args) {
 	return basenameToken(command) === "devin" && (args.includes("acp") || args.includes("--acp") || args.includes("--experimental-acp"));
 }
@@ -2797,9 +2860,7 @@ function isAppendSystemPrompt(value) {
 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);
+	return resolveWindowsExecutablePath("claude", env);
 }
 //#endregion
 //#region src/acp/auth-env.ts
@@ -2825,22 +2886,58 @@ function readEnvCredential(methodId) {
 	const value = process.env[key];
 	if (typeof value === "string" && value.trim().length > 0) return value;
 }
+function protectedEnvKey(key) {
+	return process.platform === "win32" ? key.toUpperCase() : key;
+}
+function isAuthEnvKey(key) {
+	return protectedEnvKey(key).startsWith(AUTH_ENV_PREFIX);
+}
+function authEnvSuffix(key) {
+	return key.slice(10);
+}
+function protectEnvKey(protectedKeys, key) {
+	protectedKeys.add(protectedEnvKey(key));
+}
 function promotePrefixedAuthEnvironment(env) {
+	const protectedKeys = /* @__PURE__ */ new Set();
 	for (const [key, value] of Object.entries(env)) {
-		if (!key.startsWith(AUTH_ENV_PREFIX)) continue;
+		if (!isAuthEnvKey(key)) continue;
 		if (typeof value !== "string" || value.trim().length === 0) continue;
-		const normalized = key.slice(10);
-		if (!normalized || env[normalized] != null) continue;
-		env[normalized] = value;
+		const normalized = toEnvToken(authEnvSuffix(key));
+		if (!normalized) continue;
+		protectEnvKey(protectedKeys, key);
+		protectEnvKey(protectedKeys, normalized);
+		if (env[normalized] == null) env[normalized] = value;
 	}
+	return protectedKeys;
 }
-function buildAgentEnvironment(authCredentials) {
+function buildAgentEnvironment(authCredentials, sessionEnv) {
 	const env = { ...process.env };
-	promotePrefixedAuthEnvironment(env);
-	if (!authCredentials) return env;
-	for (const [methodId, credential] of Object.entries(authCredentials)) assignAuthCredentialEnv(env, methodId, credential);
+	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)) {
+		if (typeof value !== "string" || protectedAuthEnvKeys.has(protectedEnvKey(key))) continue;
+		assignSessionEnv(env, key, value);
+	}
 	return env;
 }
+function assignSessionEnv(env, key, value) {
+	const normalizedKey = protectedEnvKey(key);
+	for (const existingKey of Object.keys(env)) if (protectedEnvKey(existingKey) === normalizedKey) delete env[existingKey];
+	env[key] = value;
+}
+function addAuthCredentialEnvKeys(protectedKeys, methodId, credential) {
+	if (typeof credential !== "string" || credential.trim().length === 0) return;
+	if (!methodId.includes("=") && !methodId.includes("\0")) protectEnvKey(protectedKeys, methodId);
+	const normalized = toEnvToken(methodId);
+	if (normalized) {
+		protectEnvKey(protectedKeys, `${AUTH_ENV_PREFIX}${normalized}`);
+		protectEnvKey(protectedKeys, normalized);
+	}
+}
 function assignAuthCredentialEnv(env, methodId, credential) {
 	if (typeof credential !== "string" || credential.trim().length === 0) return;
 	if (!methodId.includes("=") && !methodId.includes("\0") && env[methodId] == null) env[methodId] = credential;
@@ -2857,10 +2954,10 @@ function resolveConfiguredAuthCredential(methodId, authCredentials) {
 	const configCredentials = authCredentials ?? {};
 	return configCredentials[methodId] ?? configCredentials[toEnvToken(methodId)];
 }
-function buildAgentSpawnOptions(cwd, authCredentials) {
+function buildAgentSpawnOptions(cwd, authCredentials, sessionEnv) {
 	return {
 		cwd,
-		env: buildAgentEnvironment(authCredentials),
+		env: buildAgentEnvironment(authCredentials, sessionEnv),
 		stdio: [
 			"pipe",
 			"pipe",
@@ -2871,12 +2968,26 @@ function buildAgentSpawnOptions(cwd, authCredentials) {
 }
 //#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"];
 var RequestedModelUnsupportedError = class extends Error {
-	constructor(message) {
+	code = REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE;
+	reason;
+	constructor(message, reason) {
 		super(message);
 		this.name = "RequestedModelUnsupportedError";
+		this.reason = reason;
 	}
 };
+function isRequestedModelUnsupportedReason(value) {
+	return typeof value === "string" && REQUESTED_MODEL_UNSUPPORTED_REASONS.includes(value);
+}
+function isRequestedModelUnsupportedError(value) {
+	if (value instanceof RequestedModelUnsupportedError) return true;
+	if (!value || typeof value !== "object") return false;
+	const candidate = value;
+	return candidate.name === "RequestedModelUnsupportedError" && candidate.code === "ACP_MODEL_UNSUPPORTED" && isRequestedModelUnsupportedReason(candidate.reason);
+}
 function supportsLegacyClaudeCodeModelMetadata(agentCommand) {
 	if (!agentCommand) return false;
 	const { command, args } = splitCommandLine(agentCommand);
@@ -2951,19 +3062,32 @@ 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 resolveRequestedModelId(params) {
+	if (!params.models || !isCursorAcpCommandForModelAlias(params.agentCommand)) return params.requestedModel;
+	if (params.models.availableModels.some((model) => model.modelId === params.requestedModel)) return params.requestedModel;
+	const candidates = params.models.availableModels.map((model) => model.modelId).filter((modelId) => modelId.startsWith(`${params.requestedModel}[`));
+	return candidates.length === 1 ? candidates[0] : params.requestedModel;
+}
+function isCursorAcpCommandForModelAlias(agentCommand) {
+	if (!agentCommand) return false;
+	const { command, args } = splitCommandLine(agentCommand);
+	return isCursorAcpCommand(command, args);
+}
 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 through a session config option or legacy models metadata, and the adapter does not support a startup model flag.`);
+		throw new RequestedModelUnsupportedError(`Cannot ${params.context === "replay" ? "replay saved model" : "apply --model"} "${params.requestedModel}": the ACP agent did not advertise model support through a session config option or legacy models metadata, and the adapter does not support a startup model flag.`, "missing-capability");
 	}
 	if (!new Set(params.models.availableModels.map((model) => model.modelId)).has(params.requestedModel)) {
+		const resolvedModel = resolveRequestedModelId(params);
+		if (resolvedModel !== params.requestedModel) return `Cursor ACP advertised "${resolvedModel}" for requested model "${params.requestedModel}"; using the advertised id.`;
 		if (supportsLegacyClaudeCodeModelMetadata(params.agentCommand)) return `requested model "${params.requestedModel}" was not in the Claude ACP advertised model list (${formatAvailableModelIds(params.models)}); forwarding it to Claude Code so the adapter can accept or reject it.`;
-		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)}.`);
+		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)}.`, "unadvertised-model");
 	}
 }
 //#endregion
 //#region src/acp/session-control-errors.ts
-const SESSION_CONTROL_UNSUPPORTED_ACP_CODES = new Set([-32601, -32602]);
+const SESSION_CONTROL_UNSUPPORTED_ACP_CODES = /* @__PURE__ */ new Set([-32601, -32602]);
 function asRecord$1(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
@@ -3653,12 +3777,16 @@ function enqueueNdJsonLine(agentCommand, line, controller) {
 	const trimmedLine = line.trim();
 	if (!trimmedLine || shouldIgnoreNonJsonAgentOutputLine(agentCommand, trimmedLine)) return;
 	try {
-		const message = JSON.parse(trimmedLine);
-		controller.enqueue(message);
+		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);
 }
@@ -3865,7 +3993,7 @@ var AcpClient = class {
 			geminiAcp: isGeminiAcpCommand(spawnCommand, args),
 			copilotAcp: isCopilotAcpCommand(spawnCommand, args),
 			claudeAcp: isClaudeAcpCommand(spawnCommand, args),
-			spawnOptions: buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials)
+			spawnOptions: buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials, this.options.sessionOptions?.env)
 		};
 	}
 	logAgentLaunch(plan) {
@@ -3908,7 +4036,9 @@ var AcpClient = class {
 			},
 			extMethod: async (method) => {
 				if (launch.devinAcp && isDevinRequestDiagnosticsMethod(method)) return {};
-				throw RequestError.methodNotFound(method);
+				const error = RequestError.methodNotFound(method);
+				if (!this.options.suppressSdkConsoleErrors) console.error(error.message);
+				throw error;
 			},
 			readTextFile: async (params) => {
 				return this.handleReadTextFile(params);
@@ -4164,8 +4294,13 @@ var AcpClient = class {
 	}
 	async setSessionModel(sessionId, modelId, controlOverride) {
 		const control = this.resolveModelControl(sessionId, controlOverride);
-		if (!control) throw new RequestedModelUnsupportedError(`Cannot set model "${modelId}": the ACP session did not advertise a model config option or legacy session/set_model support.`);
-		return control.kind === "config_option" ? await this.setSessionModelThroughConfig(sessionId, modelId, control.configId) : await this.setSessionModelThroughLegacyMethod(sessionId, modelId);
+		if (!control) throw new RequestedModelUnsupportedError(`Cannot set model "${modelId}": the ACP session did not advertise a model config option or legacy session/set_model support.`, "missing-capability");
+		const resolvedModelId = resolveRequestedModelId({
+			requestedModel: modelId,
+			models: controlOverride?.availableModels ? { availableModels: controlOverride.availableModels } : void 0,
+			agentCommand: this.options.agentCommand
+		});
+		return control.kind === "config_option" ? await this.setSessionModelThroughConfig(sessionId, resolvedModelId, control.configId) : await this.setSessionModelThroughLegacyMethod(sessionId, resolvedModelId);
 	}
 	async setSessionModelThroughConfig(sessionId, modelId, configId) {
 		const connection = this.getConnection();
@@ -4715,8 +4850,16 @@ function mergeSessionOptions(preferred, fallback) {
 	assignDefinedOption(merged, "allowedTools", preferred?.allowedTools);
 	assignDefinedOption(merged, "maxTurns", preferred?.maxTurns);
 	assignDefinedOption(merged, "systemPrompt", preferred?.systemPrompt);
+	assignDefinedOption(merged, "env", mergeEnvRecords(fallback?.env, preferred?.env));
 	return Object.keys(merged).length > 0 ? merged : void 0;
 }
+function mergeEnvRecords(fallback, preferred) {
+	if (!fallback && !preferred) return;
+	return {
+		...fallback,
+		...preferred
+	};
+}
 function assignDefinedOption(target, key, value) {
 	if (value !== void 0) target[key] = value;
 }
@@ -4740,6 +4883,7 @@ function sessionOptionsFromRecord(record) {
 	assignStoredOption(sessionOptions, "allowedTools", storedAllowedTools(stored.allowed_tools));
 	assignStoredOption(sessionOptions, "maxTurns", storedMaxTurns(stored.max_turns));
 	assignStoredOption(sessionOptions, "systemPrompt", storedSystemPromptOption(stored.system_prompt));
+	assignStoredOption(sessionOptions, "env", storedEnvRecord(stored.env));
 	return Object.keys(sessionOptions).length > 0 ? sessionOptions : void 0;
 }
 function persistedSessionOptions(options) {
@@ -4747,12 +4891,23 @@ function persistedSessionOptions(options) {
 		model: nonEmptyString(options.model),
 		allowed_tools: Array.isArray(options.allowedTools) ? [...options.allowedTools] : void 0,
 		max_turns: typeof options.maxTurns === "number" ? options.maxTurns : void 0,
-		system_prompt: normalizeSystemPromptOption(options.systemPrompt)
+		system_prompt: normalizeSystemPromptOption(options.systemPrompt),
+		env: storedEnvRecord(options.env)
 	};
 	return hasPersistedSessionOptions(next) ? next : void 0;
 }
 function hasPersistedSessionOptions(options) {
-	return options.model !== void 0 || options.allowed_tools !== void 0 || options.max_turns !== void 0 || options.system_prompt !== void 0;
+	return options.model !== void 0 || options.allowed_tools !== void 0 || options.max_turns !== void 0 || options.system_prompt !== void 0 || options.env !== void 0;
+}
+function storedEnvRecord(value) {
+	if (value === null || typeof value !== "object" || Array.isArray(value)) return;
+	const entries = Object.entries(value);
+	const result = {};
+	for (const [key, raw] of entries) {
+		if (typeof raw !== "string") continue;
+		result[key] = raw;
+	}
+	return Object.keys(result).length > 0 ? result : void 0;
 }
 function normalizeSystemPromptOption(value) {
 	const prompt = nonEmptyString(value);
@@ -5074,30 +5229,35 @@ function numberField(source, keys) {
 		if (typeof value === "number" && Number.isFinite(value) && value >= 0) return value;
 	}
 }
-function usageToTokenUsage(update) {
-	const updateRecord = asRecord(update);
-	const usageMeta = asRecord(updateRecord?._meta)?.usage;
-	const source = asRecord(usageMeta) ?? updateRecord;
-	if (!source) return;
+function sourceToTokenUsage(source) {
+	const usageRecord = asRecord(source);
+	if (!usageRecord) return;
 	const normalized = {
-		input_tokens: numberField(source, ["input_tokens", "inputTokens"]),
-		output_tokens: numberField(source, ["output_tokens", "outputTokens"]),
-		cache_creation_input_tokens: numberField(source, [
+		input_tokens: numberField(usageRecord, ["input_tokens", "inputTokens"]),
+		output_tokens: numberField(usageRecord, ["output_tokens", "outputTokens"]),
+		cache_creation_input_tokens: numberField(usageRecord, [
 			"cache_creation_input_tokens",
 			"cacheCreationInputTokens",
 			"cachedWriteTokens"
 		]),
-		cache_read_input_tokens: numberField(source, [
+		cache_read_input_tokens: numberField(usageRecord, [
 			"cache_read_input_tokens",
 			"cacheReadInputTokens",
 			"cachedReadTokens"
 		]),
-		thought_tokens: numberField(source, ["thought_tokens", "thoughtTokens"]),
-		total_tokens: numberField(source, ["total_tokens", "totalTokens"])
+		thought_tokens: numberField(usageRecord, ["thought_tokens", "thoughtTokens"]),
+		total_tokens: numberField(usageRecord, ["total_tokens", "totalTokens"])
 	};
 	if (!hasTokenUsageValue(normalized)) return;
 	return normalized;
 }
+function usageToTokenUsage(update) {
+	const updateRecord = asRecord(update);
+	const usageMeta = asRecord(updateRecord?._meta)?.usage;
+	const source = asRecord(usageMeta) ?? updateRecord;
+	if (!source) return;
+	return sourceToTokenUsage(source);
+}
 function hasTokenUsageValue(usage) {
 	return Object.values(usage).some((value) => value !== void 0);
 }
@@ -5169,7 +5329,8 @@ function cloneSessionOptions(options) {
 		model: options.model,
 		allowed_tools: options.allowed_tools ? [...options.allowed_tools] : void 0,
 		max_turns: options.max_turns,
-		...options.system_prompt !== void 0 ? { system_prompt: cloneSystemPromptOption(options.system_prompt) } : {}
+		...options.system_prompt !== void 0 ? { system_prompt: cloneSystemPromptOption(options.system_prompt) } : {},
+		...options.env !== void 0 ? { env: { ...options.env } } : {}
 	};
 }
 function cloneSystemPromptOption(option) {
@@ -5212,6 +5373,14 @@ function recordSessionUpdate(conversation, state, notification, timestamp = isoN
 	trimConversationForRuntime(conversation);
 	return acpx;
 }
+function recordPromptResponseUsage(conversation, usage, promptMessageId, timestamp = isoNow()) {
+	const tokenUsage = sourceToTokenUsage(usage);
+	if (!tokenUsage) return false;
+	applyTokenUsage(conversation, tokenUsage, promptMessageId);
+	updateConversationTimestamp(conversation, timestamp);
+	trimConversationForRuntime(conversation);
+	return true;
+}
 function applySessionUpdate(conversation, acpx, update) {
 	const handler = SESSION_UPDATE_HANDLERS[update.sessionUpdate];
 	handler?.(conversation, acpx, update);
@@ -5264,13 +5433,14 @@ function applyUsageUpdate(conversation, update) {
 	const usage = usageToTokenUsage(update);
 	const cost = usageCost(update);
 	if (!usage && !cost) return;
-	if (usage) {
-		conversation.cumulative_token_usage = usage;
-		const userId = lastUserMessageId(conversation);
-		if (userId) conversation.request_token_usage[userId] = usage;
-	}
+	if (usage) applyTokenUsage(conversation, usage);
 	if (cost) conversation.cumulative_cost = cost;
 }
+function applyTokenUsage(conversation, usage, promptMessageId) {
+	conversation.cumulative_token_usage = usage;
+	const userId = promptMessageId ?? lastUserMessageId(conversation);
+	if (userId) conversation.request_token_usage[userId] = usage;
+}
 function applySessionInfoUpdate(conversation, update) {
 	if (hasOwn(update, "title")) conversation.title = update.title ?? null;
 	if (hasOwn(update, "updatedAt")) conversation.updated_at = update.updatedAt ?? conversation.updated_at;
@@ -5380,13 +5550,16 @@ function clearDesiredConfigOption(state, configId) {
 function getDesiredModelId(state) {
 	return normalizeModelId(state?.session_options?.model);
 }
+function hasStoredSessionOptions(options) {
+	return typeof options.model === "string" || Array.isArray(options.allowed_tools) || typeof options.max_turns === "number" || options.system_prompt !== void 0 || options.env !== void 0;
+}
 function setDesiredModelId(record, modelId, modelConfigId) {
 	const acpx = ensureAcpxState(record.acpx);
 	const normalized = normalizeModelId(modelId);
 	const sessionOptions = { ...acpx.session_options };
 	if (normalized) sessionOptions.model = normalized;
 	else delete sessionOptions.model;
-	if (typeof sessionOptions.model === "string" || Array.isArray(sessionOptions.allowed_tools) || typeof sessionOptions.max_turns === "number" || sessionOptions.system_prompt !== void 0) acpx.session_options = sessionOptions;
+	if (hasStoredSessionOptions(sessionOptions)) acpx.session_options = sessionOptions;
 	else delete acpx.session_options;
 	clearDesiredConfigOption(acpx, modelConfigId ?? modelStateFromConfigOptions(acpx.config_options)?.configId);
 	record.acpx = acpx;
@@ -5437,7 +5610,7 @@ function isProcessAlive(pid) {
 		return false;
 	}
 }
-const SESSION_LOAD_UNSUPPORTED_CODES = new Set([-32601, -32602]);
+const SESSION_LOAD_UNSUPPORTED_CODES = /* @__PURE__ */ new Set([-32601, -32602]);
 function shouldFallbackToNewSession(error, record) {
 	if (isHardReconnectFailure(error)) return false;
 	const acp = extractAcpError(error);
@@ -5879,6 +6052,7 @@ async function runPromptTurn(params) {
 			idleMs: SESSION_REPLY_IDLE_MS,
 			timeoutMs: SESSION_REPLY_DRAIN_TIMEOUT_MS
 		}).catch(() => {});
+		recordPromptResponseUsage(params.conversation, response.usage, params.promptMessageId);
 		return {
 			stopReason: response.stopReason,
 			source: "rpc"
@@ -5950,6 +6124,6 @@ var LiveSessionCheckpoint = class {
 	}
 };
 //#endregion
-export { setPerfGauge as $, assertRequestedModelSupported as A, isRetryablePromptError as At, listSessions as B, OUTPUT_FORMATS as Bt, mergeSessionOptions as C, withTimeout as Ct, applyLifecycleSnapshotToRecord as D, resolveAgentCommand as Dt, applyConversation as E, normalizeAgentName$1 as Et, absolutePath as F, AUTH_POLICIES as Ft, writeSessionRecord as G, AgentSpawnError as Gt, normalizeName as H, PERMISSION_POLICY_ACTIONS as Ht, findGitRepositoryRoot as I, EXIT_CODES as It, getPerfMetricsSnapshot as J, assertPersistedKeyPolicy as K, QueueConnectionError as Kt, findSession as L, NON_INTERACTIVE_PERMISSION_POLICIES as Lt, getAcpxVersion as M, extractAcpError as Mt, permissionModeSatisfies as N, isAcpResourceNotFoundError as Nt, reconcileAgentSessionId as O, exitCodeForOutputErrorCode as Ot, DEFAULT_HISTORY_LIMIT as P, toAcpErrorPayload as Pt, resetPerfMetrics as Q, findSessionByDirectoryWalk as R, OUTPUT_ERROR_CODES as Rt, advertisedModelState as S, withInterrupt as St, sessionOptionsFromRecord as T, listBuiltInAgents as Tt, pruneSessions as U, SESSION_RECORD_SCHEMA as Ut, listSessionsForAgent as V, PERMISSION_MODES as Vt, resolveSessionRecord as W, AcpxOperationalError as Wt, measurePerf as X, incrementPerfCounter as Y, recordPerfDuration as Z, createSessionConversation as _, parsePromptSource as _t, applyRequestedModelIfAdvertised as a, defaultSessionEventLog as at, recordSessionUpdate as b, InterruptedError as bt, setCurrentModelId as c, sessionEventLockPath as ct, setDesiredModelId as d, isAcpJsonRpcMessage as dt, startPerfTimer as et, syncAdvertisedModelState as f, parseJsonRpcErrorMessage as ft, cloneSessionConversation as g, mergePromptSourceWithText as gt, cloneSessionAcpxState as h, isPromptInput as ht, connectAndLoadSession as i, DEFAULT_EVENT_SEGMENT_MAX_BYTES as it, modelStateFromConfigOptions as j, normalizeOutputError as jt, AcpClient as k, formatErrorMessage as kt, setDesiredConfigOption as l, sessionEventSegmentPath as lt, applyConfigOptionsToState as m, PromptInputValidationError as mt, runPromptTurn as n, serializeSessionRecordForDisk as nt, currentModelIdFromSetModelResponse as o, sessionBaseDir$1 as ot, applyConfigOptionsToRecord as p, parsePromptStopReason as pt, formatPerfMetric as q, QueueProtocolError as qt, withConnectedSession as r, normalizeRuntimeSessionId as rt, clearDesiredConfigOption as s, sessionEventActivePath as st, LiveSessionCheckpoint as t, parseSessionRecord as tt, setDesiredModeId as u, extractSessionUpdateNotification as ut, recordClientOperation as v, promptToDisplayText as vt, persistSessionOptions as w, DEFAULT_AGENT_NAME as wt, trimConversationForRuntime as x, TimeoutError as xt, recordPromptSubmission as y, textPrompt as yt, isoNow$2 as z, OUTPUT_ERROR_ORIGINS as zt };
+export { getPerfMetricsSnapshot as $, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as A, listBuiltInAgents as At, absolutePath as B, AUTH_POLICIES as Bt, mergeSessionOptions as C, promptToDisplayText as Ct, applyLifecycleSnapshotToRecord as D, withInterrupt as Dt, applyConversation as E, TimeoutError as Et, modelStateFromConfigOptions as F, isRetryablePromptError as Ft, listSessions as G, OUTPUT_FORMATS as Gt, findSession as H, NON_INTERACTIVE_PERMISSION_POLICIES as Ht, splitCommandLine as I, normalizeOutputError as It, pruneSessions as J, SESSION_RECORD_SCHEMA as Jt, listSessionsForAgent as K, PERMISSION_MODES as Kt, getAcpxVersion as L, extractAcpError as Lt, RequestedModelUnsupportedError as M, resolveAgentCommand as Mt, assertRequestedModelSupported as N, exitCodeForOutputErrorCode as Nt, reconcileAgentSessionId as O, withTimeout as Ot, isRequestedModelUnsupportedError as P, formatErrorMessage as Pt, formatPerfMetric as Q, QueueProtocolError as Qt, permissionModeSatisfies as R, isAcpResourceNotFoundError as Rt, advertisedModelState as S, parsePromptSource as St, sessionOptionsFromRecord as T, InterruptedError as Tt, findSessionByDirectoryWalk as U, OUTPUT_ERROR_CODES as Ut, findGitRepositoryRoot as V, EXIT_CODES as Vt, isoNow$2 as W, OUTPUT_ERROR_ORIGINS as Wt, writeSessionRecord as X, AgentSpawnError as Xt, resolveSessionRecord as Y, AcpxOperationalError as Yt, assertPersistedKeyPolicy as Z, QueueConnectionError as Zt, createSessionConversation as _, parseJsonRpcErrorMessage as _t, applyRequestedModelIfAdvertised as a, startPerfTimer as at, recordSessionUpdate as b, isPromptInput as bt, setCurrentModelId as c, normalizeRuntimeSessionId as ct, setDesiredModelId as d, sessionBaseDir$1 as dt, incrementPerfCounter as et, syncAdvertisedModelState as f, sessionEventActivePath as ft, cloneSessionConversation as g, isAcpJsonRpcMessage as gt, cloneSessionAcpxState as h, extractSessionUpdateNotification as ht, connectAndLoadSession as i, setPerfGauge as it, REQUESTED_MODEL_UNSUPPORTED_REASONS as j, normalizeAgentName$1 as jt, AcpClient as k, DEFAULT_AGENT_NAME as kt, setDesiredConfigOption as l, DEFAULT_EVENT_SEGMENT_MAX_BYTES as lt, applyConfigOptionsToState as m, sessionEventSegmentPath as mt, runPromptTurn as n, recordPerfDuration as nt, currentModelIdFromSetModelResponse as o, parseSessionRecord as ot, applyConfigOptionsToRecord as p, sessionEventLockPath as pt, normalizeName as q, PERMISSION_POLICY_ACTIONS as qt, withConnectedSession as r, resetPerfMetrics as rt, clearDesiredConfigOption as s, serializeSessionRecordForDisk as st, LiveSessionCheckpoint as t, measurePerf as tt, setDesiredModeId as u, defaultSessionEventLog as ut, recordClientOperation as v, parsePromptStopReason as vt, persistSessionOptions as w, textPrompt as wt, trimConversationForRuntime as x, mergePromptSourceWithText as xt, recordPromptSubmission as y, PromptInputValidationError as yt, DEFAULT_HISTORY_LIMIT as z, toAcpErrorPayload as zt };
 
-//# sourceMappingURL=live-checkpoint-BZrk9Mjz.js.map
+//# sourceMappingURL=live-checkpoint-mdAaF3qJ.js.map