@victor-software-house/pi-acp 0.13.1 → 0.14.0

package/dist/{daemon-BErbUhcE.mjs → daemon-CjPR14E_.mjs}

@@ -8,7 +8,7 @@ import { isAbsolute, join, resolve } from "node:path";
 import { Hono } from "hono";
 import { AgentSideConnection, RequestError, ndJsonStream } from "@agentclientprotocol/sdk";
 import { randomUUID } from "node:crypto";
-import { DefaultResourceLoader, SessionManager, createAgentSession, createReadToolDefinition, getAgentDir } from "@earendil-works/pi-coding-agent";
+import { DefaultResourceLoader, SessionManager, createAgentSession, createBashToolDefinition, createReadToolDefinition, getAgentDir } from "@earendil-works/pi-coding-agent";
 import * as z from "zod";
 import { parse } from "yaml";
 import { $ } from "bun";
@@ -184,6 +184,78 @@ function resolveIdleMs() {
 	return n * 1e3;
 }
 //#endregion
+//#region src/acp/acp-bash-operations.ts
+const POLL_INTERVAL_MS = 100;
+const SHELL_PATH = "/bin/sh";
+function createAcpBashOperations(deps) {
+	const { conn, getSessionId } = deps;
+	return { async exec(command, cwd, options) {
+		const sessionId = getSessionId();
+		if (sessionId === "") throw new Error("pi-acp acp-bash: sessionId not yet bound");
+		const env = options.env !== void 0 ? Object.entries(options.env).filter(([, v]) => v !== void 0).map(([name, value]) => ({
+			name,
+			value: String(value)
+		})) : [];
+		const createParams = {
+			sessionId,
+			command: SHELL_PATH,
+			args: ["-c", command],
+			cwd,
+			env
+		};
+		const terminal = await conn.createTerminal(createParams);
+		let lastOutputLen = 0;
+		let cancelled = false;
+		const abortHandler = () => {
+			cancelled = true;
+			terminal.kill().catch(() => {});
+		};
+		options.signal?.addEventListener("abort", abortHandler);
+		const pollLoop = async () => {
+			while (!cancelled) {
+				try {
+					const snap = await terminal.currentOutput();
+					if (snap.output.length > lastOutputLen) {
+						const delta = snap.output.slice(lastOutputLen);
+						lastOutputLen = snap.output.length;
+						options.onData(Buffer.from(delta, "utf8"));
+					}
+					if (snap.exitStatus !== null && snap.exitStatus !== void 0) return;
+				} catch {
+					return;
+				}
+				await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
+			}
+		};
+		const timeoutPromise = options.timeout !== void 0 && options.timeout > 0 ? new Promise((resolve) => setTimeout(() => resolve({ timedOut: true }), options.timeout)) : null;
+		try {
+			const pollPromise = pollLoop();
+			const exitPromise = terminal.waitForExit();
+			const winner = timeoutPromise !== null ? await Promise.race([exitPromise, timeoutPromise]) : await exitPromise;
+			let exitCode;
+			if ("timedOut" in winner) {
+				await terminal.kill().catch(() => {});
+				exitCode = (await terminal.waitForExit()).exitCode ?? null;
+			} else exitCode = winner.exitCode ?? null;
+			cancelled = true;
+			await pollPromise;
+			try {
+				const final = await terminal.currentOutput();
+				if (final.output.length > lastOutputLen) {
+					const delta = final.output.slice(lastOutputLen);
+					options.onData(Buffer.from(delta, "utf8"));
+				}
+			} catch {}
+			return { exitCode };
+		} finally {
+			options.signal?.removeEventListener("abort", abortHandler);
+			try {
+				await terminal.release();
+			} catch {}
+		}
+	} };
+}
+//#endregion
 //#region src/acp/acp-read-operations.ts
 function createAcpReadOperations(deps) {
 	const { conn, getSessionId } = deps;
@@ -263,41 +335,66 @@ function detectAuthError(err) {
 }
 //#endregion
 //#region src/acp/client-capabilities.ts
-/**
-* Extract well-known capability flags from ACP `ClientCapabilities`.
-*
-* Reads from:
-* - `_meta.terminal_output` (terminal output rendering)
-* - `_meta.terminal-auth` (terminal auth with command metadata)
-* - `auth._meta.gateway` (gateway auth, future use)
-*/
 function parseClientCapabilities(caps) {
-	if (caps === void 0 || caps === null) return {
-		terminalOutput: false,
-		terminalAuth: false,
-		gatewayAuth: false,
-		fsReadTextFile: false
-	};
-	const meta = caps._meta;
-	const terminalOutput = typeof meta === "object" && meta !== null && meta["terminal_output"] === true;
-	const terminalAuth = typeof meta === "object" && meta !== null && meta["terminal-auth"] === true;
-	let gatewayAuth = false;
-	if ("auth" in caps) {
-		const auth = caps.auth;
-		if (typeof auth === "object" && auth !== null && "_meta" in auth) {
-			const authMeta = auth._meta;
-			if (typeof authMeta === "object" && authMeta !== null && "gateway" in authMeta) gatewayAuth = authMeta["gateway"] === true;
-		}
-	}
-	const fsReadTextFile = caps.fs?.readTextFile === true;
+	const safe = caps ?? {};
+	const meta = safe._meta;
+	const metaIsObject = typeof meta === "object" && meta !== null;
+	const authMeta = "auth" in safe && typeof safe.auth === "object" && safe.auth !== null && "_meta" in safe.auth ? safe.auth._meta : void 0;
+	const authMetaIsObject = typeof authMeta === "object" && authMeta !== null;
 	return {
-		terminalOutput,
-		terminalAuth,
-		gatewayAuth,
-		fsReadTextFile
+		terminalOutput: metaIsObject && meta["terminal_output"] === true,
+		terminalAuth: metaIsObject && meta["terminal-auth"] === true,
+		gatewayAuth: authMetaIsObject && authMeta["gateway"] === true,
+		fsReadTextFile: safe.fs?.readTextFile === true,
+		terminal: safe.terminal === true
 	};
 }
 //#endregion
+//#region src/acp/ext-methods.ts
+/**
+* ACP `extMethod` / `extNotification` dispatcher.
+*
+* ACP spec recommends prefixing extension method names with a unique
+* identifier (e.g., a domain name). pi-acp uses the `pi-acp/` prefix for
+* its built-ins; client-defined methods can also be routed here by
+* registering handlers via `register()`.
+*
+* Unknown request methods throw `RequestError.methodNotFound`. Unknown
+* notification methods are silently ignored per JSON-RPC 2.0 semantics —
+* notifications have no response channel, so erroring is meaningless.
+*/
+var ExtMethodDispatcher = class {
+	requestHandlers = /* @__PURE__ */ new Map();
+	notificationHandlers = /* @__PURE__ */ new Map();
+	constructor(deps) {
+		this.requestHandlers.set("pi-acp/ping", () => ({
+			ok: true,
+			ts: Date.now()
+		}));
+		this.requestHandlers.set("pi-acp/runtime-info", () => ({
+			version: deps.version,
+			uptimeMs: Date.now() - deps.startedAt,
+			sessionCount: deps.sessionCount()
+		}));
+	}
+	register(method, handler) {
+		this.requestHandlers.set(method, handler);
+	}
+	registerNotification(method, handler) {
+		this.notificationHandlers.set(method, handler);
+	}
+	async handleRequest(method, params) {
+		const handler = this.requestHandlers.get(method);
+		if (handler === void 0) throw RequestError.methodNotFound(method);
+		return await handler(params);
+	}
+	async handleNotification(method, params) {
+		const handler = this.notificationHandlers.get(method);
+		if (handler === void 0) return;
+		await handler(params);
+	}
+};
+//#endregion
 //#region src/acp/model-alias.ts
 /**
 * Tokenize a string: split on non-alphanumeric, lowercase, strip "claude".
@@ -856,6 +953,17 @@ var SessionManager$1 = class {
 		if (!s) throw RequestError.invalidParams(`Unknown sessionId: ${sessionId}`);
 		return s;
 	}
+	size() {
+		return this.sessions.size;
+	}
+	values() {
+		return this.sessions.values();
+	}
+	/** First registered session, or undefined. Order = insertion order. */
+	first() {
+		const it = this.sessions.values().next();
+		return it.done === true ? void 0 : it.value;
+	}
 };
 var PiAcpSession = class {
 	sessionId;
@@ -2007,7 +2115,7 @@ var SshBackend = class {
 //#endregion
 //#region package.json
 var name = "@victor-software-house/pi-acp";
-var version = "0.13.1";
+var version = "0.14.0";
 //#endregion
 //#region src/acp/agent.ts
 /** Builtin ACP slash commands handled directly by the adapter. */
@@ -2097,11 +2205,14 @@ var PiAcpAgent = class {
 		terminalOutput: false,
 		terminalAuth: false,
 		gatewayAuth: false,
-		fsReadTextFile: false
+		fsReadTextFile: false,
+		terminal: false
 	};
 	daemonContext;
 	/** Unique ID for this ACP connection. Used as the ownership key in the daemon SessionRegistry. */
 	connectionId = randomUUID();
+	extMethods;
+	startedAt = Date.now();
 	dispose() {
 		if (this.daemonContext !== void 0) {
 			const registry = this.daemonContext.sessionRegistry;
@@ -2114,6 +2225,17 @@ var PiAcpAgent = class {
 	constructor(conn, daemonContext) {
 		this.conn = conn;
 		this.daemonContext = daemonContext;
+		this.extMethods = new ExtMethodDispatcher({
+			version,
+			startedAt: this.startedAt,
+			sessionCount: () => this.sessions.size()
+		});
+	}
+	async extMethod(method, params) {
+		return this.extMethods.handleRequest(method, params);
+	}
+	async extNotification(method, params) {
+		await this.extMethods.handleNotification(method, params);
 	}
 	registerWithDaemon(input) {
 		if (this.daemonContext === void 0) return;
@@ -2213,26 +2335,43 @@ var PiAcpAgent = class {
 		};
 	}
 	/**
-	* PRD-002 §FR-6 — `read` tool ACP-FS delegation overlay.
+	* PRD-002 §FR-6 + §FR-6.5 — tool overrides for ACP-FS read + ACP terminal bash.
 	*
-	* When the client advertises `fs.readTextFile`, we override pi's
-	* built-in `read` with a custom `read` tool that proxies to
-	* `connection.fs.readTextFile`. The allowlist MUST include "read" so
-	* pi's customTool registration loop (which filters by name) can
-	* register the override; the override then shadows the builtin via
-	* the tool-definition `Map.set` path inside AgentSession.
+	* For each tool we override, the allowlist MUST include the original
+	* tool name so pi's customTool registration loop (which filters by
+	* name) can register the override; the override then shadows the
+	* builtin via the tool-definition `Map.set` path inside AgentSession
+	* (verified against pi source — agent-session.js:1811).
 	*
-	* The sessionId ref is mutated by the caller right after
-	* `createAgentSession` returns, before any model turn — the tool
-	* isn't invoked until prompt-time, so the late binding is safe.
+	* SessionId binding is late: pi mints the id inside `createAgentSession`
+	* (after `customTools` is built), so we share a single mutable ref
+	* across all overrides. The caller mutates `sessionIdRef.current`
+	* right after createAgentSession returns, before any model turn — the
+	* tools aren't invoked until prompt-time, so the late binding is safe.
 	*
-	* Returns `null` when the client doesn't advertise the capability;
-	* callers then skip the overlay and pi's built-in `read` handles
-	* everything locally.
+	* Returns `null` when neither capability is advertised; callers skip
+	* the overlay and pi's built-in tools handle everything locally.
 	*/
-	buildAcpReadOverlay(cwd) {
-		if (!this.clientCapabilities.fsReadTextFile) return null;
+	buildAcpToolOverlay(cwd) {
+		const wantRead = this.clientCapabilities.fsReadTextFile;
+		const wantBash = this.clientCapabilities.terminal;
+		if (!wantRead && !wantBash) return null;
 		const sessionIdRef = { current: "" };
+		const customTools = [];
+		if (wantRead) {
+			const readToolDef = createReadToolDefinition(cwd, { operations: createAcpReadOperations({
+				conn: this.conn,
+				getSessionId: () => sessionIdRef.current
+			}) });
+			customTools.push(readToolDef);
+		}
+		if (wantBash) {
+			const bashToolDef = createBashToolDefinition(cwd, { operations: createAcpBashOperations({
+				conn: this.conn,
+				getSessionId: () => sessionIdRef.current
+			}) });
+			customTools.push(bashToolDef);
+		}
 		return {
 			sessionIdRef,
 			tools: [
@@ -2244,10 +2383,7 @@ var PiAcpAgent = class {
 				"find",
 				"ls"
 			],
-			customTools: [createReadToolDefinition(cwd, { operations: createAcpReadOperations({
-				conn: this.conn,
-				getSessionId: () => sessionIdRef.current
-			}) })]
+			customTools
 		};
 	}
 	async initialize(params) {
@@ -2298,15 +2434,15 @@ var PiAcpAgent = class {
 			sources: resourceLoader.listSources(),
 			manifestDiagnostics
 		}).text : "";
-		const acpReadOverlay = this.buildAcpReadOverlay(effectiveCwd);
+		const acpToolOverlay = this.buildAcpToolOverlay(effectiveCwd);
 		let result;
 		try {
 			result = await createAgentSession({
 				cwd: effectiveCwd,
 				resourceLoader,
-				...acpReadOverlay ? {
-					tools: acpReadOverlay.tools,
-					customTools: acpReadOverlay.customTools
+				...acpToolOverlay ? {
+					tools: acpToolOverlay.tools,
+					customTools: acpToolOverlay.customTools
 				} : {}
 			});
 		} catch (e) {
@@ -2317,7 +2453,7 @@ var PiAcpAgent = class {
 			throw RequestError.internalError({}, `Failed to create pi session: ${msg}`);
 		}
 		const piSession = result.session;
-		if (acpReadOverlay !== null) acpReadOverlay.sessionIdRef.current = piSession.sessionManager.getSessionId();
+		if (acpToolOverlay !== null) acpToolOverlay.sessionIdRef.current = piSession.sessionManager.getSessionId();
 		if (piSession.modelRegistry.getAvailable().length === 0) {
 			piSession.dispose();
 			modeResult.cleanup();
@@ -2580,7 +2716,7 @@ var PiAcpAgent = class {
 		this.sessions.close(params.sessionId);
 		const sessionFile = await this.resolveSessionFile(params.sessionId);
 		if (sessionFile === null) throw RequestError.invalidParams(`Unknown sessionId: ${params.sessionId}`);
-		const acpReadOverlay = this.buildAcpReadOverlay(params.cwd);
+		const acpToolOverlay = this.buildAcpToolOverlay(params.cwd);
 		let result;
 		try {
 			const sm = SessionManager.open(sessionFile);
@@ -2589,9 +2725,9 @@ var PiAcpAgent = class {
 				cwd: params.cwd,
 				sessionManager: sm,
 				resourceLoader,
-				...acpReadOverlay ? {
-					tools: acpReadOverlay.tools,
-					customTools: acpReadOverlay.customTools
+				...acpToolOverlay ? {
+					tools: acpToolOverlay.tools,
+					customTools: acpToolOverlay.customTools
 				} : {}
 			});
 		} catch (e) {
@@ -2601,7 +2737,7 @@ var PiAcpAgent = class {
 			throw RequestError.internalError({}, `Failed to load pi session: ${msg}`);
 		}
 		const piSession = result.session;
-		if (acpReadOverlay !== null) acpReadOverlay.sessionIdRef.current = piSession.sessionManager.getSessionId();
+		if (acpToolOverlay !== null) acpToolOverlay.sessionIdRef.current = piSession.sessionManager.getSessionId();
 		const session = new PiAcpSession({
 			sessionId: params.sessionId,
 			cwd: params.cwd,
@@ -2686,7 +2822,7 @@ var PiAcpAgent = class {
 		}
 		const sessionFile = await this.resolveSessionFile(params.sessionId);
 		if (sessionFile === null) throw RequestError.invalidParams(`Unknown sessionId: ${params.sessionId}`);
-		const acpReadOverlay = this.buildAcpReadOverlay(params.cwd);
+		const acpToolOverlay = this.buildAcpToolOverlay(params.cwd);
 		let result;
 		try {
 			const sm = SessionManager.open(sessionFile);
@@ -2695,9 +2831,9 @@ var PiAcpAgent = class {
 				cwd: params.cwd,
 				sessionManager: sm,
 				resourceLoader,
-				...acpReadOverlay ? {
-					tools: acpReadOverlay.tools,
-					customTools: acpReadOverlay.customTools
+				...acpToolOverlay ? {
+					tools: acpToolOverlay.tools,
+					customTools: acpToolOverlay.customTools
 				} : {}
 			});
 		} catch (e) {
@@ -2707,7 +2843,7 @@ var PiAcpAgent = class {
 			throw RequestError.internalError({}, `Failed to resume pi session: ${msg}`);
 		}
 		const piSession = result.session;
-		if (acpReadOverlay !== null) acpReadOverlay.sessionIdRef.current = piSession.sessionManager.getSessionId();
+		if (acpToolOverlay !== null) acpToolOverlay.sessionIdRef.current = piSession.sessionManager.getSessionId();
 		const session = new PiAcpSession({
 			sessionId: params.sessionId,
 			cwd: params.cwd,
@@ -2751,7 +2887,7 @@ var PiAcpAgent = class {
 		if (!isAbsolute(params.cwd)) throw RequestError.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
 		const sourceFile = await this.resolveSessionFile(params.sessionId);
 		if (sourceFile === null) throw RequestError.invalidParams(`Unknown sessionId: ${params.sessionId}`);
-		const acpReadOverlay = this.buildAcpReadOverlay(params.cwd);
+		const acpToolOverlay = this.buildAcpToolOverlay(params.cwd);
 		let result;
 		try {
 			const sm = SessionManager.forkFrom(sourceFile, params.cwd);
@@ -2760,9 +2896,9 @@ var PiAcpAgent = class {
 				cwd: params.cwd,
 				sessionManager: sm,
 				resourceLoader,
-				...acpReadOverlay ? {
-					tools: acpReadOverlay.tools,
-					customTools: acpReadOverlay.customTools
+				...acpToolOverlay ? {
+					tools: acpToolOverlay.tools,
+					customTools: acpToolOverlay.customTools
 				} : {}
 			});
 		} catch (e) {
@@ -2773,7 +2909,7 @@ var PiAcpAgent = class {
 		}
 		const piSession = result.session;
 		const newSessionId = piSession.sessionManager.getSessionId();
-		if (acpReadOverlay !== null) acpReadOverlay.sessionIdRef.current = newSessionId;
+		if (acpToolOverlay !== null) acpToolOverlay.sessionIdRef.current = newSessionId;
 		const newSessionFile = piSession.sessionManager.getSessionFile();
 		if (newSessionFile !== void 0) this.sessionPaths.set(newSessionId, newSessionFile);
 		const session = new PiAcpSession({
@@ -3392,4 +3528,4 @@ async function runDaemon() {
 //#endregion
 export { runDaemon };
 
-//# sourceMappingURL=daemon-BErbUhcE.mjs.map
+//# sourceMappingURL=daemon-CjPR14E_.mjs.map