acpx 0.13.1 → 0.14.0

package/dist/{live-checkpoint-BSIrfgVo.js → live-checkpoint-BW9JivEG.js}

@@ -38,7 +38,12 @@ var SessionResolutionError = class extends AcpxOperationalError {};
 var AgentSpawnError = class extends AcpxOperationalError {
 	agentCommand;
 	constructor(agentCommand, cause) {
-		super(`Failed to spawn agent command: ${agentCommand}`, { cause: cause instanceof Error ? cause : void 0 });
+		const spawnEnoent = (cause instanceof Error ? cause.code : void 0) === "ENOENT";
+		const message = spawnEnoent ? `Failed to spawn agent command: ${agentCommand}. The agent process could not start because a required executable, interpreter, working directory, or other launch path was not found. Check the command, effective PATH, and working directory, or verify the custom agent's configured argv.` : `Failed to spawn agent command: ${agentCommand}`;
+		super(message, {
+			cause: cause instanceof Error ? cause : void 0,
+			...spawnEnoent ? { detailCode: "AGENT_SPAWN_ENOENT" } : {}
+		});
 		this.agentCommand = agentCommand;
 	}
 };
@@ -711,19 +716,17 @@ async function withInterrupt(run, onInterrupt) {
 			process.off("SIGHUP", onSighup);
 			cb();
 		};
-		const rejectInterrupted = () => {
-			onInterrupt().finally(() => {
-				finish(() => reject(new InterruptedError()));
-			});
+		const rejectInterrupted = (signal) => {
+			onInterrupt(signal).then(() => finish(() => reject(new InterruptedError())), (error) => finish(() => reject(error)));
 		};
 		const onSigint = () => {
-			rejectInterrupted();
+			rejectInterrupted("SIGINT");
 		};
 		const onSigterm = () => {
-			rejectInterrupted();
+			rejectInterrupted("SIGTERM");
 		};
 		const onSighup = () => {
-			rejectInterrupted();
+			rejectInterrupted("SIGHUP");
 		};
 		process.once("SIGINT", onSigint);
 		process.once("SIGTERM", onSigterm);
@@ -982,7 +985,7 @@ function parseJsonRpcErrorMessage(message) {
 }
 //#endregion
 //#region src/session/event-log.ts
-const DEFAULT_EVENT_SEGMENT_MAX_BYTES = 64 * 1024 * 1024;
+const DEFAULT_EVENT_SEGMENT_MAX_BYTES = 67108864;
 function sessionBaseDir$1() {
 	return path.join(os.homedir(), ".acpx", "sessions");
 }
@@ -1661,7 +1664,11 @@ const ZED_TAG_KEYS = /* @__PURE__ */ new Set([
 	"RedactedThinking",
 	"ToolUse"
 ]);
-const MAP_OBJECT_PATHS = /* @__PURE__ */ new Set(["request_token_usage", "messages.Agent.tool_results"]);
+const MAP_OBJECT_PATHS = /* @__PURE__ */ new Set([
+	"request_token_usage",
+	"messages.Agent.tool_results",
+	"acpx.session_options.env"
+]);
 const OPAQUE_VALUE_PATHS = /* @__PURE__ */ new Set([
 	"agent_capabilities",
 	"messages.Agent.content.ToolUse.input",
@@ -2068,7 +2075,7 @@ function toWritePreview(content) {
 	const visibleLines = lines.slice(0, WRITE_PREVIEW_MAX_LINES);
 	let preview = visibleLines.join("\n");
 	if (lines.length > visibleLines.length) preview += `\n... (${lines.length - visibleLines.length} more lines)`;
-	if (preview.length > WRITE_PREVIEW_MAX_CHARS) preview = `${preview.slice(0, WRITE_PREVIEW_MAX_CHARS - 3)}...`;
+	if (preview.length > WRITE_PREVIEW_MAX_CHARS) preview = `${preview.slice(0, 1197)}...`;
 	return preview;
 }
 async function defaultConfirmWrite(filePath, preview) {
@@ -2633,6 +2640,9 @@ function getAcpxVersion() {
 	cachedVersion = resolveAcpxVersion();
 	return cachedVersion;
 }
+//#endregion
+//#region src/acp/client-process.ts
+const PROCESS_HELPER_TIMEOUT_MS = 8e3;
 async function runTimedExecFile(command, args, options = {}) {
 	const timeoutMs = Math.max(1, Math.round(options.timeoutMs ?? 8e3));
 	return await new Promise((resolve, reject) => {
@@ -3338,7 +3348,7 @@ function maybeWrapSessionControlError(method, error, context) {
 }
 //#endregion
 //#region src/acp/terminal-manager.ts
-const DEFAULT_TERMINAL_OUTPUT_LIMIT_BYTES = 64 * 1024;
+const DEFAULT_TERMINAL_OUTPUT_LIMIT_BYTES = 65536;
 const DEFAULT_KILL_GRACE_MS = 1500;
 function nowIso() {
 	return (/* @__PURE__ */ new Date()).toISOString();
@@ -3399,6 +3409,7 @@ function waitMs(ms) {
 		setTimeout(resolve, Math.max(0, ms));
 	});
 }
+function onStreamError() {}
 var TerminalManager = class {
 	cwd;
 	permissionMode;
@@ -3464,6 +3475,8 @@ var TerminalManager = class {
 			};
 			proc.stdout.on("data", appendOutput);
 			proc.stderr.on("data", appendOutput);
+			proc.stdout.on("error", onStreamError);
+			proc.stderr.on("error", onStreamError);
 			proc.once("exit", (exitCode, signal) => {
 				terminal.exitCode = exitCode;
 				terminal.signal = signal;
@@ -3638,7 +3651,7 @@ var TerminalManager = class {
 		} catch {
 			return;
 		}
-		await this.waitForCleanupAfterSignal(terminal);
+		await this.waitForFinalCleanup(terminal);
 	}
 	async signalProcess(terminal, signal) {
 		const pid = terminal.process.pid;
@@ -3655,10 +3668,10 @@ var TerminalManager = class {
 	async signalWindowsProcessGroup(terminal, pid, signal) {
 		await this.captureDescendantPids(terminal, pid);
 		if (this.isRunning(terminal)) {
-			await killWindowsProcessTree(pid, signal);
+			await killWindowsProcessTree(pid, signal, terminal.processHelperTimeoutMs);
 			return;
 		}
-		for (const descendantPid of terminal.descendantPids) await killWindowsProcessTree(descendantPid, signal);
+		for (const descendantPid of terminal.descendantPids) await killWindowsProcessTree(descendantPid, signal, terminal.processHelperTimeoutMs);
 	}
 	async signalPosixProcessGroup(terminal, pid, signal) {
 		await this.captureDescendantPids(terminal, pid);
@@ -3672,6 +3685,9 @@ var TerminalManager = class {
 		if (!this.isRunning(terminal)) await terminal.processGroupSnapshotPromise?.catch(() => {});
 		for (const descendantPid of await listDescendantPids(pid, terminal.processHelperTimeoutMs)) terminal.descendantPids.add(descendantPid);
 	}
+	async waitForFinalCleanup(terminal) {
+		if (!await this.waitForCleanupAfterSignal(terminal) && process.platform === "win32") throw new Error("Terminal process cleanup did not finish after SIGKILL");
+	}
 	async waitForCleanupAfterSignal(terminal) {
 		return await Promise.race([this.waitForTerminalAndTrackedDescendants(terminal).then(() => true), waitMs(this.killGraceMs).then(() => false)]);
 	}
@@ -3803,25 +3819,19 @@ async function runWindowsProcessListCommand(timeoutMs) {
 		windowsHide: true
 	});
 }
-async function killWindowsProcessTree(pid, signal) {
+async function killWindowsProcessTree(pid, signal, timeoutMs = PROCESS_HELPER_TIMEOUT_MS) {
 	const args = [
 		"/pid",
 		String(pid),
 		"/t"
 	];
 	if (signal === "SIGKILL") args.push("/f");
-	await new Promise((resolve) => {
-		const child = spawn("taskkill", args, {
-			stdio: [
-				"ignore",
-				"ignore",
-				"ignore"
-			],
+	try {
+		await runTimedExecFile("taskkill", args, {
+			timeoutMs,
 			windowsHide: true
 		});
-		child.once("error", () => resolve());
-		child.once("close", () => resolve());
-	});
+	} catch {}
 }
 function sendSignal(pid, signal) {
 	try {
@@ -4361,9 +4371,8 @@ var AcpClient = class {
 		const onAcpMessage = () => this.eventHandlers.onAcpMessage;
 		const onAcpOutputMessage = () => this.eventHandlers.onAcpOutputMessage;
 		const elicitationRequestIds = /* @__PURE__ */ new Set();
-		const bindPromptOwner = (owner) => {
-			this.bindPromptOwner(owner);
-		};
+		const bindPromptOwner = (owner) => this.bindPromptOwner(owner);
+		const onPromptRequestWritten = (active, owner) => this.onPromptRequestWritten(active, owner);
 		const shouldSuppressInboundReplaySessionUpdate = (message) => {
 			return this.suppressReplaySessionUpdateMessages && isSessionUpdateNotification(message);
 		};
@@ -4397,7 +4406,7 @@ var AcpClient = class {
 			} }),
 			writable: new WritableStream({ async write(message) {
 				const promptOwner = promptRequestOwner(message);
-				if (promptOwner) bindPromptOwner(promptOwner);
+				const activePrompt = promptOwner ? bindPromptOwner(promptOwner) : void 0;
 				const id = responseId(message);
 				if (!(id !== void 0 && elicitationRequestIds.delete(id))) {
 					onAcpOutputMessage()?.("outbound", message);
@@ -4409,6 +4418,7 @@ var AcpClient = class {
 				} finally {
 					writer.releaseLock();
 				}
+				if (activePrompt && promptOwner) onPromptRequestWritten(activePrompt, promptOwner);
 			} })
 		};
 	}
@@ -4498,17 +4508,17 @@ var AcpClient = class {
 		this.suppressSessionUpdates = previous.suppressSessionUpdates;
 		this.suppressReplaySessionUpdateMessages = previous.suppressReplaySessionUpdateMessages;
 	}
-	async prompt(sessionId, prompt, onRequestStarted, onElicitation) {
+	async prompt(sessionId, prompt, onRequestWritten, onElicitation) {
 		const connection = this.getConnection();
 		const normalizedPrompt = this.normalizePromptForAgent(prompt);
 		const restoreConsoleError = this.options.suppressSdkConsoleErrors ? installSdkConsoleErrorSuppression() : void 0;
-		const activePrompt = this.beginActivePrompt(sessionId, onElicitation);
+		const activePrompt = this.beginActivePrompt(sessionId, onRequestWritten, onElicitation);
 		let promptPromise;
 		try {
 			promptPromise = this.runConnectionRequest(() => connection.prompt({
 				sessionId,
 				prompt: normalizedPrompt
-			}), onRequestStarted, () => !connection.signal?.aborted);
+			}));
 		} catch (error) {
 			this.clearActivePrompt(activePrompt);
 			restoreConsoleError?.();
@@ -4528,11 +4538,12 @@ var AcpClient = class {
 			this.promptPermissionFailures.delete(sessionId);
 		}
 	}
-	beginActivePrompt(sessionId, elicitationHandler) {
+	beginActivePrompt(sessionId, onRequestWritten, elicitationHandler) {
 		const previous = this.activePrompt;
 		this.cancellingSessionIds.delete(sessionId);
 		const active = {
 			sessionId,
+			onRequestWritten,
 			elicitationHandler,
 			elicitationController: new AbortController()
 		};
@@ -4546,6 +4557,13 @@ var AcpClient = class {
 			return candidate.requestId === void 0 && candidate.sessionId === owner.sessionId;
 		});
 		if (active) active.requestId = owner.requestId;
+		return active;
+	}
+	onPromptRequestWritten(active, owner) {
+		if (active.requestId !== owner.requestId || active.sessionId !== owner.sessionId) return;
+		try {
+			Promise.resolve(active.onRequestWritten?.()).catch(() => {});
+		} catch {}
 	}
 	clearActivePrompt(active) {
 		if (this.activePrompt === active) this.activePrompt = void 0;
@@ -5055,7 +5073,7 @@ var AcpClient = class {
 		if (error) this.promptPermissionFailures.delete(sessionId);
 		return error;
 	}
-	async runConnectionRequest(run, onRequestStarted, canStartRequest = () => true) {
+	async runConnectionRequest(run) {
 		return await new Promise((resolve, reject) => {
 			const pending = {
 				settled: false,
@@ -5070,14 +5088,9 @@ var AcpClient = class {
 			this.pendingConnectionRequests.add(pending);
 			Promise.resolve().then(async () => {
 				if (pending.settled) return { started: false };
-				const requestCanStart = canStartRequest();
-				const request = run();
-				if (requestCanStart) try {
-					Promise.resolve(onRequestStarted?.()).catch(() => {});
-				} catch {}
 				return {
 					started: true,
-					value: await request
+					value: await run()
 				};
 			}).then((outcome) => {
 				if (outcome.started) finish(() => resolve(outcome.value));
@@ -5882,18 +5895,6 @@ function trimRuntimeToolResult(result) {
 	if (typeof result.output === "string") result.output = trimRuntimeText(result.output, MAX_RUNTIME_TOOL_IO_CHARS);
 }
 //#endregion
-//#region src/session/config-options.ts
-function applyConfigOptionsToState(state, configOptions) {
-	const acpxState = cloneSessionAcpxState(state) ?? {};
-	applyConfigOptionsModelState(acpxState, configOptions);
-	return acpxState;
-}
-function applyConfigOptionsToRecord(record, result) {
-	const configOptions = result?.configOptions;
-	if (!configOptions) return;
-	record.acpx = applyConfigOptionsToState(record.acpx, configOptions);
-}
-//#endregion
 //#region src/session/mode-preference.ts
 function ensureAcpxState(state) {
 	return state ?? {};
@@ -5926,17 +5927,6 @@ function setDesiredModeId(record, modeId) {
 	else delete acpx.desired_mode_id;
 	record.acpx = acpx;
 }
-function setDesiredConfigOption(record, configId, value) {
-	const normalizedConfigId = normalizeModeId(configId);
-	if (!normalizedConfigId || normalizedConfigId === "mode" || normalizedConfigId === "model") return;
-	const acpx = ensureAcpxState(record.acpx);
-	const desired = { ...acpx.desired_config_options };
-	if (typeof value === "string") desired[normalizedConfigId] = value;
-	else delete desired[normalizedConfigId];
-	if (Object.keys(desired).length > 0) acpx.desired_config_options = desired;
-	else delete acpx.desired_config_options;
-	record.acpx = acpx;
-}
 function clearDesiredConfigOption(state, configId) {
 	const normalizedConfigId = normalizeModeId(configId);
 	if (!normalizedConfigId || !state.desired_config_options) return;
@@ -5948,20 +5938,6 @@ 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 (hasStoredSessionOptions(sessionOptions)) acpx.session_options = sessionOptions;
-	else delete acpx.session_options;
-	clearDesiredConfigOption(acpx, modelConfigId ?? modelStateFromConfigOptions(acpx.config_options)?.configId);
-	record.acpx = acpx;
-}
 function setCurrentModelId(record, modelId) {
 	const acpx = ensureAcpxState(record.acpx);
 	const normalized = normalizeModelId(modelId);
@@ -5998,6 +5974,50 @@ async function applyRequestedModelIfAdvertised(params) {
 	};
 }
 //#endregion
+//#region src/session/config-options.ts
+function applyConfigOptionsToState(state, configOptions) {
+	const acpxState = cloneSessionAcpxState(state) ?? {};
+	applyConfigOptionsModelState(acpxState, configOptions);
+	return acpxState;
+}
+function applyConfigOptionsToRecord(record, result) {
+	const configOptions = result?.configOptions;
+	if (!configOptions) return;
+	record.acpx = applyConfigOptionsToState(record.acpx, configOptions);
+}
+function applyAcceptedConfigOptions(state, response) {
+	const next = cloneSessionAcpxState(state) ?? {};
+	if (!response) return next;
+	applyConfigOptionsModelState(next, response.configOptions);
+	if (!next.desired_config_options) return next;
+	const desired = {};
+	for (const option of response.configOptions) if (typeof option.currentValue === "string" && Object.hasOwn(next.desired_config_options, option.id)) desired[option.id] = option.currentValue;
+	if (Object.keys(desired).length > 0) next.desired_config_options = desired;
+	else delete next.desired_config_options;
+	return next;
+}
+function applyModelSelection(state, modelId, response) {
+	const modelConfigId = advertisedModelState(state)?.configId;
+	const next = applyAcceptedConfigOptions(state, response);
+	next.session_options = {
+		...next.session_options,
+		model: modelId
+	};
+	next.current_model_id = currentModelIdFromSetModelResponse(response, modelId);
+	clearDesiredConfigOption(next, modelConfigId ?? advertisedModelState(next)?.configId);
+	return next;
+}
+function applyConfigOptionSelection(state, configId, value, response, modelConfigId = advertisedModelState(state)?.configId) {
+	if (configId === modelConfigId || configId === modelStateFromConfigOptions(response.configOptions)?.configId) return applyModelSelection(state, value, response);
+	const next = cloneSessionAcpxState(state) ?? {};
+	if (configId === "mode") next.desired_mode_id = value;
+	else next.desired_config_options = {
+		...next.desired_config_options,
+		[configId]: value
+	};
+	return applyAcceptedConfigOptions(next, response);
+}
+//#endregion
 //#region src/runtime/engine/reconnect.ts
 function isProcessAlive(pid) {
 	if (!pid || !Number.isInteger(pid) || pid <= 0 || pid === process.pid) return false;
@@ -6042,8 +6062,11 @@ async function replayDesiredMode(params) {
 		});
 	}
 }
+function canReplayModel(desiredModelId, models, createdFreshSession) {
+	return Boolean(desiredModelId) && (createdFreshSession || models !== void 0);
+}
 async function replayDesiredModel(params) {
-	if (!params.desiredModelId) return { replayed: false };
+	if (!canReplayModel(params.desiredModelId, params.models, params.createdFreshSession)) return { replayed: false };
 	try {
 		emitModelSupportWarning(assertRequestedModelSupported({
 			requestedModel: params.desiredModelId,
@@ -6051,21 +6074,21 @@ async function replayDesiredModel(params) {
 			agentCommand: params.record.agentCommand,
 			context: "replay"
 		}), params.suppressWarnings);
-		if (!params.models || params.models.currentModelId === params.desiredModelId) return { replayed: false };
+		if (!params.models) return { replayed: false };
 		const response = await withTimeout(params.client.setSessionModel(params.sessionId, params.desiredModelId, params.models), params.timeoutMs);
-		applyConfigOptionsToRecord(params.record, response);
+		params.record.acpx = applyModelSelection(params.record.acpx, params.desiredModelId, response);
 		const models = response ? modelStateFromConfigOptions(response.configOptions) : {
 			...params.models,
 			currentModelId: params.desiredModelId
 		};
-		if (params.verbose) process.stderr.write(`[acpx] replayed desired model ${params.desiredModelId} on fresh ACP session ${params.sessionId} (previous ${params.previousSessionId})\n`);
+		if (params.verbose) process.stderr.write(`[acpx] replayed desired model ${params.desiredModelId} on ACP session ${params.sessionId} (previous ${params.previousSessionId})\n`);
 		return {
 			replayed: true,
 			models,
-			configOptionsPresent: response !== void 0
+			configOptions: response?.configOptions
 		};
 	} catch (error) {
-		throw new SessionModelReplayError(`Failed to replay saved session model ${params.desiredModelId} on fresh ACP session ${params.sessionId}: ${formatErrorMessage(error)}`, {
+		throw new SessionModelReplayError(`Failed to replay saved session model ${params.desiredModelId} on ACP session ${params.sessionId}: ${formatErrorMessage(error)}`, {
 			cause: error instanceof Error ? error : void 0,
 			retryable: true
 		});
@@ -6076,19 +6099,25 @@ function emitModelSupportWarning(warning, suppressWarnings) {
 }
 async function replayDesiredConfigOptions(params) {
 	let result = { replayed: false };
-	for (const [configId, value] of Object.entries(params.desiredConfigOptions)) try {
-		const response = await withTimeout(params.client.setSessionConfigOption(params.sessionId, configId, value), params.timeoutMs);
-		applyConfigOptionsToRecord(params.record, response);
-		result = {
-			replayed: true,
-			models: modelStateFromConfigOptions(response.configOptions)
-		};
-		if (params.verbose) process.stderr.write(`[acpx] replayed desired config option ${configId} on fresh ACP session ${params.sessionId} (previous ${params.previousSessionId})\n`);
-	} catch (error) {
-		throw new SessionConfigOptionReplayError(`Failed to replay saved session config option ${configId} on fresh ACP session ${params.sessionId}: ${formatErrorMessage(error)}`, {
-			cause: error instanceof Error ? error : void 0,
-			retryable: true
-		});
+	let acceptedConfigOptions = params.acceptedConfigOptions;
+	const replacingKey = resolveReplacingConfigOptionId(params.replacingConfigOption, params.record);
+	for (const [configId, value] of Object.entries(params.desiredConfigOptions)) {
+		if (configId === replacingKey || acceptedConfigOptions && !acceptsSavedConfigValue(acceptedConfigOptions.find((option) => option.id === configId), value)) continue;
+		try {
+			const response = await withTimeout(params.client.setSessionConfigOption(params.sessionId, configId, value), params.timeoutMs);
+			params.record.acpx = applyConfigOptionSelection(params.record.acpx, configId, value, response);
+			acceptedConfigOptions = response.configOptions;
+			result = {
+				replayed: true,
+				models: modelStateFromConfigOptions(response.configOptions)
+			};
+			if (params.verbose) process.stderr.write(`[acpx] replayed desired config option ${configId} on ACP session ${params.sessionId} (previous ${params.previousSessionId})\n`);
+		} catch (error) {
+			throw new SessionConfigOptionReplayError(`Failed to replay saved session config option ${configId} on ACP session ${params.sessionId}: ${formatErrorMessage(error)}`, {
+				cause: error instanceof Error ? error : void 0,
+				retryable: true
+			});
+		}
 	}
 	return result;
 }
@@ -6135,10 +6164,12 @@ async function connectAndLoadSession(options) {
 	createdFreshSession = loadState.createdFreshSession;
 	pendingAgentSessionId = loadState.pendingAgentSessionId;
 	sessionModels = loadState.sessionModels;
-	const preferenceReplay = await replayFreshSessionPreferences({
+	const preferenceReplay = await replaySessionPreferences({
 		client,
 		record,
 		createdFreshSession,
+		reusingLoadedSession,
+		replacingConfigOption: options.replacingConfigOption,
 		sessionId,
 		pendingAgentSessionId,
 		originalSessionId,
@@ -6169,7 +6200,7 @@ function preserveLegacyModels(models) {
 	return models && !models.configId ? models : void 0;
 }
 function resolveConfigOptionsPresenceAfterReplay(replay, initiallyPresent) {
-	return initiallyPresent || replay.configReplay.replayed || replay.modelReplay.replayed && replay.modelReplay.configOptionsPresent;
+	return initiallyPresent || replay.configReplay.replayed || replay.modelReplay.configOptions !== void 0;
 }
 function applyReconnectedModelState(record, sessionModels, configOptionsPresent, legacyModelMetadataPresent, createdFreshSession) {
 	clearOmittedFreshSessionConfigOptions(record, createdFreshSession, configOptionsPresent);
@@ -6192,18 +6223,30 @@ function logReconnectAttempt(record, storedProcessAlive, shouldReconnect, verbos
 	}
 	if (shouldReconnect) process.stderr.write(`[acpx] saved session pid ${record.pid} is dead; respawning agent and attempting session reconnect\n`);
 }
-async function replayFreshSessionPreferences(params) {
-	if (!params.createdFreshSession) return {
+function replacesModel(replacingConfigOption, models, originalAcpx) {
+	const key = replacingConfigOption?.key;
+	return key !== void 0 && (key === "model" || key === models?.configId || key === advertisedModelState(originalAcpx)?.configId);
+}
+function acceptsSavedConfigValue(option, value) {
+	if (!option || option.type !== "select") return false;
+	return option.currentValue === value || option.options.some((entry) => "options" in entry ? entry.options.some((choice) => choice.value === value) : entry.value === value);
+}
+function resolveReplacingConfigOptionId(replacement, record) {
+	return replacement?.resolve?.(record) ?? replacement?.key;
+}
+async function replaySessionPreferences(params) {
+	if (params.reusingLoadedSession) return {
 		modelReplay: { replayed: false },
 		configReplay: { replayed: false }
 	};
 	let modelReplay = { replayed: false };
 	let configReplay = { replayed: false };
+	const replacingModel = replacesModel(params.replacingConfigOption, params.sessionModels, params.originalAcpx);
 	try {
 		await replayDesiredMode({
 			client: params.client,
 			sessionId: params.sessionId,
-			desiredModeId: params.desiredModeId,
+			desiredModeId: params.createdFreshSession ? params.desiredModeId : void 0,
 			previousSessionId: params.originalSessionId,
 			timeoutMs: params.timeoutMs,
 			verbose: params.verbose
@@ -6211,10 +6254,11 @@ async function replayFreshSessionPreferences(params) {
 		modelReplay = await replayDesiredModel({
 			client: params.client,
 			sessionId: params.sessionId,
-			desiredModelId: params.desiredModelId,
+			desiredModelId: replacingModel ? void 0 : params.desiredModelId,
 			previousSessionId: params.originalSessionId,
 			record: params.record,
 			models: params.sessionModels,
+			createdFreshSession: params.createdFreshSession,
 			timeoutMs: params.timeoutMs,
 			verbose: params.verbose,
 			suppressWarnings: params.suppressWarnings
@@ -6223,7 +6267,9 @@ async function replayFreshSessionPreferences(params) {
 			client: params.client,
 			record: params.record,
 			sessionId: params.sessionId,
-			desiredConfigOptions: params.desiredConfigOptions,
+			desiredConfigOptions: replacingModel ? {} : params.desiredConfigOptions,
+			acceptedConfigOptions: modelReplay.configOptions,
+			replacingConfigOption: replacingModel ? void 0 : params.replacingConfigOption,
 			previousSessionId: params.originalSessionId,
 			timeoutMs: params.timeoutMs,
 			verbose: params.verbose
@@ -6379,6 +6425,7 @@ async function withConnectedSession(options) {
 				client,
 				record,
 				resumePolicy: options.resumePolicy,
+				replacingConfigOption: options.replacingConfigOption,
 				timeoutMs: options.timeoutMs,
 				verbose: options.verbose,
 				activeController,
@@ -6437,7 +6484,7 @@ const SESSION_REPLY_IDLE_MS = 1e3;
 const SESSION_REPLY_DRAIN_TIMEOUT_MS = 5e3;
 async function runPromptTurn(params) {
 	try {
-		const promptPromise = params.client.prompt(params.sessionId, params.prompt, params.onPromptRequestStarted, params.onElicitation);
+		const promptPromise = params.client.prompt(params.sessionId, params.prompt, params.onPromptRequestWritten, params.onElicitation);
 		await params.onPromptStarted?.();
 		const response = await withTimeout(promptPromise, params.timeoutMs);
 		await params.client.waitForSessionUpdatesIdle?.({
@@ -6516,6 +6563,6 @@ var LiveSessionCheckpoint = class {
 	}
 };
 //#endregion
-export { writeSessionRecord as $, PERMISSION_POLICY_ACTIONS as $t, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as A, TimeoutError as At, getAcpxVersion as B, formatErrorMessage as Bt, mergeSessionOptions as C, PromptInputValidationError as Ct, applyLifecycleSnapshotToRecord as D, promptToDisplayText as Dt, applyConversation as E, parsePromptSource as Et, modelStateFromConfigOptions as F, normalizeAgentName$1 as Ft, findSession as G, toAcpErrorPayload as Gt, DEFAULT_HISTORY_LIMIT as H, normalizeOutputError as Ht, normalizeAgentCommandInput as I, resolveAgentArgv as It, listSessions as J, NON_INTERACTIVE_PERMISSION_POLICIES as Jt, findSessionByDirectoryWalk as K, AUTH_POLICIES as Kt, renderArgvIdentity as L, resolveAgentCommand as Lt, RequestedModelUnsupportedError as M, withTimeout as Mt, assertRequestedModelSupported as N, DEFAULT_AGENT_NAME as Nt, reconcileAgentSessionId as O, textPrompt as Ot, isRequestedModelUnsupportedError as P, listBuiltInAgents as Pt, resolveSessionRecord as Q, PERMISSION_MODES as Qt, runTimedExecFile as R, resolveCanonicalAgentName as Rt, advertisedModelState as S, parsePromptStopReason as St, sessionOptionsFromRecord as T, mergePromptSourceWithText as Tt, absolutePath as U, extractAcpError as Ut, permissionModeSatisfies as V, isRetryablePromptError as Vt, findGitRepositoryRoot as W, isAcpResourceNotFoundError as Wt, normalizeName as X, OUTPUT_ERROR_ORIGINS as Xt, listSessionsForAgent as Y, OUTPUT_ERROR_CODES as Yt, pruneSessions as Z, OUTPUT_FORMATS as Zt, createSessionConversation as _, sessionEventLockPath as _t, applyRequestedModelIfAdvertised as a, measurePerf as at, recordSessionUpdate as b, isAcpJsonRpcMessage as bt, setCurrentModelId as c, setPerfGauge as ct, setDesiredModelId as d, serializeSessionRecordForDisk as dt, SESSION_RECORD_SCHEMA as en, createAtomicWriteTempPath as et, syncAdvertisedModelState as f, normalizeRuntimeSessionId as ft, cloneSessionConversation as g, sessionEventActivePath as gt, cloneSessionAcpxState as h, sessionBaseDir$1 as ht, connectAndLoadSession as i, QueueProtocolError as in, incrementPerfCounter as it, REQUESTED_MODEL_UNSUPPORTED_REASONS as j, withInterrupt as jt, AcpClient as k, InterruptedError as kt, setDesiredConfigOption as l, startPerfTimer as lt, applyConfigOptionsToState as m, defaultSessionEventLog as mt, runPromptTurn as n, AgentSpawnError as nn, formatPerfMetric as nt, currentModelIdFromSetModelResponse as o, recordPerfDuration as ot, applyConfigOptionsToRecord as p, DEFAULT_EVENT_SEGMENT_MAX_BYTES as pt, isoNow$2 as q, EXIT_CODES as qt, withConnectedSession as r, QueueConnectionError as rn, getPerfMetricsSnapshot as rt, clearDesiredConfigOption as s, resetPerfMetrics as st, LiveSessionCheckpoint as t, AcpxOperationalError as tn, assertPersistedKeyPolicy as tt, setDesiredModeId as u, parseSessionRecord as ut, recordClientOperation as v, sessionEventSegmentPath as vt, persistSessionOptions as w, isPromptInput as wt, trimConversationForRuntime as x, parseJsonRpcErrorMessage as xt, recordPromptSubmission as y, extractSessionUpdateNotification as yt, splitCommandLine as z, exitCodeForOutputErrorCode as zt };
+export { formatPerfMetric as $, AgentSpawnError as $t, RequestedModelUnsupportedError as A, DEFAULT_AGENT_NAME as At, absolutePath as B, extractAcpError as Bt, sessionOptionsFromRecord as C, parsePromptSource as Ct, AcpClient as D, TimeoutError as Dt, reconcileAgentSessionId as E, InterruptedError as Et, runTimedExecFile as F, resolveCanonicalAgentName as Ft, listSessions as G, NON_INTERACTIVE_PERMISSION_POLICIES as Gt, findSession as H, toAcpErrorPayload as Ht, splitCommandLine as I, exitCodeForOutputErrorCode as It, pruneSessions as J, OUTPUT_FORMATS as Jt, listSessionsForAgent as K, OUTPUT_ERROR_CODES as Kt, getAcpxVersion as L, formatErrorMessage as Lt, modelStateFromConfigOptions as M, normalizeAgentName$1 as Mt, normalizeAgentCommandInput as N, resolveAgentArgv as Nt, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as O, withInterrupt as Ot, renderArgvIdentity as P, resolveAgentCommand as Pt, assertPersistedKeyPolicy as Q, AcpxOperationalError as Qt, permissionModeSatisfies as R, isRetryablePromptError as Rt, persistSessionOptions as S, mergePromptSourceWithText as St, applyLifecycleSnapshotToRecord as T, textPrompt as Tt, findSessionByDirectoryWalk as U, AUTH_POLICIES as Ut, findGitRepositoryRoot as V, isAcpResourceNotFoundError as Vt, isoNow$2 as W, EXIT_CODES as Wt, writeSessionRecord as X, PERMISSION_POLICY_ACTIONS as Xt, resolveSessionRecord as Y, PERMISSION_MODES as Yt, createAtomicWriteTempPath as Z, SESSION_RECORD_SCHEMA as Zt, recordPromptSubmission as _, isAcpJsonRpcMessage as _t, applyConfigOptionSelection as a, setPerfGauge as at, advertisedModelState as b, PromptInputValidationError as bt, applyRequestedModelIfAdvertised as c, serializeSessionRecordForDisk as ct, setDesiredModeId as d, defaultSessionEventLog as dt, QueueConnectionError as en, getPerfMetricsSnapshot as et, syncAdvertisedModelState as f, sessionBaseDir$1 as ft, recordClientOperation as g, extractSessionUpdateNotification as gt, createSessionConversation as h, sessionEventSegmentPath as ht, connectAndLoadSession as i, resetPerfMetrics as it, isRequestedModelUnsupportedError as j, listBuiltInAgents as jt, REQUESTED_MODEL_UNSUPPORTED_REASONS as k, withTimeout as kt, currentModelIdFromSetModelResponse as l, normalizeRuntimeSessionId as lt, cloneSessionConversation as m, sessionEventLockPath as mt, runPromptTurn as n, measurePerf as nt, applyConfigOptionsToRecord as o, startPerfTimer as ot, cloneSessionAcpxState as p, sessionEventActivePath as pt, normalizeName as q, OUTPUT_ERROR_ORIGINS as qt, withConnectedSession as r, recordPerfDuration as rt, applyModelSelection as s, parseSessionRecord as st, LiveSessionCheckpoint as t, QueueProtocolError as tn, incrementPerfCounter as tt, setCurrentModelId as u, DEFAULT_EVENT_SEGMENT_MAX_BYTES as ut, recordSessionUpdate as v, parseJsonRpcErrorMessage as vt, applyConversation as w, promptToDisplayText as wt, mergeSessionOptions as x, isPromptInput as xt, trimConversationForRuntime as y, parsePromptStopReason as yt, DEFAULT_HISTORY_LIMIT as z, normalizeOutputError as zt };
 
-//# sourceMappingURL=live-checkpoint-BSIrfgVo.js.map
+//# sourceMappingURL=live-checkpoint-BW9JivEG.js.map