acpx 0.15.1 → 0.16.0

package/dist/{live-checkpoint-sB7dFOYR.js → live-checkpoint-BEfxBKCh.js}

@@ -1,13 +1,19 @@
+import { A as resolveAgentCommandParts, C as asAbsoluteCwd, E as isoNow$2, F as waitForSpawn, M as runTimedExecFile, N as splitCommandLine, P as waitForChildExit, S as PROCESS_HELPER_TIMEOUT_MS, T as isChildProcessRunning, _ as buildSpawnCommandOptions, b as readWindowsEnvValue, f as resolveBuiltInAgentLaunch, g as buildAgentSpawnCommand, j as resolveAgentSessionCwd, k as requireAgentStdio, n as AGENT_REGISTRY, r as BUILT_IN_AGENT_PACKAGES, t as AGENT_ARGV_REGISTRY, v as buildTerminalShellSpawnCommand, w as basenameToken, x as resolveWindowsExecutablePath, y as buildTerminalSpawnCommand } from "./agent-registry-DU6mhZBL.js";
 import fs, { readFileSync, statSync } from "node:fs";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
+import { spawn } from "node:child_process";
 import fs$1 from "node:fs/promises";
 import os from "node:os";
+import { tempFile } from "@openclaw/fs-safe/advanced";
 import { randomUUID } from "node:crypto";
-import { execFile, spawn } from "node:child_process";
 import { Readable, Writable } from "node:stream";
-import { PROTOCOL_VERSION, client, methods } from "@agentclientprotocol/sdk";
+import { PROTOCOL_VERSION, RequestError, client, methods } from "@agentclientprotocol/sdk";
+import { FsSafeError } from "@openclaw/fs-safe/errors";
+import { isPathInside } from "@openclaw/fs-safe/path";
+import { root } from "@openclaw/fs-safe/root";
 import readline from "node:readline/promises";
+import { setTimeout as setTimeout$1 } from "node:timers/promises";
 //#region src/errors.ts
 var AcpxOperationalError = class extends Error {
 	outputCode;
@@ -412,15 +418,11 @@ function isRetryablePromptError(error) {
 	if (isNonRetryablePromptError(error)) return false;
 	const acp = extractAcpError(error);
 	if (!acp) return false;
-	if (isPermanentPromptAcpError(acp)) return false;
 	return acp.code === -32603 || acp.code === -32700;
 }
 function isNonRetryablePromptError(error) {
 	return error instanceof PermissionDeniedError || error instanceof PermissionPromptUnavailableError || isTimeoutLike(error) || isNoSessionLike(error) || isUsageLike(error);
 }
-function isPermanentPromptAcpError(acp) {
-	return acp.code === -32001 || acp.code === -32002 || acp.code === -32601 || acp.code === -32602 || isAcpAuthRequiredPayload(acp);
-}
 function exitCodeForOutputErrorCode(code) {
 	switch (code) {
 		case "USAGE": return EXIT_CODES.USAGE;
@@ -432,254 +434,6 @@ function exitCodeForOutputErrorCode(code) {
 	}
 }
 //#endregion
-//#region src/agent-registry.ts
-const ACP_ADAPTER_PACKAGE_RANGES = {
-	pi: "^0.0.31",
-	codex: "^1.1.5",
-	claude: "^0.60.0",
-	mux: "^0.28.0"
-};
-const AGENT_REGISTRY = {
-	pi: `npx pi-acp@${ACP_ADAPTER_PACKAGE_RANGES.pi}`,
-	openclaw: "openclaw acp",
-	codex: `npx -y @agentclientprotocol/codex-acp@${ACP_ADAPTER_PACKAGE_RANGES.codex}`,
-	claude: `npx -y @agentclientprotocol/claude-agent-acp@${ACP_ADAPTER_PACKAGE_RANGES.claude}`,
-	gemini: "gemini --acp",
-	cursor: "cursor-agent acp",
-	copilot: "copilot --acp --stdio",
-	droid: "droid exec --output-format acp",
-	"fast-agent": "uvx fast-agent-mcp acp",
-	"grok-build": "grok agent stdio",
-	iflow: "iflow --experimental-acp",
-	kilocode: "npx -y @kilocode/cli acp",
-	kimi: "kimi acp",
-	kiro: "kiro-cli-chat acp",
-	mcode: "mcode acp",
-	mux: `npx -y mux@${ACP_ADAPTER_PACKAGE_RANGES.mux} acp`,
-	opencode: "npx -y opencode-ai acp",
-	pool: "pool acp",
-	qoder: "qodercli --acp",
-	qwen: "qwen --acp",
-	trae: "traecli acp serve",
-	zeroclaw: "zeroclaw acp"
-};
-const AGENT_ARGV_REGISTRY = {
-	pi: ["npx", `pi-acp@${ACP_ADAPTER_PACKAGE_RANGES.pi}`],
-	openclaw: ["openclaw", "acp"],
-	codex: [
-		"npx",
-		"-y",
-		`@agentclientprotocol/codex-acp@${ACP_ADAPTER_PACKAGE_RANGES.codex}`
-	],
-	claude: [
-		"npx",
-		"-y",
-		`@agentclientprotocol/claude-agent-acp@${ACP_ADAPTER_PACKAGE_RANGES.claude}`
-	],
-	gemini: ["gemini", "--acp"],
-	cursor: ["cursor-agent", "acp"],
-	copilot: [
-		"copilot",
-		"--acp",
-		"--stdio"
-	],
-	droid: [
-		"droid",
-		"exec",
-		"--output-format",
-		"acp"
-	],
-	"fast-agent": [
-		"uvx",
-		"fast-agent-mcp",
-		"acp"
-	],
-	"grok-build": [
-		"grok",
-		"agent",
-		"stdio"
-	],
-	iflow: ["iflow", "--experimental-acp"],
-	kilocode: [
-		"npx",
-		"-y",
-		"@kilocode/cli",
-		"acp"
-	],
-	kimi: ["kimi", "acp"],
-	kiro: ["kiro-cli-chat", "acp"],
-	mcode: ["mcode", "acp"],
-	mux: [
-		"npx",
-		"-y",
-		`mux@${ACP_ADAPTER_PACKAGE_RANGES.mux}`,
-		"acp"
-	],
-	opencode: [
-		"npx",
-		"-y",
-		"opencode-ai",
-		"acp"
-	],
-	pool: ["pool", "acp"],
-	qoder: ["qodercli", "--acp"],
-	qwen: ["qwen", "--acp"],
-	trae: [
-		"traecli",
-		"acp",
-		"serve"
-	],
-	zeroclaw: ["zeroclaw", "acp"]
-};
-const BUILT_IN_AGENT_PACKAGES = {
-	codex: {
-		packageName: "@agentclientprotocol/codex-acp",
-		packageRange: ACP_ADAPTER_PACKAGE_RANGES.codex,
-		preferredBinName: "codex-acp",
-		fallbackCommand: AGENT_REGISTRY.codex,
-		legacyFallbackCommands: []
-	},
-	claude: {
-		packageName: "@agentclientprotocol/claude-agent-acp",
-		packageRange: ACP_ADAPTER_PACKAGE_RANGES.claude,
-		preferredBinName: "claude-agent-acp",
-		fallbackCommand: AGENT_REGISTRY.claude,
-		legacyFallbackCommands: [`npm exec @agentclientprotocol/claude-agent-acp@${ACP_ADAPTER_PACKAGE_RANGES.claude}`]
-	}
-};
-const AGENT_ALIASES = {
-	"factory-droid": "droid",
-	factorydroid: "droid"
-};
-const DEFAULT_AGENT_NAME = "codex";
-function normalizeAgentName$1(value) {
-	return value.trim().toLowerCase();
-}
-function resolveCanonicalAgentName(value) {
-	const normalized = normalizeAgentName$1(value);
-	return AGENT_ALIASES[normalized] ?? normalized;
-}
-function mergeAgentRegistry(overrides) {
-	if (!overrides) return { ...AGENT_REGISTRY };
-	const merged = { ...AGENT_REGISTRY };
-	for (const [name, command] of Object.entries(overrides)) {
-		const normalized = normalizeAgentName$1(name);
-		if (!normalized || !command.trim()) continue;
-		merged[normalized] = command.trim();
-	}
-	return merged;
-}
-function resolveAgentCommand(agentName, overrides) {
-	const normalized = normalizeAgentName$1(agentName);
-	const registry = mergeAgentRegistry(overrides);
-	return registry[normalized] ?? registry[AGENT_ALIASES[normalized] ?? normalized] ?? agentName;
-}
-function resolveAgentArgv(agentName) {
-	const normalized = normalizeAgentName$1(agentName);
-	const argv = AGENT_ARGV_REGISTRY[normalized] ?? AGENT_ARGV_REGISTRY[resolveCanonicalAgentName(agentName)];
-	return argv ? [...argv] : void 0;
-}
-function findBuiltInAgentPackage(agentCommand) {
-	const normalized = agentCommand.trim();
-	return Object.values(BUILT_IN_AGENT_PACKAGES).find((spec) => spec.fallbackCommand === normalized || spec.legacyFallbackCommands?.includes(normalized));
-}
-function defaultResolvePackageRoot(packageName) {
-	const segments = packageName.split("/");
-	let cursor = path.dirname(fileURLToPath(import.meta.url));
-	while (true) {
-		const candidateRoot = path.join(cursor, "node_modules", ...segments);
-		const manifestPath = path.join(candidateRoot, "package.json");
-		if (fs.existsSync(manifestPath)) try {
-			if (JSON.parse(fs.readFileSync(manifestPath, "utf8")).name === packageName) return candidateRoot;
-		} catch {}
-		const parent = path.dirname(cursor);
-		if (parent === cursor) throw new Error(`Built-in agent package not found: ${packageName}`);
-		cursor = parent;
-	}
-}
-function resolvePackageBin(spec, manifest) {
-	if (typeof manifest.bin === "string") return manifest.bin;
-	if (!manifest.bin || typeof manifest.bin !== "object") return;
-	return manifest.bin[spec.preferredBinName] ?? (Object.keys(manifest.bin).length === 1 ? Object.values(manifest.bin)[0] : void 0);
-}
-function defaultResolveNpmCliPath(execPath) {
-	const candidate = path.resolve(path.dirname(execPath), "..", "lib", "node_modules", "npm", "bin", "npm-cli.js");
-	if (!fs.existsSync(candidate)) throw new Error(`npm CLI not found for execPath: ${execPath}`);
-	return candidate;
-}
-function resolveInstalledBuiltInAgentLaunch(agentCommand, options = {}) {
-	const spec = findBuiltInAgentPackage(agentCommand);
-	if (!spec) return;
-	const readFileSync = options.readFileSync ?? fs.readFileSync;
-	const existsSync = options.existsSync ?? fs.existsSync;
-	const resolvePackageRoot = options.resolvePackageRoot ?? defaultResolvePackageRoot;
-	try {
-		const resolved = resolveInstalledBuiltInAgentPackage(spec, {
-			readFileSync,
-			existsSync,
-			resolvePackageRoot
-		});
-		if (!resolved) return;
-		return {
-			source: "installed",
-			command: process.execPath,
-			args: [resolved.binPath],
-			packageName: spec.packageName,
-			packageRange: spec.packageRange,
-			packageVersion: resolved.packageVersion,
-			binPath: resolved.binPath
-		};
-	} catch {
-		return;
-	}
-}
-function resolveInstalledBuiltInAgentPackage(spec, options) {
-	const packageRoot = options.resolvePackageRoot(spec.packageName);
-	const manifest = JSON.parse(options.readFileSync(path.join(packageRoot, "package.json"), "utf8"));
-	if (manifest.name !== spec.packageName) return;
-	const relativeBinPath = resolvePackageBin(spec, manifest);
-	if (!relativeBinPath) return;
-	const binPath = path.resolve(packageRoot, relativeBinPath);
-	return options.existsSync(binPath) ? {
-		packageVersion: manifest.version,
-		binPath
-	} : void 0;
-}
-function resolvePackageExecBuiltInAgentLaunch(agentCommand, options = {}) {
-	const spec = findBuiltInAgentPackage(agentCommand);
-	if (!spec) return;
-	const existsSync = options.existsSync ?? fs.existsSync;
-	const execPath = options.execPath ?? process.execPath;
-	const resolveNpmCliPath = options.resolveNpmCliPath ?? defaultResolveNpmCliPath;
-	try {
-		const npmCliPath = resolveNpmCliPath(execPath);
-		if (!existsSync(npmCliPath)) return;
-		return {
-			source: "package-exec",
-			command: execPath,
-			args: [
-				npmCliPath,
-				"exec",
-				"--yes",
-				`--package=${spec.packageName}@${spec.packageRange}`,
-				"--",
-				spec.preferredBinName
-			],
-			packageName: spec.packageName,
-			packageRange: spec.packageRange,
-			npmCliPath
-		};
-	} catch {
-		return;
-	}
-}
-function resolveBuiltInAgentLaunch(agentCommand, options = {}) {
-	return resolveInstalledBuiltInAgentLaunch(agentCommand, options) ?? resolvePackageExecBuiltInAgentLaunch(agentCommand, options);
-}
-function listBuiltInAgents(overrides) {
-	return [.../* @__PURE__ */ new Set([...Object.keys(AGENT_REGISTRY), ...Object.keys(overrides ?? {})])];
-}
-//#endregion
 //#region src/async-control.ts
 var TimeoutError = class extends Error {
 	constructor(timeoutMs) {
@@ -737,195 +491,38 @@ async function withInterrupt(run, onInterrupt) {
 	});
 }
 //#endregion
-//#region src/prompt-content.ts
-var PromptInputValidationError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "PromptInputValidationError";
-	}
-};
-function asRecord$6(value) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return;
-	return value;
-}
-function isNonEmptyString(value) {
-	return typeof value === "string" && value.trim().length > 0;
-}
-function isBase64Data(value) {
-	if (value.length === 0 || value.length % 4 !== 0) return false;
-	return /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(value);
-}
-function isImageMimeType(value) {
-	return /^image\/[A-Za-z0-9.+-]+$/i.test(value);
-}
-function isAudioMimeType(value) {
-	return /^audio\/[A-Za-z0-9.+-]+$/i.test(value);
-}
-function isTextBlock(value) {
-	const record = asRecord$6(value);
-	return record?.type === "text" && typeof record.text === "string";
-}
-function isImageBlock(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$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$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$6(value);
-	if (!record || !isNonEmptyString(record.uri)) return false;
-	return record.text === void 0 || typeof record.text === "string";
-}
-function isResourceBlock(value) {
-	const record = asRecord$6(value);
-	return record?.type === "resource" && isResourcePayload(record.resource);
-}
-const CONTENT_BLOCK_VALIDATORS = [
-	isTextBlock,
-	isImageBlock,
-	isAudioBlock,
-	isResourceLinkBlock,
-	isResourceBlock
-];
-function isContentBlock(value) {
-	return CONTENT_BLOCK_VALIDATORS.some((validator) => validator(value));
-}
-const CONTENT_BLOCK_ERROR_VALIDATORS = {
-	text: validateTextContentBlock,
-	image: validateImageContentBlock,
-	audio: validateAudioContentBlock,
-	resource_link: validateResourceLinkContentBlock,
-	resource: validateResourceContentBlock
-};
-function contentBlockErrorValidator(type) {
-	return Object.hasOwn(CONTENT_BLOCK_ERROR_VALIDATORS, type) ? CONTENT_BLOCK_ERROR_VALIDATORS[type] : void 0;
-}
-function validateTextContentBlock(record, index) {
-	return typeof record.text === "string" ? void 0 : `prompt[${index}] text block must include a string text field`;
-}
-function validateImageContentBlock(record, index) {
-	if (!isNonEmptyString(record.mimeType)) return `prompt[${index}] image block must include a non-empty mimeType`;
-	if (!isImageMimeType(record.mimeType)) return `prompt[${index}] image block mimeType must start with image/`;
-	if (typeof record.data !== "string" || record.data.length === 0) return `prompt[${index}] image block must include non-empty base64 data`;
-	return isBase64Data(record.data) ? void 0 : `prompt[${index}] image block data must be valid base64`;
-}
-function validateAudioContentBlock(record, index) {
-	if (!isNonEmptyString(record.mimeType)) return `prompt[${index}] audio block must include a non-empty mimeType`;
-	if (!isAudioMimeType(record.mimeType)) return `prompt[${index}] audio block mimeType must start with audio/`;
-	if (typeof record.data !== "string" || record.data.length === 0) return `prompt[${index}] audio block must include non-empty base64 data`;
-	return isBase64Data(record.data) ? void 0 : `prompt[${index}] audio block data must be valid base64`;
-}
-function validateResourceLinkContentBlock(record, index) {
-	if (!isNonEmptyString(record.uri)) return `prompt[${index}] resource_link block must include a non-empty uri`;
-	if (record.title !== void 0 && typeof record.title !== "string") return `prompt[${index}] resource_link block title must be a string when present`;
-	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$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$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)}`;
-}
-function isPromptInput(value) {
-	return Array.isArray(value) && value.every((entry) => isContentBlock(entry));
-}
-function promptCapabilityRequirement(block) {
-	switch (block.type) {
-		case "image": return {
-			blockType: "image",
-			capability: "image"
-		};
-		case "audio": return {
-			blockType: "audio",
-			capability: "audio"
-		};
-		case "resource": return {
-			blockType: "resource",
-			capability: "embeddedContext"
-		};
-		default: return;
-	}
-}
-function getUnsupportedPromptContentMessage(prompt, agentCapabilities) {
-	for (const [index, block] of prompt.entries()) {
-		const requirement = promptCapabilityRequirement(block);
-		if (!requirement) continue;
-		if (agentCapabilities?.promptCapabilities?.[requirement.capability] === true) continue;
-		return `prompt[${index}] ${requirement.blockType} content requires agentCapabilities.promptCapabilities.${requirement.capability}`;
-	}
-}
-function textPrompt(text) {
-	return [{
-		type: "text",
-		text
-	}];
-}
-function parseStructuredPrompt(source) {
-	if (!source.startsWith("[")) return;
-	try {
-		const parsed = JSON.parse(source);
-		if (isPromptInput(parsed)) return parsed;
-		if (Array.isArray(parsed)) throw new PromptInputValidationError(parsed.map((entry, index) => getContentBlockValidationError(entry, index)).find((message) => message !== void 0) ?? "Structured prompt JSON must be an array of valid ACP content blocks");
-		return;
-	} catch (error) {
-		if (error instanceof PromptInputValidationError) throw error;
-		return;
-	}
-}
-function parsePromptSource(source) {
-	const trimmed = source.trim();
-	const structured = parseStructuredPrompt(trimmed);
-	if (structured) return structured;
-	if (!trimmed) return [];
-	return textPrompt(trimmed);
-}
-function mergePromptSourceWithText(source, suffixText) {
-	const prompt = parsePromptSource(source);
-	const appended = suffixText.trim();
-	if (!appended) return prompt;
-	if (prompt.length === 0) return textPrompt(appended);
-	return [...prompt, ...textPrompt(appended)];
-}
-function promptToDisplayText(prompt) {
-	return prompt.map((block) => contentBlockDisplayText(block)).filter((entry) => entry.trim().length > 0).join("\n\n").trim();
-}
-function contentBlockDisplayText(block) {
-	switch (block.type) {
-		case "text": return block.text;
-		case "resource_link": return block.title ?? block.name ?? block.uri;
-		case "resource": return resourceBlockDisplayText(block);
-		case "image": return `[image] ${block.mimeType}`;
-		case "audio": return `[audio] ${block.mimeType}`;
-		default: return "";
-	}
-}
-function resourceBlockDisplayText(block) {
-	return "text" in block.resource && typeof block.resource.text === "string" ? block.resource.text : block.resource.uri;
+//#region src/acp/codex-compat.ts
+function isLegacyZedCodexAcpInvocation(agentCommand) {
+	return /@zed-industries\/codex-acp\b/u.test(agentCommand);
+}
+function preferCodexPermissionRefusal(request, agentName) {
+	if (agentName !== "@agentclientprotocol/codex-acp") return request;
+	const preferred = request.options.find((option) => option.kind === "reject_once" && ["decline", "reject_permissions"].includes(option.optionId));
+	return preferred ? {
+		...request,
+		options: [preferred, ...request.options.filter((option) => option !== preferred)]
+	} : request;
+}
+function codexPermissionNotice(request, response, agentName) {
+	if (agentName !== "@agentclientprotocol/codex-acp") return;
+	if (response.outcome.outcome === "cancelled") return "No matching permission option was available. The request was safely cancelled; Codex may end the current turn.";
+	const selectedId = response.outcome.optionId;
+	return request.options.find((option) => option.optionId === selectedId)?.kind === "reject_once" && selectedId === "cancel" ? "Permission refused using Codex's cancellation option; this can end the current turn. The operation was not approved." : void 0;
 }
 //#endregion
 //#region src/acp/jsonrpc.ts
-function asRecord$5(value) {
+function asRecord$6(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
 	return value;
 }
 function isAcpMessageObject(value) {
-	return asRecord$5(value) !== null;
+	return asRecord$6(value) !== null;
 }
 function hasValidId(value) {
 	return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
 }
 function isErrorObject(value) {
-	const record = asRecord$5(value);
+	const record = asRecord$6(value);
 	return !!record && typeof record.code === "number" && Number.isFinite(record.code) && typeof record.message === "string";
 }
 function hasResultOrError(value) {
@@ -950,7 +547,7 @@ function isJsonRpcResponse(value) {
 	return hasResultOrError(value);
 }
 function isAcpJsonRpcMessage(value) {
-	const record = asRecord$5(value);
+	const record = asRecord$6(value);
 	if (!record || record.jsonrpc !== "2.0") return false;
 	return isJsonRpcNotificationRecord(record) || isJsonRpcRequest(record) || isJsonRpcResponse(record);
 }
@@ -962,11 +559,11 @@ function isSessionUpdateNotification(message) {
 }
 function extractSessionUpdateNotification(message) {
 	if (!isSessionUpdateNotification(message)) return;
-	const params = asRecord$5(message.params);
+	const params = asRecord$6(message.params);
 	if (!params) return;
 	const sessionId = typeof params.sessionId === "string" ? params.sessionId : null;
 	if (!sessionId) return;
-	const update = asRecord$5(params.update);
+	const update = asRecord$6(params.update);
 	if (!update || typeof update.sessionUpdate !== "string") return;
 	return {
 		sessionId,
@@ -975,33 +572,139 @@ function extractSessionUpdateNotification(message) {
 }
 function parsePromptStopReason(message) {
 	if (!Object.hasOwn(message, "id") || !Object.hasOwn(message, "result")) return;
-	const record = asRecord$5(message.result);
+	const record = asRecord$6(message.result);
 	if (!record) return;
 	return typeof record.stopReason === "string" ? record.stopReason : void 0;
 }
+function parsePermissionNotice(message) {
+	if (!Object.hasOwn(message, "id") || !Object.hasOwn(message, "result")) return;
+	const notice = asRecord$6(asRecord$6(asRecord$6(message.result)?._meta)?.acpx)?.permissionNotice;
+	return typeof notice === "string" ? notice : void 0;
+}
 function parseJsonRpcErrorMessage(message) {
 	if (!Object.hasOwn(message, "error")) return;
-	const errorRecord = asRecord$5(message.error);
+	const errorRecord = asRecord$6(message.error);
 	if (!errorRecord || typeof errorRecord.message !== "string") return;
 	return errorRecord.message;
 }
 //#endregion
+//#region src/process-liveness.ts
+function isProcessAlive(pid) {
+	if (!pid || !Number.isInteger(pid) || pid <= 0 || pid === process.pid) return false;
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch {
+		return false;
+	}
+}
+//#endregion
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/usingCtx.js
+function _usingCtx() {
+	var r = "function" == typeof SuppressedError ? SuppressedError : function(r, e) {
+		var n = Error();
+		return n.name = "SuppressedError", n.error = r, n.suppressed = e, n;
+	}, e = {}, n = [];
+	function using(r, e) {
+		if (null != e) {
+			if (Object(e) !== e) throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
+			if (r) var o = e[Symbol.asyncDispose || Symbol["for"]("Symbol.asyncDispose")];
+			if (void 0 === o && (o = e[Symbol.dispose || Symbol["for"]("Symbol.dispose")], r)) var t = o;
+			if ("function" != typeof o) throw new TypeError("Object is not disposable.");
+			t && (o = function o() {
+				try {
+					t.call(e);
+				} catch (r) {
+					return Promise.reject(r);
+				}
+			}), n.push({
+				v: e,
+				d: o,
+				a: r
+			});
+		} else r && n.push({
+			d: e,
+			a: r
+		});
+		return e;
+	}
+	return {
+		e,
+		u: using.bind(null, !1),
+		a: using.bind(null, !0),
+		d: function d() {
+			var o, t = this.e, s = 0;
+			function next() {
+				for (; o = n.pop();) try {
+					if (!o.a && 1 === s) return s = 0, n.push(o), Promise.resolve().then(next);
+					if (o.d) {
+						var r = o.d.call(o.v);
+						if (o.a) return s |= 2, Promise.resolve(r).then(next, err);
+					} else s |= 1;
+				} catch (r) {
+					return err(r);
+				}
+				if (1 === s) return t !== e ? Promise.reject(t) : Promise.resolve();
+				if (t !== e) throw t;
+			}
+			function err(n) {
+				return t = t !== e ? new r(n, t) : n, next();
+			}
+			return next();
+		}
+	};
+}
+//#endregion
+//#region src/state-files.ts
+async function writePrivateFile(filePath, content, options = {}) {
+	try {
+		var _usingCtx$1 = _usingCtx();
+		const privateDirectory = options.privateDirectory !== false;
+		await fs$1.mkdir(path.dirname(filePath), {
+			recursive: true,
+			mode: privateDirectory ? 448 : void 0
+		});
+		const directory = await fs$1.realpath(path.dirname(filePath));
+		if (privateDirectory && process.platform !== "win32") await fs$1.chmod(directory, 448);
+		const temporary = _usingCtx$1.a(await tempFile({
+			rootDir: directory,
+			prefix: "acpx-write",
+			fileName: "record.json"
+		}));
+		const handle = await fs$1.open(temporary.path, "wx", 384);
+		try {
+			await handle.writeFile(content, "utf8");
+			await handle.chmod(384);
+		} finally {
+			await handle.close();
+		}
+		await fs$1.rename(temporary.path, path.join(directory, path.basename(filePath)));
+	} catch (_) {
+		_usingCtx$1.e = _;
+	} finally {
+		await _usingCtx$1.d();
+	}
+}
+async function writePrivateJsonFile(filePath, value) {
+	await writePrivateFile(filePath, `${JSON.stringify(value, null, 2)}\n`);
+}
+//#endregion
 //#region src/session/event-log.ts
 const DEFAULT_EVENT_SEGMENT_MAX_BYTES = 67108864;
-function sessionBaseDir$1() {
+function sessionBaseDir() {
 	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`);
+	return path.join(sessionBaseDir(), `${safeSessionId(sessionId)}.stream.ndjson`);
 }
 function sessionEventSegmentPath(sessionId, segment) {
-	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.${segment}.ndjson`);
+	return path.join(sessionBaseDir(), `${safeSessionId(sessionId)}.stream.${segment}.ndjson`);
 }
 function sessionEventLockPath(sessionId) {
-	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.lock`);
+	return path.join(sessionBaseDir(), `${safeSessionId(sessionId)}.stream.lock`);
 }
 function defaultSessionEventLog(sessionId) {
 	return {
@@ -1034,57 +737,45 @@ function extractAgentSessionId(meta) {
 	}
 }
 //#endregion
-//#region src/session/runtime-session-id.ts
-function normalizeRuntimeSessionId(value) {
-	return normalizeAgentSessionId(value);
-}
-function extractRuntimeSessionId(meta) {
-	return extractAgentSessionId(meta);
-}
-//#endregion
 //#region src/session/persistence/serialize.ts
 function serializeSessionRecordForDisk(record) {
-	const canonical = {
-		...record,
-		schema: SESSION_RECORD_SCHEMA
-	};
 	return {
-		schema: canonical.schema,
-		acpx_record_id: canonical.acpxRecordId,
-		acp_session_id: canonical.acpSessionId,
-		agent_session_id: normalizeRuntimeSessionId(canonical.agentSessionId),
-		agent_command: canonical.agentCommand,
-		agent_argv: canonical.agentArgv,
-		cwd: canonical.cwd,
-		name: canonical.name,
-		created_at: canonical.createdAt,
-		last_used_at: canonical.lastUsedAt,
-		last_seq: canonical.lastSeq,
-		last_request_id: canonical.lastRequestId,
-		event_log: canonical.eventLog,
-		closed: canonical.closed,
-		closed_at: canonical.closedAt,
-		pid: canonical.pid,
-		agent_started_at: canonical.agentStartedAt,
-		last_prompt_at: canonical.lastPromptAt,
-		last_agent_exit_code: canonical.lastAgentExitCode,
-		last_agent_exit_signal: canonical.lastAgentExitSignal,
-		last_agent_exit_at: canonical.lastAgentExitAt,
-		last_agent_disconnect_reason: canonical.lastAgentDisconnectReason,
-		protocol_version: canonical.protocolVersion,
-		agent_capabilities: canonical.agentCapabilities,
-		title: canonical.title,
-		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,
-		imported_from: canonical.importedFrom ? {
-			record_id: canonical.importedFrom.recordId,
-			cwd_original: canonical.importedFrom.cwdOriginal,
-			exported_by: canonical.importedFrom.exportedBy,
-			exported_at: canonical.importedFrom.exportedAt
+		schema: SESSION_RECORD_SCHEMA,
+		acpx_record_id: record.acpxRecordId,
+		acp_session_id: record.acpSessionId,
+		agent_session_id: normalizeAgentSessionId(record.agentSessionId),
+		agent_command: record.agentCommand,
+		agent_argv: record.agentArgv,
+		cwd: record.cwd,
+		name: record.name,
+		created_at: record.createdAt,
+		last_used_at: record.lastUsedAt,
+		last_seq: record.lastSeq,
+		last_request_id: record.lastRequestId,
+		event_log: record.eventLog,
+		closed: record.closed,
+		closed_at: record.closedAt,
+		pid: record.pid,
+		agent_started_at: record.agentStartedAt,
+		last_prompt_at: record.lastPromptAt,
+		last_agent_exit_code: record.lastAgentExitCode,
+		last_agent_exit_signal: record.lastAgentExitSignal,
+		last_agent_exit_at: record.lastAgentExitAt,
+		last_agent_disconnect_reason: record.lastAgentDisconnectReason,
+		protocol_version: record.protocolVersion,
+		agent_capabilities: record.agentCapabilities,
+		title: record.title,
+		messages: record.messages,
+		updated_at: record.updated_at,
+		cumulative_token_usage: record.cumulative_token_usage,
+		cumulative_cost: record.cumulative_cost,
+		request_token_usage: record.request_token_usage,
+		acpx: record.acpx,
+		imported_from: record.importedFrom ? {
+			record_id: record.importedFrom.recordId,
+			cwd_original: record.importedFrom.cwdOriginal,
+			exported_by: record.importedFrom.exportedBy,
+			exported_at: record.importedFrom.exportedAt
 		} : void 0
 	};
 }
@@ -1134,7 +825,7 @@ function resolveAgentArgvForCommand(agentCommand) {
 }
 //#endregion
 //#region src/session/persistence/parse.ts
-function asRecord$4(value) {
+function asRecord$5(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
@@ -1153,12 +844,12 @@ function parsePersistedAgentArgv(record) {
 function hasModelConfigOption(options) {
 	if (!Array.isArray(options)) return false;
 	return options.some((entry) => {
-		const option = asRecord$4(entry);
+		const option = asRecord$5(entry);
 		return option?.category === "model" || option?.id === "model";
 	});
 }
 function parseConfigOptions(raw) {
-	if (!Array.isArray(raw) || !raw.every((entry) => asRecord$4(entry) !== void 0)) return;
+	if (!Array.isArray(raw) || !raw.every((entry) => asRecord$5(entry) !== void 0)) return;
 	return raw;
 }
 function parseAvailableCommand(raw) {
@@ -1166,7 +857,7 @@ function parseAvailableCommand(raw) {
 		const name = raw.trim();
 		return name ? { name } : void 0;
 	}
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record) return;
 	const name = parseNonEmptyString(record.name);
 	if (!name) return;
@@ -1189,7 +880,7 @@ function parseNonEmptyString(value) {
 }
 function parseTokenUsage(raw) {
 	if (raw === void 0 || raw === null) return;
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record) return null;
 	const usage = {};
 	for (const field of [
@@ -1212,7 +903,7 @@ function isNonNegativeFiniteNumber(value) {
 }
 function parseUsageCost(raw) {
 	if (raw === void 0 || raw === null) return;
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record) return null;
 	return parseUsageCostRecord(record);
 }
@@ -1238,7 +929,7 @@ function parseCostCurrency(value) {
 }
 function parseRequestTokenUsage(raw) {
 	if (raw === void 0 || raw === null) return;
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record) return null;
 	const usage = {};
 	for (const [key, value] of Object.entries(record)) {
@@ -1249,25 +940,25 @@ function parseRequestTokenUsage(raw) {
 	return usage;
 }
 function isSessionMessageImage(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record || typeof record.source !== "string") return false;
 	if (record.size === void 0 || record.size === null) return true;
-	const size = asRecord$4(record.size);
+	const size = asRecord$5(record.size);
 	return !!size && isFiniteNumber(size.width) && isFiniteNumber(size.height);
 }
 function isSessionMessageAudio(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	return !!record && typeof record.source === "string" && typeof record.mime_type === "string";
 }
 function isFiniteNumber(value) {
 	return typeof value === "number" && Number.isFinite(value);
 }
 function isUserContent(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record) return false;
 	if (typeof record.Text === "string") return true;
 	if (record.Mention !== void 0) {
-		const mention = asRecord$4(record.Mention);
+		const mention = asRecord$5(record.Mention);
 		return !!mention && typeof mention.uri === "string" && typeof mention.content === "string";
 	}
 	if (record.Image !== void 0) return isSessionMessageImage(record.Image);
@@ -1275,7 +966,7 @@ function isUserContent(raw) {
 	return false;
 }
 function isToolUse(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	return !!record && hasStringFields(record, [
 		"id",
 		"name",
@@ -1289,18 +980,18 @@ function isOptionalString(value) {
 	return value === void 0 || value === null || typeof value === "string";
 }
 function isToolResultContent(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record) return false;
 	if (typeof record.Text === "string") return true;
 	if (record.Image !== void 0) return isSessionMessageImage(record.Image);
 	return false;
 }
 function isToolResult(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	return !!record && typeof record.tool_use_id === "string" && typeof record.tool_name === "string" && typeof record.is_error === "boolean" && isToolResultContent(record.content);
 }
 function isAgentContent(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record) return false;
 	if (typeof record.Text === "string") return true;
 	if (record.Thinking !== void 0) return isThinkingContent(record.Thinking);
@@ -1309,21 +1000,21 @@ function isAgentContent(raw) {
 	return false;
 }
 function isThinkingContent(raw) {
-	const thinking = asRecord$4(raw);
+	const thinking = asRecord$5(raw);
 	return !!thinking && typeof thinking.text === "string" && isOptionalString(thinking.signature);
 }
 function isUserMessage$1(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record || record.User === void 0) return false;
-	const user = asRecord$4(record.User);
+	const user = asRecord$5(record.User);
 	return !!user && typeof user.id === "string" && Array.isArray(user.content) && user.content.every((entry) => isUserContent(entry));
 }
 function isAgentMessage$1(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record || record.Agent === void 0) return false;
-	const agent = asRecord$4(record.Agent);
+	const agent = asRecord$5(record.Agent);
 	if (!agent || !Array.isArray(agent.content) || !agent.content.every(isAgentContent)) return false;
-	const toolResults = asRecord$4(agent.tool_results);
+	const toolResults = asRecord$5(agent.tool_results);
 	if (!toolResults) return false;
 	return Object.values(toolResults).every(isToolResult);
 }
@@ -1356,13 +1047,16 @@ function hasValidConversationCore(record) {
 	return Array.isArray(record.messages) && record.messages.every(isConversationMessage) && typeof record.updated_at === "string";
 }
 function parseAcpxState(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record) return;
 	const state = {};
-	assignBooleanTrue(state, "reset_on_next_ensure", record.reset_on_next_ensure);
+	if (record.reset_on_next_ensure === true) state.reset_on_next_ensure = true;
 	assignStringState(state, "current_mode_id", record.current_mode_id);
 	assignStringState(state, "desired_mode_id", record.desired_mode_id);
-	assignDesiredConfigOptions(state, record.desired_config_options);
+	const desiredConfigOptions = parseStringMap(record.desired_config_options);
+	if (desiredConfigOptions) state.desired_config_options = desiredConfigOptions;
+	const modelNames = parseStringMap(record.available_model_names, true);
+	if (modelNames) state.available_model_names = modelNames;
 	assignParsedModelState(state, record);
 	const availableCommands = parseAvailableCommands(record.available_commands);
 	if (availableCommands) state.available_commands = availableCommands;
@@ -1377,60 +1071,37 @@ function assignParsedModelState(state, record) {
 	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;
-}
 function assignStringState(state, key, value) {
 	if (typeof value === "string") state[key] = value;
 }
-function assignDesiredConfigOptions(state, raw) {
-	const desiredConfigOptions = asRecord$4(raw);
-	if (!desiredConfigOptions) return;
-	const parsed = Object.fromEntries(Object.entries(desiredConfigOptions).filter((entry) => {
-		const [, value] = entry;
-		return typeof value === "string";
-	}));
-	if (Object.keys(parsed).length > 0) state.desired_config_options = parsed;
+function parseStringMap(raw, preserveEmpty = false) {
+	const record = asRecord$5(raw);
+	if (!record) return;
+	const parsed = Object.fromEntries(Object.entries(record).filter((entry) => typeof entry[1] === "string"));
+	return Object.keys(parsed).length > 0 || preserveEmpty ? parsed : void 0;
 }
 function assignParsedSessionOptions(state, raw) {
-	const sessionOptions = asRecord$4(raw);
+	const sessionOptions = asRecord$5(raw);
 	if (!sessionOptions) return;
 	const parsedSessionOptions = {};
-	assignSessionOptionModel(parsedSessionOptions, sessionOptions.model);
-	assignSessionOptionAllowedTools(parsedSessionOptions, sessionOptions.allowed_tools);
-	assignSessionOptionMaxTurns(parsedSessionOptions, sessionOptions.max_turns);
+	if (typeof sessionOptions.model === "string") parsedSessionOptions.model = sessionOptions.model;
+	if (isStringArray(sessionOptions.allowed_tools)) parsedSessionOptions.allowed_tools = [...sessionOptions.allowed_tools];
+	if (isPositiveInteger(sessionOptions.max_turns)) parsedSessionOptions.max_turns = sessionOptions.max_turns;
 	assignSessionOptionSystemPrompt(parsedSessionOptions, sessionOptions.system_prompt);
-	assignSessionOptionEnv(parsedSessionOptions, sessionOptions.env);
+	const env = parseStringMap(sessionOptions.env);
+	if (env) parsedSessionOptions.env = env;
 	if (Object.keys(parsedSessionOptions).length > 0) state.session_options = parsedSessionOptions;
 }
-function assignSessionOptionModel(options, value) {
-	if (typeof value === "string") options.model = value;
-}
-function assignSessionOptionAllowedTools(options, value) {
-	if (isStringArray(value)) options.allowed_tools = [...value];
-}
-function assignSessionOptionMaxTurns(options, value) {
-	if (typeof value === "number" && Number.isInteger(value) && value > 0) options.max_turns = value;
-}
 function assignSessionOptionSystemPrompt(options, value) {
 	if (typeof value === "string" && value.length > 0) {
 		options.system_prompt = value;
 		return;
 	}
-	const appendRecord = asRecord$4(value);
+	const appendRecord = asRecord$5(value);
 	if (appendRecord && typeof appendRecord.append === "string" && appendRecord.append.length > 0) options.system_prompt = { append: appendRecord.append };
 }
-function assignSessionOptionEnv(options, value) {
-	const env = asRecord$4(value);
-	if (!env) return;
-	const parsed = Object.fromEntries(Object.entries(env).filter((entry) => {
-		const [, raw] = entry;
-		return typeof raw === "string";
-	}));
-	if (Object.keys(parsed).length > 0) options.env = parsed;
-}
 function parseEventLog(raw, sessionId) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record || !hasValidEventLogCore(record)) return defaultSessionEventLog(sessionId);
 	return {
 		active_path: record.active_path,
@@ -1449,7 +1120,7 @@ function isPositiveInteger(value) {
 }
 function parseImportedFrom(raw) {
 	if (raw == null) return;
-	const record = asRecord$4(raw);
+	const record = asRecord$5(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,
@@ -1476,8 +1147,7 @@ function normalizeOptionalName(value) {
 }
 function normalizeOptionalPid(value) {
 	if (value == null) return;
-	if (!Number.isInteger(value) || value <= 0) return null;
-	return value;
+	return isPositiveInteger(value) ? value : null;
 }
 function normalizeOptionalBoolean(value, fallback = false) {
 	if (value == null) return fallback;
@@ -1500,7 +1170,7 @@ function normalizeOptionalSignal(value) {
 	return Symbol("invalid");
 }
 function parseSessionRecord(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$5(raw);
 	if (!record) return null;
 	if (record.schema !== "acpx.session.v1") return null;
 	const optionals = validSessionOptionals({
@@ -1525,7 +1195,7 @@ function parseSessionRecord(raw) {
 		schema: SESSION_RECORD_SCHEMA,
 		acpxRecordId: record.acpx_record_id,
 		acpSessionId: record.acp_session_id,
-		agentSessionId: normalizeRuntimeSessionId(record.agent_session_id),
+		agentSessionId: normalizeAgentSessionId(record.agent_session_id),
 		agentCommand: record.agent_command,
 		agentArgv: parsePersistedAgentArgv(record),
 		cwd: record.cwd,
@@ -1545,7 +1215,7 @@ function parseSessionRecord(raw) {
 		lastAgentExitAt: optionals.lastAgentExitAt,
 		lastAgentDisconnectReason: optionals.lastAgentDisconnectReason,
 		protocolVersion: typeof record.protocol_version === "number" ? record.protocol_version : void 0,
-		agentCapabilities: asRecord$4(record.agent_capabilities),
+		agentCapabilities: asRecord$5(record.agent_capabilities),
 		title: conversation.title,
 		messages: conversation.messages,
 		updated_at: conversation.updated_at,
@@ -1669,7 +1339,8 @@ const ZED_TAG_KEYS = /* @__PURE__ */ new Set([
 const MAP_OBJECT_PATHS = /* @__PURE__ */ new Set([
 	"request_token_usage",
 	"messages.Agent.tool_results",
-	"acpx.session_options.env"
+	"acpx.session_options.env",
+	"acpx.available_model_names"
 ]);
 const OPAQUE_VALUE_PATHS = /* @__PURE__ */ new Set([
 	"agent_capabilities",
@@ -1683,10 +1354,6 @@ function isRecord(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));
 }
@@ -1712,7 +1379,7 @@ function collectViolations(value, path, violations) {
 	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(/^\./, ""));
+	if (!skipKeyRule && !SNAKE_CASE_KEY.test(key) && !ZED_TAG_KEYS.has(key)) violations.push(`${joinPath(path)}.${key}`.replace(/^\./, ""));
 	const childPath = [...path, key];
 	if (!shouldSkipDescend(childPath)) collectViolations(child, childPath, violations);
 }
@@ -1727,20 +1394,14 @@ function assertPersistedKeyPolicy(value) {
 	throw new Error(`Persisted key policy violation (expected snake_case keys): ${violations.join(", ")}`);
 }
 //#endregion
-//#region src/session/persistence/atomic-write.ts
-function createAtomicWriteTempPath(filePath, createUniqueId = randomUUID) {
-	const tempName = `.acpx-write.${process.pid}.${Date.now()}.${createUniqueId()}.tmp`;
-	return path.join(path.dirname(filePath), tempName);
-}
-//#endregion
 //#region src/session/persistence/index.ts
 const SESSION_INDEX_SCHEMA = "acpx.session-index.v1";
-function asRecord$3(value) {
+function asRecord$4(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
 function parseIndexEntry(raw) {
-	const record = asRecord$3(raw);
+	const record = asRecord$4(raw);
 	if (!record) return;
 	if (!hasRequiredIndexEntryFields(record)) return;
 	if (record.name !== void 0 && typeof record.name !== "string") return;
@@ -1784,7 +1445,7 @@ async function readSessionIndex(sessionDir) {
 	const filePath = sessionIndexPath(sessionDir);
 	try {
 		const payload = await fs$1.readFile(filePath, "utf8");
-		const record = asRecord$3(JSON.parse(payload));
+		const record = asRecord$4(JSON.parse(payload));
 		if (!record || record.schema !== SESSION_INDEX_SCHEMA || !Array.isArray(record.files)) return;
 		const files = record.files.filter((entry) => typeof entry === "string");
 		if (files.length !== record.files.length || !Array.isArray(record.entries)) return;
@@ -1800,18 +1461,14 @@ async function readSessionIndex(sessionDir) {
 	}
 }
 async function writeSessionIndex(sessionDir, index) {
-	const filePath = sessionIndexPath(sessionDir);
-	const tempFile = createAtomicWriteTempPath(filePath);
-	const payload = JSON.stringify({
+	await writePrivateJsonFile(sessionIndexPath(sessionDir), {
 		schema: SESSION_INDEX_SCHEMA,
-		files: [...index.files].toSorted(),
-		entries: [...index.entries].toSorted((a, b) => b.lastUsedAt.localeCompare(a.lastUsedAt))
-	}, null, 2);
-	await fs$1.writeFile(tempFile, `${payload}\n`, "utf8");
-	await fs$1.rename(tempFile, filePath);
+		files: index.files.toSorted(),
+		entries: index.entries.toSorted((a, b) => b.lastUsedAt.localeCompare(a.lastUsedAt))
+	});
 }
 async function rebuildSessionIndex(sessionDir) {
-	const files = (await fs$1.readdir(sessionDir, { withFileTypes: true })).filter((entry) => entry.isFile() && entry.name.endsWith(".json") && entry.name !== "index.json").map((entry) => entry.name).toSorted();
+	const files = await listSessionFiles(sessionDir);
 	const indexEntries = [];
 	for (const file of files) try {
 		const payload = await fs$1.readFile(path.join(sessionDir, file), "utf8");
@@ -1828,23 +1485,26 @@ async function rebuildSessionIndex(sessionDir) {
 	return index;
 }
 async function loadOrRebuildSessionIndex(sessionDir) {
-	const files = (await fs$1.readdir(sessionDir, { withFileTypes: true })).filter((entry) => entry.isFile() && entry.name.endsWith(".json") && entry.name !== "index.json").map((entry) => entry.name).toSorted();
+	const files = await listSessionFiles(sessionDir);
 	const existing = await readSessionIndex(sessionDir);
 	if (existing && existing.files.length === files.length && existing.files.every((file, index) => file === files[index])) return existing;
 	return await rebuildSessionIndex(sessionDir);
 }
+async function listSessionFiles(sessionDir) {
+	return (await fs$1.readdir(sessionDir, { withFileTypes: true })).filter((entry) => entry.isFile() && entry.name.endsWith(".json") && entry.name !== "index.json").map((entry) => entry.name).toSorted();
+}
 //#endregion
 //#region src/session/persistence/repository.ts
 const DEFAULT_HISTORY_LIMIT = 20;
 function sessionFilePath(acpxRecordId) {
-	const safeId = encodeURIComponent(acpxRecordId);
+	const safeId = safeSessionId(acpxRecordId);
 	return path.join(sessionBaseDir(), `${safeId}.json`);
 }
-function sessionBaseDir() {
-	return path.join(os.homedir(), ".acpx", "sessions");
-}
 async function ensureSessionDir() {
-	await fs$1.mkdir(sessionBaseDir(), { recursive: true });
+	await fs$1.mkdir(sessionBaseDir(), {
+		recursive: true,
+		mode: 448
+	});
 }
 async function loadRecordFromIndexEntry(entry) {
 	try {
@@ -1868,14 +1528,10 @@ function matchesSessionEntry(session, normalizedCwd, normalizedName, includeClos
 }
 async function writeSessionRecord(record) {
 	await measurePerf("session.write_record", async () => {
-		await ensureSessionDir();
 		const persisted = serializeSessionRecordForDisk(record);
 		assertPersistedKeyPolicy(persisted);
 		const file = sessionFilePath(record.acpxRecordId);
-		const tempFile = createAtomicWriteTempPath(file);
-		const payload = JSON.stringify(persisted, null, 2);
-		await fs$1.writeFile(tempFile, `${payload}\n`, "utf8");
-		await fs$1.rename(tempFile, file);
+		await writePrivateJsonFile(file, persisted);
 		const sessionDir = sessionBaseDir();
 		const index = await loadOrRebuildSessionIndex(sessionDir);
 		const fileName = path.basename(file);
@@ -1940,7 +1596,7 @@ function normalizeName(value) {
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : void 0;
 }
-function isoNow$2() {
+function isoNow$1() {
 	return (/* @__PURE__ */ new Date()).toISOString();
 }
 async function listSessions() {
@@ -2031,7 +1687,7 @@ function isBeforeCutoff(record, cutoffIso) {
 	return !cutoffIso || closedAtOrLastUsedAt(record) < cutoffIso;
 }
 async function pruneSessionFiles(record, sessionDir, dirEntries, includeHistory) {
-	const safeId = encodeURIComponent(record.acpxRecordId);
+	const safeId = safeSessionId(record.acpxRecordId);
 	let bytesFreed = await unlinkCountingBytes(path.join(sessionDir, `${safeId}.json`));
 	if (includeHistory) for (const name of dirEntries.filter((entry) => isSessionStreamFile(entry, safeId))) bytesFreed += await unlinkCountingBytes(path.join(sessionDir, name));
 	return bytesFreed;
@@ -2068,10 +1724,6 @@ const WRITE_PREVIEW_MAX_CHARS = 1200;
 function nowIso$1() {
 	return (/* @__PURE__ */ new Date()).toISOString();
 }
-function isWithinRoot(rootDir, targetPath) {
-	const relative = path.relative(rootDir, targetPath);
-	return relative.length === 0 || !relative.startsWith("..") && !path.isAbsolute(relative);
-}
 function toWritePreview(content) {
 	const lines = content.replace(/\r\n/g, "\n").split("\n");
 	const visibleLines = lines.slice(0, WRITE_PREVIEW_MAX_LINES);
@@ -2092,6 +1744,7 @@ function canPromptForPermission$2() {
 }
 var FileSystemHandlers = class {
 	rootDir;
+	workspace;
 	permissionMode;
 	nonInteractivePermissions;
 	onOperation;
@@ -2121,7 +1774,7 @@ var FileSystemHandlers = class {
 		});
 		try {
 			if (this.permissionMode === "deny-all") throw new PermissionDeniedError("Permission denied for fs/read_text_file (--deny-all)");
-			const content = await fs$1.readFile(filePath, "utf8");
+			const content = await (await this.getWorkspace()).readText(`.${path.sep}${path.relative(this.rootDir, filePath)}`);
 			const sliced = this.sliceContent(content, params.line, params.limit);
 			this.emitOperation({
 				method: "fs/read_text_file",
@@ -2156,8 +1809,12 @@ var FileSystemHandlers = class {
 		});
 		try {
 			if (!await this.isWriteApproved(filePath, preview)) throw new PermissionDeniedError("Permission denied for fs/write_text_file");
-			await fs$1.mkdir(path.dirname(filePath), { recursive: true });
-			await fs$1.writeFile(filePath, params.content, "utf8");
+			const file = await (await this.getWorkspace()).openWritable(`.${path.sep}${path.relative(this.rootDir, filePath)}`, { mode: 438 });
+			try {
+				await file.handle.writeFile(params.content, "utf8");
+			} finally {
+				await file.handle.close();
+			}
 			this.emitOperation({
 				method: "fs/write_text_file",
 				status: "completed",
@@ -2187,9 +1844,16 @@ var FileSystemHandlers = class {
 	resolvePathWithinRoot(rawPath) {
 		if (!path.isAbsolute(rawPath)) throw new Error(`Path must be absolute: ${rawPath}`);
 		const resolved = path.resolve(rawPath);
-		if (!isWithinRoot(this.rootDir, resolved)) throw new Error(`Path is outside allowed cwd subtree: ${resolved}`);
+		if (!isPathInside(this.rootDir, resolved)) throw new Error(`Path is outside allowed cwd subtree: ${resolved}`);
 		return resolved;
 	}
+	getWorkspace() {
+		return this.workspace ??= root(this.rootDir, {
+			symlinks: "follow-within-root",
+			hardlinks: "allow",
+			maxBytes: Infinity
+		});
+	}
 	sliceContent(content, line, limit) {
 		if (line == null && limit == null) return content;
 		const lines = content.split("\n");
@@ -2223,14 +1887,14 @@ function selected(optionId) {
 function cancelled() {
 	return { outcome: { outcome: "cancelled" } };
 }
-function withEscalationMetadata(response, event) {
+function withPermissionMetadata(response, metadata) {
 	return {
 		...response,
 		_meta: {
 			...response._meta,
 			acpx: {
 				...response._meta?.acpx && typeof response._meta.acpx === "object" && !Array.isArray(response._meta.acpx) ? response._meta.acpx : {},
-				permissionEscalation: event
+				...metadata
 			}
 		}
 	};
@@ -2405,7 +2069,7 @@ async function resolveEscalatingPermissionRequest(params, policyMatch, allowOpti
 	if (canPromptForPermission$1()) return resolveInteractivePromptResult(params, allowOption, rejectOption);
 	const escalation = buildEscalationEvent(params, policyMatch.matchedRule);
 	return {
-		response: withEscalationMetadata(rejectOption ? selected(rejectOption.optionId) : cancelled(), escalation),
+		response: withPermissionMetadata(rejectOption ? selected(rejectOption.optionId) : cancelled(), { permissionEscalation: escalation }),
 		escalation
 	};
 }
@@ -2467,419 +2131,180 @@ function classifyPermissionDecision(params, response) {
 	return "denied";
 }
 //#endregion
-//#region src/spawn-command-options.ts
-function readWindowsEnvValue(env, key) {
-	const matchedKey = Object.keys(env).find((entry) => entry.toUpperCase() === key);
-	return matchedKey ? env[matchedKey] : void 0;
-}
-function windowsExecutableExtensions(env) {
-	return (readWindowsEnvValue(env, "PATHEXT") ?? ".COM;.EXE;.BAT;.CMD").split(";").map((value) => value.trim().toLowerCase()).filter((value) => value.length > 0);
-}
-function commandCandidates(command, env) {
-	if (path.extname(command).length > 0) return [command];
-	return windowsExecutableExtensions(env).map((extension) => `${command}${extension}`);
-}
-function commandHasPath(command) {
-	return command.includes("/") || command.includes("\\") || path.isAbsolute(command);
-}
-function resolveWindowsPathCommand(command, env) {
-	const candidates = commandCandidates(command, env);
-	const pathValue = readWindowsEnvValue(env, "PATH");
-	if (!pathValue) return;
-	for (const directory of pathValue.split(";")) {
-		const resolved = findExistingCommandInDirectory(directory, candidates);
-		if (resolved) return resolved;
-	}
-}
-function findExistingCommandInDirectory(directory, candidates) {
-	const trimmedDirectory = directory.trim();
-	if (trimmedDirectory.length === 0) return;
-	return candidates.map((candidate) => path.join(trimmedDirectory, candidate)).find((resolved) => fs.existsSync(resolved));
-}
-function resolveWindowsWrapperToken(token, wrapperPath) {
-	const relative = token.match(/%~?dp0%?\s*[\\/]*(.*)$/i)?.[1]?.trim();
-	if (!relative) return;
-	const candidate = path.resolve(path.dirname(wrapperPath), relative.replace(/[\\/]+/g, path.sep).replace(/^[\\/]+/, ""));
-	return path.extname(candidate).toLowerCase() === ".exe" && fs.existsSync(candidate) ? candidate : void 0;
-}
-function resolveWindowsWrapperExecutable(wrapperPath) {
-	if (!fs.existsSync(wrapperPath)) return;
-	try {
-		return [...fs.readFileSync(wrapperPath, "utf8").matchAll(/"([^"\r\n]*)"/g)].map((match) => resolveWindowsWrapperToken(match[1] ?? "", wrapperPath)).find((candidate) => candidate !== void 0);
-	} catch {
-		return;
+//#region src/prompt-content.ts
+var PromptInputValidationError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "PromptInputValidationError";
 	}
+};
+function asRecord$3(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	return value;
 }
-function resolveWindowsCommand(command, env = process.env) {
-	const candidates = commandCandidates(command, env);
-	if (commandHasPath(command)) return candidates.find((candidate) => fs.existsSync(candidate));
-	return resolveWindowsPathCommand(command, env);
+function isNonEmptyString(value) {
+	return typeof value === "string" && value.trim().length > 0;
 }
-/**
-* Resolve a Windows command to a native executable suitable for direct spawn.
-*
-* Batch and PowerShell shims are intentionally rejected unless they point at a
-* real `.exe` entrypoint. Callers that need shell execution should use the
-* command-specific shell policy instead.
-*/
-function resolveWindowsExecutablePath(command, env = process.env) {
-	const resolved = resolveWindowsCommand(command, env);
-	if (!resolved) return;
-	const absolute = path.resolve(resolved);
-	const extension = path.extname(absolute).toLowerCase();
-	if (extension === ".exe") return absolute;
-	if (extension !== ".cmd" && extension !== ".bat" && extension !== ".ps1") return;
-	const siblingExecutable = `${absolute.slice(0, -extension.length)}.exe`;
-	return fs.existsSync(siblingExecutable) ? siblingExecutable : resolveWindowsWrapperExecutable(absolute);
-}
-function shouldUseWindowsBatchShell(command, platform = process.platform, env = process.env) {
-	if (platform !== "win32") return false;
-	const resolvedCommand = resolveWindowsCommand(command, env) ?? command;
-	const ext = path.extname(resolvedCommand).toLowerCase();
-	return ext === ".cmd" || ext === ".bat";
-}
-const CMD_META_CHAR_RE = /([()\][%!^"`<>&|;, *?])/gu;
-const CMD_BACKSLASH_QUOTE_RE = /(?=(\\+?)?)\1"/gu;
-const CMD_TRAILING_BACKSLASH_RE = /(?=(\\+?)?)\1$/gu;
-const CMD_SHIM_RE = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/iu;
-function escapeCmdCommand(value) {
-	return value.replace(CMD_META_CHAR_RE, "^$1");
-}
-function escapeCmdArgument(value, doubleEscapeMeta) {
-	const escaped = `"${value.replace(CMD_BACKSLASH_QUOTE_RE, "$1$1\\\"").replace(CMD_TRAILING_BACKSLASH_RE, "$1$1")}"`.replace(CMD_META_CHAR_RE, "^$1");
-	return doubleEscapeMeta ? escaped.replace(CMD_META_CHAR_RE, "^$1") : escaped;
-}
-function buildAgentSpawnCommand(command, args, platform = process.platform, env = process.env) {
-	if (!shouldUseWindowsBatchShell(command, platform, env)) return {
-		command,
-		args: [...args]
-	};
-	const resolvedCommand = path.win32.normalize(resolveWindowsCommand(command, env) ?? command);
-	const doubleEscapeMeta = CMD_SHIM_RE.test(resolvedCommand);
-	const shellCommand = [escapeCmdCommand(resolvedCommand), ...args.map((arg) => escapeCmdArgument(arg, doubleEscapeMeta))].join(" ");
-	return {
-		command: readWindowsEnvValue(env, "COMSPEC") ?? "cmd.exe",
-		args: [
-			"/d",
-			"/s",
-			"/c",
-			`"${shellCommand}"`
-		],
-		windowsVerbatimArguments: true
-	};
+function isBase64Data(value) {
+	if (value.length === 0 || value.length % 4 !== 0) return false;
+	return /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(value);
 }
-function buildSpawnCommandOptions(command, options, platform = process.platform, env = process.env) {
-	if (!shouldUseWindowsBatchShell(command, platform, env)) return options;
-	return {
-		...options,
-		shell: true
-	};
+function isImageMimeType(value) {
+	return /^image\/[A-Za-z0-9.+-]+$/i.test(value);
 }
-function buildTerminalSpawnCommand(command, args) {
-	return {
-		command,
-		args: args ?? [],
-		killProcessGroup: false
-	};
+function isAudioMimeType(value) {
+	return /^audio\/[A-Za-z0-9.+-]+$/i.test(value);
 }
-function buildTerminalShellSpawnCommand(command, platform = process.platform) {
-	if (platform === "win32") return {
-		command: "cmd.exe",
-		args: [
-			"/d",
-			"/s",
-			"/c",
-			command
-		],
-		killProcessGroup: true
-	};
-	return {
-		command: "/bin/sh",
-		args: ["-c", command],
-		killProcessGroup: true
-	};
+function isTextBlock(value) {
+	const record = asRecord$3(value);
+	return record?.type === "text" && typeof record.text === "string";
 }
-//#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 isImageBlock(value) {
+	const record = asRecord$3(value);
+	return record?.type === "image" && isNonEmptyString(record.mimeType) && isImageMimeType(record.mimeType) && typeof record.data === "string" && isBase64Data(record.data);
 }
-function readPackageVersion(packageJsonPath) {
-	try {
-		return parseVersion(JSON.parse(readFileSync(packageJsonPath, "utf8")).version);
-	} catch {
-		return null;
-	}
+function isAudioBlock(value) {
+	const record = asRecord$3(value);
+	return record?.type === "audio" && isNonEmptyString(record.mimeType) && isAudioMimeType(record.mimeType) && typeof record.data === "string" && isBase64Data(record.data);
 }
-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 isResourceLinkBlock(value) {
+	const record = asRecord$3(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 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 isResourcePayload(value) {
+	const record = asRecord$3(value);
+	if (!record || !isNonEmptyString(record.uri)) return false;
+	return record.text === void 0 || typeof record.text === "string";
 }
-function resolvePackageEnvVersion(env) {
-	const envPackageName = parseVersion(env.npm_package_name);
-	const envVersion = parseVersion(env.npm_package_version);
-	return envPackageName === "acpx" ? envVersion : null;
+function isResourceBlock(value) {
+	const record = asRecord$3(value);
+	return record?.type === "resource" && isResourcePayload(record.resource);
 }
-function getAcpxVersion() {
-	if (cachedVersion) return cachedVersion;
-	cachedVersion = resolveAcpxVersion();
-	return cachedVersion;
+const CONTENT_BLOCK_VALIDATORS = [
+	isTextBlock,
+	isImageBlock,
+	isAudioBlock,
+	isResourceLinkBlock,
+	isResourceBlock
+];
+function isContentBlock(value) {
+	return CONTENT_BLOCK_VALIDATORS.some((validator) => validator(value));
 }
-//#endregion
-//#region src/acp/client-process.ts
-const PROCESS_HELPER_TIMEOUT_MS = 8e3;
-async function runTimedExecFile(command, args, options = {}) {
-	const timeoutMs = Math.max(1, Math.round(options.timeoutMs ?? 8e3));
-	return await new Promise((resolve, reject) => {
-		let settled = false;
-		let timer;
-		const child = execFile(command, [...args], {
-			encoding: "utf8",
-			maxBuffer: options.maxBufferBytes ?? 33554432,
-			killSignal: "SIGKILL",
-			windowsHide: options.windowsHide
-		}, (error, stdout) => {
-			if (settled) return;
-			settled = true;
-			if (timer) clearTimeout(timer);
-			if (error) {
-				reject(error);
-				return;
-			}
-			resolve(stdout);
-		});
-		timer = setTimeout(() => {
-			if (settled) return;
-			settled = true;
-			const killed = child.kill("SIGKILL");
-			child.stdout?.destroy();
-			child.stderr?.destroy();
-			child.unref();
-			reject(Object.assign(/* @__PURE__ */ new Error(`${command} timed out after ${timeoutMs}ms`), {
-				code: "ETIMEDOUT",
-				killed,
-				signal: "SIGKILL"
-			}));
-		}, timeoutMs);
-	});
+const CONTENT_BLOCK_ERROR_VALIDATORS = {
+	text: validateTextContentBlock,
+	image: validateImageContentBlock,
+	audio: validateAudioContentBlock,
+	resource_link: validateResourceLinkContentBlock,
+	resource: validateResourceContentBlock
+};
+function contentBlockErrorValidator(type) {
+	return Object.hasOwn(CONTENT_BLOCK_ERROR_VALIDATORS, type) ? CONTENT_BLOCK_ERROR_VALIDATORS[type] : void 0;
 }
-function normalizeAgentCommandInput(value) {
-	if (typeof value === "string") return { agentCommand: value };
-	const parts = toCommandParts([...value]);
-	const argv = [parts.command, ...parts.args];
-	return {
-		agentCommand: renderArgvIdentity(argv),
-		agentArgv: argv
-	};
+function validateTextContentBlock(record, index) {
+	return typeof record.text === "string" ? void 0 : `prompt[${index}] text block must include a string text field`;
 }
-const IDENTITY_SAFE_ARG_RE = /^[A-Za-z0-9_@%+=:,./^~-]+$/u;
-function renderArgvIdentity(argv) {
-	return argv.map((arg) => IDENTITY_SAFE_ARG_RE.test(arg) ? arg : JSON.stringify(arg)).join(" ");
+function validateImageContentBlock(record, index) {
+	if (!isNonEmptyString(record.mimeType)) return `prompt[${index}] image block must include a non-empty mimeType`;
+	if (!isImageMimeType(record.mimeType)) return `prompt[${index}] image block mimeType must start with image/`;
+	if (typeof record.data !== "string" || record.data.length === 0) return `prompt[${index}] image block must include non-empty base64 data`;
+	return isBase64Data(record.data) ? void 0 : `prompt[${index}] image block data must be valid base64`;
 }
-function isoNow$1() {
-	return (/* @__PURE__ */ new Date()).toISOString();
+function validateAudioContentBlock(record, index) {
+	if (!isNonEmptyString(record.mimeType)) return `prompt[${index}] audio block must include a non-empty mimeType`;
+	if (!isAudioMimeType(record.mimeType)) return `prompt[${index}] audio block mimeType must start with audio/`;
+	if (typeof record.data !== "string" || record.data.length === 0) return `prompt[${index}] audio block must include non-empty base64 data`;
+	return isBase64Data(record.data) ? void 0 : `prompt[${index}] audio block data must be valid base64`;
 }
-function waitForSpawn$1(child) {
-	return new Promise((resolve, reject) => {
-		const onSpawn = () => {
-			child.off("error", onError);
-			resolve();
-		};
-		const onError = (error) => {
-			child.off("spawn", onSpawn);
-			reject(error);
-		};
-		child.once("spawn", onSpawn);
-		child.once("error", onError);
-	});
+function validateResourceLinkContentBlock(record, index) {
+	if (!isNonEmptyString(record.uri)) return `prompt[${index}] resource_link block must include a non-empty uri`;
+	if (record.title !== void 0 && typeof record.title !== "string") return `prompt[${index}] resource_link block title must be a string when present`;
+	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$3(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 isChildProcessRunning(child) {
-	return child.exitCode == null && child.signalCode == null;
+function getContentBlockValidationError(value, index) {
+	const record = asRecord$3(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)}`;
 }
-function requireAgentStdio(child) {
-	if (!child.stdin || !child.stdout || !child.stderr) throw new Error("ACP agent must be spawned with piped stdin/stdout/stderr");
-	return child;
+function isPromptInput(value) {
+	return Array.isArray(value) && value.every((entry) => isContentBlock(entry));
 }
-function waitForChildExit(child, timeoutMs) {
-	if (!isChildProcessRunning(child)) return Promise.resolve(true);
-	return new Promise((resolve) => {
-		let settled = false;
-		const timer = setTimeout(() => {
-			finish(false);
-		}, Math.max(0, timeoutMs));
-		const finish = (value) => {
-			if (settled) return;
-			settled = true;
-			child.off("close", onExitLike);
-			child.off("exit", onExitLike);
-			clearTimeout(timer);
-			resolve(value);
+function promptCapabilityRequirement(block) {
+	switch (block.type) {
+		case "image": return {
+			blockType: "image",
+			capability: "image"
 		};
-		const onExitLike = () => {
-			finish(true);
+		case "audio": return {
+			blockType: "audio",
+			capability: "audio"
 		};
-		child.once("close", onExitLike);
-		child.once("exit", onExitLike);
-	});
-}
-function resolveAgentCommandParts(value, argv, platform = process.platform) {
-	if (argv) {
-		const parts = toCommandParts([...argv]);
-		assertWindowsLaunchableCommand(parts.command, platform);
-		return parts;
-	}
-	if (platform === "win32") throw new Error("Raw agent command strings are not supported on Windows. Configure the agent with an argv array, for example: \"argv\": [\"agent.exe\", \"--acp\"]. Legacy agents.<name>.args arrays are migrated automatically. Existing sessions without saved argv must be closed and recreated.");
-	return splitCommandLine(value);
-}
-function assertWindowsLaunchableCommand(command, platform) {
-	if (platform === "win32" && path.extname(command).toLowerCase() === ".sh") throw new Error(`Windows cannot launch shell script executable "${command}" directly. Configure an explicit interpreter argv, for example: "argv": ["bash", "${command}"]. acpx does not infer interpreters.`);
-}
-function splitCommandLine(value) {
-	const parts = [];
-	let current = "";
-	let quote = null;
-	let escaping = false;
-	let hasPart = false;
-	for (const ch of value) {
-		const next = readCommandLineChar({
-			ch,
-			current,
-			quote,
-			escaping,
-			parts,
-			hasPart
-		});
-		current = next.current;
-		quote = next.quote;
-		escaping = next.escaping;
-		hasPart = next.hasPart;
-	}
-	if (escaping) {
-		current += "\\";
-		hasPart = true;
-	}
-	if (quote) throw new Error("Invalid --agent command: unterminated quote");
-	if (hasPart) parts.push(current);
-	return toCommandParts(parts);
-}
-function toCommandParts(parts) {
-	if (parts.length === 0 || parts[0] === "") throw new Error("Invalid --agent command: empty command");
-	return {
-		command: parts[0],
-		args: parts.slice(1)
-	};
-}
-function readCommandLineChar(state) {
-	if (state.escaping) return {
-		current: state.current + state.ch,
-		quote: state.quote,
-		escaping: false,
-		hasPart: true
-	};
-	if (state.ch === "\\" && state.quote !== "'") return {
-		current: state.current,
-		quote: state.quote,
-		escaping: true,
-		hasPart: state.hasPart
-	};
-	if (state.quote) return readQuotedCommandLineChar({
-		ch: state.ch,
-		current: state.current,
-		quote: state.quote,
-		hasPart: state.hasPart
-	});
-	return readUnquotedCommandLineChar(state);
-}
-function readQuotedCommandLineChar(state) {
-	if (state.ch === state.quote) return {
-		current: state.current,
-		quote: null,
-		escaping: false,
-		hasPart: true
-	};
-	return {
-		current: state.current + state.ch,
-		quote: state.quote,
-		escaping: false,
-		hasPart: true
-	};
-}
-function readUnquotedCommandLineChar(state) {
-	if (state.ch === "'" || state.ch === "\"") return {
-		current: state.current,
-		quote: state.ch,
-		escaping: false,
-		hasPart: true
-	};
-	if (/\s/.test(state.ch)) {
-		flushCommandLinePart(state.parts, state.current, state.hasPart);
-		return {
-			current: "",
-			quote: null,
-			escaping: false,
-			hasPart: false
+		case "resource": return {
+			blockType: "resource",
+			capability: "embeddedContext"
 		};
+		default: return;
 	}
-	return {
-		current: state.current + state.ch,
-		quote: null,
-		escaping: false,
-		hasPart: true
-	};
-}
-function flushCommandLinePart(parts, current, hasPart) {
-	if (hasPart) parts.push(current);
 }
-function asAbsoluteCwd(cwd) {
-	return path.resolve(cwd);
+function getUnsupportedPromptContentMessage(prompt, agentCapabilities) {
+	for (const [index, block] of prompt.entries()) {
+		const requirement = promptCapabilityRequirement(block);
+		if (!requirement) continue;
+		if (agentCapabilities?.promptCapabilities?.[requirement.capability] === true) continue;
+		return `prompt[${index}] ${requirement.blockType} content requires agentCapabilities.promptCapabilities.${requirement.capability}`;
+	}
 }
-async function resolveAgentSessionCwd(cwd, agentCommand, options = {}) {
-	const resolved = asAbsoluteCwd(cwd);
-	if (!shouldTranslateWslWindowsCwd(agentCommand, options)) return resolved;
-	const translated = (await (options.runWslpath ?? runWslpath)(resolved)).trim();
-	if (!translated) throw new Error(`wslpath returned an empty Windows path for cwd: ${resolved}`);
-	return translated;
+function textPrompt(text) {
+	return [{
+		type: "text",
+		text
+	}];
 }
-function shouldTranslateWslWindowsCwd(agentCommand, options) {
-	if (!isWsl(options)) return false;
+function parseStructuredPrompt(source) {
+	if (!source.startsWith("[")) return;
 	try {
-		const { command } = splitCommandLine(agentCommand);
-		return isWindowsExecutableCommand(command);
-	} catch {
-		return false;
+		const parsed = JSON.parse(source);
+		if (isPromptInput(parsed)) return parsed;
+		if (Array.isArray(parsed)) throw new PromptInputValidationError(parsed.map((entry, index) => getContentBlockValidationError(entry, index)).find((message) => message !== void 0) ?? "Structured prompt JSON must be an array of valid ACP content blocks");
+		return;
+	} catch (error) {
+		if (error instanceof PromptInputValidationError) throw error;
+		return;
 	}
 }
-function isWsl(options) {
-	if ((options.platform ?? process.platform) !== "linux") return false;
-	return (options.existsSync ?? fs.existsSync)("/proc/sys/fs/binfmt_misc/WSLInterop");
+function parsePromptSource(source) {
+	const trimmed = source.trim();
+	const structured = parseStructuredPrompt(trimmed);
+	if (structured) return structured;
+	if (!trimmed) return [];
+	return textPrompt(trimmed);
+}
+function mergePromptSourceWithText(source, suffixText) {
+	const prompt = parsePromptSource(source);
+	const appended = suffixText.trim();
+	if (!appended) return prompt;
+	if (prompt.length === 0) return textPrompt(appended);
+	return [...prompt, ...textPrompt(appended)];
 }
-const WINDOWS_EXECUTABLE_EXTENSION_RE = /\.(?:exe|cmd|bat)$/u;
-function isWindowsExecutableCommand(command) {
-	const normalized = command.toLowerCase();
-	return WINDOWS_EXECUTABLE_EXTENSION_RE.test(normalized);
+function promptToDisplayText(prompt) {
+	return prompt.map((block) => contentBlockDisplayText(block)).filter((entry) => entry.trim().length > 0).join("\n\n").trim();
 }
-async function runWslpath(cwd) {
-	return await runTimedExecFile("wslpath", ["-w", cwd]);
+function contentBlockDisplayText(block) {
+	switch (block.type) {
+		case "text": return block.text;
+		case "resource_link": return block.title ?? block.name ?? block.uri;
+		case "resource": return resourceBlockDisplayText(block);
+		case "image": return `[image] ${block.mimeType}`;
+		case "audio": return `[audio] ${block.mimeType}`;
+		default: return "";
+	}
 }
-function basenameToken(value) {
-	return path.basename(value).toLowerCase().replace(/\.(cmd|exe|bat)$/u, "");
+function resourceBlockDisplayText(block) {
+	return "text" in block.resource && typeof block.resource.text === "string" ? block.resource.text : block.resource.uri;
 }
 //#endregion
 //#region src/acp/agent-command.ts
@@ -3207,6 +2632,82 @@ function buildAgentSpawnOptions(cwd, authCredentials, sessionEnv, agentProcessEn
 	};
 }
 //#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-protocol.ts
+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: params.fs,
+			writeTextFile: params.fs
+		},
+		terminal: params.terminal,
+		...params.elicitationModes.length > 0 ? { elicitation: {
+			...params.elicitationModes.includes("form") ? { form: {} } : {},
+			...params.elicitationModes.includes("url") ? { url: {} } : {}
+		} } : {}
+	};
+	if (!params.devinAcp) return baseCapabilities;
+	return {
+		...baseCapabilities,
+		_meta: DEVIN_COMPATIBILITY_CLIENT_CAPABILITIES_META
+	};
+}
+//#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"];
@@ -3261,9 +2762,8 @@ function parseAvailableModels(value) {
 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;
+function parseModelConfigOption(option) {
+	if (!isModelSelectOption(option) || typeof option.id !== "string" || typeof option.currentValue !== "string") return;
 	const availableModels = parseAvailableModels(option.options);
 	return availableModels ? {
 		configId: option.id,
@@ -3271,12 +2771,26 @@ function parseModelConfigOption(value) {
 		availableModels
 	} : void 0;
 }
+function modelConfigPriority(option) {
+	if (option.category !== "model") return 0;
+	return option.id === "model" ? 2 : 1;
+}
 function modelStateFromConfigOptions(configOptions) {
 	if (!Array.isArray(configOptions)) return;
+	let selected;
+	let selectedPriority = -1;
 	for (const value of configOptions) {
-		const models = parseModelConfigOption(value);
-		if (models) return models;
+		const option = asRecord$2(value);
+		if (!option) continue;
+		const models = parseModelConfigOption(option);
+		if (!models) continue;
+		const priority = modelConfigPriority(option);
+		if (priority > selectedPriority) {
+			selected = models;
+			selectedPriority = priority;
+		}
 	}
+	return selected;
 }
 function modelStateFromLegacyResponse(response) {
 	if (!response || typeof response !== "object") return;
@@ -3414,6 +2928,156 @@ function createNdJsonMessageStream(agentCommand, output, input, maxMessageBytes,
 	};
 }
 //#endregion
+//#region src/acp/observed-stream.ts
+function observeAcpStream(base, options) {
+	const elicitationRequestIds = /* @__PURE__ */ new Set();
+	const shouldSuppressInboundReplaySessionUpdate = (message) => {
+		return options.suppressReplaySessionUpdates() && isSessionUpdateNotification(message);
+	};
+	const observeInbound = (message) => {
+		const requestId = elicitationRequestId(message);
+		if (requestId !== void 0) {
+			elicitationRequestIds.add(requestId);
+			return;
+		}
+		if (!shouldSuppressInboundReplaySessionUpdate(message)) options.onMessage("inbound", message);
+	};
+	return {
+		readable: new ReadableStream({ async start(controller) {
+			const reader = base.readable.getReader();
+			try {
+				while (true) {
+					const { value, done } = await reader.read();
+					if (done) break;
+					if (!value) continue;
+					observeInbound(value);
+					if (isExtensionNotification(value)) continue;
+					controller.enqueue(value);
+				}
+			} finally {
+				reader.releaseLock();
+				controller.close();
+			}
+		} }),
+		writable: new WritableStream({ async write(message) {
+			const promptOwner = promptRequestOwner(message);
+			const activePrompt = promptOwner ? options.bindPromptOwner(promptOwner) : void 0;
+			const id = responseId(message);
+			if (!(id !== void 0 && elicitationRequestIds.delete(id))) options.onMessage("outbound", message);
+			const writer = base.writable.getWriter();
+			try {
+				await writer.write(message);
+			} finally {
+				writer.releaseLock();
+			}
+			if (activePrompt && promptOwner) options.onPromptRequestWritten(activePrompt, promptOwner);
+		} })
+	};
+}
+function isExtensionNotification(message) {
+	if (!("method" in message) || "id" in message || typeof message.method !== "string") return false;
+	return message.method !== methods.client.session.update && message.method !== methods.client.elicitation.complete && message.method !== methods.protocol.cancelRequest;
+}
+function elicitationRequestId(message) {
+	if (!("method" in message) || message.method !== methods.client.elicitation.create || !("id" in message)) return;
+	return message.id;
+}
+function responseId(message) {
+	if (!("id" in message) || "method" in message) return;
+	return message.id;
+}
+function promptRequestOwner(message) {
+	if (!("method" in message) || message.method !== methods.agent.session.prompt || !("id" in message)) return;
+	const sessionId = message.params?.sessionId;
+	return typeof sessionId === "string" ? {
+		requestId: message.id,
+		sessionId
+	} : void 0;
+}
+//#endregion
+//#region src/acp/process-descendants.ts
+function parseProcessTable(output) {
+	const table = /* @__PURE__ */ new Map();
+	for (const line of output.split("\n")) {
+		const match = /^\s*(\d+)\s+(\d+)\s+(\S+)\s+(.+?)\s*$/.exec(line);
+		if (match && !match[3].startsWith("Z")) {
+			const pid = Number(match[1]);
+			if (Number.isSafeInteger(pid) && pid > 1 && pid !== process.pid) table.set(pid, {
+				pid,
+				parentPid: Number(match[2]),
+				birth: match[4]
+			});
+		}
+	}
+	return table;
+}
+function includeDescendants(table, owned) {
+	let expanded;
+	do {
+		expanded = false;
+		for (const identity of table.values()) if (owned.has(identity.parentPid) && !owned.has(identity.pid)) {
+			owned.add(identity.pid);
+			expanded = true;
+		}
+	} while (expanded);
+}
+/** Best-effort POSIX cleanup for descendants witnessed during this child launch. */
+var ProcessDescendants = class {
+	child;
+	identities = /* @__PURE__ */ new Map();
+	pending;
+	retired = false;
+	constructor(child) {
+		this.child = child;
+	}
+	capture(timeoutMs = PROCESS_HELPER_TIMEOUT_MS) {
+		if (this.retired || process.platform === "win32") return Promise.resolve(true);
+		this.pending ??= this.readSnapshot(timeoutMs).finally(() => {
+			this.pending = void 0;
+		});
+		return this.pending;
+	}
+	async readSnapshot(timeoutMs) {
+		try {
+			const output = await runTimedExecFile("ps", ["-eo", "pid=,ppid=,stat=,lstart="], { timeoutMs });
+			if (!this.retired) this.refresh(parseProcessTable(output));
+			return true;
+		} catch {
+			return false;
+		}
+	}
+	refresh(table) {
+		const owned = /* @__PURE__ */ new Set();
+		for (const [pid, identity] of this.identities) if (table.get(pid)?.birth === identity.birth) owned.add(pid);
+		const root = this.child.pid;
+		if (root && isChildProcessRunning(this.child)) owned.add(root);
+		includeDescendants(table, owned);
+		owned.delete(root ?? 0);
+		this.identities = new Map([...table].filter(([pid]) => owned.has(pid)));
+	}
+	async signal(signal, timeoutMs) {
+		if (!await this.capture(timeoutMs) || this.retired) return;
+		for (const pid of this.identities.keys()) try {
+			process.kill(pid, signal);
+		} catch {
+			this.identities.delete(pid);
+		}
+	}
+	async waitForExit(timeoutMs) {
+		const deadline = Date.now() + timeoutMs;
+		do {
+			if (!await this.capture(Math.max(1, deadline - Date.now()))) return false;
+			if (this.identities.size === 0) return true;
+			await setTimeout$1(Math.min(100, Math.max(0, deadline - Date.now())));
+		} while (Date.now() < deadline);
+		return false;
+	}
+	retire() {
+		this.retired = true;
+		this.identities.clear();
+	}
+};
+//#endregion
 //#region src/acp/session-control-errors.ts
 const SESSION_CONTROL_UNSUPPORTED_ACP_CODES = /* @__PURE__ */ new Set([-32601, -32602]);
 function asRecord$1(value) {
@@ -3485,20 +3149,6 @@ function trimToUtf8Boundary(buffer, limit) {
 	if (start >= buffer.length) start = buffer.length - limit;
 	return buffer.subarray(start);
 }
-function waitForSpawn(process) {
-	return new Promise((resolve, reject) => {
-		const onSpawn = () => {
-			process.off("error", onError);
-			resolve();
-		};
-		const onError = (error) => {
-			process.off("spawn", onSpawn);
-			reject(error);
-		};
-		process.once("spawn", onSpawn);
-		process.once("error", onError);
-	});
-}
 async function defaultConfirmExecute(commandLine) {
 	return await promptForPermission({ prompt: `\n[permission] Allow terminal command "${commandLine}"? (y/N) ` });
 }
@@ -3913,11 +3563,12 @@ async function runProcessGroupListCommand(timeoutMs) {
 	return await runTimedExecFile("ps", ["-eo", "pid=,pgid="], { timeoutMs });
 }
 async function runWindowsProcessListCommand(timeoutMs) {
+	const command = ["Get-CimInstance Win32_Process |", "ForEach-Object { \"$($_.ProcessId) $($_.ParentProcessId)\" }"].join(" ");
 	return await runTimedExecFile("powershell.exe", [
 		"-NoProfile",
 		"-NonInteractive",
 		"-Command",
-		["Get-CimInstance Win32_Process |", "ForEach-Object { \"$($_.ProcessId) $($_.ParentProcessId)\" }"].join(" ")
+		command
 	], {
 		timeoutMs,
 		windowsHide: true
@@ -3970,10 +3621,8 @@ const REPLAY_DRAIN_TIMEOUT_MS = 5e3;
 const DRAIN_POLL_INTERVAL_MS = 20;
 const AGENT_CLOSE_TERM_GRACE_MS = 1500;
 const AGENT_CLOSE_KILL_GRACE_MS = 1e3;
+const AGENT_CLEANUP_BUDGET_MS = 8e3;
 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";
 const ELICITATION_CANCEL_MESSAGES = {
 	inactive: "elicitation owner is no longer active",
 	unavailable: "elicitation handler is unavailable",
@@ -3982,16 +3631,6 @@ const ELICITATION_CANCEL_MESSAGES = {
 	cancelled: "elicitation request was cancelled",
 	requestScoped: "request-scoped elicitation has no owner"
 };
-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 normalizeElicitationModes(modes) {
 	return [...new Set((modes ?? []).filter((mode) => mode === "form" || mode === "url"))];
 }
@@ -4014,72 +3653,18 @@ function elicitationRequestScopeId(request) {
 	const value = request.requestId;
 	return value === null || typeof value === "string" || typeof value === "number" ? value : void 0;
 }
-function waitForAbort(signal) {
-	if (signal.aborted) return Promise.resolve({ kind: "aborted" });
-	return new Promise((resolve) => {
-		signal.addEventListener("abort", () => resolve({ kind: "aborted" }), { once: true });
+async function raceWithAbort(signal, pending) {
+	let onAbort;
+	const aborted = new Promise((resolve) => {
+		onAbort = () => resolve(void 0);
+		if (signal.aborted) onAbort();
+		else signal.addEventListener("abort", onAbort, { once: true });
 	});
-}
-function isExtensionNotification(message) {
-	if (!("method" in message) || "id" in message || typeof message.method !== "string") return false;
-	return message.method !== methods.client.session.update && message.method !== methods.client.elicitation.complete && message.method !== methods.protocol.cancelRequest;
-}
-function elicitationRequestId(message) {
-	if (!("method" in message) || message.method !== methods.client.elicitation.create || !("id" in message)) return;
-	return message.id;
-}
-function responseId(message) {
-	if (!("id" in message) || "method" in message) return;
-	return message.id;
-}
-function promptRequestOwner(message) {
-	if (!("method" in message) || message.method !== methods.agent.session.prompt || !("id" in message)) return;
-	const sessionId = message.params?.sessionId;
-	return typeof sessionId === "string" ? {
-		requestId: message.id,
-		sessionId
-	} : void 0;
-}
-function createAgentConnectionFacade(connection) {
-	const agent = connection.agent;
-	return {
-		signal: connection.signal,
-		close: (error) => connection.close(error),
-		initialize: async (params) => await agent.request(methods.agent.initialize, params),
-		authenticate: async (params) => {
-			await agent.request(methods.agent.authenticate, params);
-		},
-		newSession: async (params) => await agent.request(methods.agent.session.new, params),
-		loadSession: async (params) => await agent.request(methods.agent.session.load, params),
-		resumeSession: async (params) => await agent.request(methods.agent.session.resume, params),
-		prompt: async (params) => await agent.request(methods.agent.session.prompt, params),
-		setSessionMode: async (params) => await agent.request(methods.agent.session.setMode, params),
-		setSessionConfigOption: async (params) => await agent.request(methods.agent.session.setConfigOption, params),
-		extMethod: async (method, params) => await agent.request(method, params),
-		cancel: async (params) => await agent.notify(methods.agent.session.cancel, params),
-		closeSession: async (params) => {
-			await agent.request(methods.agent.session.close, params);
-		},
-		listSessions: async (params) => await agent.request(methods.agent.session.list, params)
-	};
-}
-function resolveClientCapabilities(params) {
-	const baseCapabilities = {
-		fs: {
-			readTextFile: params.fs,
-			writeTextFile: params.fs
-		},
-		terminal: params.terminal,
-		...params.elicitationModes.length > 0 ? { elicitation: {
-			...params.elicitationModes.includes("form") ? { form: {} } : {},
-			...params.elicitationModes.includes("url") ? { url: {} } : {}
-		} } : {}
-	};
-	if (!params.devinAcp) return baseCapabilities;
-	return {
-		...baseCapabilities,
-		_meta: DEVIN_COMPATIBILITY_CLIENT_CAPABILITIES_META
-	};
+	try {
+		return await Promise.race([pending, aborted]);
+	} finally {
+		signal.removeEventListener("abort", onAbort);
+	}
 }
 function hasResponseField(response, field) {
 	return !!response && typeof response === "object" && field in response;
@@ -4091,7 +3676,7 @@ function normalizeResponseConfigOptions(response) {
 function toReconnectedSessionResult(response) {
 	const configOptions = normalizeResponseConfigOptions(response);
 	return {
-		agentSessionId: extractRuntimeSessionId(response?._meta),
+		agentSessionId: extractAgentSessionId(response?._meta),
 		configOptions,
 		models: modelStateFromSessionResponse({
 			configOptions,
@@ -4146,6 +3731,8 @@ var AcpClient = class {
 	options;
 	connection;
 	agent;
+	agentDescendants = /* @__PURE__ */ new WeakMap();
+	agentCleanups = /* @__PURE__ */ new WeakMap();
 	initResult;
 	loadedSessionId;
 	eventHandlers;
@@ -4288,6 +3875,7 @@ var AcpClient = class {
 		this.logAgentLaunch(launch);
 		await this.ensureLaunchSupport(launch);
 		const { child, process: startedProcess } = await this.spawnAgentProcess(launch);
+		this.agent = child;
 		this.closing = false;
 		this.agentStartedAt = startedProcess.startedAt;
 		this.lastAgentExit = void 0;
@@ -4312,11 +3900,11 @@ var AcpClient = class {
 		let connection;
 		const stream = this.createTappedStream(createNdJsonMessageStream(this.options.agentCommand, input, output, maxMessageBytes, (error) => {
 			this.rejectPendingConnectionRequests(error);
-			connection?.close?.(error);
+			connection?.close(error);
 		}));
 		connection = this.createConnection(stream, launch);
 		connection.signal.addEventListener("abort", () => {
-			this.recordAgentExit("connection_close", child.exitCode ?? null, child.signalCode ?? null);
+			this.recordAgentExit(child, "connection_close", child.exitCode ?? null, child.signalCode ?? null);
 		}, { once: true });
 		await this.initializeAgentConnection({
 			child,
@@ -4381,13 +3969,14 @@ var AcpClient = class {
 				...plan.spawnOptions,
 				windowsVerbatimArguments: spawnCommand.windowsVerbatimArguments
 			});
-			await waitForSpawn$1(spawnedChild);
+			await waitForSpawn(spawnedChild);
 		} catch (error) {
 			const spawnError = new AgentSpawnError(this.options.agentCommand, error);
 			this.notifyProcessSpawnFailure(launch, spawnError);
 			throw spawnError;
 		}
 		const child = requireAgentStdio(spawnedChild);
+		this.agentDescendants.set(child, new ProcessDescendants(child));
 		const pid = child.pid;
 		if (pid === void 0) {
 			const spawnError = new AgentSpawnError(this.options.agentCommand, /* @__PURE__ */ new Error("spawned agent process did not expose a PID"));
@@ -4400,7 +3989,7 @@ var AcpClient = class {
 			process: Object.freeze({
 				...launch,
 				pid,
-				startedAt: isoNow$1()
+				startedAt: isoNow$2()
 			})
 		};
 	}
@@ -4433,34 +4022,34 @@ var AcpClient = class {
 		}).onRequest(methods.client.terminal.create, async ({ params }) => {
 			return await this.handleCreateTerminal(params);
 		}).onRequest(methods.client.terminal.output, async ({ params }) => {
-			return await this.handleTerminalOutput(params);
+			return await this.terminalManager.terminalOutput(params);
 		}).onRequest(methods.client.terminal.waitForExit, async ({ params }) => {
-			return await this.handleWaitForTerminalExit(params);
+			return await this.terminalManager.waitForTerminalExit(params);
 		}).onRequest(methods.client.terminal.kill, async ({ params }) => {
-			return await this.handleKillTerminal(params);
+			return await this.terminalManager.killTerminal(params);
 		}).onRequest(methods.client.terminal.release, async ({ params }) => {
-			return await this.handleReleaseTerminal(params);
+			return await this.terminalManager.releaseTerminal(params);
 		});
 		if (launch.devinAcp) app.onRequest("_cognition.ai/request_diagnostics", (params) => {
 			return params && typeof params === "object" && !Array.isArray(params) ? params : {};
 		}, async () => ({}));
-		return createAgentConnectionFacade(app.connect(stream));
+		return app.connect(stream);
 	}
 	async initializeAgentConnection(params) {
 		try {
 			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;
 			this.initResult = initResult;
+			await this.captureAgentDescendants(params.child);
 			this.log(`initialized protocol version ${initResult.protocolVersion}`);
 		} catch (error) {
-			params.connection.close?.(error);
+			params.connection.close(error);
 			await this.handleInitializeFailure(params, error);
 		}
 	}
 	async initializeProtocolConnection(connection, launch) {
-		const initializePromise = connection.initialize({
+		const initializePromise = connection.agent.request(methods.agent.initialize, {
 			protocolVersion: PROTOCOL_VERSION,
 			clientCapabilities: resolveClientCapabilities({
 				devinAcp: launch.devinAcp,
@@ -4476,10 +4065,9 @@ var AcpClient = class {
 	}
 	async handleInitializeFailure(params, error) {
 		params.startupFailure.dispose();
+		await this.captureAgentDescendants(params.child);
 		const normalizedError = error instanceof AcpMessageLimitError ? error : await this.normalizeInitializeError(error, params.child, params.startupStderr);
-		try {
-			params.child.kill();
-		} catch {}
+		await this.terminateAgentProcess(params.child);
 		if (params.launch.geminiAcp && error instanceof TimeoutError) throw new GeminiAcpStartupTimeoutError(await buildGeminiAcpStartupTimeoutMessage(params.launch.spawnCommand), {
 			cause: error,
 			retryable: true
@@ -4487,59 +4075,15 @@ var AcpClient = class {
 		throw normalizedError;
 	}
 	createTappedStream(base) {
-		const onAcpMessage = () => this.eventHandlers.onAcpMessage;
-		const onAcpOutputMessage = () => this.eventHandlers.onAcpOutputMessage;
-		const elicitationRequestIds = /* @__PURE__ */ new Set();
-		const bindPromptOwner = (owner) => this.bindPromptOwner(owner);
-		const onPromptRequestWritten = (active, owner) => this.onPromptRequestWritten(active, owner);
-		const shouldSuppressInboundReplaySessionUpdate = (message) => {
-			return this.suppressReplaySessionUpdateMessages && isSessionUpdateNotification(message);
-		};
-		const observeInbound = (message) => {
-			const requestId = elicitationRequestId(message);
-			if (requestId !== void 0) {
-				elicitationRequestIds.add(requestId);
-				return;
-			}
-			if (!shouldSuppressInboundReplaySessionUpdate(message)) {
-				onAcpOutputMessage()?.("inbound", message);
-				onAcpMessage()?.("inbound", message);
-			}
-		};
-		return {
-			readable: new ReadableStream({ async start(controller) {
-				const reader = base.readable.getReader();
-				try {
-					while (true) {
-						const { value, done } = await reader.read();
-						if (done) break;
-						if (!value) continue;
-						observeInbound(value);
-						if (isExtensionNotification(value)) continue;
-						controller.enqueue(value);
-					}
-				} finally {
-					reader.releaseLock();
-					controller.close();
-				}
-			} }),
-			writable: new WritableStream({ async write(message) {
-				const promptOwner = promptRequestOwner(message);
-				const activePrompt = promptOwner ? bindPromptOwner(promptOwner) : void 0;
-				const id = responseId(message);
-				if (!(id !== void 0 && elicitationRequestIds.delete(id))) {
-					onAcpOutputMessage()?.("outbound", message);
-					onAcpMessage()?.("outbound", message);
-				}
-				const writer = base.writable.getWriter();
-				try {
-					await writer.write(message);
-				} finally {
-					writer.releaseLock();
-				}
-				if (activePrompt && promptOwner) onPromptRequestWritten(activePrompt, promptOwner);
-			} })
-		};
+		return observeAcpStream(base, {
+			onMessage: (direction, message) => {
+				this.eventHandlers.onAcpOutputMessage?.(direction, message);
+				this.eventHandlers.onAcpMessage?.(direction, message);
+			},
+			suppressReplaySessionUpdates: () => this.suppressReplaySessionUpdateMessages,
+			bindPromptOwner: (owner) => this.bindPromptOwner(owner),
+			onPromptRequestWritten: (active, owner) => this.onPromptRequestWritten(active, owner)
+		});
 	}
 	async createSession(cwd = this.options.cwd) {
 		const connection = this.getConnection();
@@ -4548,7 +4092,7 @@ var AcpClient = class {
 		const sessionCwd = await resolveAgentSessionCwd(cwd, this.options.agentCommand);
 		let result;
 		try {
-			const createPromise = this.runConnectionRequest(() => connection.newSession({
+			const createPromise = this.runConnectionRequest(() => connection.agent.request(methods.agent.session.new, {
 				cwd: sessionCwd,
 				mcpServers: this.options.mcpServers ?? [],
 				_meta: buildClaudeCodeOptionsMeta(this.options.sessionOptions, claudeAcp)
@@ -4568,9 +4112,10 @@ var AcpClient = class {
 			response: result
 		});
 		this.rememberSessionModels(result.sessionId, models);
+		await this.captureAgentDescendants(this.agent);
 		return {
 			sessionId: result.sessionId,
-			agentSessionId: extractRuntimeSessionId(result._meta),
+			agentSessionId: extractAgentSessionId(result._meta),
 			configOptions,
 			models,
 			configOptionsPresent: hasResponseField(result, "configOptions"),
@@ -4587,7 +4132,7 @@ var AcpClient = class {
 		const previousSuppression = this.applySessionUpdateSuppression(Boolean(options.suppressReplayUpdates));
 		let response;
 		try {
-			response = await this.runConnectionRequest(() => connection.loadSession({
+			response = await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.load, {
 				sessionId,
 				cwd: sessionCwd,
 				mcpServers: this.options.mcpServers ?? []
@@ -4599,12 +4144,13 @@ var AcpClient = class {
 		this.loadedSessionId = sessionId;
 		const result = toReconnectedSessionResult(response);
 		this.updateRememberedSessionModels(sessionId, result);
+		await this.captureAgentDescendants(this.agent);
 		return result;
 	}
 	async resumeSession(sessionId, cwd = this.options.cwd) {
 		const connection = this.getConnection();
 		const sessionCwd = await resolveAgentSessionCwd(cwd, this.options.agentCommand);
-		const response = await this.runConnectionRequest(() => connection.resumeSession({
+		const response = await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.resume, {
 			sessionId,
 			cwd: sessionCwd,
 			mcpServers: this.options.mcpServers ?? []
@@ -4612,6 +4158,7 @@ var AcpClient = class {
 		this.loadedSessionId = sessionId;
 		const result = toReconnectedSessionResult(response);
 		this.updateRememberedSessionModels(sessionId, result);
+		await this.captureAgentDescendants(this.agent);
 		return result;
 	}
 	applySessionUpdateSuppression(enabled) {
@@ -4627,14 +4174,15 @@ var AcpClient = class {
 		this.suppressSessionUpdates = previous.suppressSessionUpdates;
 		this.suppressReplaySessionUpdateMessages = previous.suppressReplaySessionUpdateMessages;
 	}
-	async prompt(sessionId, prompt, onRequestWritten, onElicitation) {
+	async prompt(sessionId, prompt, onRequestWritten, onElicitation, onPermissionRequest) {
 		const connection = this.getConnection();
 		const normalizedPrompt = this.normalizePromptForAgent(prompt);
 		const restoreConsoleError = this.options.suppressSdkConsoleErrors ? installSdkConsoleErrorSuppression() : void 0;
-		const activePrompt = this.beginActivePrompt(sessionId, onRequestWritten, onElicitation);
+		const previousActivePrompt = this.activePrompt;
+		const activePrompt = this.beginActivePrompt(sessionId, onRequestWritten, onElicitation, onPermissionRequest);
 		let promptPromise;
 		try {
-			promptPromise = this.runConnectionRequest(() => connection.prompt({
+			promptPromise = this.runConnectionRequest(() => connection.agent.request(methods.agent.session.prompt, {
 				sessionId,
 				prompt: normalizedPrompt
 			}));
@@ -4645,6 +4193,7 @@ var AcpClient = class {
 		}
 		activePrompt.promise = promptPromise;
 		try {
+			previousActivePrompt?.elicitationController?.abort();
 			return this.returnPromptResponseOrPermissionFailure(sessionId, await promptPromise);
 		} catch (error) {
 			this.throwPromptPermissionFailureIfPresent(sessionId);
@@ -4652,23 +4201,19 @@ var AcpClient = class {
 		} finally {
 			restoreConsoleError?.();
 			this.clearActivePrompt(activePrompt);
-			this.cancellingSessionIds.delete(sessionId);
-			this.abortAndDropPermissionSignal(sessionId);
-			this.promptPermissionFailures.delete(sessionId);
 		}
 	}
-	beginActivePrompt(sessionId, onRequestWritten, elicitationHandler) {
-		const previous = this.activePrompt;
+	beginActivePrompt(sessionId, onRequestWritten, elicitationHandler, permissionHandler) {
 		this.cancellingSessionIds.delete(sessionId);
 		const active = {
 			sessionId,
 			onRequestWritten,
 			elicitationHandler,
+			permissionHandler,
 			elicitationController: new AbortController()
 		};
 		this.activePrompt = active;
 		this.pendingPromptOwners.push(active);
-		previous?.elicitationController?.abort();
 		return active;
 	}
 	bindPromptOwner(owner) {
@@ -4685,10 +4230,18 @@ var AcpClient = class {
 		} catch {}
 	}
 	clearActivePrompt(active) {
-		if (this.activePrompt === active) this.activePrompt = void 0;
 		const pendingIndex = this.pendingPromptOwners.indexOf(active);
+		const clearSession = !this.pendingPromptOwners.some((candidate, index) => index > pendingIndex && candidate.sessionId === active.sessionId);
+		if (this.activePrompt === active) this.activePrompt = void 0;
 		if (pendingIndex >= 0) this.pendingPromptOwners.splice(pendingIndex, 1);
+		let permissionController;
+		if (clearSession) {
+			this.cancellingSessionIds.delete(active.sessionId);
+			permissionController = this.takePermissionAbortController(active.sessionId);
+			this.promptPermissionFailures.delete(active.sessionId);
+		}
 		active.elicitationController.abort();
+		permissionController?.abort();
 	}
 	normalizePromptForAgent(prompt) {
 		const normalizedPrompt = typeof prompt === "string" ? textPrompt(prompt) : prompt;
@@ -4707,7 +4260,7 @@ var AcpClient = class {
 	async setSessionMode(sessionId, modeId) {
 		const connection = this.getConnection();
 		try {
-			await this.runConnectionRequest(() => connection.setSessionMode({
+			await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.setMode, {
 				sessionId,
 				modeId
 			}));
@@ -4718,7 +4271,7 @@ var AcpClient = class {
 	async setSessionConfigOption(sessionId, configId, value) {
 		const connection = this.getConnection();
 		try {
-			return await this.runConnectionRequest(() => connection.setSessionConfigOption({
+			return await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.setConfigOption, {
 				sessionId,
 				configId,
 				value
@@ -4740,7 +4293,7 @@ var AcpClient = class {
 	async setSessionModelThroughConfig(sessionId, modelId, configId) {
 		const connection = this.getConnection();
 		try {
-			const response = await this.runConnectionRequest(() => connection.setSessionConfigOption({
+			const response = await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.setConfigOption, {
 				sessionId,
 				configId,
 				value: modelId
@@ -4754,7 +4307,7 @@ var AcpClient = class {
 	async setSessionModelThroughLegacyMethod(sessionId, modelId) {
 		const connection = this.getConnection();
 		try {
-			await this.runConnectionRequest(() => connection.extMethod("session/set_model", {
+			await this.runConnectionRequest(() => connection.agent.request("session/set_model", {
 				sessionId,
 				modelId
 			}));
@@ -4802,26 +4355,32 @@ var AcpClient = class {
 	}
 	async cancel(sessionId) {
 		const connection = this.getConnection();
-		const active = this.activePrompt;
-		if (active?.sessionId === sessionId) {
+		const active = this.activePrompt?.sessionId === sessionId ? this.activePrompt : void 0;
+		const cancellation = active?.cancelPromise ?? this.runConnectionRequest(() => connection.agent.notify(methods.agent.session.cancel, { sessionId })).catch((error) => {
+			if (active?.cancelPromise === cancellation) active.cancelPromise = void 0;
+			throw error;
+		});
+		const permissionController = this.takePermissionAbortController(sessionId);
+		if (active) {
+			active.cancelPromise = cancellation;
 			this.cancellingSessionIds.add(sessionId);
 			active.elicitationController?.abort();
 		} else this.cancellingSessionIds.delete(sessionId);
-		this.abortAndDropPermissionSignal(sessionId);
-		await this.runConnectionRequest(() => connection.cancel({ sessionId }));
+		permissionController?.abort();
+		await cancellation;
 	}
 	async closeSession(sessionId) {
 		const connection = this.getConnection();
 		this.cancellingSessionIds.add(sessionId);
 		if (this.activePrompt?.sessionId === sessionId) this.activePrompt.elicitationController?.abort();
-		await this.runConnectionRequest(() => connection.closeSession({ sessionId }));
+		await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.close, { sessionId }));
 		if (this.loadedSessionId === sessionId) this.loadedSessionId = void 0;
 		this.modelConfigIds.delete(sessionId);
 		this.legacyModelSessionIds.delete(sessionId);
 	}
 	async listSessions(params = {}) {
 		const connection = this.getConnection();
-		return await this.runConnectionRequest(() => connection.listSessions(params));
+		return await this.runConnectionRequest(() => connection.agent.request(methods.agent.session.list, params));
 	}
 	async requestCancelActivePrompt() {
 		const active = this.activePrompt;
@@ -4881,18 +4440,36 @@ var AcpClient = class {
 		this.activePrompt?.elicitationController?.abort();
 	}
 	closeConnection() {
-		this.connection?.close?.();
+		this.connection?.close();
+	}
+	async captureAgentDescendants(child) {
+		const descendants = child && this.agentDescendants.get(child);
+		if (descendants && !await descendants.capture()) this.log("could not verify agent descendants; skipping unverified process cleanup");
+	}
+	terminateAgentProcess(child) {
+		let cleanup = this.agentCleanups.get(child);
+		if (!cleanup) {
+			cleanup = Promise.resolve().then(() => this.cleanupAgentProcess(child));
+			this.agentCleanups.set(child, cleanup);
+		}
+		return cleanup;
 	}
-	async terminateAgentProcess(child) {
+	async cleanupAgentProcess(child) {
+		const descendants = this.agentDescendants.get(child);
+		const deadline = Date.now() + AGENT_CLEANUP_BUDGET_MS;
 		const stdinCloseGraceMs = resolveAgentCloseAfterStdinEndMs(this.options.agentCommand);
-		this.endAgentStdin(child);
-		let exited = await waitForChildExit(child, stdinCloseGraceMs);
-		exited = await this.killAgentIfRunning(child, exited, "SIGTERM", AGENT_CLOSE_TERM_GRACE_MS);
-		if (!exited) {
-			this.log(`agent did not exit after ${AGENT_CLOSE_TERM_GRACE_MS}ms; forcing SIGKILL`);
-			exited = await this.killAgentIfRunning(child, exited, "SIGKILL", AGENT_CLOSE_KILL_GRACE_MS);
+		try {
+			if (descendants) await descendants.capture(Math.max(1, deadline - Date.now()));
+			this.endAgentStdin(child);
+			await waitForChildExit(child, Math.min(stdinCloseGraceMs, Math.max(0, deadline - Date.now())));
+			if (!await this.signalAgentAndDescendants(child, "SIGTERM", AGENT_CLOSE_TERM_GRACE_MS, deadline)) {
+				this.log("agent processes did not exit after SIGTERM; forcing SIGKILL");
+				await this.signalAgentAndDescendants(child, "SIGKILL", AGENT_CLOSE_KILL_GRACE_MS, deadline);
+			}
+		} finally {
+			descendants?.retire();
+			this.detachAgentHandles(child, isChildProcessRunning(child));
 		}
-		this.detachAgentHandles(child, !exited);
 	}
 	endAgentStdin(child) {
 		if (child.stdin.destroyed) return;
@@ -4900,12 +4477,15 @@ var AcpClient = class {
 			child.stdin.end();
 		} catch {}
 	}
-	async killAgentIfRunning(child, alreadyExited, signal, waitMs) {
-		if (alreadyExited || !isChildProcessRunning(child)) return alreadyExited;
-		try {
+	async signalAgentAndDescendants(child, signal, waitMs, deadline) {
+		const descendants = this.agentDescendants.get(child);
+		if (descendants && Date.now() < deadline) await descendants.signal(signal, deadline - Date.now());
+		if (isChildProcessRunning(child)) try {
 			child.kill(signal);
 		} catch {}
-		return await waitForChildExit(child, waitMs);
+		const remaining = Math.min(waitMs, Math.max(0, deadline - Date.now()));
+		const [exited, descendantsExited] = await Promise.all([waitForChildExit(child, remaining), descendants ? descendants.waitForExit(remaining) : Promise.resolve(true)]);
+		return exited && descendantsExited;
 	}
 	detachAgentHandles(agent, unref) {
 		const stdin = agent.stdin;
@@ -5057,7 +4637,7 @@ var AcpClient = class {
 			this.log(`agent advertised auth methods [${authMethods.map((m) => m.id).join(", ")}] but no matching credentials found — skipping (agent may handle auth internally)`);
 			return;
 		}
-		await connection.authenticate({ methodId: selected.methodId });
+		await connection.agent.request(methods.agent.authenticate, { methodId: selected.methodId });
 		this.log(`authenticated with method ${selected.methodId} (${selected.source})`);
 	}
 	async handlePermissionRequest(params) {
@@ -5076,7 +4656,7 @@ var AcpClient = class {
 		if ("response" in resolved) return resolved.response;
 		const { active, handler } = resolved.owner;
 		const signal = AbortSignal.any([requestSignal, active.elicitationController.signal]);
-		const handlerAttempt = Promise.resolve().then(async () => await handler(request, {
+		const outcome = await raceWithAbort(signal, Promise.resolve().then(async () => await handler(request, {
 			requestId,
 			signal
 		})).then((response) => ({
@@ -5085,10 +4665,9 @@ var AcpClient = class {
 		}), (error) => ({
 			kind: "error",
 			error
-		}));
-		const outcome = await Promise.race([handlerAttempt, waitForAbort(signal)]);
+		})));
 		if (this.activePrompt !== active) return cancelledElicitationResponse(ELICITATION_CANCEL_MESSAGES.inactive);
-		if (outcome.kind === "aborted" || signal.aborted) return cancelledElicitationResponse(ELICITATION_CANCEL_MESSAGES.cancelled);
+		if (!outcome || signal.aborted) return cancelledElicitationResponse(ELICITATION_CANCEL_MESSAGES.cancelled);
 		if (outcome.kind === "error" || !isKnownElicitationResponse(outcome.response)) return cancelledElicitationResponse(ELICITATION_CANCEL_MESSAGES.unavailable);
 		return outcome.response;
 	}
@@ -5115,15 +4694,31 @@ var AcpClient = class {
 	isElicitationSessionCancelling(sessionId) {
 		return this.closing || this.cancellingSessionIds.has(sessionId);
 	}
+	resolvePermissionOwner(sessionId) {
+		const active = this.activePrompt;
+		const handler = active?.permissionHandler ?? this.options.onPermissionRequest;
+		if (!handler) return;
+		const signal = this.cancellationSignalForSession(sessionId);
+		if (!active?.permissionHandler) return {
+			handler,
+			signal
+		};
+		return {
+			handler,
+			signal: active.sessionId === sessionId ? AbortSignal.any([signal, active.elicitationController.signal]) : AbortSignal.abort()
+		};
+	}
 	async tryHandlePermissionRequestWithHost(params) {
-		if (!this.options.onPermissionRequest) return;
-		const signal = this.cancellationSignalForSession(params.sessionId);
+		const owner = this.resolvePermissionOwner(params.sessionId);
+		if (!owner) return;
+		const { handler, signal } = owner;
+		if (signal.aborted) return this.hostPermissionDecisionResponse(params, signal, void 0);
 		try {
-			const decision = await this.options.onPermissionRequest({
+			const decision = await raceWithAbort(signal, handler({
 				sessionId: params.sessionId,
 				raw: params,
 				inferredKind: inferToolKind(params)
-			}, { signal });
+			}, { signal }));
 			return this.hostPermissionDecisionResponse(params, signal, decision);
 		} catch (error) {
 			return this.hostPermissionErrorResponse(params, signal, error);
@@ -5135,9 +4730,9 @@ var AcpClient = class {
 			return cancelledPermissionResponse();
 		}
 		if (!decision) return;
-		const response = decisionToResponse(params, decision);
+		const response = decisionToResponse(preferCodexPermissionRefusal(params, this.initResult?.agentInfo?.name), decision);
 		this.recordPermissionDecision(classifyPermissionDecision(params, response));
-		return response;
+		return decision.outcome === "cancel" ? response : this.explainPermissionRefusal(params, response);
 	}
 	hostPermissionErrorResponse(params, signal, error) {
 		if (signal.aborted || this.cancellingSessionIds.has(params.sessionId)) {
@@ -5148,16 +4743,29 @@ var AcpClient = class {
 	}
 	async resolvePermissionRequestFromMode(params) {
 		try {
-			const result = await resolvePermissionRequestWithDetails(params, this.options.permissionMode, this.options.nonInteractivePermissions ?? "deny", this.options.permissionPolicy);
+			const result = await resolvePermissionRequestWithDetails(preferCodexPermissionRefusal(params, this.initResult?.agentInfo?.name), this.options.permissionMode, this.options.nonInteractivePermissions ?? "deny", this.options.permissionPolicy);
 			this.emitPermissionEscalation(result.escalation);
 			return {
-				response: result.response,
+				response: this.explainPermissionRefusal(params, result.response),
 				recorded: false
 			};
 		} catch (error) {
 			return this.handleModePermissionError(params.sessionId, error);
 		}
 	}
+	explainPermissionRefusal(params, response) {
+		const notice = codexPermissionNotice(params, response, this.initResult?.agentInfo?.name);
+		if (!notice || this.cancellingSessionIds.has(params.sessionId)) return response;
+		try {
+			this.eventHandlers.onClientOperation?.({
+				method: "session/request_permission",
+				status: "completed",
+				summary: notice,
+				timestamp: isoNow$2()
+			});
+		} catch {}
+		return withPermissionMetadata(response, { permissionNotice: notice });
+	}
 	emitPermissionEscalation(escalation) {
 		if (escalation) this.eventHandlers.onPermissionEscalation?.(escalation);
 	}
@@ -5172,8 +4780,9 @@ var AcpClient = class {
 	}
 	attachAgentLifecycleObservers(child, startedProcess, exitNotificationBarrier) {
 		const onExit = (exitCode, signal) => {
-			const exitedAt = isoNow$1();
-			this.recordAgentExit("process_exit", exitCode, signal);
+			const exitedAt = isoNow$2();
+			this.recordAgentExit(child, "process_exit", exitCode, signal);
+			this.terminateAgentProcess(child);
 			exitNotificationBarrier.then(() => {
 				this.notifyProcessExit(startedProcess, exitCode, signal, exitedAt);
 			});
@@ -5184,10 +4793,10 @@ var AcpClient = class {
 			onExit(child.exitCode, child.signalCode);
 		}
 		child.once("close", (exitCode, signal) => {
-			this.recordAgentExit("process_close", exitCode, signal);
+			this.recordAgentExit(child, "process_close", exitCode, signal);
 		});
 		child.stdout.once("close", () => {
-			this.recordAgentExit("pipe_close", child.exitCode ?? null, child.signalCode ?? null);
+			this.recordAgentExit(child, "pipe_close", child.exitCode ?? null, child.signalCode ?? null);
 		});
 	}
 	notifyProcessSpawnFailure(launch, error) {
@@ -5196,7 +4805,7 @@ var AcpClient = class {
 		const event = Object.freeze({
 			...launch,
 			error,
-			failedAt: isoNow$1()
+			failedAt: isoNow$2()
 		});
 		try {
 			Promise.resolve(handler(event)).catch((observerError) => {
@@ -5227,12 +4836,12 @@ var AcpClient = class {
 		const message = error instanceof Error ? error.message : String(error);
 		this.log(`process lifecycle ${hook} hook failed: ${message}`);
 	}
-	recordAgentExit(reason, exitCode, signal) {
-		if (this.lastAgentExit) return;
+	recordAgentExit(child, reason, exitCode, signal) {
+		if (this.agent !== child || this.lastAgentExit) return;
 		this.lastAgentExit = {
 			exitCode,
 			signal,
-			exitedAt: isoNow$1(),
+			exitedAt: isoNow$2(),
 			reason,
 			unexpectedDuringPrompt: !this.closing && Boolean(this.activePrompt)
 		};
@@ -5286,6 +4895,7 @@ var AcpClient = class {
 			return await this.filesystem.readTextFile(params);
 		} catch (error) {
 			this.recordPermissionError(params.sessionId, error);
+			if (error instanceof FsSafeError && error.code === "not-found" || error instanceof Error && "code" in error && error.code === "ENOENT") throw RequestError.resourceNotFound(pathToFileURL(params.path).href);
 			throw error;
 		}
 	}
@@ -5305,18 +4915,6 @@ var AcpClient = class {
 			throw error;
 		}
 	}
-	async handleTerminalOutput(params) {
-		return await this.terminalManager.terminalOutput(params);
-	}
-	async handleWaitForTerminalExit(params) {
-		return await this.terminalManager.waitForTerminalExit(params);
-	}
-	async handleKillTerminal(params) {
-		return await this.terminalManager.killTerminal(params);
-	}
-	async handleReleaseTerminal(params) {
-		return await this.terminalManager.releaseTerminal(params);
-	}
 	cancellationSignalForSession(sessionId) {
 		let controller = this.permissionAbortControllers.get(sessionId);
 		if (!controller) {
@@ -5325,12 +4923,10 @@ var AcpClient = class {
 		}
 		return controller.signal;
 	}
-	abortAndDropPermissionSignal(sessionId) {
+	takePermissionAbortController(sessionId) {
 		const controller = this.permissionAbortControllers.get(sessionId);
-		if (controller) {
-			controller.abort();
-			this.permissionAbortControllers.delete(sessionId);
-		}
+		this.permissionAbortControllers.delete(sessionId);
+		return controller;
 	}
 	recordPermissionDecision(decision) {
 		this.permissionStats.requested += 1;
@@ -5393,132 +4989,6 @@ var AcpClient = class {
 	}
 };
 //#endregion
-//#region src/runtime/engine/lifecycle.ts
-function applyLifecycleSnapshotToRecord(record, snapshot) {
-	if (!snapshot) return;
-	record.pid = snapshot.running ? snapshot.pid : void 0;
-	record.agentStartedAt = snapshot.startedAt;
-	if (snapshot.lastExit) {
-		record.lastAgentExitCode = snapshot.lastExit.exitCode;
-		record.lastAgentExitSignal = snapshot.lastExit.signal;
-		record.lastAgentExitAt = snapshot.lastExit.exitedAt;
-		record.lastAgentDisconnectReason = snapshot.lastExit.reason;
-		return;
-	}
-	record.lastAgentExitCode = void 0;
-	record.lastAgentExitSignal = void 0;
-	record.lastAgentExitAt = void 0;
-	record.lastAgentDisconnectReason = void 0;
-}
-function reconcileAgentSessionId(record, agentSessionId) {
-	const normalized = normalizeRuntimeSessionId(agentSessionId);
-	if (!normalized) return;
-	record.agentSessionId = normalized;
-}
-function sessionHasAgentMessages(recordOrConversation) {
-	return recordOrConversation.messages.some((message) => typeof message === "object" && message !== null && "Agent" in message);
-}
-function applyConversation(record, conversation) {
-	record.title = conversation.title;
-	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
-//#region src/runtime/engine/session-options.ts
-function mergeSessionOptions(preferred, fallback) {
-	const merged = { ...fallback };
-	assignDefinedOption(merged, "model", preferred?.model);
-	assignDefinedOption(merged, "allowedTools", preferred?.allowedTools);
-	assignDefinedOption(merged, "maxTurns", preferred?.maxTurns);
-	assignDefinedOption(merged, "systemPrompt", preferred?.systemPrompt);
-	assignDefinedOption(merged, "env", mergeEnvRecords(fallback?.env, preferred?.env));
-	return Object.keys(merged).length > 0 ? merged : void 0;
-}
-function mergeEnvRecords(fallback, preferred) {
-	if (!fallback && !preferred) return;
-	return {
-		...fallback,
-		...preferred
-	};
-}
-function assignDefinedOption(target, key, value) {
-	if (value !== void 0) target[key] = value;
-}
-function persistSessionOptions(record, options) {
-	const next = options === void 0 ? void 0 : persistedSessionOptions(options);
-	if (next !== void 0) {
-		record.acpx = {
-			...record.acpx,
-			session_options: next
-		};
-		return;
-	}
-	if (!record.acpx) return;
-	delete record.acpx.session_options;
-}
-function sessionOptionsFromRecord(record) {
-	const stored = record.acpx?.session_options;
-	if (!stored) return;
-	const sessionOptions = {};
-	assignStoredOption(sessionOptions, "model", nonEmptyString(stored.model));
-	assignStoredOption(sessionOptions, "allowedTools", storedAllowedTools(stored.allowed_tools));
-	assignStoredOption(sessionOptions, "maxTurns", storedMaxTurns(stored.max_turns));
-	assignStoredOption(sessionOptions, "systemPrompt", storedSystemPromptOption(stored.system_prompt));
-	assignStoredOption(sessionOptions, "env", storedEnvRecord(stored.env));
-	return Object.keys(sessionOptions).length > 0 ? sessionOptions : void 0;
-}
-function persistedSessionOptions(options) {
-	const next = {
-		model: nonEmptyString(options.model),
-		allowed_tools: Array.isArray(options.allowedTools) ? [...options.allowedTools] : void 0,
-		max_turns: typeof options.maxTurns === "number" ? options.maxTurns : void 0,
-		system_prompt: normalizeSystemPromptOption(options.systemPrompt),
-		env: storedEnvRecord(options.env)
-	};
-	return hasPersistedSessionOptions(next) ? next : void 0;
-}
-function hasPersistedSessionOptions(options) {
-	return options.model !== void 0 || options.allowed_tools !== void 0 || options.max_turns !== void 0 || options.system_prompt !== void 0 || options.env !== void 0;
-}
-function storedEnvRecord(value) {
-	if (value === null || typeof value !== "object" || Array.isArray(value)) return;
-	const entries = Object.entries(value);
-	const result = {};
-	for (const [key, raw] of entries) {
-		if (typeof raw !== "string") continue;
-		result[key] = raw;
-	}
-	return Object.keys(result).length > 0 ? result : void 0;
-}
-function normalizeSystemPromptOption(value) {
-	const prompt = nonEmptyString(value);
-	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);
-}
-function assignStoredOption(target, key, value) {
-	assignDefinedOption(target, key, value);
-}
-function storedAllowedTools(value) {
-	return Array.isArray(value) && value.every((item) => typeof item === "string") ? [...value] : void 0;
-}
-function storedMaxTurns(value) {
-	return typeof value === "number" ? value : void 0;
-}
-function storedSystemPromptOption(value) {
-	return normalizeSystemPromptOption(value);
-}
-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";
@@ -5529,7 +4999,7 @@ function legacyModelState(state) {
 		currentModelId: state.current_model_id ?? "",
 		availableModels: state.available_models.map((modelId) => ({
 			modelId,
-			name: modelId
+			name: state.available_model_names && Object.hasOwn(state.available_model_names, modelId) ? state.available_model_names[modelId] : modelId
 		}))
 	};
 }
@@ -5543,11 +5013,13 @@ function advertisedModelState(state) {
 function applyAdvertisedModelState(state, models) {
 	state.current_model_id = models.currentModelId;
 	state.available_models = models.availableModels.map((model) => model.modelId);
+	state.available_model_names = Object.fromEntries(models.availableModels.map((model) => [model.modelId, model.name]));
 	state.model_control = models.configId ? "config_option" : "legacy_set_model";
 }
 function clearAdvertisedModelState(state) {
 	delete state.current_model_id;
 	delete state.available_models;
+	delete state.available_model_names;
 	delete state.model_control;
 }
 function removeModelConfigOptions(state) {
@@ -5901,6 +5373,7 @@ 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,
+		...state.available_model_names ? { available_model_names: { ...state.available_model_names } } : {},
 		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,
@@ -5920,10 +5393,10 @@ function cloneSessionOptions(options) {
 function cloneSystemPromptOption(option) {
 	return typeof option === "string" ? option : { append: option.append };
 }
-function recordPromptSubmission(conversation, prompt, timestamp = isoNow()) {
+function recordPromptSubmission(conversation, prompt, timestamp = isoNow(), 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 = nextUserMessageId();
+	const promptMessageId = messageId ?? nextUserMessageId();
 	conversation.messages.push({ User: {
 		id: promptMessageId,
 		content: userContent.map((content) => {
@@ -5949,10 +5422,10 @@ function hasAgentReplyAfterPrompt(conversation, promptMessageId) {
 	}
 	return false;
 }
-function recordSessionUpdate(conversation, state, notification, timestamp = isoNow()) {
+function recordSessionUpdate(conversation, state, notification, timestamp = isoNow(), userMessageId) {
 	const acpx = ensureAcpxState$1(state);
 	const update = notification.update;
-	applySessionUpdate(conversation, acpx, update);
+	applySessionUpdate(conversation, acpx, update, userMessageId);
 	updateConversationTimestamp(conversation, timestamp);
 	trimConversationForRuntime(conversation);
 	return acpx;
@@ -5965,13 +5438,13 @@ function recordPromptResponseUsage(conversation, usage, promptMessageId, timesta
 	trimConversationForRuntime(conversation);
 	return true;
 }
-function applySessionUpdate(conversation, acpx, update) {
+function applySessionUpdate(conversation, acpx, update, userMessageId) {
 	const handler = SESSION_UPDATE_HANDLERS[update.sessionUpdate];
-	handler?.(conversation, acpx, update);
+	handler?.(conversation, acpx, update, userMessageId);
 }
 const SESSION_UPDATE_HANDLERS = {
-	user_message_chunk: (conversation, _acpx, update) => {
-		if (update.sessionUpdate === "user_message_chunk") appendUserMessageChunk(conversation, update.content);
+	user_message_chunk: (conversation, _acpx, update, userMessageId) => {
+		if (update.sessionUpdate === "user_message_chunk") appendUserMessageChunk(conversation, update.content, userMessageId);
 	},
 	agent_message_chunk: (conversation, _acpx, update) => {
 		if (update.sessionUpdate === "agent_message_chunk") appendAgentMessageChunk(conversation, update.content, appendAgentText);
@@ -6001,11 +5474,11 @@ const SESSION_UPDATE_HANDLERS = {
 		if (update.sessionUpdate === "config_option_update") applyConfigOptionsModelState(acpx, deepClone(update.configOptions));
 	}
 };
-function appendUserMessageChunk(conversation, content) {
+function appendUserMessageChunk(conversation, content, messageId) {
 	const userContent = contentToUserContent(content);
 	if (!userContent) return;
 	conversation.messages.push({ User: {
-		id: nextUserMessageId(),
+		id: messageId ?? nextUserMessageId(),
 		content: [userContent]
 	} });
 }
@@ -6029,7 +5502,7 @@ 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()) {
+function recordClientOperation(conversation, state, _operation, timestamp = isoNow()) {
 	const acpx = ensureAcpxState$1(state);
 	updateConversationTimestamp(conversation, timestamp);
 	trimConversationForRuntime(conversation);
@@ -6068,6 +5541,147 @@ function trimRuntimeToolResult(result) {
 	if (typeof result.output === "string") result.output = trimRuntimeText(result.output, MAX_RUNTIME_TOOL_IO_CHARS);
 }
 //#endregion
+//#region src/runtime/engine/lifecycle.ts
+function createInitialSessionRecord(params) {
+	const now = (/* @__PURE__ */ new Date()).toISOString();
+	return {
+		schema: "acpx.session.v1",
+		acpxRecordId: params.recordId,
+		acpSessionId: params.sessionId,
+		agentSessionId: params.agentSessionId,
+		agentCommand: params.agentCommand,
+		agentArgv: params.agentArgv,
+		cwd: params.cwd,
+		name: params.name,
+		createdAt: now,
+		lastUsedAt: now,
+		lastSeq: 0,
+		eventLog: defaultSessionEventLog(params.recordId),
+		closed: false,
+		closedAt: void 0,
+		...createSessionConversation(now),
+		acpx: {}
+	};
+}
+function applyLifecycleSnapshotToRecord(record, snapshot) {
+	if (!snapshot) return;
+	record.pid = snapshot.running ? snapshot.pid : void 0;
+	record.agentStartedAt = snapshot.startedAt;
+	if (snapshot.lastExit) {
+		record.lastAgentExitCode = snapshot.lastExit.exitCode;
+		record.lastAgentExitSignal = snapshot.lastExit.signal;
+		record.lastAgentExitAt = snapshot.lastExit.exitedAt;
+		record.lastAgentDisconnectReason = snapshot.lastExit.reason;
+		return;
+	}
+	record.lastAgentExitCode = void 0;
+	record.lastAgentExitSignal = void 0;
+	record.lastAgentExitAt = void 0;
+	record.lastAgentDisconnectReason = void 0;
+}
+function reconcileAgentSessionId(record, agentSessionId) {
+	const normalized = normalizeAgentSessionId(agentSessionId);
+	if (!normalized) return;
+	record.agentSessionId = normalized;
+}
+function sessionHasAgentMessages(recordOrConversation) {
+	return recordOrConversation.messages.some((message) => typeof message === "object" && message !== null && "Agent" in message);
+}
+function applyConversation(record, conversation) {
+	record.title = conversation.title;
+	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
+//#region src/runtime/engine/session-options.ts
+function mergeSessionOptions(preferred, fallback) {
+	const merged = { ...fallback };
+	assignDefinedOption(merged, "model", preferred?.model);
+	assignDefinedOption(merged, "allowedTools", preferred?.allowedTools);
+	assignDefinedOption(merged, "maxTurns", preferred?.maxTurns);
+	assignDefinedOption(merged, "systemPrompt", preferred?.systemPrompt);
+	assignDefinedOption(merged, "env", mergeEnvRecords(fallback?.env, preferred?.env));
+	return Object.keys(merged).length > 0 ? merged : void 0;
+}
+function mergeEnvRecords(fallback, preferred) {
+	if (!fallback && !preferred) return;
+	return {
+		...fallback,
+		...preferred
+	};
+}
+function assignDefinedOption(target, key, value) {
+	if (value !== void 0) target[key] = value;
+}
+function persistSessionOptions(record, options) {
+	const next = options === void 0 ? void 0 : persistedSessionOptions(options);
+	if (next !== void 0) {
+		record.acpx = {
+			...record.acpx,
+			session_options: next
+		};
+		return;
+	}
+	if (!record.acpx) return;
+	delete record.acpx.session_options;
+}
+function sessionOptionsFromRecord(record) {
+	const stored = record.acpx?.session_options;
+	if (!stored) return;
+	const sessionOptions = {};
+	assignDefinedOption(sessionOptions, "model", nonEmptyString(stored.model));
+	assignDefinedOption(sessionOptions, "allowedTools", storedAllowedTools(stored.allowed_tools));
+	assignDefinedOption(sessionOptions, "maxTurns", storedMaxTurns(stored.max_turns));
+	assignDefinedOption(sessionOptions, "systemPrompt", normalizeSystemPromptOption(stored.system_prompt));
+	assignDefinedOption(sessionOptions, "env", storedEnvRecord(stored.env));
+	return Object.keys(sessionOptions).length > 0 ? sessionOptions : void 0;
+}
+function persistedSessionOptions(options) {
+	const next = {
+		model: nonEmptyString(options.model),
+		allowed_tools: Array.isArray(options.allowedTools) ? [...options.allowedTools] : void 0,
+		max_turns: typeof options.maxTurns === "number" ? options.maxTurns : void 0,
+		system_prompt: normalizeSystemPromptOption(options.systemPrompt),
+		env: storedEnvRecord(options.env)
+	};
+	return hasPersistedSessionOptions(next) ? next : void 0;
+}
+function hasPersistedSessionOptions(options) {
+	return options.model !== void 0 || options.allowed_tools !== void 0 || options.max_turns !== void 0 || options.system_prompt !== void 0 || options.env !== void 0;
+}
+function storedEnvRecord(value) {
+	if (value === null || typeof value !== "object" || Array.isArray(value)) return;
+	const entries = Object.entries(value);
+	const result = {};
+	for (const [key, raw] of entries) {
+		if (typeof raw !== "string") continue;
+		result[key] = raw;
+	}
+	return Object.keys(result).length > 0 ? result : void 0;
+}
+function normalizeSystemPromptOption(value) {
+	const prompt = nonEmptyString(value);
+	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);
+}
+function storedAllowedTools(value) {
+	return Array.isArray(value) && value.every((item) => typeof item === "string") ? [...value] : void 0;
+}
+function storedMaxTurns(value) {
+	return typeof value === "number" ? value : void 0;
+}
+function nonEmptyString(value) {
+	return typeof value === "string" && value.trim().length > 0 ? value : void 0;
+}
+//#endregion
 //#region src/session/mode-preference.ts
 function ensureAcpxState(state) {
 	return state ?? {};
@@ -6158,6 +5772,11 @@ function applyConfigOptionsToRecord(record, result) {
 	if (!configOptions) return;
 	record.acpx = applyConfigOptionsToState(record.acpx, configOptions);
 }
+function applyInitialModelSelection(record, originalModels, requestedModel, modelApplication) {
+	applyConfigOptionsToRecord(record, modelApplication.response);
+	syncAdvertisedModelState(record, modelApplication.response ? modelStateFromConfigOptions(modelApplication.response.configOptions) : originalModels);
+	if (modelApplication.applied) setCurrentModelId(record, currentModelIdFromSetModelResponse(modelApplication.response, requestedModel));
+}
 function applyAcceptedConfigOptions(state, response) {
 	const next = cloneSessionAcpxState(state) ?? {};
 	if (!response) return next;
@@ -6192,15 +5811,6 @@ function applyConfigOptionSelection(state, configId, value, response, modelConfi
 }
 //#endregion
 //#region src/runtime/engine/reconnect.ts
-function isProcessAlive(pid) {
-	if (!pid || !Number.isInteger(pid) || pid <= 0 || pid === process.pid) return false;
-	try {
-		process.kill(pid, 0);
-		return true;
-	} catch {
-		return false;
-	}
-}
 const SESSION_LOAD_UNSUPPORTED_CODES = /* @__PURE__ */ new Set([-32601, -32602]);
 function shouldFallbackToNewSession(error, record) {
 	if (isHardReconnectFailure(error)) return false;
@@ -6318,12 +5928,6 @@ async function connectAndLoadSession(options) {
 	record.closed = false;
 	record.closedAt = void 0;
 	options.onConnectedRecord?.(record);
-	let resumed = false;
-	let loadError;
-	let sessionId = record.acpSessionId;
-	let createdFreshSession = false;
-	let pendingAgentSessionId = record.agentSessionId;
-	let sessionModels;
 	const loadState = await loadOrCreateRuntimeSession({
 		client,
 		record,
@@ -6331,12 +5935,7 @@ async function connectAndLoadSession(options) {
 		sameSessionOnly,
 		timeoutMs: options.timeoutMs
 	});
-	resumed = loadState.resumed;
-	loadError = loadState.loadError;
-	sessionId = loadState.sessionId;
-	createdFreshSession = loadState.createdFreshSession;
-	pendingAgentSessionId = loadState.pendingAgentSessionId;
-	sessionModels = loadState.sessionModels;
+	const { resumed, loadError, sessionId, createdFreshSession, pendingAgentSessionId, sessionModels } = loadState;
 	const preferenceReplay = await replaySessionPreferences({
 		client,
 		record,
@@ -6474,35 +6073,17 @@ async function loadOrCreateRuntimeSession(params) {
 		resumed: true,
 		createdFreshSession: false
 	};
-	if (params.client.supportsResumeSession()) return await resumeRuntimeSession(params);
-	if (params.client.supportsLoadSession()) return await loadRuntimeSession(params);
+	if (params.client.supportsResumeSession()) return await loadRuntimeSession(params, true);
+	if (params.client.supportsLoadSession()) return await loadRuntimeSession(params, false);
 	if (params.sameSessionOnly) throw makeSessionResumeRequiredError({
 		record: params.record,
 		reason: "agent does not support session/resume or session/load"
 	});
 	return await createFreshRuntimeSession(params.client, params.record, params.timeoutMs);
 }
-async function resumeRuntimeSession(params) {
-	try {
-		const resumeResult = await withTimeout(params.client.resumeSession(params.record.acpSessionId, params.record.cwd), params.timeoutMs);
-		reconcileAgentSessionId(params.record, resumeResult.agentSessionId);
-		applyConfigOptionsToRecord(params.record, resumeResult);
-		return {
-			sessionId: params.record.acpSessionId,
-			pendingAgentSessionId: params.record.agentSessionId,
-			sessionModels: resumeResult.models,
-			configOptionsPresent: resumeResult.configOptionsPresent,
-			legacyModelMetadataPresent: resumeResult.legacyModelMetadataPresent,
-			resumed: true,
-			createdFreshSession: false
-		};
-	} catch (error) {
-		return await recoverRuntimeSessionLoadFailure(params, error);
-	}
-}
-async function loadRuntimeSession(params) {
+async function loadRuntimeSession(params, resume) {
 	try {
-		const loadResult = await withTimeout(params.client.loadSessionWithOptions(params.record.acpSessionId, params.record.cwd, { suppressReplayUpdates: true }), params.timeoutMs);
+		const loadResult = await withTimeout(resume ? params.client.resumeSession(params.record.acpSessionId, params.record.cwd) : params.client.loadSessionWithOptions(params.record.acpSessionId, params.record.cwd, { suppressReplayUpdates: true }), params.timeoutMs);
 		reconcileAgentSessionId(params.record, loadResult.agentSessionId);
 		applyConfigOptionsToRecord(params.record, loadResult);
 		return {
@@ -6619,7 +6200,7 @@ async function withConnectedSession(options) {
 				resumed,
 				loadError
 			});
-			const now = isoNow$2();
+			const now = isoNow$1();
 			record.lastUsedAt = now;
 			record.closed = false;
 			record.closedAt = void 0;
@@ -6640,7 +6221,7 @@ async function withConnectedSession(options) {
 			});
 			else await client.cancelActivePrompt(2500);
 			applyLifecycleSnapshotToRecord(record, client.getAgentLifecycleSnapshot());
-			record.lastUsedAt = isoNow$2();
+			record.lastUsedAt = isoNow$1();
 			await options.saveRecord(record).catch(() => {});
 			await client.close();
 		});
@@ -6666,10 +6247,13 @@ function recoveredSessionResult(response, conversation, promptMessageId) {
 		...responseMetaField(response?._meta)
 	};
 }
+function abortTimedOutRequests(error, client, sessionId) {
+	if (error instanceof TimeoutError) client.endPromptElicitation?.(sessionId);
+}
 async function runPromptTurn(params) {
 	let settledResponse;
 	try {
-		const promptPromise = params.client.prompt(params.sessionId, params.prompt, params.onPromptRequestWritten, params.onElicitation);
+		const promptPromise = params.client.prompt(params.sessionId, params.prompt, params.onPromptRequestWritten, params.onElicitation, params.onPermissionRequest);
 		promptPromise.then((response) => {
 			settledResponse = response;
 		}, () => {});
@@ -6686,6 +6270,7 @@ async function runPromptTurn(params) {
 			...responseMetaField(response._meta)
 		};
 	} catch (error) {
+		abortTimedOutRequests(error, params.client, params.sessionId);
 		if (!(error instanceof TimeoutError) || !params.promptMessageId) throw error;
 		await params.client.waitForSessionUpdatesIdle?.({
 			idleMs: SESSION_REPLY_IDLE_MS,
@@ -6749,6 +6334,6 @@ var LiveSessionCheckpoint = class {
 	}
 };
 //#endregion
-export { formatPerfMetric as $, AgentSpawnError as $t, RequestedModelUnsupportedError as A, DEFAULT_AGENT_NAME as At, absolutePath as B, extractAcpError as Bt, sessionOptionsFromRecord as C, parsePromptSource as Ct, AcpClient as D, TimeoutError as Dt, reconcileAgentSessionId as E, InterruptedError as Et, runTimedExecFile as F, resolveCanonicalAgentName as Ft, listSessions as G, NON_INTERACTIVE_PERMISSION_POLICIES as Gt, findSession as H, toAcpErrorPayload as Ht, splitCommandLine as I, exitCodeForOutputErrorCode as It, pruneSessions as J, OUTPUT_FORMATS as Jt, listSessionsForAgent as K, OUTPUT_ERROR_CODES as Kt, getAcpxVersion as L, formatErrorMessage as Lt, modelStateFromConfigOptions as M, normalizeAgentName$1 as Mt, normalizeAgentCommandInput as N, resolveAgentArgv as Nt, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as O, withInterrupt as Ot, renderArgvIdentity as P, resolveAgentCommand as Pt, assertPersistedKeyPolicy as Q, AcpxOperationalError as Qt, permissionModeSatisfies as R, isRetryablePromptError as Rt, persistSessionOptions as S, mergePromptSourceWithText as St, applyLifecycleSnapshotToRecord as T, textPrompt as Tt, findSessionByDirectoryWalk as U, AUTH_POLICIES as Ut, findGitRepositoryRoot as V, isAcpResourceNotFoundError as Vt, isoNow$2 as W, EXIT_CODES as Wt, writeSessionRecord as X, PERMISSION_POLICY_ACTIONS as Xt, resolveSessionRecord as Y, PERMISSION_MODES as Yt, createAtomicWriteTempPath as Z, SESSION_RECORD_SCHEMA as Zt, recordPromptSubmission as _, isAcpJsonRpcMessage as _t, applyConfigOptionSelection as a, setPerfGauge as at, advertisedModelState as b, PromptInputValidationError as bt, applyRequestedModelIfAdvertised as c, serializeSessionRecordForDisk as ct, setDesiredModeId as d, defaultSessionEventLog as dt, QueueConnectionError as en, getPerfMetricsSnapshot as et, syncAdvertisedModelState as f, sessionBaseDir$1 as ft, recordClientOperation as g, extractSessionUpdateNotification as gt, createSessionConversation as h, sessionEventSegmentPath as ht, connectAndLoadSession as i, resetPerfMetrics as it, isRequestedModelUnsupportedError as j, listBuiltInAgents as jt, REQUESTED_MODEL_UNSUPPORTED_REASONS as k, withTimeout as kt, currentModelIdFromSetModelResponse as l, normalizeRuntimeSessionId as lt, cloneSessionConversation as m, sessionEventLockPath as mt, runPromptTurn as n, measurePerf as nt, applyConfigOptionsToRecord as o, startPerfTimer as ot, cloneSessionAcpxState as p, sessionEventActivePath as pt, normalizeName as q, OUTPUT_ERROR_ORIGINS as qt, withConnectedSession as r, recordPerfDuration as rt, applyModelSelection as s, parseSessionRecord as st, LiveSessionCheckpoint as t, QueueProtocolError as tn, incrementPerfCounter as tt, setCurrentModelId as u, DEFAULT_EVENT_SEGMENT_MAX_BYTES as ut, recordSessionUpdate as v, parseJsonRpcErrorMessage as vt, applyConversation as w, promptToDisplayText as wt, mergeSessionOptions as x, isPromptInput as xt, trimConversationForRuntime as y, parsePromptStopReason as yt, DEFAULT_HISTORY_LIMIT as z, normalizeOutputError as zt };
+export { getPerfMetricsSnapshot as $, isRequestedModelUnsupportedError as A, isRetryablePromptError as At, absolutePath as B, OUTPUT_FORMATS as Bt, recordSessionUpdate as C, isLegacyZedCodexAcpInvocation as Ct, REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE as D, withTimeout as Dt, AcpClient as E, withInterrupt as Et, parsePromptSource as F, AUTH_POLICIES as Ft, listSessions as G, AgentSpawnError as Gt, findSession as H, PERMISSION_POLICY_ACTIONS as Ht, promptToDisplayText as I, EXIT_CODES as It, pruneSessions as J, listSessionsForAgent as K, QueueConnectionError as Kt, textPrompt as L, NON_INTERACTIVE_PERMISSION_POLICIES as Lt, PromptInputValidationError as M, extractAcpError as Mt, isPromptInput as N, isAcpResourceNotFoundError as Nt, REQUESTED_MODEL_UNSUPPORTED_REASONS as O, exitCodeForOutputErrorCode as Ot, mergePromptSourceWithText as P, toAcpErrorPayload as Pt, formatPerfMetric as Q, permissionModeSatisfies as R, OUTPUT_ERROR_CODES as Rt, recordPromptSubmission as S, parsePromptStopReason as St, advertisedModelState as T, TimeoutError as Tt, findSessionByDirectoryWalk as U, SESSION_RECORD_SCHEMA as Ut, findGitRepositoryRoot as V, PERMISSION_MODES as Vt, isoNow$1 as W, AcpxOperationalError as Wt, writeSessionRecord as X, resolveSessionRecord as Y, assertPersistedKeyPolicy as Z, reconcileAgentSessionId as _, isProcessAlive as _t, applyConfigOptionSelection as a, startPerfTimer as at, createSessionConversation as b, parseJsonRpcErrorMessage as bt, applyModelSelection as c, normalizeAgentSessionId as ct, mergeSessionOptions as d, sessionBaseDir as dt, incrementPerfCounter as et, persistSessionOptions as f, sessionEventActivePath as ft, createInitialSessionRecord as g, writePrivateJsonFile as gt, applyLifecycleSnapshotToRecord as h, writePrivateFile as ht, connectAndLoadSession as i, setPerfGauge as it, getAcpxVersion as j, normalizeOutputError as jt, RequestedModelUnsupportedError as k, formatErrorMessage as kt, applyRequestedModelIfAdvertised as l, DEFAULT_EVENT_SEGMENT_MAX_BYTES as lt, applyConversation as m, sessionEventSegmentPath as mt, runPromptTurn as n, recordPerfDuration as nt, applyConfigOptionsToRecord as o, parseSessionRecord as ot, sessionOptionsFromRecord as p, sessionEventLockPath as pt, normalizeName as q, QueueProtocolError as qt, withConnectedSession as r, resetPerfMetrics as rt, applyInitialModelSelection as s, serializeSessionRecordForDisk as st, LiveSessionCheckpoint as t, measurePerf as tt, setDesiredModeId as u, defaultSessionEventLog as ut, cloneSessionAcpxState as v, extractSessionUpdateNotification as vt, trimConversationForRuntime as w, InterruptedError as wt, recordClientOperation as x, parsePermissionNotice as xt, cloneSessionConversation as y, isAcpJsonRpcMessage as yt, DEFAULT_HISTORY_LIMIT as z, OUTPUT_ERROR_ORIGINS as zt };
 
-//# sourceMappingURL=live-checkpoint-sB7dFOYR.js.map
+//# sourceMappingURL=live-checkpoint-BEfxBKCh.js.map