acpx 0.12.1 → 0.13.1

package/dist/{output-fNqTAsFQ.js → output-BZQE0gI1.js}

@@ -1,11 +1,10 @@
-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-DQp4JSHD.js";
+import { $ as writeSessionRecord, At as TimeoutError, Bt as formatErrorMessage, C as mergeSessionOptions, D as applyLifecycleSnapshotToRecord, Dt as promptToDisplayText, E as applyConversation, F as modelStateFromConfigOptions, G as findSession, Gt as toAcpErrorPayload, Ht as normalizeOutputError, J as listSessions, K as findSessionByDirectoryWalk, Mt as withTimeout, N as assertRequestedModelSupported, Ot as textPrompt, Q as resolveSessionRecord, R as runTimedExecFile, S as advertisedModelState, St as parsePromptStopReason, T as sessionOptionsFromRecord, U as absolutePath, Ut as extractAcpError, Vt as isRetryablePromptError, W as findGitRepositoryRoot, X as normalizeName, Xt as OUTPUT_ERROR_ORIGINS, Y as listSessionsForAgent, Yt as OUTPUT_ERROR_CODES, Z as pruneSessions, _ as createSessionConversation, _t as sessionEventLockPath, a as applyRequestedModelIfAdvertised, at as measurePerf, b as recordSessionUpdate, bt as isAcpJsonRpcMessage, c as setCurrentModelId, ct as setPerfGauge, d as setDesiredModelId, f as syncAdvertisedModelState, ft as normalizeRuntimeSessionId, g as cloneSessionConversation, gt as sessionEventActivePath, h as cloneSessionAcpxState, ht as sessionBaseDir, i as connectAndLoadSession, in as QueueProtocolError, it as incrementPerfCounter, jt as withInterrupt, k as AcpClient, kt as InterruptedError, l as setDesiredConfigOption, lt as startPerfTimer, m as applyConfigOptionsToState, mt as defaultSessionEventLog, n as runPromptTurn, nt as formatPerfMetric, o as currentModelIdFromSetModelResponse, ot as recordPerfDuration, p as applyConfigOptionsToRecord, q as isoNow, r as withConnectedSession, rn as QueueConnectionError, rt as getPerfMetricsSnapshot, s as clearDesiredConfigOption, st as resetPerfMetrics, t as LiveSessionCheckpoint, u as setDesiredModeId, v as recordClientOperation, vt as sessionEventSegmentPath, w as persistSessionOptions, wt as isPromptInput, x as trimConversationForRuntime, xt as parseJsonRpcErrorMessage, y as recordPromptSubmission, yt as extractSessionUpdateNotification, z as splitCommandLine } from "./live-checkpoint-BSIrfgVo.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;
@@ -1611,6 +1610,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,
@@ -1628,8 +1628,45 @@ function toSessionMutationResult(result) {
 		loadError: result.loadError
 	};
 }
+/**
+* Re-apply the session-pinned model after reconnect, matching the prompt path.
+*
+* Some agents (e.g. opencode) restore to their default model on session load and
+* advertise model-dependent config options for that default. Without replaying
+* `session_options.model` first, `set` fails because the option set belongs to
+* the wrong model, and the record is overwritten with default-model options.
+*/
+async function reapplyPinnedModelAfterConnect(params) {
+	const pinnedModel = sessionOptionsFromRecord(params.record)?.model;
+	if (!pinnedModel) return;
+	const models = advertisedModelState(params.record.acpx);
+	if (models?.currentModelId === pinnedModel) {
+		setDesiredModelId(params.record, pinnedModel, models.configId);
+		setCurrentModelId(params.record, pinnedModel);
+		return;
+	}
+	const result = await applyRequestedModelIfAdvertised({
+		client: params.client,
+		sessionId: params.sessionId,
+		requestedModel: pinnedModel,
+		models,
+		agentCommand: params.record.agentCommand,
+		timeoutMs: params.timeoutMs
+	});
+	if (result.response) applyConfigOptionsToRecord(params.record, result.response);
+	if (result.applied) {
+		setDesiredModelId(params.record, pinnedModel, models?.configId);
+		setCurrentModelId(params.record, currentModelIdFromSetModelResponse(result.response, pinnedModel));
+	}
+}
 async function runSessionSetModeDirect(options) {
 	return toSessionMutationResult(await withConnectedSession(buildDirectConnectedSessionOptions(options, async ({ client, sessionId, record }) => {
+		await reapplyPinnedModelAfterConnect({
+			client,
+			sessionId,
+			record,
+			timeoutMs: options.timeoutMs
+		});
 		await withTimeout(client.setSessionMode(sessionId, options.modeId), options.timeoutMs);
 		setDesiredModeId(record, options.modeId);
 	})));
@@ -1651,6 +1688,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;
+		if (options.configId !== modelConfigId) await reapplyPinnedModelAfterConnect({
+			client,
+			sessionId,
+			record,
+			timeoutMs: options.timeoutMs
+		});
 		const response = await withTimeout(client.setSessionConfigOption(sessionId, options.configId, options.value), options.timeoutMs);
 		applyConfigOptionsToRecord(record, response);
 		if (options.configId === modelConfigId) {
@@ -1669,7 +1712,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 {
@@ -1694,6 +1736,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
@@ -1720,6 +1763,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
@@ -1751,6 +1795,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
@@ -1786,26 +1831,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;
 	}
@@ -1849,6 +1892,7 @@ async function createSessionRecordWithClient(client, options) {
 		acpSessionId: sessionId,
 		agentSessionId,
 		agentCommand: options.agentCommand,
+		agentArgv: options.agentArgv,
 		cwd,
 		name: normalizeName(options.name),
 		createdAt: now,
@@ -1927,6 +1971,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,
@@ -1934,6 +1979,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
@@ -1963,6 +2009,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,
@@ -1970,6 +2017,7 @@ async function listAgentSessions(options) {
 		permissionPolicy: options.permissionPolicy,
 		authCredentials: options.authCredentials,
 		authPolicy: options.authPolicy,
+		fs: options.fs,
 		terminal: options.terminal,
 		verbose: options.verbose
 	});
@@ -2017,6 +2065,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
@@ -2031,6 +2080,7 @@ async function ensureSession(options) {
 	return {
 		record: await createSession({
 			agentCommand: options.agentCommand,
+			agentArgv: options.agentArgv,
 			cwd,
 			name: options.name,
 			resumeSessionId: options.resumeSessionId,
@@ -2040,6 +2090,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,
@@ -2301,6 +2352,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,
@@ -2966,6 +3018,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,
@@ -2973,6 +3026,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,
@@ -2982,6 +3036,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
@@ -3244,6 +3299,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,
@@ -3251,6 +3307,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,
@@ -3339,6 +3396,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,
@@ -3381,12 +3439,14 @@ async function submitToRunningOwner(options, waitForCompletion, extras) {
 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,
@@ -3404,6 +3464,7 @@ function createQueueOwnerTurnController(options) {
 				nonInteractivePermissions: options.nonInteractivePermissions,
 				authCredentials: options.authCredentials,
 				authPolicy: options.authPolicy,
+				fs: options.fs,
 				terminal: options.terminal,
 				timeoutMs,
 				verbose: options.verbose
@@ -3417,6 +3478,7 @@ function createQueueOwnerTurnController(options) {
 				nonInteractivePermissions: options.nonInteractivePermissions,
 				authCredentials: options.authCredentials,
 				authPolicy: options.authPolicy,
+				fs: options.fs,
 				terminal: options.terminal,
 				timeoutMs,
 				verbose: options.verbose
@@ -3431,6 +3493,7 @@ function createQueueOwnerTurnController(options) {
 				nonInteractivePermissions: options.nonInteractivePermissions,
 				authCredentials: options.authCredentials,
 				authPolicy: options.authPolicy,
+				fs: options.fs,
 				terminal: options.terminal,
 				timeoutMs,
 				verbose: options.verbose
@@ -4698,4 +4761,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-fNqTAsFQ.js.map
+//# sourceMappingURL=output-BZQE0gI1.js.map