acpx 0.13.0 → 0.13.2

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

@@ -1,11 +1,10 @@
-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 { $ as formatPerfMetric, B as absolutePath, Bt as extractAcpError, C as sessionOptionsFromRecord, D as AcpClient, Dt as TimeoutError, Et as InterruptedError, F as runTimedExecFile, G as listSessions, H as findSession, Ht as toAcpErrorPayload, I as splitCommandLine, J as pruneSessions, K as listSessionsForAgent, Kt as OUTPUT_ERROR_CODES, Lt as formatErrorMessage, M as modelStateFromConfigOptions, Ot as withInterrupt, Rt as isRetryablePromptError, S as persistSessionOptions, T as applyLifecycleSnapshotToRecord, Tt as textPrompt, U as findSessionByDirectoryWalk, V as findGitRepositoryRoot, W as isoNow, X as writeSessionRecord, Y as resolveSessionRecord, _ as recordPromptSubmission, _t as isAcpJsonRpcMessage, a as applyConfigOptionSelection, at as setPerfGauge, b as advertisedModelState, c as applyRequestedModelIfAdvertised, d as setDesiredModeId, dt as defaultSessionEventLog, en as QueueConnectionError, et as getPerfMetricsSnapshot, f as syncAdvertisedModelState, ft as sessionBaseDir, g as recordClientOperation, gt as extractSessionUpdateNotification, h as createSessionConversation, ht as sessionEventSegmentPath, i as connectAndLoadSession, it as resetPerfMetrics, kt as withTimeout, l as currentModelIdFromSetModelResponse, lt as normalizeRuntimeSessionId, m as cloneSessionConversation, mt as sessionEventLockPath, n as runPromptTurn, nt as measurePerf, o as applyConfigOptionsToRecord, ot as startPerfTimer, p as cloneSessionAcpxState, pt as sessionEventActivePath, q as normalizeName, qt as OUTPUT_ERROR_ORIGINS, r as withConnectedSession, rt as recordPerfDuration, s as applyModelSelection, t as LiveSessionCheckpoint, tn as QueueProtocolError, tt as incrementPerfCounter, u as setCurrentModelId, v as recordSessionUpdate, vt as parseJsonRpcErrorMessage, w as applyConversation, wt as promptToDisplayText, x as mergeSessionOptions, xt as isPromptInput, y as trimConversationForRuntime, yt as parsePromptStopReason, zt as normalizeOutputError } from "./live-checkpoint-Gw2oGjhe.js";
 import fs, { mkdtempSync, realpathSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import fs$1 from "node:fs/promises";
 import os from "node:os";
 import { createHash, randomInt, randomUUID } from "node:crypto";
-import { execFile, spawn } from "node:child_process";
-import { promisify } from "node:util";
+import { spawn } from "node:child_process";
 import net from "node:net";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -1117,7 +1116,7 @@ var SessionQueueOwner = class SessionQueueOwner {
 };
 //#endregion
 //#region src/cli/queue/ipc.ts
-const MAX_MESSAGE_BUFFER_SIZE = 10 * 1024 * 1024;
+const MAX_MESSAGE_BUFFER_SIZE = 10485760;
 const STALE_OWNER_PROTOCOL_DETAIL_CODES = /* @__PURE__ */ new Set(["QUEUE_PROTOCOL_MALFORMED_MESSAGE", "QUEUE_PROTOCOL_UNEXPECTED_RESPONSE"]);
 async function maybeRecoverStaleOwnerAfterProtocolMismatch(params) {
 	if (!(params.error instanceof QueueProtocolError)) return false;
@@ -1605,6 +1604,7 @@ async function trySetConfigOptionOnRunningOwner(sessionId, configId, value, time
 function buildDirectConnectedSessionOptions(options, run) {
 	return {
 		sessionRecordId: options.sessionRecordId,
+		replacingConfigOption: options.replacingConfigOption,
 		loadRecord: resolveSessionRecord,
 		saveRecord: writeSessionRecord,
 		mcpServers: options.mcpServers,
@@ -1636,12 +1636,13 @@ async function runSessionSetModeDirect(options) {
 	})));
 }
 async function runSessionSetModelDirect(options) {
-	const result = await withConnectedSession(buildDirectConnectedSessionOptions(options, async ({ client, sessionId, record }) => {
+	const result = await withConnectedSession(buildDirectConnectedSessionOptions({
+		...options,
+		replacingConfigOption: { key: "model" }
+	}, async ({ client, sessionId, record }) => {
 		const models = advertisedModelState(record.acpx);
 		const response = await withTimeout(client.setSessionModel(sessionId, options.modelId, models), options.timeoutMs);
-		applyConfigOptionsToRecord(record, response);
-		setDesiredModelId(record, options.modelId, models?.configId);
-		setCurrentModelId(record, currentModelIdFromSetModelResponse(response, options.modelId));
+		record.acpx = applyModelSelection(record.acpx, options.modelId, response);
 		return response;
 	}));
 	return {
@@ -1650,15 +1651,12 @@ async function runSessionSetModelDirect(options) {
 	};
 }
 async function runSessionSetConfigOptionDirect(options) {
-	const result = await withConnectedSession(buildDirectConnectedSessionOptions(options, async ({ client, sessionId, record }) => {
-		const modelConfigId = advertisedModelState(record.acpx)?.configId;
+	const result = await withConnectedSession(buildDirectConnectedSessionOptions({
+		...options,
+		replacingConfigOption: { key: options.configId }
+	}, async ({ client, sessionId, record }) => {
 		const response = await withTimeout(client.setSessionConfigOption(sessionId, options.configId, options.value), options.timeoutMs);
-		applyConfigOptionsToRecord(record, response);
-		if (options.configId === modelConfigId) {
-			setDesiredModelId(record, options.value, options.configId);
-			setCurrentModelId(record, currentModelIdFromSetModelResponse(response, options.value));
-		} else if (options.configId === "mode") setDesiredModeId(record, options.value);
-		else setDesiredConfigOption(record, options.configId, options.value);
+		record.acpx = applyConfigOptionSelection(record.acpx, options.configId, options.value, response);
 		return response;
 	}));
 	return {
@@ -1670,7 +1668,6 @@ async function runSessionSetConfigOptionDirect(options) {
 }
 //#endregion
 //#region src/cli/session/session-control.ts
-const execFileAsync = promisify(execFile);
 async function cancelSessionPrompt(options) {
 	const cancelled = await tryCancelOnRunningOwner(options);
 	return {
@@ -1705,9 +1702,7 @@ async function setSessionModel(options) {
 	const submittedToOwner = await trySetModelOnRunningOwner(options.sessionId, options.modelId, options.timeoutMs, options.verbose);
 	if (submittedToOwner) {
 		const record = await resolveSessionRecord(options.sessionId);
-		applyConfigOptionsToRecord(record, submittedToOwner.response);
-		setDesiredModelId(record, options.modelId, advertisedModelState(record.acpx)?.configId);
-		setCurrentModelId(record, currentModelIdFromSetModelResponse(submittedToOwner.response, options.modelId));
+		record.acpx = applyModelSelection(record.acpx, options.modelId, submittedToOwner.response);
 		await writeSessionRecord(record);
 		return {
 			record,
@@ -1732,13 +1727,7 @@ async function setSessionConfigOption(options) {
 	const ownerResponse = await trySetConfigOptionOnRunningOwner(options.sessionId, options.configId, options.value, options.timeoutMs, options.verbose);
 	if (ownerResponse) {
 		const record = await resolveSessionRecord(options.sessionId);
-		const modelConfigId = advertisedModelState(record.acpx)?.configId;
-		applyConfigOptionsToRecord(record, ownerResponse);
-		if (options.configId === modelConfigId) {
-			setDesiredModelId(record, options.value, options.configId);
-			setCurrentModelId(record, currentModelIdFromSetModelResponse(ownerResponse, options.value));
-		} else if (options.configId === "mode") setDesiredModeId(record, options.value);
-		else setDesiredConfigOption(record, options.configId, options.value);
+		record.acpx = applyConfigOptionSelection(record.acpx, options.configId, options.value, ownerResponse);
 		await writeSessionRecord(record);
 		return {
 			record,
@@ -1790,26 +1779,24 @@ async function readProcCmdline(pid) {
 }
 async function readPosixCommandLine(pid) {
 	try {
-		const { stdout } = await execFileAsync("ps", [
+		return (await runTimedExecFile("ps", [
 			"-p",
 			String(pid),
 			"-o",
 			"command="
-		]);
-		return stdout.trim() || void 0;
+		])).trim() || void 0;
 	} catch {
 		return;
 	}
 }
 async function readWindowsCommandLine(pid) {
 	try {
-		const { stdout } = await execFileAsync("powershell.exe", [
+		return (await runTimedExecFile("powershell.exe", [
 			"-NoProfile",
 			"-NonInteractive",
 			"-Command",
 			`(Get-CimInstance Win32_Process -Filter "ProcessId = ${pid}").CommandLine`
-		], { windowsHide: true });
-		return stdout.trim() || void 0;
+		], { windowsHide: true })).trim() || void 0;
 	} catch {
 		return;
 	}
@@ -2706,10 +2693,6 @@ function toPromptResult(stopReason, sessionId, client) {
 function requestedModelId(value) {
 	return typeof value === "string" ? value.trim() : "";
 }
-function applyConfigOptionResponseToState(state, response) {
-	if (!response?.configOptions) return state;
-	return applyConfigOptionsToState(state, response.configOptions);
-}
 function mergeConnectedModelState(state, connectedState) {
 	if (!connectedState) return state;
 	const nextState = cloneSessionAcpxState(state) ?? {};
@@ -2731,29 +2714,21 @@ function mergeConnectedModelPreferences(nextState, connectedState) {
 	if (connectedState.session_options) nextState.session_options = cloneSessionAcpxState(connectedState)?.session_options;
 	if (connectedState.desired_mode_id !== void 0) nextState.desired_mode_id = connectedState.desired_mode_id;
 	if (connectedState.desired_config_options) nextState.desired_config_options = { ...connectedState.desired_config_options };
+	else delete nextState.desired_config_options;
 }
 async function applyPromptModelIfAdvertised(params) {
 	const requestedModel = requestedModelId(params.requestedModel);
 	if (!requestedModel) return;
-	const models = advertisedModelState(params.record.acpx);
-	emitModelSupportWarning(assertRequestedModelSupported({
+	const result = await applyRequestedModelIfAdvertised({
+		client: params.client,
+		sessionId: params.sessionId,
 		requestedModel,
-		models,
+		models: advertisedModelState(params.record.acpx),
 		agentCommand: params.record.agentCommand,
-		context: "apply"
-	}), params.suppressWarnings);
-	if (!models) return;
-	if (params.record.acpx?.current_model_id === requestedModel) {
-		setDesiredModelId(params.record, requestedModel, models.configId);
-		return;
-	}
-	const response = await withTimeout(params.client.setSessionModel(params.sessionId, requestedModel, models), params.timeoutMs);
-	applyConfigOptionsToRecord(params.record, response);
-	setDesiredModelId(params.record, requestedModel, models.configId);
-	setCurrentModelId(params.record, currentModelIdFromSetModelResponse(response, requestedModel));
-}
-function emitModelSupportWarning(warning, suppressWarnings) {
-	if (warning && !suppressWarnings) process.stderr.write(`[acpx] warning: ${warning}\n`);
+		timeoutMs: params.timeoutMs,
+		onWarning: params.suppressWarnings ? void 0 : (message) => process.stderr.write(`[acpx] warning: ${message}\n`)
+	});
+	if (result.applied) params.record.acpx = applyModelSelection(params.record.acpx, requestedModel, result.response);
 }
 function jsonRpcIdKey$1(value) {
 	if (typeof value === "string") return `s:${value}`;
@@ -2976,7 +2951,7 @@ async function runSessionPrompt(options) {
 			if (options.verbose) process.stderr.write("[acpx] live session checkpoint failed: " + formatErrorMessage(error) + "\n");
 		}
 	});
-	const ownClient = options.client == null;
+	let closeClientOnExit = options.client == null;
 	const client = options.client ?? new AcpClient({
 		agentCommand: record.agentCommand,
 		agentArgv: record.agentArgv,
@@ -3047,34 +3022,13 @@ async function runSessionPrompt(options) {
 		setSessionModel: async (modelId) => {
 			const models = advertisedModelState(acpxState);
 			const response = await client.setSessionModel(activeSessionIdForControl, modelId, models);
-			acpxState = applyConfigOptionResponseToState(acpxState, response);
-			const nextState = cloneSessionAcpxState(acpxState) ?? {};
-			nextState.session_options = {
-				...nextState.session_options,
-				model: modelId
-			};
-			nextState.current_model_id = currentModelIdFromSetModelResponse(response, modelId);
-			clearDesiredConfigOption(nextState, models?.configId);
-			acpxState = nextState;
+			acpxState = applyModelSelection(acpxState, modelId, response);
 			return response;
 		},
 		setSessionConfigOption: async (configId, value) => {
+			const modelConfigId = advertisedModelState(acpxState)?.configId;
 			const response = await client.setSessionConfigOption(activeSessionIdForControl, configId, value);
-			acpxState = applyConfigOptionResponseToState(acpxState, response);
-			const nextState = cloneSessionAcpxState(acpxState) ?? {};
-			if (configId === modelStateFromConfigOptions(nextState.config_options)?.configId) {
-				nextState.session_options = {
-					...nextState.session_options,
-					model: value
-				};
-				nextState.current_model_id = currentModelIdFromSetModelResponse(response, value);
-				clearDesiredConfigOption(nextState, configId);
-			} else if (configId === "mode") nextState.desired_mode_id = value;
-			else nextState.desired_config_options = {
-				...nextState.desired_config_options,
-				[configId]: value
-			};
-			acpxState = nextState;
+			acpxState = applyConfigOptionSelection(acpxState, configId, value, response, modelConfigId);
 			return response;
 		}
 	};
@@ -3092,6 +3046,7 @@ async function runSessionPrompt(options) {
 					client,
 					record,
 					resumePolicy: options.resumePolicy,
+					replacingConfigOption: requestedModelId(options.sessionOptions?.model) ? { key: "model" } : void 0,
 					timeoutMs: options.timeoutMs,
 					verbose: options.verbose,
 					suppressWarnings: options.suppressSdkConsoleErrors,
@@ -3113,6 +3068,7 @@ async function runSessionPrompt(options) {
 			emitConnectPerfMetric(connectStartedAt, options.verbose);
 			return connected;
 		} catch (error) {
+			closeClientOnExit = true;
 			flushConnectOutput();
 			throw error;
 		}
@@ -3200,7 +3156,7 @@ async function runSessionPrompt(options) {
 		await applyPromptModelIfAdvertised({
 			client,
 			sessionId: activeSessionId,
-			requestedModel: sessionOptions?.model,
+			requestedModel: options.sessionOptions?.model,
 			record,
 			timeoutMs: options.timeoutMs,
 			suppressWarnings: options.suppressSdkConsoleErrors
@@ -3224,7 +3180,7 @@ async function runSessionPrompt(options) {
 		applyConversation(record, conversation);
 		record.acpx = acpxState;
 		await flushPendingMessages(false).catch(() => {});
-		if (ownClient) await client.close();
+		if (closeClientOnExit) await client.close();
 	};
 	try {
 		return await runWithOptionalInterrupt({
@@ -3242,7 +3198,7 @@ async function runSessionPrompt(options) {
 		else stopTotalTimer();
 		if (notifiedClientAvailable) options.onClientClosed?.();
 		client.clearEventHandlers();
-		if (ownClient) await client.close();
+		if (closeClientOnExit) await client.close();
 		applyLifecycleSnapshotToRecord(record, client.getAgentLifecycleSnapshot());
 		applyConversation(record, conversation);
 		record.acpx = acpxState;
@@ -4374,7 +4330,7 @@ function limitOutputBlock(value) {
 		const hidden = lines.length - visible.length;
 		result += `\n... (${hidden} more lines)`;
 	}
-	if (result.length > MAX_OUTPUT_CHARS) result = `${result.slice(0, MAX_OUTPUT_CHARS - 3)}...`;
+	if (result.length > MAX_OUTPUT_CHARS) result = `${result.slice(0, 1997)}...`;
 	return result;
 }
 var TextOutputFormatter = class {
@@ -4722,4 +4678,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-CzN8vLdE.js.map
+//# sourceMappingURL=output-DiPPprGk.js.map