acpx 0.12.1 → 0.13.0

package/dist/runtime.d.ts

@@ -1,5 +1,5 @@
-import { a as AcpPermissionRequest, c as NonInteractivePermissionPolicy, f as SessionRecord, i as AcpPermissionDecision, l as PermissionMode, n as SystemPromptOption, s as McpServer$1, t as SessionAgentOptions } from "./session-options-C4uYkKDy.js";
-import { a as RequestedModelUnsupportedErrorCode, i as RequestedModelUnsupportedError, n as REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE, o as RequestedModelUnsupportedReason, r as REQUESTED_MODEL_UNSUPPORTED_REASONS, s as isRequestedModelUnsupportedError, t as AcpClient } from "./client-CFo_9MIo.js";
+import { a as AcpPermissionRequest, c as NonInteractivePermissionPolicy, f as SessionRecord, i as AcpPermissionDecision, l as PermissionMode, n as SystemPromptOption, s as McpServer$1, t as SessionAgentOptions } from "./session-options-CTdZvr68.js";
+import { a as RequestedModelUnsupportedErrorCode, i as RequestedModelUnsupportedError, n as REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE, o as RequestedModelUnsupportedReason, r as REQUESTED_MODEL_UNSUPPORTED_REASONS, s as isRequestedModelUnsupportedError, t as AcpClient } from "./client-BeKvumq9.js";
 import fs from "node:fs";
 import { ToolCallContent, ToolCallLocation, ToolKind } from "@agentclientprotocol/sdk";
 //#region src/agent-registry.d.ts
@@ -257,7 +257,7 @@ interface AcpSessionStore {
   save(record: AcpSessionRecord): Promise<void>;
 }
 interface AcpAgentRegistry {
-  resolve(agentName: string): string;
+  resolve(agentName: string): string | string[];
   list(): string[];
 }
 type AcpRuntimeOptions = {
@@ -396,7 +396,7 @@ type AcpxRuntimeLike = AcpRuntime & {
   doctor(): Promise<AcpRuntimeDoctorReport>;
 };
 declare function createAgentRegistry(params?: {
-  overrides?: Record<string, string>;
+  overrides?: Record<string, string | string[]>;
 }): AcpAgentRegistry;
 declare class AcpxRuntime implements AcpxRuntimeLike {
   private readonly options;

package/dist/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","names":[],"sources":["../src/agent-registry.ts","../src/runtime/public/contract.ts","../src/runtime/engine/manager.ts","../src/runtime/public/file-session-store.ts","../src/runtime/public/errors.ts","../src/runtime/public/shared.ts","../src/runtime/public/handle-state.ts","../src/runtime.ts"],"mappings":"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"}
+{"version":3,"file":"runtime.d.ts","names":[],"sources":["../src/agent-registry.ts","../src/runtime/public/contract.ts","../src/runtime/engine/manager.ts","../src/runtime/public/file-session-store.ts","../src/runtime/public/errors.ts","../src/runtime/public/shared.ts","../src/runtime/public/handle-state.ts","../src/runtime.ts"],"mappings":"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"}

package/dist/runtime.js

@@ -1,4 +1,4 @@
-import { A as REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE, At as listBuiltInAgents, D as applyLifecycleSnapshotToRecord, E as applyConversation, F as modelStateFromConfigOptions, It as normalizeOutputError, Lt as extractAcpError, M as RequestedModelUnsupportedError, Mt as resolveAgentCommand, O as reconcileAgentSessionId, Ot as withTimeout, P as isRequestedModelUnsupportedError, Rt as isAcpResourceNotFoundError, S as advertisedModelState, T as sessionOptionsFromRecord, Z as assertPersistedKeyPolicy, _ as createSessionConversation, a as applyRequestedModelIfAdvertised, b as recordSessionUpdate, c as setCurrentModelId, d as setDesiredModelId, f as syncAdvertisedModelState, g as cloneSessionConversation, h as cloneSessionAcpxState, i as connectAndLoadSession, j as REQUESTED_MODEL_UNSUPPORTED_REASONS, k as AcpClient, kt as DEFAULT_AGENT_NAME, l as setDesiredConfigOption, m as applyConfigOptionsToState, n as runPromptTurn, o as currentModelIdFromSetModelResponse, ot as parseSessionRecord, p as applyConfigOptionsToRecord, r as withConnectedSession, s as clearDesiredConfigOption, st as serializeSessionRecordForDisk, t as LiveSessionCheckpoint, u as setDesiredModeId, ut as defaultSessionEventLog, v as recordClientOperation, w as persistSessionOptions, wt as textPrompt, x as trimConversationForRuntime, y as recordPromptSubmission } from "./live-checkpoint-DQp4JSHD.js";
+import { $ as createAtomicWriteTempPath, A as REQUESTED_MODEL_UNSUPPORTED_ERROR_CODE, D as applyLifecycleSnapshotToRecord, Dt as textPrompt, E as applyConversation, F as modelStateFromConfigOptions, Ft as resolveAgentArgv, Ht as extractAcpError, I as normalizeAgentCommandInput, It as resolveAgentCommand, Lt as resolveCanonicalAgentName, M as RequestedModelUnsupportedError, Mt as DEFAULT_AGENT_NAME, Nt as listBuiltInAgents, O as reconcileAgentSessionId, P as isRequestedModelUnsupportedError, Pt as normalizeAgentName, S as advertisedModelState, T as sessionOptionsFromRecord, Ut as isAcpResourceNotFoundError, Vt as normalizeOutputError, _ as createSessionConversation, a as applyRequestedModelIfAdvertised, b as recordSessionUpdate, c as setCurrentModelId, d as setDesiredModelId, et as assertPersistedKeyPolicy, f as syncAdvertisedModelState, g as cloneSessionConversation, h as cloneSessionAcpxState, i as connectAndLoadSession, j as REQUESTED_MODEL_UNSUPPORTED_REASONS, jt as withTimeout, k as AcpClient, l as setDesiredConfigOption, lt as parseSessionRecord, m as applyConfigOptionsToState, n as runPromptTurn, o as currentModelIdFromSetModelResponse, p as applyConfigOptionsToRecord, pt as defaultSessionEventLog, r as withConnectedSession, s as clearDesiredConfigOption, t as LiveSessionCheckpoint, u as setDesiredModeId, ut as serializeSessionRecordForDisk, v as recordClientOperation, w as persistSessionOptions, x as trimConversationForRuntime, y as recordPromptSubmission } from "./live-checkpoint-CBecfnSH.js";
 import path from "node:path";
 import fs from "node:fs/promises";
 import { randomUUID } from "node:crypto";
@@ -561,6 +561,7 @@ function createInitialRecord(params) {
 		acpSessionId: params.sessionId,
 		agentSessionId: params.agentSessionId,
 		agentCommand: params.agentCommand,
+		agentArgv: params.agentArgv,
 		cwd: params.cwd,
 		name: params.sessionName,
 		createdAt: now,
@@ -822,7 +823,7 @@ var AcpRuntimeManager = class {
 	}
 	async ensureSession(input) {
 		const cwd = path.resolve(input.cwd?.trim() || this.options.cwd);
-		const agentCommand = this.options.agentRegistry.resolve(input.agent);
+		const { agentCommand, agentArgv } = normalizeAgentCommandInput(this.options.agentRegistry.resolve(input.agent));
 		const existing = await this.options.sessionStore.load(input.sessionKey);
 		if (input.mode === "persistent" && existing && shouldReuseExistingRecord(existing, {
 			cwd,
@@ -837,6 +838,7 @@ var AcpRuntimeManager = class {
 		}
 		const client = this.createClient({
 			agentCommand,
+			agentArgv,
 			cwd,
 			mcpServers: [...this.options.mcpServers ?? []],
 			permissionMode: this.options.permissionMode,
@@ -853,6 +855,7 @@ var AcpRuntimeManager = class {
 				input,
 				client,
 				agentCommand,
+				agentArgv,
 				cwd,
 				session
 			});
@@ -863,12 +866,13 @@ var AcpRuntimeManager = class {
 		}
 	}
 	async createAndSaveRuntimeRecord(params) {
-		const { input, client, agentCommand, cwd, session } = params;
+		const { input, client, agentCommand, agentArgv, cwd, session } = params;
 		const record = createInitialRecord({
 			recordId: createRecordId(input.sessionKey, input.mode),
 			sessionName: input.sessionKey,
 			sessionId: session.sessionId,
 			agentCommand,
+			agentArgv,
 			cwd,
 			agentSessionId: session.agentSessionId
 		});
@@ -1029,6 +1033,7 @@ var AcpRuntimeManager = class {
 	createTurnClient(record) {
 		return this.createClient({
 			agentCommand: record.agentCommand,
+			agentArgv: record.agentArgv,
 			cwd: record.cwd,
 			mcpServers: [...this.options.mcpServers ?? []],
 			permissionMode: this.options.permissionMode,
@@ -1316,6 +1321,7 @@ var AcpRuntimeManager = class {
 		const pendingClient = await this.readPendingPersistentClient(record, { consume: true });
 		const client = pendingClient ?? this.createClient({
 			agentCommand: record.agentCommand,
+			agentArgv: record.agentArgv,
 			cwd: record.cwd,
 			mcpServers: [...this.options.mcpServers ?? []],
 			permissionMode: this.options.permissionMode,
@@ -1382,7 +1388,7 @@ var FileSessionStore = class {
 		const persisted = serializeSessionRecordForDisk(record);
 		assertPersistedKeyPolicy(persisted);
 		const file = this.filePath(record.acpxRecordId);
-		const tempFile = `${file}.${process.pid}.${Date.now()}.tmp`;
+		const tempFile = createAtomicWriteTempPath(file);
 		const payload = JSON.stringify(persisted, null, 2);
 		await fs.writeFile(tempFile, `${payload}\n`, "utf8");
 		await fs.rename(tempFile, file);
@@ -1464,7 +1470,7 @@ function normalizeRuntimeDetails(details) {
 }
 async function probeRuntime(options, deps = {}) {
 	const agentName = options.probeAgent?.trim() || "codex";
-	const agentCommand = options.agentRegistry.resolve(agentName);
+	const agentCommand = normalizeAgentCommandInput(options.agentRegistry.resolve(agentName));
 	const client = createProbeClient(options, agentCommand, deps);
 	try {
 		await client.start();
@@ -1473,7 +1479,7 @@ async function probeRuntime(options, deps = {}) {
 			message: "embedded ACP runtime ready",
 			details: [
 				`agent=${agentName}`,
-				`command=${agentCommand}`,
+				`command=${agentCommand.agentCommand}`,
 				`cwd=${options.cwd}`,
 				...client.initializeResult?.protocolVersion ? [`protocolVersion=${client.initializeResult.protocolVersion}`] : []
 			]
@@ -1484,7 +1490,7 @@ async function probeRuntime(options, deps = {}) {
 			message: "embedded ACP runtime probe failed",
 			details: [
 				`agent=${agentName}`,
-				`command=${agentCommand}`,
+				`command=${agentCommand.agentCommand}`,
 				`cwd=${options.cwd}`,
 				formatRuntimeDetail(error)
 			]
@@ -1495,7 +1501,7 @@ async function probeRuntime(options, deps = {}) {
 }
 function createProbeClient(options, agentCommand, deps) {
 	const clientOptions = {
-		agentCommand,
+		...agentCommand,
 		cwd: options.cwd,
 		mcpServers: [...options.mcpServers ?? []],
 		permissionMode: options.permissionMode,
@@ -1513,15 +1519,31 @@ const ACPX_CAPABILITIES = { controls: [
 	"session/status"
 ] };
 function createAgentRegistry(params) {
+	const overrides = normalizeRegistryOverrides(params?.overrides);
 	return {
 		resolve(agentName) {
-			return resolveAgentCommand(agentName, params?.overrides);
+			const normalizedAgentName = normalizeAgentName(agentName);
+			return overrides[normalizedAgentName] ?? overrides[resolveCanonicalAgentName(agentName)] ?? resolveAgentArgv(agentName) ?? resolveAgentCommand(agentName);
 		},
 		list() {
-			return listBuiltInAgents(params?.overrides);
+			return listBuiltInAgents(overrides);
 		}
 	};
 }
+function normalizeRegistryOverrides(values) {
+	const normalized = {};
+	for (const [name, value] of Object.entries(values ?? {})) {
+		const normalizedName = normalizeAgentName(name);
+		if (!normalizedName) continue;
+		const normalizedValue = normalizeRegistryOverride(value);
+		if (normalizedValue) normalized[normalizedName] = normalizedValue;
+	}
+	return normalized;
+}
+function normalizeRegistryOverride(value) {
+	if (typeof value === "string") return value.trim() || void 0;
+	return value.length > 0 && value[0]?.length ? [...value] : void 0;
+}
 var AcpxRuntime = class {
 	options;
 	testOptions;