acpx 0.5.0 → 0.5.2

package/dist/{prompt-turn-Bt8T3SRR.js → prompt-turn-CXMtXBl-.js}

@@ -1,6 +1,7 @@
-import { C as isAcpResourceNotFoundError, F as ClaudeAcpSessionCreateTimeoutError, G as SessionResolutionError, H as SessionModeReplayError, I as CopilotAcpUnsupportedError, K as SessionResumeRequiredError, L as GeminiAcpStartupTimeoutError, M as AgentDisconnectedError, N as AgentSpawnError, P as AuthPolicyError, R as PermissionDeniedError, S as extractAcpError, U as SessionModelReplayError, W as SessionNotFoundError, g as textPrompt, i as measurePerf, j as SESSION_RECORD_SCHEMA, l as extractRuntimeSessionId, r as incrementPerfCounter, u as normalizeRuntimeSessionId, v as formatErrorMessage, y as isAcpQueryClosedBeforeResponseError, z as PermissionPromptUnavailableError } from "./perf-metrics-D9QC81lB.js";
-import { r as isSessionUpdateNotification } from "./jsonrpc-M3y-qzy8.js";
+import { B as PermissionPromptUnavailableError, C as isAcpResourceNotFoundError, F as AuthPolicyError, G as SessionNotFoundError, I as ClaudeAcpSessionCreateTimeoutError, K as SessionResolutionError, L as CopilotAcpUnsupportedError, M as AgentDisconnectedError, N as AgentSpawnError, P as AgentStartupError, R as GeminiAcpStartupTimeoutError, S as extractAcpError, U as SessionModeReplayError, W as SessionModelReplayError, g as textPrompt, i as measurePerf, j as SESSION_RECORD_SCHEMA, l as extractRuntimeSessionId, q as SessionResumeRequiredError, r as incrementPerfCounter, u as normalizeRuntimeSessionId, v as formatErrorMessage, y as isAcpQueryClosedBeforeResponseError, z as PermissionDeniedError } from "./perf-metrics-D0um6IR6.js";
+import { r as isSessionUpdateNotification } from "./jsonrpc-DSxh2w5R.js";
 import fs, { statSync } from "node:fs";
+import { fileURLToPath } from "node:url";
 import path from "node:path";
 import fs$1 from "node:fs/promises";
 import os from "node:os";
@@ -9,6 +10,159 @@ import { Readable, Writable } from "node:stream";
 import { ClientSideConnection, PROTOCOL_VERSION } from "@agentclientprotocol/sdk";
 import readline from "node:readline/promises";
 import { randomUUID } from "node:crypto";
+//#region src/agent-registry.ts
+const ACP_ADAPTER_PACKAGE_RANGES = {
+	pi: "^0.0.22",
+	codex: "^0.11.1",
+	claude: "^0.25.0"
+};
+const AGENT_REGISTRY = {
+	pi: `npx pi-acp@${ACP_ADAPTER_PACKAGE_RANGES.pi}`,
+	openclaw: "openclaw acp",
+	codex: `npx @zed-industries/codex-acp@${ACP_ADAPTER_PACKAGE_RANGES.codex}`,
+	claude: `npx -y @agentclientprotocol/claude-agent-acp@${ACP_ADAPTER_PACKAGE_RANGES.claude}`,
+	gemini: "gemini --acp",
+	cursor: "cursor-agent acp",
+	copilot: "copilot --acp --stdio",
+	droid: "droid exec --output-format acp",
+	iflow: "iflow --experimental-acp",
+	kilocode: "npx -y @kilocode/cli acp",
+	kimi: "kimi acp",
+	kiro: "kiro-cli-chat acp",
+	opencode: "npx -y opencode-ai acp",
+	qoder: "qodercli --acp",
+	qwen: "qwen --acp",
+	trae: "traecli acp serve"
+};
+const BUILT_IN_AGENT_PACKAGES = {
+	codex: {
+		packageName: "@zed-industries/codex-acp",
+		packageRange: ACP_ADAPTER_PACKAGE_RANGES.codex,
+		preferredBinName: "codex-acp",
+		fallbackCommand: AGENT_REGISTRY.codex,
+		legacyFallbackCommands: []
+	},
+	claude: {
+		packageName: "@agentclientprotocol/claude-agent-acp",
+		packageRange: ACP_ADAPTER_PACKAGE_RANGES.claude,
+		preferredBinName: "claude-agent-acp",
+		fallbackCommand: AGENT_REGISTRY.claude,
+		legacyFallbackCommands: [`npm exec @agentclientprotocol/claude-agent-acp@${ACP_ADAPTER_PACKAGE_RANGES.claude}`]
+	}
+};
+const AGENT_ALIASES = {
+	"factory-droid": "droid",
+	factorydroid: "droid"
+};
+const DEFAULT_AGENT_NAME = "codex";
+function normalizeAgentName$1(value) {
+	return value.trim().toLowerCase();
+}
+function mergeAgentRegistry(overrides) {
+	if (!overrides) return { ...AGENT_REGISTRY };
+	const merged = { ...AGENT_REGISTRY };
+	for (const [name, command] of Object.entries(overrides)) {
+		const normalized = normalizeAgentName$1(name);
+		if (!normalized || !command.trim()) continue;
+		merged[normalized] = command.trim();
+	}
+	return merged;
+}
+function resolveAgentCommand(agentName, overrides) {
+	const normalized = normalizeAgentName$1(agentName);
+	const registry = mergeAgentRegistry(overrides);
+	return registry[normalized] ?? registry[AGENT_ALIASES[normalized] ?? normalized] ?? agentName;
+}
+function findBuiltInAgentPackage(agentCommand) {
+	const normalized = agentCommand.trim();
+	return Object.values(BUILT_IN_AGENT_PACKAGES).find((spec) => spec.fallbackCommand === normalized || spec.legacyFallbackCommands?.includes(normalized));
+}
+function defaultResolvePackageRoot(packageName) {
+	const segments = packageName.split("/");
+	let cursor = path.dirname(fileURLToPath(import.meta.url));
+	while (true) {
+		const candidateRoot = path.join(cursor, "node_modules", ...segments);
+		const manifestPath = path.join(candidateRoot, "package.json");
+		if (fs.existsSync(manifestPath)) try {
+			if (JSON.parse(fs.readFileSync(manifestPath, "utf8")).name === packageName) return candidateRoot;
+		} catch {}
+		const parent = path.dirname(cursor);
+		if (parent === cursor) throw new Error(`Built-in agent package not found: ${packageName}`);
+		cursor = parent;
+	}
+}
+function resolvePackageBin(spec, manifest) {
+	if (typeof manifest.bin === "string") return manifest.bin;
+	if (!manifest.bin || typeof manifest.bin !== "object") return;
+	return manifest.bin[spec.preferredBinName] ?? (Object.keys(manifest.bin).length === 1 ? Object.values(manifest.bin)[0] : void 0);
+}
+function defaultResolveNpmCliPath(execPath) {
+	const candidate = path.resolve(path.dirname(execPath), "..", "lib", "node_modules", "npm", "bin", "npm-cli.js");
+	if (!fs.existsSync(candidate)) throw new Error(`npm CLI not found for execPath: ${execPath}`);
+	return candidate;
+}
+function resolveInstalledBuiltInAgentLaunch(agentCommand, options = {}) {
+	const spec = findBuiltInAgentPackage(agentCommand);
+	if (!spec) return;
+	const readFileSync = options.readFileSync ?? fs.readFileSync;
+	const existsSync = options.existsSync ?? fs.existsSync;
+	const resolvePackageRoot = options.resolvePackageRoot ?? defaultResolvePackageRoot;
+	try {
+		const packageRoot = resolvePackageRoot(spec.packageName);
+		const manifest = JSON.parse(readFileSync(path.join(packageRoot, "package.json"), "utf8"));
+		if (manifest.name !== spec.packageName) return;
+		const relativeBinPath = resolvePackageBin(spec, manifest);
+		if (!relativeBinPath) return;
+		const binPath = path.resolve(packageRoot, relativeBinPath);
+		if (!existsSync(binPath)) return;
+		return {
+			source: "installed",
+			command: process.execPath,
+			args: [binPath],
+			packageName: spec.packageName,
+			packageRange: spec.packageRange,
+			packageVersion: manifest.version,
+			binPath
+		};
+	} catch {
+		return;
+	}
+}
+function resolvePackageExecBuiltInAgentLaunch(agentCommand, options = {}) {
+	const spec = findBuiltInAgentPackage(agentCommand);
+	if (!spec) return;
+	const existsSync = options.existsSync ?? fs.existsSync;
+	const execPath = options.execPath ?? process.execPath;
+	const resolveNpmCliPath = options.resolveNpmCliPath ?? defaultResolveNpmCliPath;
+	try {
+		const npmCliPath = resolveNpmCliPath(execPath);
+		if (!existsSync(npmCliPath)) return;
+		return {
+			source: "package-exec",
+			command: execPath,
+			args: [
+				npmCliPath,
+				"exec",
+				"--yes",
+				`--package=${spec.packageName}@${spec.packageRange}`,
+				"--",
+				spec.preferredBinName
+			],
+			packageName: spec.packageName,
+			packageRange: spec.packageRange,
+			npmCliPath
+		};
+	} catch {
+		return;
+	}
+}
+function resolveBuiltInAgentLaunch(agentCommand, options = {}) {
+	return resolveInstalledBuiltInAgentLaunch(agentCommand, options) ?? resolvePackageExecBuiltInAgentLaunch(agentCommand, options);
+}
+function listBuiltInAgents(overrides) {
+	return Object.keys(mergeAgentRegistry(overrides));
+}
+//#endregion
 //#region src/async-control.ts
 var TimeoutError = class extends Error {
 	constructor(timeoutMs) {
@@ -323,6 +477,7 @@ function parseAcpxState(raw) {
 	const record = asRecord$3(raw);
 	if (!record) return;
 	const state = {};
+	if (record.reset_on_next_ensure === true) state.reset_on_next_ensure = true;
 	if (typeof record.current_mode_id === "string") state.current_mode_id = record.current_mode_id;
 	if (typeof record.desired_mode_id === "string") state.desired_mode_id = record.desired_mode_id;
 	if (typeof record.current_model_id === "string") state.current_model_id = record.current_model_id;
@@ -1663,6 +1818,7 @@ const REPLAY_DRAIN_TIMEOUT_MS = 5e3;
 const DRAIN_POLL_INTERVAL_MS = 20;
 const AGENT_CLOSE_TERM_GRACE_MS = 1500;
 const AGENT_CLOSE_KILL_GRACE_MS = 1e3;
+const STARTUP_STDERR_MAX_CHARS = 8192;
 function shouldSuppressSdkConsoleError(args) {
 	if (args.length === 0) return false;
 	return typeof args[0] === "string" && args[0] === "Error handling request";
@@ -1798,6 +1954,9 @@ var AcpClient = class {
 	supportsLoadSession() {
 		return Boolean(this.initResult?.agentCapabilities?.loadSession);
 	}
+	supportsCloseSession() {
+		return Boolean(this.initResult?.agentCapabilities?.sessionCapabilities?.close);
+	}
 	setEventHandlers(handlers) {
 		this.eventHandlers = { ...handlers };
 	}
@@ -1825,13 +1984,18 @@ var AcpClient = class {
 	async start() {
 		if (this.connection && this.agent && isChildProcessRunning(this.agent)) return;
 		if (this.connection || this.agent) await this.close();
-		const { command, args: initialArgs } = splitCommandLine(this.options.agentCommand);
-		let args = await resolveGeminiCommandArgs(command, initialArgs);
-		if (isQoderAcpCommand(command, args)) args = buildQoderAcpCommandArgs(args, this.options);
-		this.log(`spawning agent: ${command} ${args.join(" ")}`);
-		const geminiAcp = isGeminiAcpCommand(command, args);
-		if (isCopilotAcpCommand(command, args)) await ensureCopilotAcpSupport(command);
-		const spawnedChild = spawn(command, args, buildSpawnCommandOptions(command, buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials)));
+		const configuredCommand = splitCommandLine(this.options.agentCommand);
+		const resolvedBuiltInLaunch = resolveBuiltInAgentLaunch(this.options.agentCommand);
+		const spawnCommand = resolvedBuiltInLaunch?.command ?? configuredCommand.command;
+		let args = resolvedBuiltInLaunch?.args ?? configuredCommand.args;
+		args = await resolveGeminiCommandArgs(spawnCommand, args);
+		if (isQoderAcpCommand(spawnCommand, args)) args = buildQoderAcpCommandArgs(args, this.options);
+		if (resolvedBuiltInLaunch?.source === "installed") this.log(`spawning installed built-in agent ${resolvedBuiltInLaunch.packageName}${resolvedBuiltInLaunch.packageVersion ? `@${resolvedBuiltInLaunch.packageVersion}` : ""} via ${spawnCommand} ${args.join(" ")}`);
+		else if (resolvedBuiltInLaunch?.source === "package-exec") this.log(`spawning built-in agent ${resolvedBuiltInLaunch.packageName}@${resolvedBuiltInLaunch.packageRange} via current Node package exec bridge ${spawnCommand} ${args.join(" ")}`);
+		else this.log(`spawning agent: ${spawnCommand} ${args.join(" ")}`);
+		const geminiAcp = isGeminiAcpCommand(spawnCommand, args);
+		if (isCopilotAcpCommand(spawnCommand, args)) await ensureCopilotAcpSupport(spawnCommand);
+		const spawnedChild = spawn(spawnCommand, args, buildSpawnCommandOptions(spawnCommand, buildAgentSpawnOptions(this.options.cwd, this.options.authCredentials)));
 		try {
 			await waitForSpawn$1(spawnedChild);
 		} catch (error) {
@@ -1843,7 +2007,9 @@ var AcpClient = class {
 		this.lastAgentExit = void 0;
 		this.lastKnownPid = child.pid ?? void 0;
 		this.attachAgentLifecycleObservers(child);
+		const startupStderr = [];
 		child.stderr.on("data", (chunk) => {
+			this.captureStartupStderr(startupStderr, chunk);
 			if (!this.options.verbose) return;
 			process.stderr.write(chunk);
 		});
@@ -1881,30 +2047,38 @@ var AcpClient = class {
 		connection.signal.addEventListener("abort", () => {
 			this.recordAgentExit("connection_close", child.exitCode ?? null, child.signalCode ?? null);
 		}, { once: true });
+		const startupFailure = this.createStartupFailureWatcher(child, startupStderr);
 		try {
-			const initializePromise = connection.initialize({
-				protocolVersion: PROTOCOL_VERSION,
-				clientCapabilities: {
-					fs: {
-						readTextFile: true,
-						writeTextFile: true
+			const initResult = await Promise.race([(async () => {
+				const initializePromise = connection.initialize({
+					protocolVersion: PROTOCOL_VERSION,
+					clientCapabilities: {
+						fs: {
+							readTextFile: true,
+							writeTextFile: true
+						},
+						terminal: true
 					},
-					terminal: true
-				},
-				clientInfo: {
-					name: "acpx",
-					version: "0.1.0"
-				}
-			});
-			const initResult = geminiAcp ? await withTimeout(initializePromise, resolveGeminiAcpStartupTimeoutMs()) : await initializePromise;
-			await this.authenticateIfRequired(connection, initResult.authMethods ?? []);
+					clientInfo: {
+						name: "acpx",
+						version: "0.1.0"
+					}
+				});
+				const initialized = geminiAcp ? await withTimeout(initializePromise, resolveGeminiAcpStartupTimeoutMs()) : await initializePromise;
+				await this.authenticateIfRequired(connection, initialized.authMethods ?? []);
+				return initialized;
+			})(), startupFailure.promise]);
+			startupFailure.dispose();
 			this.connection = connection;
 			this.agent = child;
 			this.initResult = initResult;
 			this.log(`initialized protocol version ${initResult.protocolVersion}`);
 		} catch (error) {
-			child.kill();
-			if (geminiAcp && error instanceof TimeoutError) throw new GeminiAcpStartupTimeoutError(await buildGeminiAcpStartupTimeoutMessage(command), {
+			startupFailure.dispose();
+			try {
+				child.kill();
+			} catch {}
+			if (geminiAcp && error instanceof TimeoutError) throw new GeminiAcpStartupTimeoutError(await buildGeminiAcpStartupTimeoutMessage(spawnCommand), {
 				cause: error,
 				retryable: true
 			});
@@ -2079,6 +2253,11 @@ var AcpClient = class {
 		this.cancellingSessionIds.add(sessionId);
 		await this.runConnectionRequest(() => connection.cancel({ sessionId }));
 	}
+	async closeSession(sessionId) {
+		const connection = this.getConnection();
+		await this.runConnectionRequest(() => connection.unstable_closeSession({ sessionId }));
+		if (this.loadedSessionId === sessionId) this.loadedSessionId = void 0;
+	}
 	async requestCancelActivePrompt() {
 		const active = this.activePrompt;
 		if (!active) return false;
@@ -2164,6 +2343,65 @@ var AcpClient = class {
 		if (!this.options.verbose) return;
 		process.stderr.write(`[acpx] ${message}\n`);
 	}
+	captureStartupStderr(target, chunk) {
+		const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+		if (text.length === 0) return;
+		target.push(text);
+		if (target.join("").length - STARTUP_STDERR_MAX_CHARS <= 0) return;
+		const joined = target.join("");
+		target.splice(0, target.length, joined.slice(-STARTUP_STDERR_MAX_CHARS));
+	}
+	summarizeStartupStderr(target) {
+		const joined = target.join("").trim();
+		if (!joined) return;
+		return joined.replace(/\s+/gu, " ").trim().slice(0, STARTUP_STDERR_MAX_CHARS);
+	}
+	createStartupFailureWatcher(child, startupStderr) {
+		let settled = false;
+		let rejectPromise;
+		const cleanup = () => {
+			child.off("error", onError);
+			child.off("exit", onExit);
+			child.off("close", onClose);
+		};
+		const finish = (error) => {
+			if (settled) return;
+			settled = true;
+			cleanup();
+			if (error) rejectPromise(error);
+		};
+		const createError = (params) => new AgentStartupError({
+			agentCommand: this.options.agentCommand,
+			exitCode: params?.exitCode ?? child.exitCode ?? null,
+			signal: params?.signal ?? child.signalCode ?? null,
+			stderrSummary: this.summarizeStartupStderr(startupStderr),
+			cause: params?.cause
+		});
+		const onError = (error) => {
+			finish(createError({ cause: error }));
+		};
+		const onExit = (exitCode, signal) => {
+			finish(createError({
+				exitCode,
+				signal
+			}));
+		};
+		const onClose = (exitCode, signal) => {
+			finish(createError({
+				exitCode,
+				signal
+			}));
+		};
+		return {
+			promise: new Promise((_resolve, reject) => {
+				rejectPromise = reject;
+				child.once("error", onError);
+				child.once("exit", onExit);
+				child.once("close", onClose);
+			}),
+			dispose: () => finish()
+		};
+	}
 	selectAuthMethod(methods) {
 		for (const method of methods) {
 			const envCredential = readEnvCredential(method.id);
@@ -3118,6 +3356,6 @@ async function runPromptTurn(params) {
 	}
 }
 //#endregion
-export { resolveSessionRecord as A, serializeSessionRecordForDisk as B, findGitRepositoryRoot as C, listSessions as D, isoNow$2 as E, sessionBaseDir$1 as F, TimeoutError as H, sessionEventActivePath as I, sessionEventLockPath as L, parseSessionRecord as M, DEFAULT_EVENT_SEGMENT_MAX_BYTES as N, listSessionsForAgent as O, defaultSessionEventLog as P, sessionEventSegmentPath as R, absolutePath as S, findSessionByDirectoryWalk as T, withInterrupt as U, InterruptedError as V, withTimeout as W, recordSessionUpdate as _, applyConversation as a, permissionModeSatisfies as b, setCurrentModelId as c, syncAdvertisedModelState as d, cloneSessionAcpxState as f, recordPromptSubmission as g, recordClientOperation as h, connectAndLoadSession as i, writeSessionRecord as j, normalizeName as k, setDesiredModeId as l, createSessionConversation as m, withConnectedSession as n, applyLifecycleSnapshotToRecord as o, cloneSessionConversation as p, sessionOptionsFromRecord as r, reconcileAgentSessionId as s, runPromptTurn as t, setDesiredModelId as u, trimConversationForRuntime as v, findSession as w, DEFAULT_HISTORY_LIMIT as x, AcpClient as y, assertPersistedKeyPolicy as z };
+export { resolveSessionRecord as A, serializeSessionRecordForDisk as B, findGitRepositoryRoot as C, listSessions as D, isoNow$2 as E, sessionBaseDir$1 as F, DEFAULT_AGENT_NAME as G, TimeoutError as H, sessionEventActivePath as I, resolveAgentCommand as J, listBuiltInAgents as K, sessionEventLockPath as L, parseSessionRecord as M, DEFAULT_EVENT_SEGMENT_MAX_BYTES as N, listSessionsForAgent as O, defaultSessionEventLog as P, sessionEventSegmentPath as R, absolutePath as S, findSessionByDirectoryWalk as T, withInterrupt as U, InterruptedError as V, withTimeout as W, recordSessionUpdate as _, applyConversation as a, permissionModeSatisfies as b, setCurrentModelId as c, syncAdvertisedModelState as d, cloneSessionAcpxState as f, recordPromptSubmission as g, recordClientOperation as h, connectAndLoadSession as i, writeSessionRecord as j, normalizeName as k, setDesiredModeId as l, createSessionConversation as m, withConnectedSession as n, applyLifecycleSnapshotToRecord as o, cloneSessionConversation as p, normalizeAgentName$1 as q, sessionOptionsFromRecord as r, reconcileAgentSessionId as s, runPromptTurn as t, setDesiredModelId as u, trimConversationForRuntime as v, findSession as w, DEFAULT_HISTORY_LIMIT as x, AcpClient as y, assertPersistedKeyPolicy as z };
 
-//# sourceMappingURL=prompt-turn-Bt8T3SRR.js.map
+//# sourceMappingURL=prompt-turn-CXMtXBl-.js.map