acpx 0.12.0 → 0.13.0

package/dist/{output-CjdF5rHk.js → output-CzN8vLdE.js}

@@ -1,4 +1,4 @@
-import { $ as getPerfMetricsSnapshot, B as absolutePath, C as mergeSessionOptions, Ct as promptToDisplayText, D as applyLifecycleSnapshotToRecord, Dt as withInterrupt, E as applyConversation, Et as TimeoutError, F as modelStateFromConfigOptions, Ft as isRetryablePromptError, G as listSessions, H as findSession, I as splitCommandLine, It as normalizeOutputError, J as pruneSessions, K as listSessionsForAgent, Lt as extractAcpError, N as assertRequestedModelSupported, Ot as withTimeout, Pt as formatErrorMessage, Q as formatPerfMetric, Qt as QueueProtocolError, S as advertisedModelState, T as sessionOptionsFromRecord, Tt as InterruptedError, U as findSessionByDirectoryWalk, Ut as OUTPUT_ERROR_CODES, V as findGitRepositoryRoot, W as isoNow, Wt as OUTPUT_ERROR_ORIGINS, X as writeSessionRecord, Y as resolveSessionRecord, Zt as QueueConnectionError, _ as createSessionConversation, _t as parseJsonRpcErrorMessage, a as applyRequestedModelIfAdvertised, at as startPerfTimer, b as recordSessionUpdate, bt as isPromptInput, c as setCurrentModelId, ct as normalizeRuntimeSessionId, d as setDesiredModelId, dt as sessionBaseDir, et as incrementPerfCounter, f as syncAdvertisedModelState, ft as sessionEventActivePath, g as cloneSessionConversation, gt as isAcpJsonRpcMessage, h as cloneSessionAcpxState, ht as extractSessionUpdateNotification, i as connectAndLoadSession, it as setPerfGauge, k as AcpClient, l as setDesiredConfigOption, m as applyConfigOptionsToState, mt as sessionEventSegmentPath, n as runPromptTurn, nt as recordPerfDuration, o as currentModelIdFromSetModelResponse, p as applyConfigOptionsToRecord, pt as sessionEventLockPath, q as normalizeName, r as withConnectedSession, rt as resetPerfMetrics, s as clearDesiredConfigOption, t as LiveSessionCheckpoint, tt as measurePerf, u as setDesiredModeId, ut as defaultSessionEventLog, v as recordClientOperation, vt as parsePromptStopReason, w as persistSessionOptions, wt as textPrompt, x as trimConversationForRuntime, y as recordPromptSubmission, zt as toAcpErrorPayload } from "./live-checkpoint-ClPCSdrW.js";
+import { At as withInterrupt, Bt as isRetryablePromptError, C as mergeSessionOptions, Ct as isPromptInput, D as applyLifecycleSnapshotToRecord, Dt as textPrompt, E as applyConversation, Et as promptToDisplayText, F as modelStateFromConfigOptions, G as findSessionByDirectoryWalk, H as absolutePath, Ht as extractAcpError, J as listSessionsForAgent, Jt as OUTPUT_ERROR_CODES, K as isoNow, N as assertRequestedModelSupported, Ot as InterruptedError, Q as writeSessionRecord, R as splitCommandLine, S as advertisedModelState, T as sessionOptionsFromRecord, U as findGitRepositoryRoot, Vt as normalizeOutputError, W as findSession, Wt as toAcpErrorPayload, X as pruneSessions, Y as normalizeName, Yt as OUTPUT_ERROR_ORIGINS, Z as resolveSessionRecord, _ as createSessionConversation, _t as sessionEventSegmentPath, a as applyRequestedModelIfAdvertised, at as recordPerfDuration, b as recordSessionUpdate, bt as parseJsonRpcErrorMessage, c as setCurrentModelId, ct as startPerfTimer, d as setDesiredModelId, dt as normalizeRuntimeSessionId, f as syncAdvertisedModelState, g as cloneSessionConversation, gt as sessionEventLockPath, h as cloneSessionAcpxState, ht as sessionEventActivePath, i as connectAndLoadSession, it as measurePerf, jt as withTimeout, k as AcpClient, kt as TimeoutError, l as setDesiredConfigOption, m as applyConfigOptionsToState, mt as sessionBaseDir, n as runPromptTurn, nn as QueueConnectionError, nt as getPerfMetricsSnapshot, o as currentModelIdFromSetModelResponse, ot as resetPerfMetrics, p as applyConfigOptionsToRecord, pt as defaultSessionEventLog, q as listSessions, r as withConnectedSession, rn as QueueProtocolError, rt as incrementPerfCounter, s as clearDesiredConfigOption, st as setPerfGauge, t as LiveSessionCheckpoint, tt as formatPerfMetric, u as setDesiredModeId, v as recordClientOperation, vt as extractSessionUpdateNotification, w as persistSessionOptions, x as trimConversationForRuntime, xt as parsePromptStopReason, y as recordPromptSubmission, yt as isAcpJsonRpcMessage, zt as formatErrorMessage } from "./live-checkpoint-CBecfnSH.js";
 import fs, { mkdtempSync, realpathSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import fs$1 from "node:fs/promises";
@@ -104,18 +104,26 @@ function isQueueOwnerHeartbeatStale(owner) {
 }
 async function ensureQueueDir() {
 	const baseDir = queueBaseDir();
-	await fs$1.mkdir(baseDir, {
-		recursive: true,
-		mode: 448
-	});
-	await fs$1.chmod(baseDir, 448);
+	try {
+		await fs$1.mkdir(baseDir, {
+			recursive: true,
+			mode: 448
+		});
+		await fs$1.chmod(baseDir, 448);
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		throw new Error(`Failed to prepare queue directory ${baseDir}: ${message}`, { cause: error });
+	}
 	const socketDir = queueSocketBaseDir();
-	if (socketDir) {
+	if (socketDir) try {
 		await fs$1.mkdir(socketDir, {
 			recursive: true,
 			mode: 448
 		});
 		await fs$1.chmod(socketDir, 448);
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		throw new Error(`Failed to prepare queue socket directory ${socketDir}: ${message}`, { cause: error });
 	}
 }
 async function removeSocketFile(socketPath) {
@@ -1310,6 +1318,7 @@ async function submitToQueueOwner(owner, options) {
 		owner,
 		request,
 		onAccepted: ({ resolve }) => {
+			options.onQueueAccepted?.();
 			options.outputFormatter.setContext({ sessionId: options.sessionId });
 			if (!options.waitForCompletion) resolve({
 				queued: true,
@@ -1602,6 +1611,7 @@ function buildDirectConnectedSessionOptions(options, run) {
 		nonInteractivePermissions: options.nonInteractivePermissions,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		timeoutMs: options.timeoutMs,
 		verbose: options.verbose,
@@ -1685,6 +1695,7 @@ async function setSessionMode(options) {
 		nonInteractivePermissions: options.nonInteractivePermissions,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		timeoutMs: options.timeoutMs,
 		verbose: options.verbose
@@ -1711,6 +1722,7 @@ async function setSessionModel(options) {
 		nonInteractivePermissions: options.nonInteractivePermissions,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		timeoutMs: options.timeoutMs,
 		verbose: options.verbose
@@ -1742,6 +1754,7 @@ async function setSessionConfigOption(options) {
 		nonInteractivePermissions: options.nonInteractivePermissions,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		timeoutMs: options.timeoutMs,
 		verbose: options.verbose
@@ -1840,6 +1853,7 @@ async function createSessionRecordWithClient(client, options) {
 		acpSessionId: sessionId,
 		agentSessionId,
 		agentCommand: options.agentCommand,
+		agentArgv: options.agentArgv,
 		cwd,
 		name: normalizeName(options.name),
 		createdAt: now,
@@ -1918,6 +1932,7 @@ async function resumeSessionRecordWithClient(client, options, cwd) {
 async function createSessionWithClient(options) {
 	const client = new AcpClient({
 		agentCommand: options.agentCommand,
+		agentArgv: options.agentArgv,
 		cwd: absolutePath(options.cwd),
 		mcpServers: options.mcpServers,
 		permissionMode: options.permissionMode,
@@ -1925,6 +1940,7 @@ async function createSessionWithClient(options) {
 		permissionPolicy: options.permissionPolicy,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		verbose: options.verbose,
 		sessionOptions: options.sessionOptions
@@ -1954,6 +1970,7 @@ async function createSession(options) {
 async function listAgentSessions(options) {
 	const client = new AcpClient({
 		agentCommand: options.agentCommand,
+		agentArgv: options.agentArgv,
 		cwd: absolutePath(options.cwd),
 		mcpServers: options.mcpServers,
 		permissionMode: options.permissionMode,
@@ -1961,6 +1978,7 @@ async function listAgentSessions(options) {
 		permissionPolicy: options.permissionPolicy,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		verbose: options.verbose
 	});
@@ -2008,6 +2026,7 @@ async function ensureSession(options) {
 				nonInteractivePermissions: options.nonInteractivePermissions,
 				authCredentials: options.authCredentials,
 				authPolicy: options.authPolicy,
+				fs: options.fs,
 				terminal: options.terminal,
 				timeoutMs: options.timeoutMs,
 				verbose: options.verbose
@@ -2022,6 +2041,7 @@ async function ensureSession(options) {
 	return {
 		record: await createSession({
 			agentCommand: options.agentCommand,
+			agentArgv: options.agentArgv,
 			cwd,
 			name: options.name,
 			resumeSessionId: options.resumeSessionId,
@@ -2031,6 +2051,7 @@ async function ensureSession(options) {
 			permissionPolicy: options.permissionPolicy,
 			authCredentials: options.authCredentials,
 			authPolicy: options.authPolicy,
+			fs: options.fs,
 			terminal: options.terminal,
 			timeoutMs: options.timeoutMs,
 			verbose: options.verbose,
@@ -2292,6 +2313,7 @@ function queueOwnerRuntimeOptionsFromSend(options) {
 		nonInteractivePermissions: options.nonInteractivePermissions,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		suppressSdkConsoleErrors: options.suppressSdkConsoleErrors,
 		verbose: options.verbose,
@@ -2311,7 +2333,9 @@ function writeQueueOwnerPayloadFile(payload) {
 	});
 	return payloadPath;
 }
-function buildQueueOwnerSpawnOptions(payloadFilePath) {
+/** Max stderr bytes retained for cold-start diagnostics. */
+const QUEUE_OWNER_STARTUP_STDERR_MAX_BYTES = 4e3;
+function buildQueueOwnerSpawnOptions(payloadFilePath, opts) {
 	const env = {
 		...process.env,
 		[QUEUE_OWNER_PAYLOAD_FILE_ENV]: payloadFilePath
@@ -2319,14 +2343,77 @@ function buildQueueOwnerSpawnOptions(payloadFilePath) {
 	delete env[QUEUE_OWNER_PAYLOAD_ENV];
 	return {
 		detached: true,
-		stdio: "ignore",
+		stdio: opts?.captureStderr === true ? [
+			"ignore",
+			"ignore",
+			"pipe"
+		] : "ignore",
 		env,
 		windowsHide: true
 	};
 }
+function formatQueueOwnerStartupFailure(params) {
+	const parts = [`Session queue owner failed to start for session ${params.sessionId}`];
+	if (params.exit.spawnError) parts.push(`spawn error: ${params.exit.spawnError.message}`);
+	else if (params.exit.exited) {
+		const codePart = params.exit.code === null ? "null" : String(params.exit.code);
+		const signalPart = params.exit.signal ? `, signal ${params.exit.signal}` : "";
+		parts.push(`exited with code ${codePart}${signalPart} before binding its socket`);
+	}
+	const tail = params.logTail.trim();
+	if (tail.length > 0) parts.push(`stderr:\n${tail}`);
+	return parts.join(": ");
+}
 function spawnQueueOwnerProcess(options) {
 	const payloadPath = writeQueueOwnerPayloadFile(JSON.stringify(options));
-	spawn(process.execPath, resolveQueueOwnerSpawnArgs(), buildQueueOwnerSpawnOptions(payloadPath)).unref();
+	let exited = false;
+	let code = null;
+	let signal = null;
+	let spawnError;
+	let capturing = true;
+	let stderrTail = Buffer.alloc(0);
+	const child = spawn(process.execPath, resolveQueueOwnerSpawnArgs(), buildQueueOwnerSpawnOptions(payloadPath, { captureStderr: true }));
+	const stopStartupCapture = () => {
+		if (!capturing) return;
+		capturing = false;
+		const stderr = child.stderr;
+		if (!stderr) return;
+		stderr.removeAllListeners("data");
+		stderr.on("data", () => {});
+		stderr.resume();
+		stderr.unref();
+	};
+	child.stderr?.on("data", (chunk) => {
+		if (!capturing) return;
+		const buf = typeof chunk === "string" ? Buffer.from(chunk) : chunk;
+		const combined = Buffer.concat([stderrTail, buf]);
+		stderrTail = combined.length > 4e3 ? combined.subarray(combined.length - QUEUE_OWNER_STARTUP_STDERR_MAX_BYTES) : combined;
+	});
+	child.stderr?.on("error", () => {});
+	child.on("error", (error) => {
+		spawnError = error;
+	});
+	child.on("close", (exitCode, exitSignal) => {
+		exited = true;
+		code = exitCode;
+		signal = exitSignal;
+		stopStartupCapture();
+	});
+	child.unref();
+	return {
+		pid: child.pid,
+		getExitState: () => ({
+			exited,
+			code,
+			signal,
+			...spawnError ? { spawnError } : {}
+		}),
+		readLogTail: (maxBytes = QUEUE_OWNER_STARTUP_STDERR_MAX_BYTES) => {
+			const start = Math.max(0, stderrTail.length - maxBytes);
+			return stderrTail.subarray(start).toString("utf8");
+		},
+		stopStartupCapture
+	};
 }
 //#endregion
 //#region src/session/events.ts
@@ -2892,6 +2979,7 @@ async function runSessionPrompt(options) {
 	const ownClient = options.client == null;
 	const client = options.client ?? new AcpClient({
 		agentCommand: record.agentCommand,
+		agentArgv: record.agentArgv,
 		cwd: absolutePath(record.cwd),
 		mcpServers: options.mcpServers,
 		permissionMode: options.permissionMode,
@@ -2899,6 +2987,7 @@ async function runSessionPrompt(options) {
 		permissionPolicy: options.permissionPolicy,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		suppressSdkConsoleErrors: options.suppressSdkConsoleErrors,
 		verbose: options.verbose,
@@ -2908,6 +2997,7 @@ async function runSessionPrompt(options) {
 		permissionMode: options.permissionMode,
 		nonInteractivePermissions: options.nonInteractivePermissions,
 		permissionPolicy: options.permissionPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		suppressSdkConsoleErrors: options.suppressSdkConsoleErrors,
 		verbose: options.verbose
@@ -3093,7 +3183,8 @@ async function runSessionPrompt(options) {
 	const savePromptSuccess = async (response) => {
 		await flushPendingMessages(false);
 		output.flush();
-		record.lastUsedAt = isoNow();
+		const now = isoNow();
+		record.lastUsedAt = now;
 		record.closed = false;
 		record.closedAt = void 0;
 		record.protocolVersion = client.initializeResult?.protocolVersion;
@@ -3169,6 +3260,7 @@ async function runOnce(options) {
 	const acpErrors = new AcpErrorTracker();
 	const client = new AcpClient({
 		agentCommand: options.agentCommand,
+		agentArgv: options.agentArgv,
 		cwd: absolutePath(options.cwd),
 		mcpServers: options.mcpServers,
 		permissionMode: options.permissionMode,
@@ -3176,6 +3268,7 @@ async function runOnce(options) {
 		permissionPolicy: options.permissionPolicy,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		suppressSdkConsoleErrors: options.suppressSdkConsoleErrors,
 		verbose: options.verbose,
@@ -3264,6 +3357,7 @@ async function sendSessionDirect(options) {
 		permissionPolicy: options.permissionPolicy,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		outputFormatter: options.outputFormatter,
 		errorEmissionPolicy: options.errorEmissionPolicy,
@@ -3282,7 +3376,7 @@ async function sendSessionDirect(options) {
 const QUEUE_OWNER_STARTUP_MAX_ATTEMPTS = 120;
 const QUEUE_OWNER_HEARTBEAT_INTERVAL_MS = 5e3;
 const QUEUE_OWNER_ACTIVE_TURN_CANCEL_GRACE_MS = 750;
-async function submitToRunningOwner(options, waitForCompletion) {
+async function submitToRunningOwner(options, waitForCompletion, extras) {
 	return await trySubmitToRunningOwner({
 		sessionId: options.sessionId,
 		message: promptToDisplayText(options.prompt),
@@ -3299,18 +3393,21 @@ async function submitToRunningOwner(options, waitForCompletion) {
 		promptRetries: options.promptRetries,
 		waitForCompletion,
 		verbose: options.verbose,
-		sessionOptions: options.sessionOptions
+		sessionOptions: options.sessionOptions,
+		onQueueAccepted: extras?.onQueueAccepted
 	});
 }
 function createQueueOwnerSharedClient(options, sessionRecord) {
 	return new AcpClient({
 		agentCommand: sessionRecord.agentCommand,
+		agentArgv: sessionRecord.agentArgv,
 		cwd: absolutePath(sessionRecord.cwd),
 		mcpServers: options.mcpServers,
 		permissionMode: options.permissionMode,
 		nonInteractivePermissions: options.nonInteractivePermissions,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		suppressSdkConsoleErrors: options.suppressSdkConsoleErrors,
 		verbose: options.verbose,
@@ -3328,6 +3425,7 @@ function createQueueOwnerTurnController(options) {
 				nonInteractivePermissions: options.nonInteractivePermissions,
 				authCredentials: options.authCredentials,
 				authPolicy: options.authPolicy,
+				fs: options.fs,
 				terminal: options.terminal,
 				timeoutMs,
 				verbose: options.verbose
@@ -3341,6 +3439,7 @@ function createQueueOwnerTurnController(options) {
 				nonInteractivePermissions: options.nonInteractivePermissions,
 				authCredentials: options.authCredentials,
 				authPolicy: options.authPolicy,
+				fs: options.fs,
 				terminal: options.terminal,
 				timeoutMs,
 				verbose: options.verbose
@@ -3355,6 +3454,7 @@ function createQueueOwnerTurnController(options) {
 				nonInteractivePermissions: options.nonInteractivePermissions,
 				authCredentials: options.authCredentials,
 				authPolicy: options.authPolicy,
+				fs: options.fs,
 				terminal: options.terminal,
 				timeoutMs,
 				verbose: options.verbose
@@ -3366,6 +3466,9 @@ function logDeferredCancelFailure(error, verbose) {
 	if (!verbose) return;
 	process.stderr.write(`[acpx] failed to apply deferred cancel: ${formatErrorMessage(error)}\n`);
 }
+function queueOwnerExitIsFatal(exit) {
+	return exit.exited && (exit.spawnError !== void 0 || exit.code !== 0 || exit.signal !== null);
+}
 function logQueueOwnerReady(params) {
 	if (!params.verbose) return;
 	process.stderr.write(`[acpx] queue owner ready for session ${params.sessionId} (ttlMs=${params.ttlMs}, maxQueueDepth=${params.maxQueueDepth})\n`);
@@ -3602,14 +3705,42 @@ async function sendSession(options) {
 	const waitForCompletion = options.waitForCompletion !== false;
 	const queuedToOwner = await submitToRunningOwner(options, waitForCompletion);
 	if (queuedToOwner) return queuedToOwner;
-	spawnQueueOwnerProcess(queueOwnerRuntimeOptionsFromSend(options));
+	const owner = spawnQueueOwnerProcess(queueOwnerRuntimeOptionsFromSend(options));
+	const onQueueAccepted = () => {
+		owner.stopStartupCapture();
+	};
 	for (let attempt = 0; attempt < QUEUE_OWNER_STARTUP_MAX_ATTEMPTS; attempt += 1) {
-		const queued = await submitToRunningOwner(options, waitForCompletion);
-		if (queued) return queued;
+		const queued = await submitToRunningOwner(options, waitForCompletion, { onQueueAccepted });
+		if (queued) {
+			owner.stopStartupCapture();
+			return queued;
+		}
+		const exit = owner.getExitState();
+		if (queueOwnerExitIsFatal(exit)) {
+			const message = formatQueueOwnerStartupFailure({
+				sessionId: options.sessionId,
+				exit,
+				logTail: owner.readLogTail()
+			});
+			owner.stopStartupCapture();
+			throw new Error(message);
+		}
 		await waitMs(50);
 	}
-	throw new Error(`Session queue owner failed to start for session ${options.sessionId}`);
+	const finalExit = owner.getExitState();
+	const message = formatQueueOwnerStartupFailure({
+		sessionId: options.sessionId,
+		exit: finalExit.exited ? finalExit : {
+			exited: false,
+			code: null,
+			signal: null
+		},
+		logTail: owner.readLogTail()
+	});
+	owner.stopStartupCapture();
+	throw new Error(message);
 }
+const queueOwnerRuntimeTestInternals = { queueOwnerExitIsFatal };
 //#endregion
 //#region src/session/session.ts
 var session_exports = /* @__PURE__ */ __exportAll({
@@ -3632,6 +3763,7 @@ var session_exports = /* @__PURE__ */ __exportAll({
 	mergeConnectedModelState: () => mergeConnectedModelState,
 	normalizeQueueOwnerTtlMs: () => normalizeQueueOwnerTtlMs,
 	pruneSessions: () => pruneSessions,
+	queueOwnerRuntimeTestInternals: () => queueOwnerRuntimeTestInternals,
 	runOnce: () => runOnce,
 	runQueuedTask: () => runQueuedTask,
 	runSessionQueueOwner: () => runSessionQueueOwner,
@@ -4590,4 +4722,4 @@ function createOutputFormatter(format, options = {}) {
 //#endregion
 export { runSessionQueueOwner as a, buildQueueOwnerArgOverride as c, createSessionWithClient as d, cancelSessionPrompt as f, __exportAll as g, isProcessAlive as h, session_exports as i, flushPerfMetricsCapture as l, DEFAULT_QUEUE_OWNER_TTL_MS as m, getTextErrorRemediationHints as n, runOnce as o, probeQueueOwnerHealth as p, output_exports as r, sendSessionDirect as s, createOutputFormatter as t, installPerfMetricsCapture as u };
 
-//# sourceMappingURL=output-CjdF5rHk.js.map
+//# sourceMappingURL=output-CzN8vLdE.js.map