acpx 0.19.3 → 0.19.5

package/dist/{queue-owner-runtime-Dhr4gxNE.js → queue-owner-runtime-DoijBCvt.js}

@@ -1,5 +1,5 @@
-import { $ as resetPerfMetrics, Bt as GeminiAcpStartupTimeoutError, C as textPrompt, Ct as normalizeOutputError, F as normalizeName, Ft as AgentSpawnError, G as SESSION_JOURNAL_SCHEMA, Gt as SessionModeReplayError, Ht as PermissionPromptUnavailableError, It as AgentStartupError, Jt as SessionResumeRequiredError, K as SessionJournalReader, Kt as SessionModelReplayError, L as readSessionRecord, Lt as AuthPolicyError, M as isoNow$1, Nt as AcpxOperationalError, O as absolutePath, Pt as AgentDisconnectedError, Q as measurePerf, R as resolveSessionRecord, Rt as ClaudeAcpSessionCreateTimeoutError, S as promptToDisplayText, St as isRetryablePromptError, T as lockOwnerPid, Tt as isAcpResourceNotFoundError, U as extractAgentSessionId, Ut as QueueConnectionError, Vt as PermissionDeniedError, W as normalizeAgentSessionId, Wt as SessionConfigOptionReplayError, X as getPerfMetricsSnapshot, Y as formatPerfMetric, Yt as UnsupportedPromptContentError, Z as incrementPerfCounter, _ as ProcessDescendants, a as trySetModelOnRunningOwner, at as isSessionUpdateNotification, bt as formatErrorMessage, d as releaseQueueOwnerLease, dt as sessionBaseDir, et as setPerfGauge, f as terminateProcess, ft as sessionEventActivePath, g as QueueLeaseGuardSettlementError, h as waitMs$1, i as trySetModeOnRunningOwner, it as isAcpMessageObject, j as findSessionByDirectoryWalk, k as findGitRepositoryRoot, m as tryAcquireQueueOwnerLease, mt as sessionEventSegmentPath, n as tryCloseSessionOnRunningOwner, o as trySubmitToRunningOwner, p as terminateQueueOwnerForSession, pt as sessionEventLockPath, r as trySetConfigOptionOnRunningOwner, rt as isAcpJsonRpcMessage, s as SessionQueueOwner, t as tryCancelOnRunningOwner, tt as startPerfTimer, u as refreshQueueOwnerLease, ut as defaultSessionEventLog, vt as isProcessAlive, w as createLockOwner, wt as extractAcpError, xt as isAcpQueryClosedBeforeResponseError, y as getUnsupportedPromptContentMessage, z as writeSessionRecord, zt as CopilotAcpUnsupportedError } from "./ipc-BW06Pbb8.js";
-import { A as requireAgentStdio, C as PROCESS_HELPER_TIMEOUT_MS, D as isoNow$2, E as isChildProcessRunning, F as waitForChildExit, I as waitForSpawn, M as resolveAgentSessionCwd, N as runTimedExecFile, P as splitCommandLine, T as basenameToken, _ as buildSpawnCommandOptions, b as readWindowsEnvValue, f as resolveBuiltInAgentLaunch, g as buildAgentSpawnCommand, j as resolveAgentCommandParts, v as buildTerminalShellSpawnCommand, w as asAbsoluteCwd, x as resolveWindowsExecutablePath, y as buildTerminalSpawnCommand } from "./agent-registry-DWnqUICY.js";
+import { $ as measurePerf, $t as UnsupportedPromptContentError, Bt as AgentStartupError, C as textPrompt, Dt as normalizeOutputError, Et as isRetryablePromptError, F as normalizeName, G as normalizeAgentSessionId, Gt as PermissionDeniedError, H as canonicalAgentCommand, Ht as ClaudeAcpSessionCreateTimeoutError, Jt as SessionConfigOptionReplayError, K as SESSION_JOURNAL_SCHEMA, Kt as PermissionPromptUnavailableError, L as readSessionRecord, Lt as AcpxOperationalError, M as isoNow$1, O as absolutePath, Ot as extractAcpError, Q as incrementPerfCounter, Qt as SessionResumeRequiredError, R as resolveSessionRecord, Rt as AgentDisconnectedError, S as promptToDisplayText, St as isProcessAlive, T as lockOwnerPid, Tt as isAcpQueryClosedBeforeResponseError, Ut as CopilotAcpUnsupportedError, Vt as AuthPolicyError, W as extractAgentSessionId, Wt as GeminiAcpStartupTimeoutError, X as formatPerfMetric, Xt as SessionModelReplayError, Yt as SessionModeReplayError, Z as getPerfMetricsSnapshot, _ as ProcessDescendants, _t as sessionEventLockPath, a as trySetModelOnRunningOwner, at as isAcpMessageObject, d as releaseQueueOwnerLease, et as resetPerfMetrics, f as terminateProcess, ft as defaultSessionEventLog, g as QueueLeaseGuardSettlementError, gt as sessionEventActivePath, h as waitMs$1, ht as sessionBaseDir, i as trySetModeOnRunningOwner, it as isAcpJsonRpcMessage, j as findSessionByDirectoryWalk, k as findGitRepositoryRoot, kt as isAcpResourceNotFoundError, m as tryAcquireQueueOwnerLease, mt as retainedEventMaxSegments, n as tryCloseSessionOnRunningOwner, nt as startPerfTimer, o as trySubmitToRunningOwner, ot as isSessionUpdateNotification, p as terminateQueueOwnerForSession, pt as existingEventSegmentIndices, q as SessionJournalReader, qt as QueueConnectionError, r as trySetConfigOptionOnRunningOwner, s as SessionQueueOwner, t as tryCancelOnRunningOwner, tt as setPerfGauge, u as refreshQueueOwnerLease, vt as sessionEventSegmentPath, w as createLockOwner, wt as formatErrorMessage, y as getUnsupportedPromptContentMessage, z as writeSessionRecord, zt as AgentSpawnError } from "./ipc-C96eDxkW.js";
+import { A as requireAgentStdio, C as PROCESS_HELPER_TIMEOUT_MS, D as isoNow$2, E as isChildProcessRunning, F as waitForChildExit, I as waitForSpawn, M as resolveAgentSessionCwd, N as runTimedExecFile, P as splitCommandLine, T as basenameToken, _ as buildSpawnCommandOptions, b as readWindowsEnvValue, f as resolveBuiltInAgentLaunch, g as buildAgentSpawnCommand, j as resolveAgentCommandParts, v as buildTerminalShellSpawnCommand, w as asAbsoluteCwd, x as resolveWindowsExecutablePath, y as buildTerminalSpawnCommand } from "./agent-registry-kHdpsK9F.js";
 import fs, { readFileSync, realpathSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
@@ -112,8 +112,8 @@ async function pathExists(filePath) {
 	}
 }
 async function countExistingSegments(sessionId, maxSegments) {
-	let count = 0;
-	for (let segment = 1; segment <= maxSegments; segment += 1) if (await pathExists(sessionEventSegmentPath(sessionId, segment))) count += 1;
+	const limit = retainedEventMaxSegments(maxSegments);
+	let count = (await existingEventSegmentIndices(sessionId)).filter((index) => index <= limit).length;
 	if (await pathExists(sessionEventActivePath(sessionId))) count += 1;
 	return count;
 }
@@ -124,22 +124,36 @@ async function resolveInitialSegmentCount(record, maxSegments) {
 async function resolveSessionMaxSegments(sessionId) {
 	try {
 		const configured = (await resolveSessionRecord(sessionId)).eventLog.max_segments;
-		if (Number.isInteger(configured) && configured > 0) return configured;
+		const retained = retainedEventMaxSegments(configured);
+		if (retained > 0) return retained;
 	} catch {}
 	return 5;
 }
 async function rotateSegments(sessionId, maxSegments) {
-	const active = sessionEventActivePath(sessionId);
-	const overflow = sessionEventSegmentPath(sessionId, maxSegments);
-	await fs$1.unlink(overflow).catch((error) => {
+	const limit = retainedEventMaxSegments(maxSegments);
+	if (limit < 1) return;
+	await discardOverflowSegment(sessionId, limit);
+	await shiftRetainedSegments(sessionId, limit);
+	await promoteActiveSegment(sessionId);
+}
+async function discardOverflowSegment(sessionId, limit) {
+	if (!(await existingEventSegmentIndices(sessionId)).includes(limit)) return;
+	await fs$1.unlink(sessionEventSegmentPath(sessionId, limit)).catch((error) => {
 		if (error.code !== "ENOENT") throw error;
 	});
-	for (let segment = maxSegments - 1; segment >= 1; segment -= 1) {
+}
+async function shiftRetainedSegments(sessionId, limit) {
+	const movable = (await existingEventSegmentIndices(sessionId)).filter((index) => index < limit).toSorted((left, right) => right - left);
+	for (const segment of movable) {
 		const from = sessionEventSegmentPath(sessionId, segment);
-		const to = sessionEventSegmentPath(sessionId, segment + 1);
 		if (!await pathExists(from)) continue;
-		await fs$1.rename(from, to);
+		const next = segment + 1;
+		if (!Number.isSafeInteger(next)) throw new Error("Session journal segment index exceeds its supported range");
+		await fs$1.rename(from, sessionEventSegmentPath(sessionId, next));
 	}
+}
+async function promoteActiveSegment(sessionId) {
+	const active = sessionEventActivePath(sessionId);
 	if (await pathExists(active)) await fs$1.rename(active, sessionEventSegmentPath(sessionId, 1));
 }
 var SessionEventWriter = class SessionEventWriter {
@@ -174,7 +188,7 @@ var SessionEventWriter = class SessionEventWriter {
 	}
 	static async open(record, options = {}) {
 		const maxSegmentBytes = options.maxSegmentBytes ?? record.eventLog.max_segment_bytes ?? 67108864;
-		const maxSegments = options.maxSegments ?? record.eventLog.max_segments ?? 5;
+		const maxSegments = retainedEventMaxSegments(options.maxSegments ?? record.eventLog.max_segments ?? 5);
 		const activePath = sessionEventActivePath(record.acpxRecordId);
 		const tail = await new SessionJournalReader({
 			...record,
@@ -339,7 +353,7 @@ var SessionEventWriter = class SessionEventWriter {
 	}
 };
 async function listSessionEvents(sessionId, maxSegments) {
-	maxSegments ??= await resolveSessionMaxSegments(sessionId);
+	maxSegments = retainedEventMaxSegments(maxSegments ?? await resolveSessionMaxSegments(sessionId));
 	return await new SessionJournalReader({
 		acpxRecordId: sessionId,
 		eventLog: { max_segments: maxSegments }
@@ -558,7 +572,7 @@ async function acquireSessionTurn(recordId, signal) {
 }
 async function acquireSessionScope(scope, signal) {
 	return await acquireSessionTurn(`ensure:${createHash("sha256").update(JSON.stringify([
-		scope.agentCommand,
+		canonicalAgentCommand(scope.agentCommand),
 		scope.cwd,
 		scope.name
 	])).digest("hex")}`, signal);
@@ -606,6 +620,18 @@ function sliceReadWindow(content, line, limit) {
 }
 //#endregion
 //#region src/permission-prompt.ts
+function visiblePromptText(value) {
+	let rendered = "";
+	for (const character of value) {
+		const codePoint = character.codePointAt(0);
+		if (codePoint !== void 0 && (codePoint <= 31 || codePoint >= 127 && codePoint <= 159)) {
+			rendered += `\\x${codePoint.toString(16).padStart(2, "0")}`;
+			continue;
+		}
+		rendered += character;
+	}
+	return rendered;
+}
 let promptQueue = Promise.resolve();
 async function promptForPermission(options) {
 	options.signal?.throwIfAborted();
@@ -624,6 +650,10 @@ async function promptForPermission(options) {
 		signal.removeEventListener("abort", onAbort);
 	}
 }
+function promptForDisplay(prompt) {
+	if (prompt.startsWith("\n")) return `\n${visiblePromptText(prompt.slice(1))}`;
+	return visiblePromptText(prompt);
+}
 async function askPermission(options) {
 	options.signal?.throwIfAborted();
 	if (!canPrompt()) return false;
@@ -640,7 +670,7 @@ async function askPermission(options) {
 		rl.once("close", onClose);
 	});
 	try {
-		const answer = await Promise.race([rl.question(options.prompt, { signal }), closed]);
+		const answer = await Promise.race([rl.question(promptForDisplay(options.prompt), { signal }), closed]);
 		options.signal?.throwIfAborted();
 		const normalized = answer?.trim().toLowerCase();
 		return normalized === "y" || normalized === "yes";
@@ -654,8 +684,8 @@ function canPrompt() {
 	return process.stdin.isTTY && process.stderr.isTTY && !process.stdin.readableEnded && !process.stdin.destroyed;
 }
 function writePromptDetails(options) {
-	if (options.header) process.stderr.write(`\n${options.header}\n`);
-	if (options.details && options.details.trim().length > 0) process.stderr.write(`${options.details}\n`);
+	if (options.header) process.stderr.write(`\n${visiblePromptText(options.header)}\n`);
+	if (options.details && options.details.trim().length > 0) process.stderr.write(`${options.details.split("\n").map(visiblePromptText).join("\n")}\n`);
 }
 //#endregion
 //#region src/filesystem.ts
@@ -1330,7 +1360,12 @@ function buildAgentEnvironment(authCredentials, sessionEnv, agentProcessEnv) {
 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;
+	Object.defineProperty(env, key, {
+		value,
+		writable: true,
+		enumerable: true,
+		configurable: true
+	});
 }
 function addAuthCredentialEnvKeys(protectedKeys, methodId, credential) {
 	if (typeof credential !== "string" || credential.trim().length === 0) return;
@@ -1516,34 +1551,7 @@ function captureCommandProbeOutput(child, timeoutMs, retire) {
 	};
 }
 //#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 {
-	code = REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE;
-	reason;
-	ambiguous;
-	constructor(message, reason, details) {
-		super(message);
-		this.name = "RequestedModelUnsupportedError";
-		this.reason = reason;
-		if (details?.ambiguous) this.ambiguous = true;
-	}
-};
-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);
-	return isClaudeAcpCommand(command, args);
-}
+//#region src/acp/model-config-state.ts
 function asRecord$2(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
@@ -1602,6 +1610,35 @@ function modelStateFromConfigOptions(configOptions) {
 	}
 	return selected;
 }
+//#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 {
+	code = REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE;
+	reason;
+	ambiguous;
+	constructor(message, reason, details) {
+		super(message);
+		this.name = "RequestedModelUnsupportedError";
+		this.reason = reason;
+		if (details?.ambiguous) this.ambiguous = true;
+	}
+};
+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);
+	return isClaudeAcpCommand(command, args);
+}
 function modelStateFromLegacyResponse(response) {
 	if (!response || typeof response !== "object") return;
 	const models = response.models;
@@ -1633,6 +1670,16 @@ function resolveRequestedModelId(params) {
 	if (candidates.length > 1) throw new RequestedModelUnsupportedError(`Cannot select model "${params.requestedModel}": multiple advertised Cursor models match (${candidates.join(", ")}). Use an exact advertised model ID.`, "unadvertised-model", { ambiguous: true });
 	return candidates.length === 1 ? candidates[0] : params.requestedModel;
 }
+function resolveRequestedConfigOption(params) {
+	const modelConfigId = params.models?.configId;
+	return {
+		modelConfigId,
+		resolvedValue: modelConfigId === params.configId ? resolveRequestedModelId({
+			...params,
+			requestedModel: params.value
+		}) : params.value
+	};
+}
 function isCursorAcpCommandForModelAlias(agentCommand) {
 	if (!agentCommand) return false;
 	const { command, args } = splitCommandLine(agentCommand);
@@ -2242,7 +2289,7 @@ async function spawnTerminalProcess(params, defaultCwd, authority) {
 }
 async function spawnAndWait(spawnCommand, params, defaultCwd, authority) {
 	const spawnOptions = buildTerminalSpawnOptions(spawnCommand.command, params.cwd ?? defaultCwd, params.env);
-	if (spawnCommand.killProcessGroup || process.platform !== "win32") spawnOptions.detached = true;
+	if (process.platform !== "win32") spawnOptions.detached = true;
 	assertControlAuthority(authority);
 	const proc = spawn(spawnCommand.command, spawnCommand.args, spawnOptions);
 	await waitForSpawn(proc);
@@ -2406,7 +2453,14 @@ function hasResponseField(response, field) {
 }
 function normalizeResponseConfigOptions(response) {
 	if (!response || !("configOptions" in response)) return;
-	return response.configOptions ?? [];
+	return Array.isArray(response.configOptions) ? response.configOptions : void 0;
+}
+function normalizeConfigOptionAcknowledgement(response) {
+	if (!response || typeof response !== "object" || Array.isArray(response)) return {};
+	if (Array.isArray(response.configOptions)) return response;
+	const acknowledgement = { ...response };
+	delete acknowledgement.configOptions;
+	return acknowledgement;
 }
 function toReconnectedSessionResult(response) {
 	const configOptions = normalizeResponseConfigOptions(response);
@@ -2417,7 +2471,7 @@ function toReconnectedSessionResult(response) {
 			configOptions,
 			response
 		}),
-		configOptionsPresent: hasResponseField(response, "configOptions"),
+		configOptionsPresent: configOptions !== void 0,
 		legacyModelMetadataPresent: hasResponseField(response, "models")
 	};
 }
@@ -2971,7 +3025,7 @@ var AcpClient = class {
 			agentSessionId: extractAgentSessionId(result._meta),
 			configOptions,
 			models,
-			configOptionsPresent: hasResponseField(result, "configOptions"),
+			configOptionsPresent: configOptions !== void 0,
 			legacyModelMetadataPresent: hasResponseField(result, "models")
 		};
 	}
@@ -3128,11 +3182,11 @@ var AcpClient = class {
 		assertControlAuthority(authority);
 		const resolvedValue = models?.configId === configId ? this.resolveSessionModelId(value, models) : value;
 		const connection = this.getConnection();
-		return await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.setConfigOption, {
+		return normalizeConfigOptionAcknowledgement(await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.setConfigOption, {
 			sessionId,
 			configId,
 			value: resolvedValue
-		}), authority, (error) => maybeWrapSessionControlError("session/set_config_option", error, `for "${configId}"="${value}"`));
+		}), authority, (error) => maybeWrapSessionControlError("session/set_config_option", error, `for "${configId}"="${value}"`)));
 	}
 	async setSessionModel(sessionId, modelId, models, authority) {
 		assertControlAuthority(authority);
@@ -3154,11 +3208,11 @@ var AcpClient = class {
 	}
 	async setSessionModelThroughConfig(sessionId, modelId, configId, authority) {
 		const connection = this.getConnection();
-		return await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.setConfigOption, {
+		return normalizeConfigOptionAcknowledgement(await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.setConfigOption, {
 			sessionId,
 			configId,
 			value: modelId
-		}), authority, (error) => this.throwSessionModelError("session/set_config_option", modelId, error));
+		}), authority, (error) => this.throwSessionModelError("session/set_config_option", modelId, error)));
 	}
 	async setSessionModelThroughLegacyMethod(sessionId, modelId, authority) {
 		const connection = this.getConnection();
@@ -3925,6 +3979,7 @@ function removeModelConfigOptions(state) {
 	state.config_options = state.config_options.filter((option) => option.category !== "model" && option.id !== "model");
 }
 function applyConfigOptionsModelState(state, configOptions) {
+	if (!Array.isArray(configOptions)) return;
 	const previousConfigModels = modelStateFromConfigOptions(state.config_options);
 	const preservesLegacyControl = state.model_control === "legacy_set_model" || state.model_control === void 0 && previousConfigModels === void 0 && legacyModelState(state) !== void 0;
 	state.config_options = structuredClone(configOptions);
@@ -3934,14 +3989,9 @@ function applyConfigOptionsModelState(state, configOptions) {
 	else clearAdvertisedModelState(state);
 }
 //#endregion
-//#region src/session/conversation-model.ts
-const MAX_RUNTIME_MESSAGES = 200;
-const MAX_RUNTIME_AGENT_TEXT_CHARS = 8e3;
-const MAX_RUNTIME_THINKING_CHARS = 4e3;
-const MAX_RUNTIME_TOOL_IO_CHARS = 4e3;
-const MAX_RUNTIME_REQUEST_TOKEN_USAGE = 100;
-function isoNow() {
-	return (/* @__PURE__ */ new Date()).toISOString();
+//#region src/session/conversation-reducer.ts
+function resolveUserMessageId(value) {
+	return typeof value === "string" ? value : value();
 }
 function deepClone(value) {
 	try {
@@ -4012,9 +4062,6 @@ function resourceToUserContent(content) {
 		content: content.resource.uri
 	} };
 }
-function nextUserMessageId() {
-	return randomUUID();
-}
 function isUserMessage(message) {
 	return typeof message === "object" && message !== null && hasOwn(message, "User");
 }
@@ -4046,7 +4093,7 @@ function ensureAgentMessage(conversation) {
 function appendAgentText(agent, text) {
 	const last = agent.content.at(-1);
 	if (last && isAgentTextContent(last)) {
-		last.Text = trimRuntimeText(`${last.Text}${text}`, MAX_RUNTIME_AGENT_TEXT_CHARS);
+		last.Text = `${last.Text}${text}`;
 		return;
 	}
 	const next = { Text: text };
@@ -4055,7 +4102,7 @@ function appendAgentText(agent, text) {
 function appendAgentThinking(agent, text) {
 	const last = agent.content.at(-1);
 	if (last && isAgentThinkingContent(last)) {
-		last.Thinking.text = trimRuntimeText(`${last.Thinking.text}${text}`, MAX_RUNTIME_THINKING_CHARS);
+		last.Thinking.text = `${last.Thinking.text}${text}`;
 		return;
 	}
 	const next = { Thinking: {
@@ -4064,13 +4111,6 @@ function appendAgentThinking(agent, text) {
 	} };
 	agent.content.push(next);
 }
-function trimRuntimeText(value, maxChars) {
-	if (value.length <= maxChars) return value;
-	let end = Math.max(0, maxChars - 3);
-	const last = value.charCodeAt(end - 1);
-	if (last >= 55296 && last <= 56319) end -= 1;
-	return `${value.slice(0, end)}...`;
-}
 function statusIndicatesComplete(status) {
 	if (typeof status !== "string") return false;
 	const normalized = status.toLowerCase();
@@ -4082,18 +4122,18 @@ function statusIndicatesError(status) {
 	return normalized.includes("fail") || normalized.includes("error");
 }
 function toToolResultContent(value) {
-	if (typeof value === "string") return { Text: trimRuntimeText(value, MAX_RUNTIME_TOOL_IO_CHARS) };
+	if (typeof value === "string") return { Text: value };
 	if (value != null) try {
-		return { Text: trimRuntimeText(JSON.stringify(value), MAX_RUNTIME_TOOL_IO_CHARS) };
+		return { Text: JSON.stringify(value) ?? "[Unserializable value]" };
 	} catch {
 		return { Text: "[Unserializable value]" };
 	}
 	return { Text: "" };
 }
 function toRawInput(value) {
-	if (typeof value === "string") return trimRuntimeText(value, MAX_RUNTIME_TOOL_IO_CHARS);
+	if (typeof value === "string") return value;
 	try {
-		return trimRuntimeText(JSON.stringify(value ?? {}), MAX_RUNTIME_TOOL_IO_CHARS);
+		return JSON.stringify(value ?? {}) ?? "[Unserializable input]";
 	} catch {
 		return value == null ? "" : "[Unserializable input]";
 	}
@@ -4138,11 +4178,13 @@ function existingToolResultValues(existing) {
 	};
 }
 function applyToolCallUpdate(agent, update) {
+	const contentCount = agent.content.length;
 	const tool = ensureToolUseContent(agent, update.toolCallId);
 	applyToolIdentityUpdate(tool, update);
 	applyToolInputUpdate(tool, update);
 	applyToolStatusUpdate(tool, update);
 	applyToolResultUpdate(agent, tool, update);
+	return agent.content.length !== contentCount || hasOwn(update, "rawInput") || hasToolResultPatch(update);
 }
 function applyToolIdentityUpdate(tool, update) {
 	if (hasOwn(update, "title")) tool.name = normalizeAgentName(update.title) ?? tool.name ?? "tool_call";
@@ -4245,7 +4287,7 @@ function lastUserMessageId(conversation) {
 		if (message && isUserMessage(message)) return message.User.id;
 	}
 }
-function createSessionConversation(timestamp = isoNow()) {
+function createConversation(timestamp) {
 	return {
 		title: null,
 		messages: [],
@@ -4255,8 +4297,7 @@ function createSessionConversation(timestamp = isoNow()) {
 		request_token_usage: {}
 	};
 }
-function cloneSessionConversation(conversation) {
-	if (!conversation) return createSessionConversation();
+function cloneConversation(conversation) {
 	return {
 		title: conversation.title,
 		messages: deepClone(conversation.messages ?? []),
@@ -4272,6 +4313,7 @@ function cloneUsageCost(cost) {
 function cloneSessionAcpxState(state) {
 	if (!state) return;
 	return {
+		...state.session_origin ? { session_origin: state.session_origin } : {},
 		current_mode_id: state.current_mode_id,
 		desired_mode_id: state.desired_mode_id,
 		desired_config_options: state.desired_config_options ? { ...state.desired_config_options } : void 0,
@@ -4297,57 +4339,47 @@ function cloneSessionOptions(options) {
 function cloneSystemPromptOption(option) {
 	return typeof option === "string" ? option : { append: option.append };
 }
-function recordPromptSubmission(conversation, prompt, timestamp = isoNow(), messageId) {
+function reducePromptSubmission(conversation, prompt, timestamp, messageId) {
 	const userContent = (typeof prompt === "string" ? textPrompt(prompt) : prompt).map((content) => contentToUserContent(content)).filter((content) => content !== void 0);
-	if (userContent.length === 0) return;
-	const promptMessageId = messageId ?? nextUserMessageId();
+	if (userContent.length === 0) return { messageIndex: void 0 };
 	conversation.messages.push({ User: {
-		id: promptMessageId,
-		content: userContent.map((content) => {
-			if ("Text" in content) return { Text: trimRuntimeText(content.Text, MAX_RUNTIME_AGENT_TEXT_CHARS) };
-			return content;
-		})
+		id: resolveUserMessageId(messageId),
+		content: userContent
 	} });
 	updateConversationTimestamp(conversation, timestamp);
-	trimConversationForRuntime(conversation);
-	return promptMessageId;
+	return { messageIndex: conversation.messages.length - 1 };
 }
-function recordSessionUpdate(conversation, state, notification, timestamp = isoNow(), userMessageId) {
+function reduceSessionUpdate(conversation, state, notification, timestamp, userMessageId) {
 	const acpx = ensureAcpxState$1(state);
-	const update = notification.update;
-	applySessionUpdate(conversation, acpx, update, userMessageId);
+	const messageIndex = applySessionUpdate(conversation, acpx, notification.update, userMessageId);
 	updateConversationTimestamp(conversation, timestamp);
-	trimConversationForRuntime(conversation);
-	return acpx;
+	return {
+		acpx,
+		messageIndex
+	};
 }
-function recordPromptResponseUsage(conversation, usage, promptMessageId, timestamp = isoNow()) {
+function reducePromptResponseUsage(conversation, usage, promptMessageId, timestamp) {
 	const tokenUsage = sourceToTokenUsage(usage);
 	if (!tokenUsage) return false;
 	applyTokenUsage(conversation, tokenUsage, promptMessageId);
 	updateConversationTimestamp(conversation, timestamp);
-	trimConversationForRuntime(conversation);
 	return true;
 }
 function applySessionUpdate(conversation, acpx, update, userMessageId) {
-	const handler = SESSION_UPDATE_HANDLERS[update.sessionUpdate];
-	handler?.(conversation, acpx, update, userMessageId);
+	return (Object.hasOwn(SESSION_UPDATE_HANDLERS, update.sessionUpdate) ? SESSION_UPDATE_HANDLERS[update.sessionUpdate] : void 0)?.(conversation, acpx, update, userMessageId);
 }
 const SESSION_UPDATE_HANDLERS = {
 	user_message_chunk: (conversation, _acpx, update, userMessageId) => {
-		if (update.sessionUpdate === "user_message_chunk") appendUserMessageChunk(conversation, update.content, userMessageId);
+		if (update.sessionUpdate === "user_message_chunk") return appendUserMessageChunk(conversation, update.content, userMessageId);
 	},
 	agent_message_chunk: (conversation, _acpx, update) => {
-		if (update.sessionUpdate === "agent_message_chunk") appendAgentMessageChunk(conversation, update.content, appendAgentText);
+		if (update.sessionUpdate === "agent_message_chunk") return appendAgentMessageChunk(conversation, update.content, appendAgentText);
 	},
 	agent_thought_chunk: (conversation, _acpx, update) => {
-		if (update.sessionUpdate === "agent_thought_chunk") appendAgentMessageChunk(conversation, update.content, appendAgentThinking);
-	},
-	tool_call: (conversation, _acpx, update) => {
-		if (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update") applyToolCallUpdate(ensureAgentMessage(conversation), update);
-	},
-	tool_call_update: (conversation, _acpx, update) => {
-		if (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update") applyToolCallUpdate(ensureAgentMessage(conversation), update);
+		if (update.sessionUpdate === "agent_thought_chunk") return appendAgentMessageChunk(conversation, update.content, appendAgentThinking);
 	},
+	tool_call: applyToolUpdate,
+	tool_call_update: applyToolUpdate,
 	usage_update: (conversation, _acpx, update) => {
 		if (update.sessionUpdate === "usage_update") applyUsageUpdate(conversation, update);
 	},
@@ -4364,17 +4396,24 @@ const SESSION_UPDATE_HANDLERS = {
 		if (update.sessionUpdate === "config_option_update") applyConfigOptionsModelState(acpx, deepClone(update.configOptions));
 	}
 };
+function applyToolUpdate(conversation, _acpx, update) {
+	if (update.sessionUpdate !== "tool_call" && update.sessionUpdate !== "tool_call_update") return;
+	return applyToolCallUpdate(ensureAgentMessage(conversation), update) ? conversation.messages.length - 1 : void 0;
+}
 function appendUserMessageChunk(conversation, content, messageId) {
 	const userContent = contentToUserContent(content);
 	if (!userContent) return;
 	conversation.messages.push({ User: {
-		id: messageId ?? nextUserMessageId(),
+		id: resolveUserMessageId(messageId),
 		content: [userContent]
 	} });
+	return conversation.messages.length - 1;
 }
 function appendAgentMessageChunk(conversation, content, append) {
 	const text = extractText(content);
-	if (text) append(ensureAgentMessage(conversation), text);
+	if (!text) return;
+	append(ensureAgentMessage(conversation), text);
+	return conversation.messages.length - 1;
 }
 function applyUsageUpdate(conversation, update) {
 	const usage = usageToTokenUsage(update);
@@ -4386,17 +4425,30 @@ function applyUsageUpdate(conversation, update) {
 function applyTokenUsage(conversation, usage, promptMessageId) {
 	conversation.cumulative_token_usage = usage;
 	const userId = promptMessageId ?? lastUserMessageId(conversation);
-	if (userId) conversation.request_token_usage[userId] = usage;
+	if (userId) Object.defineProperty(conversation.request_token_usage, userId, {
+		value: usage,
+		writable: true,
+		enumerable: true,
+		configurable: true
+	});
 }
 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;
 }
-function recordClientOperation(conversation, state, _operation, timestamp = isoNow()) {
-	const acpx = ensureAcpxState$1(state);
-	updateConversationTimestamp(conversation, timestamp);
-	trimConversationForRuntime(conversation);
-	return acpx;
+//#endregion
+//#region src/session/conversation-retention.ts
+const MAX_RUNTIME_MESSAGES = 200;
+const MAX_RUNTIME_AGENT_TEXT_CHARS = 8e3;
+const MAX_RUNTIME_THINKING_CHARS = 4e3;
+const MAX_RUNTIME_TOOL_IO_CHARS = 4e3;
+const MAX_RUNTIME_REQUEST_TOKEN_USAGE = 100;
+function trimRuntimeText(value, maxChars) {
+	if (value.length <= maxChars) return value;
+	let end = Math.max(0, maxChars - 3);
+	const last = value.charCodeAt(end - 1);
+	if (last >= 55296 && last <= 56319) end -= 1;
+	return `${value.slice(0, end)}...`;
 }
 function trimConversationForRuntime(conversation) {
 	if (conversation.messages.length > MAX_RUNTIME_MESSAGES) conversation.messages = conversation.messages.slice(-200);
@@ -4431,6 +4483,39 @@ function trimRuntimeToolResult(result) {
 	if (typeof result.output === "string") result.output = trimRuntimeText(result.output, MAX_RUNTIME_TOOL_IO_CHARS);
 }
 //#endregion
+//#region src/session/conversation-model.ts
+function isoNow() {
+	return (/* @__PURE__ */ new Date()).toISOString();
+}
+function createSessionConversation(timestamp = isoNow()) {
+	return createConversation(timestamp);
+}
+function cloneSessionConversation(conversation) {
+	return conversation ? cloneConversation(conversation) : createSessionConversation();
+}
+function recordPromptSubmission(conversation, prompt, timestamp = isoNow(), messageId) {
+	let promptMessageId = messageId;
+	if (reducePromptSubmission(conversation, prompt, timestamp, () => promptMessageId ??= randomUUID()).messageIndex === void 0) return;
+	trimConversationForRuntime(conversation);
+	return promptMessageId;
+}
+function recordSessionUpdate(conversation, state, notification, timestamp = isoNow(), userMessageId) {
+	const { acpx } = reduceSessionUpdate(conversation, state, notification, timestamp, userMessageId ?? randomUUID);
+	trimConversationForRuntime(conversation);
+	return acpx;
+}
+function recordPromptResponseUsage(conversation, usage, promptMessageId, timestamp = isoNow()) {
+	if (!reducePromptResponseUsage(conversation, usage, promptMessageId, timestamp)) return false;
+	trimConversationForRuntime(conversation);
+	return true;
+}
+function recordClientOperation(conversation, state, _operation, timestamp = isoNow()) {
+	const acpx = state ?? {};
+	conversation.updated_at = timestamp;
+	trimConversationForRuntime(conversation);
+	return acpx;
+}
+//#endregion
 //#region src/runtime/engine/lifecycle.ts
 function createInitialSessionRecord(params) {
 	const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -4450,7 +4535,7 @@ function createInitialSessionRecord(params) {
 		closed: false,
 		closedAt: void 0,
 		...createSessionConversation(now),
-		acpx: {}
+		acpx: params.sessionOrigin ? { session_origin: params.sessionOrigin } : {}
 	};
 }
 function applyLifecycleSnapshotToRecord(record, snapshot) {
@@ -4477,6 +4562,17 @@ function reconcileAgentSessionId(record, agentSessionId) {
 function sessionHasAgentMessages(recordOrConversation) {
 	return recordOrConversation.messages.some((message) => typeof message === "object" && message !== null && "Agent" in message);
 }
+function sessionHasAtMostOneUserMessage(recordOrConversation) {
+	let userMessageCount = 0;
+	for (const message of recordOrConversation.messages) if (typeof message === "object" && message !== null && "User" in message) {
+		userMessageCount += 1;
+		if (userMessageCount > 1) return false;
+	}
+	return true;
+}
+function sessionHasUserMessages(recordOrConversation) {
+	return recordOrConversation.messages.some((message) => typeof message === "object" && message !== null && "User" in message);
+}
 function applyConversation(record, conversation) {
 	record.title = conversation.title;
 	record.updated_at = conversation.updated_at;
@@ -4553,19 +4649,27 @@ function storedEnvRecord(value) {
 	const result = {};
 	for (const [key, raw] of entries) {
 		if (typeof raw !== "string") continue;
-		result[key] = raw;
+		Object.defineProperty(result, key, {
+			value: raw,
+			writable: true,
+			enumerable: true,
+			configurable: true
+		});
 	}
 	return Object.keys(result).length > 0 ? result : void 0;
 }
 function normalizeSystemPromptOption(value) {
-	const prompt = nonEmptyString(value);
+	const prompt = nonEmptyPromptText(value);
 	if (prompt !== void 0) return prompt;
 	const append = appendedSystemPrompt(value);
 	return append === void 0 ? void 0 : { append };
 }
 function appendedSystemPrompt(value) {
 	if (typeof value !== "object" || value === null || Array.isArray(value)) return;
-	return nonEmptyString(value.append);
+	return nonEmptyPromptText(value.append);
+}
+function nonEmptyPromptText(value) {
+	return typeof value === "string" && value.length > 0 ? value : void 0;
 }
 function storedAllowedTools(value) {
 	return Array.isArray(value) && value.every((item) => typeof item === "string") ? [...value] : void 0;
@@ -4638,13 +4742,19 @@ async function applyRequestedModelIfAdvertised(params) {
 	});
 	if (warning) params.onWarning?.(warning);
 	if (!params.models) return { applied: false };
-	if (params.models.currentModelId === requestedModel) return {
+	const resolvedModelId = resolveRequestedModelId({
+		...params,
+		requestedModel
+	});
+	if (params.models.currentModelId === resolvedModelId) return {
 		applied: true,
-		modelId: requestedModel
+		modelId: requestedModel,
+		resolvedModelId
 	};
 	return {
 		applied: true,
 		modelId: requestedModel,
+		resolvedModelId,
 		response: await withTimeout(params.client.setSessionModel(params.sessionId, requestedModel, params.models, params.authority), params.timeoutMs)
 	};
 }
@@ -4657,17 +4767,18 @@ function applyConfigOptionsToState(state, configOptions) {
 }
 function applyConfigOptionsToRecord(record, result) {
 	const configOptions = result?.configOptions;
-	if (!configOptions) return;
+	if (!Array.isArray(configOptions)) return;
 	record.acpx = applyConfigOptionsToState(record.acpx, configOptions);
 }
 function applyInitialModelSelection(record, originalModels, modelApplication) {
 	applyConfigOptionsToRecord(record, modelApplication.response);
-	syncAdvertisedModelState(record, modelApplication.response?.configOptions !== void 0 ? modelStateFromConfigOptions(modelApplication.response.configOptions) : originalModels);
-	if (modelApplication.applied) record.acpx = applyModelSelection(record.acpx, modelApplication.modelId, modelApplication.response);
+	const configOptions = modelApplication.response?.configOptions;
+	syncAdvertisedModelState(record, Array.isArray(configOptions) ? modelStateFromConfigOptions(configOptions) : originalModels);
+	if (modelApplication.applied) record.acpx = applyModelSelection(record.acpx, modelApplication.modelId, modelApplication.response, modelApplication.resolvedModelId);
 }
 function applyAcceptedConfigOptions(state, response, selection) {
 	const next = cloneSessionAcpxState(state) ?? {};
-	if (response?.configOptions === void 0) {
+	if (!Array.isArray(response?.configOptions)) {
 		const option = next.config_options?.find((entry) => entry.id === selection.configId);
 		if (option) option.currentValue = selection.value;
 		return next;
@@ -4683,22 +4794,25 @@ function reconcileDesiredConfigOptions(state, configOptions) {
 	if (desiredEntries.length > 0) state.desired_config_options = Object.fromEntries(desiredEntries);
 	else delete state.desired_config_options;
 }
-function applyModelSelection(state, modelId, response) {
+function applyModelSelection(state, modelId, response, resolvedModelId = modelId) {
 	const modelConfigId = advertisedModelState(state)?.configId;
 	const next = applyAcceptedConfigOptions(state, response, {
 		configId: modelConfigId,
-		value: modelId
+		value: resolvedModelId
 	});
 	next.session_options = {
 		...next.session_options,
 		model: modelId
 	};
-	next.current_model_id = currentModelIdFromSetModelResponse(response, modelId);
+	next.current_model_id = currentModelIdFromSetModelResponse(response, resolvedModelId);
 	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);
+function isModelConfigSelection(configId, response, modelConfigId) {
+	return configId === modelConfigId || configId === modelStateFromConfigOptions(response?.configOptions)?.configId;
+}
+function applyConfigOptionSelection(state, configId, value, response, modelConfigId = advertisedModelState(state)?.configId, resolvedValue = value) {
+	if (isModelConfigSelection(configId, response, modelConfigId)) return applyModelSelection(state, value, response, resolvedValue);
 	const next = cloneSessionAcpxState(state) ?? {};
 	next.desired_config_options = {
 		...next.desired_config_options,
@@ -4806,9 +4920,14 @@ async function replayDesiredModel(params) {
 			context: "replay"
 		}), params.suppressWarnings);
 		if (!params.models) return { replayed: false };
+		const resolvedModelId = resolveRequestedModelId({
+			requestedModel: params.desiredModelId,
+			models: params.models,
+			agentCommand: params.record.agentCommand
+		});
 		const response = await withTimeout(params.client.setSessionModel(params.sessionId, params.desiredModelId, params.models, params.replay.authority), params.timeoutMs);
 		params.replay.acknowledged = true;
-		params.record.acpx = applyModelSelection(params.record.acpx, params.desiredModelId, response);
+		params.record.acpx = applyModelSelection(params.record.acpx, params.desiredModelId, response, resolvedModelId);
 		const models = advertisedModelState(params.record.acpx);
 		if (params.verbose) process.stderr.write(`[acpx] replayed desired model ${params.desiredModelId} on ACP session ${params.sessionId} (previous ${params.previousSessionId})\n`);
 		return {
@@ -4834,9 +4953,16 @@ async function replayDesiredConfigOptions(params) {
 	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, advertisedModelState(params.record.acpx), params.replay.authority), params.timeoutMs);
+			const models = advertisedModelState(params.record.acpx);
+			const { modelConfigId, resolvedValue } = resolveRequestedConfigOption({
+				configId,
+				value,
+				models,
+				agentCommand: params.record.agentCommand
+			});
+			const response = await withTimeout(params.client.setSessionConfigOption(params.sessionId, configId, value, models, params.replay.authority), params.timeoutMs);
 			params.replay.acknowledged = true;
-			params.record.acpx = applyConfigOptionSelection(params.record.acpx, configId, value, response);
+			params.record.acpx = applyConfigOptionSelection(params.record.acpx, configId, value, response, modelConfigId, resolvedValue);
 			acceptedConfigOptions = params.record.acpx.config_options;
 			result = {
 				replayed: true,
@@ -4885,7 +5011,8 @@ async function connectAndLoadSession(options) {
 		reusingLoadedSession,
 		sameSessionOnly,
 		timeoutMs: options.timeoutMs,
-		authority: options.authority
+		authority: options.authority,
+		promptRecorded: options.promptRecorded
 	});
 	const { resumed, loadError, sessionId, createdFreshSession, pendingAgentSessionId, sessionModels } = loadState;
 	applyReconnectedModelState(record, sessionModels, loadState.configOptionsPresent, loadState.legacyModelMetadataPresent, createdFreshSession);
@@ -5084,19 +5211,32 @@ function rethrowCancelledLoad(error, authority) {
 }
 async function recoverRuntimeSessionLoadFailure(params, error) {
 	const loadError = formatErrorMessage(error);
-	if (params.sameSessionOnly) throw makeSessionResumeRequiredError({
-		record: params.record,
-		reason: loadError,
-		cause: error
-	});
-	if (!shouldFallbackToNewSession(error, params.record)) throw error;
+	if (!canRecoverLoadWithFreshSession(params, error)) {
+		if (params.sameSessionOnly) throw makeSessionResumeRequiredError({
+			record: params.record,
+			reason: loadError,
+			cause: error
+		});
+		throw error;
+	}
 	return {
 		...await createFreshRuntimeSession(params.client, params.record, params.timeoutMs, params.authority),
 		loadError
 	};
 }
+function canRecoverLoadWithFreshSession(params, error) {
+	if (!params.sameSessionOnly) return shouldFallbackToNewSession(error, params.record);
+	return isUnpromptedNewSession(params.record, params.promptRecorded) && extractAcpError(error)?.code === -32603;
+}
+function isUnpromptedNewSession(record, promptRecorded = false) {
+	return record.acpx?.session_origin === "new" && !record.importedFrom && !sessionHasAgentMessages(record) && !record.messages.includes("Resume") && (promptRecorded ? sessionHasAtMostOneUserMessage(record) : !sessionHasUserMessages(record));
+}
 async function createFreshRuntimeSession(client, record, timeoutMs, authority) {
 	const createdSession = await withTimeout(client.createSession(record.cwd, authority), timeoutMs);
+	record.acpx = {
+		...record.acpx,
+		session_origin: "new"
+	};
 	applyConfigOptionsToRecord(record, createdSession);
 	return {
 		sessionId: createdSession.sessionId,
@@ -5289,8 +5429,13 @@ async function runSessionSetModelDirect(options) {
 		replacingConfigOption: { key: "model" }
 	}, async ({ client, sessionId, record }) => {
 		const models = advertisedModelState(record.acpx);
+		const resolvedModelId = resolveRequestedModelId({
+			requestedModel: options.modelId,
+			models,
+			agentCommand: record.agentCommand
+		});
 		const response = await withTimeout(client.setSessionModel(sessionId, options.modelId, models), options.timeoutMs);
-		record.acpx = applyModelSelection(record.acpx, options.modelId, response);
+		record.acpx = applyModelSelection(record.acpx, options.modelId, response, resolvedModelId);
 		return response;
 	}));
 	return {
@@ -5304,8 +5449,14 @@ async function runSessionSetConfigOptionDirect(options) {
 		replacingConfigOption: { key: options.configId }
 	}, async ({ client, sessionId, record }) => {
 		const models = advertisedModelState(record.acpx);
+		const { modelConfigId, resolvedValue } = resolveRequestedConfigOption({
+			configId: options.configId,
+			value: options.value,
+			models,
+			agentCommand: record.agentCommand
+		});
 		const response = await withTimeout(client.setSessionConfigOption(sessionId, options.configId, options.value, models), options.timeoutMs);
-		record.acpx = applyConfigOptionSelection(record.acpx, options.configId, options.value, response, models?.configId);
+		record.acpx = applyConfigOptionSelection(record.acpx, options.configId, options.value, response, modelConfigId, resolvedValue);
 		return response;
 	}));
 	return {
@@ -5451,7 +5602,11 @@ async function setSessionModelOnOwner(options) {
 	if (!submittedToOwner) return;
 	const record = await resolveSessionRecord(options.sessionId);
 	if (!submittedToOwner.persistsControlState) {
-		record.acpx = applyModelSelection(record.acpx, options.modelId, submittedToOwner.value.response);
+		record.acpx = applyModelSelection(record.acpx, options.modelId, submittedToOwner.value.response, resolveRequestedModelId({
+			requestedModel: options.modelId,
+			models: advertisedModelState(record.acpx),
+			agentCommand: record.agentCommand
+		}));
 		await writeSessionRecord(record);
 	}
 	return {
@@ -5482,7 +5637,14 @@ async function setSessionConfigOptionOnOwner(options) {
 	if (!ownerResponse) return;
 	const record = await resolveSessionRecord(options.sessionId);
 	if (!ownerResponse.persistsControlState) {
-		record.acpx = applyConfigOptionSelection(record.acpx, options.configId, options.value, ownerResponse.value);
+		const models = advertisedModelState(record.acpx);
+		const { modelConfigId, resolvedValue } = resolveRequestedConfigOption({
+			configId: options.configId,
+			value: options.value,
+			models,
+			agentCommand: record.agentCommand
+		});
+		record.acpx = applyConfigOptionSelection(record.acpx, options.configId, options.value, ownerResponse.value, modelConfigId, resolvedValue);
 		await writeSessionRecord(record);
 	}
 	return {
@@ -5600,7 +5762,7 @@ async function closeSession(sessionId) {
 }
 //#endregion
 //#region src/session/execution/session-management.ts
-async function createSessionRecordWithClient(client, options) {
+async function createSessionRecordWithClient(client, options, resumedRecordId) {
 	const cwd = absolutePath(options.cwd);
 	await withTimeout(client.start({ signal: options.signal }), options.timeoutMs);
 	assertControlAuthority({ signal: options.signal });
@@ -5610,9 +5772,10 @@ async function createSessionRecordWithClient(client, options) {
 	const lifecycle = client.getAgentLifecycleSnapshot();
 	const record = {
 		...createInitialSessionRecord({
-			recordId: sessionId,
+			recordId: resumedRecordId ?? randomUUID(),
 			sessionId,
 			agentSessionId,
+			sessionOrigin: options.resumeSessionId ? "resume" : "new",
 			agentCommand: options.agentCommand,
 			agentArgv: options.agentArgv,
 			cwd,
@@ -5681,11 +5844,17 @@ async function resumeSessionRecordWithClient(client, options, cwd) {
 }
 async function createSessionWithClient(options) {
 	assertControlAuthority({ signal: options.signal });
+	let resumedRecordId;
 	if (options.resumeSessionId) {
 		const resumedRecord = await readSessionRecord(options.resumeSessionId);
 		assertControlAuthority({ signal: options.signal });
-		if (resumedRecord && !resumedRecord.closed && resumedRecord.agentCommand === options.agentCommand) {
-			await closeSession(resumedRecord.acpxRecordId);
+		if (resumedRecord && resumedRecord.agentCommand === options.agentCommand) {
+			resumedRecordId = resumedRecord.acpxRecordId;
+			if (!resumedRecord.closed) await closeSession(resumedRecord.acpxRecordId);
+			options = {
+				...options,
+				resumeSessionId: resumedRecord.acpSessionId
+			};
 			assertControlAuthority({ signal: options.signal });
 		}
 	}
@@ -5708,7 +5877,7 @@ async function createSessionWithClient(options) {
 	try {
 		const create = async () => {
 			assertControlAuthority({ signal: options.signal });
-			const record = await createSessionRecordWithClient(client, options);
+			const record = await createSessionRecordWithClient(client, options, resumedRecordId);
 			assertControlAuthority({ signal: options.signal });
 			return record;
 		};
@@ -6190,14 +6359,25 @@ function createOwnedSessionControls(options) {
 		},
 		setSessionModel: async (modelId, deadline) => {
 			const models = advertisedModelState(options.record.acpx);
+			const resolvedModelId = resolveRequestedModelId({
+				requestedModel: modelId,
+				models,
+				agentCommand: options.record.agentCommand
+			});
 			return await acceptControl(options, (authority) => options.client.setSessionModel(options.sessionId(), modelId, models, authority), (response) => {
-				options.record.acpx = applyModelSelection(options.record.acpx, modelId, response);
+				options.record.acpx = applyModelSelection(options.record.acpx, modelId, response, resolvedModelId);
 			}, deadline);
 		},
 		setSessionConfigOption: async (configId, value, deadline) => {
 			const models = advertisedModelState(options.record.acpx);
+			const { modelConfigId, resolvedValue } = resolveRequestedConfigOption({
+				configId,
+				value,
+				models,
+				agentCommand: options.record.agentCommand
+			});
 			return await acceptControl(options, (authority) => options.client.setSessionConfigOption(options.sessionId(), configId, value, models, authority), (response) => {
-				options.record.acpx = applyConfigOptionSelection(options.record.acpx, configId, value, response, models?.configId);
+				options.record.acpx = applyConfigOptionSelection(options.record.acpx, configId, value, response, modelConfigId, resolvedValue);
 			}, deadline);
 		}
 	};
@@ -6693,7 +6873,7 @@ async function applyPromptModelIfAdvertised(params) {
 		authority: { signal: params.signal },
 		onWarning: params.suppressWarnings ? void 0 : (message) => process.stderr.write(`[acpx] warning: ${message}\n`)
 	});
-	if (result.applied) params.record.acpx = applyModelSelection(params.record.acpx, requestedModel, result.response);
+	if (result.applied) params.record.acpx = applyModelSelection(params.record.acpx, requestedModel, result.response, result.resolvedModelId);
 }
 function jsonRpcIdKey(message) {
 	if (!("id" in message)) return;
@@ -7145,6 +7325,7 @@ async function runOwnedSessionPrompt(options) {
 					timeoutMs: options.timeoutMs,
 					verbose: options.verbose,
 					suppressWarnings: options.suppressSdkConsoleErrors,
+					promptRecorded: true,
 					activeController,
 					authority: { signal: options.ownedSignal },
 					onClientAvailable: (controller) => {
@@ -7245,8 +7426,10 @@ async function runOwnedSessionPrompt(options) {
 		record.lastUsedAt = now;
 		record.closed = false;
 		record.closedAt = void 0;
-		record.protocolVersion = client.initializeResult?.protocolVersion;
-		record.agentCapabilities = client.initializeResult?.agentCapabilities;
+		if (client.initializeResult) {
+			record.protocolVersion = client.initializeResult.protocolVersion;
+			record.agentCapabilities = client.initializeResult.agentCapabilities;
+		}
 		applyConversation(record, conversation);
 		applyLifecycleSnapshotToRecord(record, client.getAgentLifecycleSnapshot());
 		stopTotalTimer();
@@ -7256,15 +7439,20 @@ async function runOwnedSessionPrompt(options) {
 		options.ownedSignal?.throwIfAborted();
 		const { sessionId: activeSessionId, resumed, loadError } = await connectForPrompt();
 		options.ownedSignal?.throwIfAborted();
-		await applyPromptModelIfAdvertised({
-			client,
-			sessionId: activeSessionId,
-			requestedModel: options.sessionOptions?.model,
-			record,
-			timeoutMs: options.timeoutMs,
-			suppressWarnings: options.suppressSdkConsoleErrors,
-			signal: options.ownedSignal
-		});
+		try {
+			await applyPromptModelIfAdvertised({
+				client,
+				sessionId: activeSessionId,
+				requestedModel: options.sessionOptions?.model,
+				record,
+				timeoutMs: options.timeoutMs,
+				suppressWarnings: options.suppressSdkConsoleErrors,
+				signal: options.ownedSignal
+			});
+		} catch (error) {
+			if (error instanceof TimeoutError) closeClientOnExit = true;
+			throw error;
+		}
 		options.ownedSignal?.throwIfAborted();
 		output.setContext({ sessionId: record.acpxRecordId });
 		await liveCheckpoint.checkpoint();
@@ -7357,6 +7545,7 @@ async function runOnce(options, control) {
 	let promptTurnActive = false;
 	let promptTurnHadSideEffects = false;
 	let controlState = {};
+	let sawOwnedModelConfig = false;
 	const acpErrors = new AcpErrorTracker();
 	const client = new AcpClient({
 		agentCommand: options.agentCommand,
@@ -7377,7 +7566,10 @@ async function runOnce(options, control) {
 			acpErrors.observe(output, direction, message);
 		},
 		onSessionUpdate: (notification) => {
-			if (notification.update.sessionUpdate === "config_option_update") controlState = applyConfigOptionsToState(controlState, notification.update.configOptions);
+			if (notification.update.sessionUpdate === "config_option_update" && client.hasReusableSession(notification.sessionId)) {
+				controlState = applyConfigOptionsToState(controlState, notification.update.configOptions);
+				sawOwnedModelConfig ||= controlState.model_control === "config_option";
+			}
 			if (promptTurnActive) promptTurnHadSideEffects = true;
 			options.onSessionUpdate?.(notification);
 		},
@@ -7393,6 +7585,11 @@ async function runOnce(options, control) {
 	});
 	const permissionStatsBefore = client.getPermissionStats();
 	const closeOwnedClient = ownDirectClient(client, control?.signal);
+	const initializeControlState = (createdSession) => {
+		const configOptions = controlState.config_options ?? createdSession.configOptions ?? [];
+		if (createdSession.models && !sawOwnedModelConfig) applyAdvertisedModelState(controlState, createdSession.models);
+		controlState = applyConfigOptionsToState(controlState, configOptions);
+	};
 	const runExecPromptAttempt = async (sessionId) => {
 		assertControlAuthority(authority);
 		acpErrors.reset();
@@ -7425,23 +7622,28 @@ async function runOnce(options, control) {
 				});
 				assertControlAuthority(authority);
 				const sessionId = createdSession.sessionId;
-				if (createdSession.models) applyAdvertisedModelState(controlState, createdSession.models);
-				controlState = applyConfigOptionsToState(controlState, createdSession.configOptions ?? []);
+				initializeControlState(createdSession);
 				const modelApplication = await applyRequestedModelIfAdvertised({
 					client,
 					sessionId,
 					requestedModel: options.sessionOptions?.model,
-					models: createdSession.models,
+					models: advertisedModelState(controlState),
 					agentCommand: options.agentCommand,
 					timeoutMs: options.timeoutMs,
 					authority,
 					onWarning: options.suppressSdkConsoleErrors ? void 0 : (message) => process.stderr.write(`[acpx] warning: ${message}\n`)
 				});
-				if (modelApplication.applied) controlState = applyModelSelection(controlState, modelApplication.modelId, modelApplication.response);
+				if (modelApplication.applied) controlState = applyModelSelection(controlState, modelApplication.modelId, modelApplication.response, modelApplication.resolvedModelId);
 				for (const configOption of options.configOptions ?? []) {
 					assertControlAuthority(authority);
-					const response = await withTimeout(client.setSessionConfigOption(sessionId, configOption.configId, configOption.value, advertisedModelState(controlState), authority), options.timeoutMs);
-					controlState = applyConfigOptionSelection(controlState, configOption.configId, configOption.value, response);
+					const models = advertisedModelState(controlState);
+					const { modelConfigId, resolvedValue } = resolveRequestedConfigOption({
+						...configOption,
+						models,
+						agentCommand: options.agentCommand
+					});
+					const response = await withTimeout(client.setSessionConfigOption(sessionId, configOption.configId, configOption.value, models, authority), options.timeoutMs);
+					controlState = applyConfigOptionSelection(controlState, configOption.configId, configOption.value, response, modelConfigId, resolvedValue);
 				}
 				assertControlAuthority(authority);
 				output.setContext({ sessionId });
@@ -7917,6 +8119,6 @@ async function sendSession(options) {
 }
 const queueOwnerRuntimeTestInternals = { queueOwnerExitIsFatal };
 //#endregion
-export { isRequestedModelUnsupportedError as $, applyInitialModelSelection as A, reconcileAgentSessionId as B, setSessionModeOnOwner as C, connectAndLoadSession as D, withConnectedSession as E, persistSessionOptions as F, recordPromptSubmission as G, cloneSessionConversation as H, sessionOptionsFromRecord as I, advertisedModelState as J, recordSessionUpdate as K, applyConversation as L, applyRequestedModelIfAdvertised as M, setDesiredModeId as N, applyConfigOptionSelection as O, normalizeSessionOptionShape as P, RequestedModelUnsupportedError as Q, applyLifecycleSnapshotToRecord as R, setSessionMode as S, setSessionModelOnOwner as T, createSessionConversation as U, cloneSessionAcpxState as V, recordClientOperation as W, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as X, AcpClient as Y, REQUESTED_MODEL_UNSUPPORTED_REASONS as Z, cancelSessionPrompt as _, runQueuedTask as a, acquireSessionScope as at, setSessionConfigOption as b, LiveSessionCheckpoint as c, InterruptedError as ct, flushPerfMetricsCapture as d, withInterrupt as dt, getAcpxVersion as et, installPerfMetricsCapture as f, withTimeout as ft, listAgentSessions as g, ensureSession as h, runOnce as i, acquireSessionImport as it, applyModelSelection as j, applyConfigOptionsToRecord as k, runPromptTurn as l, TimeoutError as lt, createSessionWithClient as m, runSessionQueueOwner as n, DEFAULT_QUEUE_OWNER_TTL_MS as nt, sendSessionDirect as o, listSessionEvents as ot, createSession as p, trimConversationForRuntime as q, sendSession as r, normalizeQueueOwnerTtlMs as rt, DISCARD_OUTPUT_FORMATTER as s, isLegacyZedCodexAcpInvocation as st, queueOwnerRuntimeTestInternals as t, permissionModeSatisfies as tt, buildQueueOwnerArgOverride as u, assertControlAuthority as ut, closeSession as v, setSessionModel as w, setSessionConfigOptionOnOwner as x, sessionControlTestInternals as y, createInitialSessionRecord as z };
+export { isRequestedModelUnsupportedError as $, applyInitialModelSelection as A, reconcileAgentSessionId as B, setSessionModeOnOwner as C, connectAndLoadSession as D, withConnectedSession as E, persistSessionOptions as F, recordSessionUpdate as G, createSessionConversation as H, sessionOptionsFromRecord as I, advertisedModelState as J, trimConversationForRuntime as K, applyConversation as L, applyRequestedModelIfAdvertised as M, setDesiredModeId as N, applyConfigOptionSelection as O, normalizeSessionOptionShape as P, RequestedModelUnsupportedError as Q, applyLifecycleSnapshotToRecord as R, setSessionMode as S, setSessionModelOnOwner as T, recordClientOperation as U, cloneSessionConversation as V, recordPromptSubmission as W, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as X, AcpClient as Y, REQUESTED_MODEL_UNSUPPORTED_REASONS as Z, cancelSessionPrompt as _, runQueuedTask as a, normalizeQueueOwnerTtlMs as at, setSessionConfigOption as b, LiveSessionCheckpoint as c, listSessionEvents as ct, flushPerfMetricsCapture as d, TimeoutError as dt, resolveRequestedConfigOption as et, installPerfMetricsCapture as f, assertControlAuthority as ft, listAgentSessions as g, ensureSession as h, runOnce as i, DEFAULT_QUEUE_OWNER_TTL_MS as it, applyModelSelection as j, applyConfigOptionsToRecord as k, runPromptTurn as l, isLegacyZedCodexAcpInvocation as lt, createSessionWithClient as m, withTimeout as mt, runSessionQueueOwner as n, getAcpxVersion as nt, sendSessionDirect as o, acquireSessionImport as ot, createSession as p, withInterrupt as pt, cloneSessionAcpxState as q, sendSession as r, permissionModeSatisfies as rt, DISCARD_OUTPUT_FORMATTER as s, acquireSessionScope as st, queueOwnerRuntimeTestInternals as t, resolveRequestedModelId as tt, buildQueueOwnerArgOverride as u, InterruptedError as ut, closeSession as v, setSessionModel as w, setSessionConfigOptionOnOwner as x, sessionControlTestInternals as y, createInitialSessionRecord as z };
 
-//# sourceMappingURL=queue-owner-runtime-Dhr4gxNE.js.map
+//# sourceMappingURL=queue-owner-runtime-DoijBCvt.js.map