acpx 0.9.0 → 0.11.0

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

@@ -1,14 +1,14 @@
-import fs, { statSync } from "node:fs";
+import fs, { readFileSync, statSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import path from "node:path";
 import fs$1 from "node:fs/promises";
 import os from "node:os";
+import { randomUUID } from "node:crypto";
 import { execFile, spawn } from "node:child_process";
 import { Readable, Writable } from "node:stream";
-import { ClientSideConnection, PROTOCOL_VERSION } from "@agentclientprotocol/sdk";
+import { ClientSideConnection, PROTOCOL_VERSION, RequestError } from "@agentclientprotocol/sdk";
 import readline from "node:readline/promises";
 import { promisify } from "node:util";
-import { randomUUID } from "node:crypto";
 //#region src/errors.ts
 var AcpxOperationalError = class extends Error {
 	outputCode;
@@ -223,12 +223,12 @@ const SESSION_RECORD_SCHEMA = "acpx.session.v1";
 //#endregion
 //#region src/acp/error-shapes.ts
 const RESOURCE_NOT_FOUND_ACP_CODES = new Set([-32001, -32002]);
-function asRecord$7(value) {
+function asRecord$8(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
 function toAcpErrorPayload(value) {
-	const record = asRecord$7(value);
+	const record = asRecord$8(value);
 	if (!record) return;
 	if (typeof record.code !== "number" || !Number.isFinite(record.code)) return;
 	if (typeof record.message !== "string" || record.message.length === 0) return;
@@ -242,7 +242,7 @@ function extractAcpErrorInternal(value, depth) {
 	if (depth > 5) return;
 	const direct = toAcpErrorPayload(value);
 	if (direct) return direct;
-	const record = asRecord$7(value);
+	const record = asRecord$8(value);
 	if (!record) return;
 	return extractNestedAcpError(record, depth);
 }
@@ -277,7 +277,7 @@ function hasSessionNotFoundHint(value, depth = 0) {
 	if (depth > 4) return false;
 	if (isSessionNotFoundText(value)) return true;
 	if (Array.isArray(value)) return value.some((entry) => hasSessionNotFoundHint(entry, depth + 1));
-	const record = asRecord$7(value);
+	const record = asRecord$8(value);
 	if (!record) return false;
 	return Object.values(record).some((entry) => hasSessionNotFoundHint(entry, depth + 1));
 }
@@ -297,7 +297,7 @@ function isAcpResourceNotFoundError(error) {
 //#region src/acp/error-normalization.ts
 const AUTH_REQUIRED_ACP_CODES = new Set([-32e3]);
 const QUERY_CLOSED_BEFORE_RESPONSE_DETAIL = "query closed before response received";
-function asRecord$6(value) {
+function asRecord$7(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
@@ -318,7 +318,7 @@ function isAcpAuthRequiredPayload(acp) {
 	if (!acp) return false;
 	if (!AUTH_REQUIRED_ACP_CODES.has(acp.code)) return false;
 	if (isAuthRequiredMessage(acp.message)) return true;
-	const data = asRecord$6(acp.data);
+	const data = asRecord$7(acp.data);
 	if (!data) return false;
 	return hasAuthRequiredData(data);
 }
@@ -338,7 +338,7 @@ function isOutputErrorOrigin(value) {
 	return typeof value === "string" && OUTPUT_ERROR_ORIGINS.includes(value);
 }
 function readOutputErrorMeta(error) {
-	const record = asRecord$6(error);
+	const record = asRecord$7(error);
 	if (!record) return {};
 	return {
 		outputCode: isOutputErrorCode(record.outputCode) ? record.outputCode : void 0,
@@ -356,7 +356,7 @@ function isNoSessionLike(error) {
 }
 function isUsageLike(error) {
 	if (!(error instanceof Error)) return false;
-	return error.name === "CommanderError" || error.name === "InvalidArgumentError" || asRecord$6(error)?.code === "commander.invalidArgument";
+	return error.name === "CommanderError" || error.name === "InvalidArgumentError" || asRecord$7(error)?.code === "commander.invalidArgument";
 }
 function formatErrorMessage(error) {
 	return formatUnknownErrorMessage(error);
@@ -364,7 +364,7 @@ function formatErrorMessage(error) {
 function isAcpQueryClosedBeforeResponseError(error) {
 	const acp = extractAcpError(error);
 	if (!acp || acp.code !== -32603) return false;
-	const details = asRecord$6(acp.data)?.details;
+	const details = asRecord$7(acp.data)?.details;
 	if (typeof details !== "string") return false;
 	return details.toLowerCase().includes(QUERY_CLOSED_BEFORE_RESPONSE_DETAIL);
 }
@@ -432,7 +432,8 @@ function exitCodeForOutputErrorCode(code) {
 const ACP_ADAPTER_PACKAGE_RANGES = {
 	pi: "^0.0.26",
 	codex: "^0.0.44",
-	claude: "^0.36.1"
+	claude: "^0.37.0",
+	mux: "^0.27.0"
 };
 const AGENT_REGISTRY = {
 	pi: `npx pi-acp@${ACP_ADAPTER_PACKAGE_RANGES.pi}`,
@@ -443,10 +444,12 @@ const AGENT_REGISTRY = {
 	cursor: "cursor-agent acp",
 	copilot: "copilot --acp --stdio",
 	droid: "droid exec --output-format acp",
+	"fast-agent": "uvx fast-agent-mcp acp",
 	iflow: "iflow --experimental-acp",
 	kilocode: "npx -y @kilocode/cli acp",
 	kimi: "kimi acp",
 	kiro: "kiro-cli-chat acp",
+	mux: `npx -y mux@${ACP_ADAPTER_PACKAGE_RANGES.mux} acp`,
 	opencode: "npx -y opencode-ai acp",
 	qoder: "qodercli --acp",
 	qwen: "qwen --acp",
@@ -658,7 +661,7 @@ var PromptInputValidationError = class extends Error {
 		this.name = "PromptInputValidationError";
 	}
 };
-function asRecord$5(value) {
+function asRecord$6(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
@@ -676,28 +679,28 @@ function isAudioMimeType(value) {
 	return /^audio\/[A-Za-z0-9.+-]+$/i.test(value);
 }
 function isTextBlock(value) {
-	const record = asRecord$5(value);
+	const record = asRecord$6(value);
 	return record?.type === "text" && typeof record.text === "string";
 }
 function isImageBlock(value) {
-	const record = asRecord$5(value);
+	const record = asRecord$6(value);
 	return record?.type === "image" && isNonEmptyString(record.mimeType) && isImageMimeType(record.mimeType) && typeof record.data === "string" && isBase64Data(record.data);
 }
 function isAudioBlock(value) {
-	const record = asRecord$5(value);
+	const record = asRecord$6(value);
 	return record?.type === "audio" && isNonEmptyString(record.mimeType) && isAudioMimeType(record.mimeType) && typeof record.data === "string" && isBase64Data(record.data);
 }
 function isResourceLinkBlock(value) {
-	const record = asRecord$5(value);
+	const record = asRecord$6(value);
 	return record?.type === "resource_link" && isNonEmptyString(record.uri) && (record.title === void 0 || typeof record.title === "string") && (record.name === void 0 || typeof record.name === "string");
 }
 function isResourcePayload(value) {
-	const record = asRecord$5(value);
+	const record = asRecord$6(value);
 	if (!record || !isNonEmptyString(record.uri)) return false;
 	return record.text === void 0 || typeof record.text === "string";
 }
 function isResourceBlock(value) {
-	const record = asRecord$5(value);
+	const record = asRecord$6(value);
 	return record?.type === "resource" && isResourcePayload(record.resource);
 }
 const CONTENT_BLOCK_VALIDATORS = [
@@ -741,11 +744,11 @@ function validateResourceLinkContentBlock(record, index) {
 	if (record.name !== void 0 && typeof record.name !== "string") return `prompt[${index}] resource_link block name must be a string when present`;
 }
 function validateResourceContentBlock(record, index) {
-	if (!asRecord$5(record.resource)) return `prompt[${index}] resource block must include a resource object`;
+	if (!asRecord$6(record.resource)) return `prompt[${index}] resource block must include a resource object`;
 	return isResourcePayload(record.resource) ? void 0 : `prompt[${index}] resource block resource must include a non-empty uri and optional text`;
 }
 function getContentBlockValidationError(value, index) {
-	const record = asRecord$5(value);
+	const record = asRecord$6(value);
 	if (!record || typeof record.type !== "string") return `prompt[${index}] must be an ACP content block object`;
 	const validator = contentBlockErrorValidator(record.type);
 	return validator ? validator(record, index) : `prompt[${index}] has unsupported content block type ${JSON.stringify(record.type)}`;
@@ -827,6 +830,104 @@ function resourceBlockDisplayText(block) {
 	return "text" in block.resource && typeof block.resource.text === "string" ? block.resource.text : block.resource.uri;
 }
 //#endregion
+//#region src/acp/jsonrpc.ts
+function asRecord$5(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	return value;
+}
+function hasValidId(value) {
+	return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
+}
+function isErrorObject(value) {
+	const record = asRecord$5(value);
+	return !!record && typeof record.code === "number" && Number.isFinite(record.code) && typeof record.message === "string";
+}
+function hasResultOrError(value) {
+	const hasResult = Object.hasOwn(value, "result");
+	const hasError = Object.hasOwn(value, "error");
+	if (hasResult && hasError) return false;
+	if (!hasResult && !hasError) return false;
+	if (hasError && !isErrorObject(value.error)) return false;
+	return true;
+}
+function hasMethod(value) {
+	return typeof value.method === "string" && value.method.length > 0;
+}
+function isJsonRpcRequest(value) {
+	return hasMethod(value) && Object.hasOwn(value, "id") && hasValidId(value.id);
+}
+function isJsonRpcNotificationRecord(value) {
+	return hasMethod(value) && !Object.hasOwn(value, "id");
+}
+function isJsonRpcResponse(value) {
+	if (hasMethod(value) || !Object.hasOwn(value, "id") || !hasValidId(value.id)) return false;
+	return hasResultOrError(value);
+}
+function isAcpJsonRpcMessage(value) {
+	const record = asRecord$5(value);
+	if (!record || record.jsonrpc !== "2.0") return false;
+	return isJsonRpcNotificationRecord(record) || isJsonRpcRequest(record) || isJsonRpcResponse(record);
+}
+function isJsonRpcNotification(message) {
+	return Object.hasOwn(message, "method") && typeof message.method === "string" && !Object.hasOwn(message, "id");
+}
+function isSessionUpdateNotification(message) {
+	return isJsonRpcNotification(message) && message.method === "session/update";
+}
+function extractSessionUpdateNotification(message) {
+	if (!isSessionUpdateNotification(message)) return;
+	const params = asRecord$5(message.params);
+	if (!params) return;
+	const sessionId = typeof params.sessionId === "string" ? params.sessionId : null;
+	if (!sessionId) return;
+	const update = asRecord$5(params.update);
+	if (!update || typeof update.sessionUpdate !== "string") return;
+	return {
+		sessionId,
+		update
+	};
+}
+function parsePromptStopReason(message) {
+	if (!Object.hasOwn(message, "id") || !Object.hasOwn(message, "result")) return;
+	const record = asRecord$5(message.result);
+	if (!record) return;
+	return typeof record.stopReason === "string" ? record.stopReason : void 0;
+}
+function parseJsonRpcErrorMessage(message) {
+	if (!Object.hasOwn(message, "error")) return;
+	const errorRecord = asRecord$5(message.error);
+	if (!errorRecord || typeof errorRecord.message !== "string") return;
+	return errorRecord.message;
+}
+//#endregion
+//#region src/session/event-log.ts
+const DEFAULT_EVENT_SEGMENT_MAX_BYTES = 64 * 1024 * 1024;
+function sessionBaseDir$1() {
+	return path.join(os.homedir(), ".acpx", "sessions");
+}
+function safeSessionId(sessionId) {
+	return encodeURIComponent(sessionId);
+}
+function sessionEventActivePath(sessionId) {
+	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.ndjson`);
+}
+function sessionEventSegmentPath(sessionId, segment) {
+	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.${segment}.ndjson`);
+}
+function sessionEventLockPath(sessionId) {
+	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.lock`);
+}
+function defaultSessionEventLog(sessionId) {
+	return {
+		active_path: sessionEventActivePath(sessionId),
+		segment_count: 5,
+		max_segment_bytes: DEFAULT_EVENT_SEGMENT_MAX_BYTES,
+		max_segments: 5,
+		last_write_at: void 0,
+		last_write_error: null
+	};
+}
+//#endregion
 //#region src/acp/agent-session-id.ts
 const AGENT_SESSION_ID_META_KEYS = ["agentSessionId", "sessionId"];
 function normalizeAgentSessionId(value) {
@@ -889,173 +990,15 @@ function serializeSessionRecordForDisk(record) {
 		messages: canonical.messages,
 		updated_at: canonical.updated_at,
 		cumulative_token_usage: canonical.cumulative_token_usage,
+		cumulative_cost: canonical.cumulative_cost,
 		request_token_usage: canonical.request_token_usage,
-		acpx: canonical.acpx
-	};
-}
-//#endregion
-//#region src/perf-metrics.ts
-const counters = /* @__PURE__ */ new Map();
-const gauges = /* @__PURE__ */ new Map();
-const timings = /* @__PURE__ */ new Map();
-function hrNow() {
-	return process.hrtime.bigint();
-}
-function durationMs(start) {
-	return Number(process.hrtime.bigint() - start) / 1e6;
-}
-function roundMetric(value) {
-	return Number(value.toFixed(3));
-}
-function incrementPerfCounter(name, delta = 1) {
-	counters.set(name, (counters.get(name) ?? 0) + delta);
-}
-function setPerfGauge(name, value) {
-	gauges.set(name, value);
-}
-function recordPerfDuration(name, durationMsValue) {
-	const next = timings.get(name) ?? {
-		count: 0,
-		totalMs: 0,
-		maxMs: 0
-	};
-	next.count += 1;
-	next.totalMs += durationMsValue;
-	next.maxMs = Math.max(next.maxMs, durationMsValue);
-	timings.set(name, next);
-}
-async function measurePerf(name, run) {
-	const startedAt = hrNow();
-	try {
-		return await run();
-	} finally {
-		recordPerfDuration(name, durationMs(startedAt));
-	}
-}
-function startPerfTimer(name) {
-	const startedAt = hrNow();
-	return () => {
-		const elapsedMs = durationMs(startedAt);
-		recordPerfDuration(name, elapsedMs);
-		return elapsedMs;
-	};
-}
-function getPerfMetricsSnapshot() {
-	return {
-		counters: Object.fromEntries(counters.entries()),
-		gauges: Object.fromEntries(gauges.entries()),
-		timings: Object.fromEntries([...timings.entries()].map(([name, bucket]) => [name, {
-			count: bucket.count,
-			totalMs: roundMetric(bucket.totalMs),
-			maxMs: roundMetric(bucket.maxMs)
-		}]))
-	};
-}
-function resetPerfMetrics() {
-	counters.clear();
-	gauges.clear();
-	timings.clear();
-}
-function formatPerfMetric(name, durationMsValue) {
-	return `${name}=${roundMetric(durationMsValue)}ms`;
-}
-//#endregion
-//#region src/persisted-key-policy.ts
-const SNAKE_CASE_KEY = /^[a-z][a-z0-9_]*$/;
-const ZED_TAG_KEYS = new Set([
-	"User",
-	"Agent",
-	"Resume",
-	"Text",
-	"Mention",
-	"Image",
-	"Audio",
-	"Thinking",
-	"RedactedThinking",
-	"ToolUse"
-]);
-const MAP_OBJECT_PATHS = new Set(["request_token_usage", "messages.Agent.tool_results"]);
-const OPAQUE_VALUE_PATHS = new Set([
-	"agent_capabilities",
-	"messages.Agent.content.ToolUse.input",
-	"acpx.desired_config_options",
-	"acpx.config_options"
-]);
-function isRecord(value) {
-	return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function joinPath(path) {
-	return path.join(".");
-}
-function isAllowedKey(path, key) {
-	if (ZED_TAG_KEYS.has(key)) return true;
-	return false;
-}
-function shouldSkipKeyRule(path) {
-	return MAP_OBJECT_PATHS.has(joinPath(path));
-}
-function shouldSkipDescend(path) {
-	return OPAQUE_VALUE_PATHS.has(joinPath(path)) || isToolResultOutputPath(path);
-}
-function isToolResultOutputTail(path, toolResultsIndex) {
-	return toolResultsIndex !== -1 && toolResultsIndex + 2 === path.length - 1;
-}
-function isToolResultOutputPath(path) {
-	if (path.length < 5 || path[path.length - 1] !== "output") return false;
-	const toolResultsIndex = path.lastIndexOf("tool_results");
-	if (!isToolResultOutputTail(path, toolResultsIndex)) return false;
-	return path.slice(0, toolResultsIndex + 1).join(".") === "messages.Agent.tool_results";
-}
-function collectViolations(value, path, violations) {
-	if (Array.isArray(value)) {
-		for (const entry of value) collectViolations(entry, path, violations);
-		return;
-	}
-	if (!isRecord(value)) return;
-	const skipKeyRule = shouldSkipKeyRule(path);
-	for (const [key, child] of Object.entries(value)) collectKeyViolation(child, key, path, skipKeyRule, violations);
-}
-function collectKeyViolation(child, key, path, skipKeyRule, violations) {
-	if (!skipKeyRule && !SNAKE_CASE_KEY.test(key) && !isAllowedKey(path, key)) violations.push(`${joinPath(path)}.${key}`.replace(/^\./, ""));
-	const childPath = [...path, key];
-	if (!shouldSkipDescend(childPath)) collectViolations(child, childPath, violations);
-}
-function findPersistedKeyPolicyViolations(value) {
-	const violations = [];
-	collectViolations(value, [], violations);
-	return violations;
-}
-function assertPersistedKeyPolicy(value) {
-	const violations = findPersistedKeyPolicyViolations(value);
-	if (violations.length === 0) return;
-	throw new Error(`Persisted key policy violation (expected snake_case keys): ${violations.join(", ")}`);
-}
-//#endregion
-//#region src/session/event-log.ts
-const DEFAULT_EVENT_SEGMENT_MAX_BYTES = 64 * 1024 * 1024;
-function sessionBaseDir$1() {
-	return path.join(os.homedir(), ".acpx", "sessions");
-}
-function safeSessionId(sessionId) {
-	return encodeURIComponent(sessionId);
-}
-function sessionEventActivePath(sessionId) {
-	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.ndjson`);
-}
-function sessionEventSegmentPath(sessionId, segment) {
-	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.${segment}.ndjson`);
-}
-function sessionEventLockPath(sessionId) {
-	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.lock`);
-}
-function defaultSessionEventLog(sessionId) {
-	return {
-		active_path: sessionEventActivePath(sessionId),
-		segment_count: 5,
-		max_segment_bytes: DEFAULT_EVENT_SEGMENT_MAX_BYTES,
-		max_segments: 5,
-		last_write_at: void 0,
-		last_write_error: null
+		acpx: canonical.acpx,
+		imported_from: canonical.importedFrom ? {
+			record_id: canonical.importedFrom.recordId,
+			cwd_original: canonical.importedFrom.cwdOriginal,
+			exported_by: canonical.importedFrom.exportedBy,
+			exported_at: canonical.importedFrom.exportedAt
+		} : void 0
 	};
 }
 //#endregion
@@ -1070,6 +1013,43 @@ function hasOwn$1(source, key) {
 function isStringArray(value) {
 	return Array.isArray(value) && value.every((entry) => typeof entry === "string");
 }
+function hasModelConfigOption(options) {
+	if (!Array.isArray(options)) return false;
+	return options.some((entry) => {
+		const option = asRecord$4(entry);
+		return option?.category === "model" || option?.id === "model";
+	});
+}
+function parseConfigOptions(raw) {
+	if (!Array.isArray(raw) || !raw.every((entry) => asRecord$4(entry) !== void 0)) return;
+	return raw;
+}
+function parseAvailableCommand(raw) {
+	if (typeof raw === "string") {
+		const name = raw.trim();
+		return name ? { name } : void 0;
+	}
+	const record = asRecord$4(raw);
+	if (!record) return;
+	const name = parseNonEmptyString(record.name);
+	if (!name) return;
+	const description = parseNonEmptyString(record.description);
+	return {
+		name,
+		...description ? { description } : {},
+		...typeof record.has_input === "boolean" ? { has_input: record.has_input } : {}
+	};
+}
+function parseAvailableCommands(raw) {
+	if (!Array.isArray(raw)) return;
+	const commands = raw.map((entry) => parseAvailableCommand(entry)).filter((entry) => entry !== void 0);
+	return commands.length > 0 ? commands : void 0;
+}
+function parseNonEmptyString(value) {
+	if (typeof value !== "string") return;
+	const trimmed = value.trim();
+	return trimmed ? trimmed : void 0;
+}
 function parseTokenUsage(raw) {
 	if (raw === void 0 || raw === null) return;
 	const record = asRecord$4(raw);
@@ -1079,7 +1059,9 @@ function parseTokenUsage(raw) {
 		"input_tokens",
 		"output_tokens",
 		"cache_creation_input_tokens",
-		"cache_read_input_tokens"
+		"cache_read_input_tokens",
+		"thought_tokens",
+		"total_tokens"
 	]) {
 		const value = record[field];
 		if (value === void 0) continue;
@@ -1091,6 +1073,32 @@ function parseTokenUsage(raw) {
 function isNonNegativeFiniteNumber(value) {
 	return typeof value === "number" && Number.isFinite(value) && value >= 0;
 }
+function parseUsageCost(raw) {
+	if (raw === void 0 || raw === null) return;
+	const record = asRecord$4(raw);
+	if (!record) return null;
+	return parseUsageCostRecord(record);
+}
+function parseUsageCostRecord(record) {
+	const amount = parseCostAmount(record.amount);
+	const currency = parseCostCurrency(record.currency);
+	if (amount === null || currency === null) return null;
+	const cost = {
+		...amount !== void 0 ? { amount } : {},
+		...currency !== void 0 ? { currency } : {}
+	};
+	return Object.keys(cost).length > 0 ? cost : void 0;
+}
+function parseCostAmount(value) {
+	if (value === void 0) return;
+	return isNonNegativeFiniteNumber(value) ? value : null;
+}
+function parseCostCurrency(value) {
+	if (value === void 0) return;
+	if (typeof value !== "string") return null;
+	const currency = value.trim();
+	return currency.length > 0 ? currency : void 0;
+}
 function parseRequestTokenUsage(raw) {
 	if (raw === void 0 || raw === null) return;
 	const record = asRecord$4(raw);
@@ -1190,13 +1198,15 @@ function parseConversationRecord(record) {
 	const title = parseConversationTitle(record.title);
 	if (title === INVALID_VALUE) return;
 	const cumulativeTokenUsage = parseTokenUsage(record.cumulative_token_usage);
+	const cumulativeCost = parseUsageCost(record.cumulative_cost);
 	const requestTokenUsage = parseRequestTokenUsage(record.request_token_usage);
-	if (cumulativeTokenUsage === null || requestTokenUsage === null) return;
+	if (cumulativeTokenUsage === null || cumulativeCost === null || requestTokenUsage === null) return;
 	return {
 		title,
 		messages: record.messages,
 		updated_at: record.updated_at,
 		cumulative_token_usage: cumulativeTokenUsage ?? {},
+		cumulative_cost: cumulativeCost,
 		request_token_usage: requestTokenUsage ?? {}
 	};
 }
@@ -1216,13 +1226,20 @@ function parseAcpxState(raw) {
 	assignStringState(state, "current_mode_id", record.current_mode_id);
 	assignStringState(state, "desired_mode_id", record.desired_mode_id);
 	assignDesiredConfigOptions(state, record.desired_config_options);
-	assignStringState(state, "current_model_id", record.current_model_id);
-	if (isStringArray(record.available_models)) state.available_models = [...record.available_models];
-	if (isStringArray(record.available_commands)) state.available_commands = [...record.available_commands];
-	if (Array.isArray(record.config_options)) state.config_options = record.config_options;
+	assignParsedModelState(state, record);
+	const availableCommands = parseAvailableCommands(record.available_commands);
+	if (availableCommands) state.available_commands = availableCommands;
 	assignParsedSessionOptions(state, record.session_options);
 	return state;
 }
+function assignParsedModelState(state, record) {
+	assignStringState(state, "current_model_id", record.current_model_id);
+	if (isStringArray(record.available_models)) state.available_models = [...record.available_models];
+	if (record.model_control === "config_option" || record.model_control === "legacy_set_model") state.model_control = record.model_control;
+	const configOptions = parseConfigOptions(record.config_options);
+	if (configOptions) state.config_options = configOptions;
+	if (state.model_control === void 0 && state.available_models !== void 0) state.model_control = hasModelConfigOption(state.config_options) ? "config_option" : "legacy_set_model";
+}
 function assignBooleanTrue(state, key, value) {
 	if (value === true) state[key] = true;
 }
@@ -1283,6 +1300,27 @@ function hasValidEventLogCore(record) {
 function isPositiveInteger(value) {
 	return typeof value === "number" && Number.isInteger(value) && value > 0;
 }
+function parseImportedFrom(raw) {
+	if (raw == null) return;
+	const record = asRecord$4(raw);
+	if (!record || typeof record.record_id !== "string" || typeof record.cwd_original !== "string" || typeof record.exported_by !== "string" || typeof record.exported_at !== "string") return null;
+	return {
+		recordId: record.record_id,
+		cwdOriginal: record.cwd_original,
+		exportedBy: record.exported_by,
+		exportedAt: record.exported_at
+	};
+}
+function parseSessionRecordMetadata(record) {
+	const lastRequestId = normalizeOptionalString(record.last_request_id);
+	if (lastRequestId === null) return null;
+	const importedFrom = parseImportedFrom(record.imported_from);
+	if (importedFrom === null) return null;
+	return {
+		lastRequestId,
+		importedFrom
+	};
+}
 function normalizeOptionalName(value) {
 	if (value == null) return;
 	if (typeof value !== "string") return null;
@@ -1334,8 +1372,8 @@ function parseSessionRecord(raw) {
 	const conversation = parseConversationRecord(record);
 	if (!conversation) return null;
 	const eventLog = parseEventLog(record.event_log, record.acpx_record_id);
-	const lastRequestId = normalizeOptionalString(record.last_request_id);
-	if (lastRequestId === null) return null;
+	const metadata = parseSessionRecordMetadata(record);
+	if (!metadata) return null;
 	return {
 		schema: SESSION_RECORD_SCHEMA,
 		acpxRecordId: record.acpx_record_id,
@@ -1347,7 +1385,7 @@ function parseSessionRecord(raw) {
 		createdAt: record.created_at,
 		lastUsedAt: record.last_used_at,
 		lastSeq: record.last_seq,
-		lastRequestId,
+		lastRequestId: metadata.lastRequestId,
 		eventLog,
 		closed: optionals.closed,
 		closedAt: optionals.closedAt,
@@ -1364,38 +1402,177 @@ function parseSessionRecord(raw) {
 		messages: conversation.messages,
 		updated_at: conversation.updated_at,
 		cumulative_token_usage: conversation.cumulative_token_usage,
+		cumulative_cost: conversation.cumulative_cost,
 		request_token_usage: conversation.request_token_usage,
-		acpx: parseAcpxState(record.acpx)
+		acpx: parseAcpxState(record.acpx),
+		importedFrom: metadata.importedFrom
 	};
 }
-function hasValidSessionRecordCore(record) {
-	return hasStringFields(record, [
-		"acpx_record_id",
-		"acp_session_id",
-		"agent_command",
-		"cwd",
-		"created_at",
-		"last_used_at"
-	]) && typeof record.last_seq === "number" && Number.isInteger(record.last_seq) && record.last_seq >= 0;
+function hasValidSessionRecordCore(record) {
+	return hasStringFields(record, [
+		"acpx_record_id",
+		"acp_session_id",
+		"agent_command",
+		"cwd",
+		"created_at",
+		"last_used_at"
+	]) && typeof record.last_seq === "number" && Number.isInteger(record.last_seq) && record.last_seq >= 0;
+}
+function validSessionOptionals(options) {
+	if (hasNullOptionalSessionFields(options) || hasInvalidExitStatus(options)) return null;
+	return options;
+}
+function hasNullOptionalSessionFields(options) {
+	return [
+		options.name,
+		options.pid,
+		options.closed,
+		options.closedAt,
+		options.agentStartedAt,
+		options.lastPromptAt,
+		options.lastAgentExitAt,
+		options.lastAgentDisconnectReason
+	].some((value) => value === null);
+}
+function hasInvalidExitStatus(options) {
+	return typeof options.lastAgentExitCode === "symbol" || typeof options.lastAgentExitSignal === "symbol";
+}
+//#endregion
+//#region src/perf-metrics.ts
+const counters = /* @__PURE__ */ new Map();
+const gauges = /* @__PURE__ */ new Map();
+const timings = /* @__PURE__ */ new Map();
+function hrNow() {
+	return process.hrtime.bigint();
+}
+function durationMs(start) {
+	return Number(process.hrtime.bigint() - start) / 1e6;
+}
+function roundMetric(value) {
+	return Number(value.toFixed(3));
+}
+function incrementPerfCounter(name, delta = 1) {
+	counters.set(name, (counters.get(name) ?? 0) + delta);
+}
+function setPerfGauge(name, value) {
+	gauges.set(name, value);
+}
+function recordPerfDuration(name, durationMsValue) {
+	const next = timings.get(name) ?? {
+		count: 0,
+		totalMs: 0,
+		maxMs: 0
+	};
+	next.count += 1;
+	next.totalMs += durationMsValue;
+	next.maxMs = Math.max(next.maxMs, durationMsValue);
+	timings.set(name, next);
+}
+async function measurePerf(name, run) {
+	const startedAt = hrNow();
+	try {
+		return await run();
+	} finally {
+		recordPerfDuration(name, durationMs(startedAt));
+	}
+}
+function startPerfTimer(name) {
+	const startedAt = hrNow();
+	return () => {
+		const elapsedMs = durationMs(startedAt);
+		recordPerfDuration(name, elapsedMs);
+		return elapsedMs;
+	};
+}
+function getPerfMetricsSnapshot() {
+	return {
+		counters: Object.fromEntries(counters.entries()),
+		gauges: Object.fromEntries(gauges.entries()),
+		timings: Object.fromEntries([...timings.entries()].map(([name, bucket]) => [name, {
+			count: bucket.count,
+			totalMs: roundMetric(bucket.totalMs),
+			maxMs: roundMetric(bucket.maxMs)
+		}]))
+	};
+}
+function resetPerfMetrics() {
+	counters.clear();
+	gauges.clear();
+	timings.clear();
+}
+function formatPerfMetric(name, durationMsValue) {
+	return `${name}=${roundMetric(durationMsValue)}ms`;
+}
+//#endregion
+//#region src/persisted-key-policy.ts
+const SNAKE_CASE_KEY = /^[a-z][a-z0-9_]*$/;
+const ZED_TAG_KEYS = new Set([
+	"User",
+	"Agent",
+	"Resume",
+	"Text",
+	"Mention",
+	"Image",
+	"Audio",
+	"Thinking",
+	"RedactedThinking",
+	"ToolUse"
+]);
+const MAP_OBJECT_PATHS = new Set(["request_token_usage", "messages.Agent.tool_results"]);
+const OPAQUE_VALUE_PATHS = new Set([
+	"agent_capabilities",
+	"messages.Agent.content.ToolUse.input",
+	"acpx.desired_config_options",
+	"acpx.config_options"
+]);
+function isRecord(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function joinPath(path) {
+	return path.join(".");
+}
+function isAllowedKey(path, key) {
+	if (ZED_TAG_KEYS.has(key)) return true;
+	return false;
+}
+function shouldSkipKeyRule(path) {
+	return MAP_OBJECT_PATHS.has(joinPath(path));
+}
+function shouldSkipDescend(path) {
+	return OPAQUE_VALUE_PATHS.has(joinPath(path)) || isToolResultOutputPath(path);
+}
+function isToolResultOutputTail(path, toolResultsIndex) {
+	return toolResultsIndex !== -1 && toolResultsIndex + 2 === path.length - 1;
 }
-function validSessionOptionals(options) {
-	if (hasNullOptionalSessionFields(options) || hasInvalidExitStatus(options)) return null;
-	return options;
+function isToolResultOutputPath(path) {
+	if (path.length < 5 || path[path.length - 1] !== "output") return false;
+	const toolResultsIndex = path.lastIndexOf("tool_results");
+	if (!isToolResultOutputTail(path, toolResultsIndex)) return false;
+	return path.slice(0, toolResultsIndex + 1).join(".") === "messages.Agent.tool_results";
 }
-function hasNullOptionalSessionFields(options) {
-	return [
-		options.name,
-		options.pid,
-		options.closed,
-		options.closedAt,
-		options.agentStartedAt,
-		options.lastPromptAt,
-		options.lastAgentExitAt,
-		options.lastAgentDisconnectReason
-	].some((value) => value === null);
+function collectViolations(value, path, violations) {
+	if (Array.isArray(value)) {
+		for (const entry of value) collectViolations(entry, path, violations);
+		return;
+	}
+	if (!isRecord(value)) return;
+	const skipKeyRule = shouldSkipKeyRule(path);
+	for (const [key, child] of Object.entries(value)) collectKeyViolation(child, key, path, skipKeyRule, violations);
 }
-function hasInvalidExitStatus(options) {
-	return typeof options.lastAgentExitCode === "symbol" || typeof options.lastAgentExitSignal === "symbol";
+function collectKeyViolation(child, key, path, skipKeyRule, violations) {
+	if (!skipKeyRule && !SNAKE_CASE_KEY.test(key) && !isAllowedKey(path, key)) violations.push(`${joinPath(path)}.${key}`.replace(/^\./, ""));
+	const childPath = [...path, key];
+	if (!shouldSkipDescend(childPath)) collectViolations(child, childPath, violations);
+}
+function findPersistedKeyPolicyViolations(value) {
+	const violations = [];
+	collectViolations(value, [], violations);
+	return violations;
+}
+function assertPersistedKeyPolicy(value) {
+	const violations = findPersistedKeyPolicyViolations(value);
+	if (violations.length === 0) return;
+	throw new Error(`Persisted key policy violation (expected snake_case keys): ${violations.join(", ")}`);
 }
 //#endregion
 //#region src/session/persistence/index.ts
@@ -2204,6 +2381,49 @@ function buildTerminalShellSpawnCommand(command, platform = process.platform) {
 	};
 }
 //#endregion
+//#region src/version.ts
+const UNKNOWN_VERSION = "0.0.0-unknown";
+const MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
+let cachedVersion = null;
+function parseVersion(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function readPackageVersion(packageJsonPath) {
+	try {
+		return parseVersion(JSON.parse(readFileSync(packageJsonPath, "utf8")).version);
+	} catch {
+		return null;
+	}
+}
+function resolveVersionFromAncestors(startDir) {
+	let current = startDir;
+	while (true) {
+		const packageVersion = readPackageVersion(path.join(current, "package.json"));
+		if (packageVersion) return packageVersion;
+		const parent = path.dirname(current);
+		if (parent === current) return null;
+		current = parent;
+	}
+}
+function resolveAcpxVersion(params) {
+	const envVersion = resolvePackageEnvVersion(params?.env ?? process.env);
+	if (envVersion) return envVersion;
+	if (params?.packageJsonPath) return readPackageVersion(params.packageJsonPath) ?? UNKNOWN_VERSION;
+	return resolveVersionFromAncestors(MODULE_DIR) ?? UNKNOWN_VERSION;
+}
+function resolvePackageEnvVersion(env) {
+	const envPackageName = parseVersion(env.npm_package_name);
+	const envVersion = parseVersion(env.npm_package_version);
+	return envPackageName === "acpx" ? envVersion : null;
+}
+function getAcpxVersion() {
+	if (cachedVersion) return cachedVersion;
+	cachedVersion = resolveAcpxVersion();
+	return cachedVersion;
+}
+//#endregion
 //#region src/acp/client-process.ts
 const execFileAsync = promisify(execFile);
 function isoNow$1() {
@@ -2379,6 +2599,7 @@ const GEMINI_ACP_FLAG_VERSION = [
 	0
 ];
 const COPILOT_HELP_TIMEOUT_MS = 2e3;
+const CLAUDE_CODE_DEFAULT_SETTING_SOURCES = ["project", "local"];
 const QODER_BENIGN_STDOUT_LINES = new Set(["Received interrupt signal. Cleaning up resources...", "Cleanup completed. Exiting..."]);
 function resolveAgentCloseAfterStdinEndMs(agentCommand) {
 	const { command } = splitCommandLine(agentCommand);
@@ -2401,6 +2622,9 @@ function isCopilotAcpCommand(command, args) {
 function isQoderAcpCommand(command, args) {
 	return basenameToken(command) === "qodercli" && args.includes("--acp");
 }
+function isDevinAcpCommand(command, args) {
+	return basenameToken(command) === "devin" && (args.includes("acp") || args.includes("--acp") || args.includes("--experimental-acp"));
+}
 function hasCommandFlag(args, flagName) {
 	return args.some((arg) => arg === flagName || arg.startsWith(`${flagName}=`));
 }
@@ -2541,16 +2765,20 @@ async function ensureCopilotAcpSupport(command) {
 	const helpOutput = await readCommandOutput(command, ["--help"], COPILOT_HELP_TIMEOUT_MS);
 	if (typeof helpOutput === "string" && !helpOutput.includes("--acp")) throw new CopilotAcpUnsupportedError(await buildCopilotAcpUnsupportedMessage(command), { retryable: false });
 }
-function buildClaudeCodeOptionsMeta(options) {
-	if (!options) return;
+function buildClaudeCodeOptionsMeta(options, isolateUserSettings = false) {
 	const claudeCodeOptions = {};
-	assignClaudeCodeOptions(claudeCodeOptions, options);
+	if (isolateUserSettings) claudeCodeOptions.settingSources = resolveClaudeCodeSettingSources();
+	if (options) assignClaudeCodeOptions(claudeCodeOptions, options);
 	const meta = {};
 	if (Object.keys(claudeCodeOptions).length > 0) meta.claudeCode = { options: claudeCodeOptions };
-	assignClaudeCodeSystemPrompt(meta, options.systemPrompt);
+	assignClaudeCodeSystemPrompt(meta, options?.systemPrompt);
 	if (Object.keys(meta).length === 0) return;
 	return meta;
 }
+function resolveClaudeCodeSettingSources(env = process.env) {
+	if (env.ACPX_CLAUDE_INCLUDE_USER_SETTINGS?.trim() === "1") return ["user", ...CLAUDE_CODE_DEFAULT_SETTING_SOURCES];
+	return [...CLAUDE_CODE_DEFAULT_SETTING_SOURCES];
+}
 function assignClaudeCodeOptions(target, options) {
 	if (typeof options.model === "string" && options.model.trim().length > 0) target.model = options.model;
 	if (Array.isArray(options.allowedTools)) target.allowedTools = [...options.allowedTools];
@@ -2642,74 +2870,96 @@ function buildAgentSpawnOptions(cwd, authCredentials) {
 	};
 }
 //#endregion
-//#region src/acp/jsonrpc.ts
+//#region src/acp/model-support.ts
+var RequestedModelUnsupportedError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "RequestedModelUnsupportedError";
+	}
+};
+function supportsLegacyClaudeCodeModelMetadata(agentCommand) {
+	if (!agentCommand) return false;
+	const { command, args } = splitCommandLine(agentCommand);
+	return isClaudeAcpCommand(command, args);
+}
 function asRecord$2(value) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
-function hasValidId(value) {
-	return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
-}
-function isErrorObject(value) {
-	const record = asRecord$2(value);
-	return !!record && typeof record.code === "number" && Number.isFinite(record.code) && typeof record.message === "string";
-}
-function hasResultOrError(value) {
-	const hasResult = Object.hasOwn(value, "result");
-	const hasError = Object.hasOwn(value, "error");
-	if (hasResult && hasError) return false;
-	if (!hasResult && !hasError) return false;
-	if (hasError && !isErrorObject(value.error)) return false;
-	return true;
-}
-function hasMethod(value) {
-	return typeof value.method === "string" && value.method.length > 0;
-}
-function isJsonRpcRequest(value) {
-	return hasMethod(value) && Object.hasOwn(value, "id") && hasValidId(value.id);
-}
-function isJsonRpcNotificationRecord(value) {
-	return hasMethod(value) && !Object.hasOwn(value, "id");
-}
-function isJsonRpcResponse(value) {
-	if (hasMethod(value) || !Object.hasOwn(value, "id") || !hasValidId(value.id)) return false;
-	return hasResultOrError(value);
-}
-function isAcpJsonRpcMessage(value) {
-	const record = asRecord$2(value);
-	if (!record || record.jsonrpc !== "2.0") return false;
-	return isJsonRpcNotificationRecord(record) || isJsonRpcRequest(record) || isJsonRpcResponse(record);
-}
-function isJsonRpcNotification(message) {
-	return Object.hasOwn(message, "method") && typeof message.method === "string" && !Object.hasOwn(message, "id");
+function parseAvailableModel(value) {
+	const option = asRecord$2(value);
+	if (!option || typeof option.value !== "string" || typeof option.name !== "string") return;
+	return {
+		modelId: option.value,
+		name: option.name
+	};
 }
-function isSessionUpdateNotification(message) {
-	return isJsonRpcNotification(message) && message.method === "session/update";
+function parseAvailableModelGroup(value) {
+	const group = asRecord$2(value);
+	if (!group || typeof group.group !== "string" || typeof group.name !== "string" || !Array.isArray(group.options)) return;
+	const models = group.options.map((option) => parseAvailableModel(option));
+	return models.every((model) => model !== void 0) ? models : void 0;
+}
+function parseAvailableModels(value) {
+	if (!Array.isArray(value)) return;
+	const directModels = value.map((option) => parseAvailableModel(option));
+	if (directModels.every((model) => model !== void 0)) return directModels;
+	const groupedModels = value.map((group) => parseAvailableModelGroup(group));
+	return groupedModels.every((models) => models !== void 0) ? groupedModels.flat() : void 0;
+}
+function isModelSelectOption(option) {
+	return option.type === "select" && (option.category === "model" || option.id === "model");
+}
+function parseModelConfigOption(value) {
+	const option = asRecord$2(value);
+	if (!option || !isModelSelectOption(option) || typeof option.id !== "string" || typeof option.currentValue !== "string") return;
+	const availableModels = parseAvailableModels(option.options);
+	return availableModels ? {
+		configId: option.id,
+		currentModelId: option.currentValue,
+		availableModels
+	} : void 0;
 }
-function extractSessionUpdateNotification(message) {
-	if (!isSessionUpdateNotification(message)) return;
-	const params = asRecord$2(message.params);
-	if (!params) return;
-	const sessionId = typeof params.sessionId === "string" ? params.sessionId : null;
-	if (!sessionId) return;
-	const update = asRecord$2(params.update);
-	if (!update || typeof update.sessionUpdate !== "string") return;
+function modelStateFromConfigOptions(configOptions) {
+	if (!Array.isArray(configOptions)) return;
+	for (const value of configOptions) {
+		const models = parseModelConfigOption(value);
+		if (models) return models;
+	}
+}
+function modelStateFromLegacyResponse(response) {
+	if (!response || typeof response !== "object") return;
+	const models = response.models;
+	if (!models || typeof models.currentModelId !== "string" || !Array.isArray(models.availableModels)) return;
+	const availableModels = models.availableModels.flatMap((entry) => {
+		if (!entry || typeof entry !== "object") return [];
+		const candidate = entry;
+		return typeof candidate.modelId === "string" && typeof candidate.name === "string" ? [{
+			modelId: candidate.modelId,
+			name: candidate.name
+		}] : [];
+	});
 	return {
-		sessionId,
-		update
+		currentModelId: models.currentModelId,
+		availableModels
 	};
 }
-function parsePromptStopReason(message) {
-	if (!Object.hasOwn(message, "id") || !Object.hasOwn(message, "result")) return;
-	const record = asRecord$2(message.result);
-	if (!record) return;
-	return typeof record.stopReason === "string" ? record.stopReason : void 0;
+function modelStateFromSessionResponse(params) {
+	return modelStateFromConfigOptions(params.configOptions) ?? modelStateFromLegacyResponse(params.response);
 }
-function parseJsonRpcErrorMessage(message) {
-	if (!Object.hasOwn(message, "error")) return;
-	const errorRecord = asRecord$2(message.error);
-	if (!errorRecord || typeof errorRecord.message !== "string") return;
-	return errorRecord.message;
+function formatAvailableModelIds(models) {
+	const ids = models?.availableModels.map((model) => model.modelId.trim()).filter((modelId) => modelId.length > 0) ?? [];
+	return ids.length > 0 ? ids.join(", ") : "none advertised";
+}
+function assertRequestedModelSupported(params) {
+	if (!params.models) {
+		if (supportsLegacyClaudeCodeModelMetadata(params.agentCommand)) return;
+		throw new RequestedModelUnsupportedError(`Cannot ${params.context === "replay" ? "replay saved model" : "apply --model"} "${params.requestedModel}": the ACP agent did not advertise model support through a session config option or legacy models metadata, and the adapter does not support a startup model flag.`);
+	}
+	if (!new Set(params.models.availableModels.map((model) => model.modelId)).has(params.requestedModel)) {
+		if (supportsLegacyClaudeCodeModelMetadata(params.agentCommand)) return `requested model "${params.requestedModel}" was not in the Claude ACP advertised model list (${formatAvailableModelIds(params.models)}); forwarding it to Claude Code so the adapter can accept or reject it.`;
+		throw new RequestedModelUnsupportedError(`Cannot ${params.context === "replay" ? "replay saved model" : "apply --model"} "${params.requestedModel}": the ACP agent did not advertise that model. Available models: ${formatAvailableModelIds(params.models)}.`);
+	}
 }
 //#endregion
 //#region src/acp/session-control-errors.ts
@@ -3328,11 +3578,54 @@ const DRAIN_POLL_INTERVAL_MS = 20;
 const AGENT_CLOSE_TERM_GRACE_MS = 1500;
 const AGENT_CLOSE_KILL_GRACE_MS = 1e3;
 const STARTUP_STDERR_MAX_CHARS = 8192;
+const DEVIN_COMPATIBILITY_CLIENT_CAPABILITIES_META = Object.freeze({ "cognition.ai/requestDiagnostics": true });
+const DEVIN_COMPATIBILITY_CLIENT_NAME = "windsurf";
+const DEFAULT_DEVIN_COMPATIBILITY_CLIENT_VERSION = "1.110.1";
+function resolveClientInfo(devinAcp) {
+	if (!devinAcp) return {
+		name: "acpx",
+		version: getAcpxVersion()
+	};
+	return {
+		name: DEVIN_COMPATIBILITY_CLIENT_NAME,
+		version: process.env.ACPX_DEVIN_WINDSURF_VERSION ?? DEFAULT_DEVIN_COMPATIBILITY_CLIENT_VERSION
+	};
+}
+function resolveClientCapabilities(params) {
+	const baseCapabilities = {
+		fs: {
+			readTextFile: true,
+			writeTextFile: true
+		},
+		terminal: params.terminal
+	};
+	if (!params.devinAcp) return baseCapabilities;
+	return {
+		...baseCapabilities,
+		_meta: DEVIN_COMPATIBILITY_CLIENT_CAPABILITIES_META
+	};
+}
+function isDevinRequestDiagnosticsMethod(method) {
+	return method === "_cognition.ai/request_diagnostics";
+}
+function hasResponseField(response, field) {
+	return !!response && typeof response === "object" && field in response;
+}
+function normalizeResponseConfigOptions(response) {
+	if (!response || !("configOptions" in response)) return;
+	return response.configOptions ?? [];
+}
 function toReconnectedSessionResult(response) {
+	const configOptions = normalizeResponseConfigOptions(response);
 	return {
 		agentSessionId: extractRuntimeSessionId(response?._meta),
-		configOptions: response?.configOptions ?? void 0,
-		models: response?.models ?? void 0
+		configOptions,
+		models: modelStateFromSessionResponse({
+			configOptions,
+			response
+		}),
+		configOptionsPresent: hasResponseField(response, "configOptions"),
+		legacyModelMetadataPresent: hasResponseField(response, "models")
 	};
 }
 function childProcessIsRunning(agent) {
@@ -3431,6 +3724,8 @@ var AcpClient = class {
 	lastKnownPid;
 	promptPermissionFailures = /* @__PURE__ */ new Map();
 	pendingConnectionRequests = /* @__PURE__ */ new Set();
+	modelConfigIds = /* @__PURE__ */ new Map();
+	legacyModelSessionIds = /* @__PURE__ */ new Set();
 	constructor(options) {
 		this.options = {
 			...options,
@@ -3542,7 +3837,7 @@ var AcpClient = class {
 		const input = Writable.toWeb(child.stdin);
 		const output = Readable.toWeb(child.stdout);
 		const stream = this.createTappedStream(createNdJsonMessageStream(this.options.agentCommand, input, output));
-		const connection = this.createConnection(stream);
+		const connection = this.createConnection(stream, launch);
 		connection.signal.addEventListener("abort", () => {
 			this.recordAgentExit("connection_close", child.exitCode ?? null, child.signalCode ?? null);
 		}, { once: true });
@@ -3566,6 +3861,7 @@ var AcpClient = class {
 			spawnCommand,
 			args,
 			resolvedBuiltInLaunch,
+			devinAcp: isDevinAcpCommand(spawnCommand, args),
 			geminiAcp: isGeminiAcpCommand(spawnCommand, args),
 			copilotAcp: isCopilotAcpCommand(spawnCommand, args),
 			claudeAcp: isClaudeAcpCommand(spawnCommand, args),
@@ -3602,7 +3898,7 @@ var AcpClient = class {
 		}
 		return requireAgentStdio(spawnedChild);
 	}
-	createConnection(stream) {
+	createConnection(stream, launch) {
 		return new ClientSideConnection(() => ({
 			sessionUpdate: async (params) => {
 				await this.handleSessionUpdate(params);
@@ -3610,6 +3906,10 @@ var AcpClient = class {
 			requestPermission: async (params) => {
 				return this.handlePermissionRequest(params);
 			},
+			extMethod: async (method) => {
+				if (launch.devinAcp && isDevinRequestDiagnosticsMethod(method)) return {};
+				throw RequestError.methodNotFound(method);
+			},
 			readTextFile: async (params) => {
 				return this.handleReadTextFile(params);
 			},
@@ -3630,12 +3930,13 @@ var AcpClient = class {
 			},
 			releaseTerminal: async (params) => {
 				return this.handleReleaseTerminal(params);
-			}
+			},
+			extNotification: async () => {}
 		}), stream);
 	}
 	async initializeAgentConnection(params) {
 		try {
-			const initResult = await Promise.race([this.initializeProtocolConnection(params.connection, params.launch.geminiAcp), params.startupFailure.promise]);
+			const initResult = await Promise.race([this.initializeProtocolConnection(params.connection, params.launch), params.startupFailure.promise]);
 			params.startupFailure.dispose();
 			this.connection = params.connection;
 			this.agent = params.child;
@@ -3645,22 +3946,16 @@ var AcpClient = class {
 			await this.handleInitializeFailure(params, error);
 		}
 	}
-	async initializeProtocolConnection(connection, geminiAcp) {
+	async initializeProtocolConnection(connection, launch) {
 		const initializePromise = connection.initialize({
 			protocolVersion: PROTOCOL_VERSION,
-			clientCapabilities: {
-				fs: {
-					readTextFile: true,
-					writeTextFile: true
-				},
+			clientCapabilities: resolveClientCapabilities({
+				devinAcp: launch.devinAcp,
 				terminal: this.options.terminal !== false
-			},
-			clientInfo: {
-				name: "acpx",
-				version: "0.1.0"
-			}
+			}),
+			clientInfo: resolveClientInfo(launch.devinAcp)
 		});
-		const initialized = geminiAcp ? await withTimeout(initializePromise, resolveGeminiAcpStartupTimeoutMs()) : await initializePromise;
+		const initialized = launch.geminiAcp ? await withTimeout(initializePromise, resolveGeminiAcpStartupTimeoutMs()) : await initializePromise;
 		await this.authenticateIfRequired(connection, initialized.authMethods ?? []);
 		return initialized;
 	}
@@ -3723,7 +4018,7 @@ var AcpClient = class {
 			const createPromise = this.runConnectionRequest(() => connection.newSession({
 				cwd: sessionCwd,
 				mcpServers: this.options.mcpServers ?? [],
-				_meta: buildClaudeCodeOptionsMeta(this.options.sessionOptions)
+				_meta: buildClaudeCodeOptionsMeta(this.options.sessionOptions, claudeAcp)
 			}));
 			result = claudeAcp ? await withTimeout(createPromise, resolveClaudeAcpSessionCreateTimeoutMs()) : await createPromise;
 		} catch (error) {
@@ -3734,11 +4029,19 @@ var AcpClient = class {
 			throw error;
 		}
 		this.loadedSessionId = result.sessionId;
+		const configOptions = normalizeResponseConfigOptions(result);
+		const models = modelStateFromSessionResponse({
+			configOptions,
+			response: result
+		});
+		this.rememberSessionModels(result.sessionId, models);
 		return {
 			sessionId: result.sessionId,
 			agentSessionId: extractRuntimeSessionId(result._meta),
-			configOptions: result.configOptions ?? void 0,
-			models: result.models ?? void 0
+			configOptions,
+			models,
+			configOptionsPresent: hasResponseField(result, "configOptions"),
+			legacyModelMetadataPresent: hasResponseField(result, "models")
 		};
 	}
 	async loadSession(sessionId, cwd = this.options.cwd) {
@@ -3761,7 +4064,9 @@ var AcpClient = class {
 			this.restoreSessionUpdateSuppression(previousSuppression);
 		}
 		this.loadedSessionId = sessionId;
-		return toReconnectedSessionResult(response);
+		const result = toReconnectedSessionResult(response);
+		this.updateRememberedSessionModels(sessionId, result);
+		return result;
 	}
 	async resumeSession(sessionId, cwd = this.options.cwd) {
 		const connection = this.getConnection();
@@ -3772,7 +4077,9 @@ var AcpClient = class {
 			mcpServers: this.options.mcpServers ?? []
 		}));
 		this.loadedSessionId = sessionId;
-		return toReconnectedSessionResult(response);
+		const result = toReconnectedSessionResult(response);
+		this.updateRememberedSessionModels(sessionId, result);
+		return result;
 	}
 	applySessionUpdateSuppression(enabled) {
 		const previous = {
@@ -3855,21 +4162,73 @@ var AcpClient = class {
 			throw maybeWrapSessionControlError("session/set_config_option", error, `for "${configId}"="${value}"`);
 		}
 	}
-	async setSessionModel(sessionId, modelId) {
+	async setSessionModel(sessionId, modelId, controlOverride) {
+		const control = this.resolveModelControl(sessionId, controlOverride);
+		if (!control) throw new RequestedModelUnsupportedError(`Cannot set model "${modelId}": the ACP session did not advertise a model config option or legacy session/set_model support.`);
+		return control.kind === "config_option" ? await this.setSessionModelThroughConfig(sessionId, modelId, control.configId) : await this.setSessionModelThroughLegacyMethod(sessionId, modelId);
+	}
+	async setSessionModelThroughConfig(sessionId, modelId, configId) {
+		const connection = this.getConnection();
+		try {
+			const response = await this.runConnectionRequest(() => connection.setSessionConfigOption({
+				sessionId,
+				configId,
+				value: modelId
+			}));
+			this.rememberSessionModels(sessionId, modelStateFromConfigOptions(response.configOptions));
+			return response;
+		} catch (error) {
+			return this.throwSessionModelError("session/set_config_option", modelId, error);
+		}
+	}
+	async setSessionModelThroughLegacyMethod(sessionId, modelId) {
 		const connection = this.getConnection();
 		try {
-			await this.runConnectionRequest(() => connection.unstable_setSessionModel({
+			await this.runConnectionRequest(() => connection.extMethod("session/set_model", {
 				sessionId,
 				modelId
 			}));
+			return;
 		} catch (error) {
-			const wrapped = maybeWrapSessionControlError("session/set_model", error, `for model "${modelId}"`);
-			if (wrapped !== error) throw wrapped;
-			const acp = extractAcpError(error);
-			const summary = acp ? formatSessionControlAcpSummary(acp) : error instanceof Error ? error.message : String(error);
-			if (error instanceof Error) throw new Error(`Failed session/set_model for model "${modelId}": ${summary}`, { cause: error });
-			throw new Error(`Failed session/set_model for model "${modelId}": ${summary}`, { cause: error });
+			return this.throwSessionModelError("session/set_model", modelId, error);
+		}
+	}
+	throwSessionModelError(method, modelId, error) {
+		const wrapped = maybeWrapSessionControlError(method, error, `for model "${modelId}"`);
+		if (wrapped !== error) throw wrapped;
+		const acp = extractAcpError(error);
+		const summary = acp ? formatSessionControlAcpSummary(acp) : error instanceof Error ? error.message : String(error);
+		throw new Error(`Failed ${method} for model "${modelId}": ${summary}`, { cause: error });
+	}
+	resolveModelControl(sessionId, controlOverride) {
+		if (controlOverride) return controlOverride.configId ? {
+			kind: "config_option",
+			configId: controlOverride.configId
+		} : { kind: "legacy_set_model" };
+		const configId = this.modelConfigIds.get(sessionId);
+		if (configId) return {
+			kind: "config_option",
+			configId
+		};
+		return this.legacyModelSessionIds.has(sessionId) ? { kind: "legacy_set_model" } : void 0;
+	}
+	rememberSessionModels(sessionId, models) {
+		if (!models) {
+			this.modelConfigIds.delete(sessionId);
+			this.legacyModelSessionIds.delete(sessionId);
+			return;
+		}
+		if (models.configId) {
+			this.modelConfigIds.set(sessionId, models.configId);
+			this.legacyModelSessionIds.delete(sessionId);
+			return;
 		}
+		this.modelConfigIds.delete(sessionId);
+		this.legacyModelSessionIds.add(sessionId);
+	}
+	updateRememberedSessionModels(sessionId, result) {
+		const explicitConfigRemoval = result.configOptionsPresent && this.modelConfigIds.has(sessionId);
+		if (result.models || result.legacyModelMetadataPresent || explicitConfigRemoval) this.rememberSessionModels(sessionId, result.models);
 	}
 	async cancel(sessionId) {
 		const connection = this.getConnection();
@@ -3881,6 +4240,8 @@ var AcpClient = class {
 		const connection = this.getConnection();
 		await this.runConnectionRequest(() => connection.closeSession({ sessionId }));
 		if (this.loadedSessionId === sessionId) this.loadedSessionId = void 0;
+		this.modelConfigIds.delete(sessionId);
+		this.legacyModelSessionIds.delete(sessionId);
 	}
 	async listSessions(params = {}) {
 		const connection = this.getConnection();
@@ -3929,6 +4290,8 @@ var AcpClient = class {
 		this.permissionAbortControllers.clear();
 		this.promptPermissionFailures.clear();
 		this.loadedSessionId = void 0;
+		this.modelConfigIds.clear();
+		this.legacyModelSessionIds.clear();
 		this.initResult = void 0;
 		this.connection = void 0;
 		this.agent = void 0;
@@ -3982,7 +4345,7 @@ var AcpClient = class {
 		target.push(text);
 		if (target.join("").length - STARTUP_STDERR_MAX_CHARS <= 0) return;
 		const joined = target.join("");
-		target.splice(0, target.length, joined.slice(-STARTUP_STDERR_MAX_CHARS));
+		target.splice(0, target.length, joined.slice(-8192));
 	}
 	summarizeStartupStderr(target) {
 		const joined = target.join("").trim();
@@ -4341,6 +4704,7 @@ function applyConversation(record, conversation) {
 	record.updated_at = conversation.updated_at;
 	record.messages = conversation.messages;
 	record.cumulative_token_usage = conversation.cumulative_token_usage;
+	record.cumulative_cost = conversation.cumulative_cost;
 	record.request_token_usage = conversation.request_token_usage;
 }
 //#endregion
@@ -4416,6 +4780,51 @@ function nonEmptyString(value) {
 	return typeof value === "string" && value.trim().length > 0 ? value : void 0;
 }
 //#endregion
+//#region src/session/model-state.ts
+function configOptionsAreAuthoritative(state) {
+	return state.model_control === "config_option";
+}
+function legacyModelState(state) {
+	if (!Array.isArray(state.available_models)) return;
+	return {
+		currentModelId: state.current_model_id ?? "",
+		availableModels: state.available_models.map((modelId) => ({
+			modelId,
+			name: modelId
+		}))
+	};
+}
+function advertisedModelState(state) {
+	if (!state) return;
+	const configModels = modelStateFromConfigOptions(state?.config_options);
+	if (configModels) return configModels;
+	if (configOptionsAreAuthoritative(state)) return;
+	return legacyModelState(state);
+}
+function applyAdvertisedModelState(state, models) {
+	state.current_model_id = models.currentModelId;
+	state.available_models = models.availableModels.map((model) => model.modelId);
+	state.model_control = models.configId ? "config_option" : "legacy_set_model";
+}
+function clearAdvertisedModelState(state) {
+	delete state.current_model_id;
+	delete state.available_models;
+	delete state.model_control;
+}
+function removeModelConfigOptions(state) {
+	if (!state.config_options) return;
+	state.config_options = state.config_options.filter((option) => option.category !== "model" && option.id !== "model");
+}
+function applyConfigOptionsModelState(state, configOptions) {
+	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);
+	const models = modelStateFromConfigOptions(configOptions);
+	if (models) applyAdvertisedModelState(state, models);
+	else if (preservesLegacyControl) state.model_control = "legacy_set_model";
+	else clearAdvertisedModelState(state);
+}
+//#endregion
 //#region src/session/conversation-model.ts
 const MAX_RUNTIME_MESSAGES = 200;
 const MAX_RUNTIME_AGENT_TEXT_CHARS = 8e3;
@@ -4436,10 +4845,25 @@ function hasOwn(source, key) {
 	return Object.prototype.hasOwnProperty.call(source, key);
 }
 function normalizeAgentName(value) {
+	return trimmedString(value);
+}
+function trimmedString(value) {
 	if (typeof value !== "string") return;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : void 0;
 }
+function normalizeAvailableCommand(value) {
+	const record = asRecord(value);
+	if (!record) return;
+	const name = trimmedString(record.name);
+	if (!name) return;
+	const description = trimmedString(record.description);
+	return {
+		name,
+		...description ? { description } : {},
+		has_input: record.input != null
+	};
+}
 function extractText(content) {
 	switch (content.type) {
 		case "text": return content.text;
@@ -4667,7 +5091,9 @@ function usageToTokenUsage(update) {
 			"cache_read_input_tokens",
 			"cacheReadInputTokens",
 			"cachedReadTokens"
-		])
+		]),
+		thought_tokens: numberField(source, ["thought_tokens", "thoughtTokens"]),
+		total_tokens: numberField(source, ["total_tokens", "totalTokens"])
 	};
 	if (!hasTokenUsageValue(normalized)) return;
 	return normalized;
@@ -4675,6 +5101,21 @@ function usageToTokenUsage(update) {
 function hasTokenUsageValue(usage) {
 	return Object.values(usage).some((value) => value !== void 0);
 }
+function usageCost(update) {
+	const cost = asRecord(asRecord(update)?.cost);
+	if (!cost) return;
+	return buildUsageCost(numberField(cost, ["amount"]), stringField(cost.currency));
+}
+function stringField(value) {
+	return typeof value === "string" && value.trim() ? value : void 0;
+}
+function buildUsageCost(amount, currency) {
+	const cost = {
+		...amount !== void 0 ? { amount } : {},
+		...currency !== void 0 ? { currency } : {}
+	};
+	return Object.keys(cost).length > 0 ? cost : void 0;
+}
 function ensureAcpxState$1(state) {
 	return state ?? {};
 }
@@ -4690,6 +5131,7 @@ function createSessionConversation(timestamp = isoNow()) {
 		messages: [],
 		updated_at: timestamp,
 		cumulative_token_usage: {},
+		cumulative_cost: void 0,
 		request_token_usage: {}
 	};
 }
@@ -4700,9 +5142,13 @@ function cloneSessionConversation(conversation) {
 		messages: deepClone(conversation.messages ?? []),
 		updated_at: conversation.updated_at,
 		cumulative_token_usage: deepClone(conversation.cumulative_token_usage ?? {}),
+		cumulative_cost: cloneUsageCost(conversation.cumulative_cost),
 		request_token_usage: deepClone(conversation.request_token_usage ?? {})
 	};
 }
+function cloneUsageCost(cost) {
+	return cost ? { ...cost } : void 0;
+}
 function cloneSessionAcpxState(state) {
 	if (!state) return;
 	return {
@@ -4711,7 +5157,8 @@ function cloneSessionAcpxState(state) {
 		desired_config_options: state.desired_config_options ? { ...state.desired_config_options } : void 0,
 		current_model_id: state.current_model_id,
 		available_models: state.available_models ? [...state.available_models] : void 0,
-		available_commands: state.available_commands ? [...state.available_commands] : void 0,
+		model_control: state.model_control,
+		available_commands: state.available_commands ? state.available_commands.map((command) => ({ ...command })) : void 0,
 		config_options: state.config_options ? deepClone(state.config_options) : void 0,
 		session_options: cloneSessionOptions(state.session_options)
 	};
@@ -4792,13 +5239,13 @@ const SESSION_UPDATE_HANDLERS = {
 		if (update.sessionUpdate === "session_info_update") applySessionInfoUpdate(conversation, update);
 	},
 	available_commands_update: (_conversation, acpx, update) => {
-		if (update.sessionUpdate === "available_commands_update") acpx.available_commands = update.availableCommands.map((entry) => entry.name).filter((entry) => typeof entry === "string" && entry.trim().length > 0);
+		if (update.sessionUpdate === "available_commands_update") acpx.available_commands = update.availableCommands.map((entry) => normalizeAvailableCommand(entry)).filter((entry) => entry !== void 0);
 	},
 	current_mode_update: (_conversation, acpx, update) => {
 		if (update.sessionUpdate === "current_mode_update") acpx.current_mode_id = update.currentModeId;
 	},
 	config_option_update: (_conversation, acpx, update) => {
-		if (update.sessionUpdate === "config_option_update") acpx.config_options = deepClone(update.configOptions);
+		if (update.sessionUpdate === "config_option_update") applyConfigOptionsModelState(acpx, deepClone(update.configOptions));
 	}
 };
 function appendUserMessageChunk(conversation, content) {
@@ -4815,10 +5262,14 @@ function appendAgentMessageChunk(conversation, content, append) {
 }
 function applyUsageUpdate(conversation, update) {
 	const usage = usageToTokenUsage(update);
-	if (!usage) return;
-	conversation.cumulative_token_usage = usage;
-	const userId = lastUserMessageId(conversation);
-	if (userId) conversation.request_token_usage[userId] = usage;
+	const cost = usageCost(update);
+	if (!usage && !cost) return;
+	if (usage) {
+		conversation.cumulative_token_usage = usage;
+		const userId = lastUserMessageId(conversation);
+		if (userId) conversation.request_token_usage[userId] = usage;
+	}
+	if (cost) conversation.cumulative_cost = cost;
 }
 function applySessionInfoUpdate(conversation, update) {
 	if (hasOwn(update, "title")) conversation.title = update.title ?? null;
@@ -4831,10 +5282,10 @@ function recordClientOperation(conversation, state, operation, timestamp = isoNo
 	return acpx;
 }
 function trimConversationForRuntime(conversation) {
-	if (conversation.messages.length > MAX_RUNTIME_MESSAGES) conversation.messages = conversation.messages.slice(-MAX_RUNTIME_MESSAGES);
+	if (conversation.messages.length > MAX_RUNTIME_MESSAGES) conversation.messages = conversation.messages.slice(-200);
 	for (const message of conversation.messages) trimRuntimeMessage(message);
 	const requestUsageEntries = Object.entries(conversation.request_token_usage);
-	if (requestUsageEntries.length > MAX_RUNTIME_REQUEST_TOKEN_USAGE) conversation.request_token_usage = Object.fromEntries(requestUsageEntries.slice(-MAX_RUNTIME_REQUEST_TOKEN_USAGE));
+	if (requestUsageEntries.length > MAX_RUNTIME_REQUEST_TOKEN_USAGE) conversation.request_token_usage = Object.fromEntries(requestUsageEntries.slice(-100));
 }
 function trimRuntimeMessage(message) {
 	if (isUserMessage(message)) {
@@ -4864,12 +5315,15 @@ function trimRuntimeToolResult(result) {
 }
 //#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;
-	const acpxState = cloneSessionAcpxState(record.acpx) ?? {};
-	acpxState.config_options = structuredClone(configOptions);
-	record.acpx = acpxState;
+	record.acpx = applyConfigOptionsToState(record.acpx, configOptions);
 }
 //#endregion
 //#region src/session/mode-preference.ts
@@ -4915,10 +5369,18 @@ function setDesiredConfigOption(record, configId, value) {
 	else delete acpx.desired_config_options;
 	record.acpx = acpx;
 }
+function clearDesiredConfigOption(state, configId) {
+	const normalizedConfigId = normalizeModeId(configId);
+	if (!normalizedConfigId || !state.desired_config_options) return;
+	const desired = { ...state.desired_config_options };
+	delete desired[normalizedConfigId];
+	if (Object.keys(desired).length > 0) state.desired_config_options = desired;
+	else delete state.desired_config_options;
+}
 function getDesiredModelId(state) {
 	return normalizeModelId(state?.session_options?.model);
 }
-function setDesiredModelId(record, modelId) {
+function setDesiredModelId(record, modelId, modelConfigId) {
 	const acpx = ensureAcpxState(record.acpx);
 	const normalized = normalizeModelId(modelId);
 	const sessionOptions = { ...acpx.session_options };
@@ -4926,6 +5388,7 @@ function setDesiredModelId(record, modelId) {
 	else delete sessionOptions.model;
 	if (typeof sessionOptions.model === "string" || Array.isArray(sessionOptions.allowed_tools) || typeof sessionOptions.max_turns === "number" || sessionOptions.system_prompt !== void 0) acpx.session_options = sessionOptions;
 	else delete acpx.session_options;
+	clearDesiredConfigOption(acpx, modelConfigId ?? modelStateFromConfigOptions(acpx.config_options)?.configId);
 	record.acpx = acpx;
 }
 function setCurrentModelId(record, modelId) {
@@ -4938,49 +5401,30 @@ function setCurrentModelId(record, modelId) {
 function syncAdvertisedModelState(record, models) {
 	if (!models) return;
 	const acpx = ensureAcpxState(record.acpx);
-	acpx.current_model_id = models.currentModelId;
-	acpx.available_models = models.availableModels.map((model) => model.modelId);
+	applyAdvertisedModelState(acpx, models);
 	record.acpx = acpx;
 }
 //#endregion
-//#region src/acp/model-support.ts
-var RequestedModelUnsupportedError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "RequestedModelUnsupportedError";
-	}
-};
-function supportsLegacyClaudeCodeModelMetadata(agentCommand) {
-	if (!agentCommand) return false;
-	const { command, args } = splitCommandLine(agentCommand);
-	return isClaudeAcpCommand(command, args);
-}
-function formatAvailableModelIds(models) {
-	const ids = models?.availableModels.map((model) => model.modelId.trim()).filter((modelId) => modelId.length > 0) ?? [];
-	return ids.length > 0 ? ids.join(", ") : "none advertised";
-}
-function assertRequestedModelSupported(params) {
-	if (!params.models) {
-		if (supportsLegacyClaudeCodeModelMetadata(params.agentCommand)) return;
-		throw new RequestedModelUnsupportedError(`Cannot ${params.context === "replay" ? "replay saved model" : "apply --model"} "${params.requestedModel}": the ACP agent did not advertise model support. Generic model selection requires ACP models plus session/set_model support, or an adapter-specific startup model flag.`);
-	}
-	if (!new Set(params.models.availableModels.map((model) => model.modelId)).has(params.requestedModel)) throw new RequestedModelUnsupportedError(`Cannot ${params.context === "replay" ? "replay saved model" : "apply --model"} "${params.requestedModel}": the ACP agent did not advertise that model. Available models: ${formatAvailableModelIds(params.models)}.`);
-}
-//#endregion
 //#region src/session/model-application.ts
+function currentModelIdFromSetModelResponse(response, fallbackModelId) {
+	return modelStateFromConfigOptions(response?.configOptions)?.currentModelId ?? fallbackModelId;
+}
 async function applyRequestedModelIfAdvertised(params) {
 	const requestedModel = typeof params.requestedModel === "string" ? params.requestedModel.trim() : "";
-	if (!requestedModel) return false;
-	assertRequestedModelSupported({
+	if (!requestedModel) return { applied: false };
+	const warning = assertRequestedModelSupported({
 		requestedModel,
 		models: params.models,
 		agentCommand: params.agentCommand,
 		context: "apply"
 	});
-	if (!params.models) return false;
-	if (params.models.currentModelId === requestedModel) return true;
-	await withTimeout(params.client.setSessionModel(params.sessionId, requestedModel), params.timeoutMs);
-	return true;
+	if (warning) params.onWarning?.(warning);
+	if (!params.models) return { applied: false };
+	if (params.models.currentModelId === requestedModel) return { applied: true };
+	return {
+		applied: true,
+		response: await withTimeout(params.client.setSessionModel(params.sessionId, requestedModel, params.models), params.timeoutMs)
+	};
 }
 //#endregion
 //#region src/runtime/engine/reconnect.ts
@@ -5028,17 +5472,27 @@ async function replayDesiredMode(params) {
 	}
 }
 async function replayDesiredModel(params) {
-	if (!params.desiredModelId) return;
+	if (!params.desiredModelId) return { replayed: false };
 	try {
-		assertRequestedModelSupported({
+		emitModelSupportWarning(assertRequestedModelSupported({
 			requestedModel: params.desiredModelId,
 			models: params.models,
 			agentCommand: params.record.agentCommand,
 			context: "replay"
-		});
-		if (!params.models || params.models.currentModelId === params.desiredModelId) return;
-		await withTimeout(params.client.setSessionModel(params.sessionId, params.desiredModelId), params.timeoutMs);
+		}), params.suppressWarnings);
+		if (!params.models || params.models.currentModelId === params.desiredModelId) return { replayed: false };
+		const response = await withTimeout(params.client.setSessionModel(params.sessionId, params.desiredModelId, params.models), params.timeoutMs);
+		applyConfigOptionsToRecord(params.record, 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`);
+		return {
+			replayed: true,
+			models,
+			configOptionsPresent: response !== void 0
+		};
 	} catch (error) {
 		throw new SessionModelReplayError(`Failed to replay saved session model ${params.desiredModelId} on fresh ACP session ${params.sessionId}: ${formatErrorMessage(error)}`, {
 			cause: error instanceof Error ? error : void 0,
@@ -5046,9 +5500,18 @@ async function replayDesiredModel(params) {
 		});
 	}
 }
+function emitModelSupportWarning(warning, suppressWarnings) {
+	if (warning && !suppressWarnings) process.stderr.write(`[acpx] warning: ${warning}\n`);
+}
 async function replayDesiredConfigOptions(params) {
+	let result = { replayed: false };
 	for (const [configId, value] of Object.entries(params.desiredConfigOptions)) try {
-		await withTimeout(params.client.setSessionConfigOption(params.sessionId, configId, value), params.timeoutMs);
+		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)}`, {
@@ -5056,6 +5519,7 @@ async function replayDesiredConfigOptions(params) {
 			retryable: true
 		});
 	}
+	return result;
 }
 function restoreOriginalSessionState(params) {
 	params.record.acpSessionId = params.sessionId;
@@ -5064,9 +5528,10 @@ function restoreOriginalSessionState(params) {
 async function connectAndLoadSession(options) {
 	const record = options.record;
 	const client = options.client;
-	const sameSessionOnly = requiresSameSession(options.resumePolicy);
+	const sameSessionOnly = requiresSameSession(options.resumePolicy) || Boolean(record.importedFrom);
 	const originalSessionId = record.acpSessionId;
 	const originalAgentSessionId = record.agentSessionId;
+	const originalAcpx = cloneSessionAcpxState(record.acpx);
 	const desiredModeId = getDesiredModeId(record.acpx);
 	const desiredModelId = getDesiredModelId(record.acpx);
 	const desiredConfigOptions = getDesiredConfigOptions(record.acpx);
@@ -5099,7 +5564,7 @@ async function connectAndLoadSession(options) {
 	createdFreshSession = loadState.createdFreshSession;
 	pendingAgentSessionId = loadState.pendingAgentSessionId;
 	sessionModels = loadState.sessionModels;
-	await replayFreshSessionPreferences({
+	const preferenceReplay = await replayFreshSessionPreferences({
 		client,
 		record,
 		createdFreshSession,
@@ -5107,14 +5572,16 @@ async function connectAndLoadSession(options) {
 		pendingAgentSessionId,
 		originalSessionId,
 		originalAgentSessionId,
+		originalAcpx,
 		desiredModeId,
 		desiredModelId,
 		desiredConfigOptions,
 		sessionModels,
 		timeoutMs: options.timeoutMs,
-		verbose: options.verbose
+		verbose: options.verbose,
+		suppressWarnings: options.suppressWarnings
 	});
-	applyReconnectedModelState(record, sessionModels, createdFreshSession, desiredModelId);
+	applyReconnectedModelState(record, resolveModelsAfterReplay(preferenceReplay, sessionModels), resolveConfigOptionsPresenceAfterReplay(preferenceReplay, loadState.configOptionsPresent), loadState.legacyModelMetadataPresent, createdFreshSession);
 	options.onSessionIdResolved?.(sessionId);
 	return {
 		sessionId,
@@ -5123,9 +5590,28 @@ async function connectAndLoadSession(options) {
 		loadError
 	};
 }
-function applyReconnectedModelState(record, sessionModels, createdFreshSession, desiredModelId) {
-	syncAdvertisedModelState(record, sessionModels);
-	if (createdFreshSession && desiredModelId && sessionModels) setCurrentModelId(record, desiredModelId);
+function resolveModelsAfterReplay(replay, initialModels) {
+	if (replay.configReplay.replayed) return replay.configReplay.models ?? preserveLegacyModels(replay.modelReplay.replayed ? replay.modelReplay.models : initialModels);
+	return replay.modelReplay.replayed ? replay.modelReplay.models : initialModels;
+}
+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;
+}
+function applyReconnectedModelState(record, sessionModels, configOptionsPresent, legacyModelMetadataPresent, createdFreshSession) {
+	clearOmittedFreshSessionConfigOptions(record, createdFreshSession, configOptionsPresent);
+	if (sessionModels) {
+		if (legacyModelMetadataPresent && !sessionModels.configId && record.acpx) removeModelConfigOptions(record.acpx);
+		syncAdvertisedModelState(record, sessionModels);
+	} else clearRemovedModelState(record, legacyModelMetadataPresent || createdFreshSession);
+}
+function clearOmittedFreshSessionConfigOptions(record, createdFreshSession, configOptionsPresent) {
+	if (createdFreshSession && !configOptionsPresent && record.acpx) delete record.acpx.config_options;
+}
+function clearRemovedModelState(record, shouldClear) {
+	if (shouldClear && record.acpx) clearAdvertisedModelState(record.acpx);
 }
 function logReconnectAttempt(record, storedProcessAlive, shouldReconnect, verbose) {
 	if (!verbose) return;
@@ -5136,7 +5622,12 @@ 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;
+	if (!params.createdFreshSession) return {
+		modelReplay: { replayed: false },
+		configReplay: { replayed: false }
+	};
+	let modelReplay = { replayed: false };
+	let configReplay = { replayed: false };
 	try {
 		await replayDesiredMode({
 			client: params.client,
@@ -5146,7 +5637,7 @@ async function replayFreshSessionPreferences(params) {
 			timeoutMs: params.timeoutMs,
 			verbose: params.verbose
 		});
-		await replayDesiredModel({
+		modelReplay = await replayDesiredModel({
 			client: params.client,
 			sessionId: params.sessionId,
 			desiredModelId: params.desiredModelId,
@@ -5154,10 +5645,12 @@ async function replayFreshSessionPreferences(params) {
 			record: params.record,
 			models: params.sessionModels,
 			timeoutMs: params.timeoutMs,
-			verbose: params.verbose
+			verbose: params.verbose,
+			suppressWarnings: params.suppressWarnings
 		});
-		await replayDesiredConfigOptions({
+		configReplay = await replayDesiredConfigOptions({
 			client: params.client,
+			record: params.record,
 			sessionId: params.sessionId,
 			desiredConfigOptions: params.desiredConfigOptions,
 			previousSessionId: params.originalSessionId,
@@ -5170,17 +5663,24 @@ async function replayFreshSessionPreferences(params) {
 			sessionId: params.originalSessionId,
 			agentSessionId: params.originalAgentSessionId
 		});
+		params.record.acpx = cloneSessionAcpxState(params.originalAcpx);
 		if (params.verbose) process.stderr.write(`[acpx] ${formatErrorMessage(error)}\n`);
 		throw error;
 	}
 	params.record.acpSessionId = params.sessionId;
 	reconcileAgentSessionId(params.record, params.pendingAgentSessionId);
+	return {
+		modelReplay,
+		configReplay
+	};
 }
 async function loadOrCreateRuntimeSession(params) {
 	if (params.reusingLoadedSession) return {
 		sessionId: params.record.acpSessionId,
 		pendingAgentSessionId: params.record.agentSessionId,
 		sessionModels: void 0,
+		configOptionsPresent: false,
+		legacyModelMetadataPresent: false,
 		resumed: true,
 		createdFreshSession: false
 	};
@@ -5201,6 +5701,8 @@ async function resumeRuntimeSession(params) {
 			sessionId: params.record.acpSessionId,
 			pendingAgentSessionId: params.record.agentSessionId,
 			sessionModels: resumeResult.models,
+			configOptionsPresent: resumeResult.configOptionsPresent,
+			legacyModelMetadataPresent: resumeResult.legacyModelMetadataPresent,
 			resumed: true,
 			createdFreshSession: false
 		};
@@ -5217,6 +5719,8 @@ async function loadRuntimeSession(params) {
 			sessionId: params.record.acpSessionId,
 			pendingAgentSessionId: params.record.agentSessionId,
 			sessionModels: loadResult.models,
+			configOptionsPresent: loadResult.configOptionsPresent,
+			legacyModelMetadataPresent: loadResult.legacyModelMetadataPresent,
 			resumed: true,
 			createdFreshSession: false
 		};
@@ -5244,6 +5748,8 @@ async function createFreshRuntimeSession(client, record, timeoutMs) {
 		sessionId: createdSession.sessionId,
 		pendingAgentSessionId: createdSession.agentSessionId,
 		sessionModels: createdSession.models,
+		configOptionsPresent: createdSession.configOptionsPresent,
+		legacyModelMetadataPresent: createdSession.legacyModelMetadataPresent,
 		resumed: false,
 		createdFreshSession: true
 	};
@@ -5259,7 +5765,10 @@ function createActiveSessionController(params) {
 			await params.client.setSessionMode(getActiveSessionId(), modeId);
 		},
 		setSessionModel: async (modelId) => {
-			await params.client.setSessionModel(getActiveSessionId(), modelId);
+			const models = advertisedModelState(params.record.acpx);
+			const response = await params.client.setSessionModel(getActiveSessionId(), modelId, models);
+			applyConfigOptionsToRecord(params.record, response);
+			return response;
 		},
 		setSessionConfigOption: async (configId, value) => {
 			return await params.client.setSessionConfigOption(getActiveSessionId(), configId, value);
@@ -5297,6 +5806,7 @@ async function withConnectedSession(options) {
 	let notifiedClientAvailable = false;
 	const activeController = createActiveSessionController({
 		client,
+		record,
 		getActiveSessionId: () => activeSessionIdForControl
 	});
 	try {
@@ -5440,6 +5950,6 @@ var LiveSessionCheckpoint = class {
 	}
 };
 //#endregion
-export { getPerfMetricsSnapshot as $, parsePromptStopReason as A, EXIT_CODES as At, normalizeName as B, QueueProtocolError as Bt, applyConversation as C, formatErrorMessage as Ct, extractSessionUpdateNotification as D, isAcpResourceNotFoundError as Dt, AcpClient as E, extractAcpError as Et, findSession as F, PERMISSION_MODES as Ft, DEFAULT_EVENT_SEGMENT_MAX_BYTES as G, resolveSessionRecord as H, findSessionByDirectoryWalk as I, PERMISSION_POLICY_ACTIONS as It, sessionEventActivePath as J, defaultSessionEventLog as K, isoNow$2 as L, SESSION_RECORD_SCHEMA as Lt, DEFAULT_HISTORY_LIMIT as M, OUTPUT_ERROR_CODES as Mt, absolutePath as N, OUTPUT_ERROR_ORIGINS as Nt, isAcpJsonRpcMessage as O, toAcpErrorPayload as Ot, findGitRepositoryRoot as P, OUTPUT_FORMATS as Pt, formatPerfMetric as Q, listSessions as R, AgentSpawnError as Rt, sessionOptionsFromRecord as S, exitCodeForOutputErrorCode as St, reconcileAgentSessionId as T, normalizeOutputError as Tt, writeSessionRecord as U, pruneSessions as V, parseSessionRecord as W, sessionEventSegmentPath as X, sessionEventLockPath as Y, assertPersistedKeyPolicy as Z, recordPromptSubmission as _, withTimeout as _t, applyRequestedModelIfAdvertised as a, startPerfTimer as at, mergeSessionOptions as b, normalizeAgentName$1 as bt, setDesiredConfigOption as c, PromptInputValidationError as ct, syncAdvertisedModelState as d, parsePromptSource as dt, incrementPerfCounter as et, applyConfigOptionsToRecord as f, promptToDisplayText as ft, recordClientOperation as g, withInterrupt as gt, createSessionConversation as h, TimeoutError as ht, connectAndLoadSession as i, setPerfGauge as it, permissionModeSatisfies as j, NON_INTERACTIVE_PERMISSION_POLICIES as jt, parseJsonRpcErrorMessage as k, AUTH_POLICIES as kt, setDesiredModeId as l, isPromptInput as lt, cloneSessionConversation as m, InterruptedError as mt, runPromptTurn as n, recordPerfDuration as nt, assertRequestedModelSupported as o, serializeSessionRecordForDisk as ot, cloneSessionAcpxState as p, textPrompt as pt, sessionBaseDir$1 as q, withConnectedSession as r, resetPerfMetrics as rt, setCurrentModelId as s, normalizeRuntimeSessionId as st, LiveSessionCheckpoint as t, measurePerf as tt, setDesiredModelId as u, mergePromptSourceWithText as ut, recordSessionUpdate as v, DEFAULT_AGENT_NAME as vt, applyLifecycleSnapshotToRecord as w, isRetryablePromptError as wt, persistSessionOptions as x, resolveAgentCommand as xt, trimConversationForRuntime as y, listBuiltInAgents as yt, listSessionsForAgent as z, QueueConnectionError as zt };
+export { setPerfGauge as $, assertRequestedModelSupported as A, isRetryablePromptError as At, listSessions as B, OUTPUT_FORMATS as Bt, mergeSessionOptions as C, withTimeout as Ct, applyLifecycleSnapshotToRecord as D, resolveAgentCommand as Dt, applyConversation as E, normalizeAgentName$1 as Et, absolutePath as F, AUTH_POLICIES as Ft, writeSessionRecord as G, AgentSpawnError as Gt, normalizeName as H, PERMISSION_POLICY_ACTIONS as Ht, findGitRepositoryRoot as I, EXIT_CODES as It, getPerfMetricsSnapshot as J, assertPersistedKeyPolicy as K, QueueConnectionError as Kt, findSession as L, NON_INTERACTIVE_PERMISSION_POLICIES as Lt, getAcpxVersion as M, extractAcpError as Mt, permissionModeSatisfies as N, isAcpResourceNotFoundError as Nt, reconcileAgentSessionId as O, exitCodeForOutputErrorCode as Ot, DEFAULT_HISTORY_LIMIT as P, toAcpErrorPayload as Pt, resetPerfMetrics as Q, findSessionByDirectoryWalk as R, OUTPUT_ERROR_CODES as Rt, advertisedModelState as S, withInterrupt as St, sessionOptionsFromRecord as T, listBuiltInAgents as Tt, pruneSessions as U, SESSION_RECORD_SCHEMA as Ut, listSessionsForAgent as V, PERMISSION_MODES as Vt, resolveSessionRecord as W, AcpxOperationalError as Wt, measurePerf as X, incrementPerfCounter as Y, recordPerfDuration as Z, createSessionConversation as _, parsePromptSource as _t, applyRequestedModelIfAdvertised as a, defaultSessionEventLog as at, recordSessionUpdate as b, InterruptedError as bt, setCurrentModelId as c, sessionEventLockPath as ct, setDesiredModelId as d, isAcpJsonRpcMessage as dt, startPerfTimer as et, syncAdvertisedModelState as f, parseJsonRpcErrorMessage as ft, cloneSessionConversation as g, mergePromptSourceWithText as gt, cloneSessionAcpxState as h, isPromptInput as ht, connectAndLoadSession as i, DEFAULT_EVENT_SEGMENT_MAX_BYTES as it, modelStateFromConfigOptions as j, normalizeOutputError as jt, AcpClient as k, formatErrorMessage as kt, setDesiredConfigOption as l, sessionEventSegmentPath as lt, applyConfigOptionsToState as m, PromptInputValidationError as mt, runPromptTurn as n, serializeSessionRecordForDisk as nt, currentModelIdFromSetModelResponse as o, sessionBaseDir$1 as ot, applyConfigOptionsToRecord as p, parsePromptStopReason as pt, formatPerfMetric as q, QueueProtocolError as qt, withConnectedSession as r, normalizeRuntimeSessionId as rt, clearDesiredConfigOption as s, sessionEventActivePath as st, LiveSessionCheckpoint as t, parseSessionRecord as tt, setDesiredModeId as u, extractSessionUpdateNotification as ut, recordClientOperation as v, promptToDisplayText as vt, persistSessionOptions as w, DEFAULT_AGENT_NAME as wt, trimConversationForRuntime as x, TimeoutError as xt, recordPromptSubmission as y, textPrompt as yt, isoNow$2 as z, OUTPUT_ERROR_ORIGINS as zt };
 
-//# sourceMappingURL=live-checkpoint-D5d-K9s1.js.map
+//# sourceMappingURL=live-checkpoint-BZrk9Mjz.js.map