acpx 0.2.0 → 0.3.0

package/dist/{session-C6nyqSfk.js → session-C2Q8ktsN.js}

@@ -1,7 +1,7 @@
-import { t as __exportAll } from "./rolldown-runtime-CjeV3_4I.js";
-import { n as isSessionUpdateNotification, t as isAcpJsonRpcMessage } from "./acp-jsonrpc-CGT_1Mel.js";
-import { B as ClaudeAcpSessionCreateTimeoutError, E as normalizeOutputError, G as QueueConnectionError, H as GeminiAcpStartupTimeoutError, I as promptToDisplayText, J as SessionResolutionError, K as SessionModeReplayError, L as textPrompt, M as extractAcpError, N as isAcpResourceNotFoundError, R as AgentSpawnError, S as startPerfTimer, T as isAcpQueryClosedBeforeResponseError, U as PermissionDeniedError, V as CopilotAcpUnsupportedError, W as PermissionPromptUnavailableError, _ as getPerfMetricsSnapshot, a as trySetConfigOptionOnRunningOwner, b as resetPerfMetrics, c as SessionQueueOwner, d as releaseQueueOwnerLease, f as terminateProcess, g as formatPerfMetric, h as waitMs$1, i as tryCancelOnRunningOwner, j as SESSION_RECORD_SCHEMA, l as isProcessAlive, m as tryAcquireQueueOwnerLease, o as trySetModeOnRunningOwner, p as terminateQueueOwnerForSession, q as SessionNotFoundError, s as trySubmitToRunningOwner, t as QUEUE_CONNECT_RETRY_MS, u as refreshQueueOwnerLease, v as incrementPerfCounter, w as formatErrorMessage, x as setPerfGauge, y as measurePerf, z as AuthPolicyError } from "./queue-ipc-C8StWiZt.js";
-import { n as normalizeRuntimeSessionId, t as extractRuntimeSessionId } from "./runtime-session-id-B03l5p1Q.js";
+import { t as __exportAll } from "./rolldown-runtime-CiIaOW0V.js";
+import { B as CopilotAcpUnsupportedError, E as normalizeOutputError, F as promptToDisplayText, G as SessionModeReplayError, H as PermissionDeniedError, I as textPrompt, J as extractAcpError, K as SessionNotFoundError, L as AgentSpawnError, R as AuthPolicyError, S as startPerfTimer, T as isAcpQueryClosedBeforeResponseError, U as PermissionPromptUnavailableError, V as GeminiAcpStartupTimeoutError, W as QueueConnectionError, Y as isAcpResourceNotFoundError, _ as getPerfMetricsSnapshot, a as trySetConfigOptionOnRunningOwner, b as resetPerfMetrics, c as SessionQueueOwner, d as releaseQueueOwnerLease, f as terminateProcess, g as formatPerfMetric, h as waitMs$1, i as tryCancelOnRunningOwner, j as SESSION_RECORD_SCHEMA, l as isProcessAlive, m as tryAcquireQueueOwnerLease, o as trySetModeOnRunningOwner, p as terminateQueueOwnerForSession, q as SessionResolutionError, s as trySubmitToRunningOwner, u as refreshQueueOwnerLease, v as incrementPerfCounter, w as formatErrorMessage, x as setPerfGauge, y as measurePerf, z as ClaudeAcpSessionCreateTimeoutError } from "./queue-ipc-EQLpBMKv.js";
+import { n as isSessionUpdateNotification, t as isAcpJsonRpcMessage } from "./acp-jsonrpc-BNHXq7qK.js";
+import { n as normalizeRuntimeSessionId, t as extractRuntimeSessionId } from "./runtime-session-id-C544sPPL.js";
 import fs, { realpathSync, statSync } from "node:fs";
 import fs$1 from "node:fs/promises";
 import path from "node:path";
@@ -11,7 +11,6 @@ import { ClientSideConnection, PROTOCOL_VERSION, ndJsonStream } from "@agentclie
 import readline from "node:readline/promises";
 import { randomUUID } from "node:crypto";
 import os from "node:os";
-
 //#region src/permission-prompt.ts
 async function promptForPermission(options) {
 	if (!process.stdin.isTTY || !process.stderr.isTTY) return false;
@@ -28,7 +27,6 @@ async function promptForPermission(options) {
 		rl.close();
 	}
 }
-
 //#endregion
 //#region src/filesystem.ts
 const WRITE_PREVIEW_MAX_LINES = 16;
@@ -176,7 +174,6 @@ var FileSystemHandlers = class {
 		this.onOperation?.(operation);
 	}
 };
-
 //#endregion
 //#region src/permissions.ts
 function selected(optionId) {
@@ -251,7 +248,6 @@ function classifyPermissionDecision(params, response) {
 	if (selectedOption.kind === "allow_once" || selectedOption.kind === "allow_always") return "approved";
 	return "denied";
 }
-
 //#endregion
 //#region src/session-runtime-helpers.ts
 var TimeoutError = class extends Error {
@@ -305,7 +301,6 @@ async function withInterrupt(run, onInterrupt) {
 		run().then((result) => finish(() => resolve(result)), (error) => finish(() => reject(error)));
 	});
 }
-
 //#endregion
 //#region src/terminal.ts
 const DEFAULT_TERMINAL_OUTPUT_LIMIT_BYTES = 64 * 1024;
@@ -602,7 +597,6 @@ var TerminalManager = class {
 		await Promise.race([terminal.exitPromise.then(() => void 0), waitMs(this.killGraceMs)]);
 	}
 };
-
 //#endregion
 //#region src/client.ts
 const REPLAY_IDLE_MS = 80;
@@ -614,7 +608,13 @@ const AGENT_CLOSE_KILL_GRACE_MS = 1e3;
 const GEMINI_ACP_STARTUP_TIMEOUT_MS = 15e3;
 const CLAUDE_ACP_SESSION_CREATE_TIMEOUT_MS = 6e4;
 const GEMINI_VERSION_TIMEOUT_MS = 2e3;
+const GEMINI_ACP_FLAG_VERSION = [
+	0,
+	33,
+	0
+];
 const COPILOT_HELP_TIMEOUT_MS = 2e3;
+const SESSION_CONTROL_UNSUPPORTED_ACP_CODES = new Set([-32601, -32602]);
 function shouldSuppressSdkConsoleError(args) {
 	if (args.length === 0) return false;
 	return typeof args[0] === "string" && args[0] === "Error handling request";
@@ -724,7 +724,7 @@ function basenameToken(value) {
 	return path.basename(value).toLowerCase().replace(/\.(cmd|exe|bat)$/u, "");
 }
 function isGeminiAcpCommand(command, args) {
-	return basenameToken(command) === "gemini" && args.includes("--experimental-acp");
+	return basenameToken(command) === "gemini" && (args.includes("--acp") || args.includes("--experimental-acp"));
 }
 function isClaudeAcpCommand(command, args) {
 	if (basenameToken(command) === "claude-agent-acp") return true;
@@ -733,6 +733,38 @@ function isClaudeAcpCommand(command, args) {
 function isCopilotAcpCommand(command, args) {
 	return basenameToken(command) === "copilot" && args.includes("--acp");
 }
+function readWindowsEnvValue(env, key) {
+	const matchedKey = Object.keys(env).find((entry) => entry.toUpperCase() === key);
+	return matchedKey ? env[matchedKey] : void 0;
+}
+function resolveWindowsCommand(command, env = process.env) {
+	const extensions = (readWindowsEnvValue(env, "PATHEXT") ?? ".COM;.EXE;.BAT;.CMD").split(";").map((value) => value.trim().toLowerCase()).filter((value) => value.length > 0);
+	const candidates = path.extname(command).length > 0 ? [command] : extensions.map((extension) => `${command}${extension}`);
+	if (command.includes("/") || command.includes("\\") || path.isAbsolute(command)) return candidates.find((candidate) => fs.existsSync(candidate));
+	const pathValue = readWindowsEnvValue(env, "PATH");
+	if (!pathValue) return;
+	for (const directory of pathValue.split(";")) {
+		const trimmedDirectory = directory.trim();
+		if (trimmedDirectory.length === 0) continue;
+		for (const candidate of candidates) {
+			const resolved = path.join(trimmedDirectory, candidate);
+			if (fs.existsSync(resolved)) return resolved;
+		}
+	}
+}
+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";
+}
+function buildSpawnCommandOptions(command, options, platform = process.platform, env = process.env) {
+	if (!shouldUseWindowsBatchShell(command, platform, env)) return options;
+	return {
+		...options,
+		shell: true
+	};
+}
 function resolveGeminiAcpStartupTimeoutMs() {
 	const raw = process.env.ACPX_GEMINI_ACP_STARTUP_TIMEOUT_MS;
 	if (typeof raw === "string" && raw.trim().length > 0) {
@@ -749,16 +781,38 @@ function resolveClaudeAcpSessionCreateTimeoutMs() {
 	}
 	return CLAUDE_ACP_SESSION_CREATE_TIMEOUT_MS;
 }
+function parseGeminiVersion(value) {
+	if (typeof value !== "string") return;
+	const normalized = value.trim();
+	const match = normalized.match(/(\d+)\.(\d+)\.(\d+)/);
+	if (!match) return;
+	return {
+		raw: normalized,
+		parts: [
+			Number(match[1]),
+			Number(match[2]),
+			Number(match[3])
+		]
+	};
+}
+function compareVersionParts(left, right) {
+	for (let index = 0; index < Math.max(left.length, right.length); index += 1) {
+		const leftPart = left[index] ?? 0;
+		const rightPart = right[index] ?? 0;
+		if (leftPart !== rightPart) return leftPart - rightPart;
+	}
+	return 0;
+}
 async function detectGeminiVersion(command) {
 	return await new Promise((resolve) => {
-		const child = spawn(command, ["--version"], {
+		const child = spawn(command, ["--version"], buildSpawnCommandOptions(command, {
 			stdio: [
 				"ignore",
 				"pipe",
 				"pipe"
 			],
 			windowsHide: true
-		});
+		}));
 		let stdout = "";
 		let stderr = "";
 		let settled = false;
@@ -787,20 +841,26 @@ async function detectGeminiVersion(command) {
 			finish(void 0);
 		});
 		child.once("close", () => {
-			finish(`${stdout}\n${stderr}`.split(/\r?\n/).map((line) => line.trim()).find((line) => /^\d+\.\d+\.\d+/.test(line)));
+			finish(parseGeminiVersion(`${stdout}\n${stderr}`.split(/\r?\n/).map((line) => line.trim()).find((line) => /\d+\.\d+\.\d+/.test(line))));
 		});
 	});
 }
+async function resolveGeminiCommandArgs(command, args) {
+	if (basenameToken(command) !== "gemini" || !args.includes("--acp")) return [...args];
+	const version = await detectGeminiVersion(command);
+	if (version && compareVersionParts(version.parts, GEMINI_ACP_FLAG_VERSION) < 0) return args.map((arg) => arg === "--acp" ? "--experimental-acp" : arg);
+	return [...args];
+}
 async function readCommandOutput(command, args, timeoutMs) {
 	return await new Promise((resolve) => {
-		const child = spawn(command, [...args], {
+		const child = spawn(command, [...args], buildSpawnCommandOptions(command, {
 			stdio: [
 				"ignore",
 				"pipe",
 				"pipe"
 			],
 			windowsHide: true
-		});
+		}));
 		let stdout = "";
 		let stderr = "";
 		let settled = false;
@@ -836,7 +896,7 @@ async function readCommandOutput(command, args, timeoutMs) {
 async function buildGeminiAcpStartupTimeoutMessage(command) {
 	const parts = ["Gemini CLI ACP startup timed out before initialize completed.", "This usually means the local Gemini CLI is waiting on interactive OAuth or has incompatible ACP subprocess behavior."];
 	const version = await detectGeminiVersion(command);
-	if (version) parts.push(`Detected Gemini CLI version: ${version}.`);
+	if (version) parts.push(`Detected Gemini CLI version: ${version.raw}.`);
 	if (!process.env.GEMINI_API_KEY && !process.env.GOOGLE_API_KEY) parts.push("No GEMINI_API_KEY or GOOGLE_API_KEY was set for non-interactive auth.");
 	parts.push("Try upgrading Gemini CLI and using API-key-based auth for non-interactive ACP runs.");
 	return parts.join(" ");
@@ -886,6 +946,30 @@ function buildClaudeCodeOptionsMeta(options) {
 	if (Object.keys(claudeCodeOptions).length === 0) return;
 	return { claudeCode: { options: claudeCodeOptions } };
 }
+function asRecord$3(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	return value;
+}
+function isLikelySessionControlUnsupportedError(acp) {
+	if (SESSION_CONTROL_UNSUPPORTED_ACP_CODES.has(acp.code)) return true;
+	if (acp.code !== -32603) return false;
+	const details = asRecord$3(acp.data)?.details;
+	return typeof details === "string" && details.toLowerCase().includes("invalid params");
+}
+function formatSessionControlAcpSummary(acp) {
+	const details = asRecord$3(acp.data)?.details;
+	if (typeof details === "string" && details.trim().length > 0) return `${details.trim()} (ACP ${acp.code}, adapter reported "${acp.message}")`;
+	return `${acp.message} (ACP ${acp.code})`;
+}
+function maybeWrapSessionControlError(method, error, context) {
+	const acp = extractAcpError(error);
+	if (!acp || !isLikelySessionControlUnsupportedError(acp)) return error;
+	const acpSummary = formatSessionControlAcpSummary(acp);
+	const message = `Agent rejected ${method}${context ? ` ${context}` : ""}: ${acpSummary}. The adapter may not implement ${method}, or the requested value is not supported.`;
+	const wrapped = new Error(message, { cause: error instanceof Error ? error : void 0 });
+	wrapped.acp = acp;
+	return wrapped;
+}
 function buildAgentEnvironment(authCredentials) {
 	const env = { ...process.env };
 	if (!authCredentials) return env;
@@ -1018,11 +1102,12 @@ var AcpClient = class {
 	async start() {
 		if (this.connection && this.agent && isChildProcessRunning(this.agent)) return;
 		if (this.connection || this.agent) await this.close();
-		const { command, args } = splitCommandLine(this.options.agentCommand);
+		const { command, args: initialArgs } = splitCommandLine(this.options.agentCommand);
+		const args = await resolveGeminiCommandArgs(command, initialArgs);
 		this.log(`spawning agent: ${command} ${args.join(" ")}`);
 		const geminiAcp = isGeminiAcpCommand(command, args);
 		if (isCopilotAcpCommand(command, args)) await ensureCopilotAcpSupport(command);
-		const spawnedChild = spawn(command, args, buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials));
+		const spawnedChild = spawn(command, args, buildSpawnCommandOptions(command, buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials)));
 		try {
 			await waitForSpawn(spawnedChild);
 		} catch (error) {
@@ -1223,17 +1308,27 @@ var AcpClient = class {
 		}
 	}
 	async setSessionMode(sessionId, modeId) {
-		await this.getConnection().setSessionMode({
-			sessionId,
-			modeId
-		});
+		const connection = this.getConnection();
+		try {
+			await connection.setSessionMode({
+				sessionId,
+				modeId
+			});
+		} catch (error) {
+			throw maybeWrapSessionControlError("session/set_mode", error, `for mode "${modeId}"`);
+		}
 	}
 	async setSessionConfigOption(sessionId, configId, value) {
-		return await this.getConnection().setSessionConfigOption({
-			sessionId,
-			configId,
-			value
-		});
+		const connection = this.getConnection();
+		try {
+			return await connection.setSessionConfigOption({
+				sessionId,
+				configId,
+				value
+			});
+		} catch (error) {
+			throw maybeWrapSessionControlError("session/set_config_option", error, `for "${configId}"="${value}"`);
+		}
 	}
 	async cancel(sessionId) {
 		const connection = this.getConnection();
@@ -1359,17 +1454,13 @@ var AcpClient = class {
 		} catch (error) {
 			if (error instanceof PermissionPromptUnavailableError) {
 				this.notePromptPermissionFailure(params.sessionId, error);
-				this.permissionStats.requested += 1;
-				this.permissionStats.cancelled += 1;
+				this.recordPermissionDecision("cancelled");
 				return { outcome: { outcome: "cancelled" } };
 			}
 			throw error;
 		}
 		const decision = classifyPermissionDecision(params, response);
-		this.permissionStats.requested += 1;
-		if (decision === "approved") this.permissionStats.approved += 1;
-		else if (decision === "denied") this.permissionStats.denied += 1;
-		else this.permissionStats.cancelled += 1;
+		this.recordPermissionDecision(decision);
 		return response;
 	}
 	attachAgentLifecycleObservers(child) {
@@ -1402,13 +1493,18 @@ var AcpClient = class {
 		return error;
 	}
 	async handleReadTextFile(params) {
-		return await this.filesystem.readTextFile(params);
+		try {
+			return await this.filesystem.readTextFile(params);
+		} catch (error) {
+			this.recordPermissionError(params.sessionId, error);
+			throw error;
+		}
 	}
 	async handleWriteTextFile(params) {
 		try {
 			return await this.filesystem.writeTextFile(params);
 		} catch (error) {
-			if (error instanceof PermissionPromptUnavailableError) this.notePromptPermissionFailure(params.sessionId, error);
+			this.recordPermissionError(params.sessionId, error);
 			throw error;
 		}
 	}
@@ -1416,7 +1512,7 @@ var AcpClient = class {
 		try {
 			return await this.terminalManager.createTerminal(params);
 		} catch (error) {
-			if (error instanceof PermissionPromptUnavailableError) this.notePromptPermissionFailure(params.sessionId, error);
+			this.recordPermissionError(params.sessionId, error);
 			throw error;
 		}
 	}
@@ -1432,6 +1528,26 @@ var AcpClient = class {
 	async handleReleaseTerminal(params) {
 		return await this.terminalManager.releaseTerminal(params);
 	}
+	recordPermissionDecision(decision) {
+		this.permissionStats.requested += 1;
+		if (decision === "approved") {
+			this.permissionStats.approved += 1;
+			return;
+		}
+		if (decision === "denied") {
+			this.permissionStats.denied += 1;
+			return;
+		}
+		this.permissionStats.cancelled += 1;
+	}
+	recordPermissionError(sessionId, error) {
+		if (error instanceof PermissionPromptUnavailableError) {
+			this.notePromptPermissionFailure(sessionId, error);
+			this.recordPermissionDecision("cancelled");
+			return;
+		}
+		if (error instanceof PermissionDeniedError) this.recordPermissionDecision("denied");
+	}
 	async handleSessionUpdate(notification) {
 		const sequence = ++this.observedSessionUpdates;
 		this.sessionUpdateChain = this.sessionUpdateChain.then(async () => {
@@ -1469,7 +1585,6 @@ var AcpClient = class {
 		throw new Error(`Timed out waiting for session replay drain after ${normalizedTimeoutMs}ms`);
 	}
 };
-
 //#endregion
 //#region src/perf-metrics-capture.ts
 const PERF_METRICS_FILE_ENV = "ACPX_PERF_METRICS_FILE";
@@ -1541,7 +1656,6 @@ function installPerfMetricsCapture(options = {}) {
 		process.once(signal, handler);
 	}
 }
-
 //#endregion
 //#region src/session-conversation-model.ts
 const MAX_RUNTIME_MESSAGES = 200;
@@ -1892,11 +2006,9 @@ function trimConversationForRuntime(conversation) {
 	const requestUsageEntries = Object.entries(conversation.request_token_usage);
 	if (requestUsageEntries.length > MAX_RUNTIME_REQUEST_TOKEN_USAGE) conversation.request_token_usage = Object.fromEntries(requestUsageEntries.slice(-MAX_RUNTIME_REQUEST_TOKEN_USAGE));
 }
-
 //#endregion
 //#region src/session-event-log.ts
 const DEFAULT_EVENT_SEGMENT_MAX_BYTES = 64 * 1024 * 1024;
-const DEFAULT_EVENT_MAX_SEGMENTS = 5;
 function sessionBaseDir$1() {
 	return path.join(os.homedir(), ".acpx", "sessions");
 }
@@ -1915,14 +2027,13 @@ function sessionEventLockPath(sessionId) {
 function defaultSessionEventLog(sessionId) {
 	return {
 		active_path: sessionEventActivePath(sessionId),
-		segment_count: DEFAULT_EVENT_MAX_SEGMENTS,
+		segment_count: 5,
 		max_segment_bytes: DEFAULT_EVENT_SEGMENT_MAX_BYTES,
-		max_segments: DEFAULT_EVENT_MAX_SEGMENTS,
+		max_segments: 5,
 		last_write_at: void 0,
 		last_write_error: null
 	};
 }
-
 //#endregion
 //#region src/session-persistence/serialize.ts
 function serializeSessionRecordForDisk(record) {
@@ -1962,7 +2073,6 @@ function serializeSessionRecordForDisk(record) {
 		acpx: canonical.acpx
 	};
 }
-
 //#endregion
 //#region src/persisted-key-policy.ts
 const SNAKE_CASE_KEY = /^[a-z][a-z0-9_]*$/;
@@ -2029,7 +2139,6 @@ function assertPersistedKeyPolicy(value) {
 	if (violations.length === 0) return;
 	throw new Error(`Persisted key policy violation (expected snake_case keys): ${violations.join(", ")}`);
 }
-
 //#endregion
 //#region src/session-persistence/parse.ts
 function asRecord$1(value) {
@@ -2206,7 +2315,7 @@ function normalizeOptionalSignal(value) {
 function parseSessionRecord(raw) {
 	const record = asRecord$1(raw);
 	if (!record) return null;
-	if (record.schema !== SESSION_RECORD_SCHEMA) return null;
+	if (record.schema !== "acpx.session.v1") return null;
 	const name = normalizeOptionalName(record.name);
 	const pid = normalizeOptionalPid(record.pid);
 	const closed = normalizeOptionalBoolean(record.closed, false);
@@ -2255,7 +2364,6 @@ function parseSessionRecord(raw) {
 		acpx: parseAcpxState(record.acpx)
 	};
 }
-
 //#endregion
 //#region src/session-persistence/index.ts
 const SESSION_INDEX_SCHEMA = "acpx.session-index.v1";
@@ -2347,7 +2455,6 @@ async function loadOrRebuildSessionIndex(sessionDir) {
 	if (existing && existing.files.length === files.length && existing.files.every((file, index) => file === files[index])) return existing;
 	return await rebuildSessionIndex(sessionDir);
 }
-
 //#endregion
 //#region src/session-persistence/repository.ts
 const DEFAULT_HISTORY_LIMIT = 20;
@@ -2498,7 +2605,6 @@ async function findSessionByDirectoryWalk(options) {
 		if (!isWithinBoundary(walkBoundary, current)) return;
 	}
 }
-
 //#endregion
 //#region src/session-events.ts
 const LOCK_RETRY_MS = 15;
@@ -2614,8 +2720,8 @@ var SessionEventWriter = class SessionEventWriter {
 	}
 	static async open(record, options = {}) {
 		const lock = await acquireEventsLock(record.acpxRecordId);
-		const maxSegmentBytes = options.maxSegmentBytes ?? record.eventLog.max_segment_bytes ?? DEFAULT_EVENT_SEGMENT_MAX_BYTES;
-		const maxSegments = options.maxSegments ?? record.eventLog.max_segments ?? DEFAULT_EVENT_MAX_SEGMENTS;
+		const maxSegmentBytes = options.maxSegmentBytes ?? record.eventLog.max_segment_bytes ?? 67108864;
+		const maxSegments = options.maxSegments ?? record.eventLog.max_segments ?? 5;
 		const activePath = sessionEventActivePath(record.acpxRecordId);
 		const activeSizeBytes = await statSize(activePath);
 		const segmentCount = Number.isInteger(record.eventLog.segment_count) && record.eventLog.segment_count > 0 ? record.eventLog.segment_count : await countExistingSegments(record.acpxRecordId, maxSegments) || 1;
@@ -2685,7 +2791,6 @@ var SessionEventWriter = class SessionEventWriter {
 		}
 	}
 };
-
 //#endregion
 //#region src/queue-owner-turn-controller.ts
 var QueueOwnerTurnController = class {
@@ -2767,7 +2872,6 @@ var QueueOwnerTurnController = class {
 		return await this.options.setSessionConfigOptionFallback(configId, value, timeoutMs);
 	}
 };
-
 //#endregion
 //#region src/session-mode-preference.ts
 function ensureAcpxState(state) {
@@ -2788,7 +2892,6 @@ function setDesiredModeId(record, modeId) {
 	else delete acpx.desired_mode_id;
 	record.acpx = acpx;
 }
-
 //#endregion
 //#region src/session-runtime/lifecycle.ts
 function applyLifecycleSnapshotToRecord(record, snapshot) {
@@ -2821,7 +2924,6 @@ function applyConversation(record, conversation) {
 	record.cumulative_token_usage = conversation.cumulative_token_usage;
 	record.request_token_usage = conversation.request_token_usage;
 }
-
 //#endregion
 //#region src/session-runtime/connect-load.ts
 function shouldFallbackToNewSession(error, record) {
@@ -2901,7 +3003,6 @@ async function connectAndLoadSession(options) {
 		loadError
 	};
 }
-
 //#endregion
 //#region src/session-runtime/prompt-runner.ts
 async function withConnectedSession(options) {
@@ -3018,7 +3119,6 @@ async function runSessionSetConfigOptionDirect(options) {
 		loadError: result.loadError
 	};
 }
-
 //#endregion
 //#region src/session-runtime/queue-owner-process.ts
 function resolveQueueOwnerSpawnArgs(argv = process.argv) {
@@ -3055,7 +3155,6 @@ function spawnQueueOwnerProcess(options) {
 	const payload = JSON.stringify(options);
 	spawn(process.execPath, resolveQueueOwnerSpawnArgs(), buildQueueOwnerSpawnOptions(payload)).unref();
 }
-
 //#endregion
 //#region src/session-runtime.ts
 const DEFAULT_QUEUE_OWNER_TTL_MS = 3e5;
@@ -3104,6 +3203,53 @@ const DISCARD_OUTPUT_FORMATTER = {
 	onError() {},
 	flush() {}
 };
+function jsonRpcIdKey(value) {
+	if (typeof value === "string") return `s:${value}`;
+	if (typeof value === "number" && Number.isFinite(value)) return `n:${value}`;
+}
+function extractJsonRpcRequestInfo(message) {
+	const candidate = message;
+	if (typeof candidate.method !== "string") return;
+	const idKey = jsonRpcIdKey(candidate.id);
+	if (!idKey) return;
+	return {
+		idKey,
+		method: candidate.method
+	};
+}
+function extractJsonRpcResponseInfo(message) {
+	const candidate = message;
+	const idKey = jsonRpcIdKey(candidate.id);
+	if (!idKey) return;
+	const hasError = Object.hasOwn(candidate, "error");
+	if (!hasError && !Object.hasOwn(candidate, "result")) return;
+	return {
+		idKey,
+		hasError
+	};
+}
+function filterRecoverableLoadFallbackOutput(messages) {
+	const requestMethodById = /* @__PURE__ */ new Map();
+	const failedLoadRequestIds = /* @__PURE__ */ new Set();
+	for (const message of messages) {
+		const request = extractJsonRpcRequestInfo(message);
+		if (request) {
+			requestMethodById.set(request.idKey, request.method);
+			continue;
+		}
+		const response = extractJsonRpcResponseInfo(message);
+		if (!response || !response.hasError) continue;
+		if (requestMethodById.get(response.idKey) === "session/load") failedLoadRequestIds.add(response.idKey);
+	}
+	if (failedLoadRequestIds.size === 0) return messages;
+	return messages.filter((message) => {
+		const request = extractJsonRpcRequestInfo(message);
+		if (request && request.method === "session/load" && failedLoadRequestIds.has(request.idKey)) return false;
+		const response = extractJsonRpcResponseInfo(message);
+		if (response && failedLoadRequestIds.has(response.idKey)) return false;
+		return true;
+	});
+}
 function normalizeQueueOwnerTtlMs(ttlMs) {
 	if (ttlMs == null) return DEFAULT_QUEUE_OWNER_TTL_MS;
 	if (!Number.isFinite(ttlMs) || ttlMs < 0) return DEFAULT_QUEUE_OWNER_TTL_MS;
@@ -3170,6 +3316,8 @@ async function runSessionPrompt(options) {
 		return await SessionEventWriter.open(record);
 	});
 	const pendingMessages = [];
+	const pendingConnectOutputMessages = [];
+	let bufferingConnectOutput = true;
 	let sawAcpMessage = false;
 	let eventWriterClosed = false;
 	const closeEventWriter = async (checkpoint) => {
@@ -3208,6 +3356,10 @@ async function runSessionPrompt(options) {
 			pendingMessages.push(message);
 		},
 		onAcpOutputMessage: (_direction, message) => {
+			if (bufferingConnectOutput) {
+				pendingConnectOutputMessages.push(message);
+				return;
+			}
 			output.onAcpMessage(message);
 		},
 		onSessionUpdate: (notification) => {
@@ -3234,23 +3386,36 @@ async function runSessionPrompt(options) {
 	try {
 		return await withInterrupt(async () => {
 			const connectStartedAt = Date.now();
-			const { sessionId: activeSessionId, resumed, loadError } = await measurePerf("runtime.connect_and_load", async () => await connectAndLoadSession({
-				client,
-				record,
-				timeoutMs: options.timeoutMs,
-				verbose: options.verbose,
-				activeController,
-				onClientAvailable: (controller) => {
-					options.onClientAvailable?.(controller);
-					notifiedClientAvailable = true;
-				},
-				onConnectedRecord: (connectedRecord) => {
-					connectedRecord.lastPromptAt = isoNow();
-				},
-				onSessionIdResolved: (sessionId) => {
-					activeSessionIdForControl = sessionId;
+			const { sessionId: activeSessionId, resumed, loadError } = await measurePerf("runtime.connect_and_load", async () => {
+				try {
+					return await connectAndLoadSession({
+						client,
+						record,
+						timeoutMs: options.timeoutMs,
+						verbose: options.verbose,
+						activeController,
+						onClientAvailable: (controller) => {
+							options.onClientAvailable?.(controller);
+							notifiedClientAvailable = true;
+						},
+						onConnectedRecord: (connectedRecord) => {
+							connectedRecord.lastPromptAt = isoNow();
+						},
+						onSessionIdResolved: (sessionId) => {
+							activeSessionIdForControl = sessionId;
+						}
+					});
+				} catch (error) {
+					bufferingConnectOutput = false;
+					for (const message of pendingConnectOutputMessages) output.onAcpMessage(message);
+					pendingConnectOutputMessages.length = 0;
+					throw error;
 				}
-			}));
+			});
+			bufferingConnectOutput = false;
+			const connectOutputMessages = loadError == null ? pendingConnectOutputMessages : filterRecoverableLoadFallbackOutput(pendingConnectOutputMessages);
+			for (const message of connectOutputMessages) output.onAcpMessage(message);
+			pendingConnectOutputMessages.length = 0;
 			if (options.verbose) process.stderr.write(`[acpx] ${formatPerfMetric("prompt.connect_and_load", Date.now() - connectStartedAt)}\n`);
 			output.setContext({ sessionId: record.acpxRecordId });
 			await flushPendingMessages(false);
@@ -3619,7 +3784,7 @@ async function sendSession(options) {
 	for (let attempt = 0; attempt < QUEUE_OWNER_STARTUP_MAX_ATTEMPTS; attempt += 1) {
 		const queued = await submitToRunningOwner(options, waitForCompletion);
 		if (queued) return queued;
-		await waitMs$1(QUEUE_CONNECT_RETRY_MS);
+		await waitMs$1(50);
 	}
 	throw new Error(`Session queue owner failed to start for session ${options.sessionId}`);
 }
@@ -3707,11 +3872,10 @@ async function closeSession(sessionId) {
 	await writeSessionRecord(record);
 	return record;
 }
-
 //#endregion
 //#region src/session.ts
 var session_exports = /* @__PURE__ */ __exportAll({
-	DEFAULT_HISTORY_LIMIT: () => DEFAULT_HISTORY_LIMIT,
+	DEFAULT_HISTORY_LIMIT: () => 20,
 	DEFAULT_QUEUE_OWNER_TTL_MS: () => DEFAULT_QUEUE_OWNER_TTL_MS,
 	InterruptedError: () => InterruptedError,
 	TimeoutError: () => TimeoutError,
@@ -3732,7 +3896,7 @@ var session_exports = /* @__PURE__ */ __exportAll({
 	setSessionConfigOption: () => setSessionConfigOption,
 	setSessionMode: () => setSessionMode
 });
-
 //#endregion
 export { findGitRepositoryRoot as a, flushPerfMetricsCapture as c, DEFAULT_HISTORY_LIMIT as i, installPerfMetricsCapture as l, DEFAULT_QUEUE_OWNER_TTL_MS as n, findSession as o, runSessionQueueOwner as r, findSessionByDirectoryWalk as s, session_exports as t, InterruptedError as u };
-//# sourceMappingURL=session-C6nyqSfk.js.map
+
+//# sourceMappingURL=session-C2Q8ktsN.js.map