acpx 0.13.0 → 0.13.1

package/dist/{output-CzN8vLdE.js → output-BZQE0gI1.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 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;
@@ -1629,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);
 	})));
@@ -1652,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) {
@@ -1670,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 {
@@ -1790,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;
 	}
@@ -4722,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-CzN8vLdE.js.map
+//# sourceMappingURL=output-BZQE0gI1.js.map