@victor-software-house/pi-acp 0.2.0 → 0.4.0

package/dist/index.mjs

@@ -4,8 +4,7 @@ import { AgentSideConnection, RequestError, ndJsonStream } from "@agentclientpro
 import { spawnSync } from "node:child_process";
 import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { SessionManager, VERSION, createAgentSession } from "@mariozechner/pi-coding-agent";
+import { SessionManager, createAgentSession } from "@mariozechner/pi-coding-agent";
 import * as z from "zod";
 //#region src/acp/auth.ts
 const AUTH_METHOD_ID = "pi_terminal_login";
@@ -64,6 +63,135 @@ function detectAuthError(err) {
 	return RequestError.authRequired({ authMethods: buildAuthMethods() }, "Configure an API key or log in with an OAuth provider.");
 }
 //#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
+	};
+	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;
+		}
+	}
+	return {
+		terminalOutput,
+		terminalAuth,
+		gatewayAuth
+	};
+}
+//#endregion
+//#region src/acp/model-alias.ts
+/**
+* Tokenize a string: split on non-alphanumeric, lowercase, strip "claude".
+*/
+function tokenize(input) {
+	return input.toLowerCase().split(/[^a-z0-9]+/).filter((t) => t !== "" && t !== "claude");
+}
+/**
+* Extract a context hint in square brackets, e.g. "opus[1m]" -> { base: "opus", hint: "1m" }.
+*/
+function extractContextHint(input) {
+	const match = /^(.+?)\[([^\]]+)\]$/.exec(input);
+	if (match !== null && match[1] !== void 0 && match[2] !== void 0) return {
+		base: match[1],
+		hint: match[2]
+	};
+	return {
+		base: input,
+		hint: null
+	};
+}
+/** Check if a string is purely numeric. */
+function isNumeric(s) {
+	return /^\d+$/.test(s);
+}
+/**
+* Score how well a model matches the given preference tokens.
+*
+* Returns a score >= 0 (higher is better), or -1 for no match.
+* Requires at least one non-numeric token to match to avoid false positives
+* from bare version numbers (e.g. "4" matching model version suffixes).
+*/
+function scoreModel(model, prefTokens, hint) {
+	const modelStr = `${model.provider}/${model.id}/${model.name ?? ""}`.toLowerCase();
+	const modelTokens = tokenize(modelStr);
+	let matched = 0;
+	let hasNonNumericMatch = false;
+	for (const pt of prefTokens) if (modelTokens.some((mt) => mt.includes(pt) || pt.includes(mt))) {
+		matched++;
+		if (!isNumeric(pt)) hasNonNumericMatch = true;
+	}
+	if (matched === 0) return -1;
+	if (!hasNonNumericMatch) return -1;
+	let score = matched / prefTokens.length;
+	if (hint !== null && modelStr.includes(hint.toLowerCase())) score += .5;
+	const pref = prefTokens.join("");
+	if (model.id.toLowerCase().includes(pref)) score += .25;
+	return score;
+}
+/**
+* Resolve a user-friendly model preference to a concrete model.
+*
+* Matching strategy (in order):
+* 1. Exact match on "provider/id"
+* 2. Exact match on "id" alone
+* 3. Tokenized scored match with optional context hint
+*
+* Returns null if no model matches.
+*/
+function resolveModelPreference(models, preference) {
+	const trimmed = preference.trim();
+	if (trimmed === "") return null;
+	if (trimmed.includes("/")) {
+		const [p, ...rest] = trimmed.split("/");
+		const provider = p ?? "";
+		const id = rest.join("/");
+		const exact = models.find((m) => m.provider.toLowerCase() === provider.toLowerCase() && m.id.toLowerCase() === id.toLowerCase());
+		if (exact !== void 0) return {
+			provider: exact.provider,
+			id: exact.id
+		};
+	}
+	const byId = models.find((m) => m.id.toLowerCase() === trimmed.toLowerCase());
+	if (byId !== void 0) return {
+		provider: byId.provider,
+		id: byId.id
+	};
+	const { base, hint } = extractContextHint(trimmed);
+	const prefTokens = tokenize(base);
+	if (prefTokens.length === 0) return null;
+	let bestModel = null;
+	let bestScore = -1;
+	for (const model of models) {
+		const s = scoreModel(model, prefTokens, hint);
+		if (s > bestScore) {
+			bestScore = s;
+			bestModel = model;
+		}
+	}
+	if (bestModel === null || bestScore < .5) return null;
+	return {
+		provider: bestModel.provider,
+		id: bestModel.id
+	};
+}
+//#endregion
 //#region src/acp/pi-settings.ts
 /**
 * Read pi settings from global and project config files.
@@ -116,69 +244,78 @@ function skillCommandsEnabled(cwd) {
 	if (typeof settings.skills?.enableSkillCommands === "boolean") return settings.skills.enableSkillCommands;
 	return true;
 }
-function quietStartupEnabled(cwd) {
-	const settings = resolvedSettings(cwd);
-	if (typeof settings.quietStartup === "boolean") return settings.quietStartup;
-	if (typeof settings.quietStart === "boolean") return settings.quietStart;
-	return false;
-}
 //#endregion
-//#region src/acp/translate/pi-tools.ts
-/**
-* Extract displayable text from a pi tool result.
-*
-* Pi tool results have varying shapes depending on the tool. This function
-* tries content blocks first, then falls back to details fields (diff, stdout/stderr),
-* and finally JSON serialization as a last resort.
-*/
+//#region src/acp/translate/tool-content.ts
 const textBlockSchema = z.object({
 	type: z.literal("text"),
 	text: z.string()
 });
-const toolDetailsSchema = z.object({
-	diff: z.string().optional(),
+const imageBlockSchema = z.object({ type: z.literal("image") });
+const contentBlockSchema = z.union([textBlockSchema, imageBlockSchema]);
+const bashDetailsSchema = z.object({
 	stdout: z.string().optional(),
 	stderr: z.string().optional(),
 	output: z.string().optional(),
 	exitCode: z.number().optional(),
 	code: z.number().optional()
 });
-const toolResultSchema = z.object({
+const bashResultSchema = z.object({
 	content: z.array(z.unknown()).optional(),
-	details: toolDetailsSchema.optional(),
+	details: bashDetailsSchema.optional(),
 	stdout: z.string().optional(),
 	stderr: z.string().optional(),
 	output: z.string().optional(),
 	exitCode: z.number().optional(),
 	code: z.number().optional()
 });
-function toolResultToText(result) {
-	if (result === null || result === void 0 || typeof result !== "object") return "";
-	const parsed = toolResultSchema.safeParse(result);
-	if (!parsed.success) try {
-		return JSON.stringify(result, null, 2);
-	} catch {
-		return String(result);
-	}
+/**
+* Extract stdout/stderr and exit code from a pi bash/tmux result.
+*/
+function extractBashOutput(result) {
+	if (result === null || result === void 0 || typeof result !== "object") return {
+		output: "",
+		exitCode: void 0
+	};
+	const parsed = bashResultSchema.safeParse(result);
+	if (!parsed.success) return {
+		output: "",
+		exitCode: void 0
+	};
 	const r = parsed.data;
+	const d = r.details;
 	if (r.content !== void 0) {
 		const texts = r.content.map((block) => textBlockSchema.safeParse(block)).filter((res) => res.success).map((res) => res.data.text);
-		if (texts.length > 0) return texts.join("");
+		if (texts.length > 0) {
+			const exitCode = d?.exitCode ?? r.exitCode ?? d?.code ?? r.code;
+			return {
+				output: texts.join(""),
+				exitCode
+			};
+		}
 	}
-	const d = r.details;
-	const diff = d?.diff;
-	if (diff !== void 0 && diff.trim() !== "") return diff;
 	const stdout = d?.stdout ?? r.stdout ?? d?.output ?? r.output;
 	const stderr = d?.stderr ?? r.stderr;
 	const exitCode = d?.exitCode ?? r.exitCode ?? d?.code ?? r.code;
-	const hasStdout = stdout !== void 0 && stdout.trim() !== "";
-	const hasStderr = stderr !== void 0 && stderr.trim() !== "";
-	if (hasStdout || hasStderr) {
-		const parts = [];
-		if (hasStdout) parts.push(stdout);
-		if (hasStderr) parts.push(`stderr:\n${stderr}`);
-		if (exitCode !== void 0) parts.push(`exit code: ${exitCode}`);
-		return parts.join("\n\n").trimEnd();
+	const parts = [];
+	if (stdout !== void 0 && stdout.trim() !== "") parts.push(stdout);
+	if (stderr !== void 0 && stderr.trim() !== "") parts.push(stderr);
+	return {
+		output: parts.join("\n"),
+		exitCode
+	};
+}
+/**
+* Extract text content from a pi tool result (generic).
+*/
+function extractTextContent(result) {
+	if (result === null || result === void 0 || typeof result !== "object") return "";
+	if ("content" in result && Array.isArray(result.content)) {
+		const texts = [];
+		for (const block of result.content) {
+			const parsed = textBlockSchema.safeParse(block);
+			if (parsed.success) texts.push(parsed.data.text);
+		}
+		if (texts.length > 0) return texts.join("");
 	}
 	try {
 		return JSON.stringify(result, null, 2);
@@ -186,6 +323,164 @@ function toolResultToText(result) {
 		return String(result);
 	}
 }
+/**
+* Extract content blocks from a pi result, preserving type information.
+* Used for read results where images need to be preserved.
+*/
+function extractContentBlocks(result) {
+	if (result === null || result === void 0 || typeof result !== "object") return [];
+	if (!("content" in result) || !Array.isArray(result.content)) return [];
+	const blocks = [];
+	for (const raw of result.content) {
+		const parsed = contentBlockSchema.safeParse(raw);
+		if (parsed.success) blocks.push(parsed.data);
+	}
+	return blocks;
+}
+/**
+* Find the longest consecutive backtick sequence in a string.
+*/
+function longestBacktickRun(text) {
+	let max = 0;
+	let current = 0;
+	for (const ch of text) if (ch === "`") {
+		current++;
+		if (current > max) max = current;
+	} else current = 0;
+	return max;
+}
+/**
+* Wrap text in a dynamically-sized backtick fence to prevent markdown rendering.
+*
+* Instead of character-level escaping (which fails on files containing backtick
+* sequences, indented code blocks, blockquotes, and list markers), this wraps
+* the entire text in a backtick fence whose length exceeds any backtick sequence
+* in the content. This approach is simpler and strictly more correct (following
+* the claude-agent-acp pattern).
+*/
+function markdownEscape(text) {
+	if (text === "") return "";
+	const fenceLen = Math.max(3, longestBacktickRun(text) + 1);
+	const fence = "`".repeat(fenceLen);
+	return `${fence}\n${text.endsWith("\n") ? text.slice(0, -1) : text}\n${fence}`;
+}
+/**
+* Format tool output into `ToolCallContent[]` by tool name.
+*
+* Returns the appropriate content shape for each tool type:
+* - bash/tmux: console code fences
+* - read: markdown-escaped text (images preserved)
+* - edit/write: empty (diff handled separately)
+* - lsp: code fences
+* - errors: code fences with failed status
+* - everything else: plain text
+*/
+function formatToolContent(toolName, result, isError) {
+	if (isError) {
+		const text = extractTextContent(result);
+		if (text === "") return [];
+		return [{
+			type: "content",
+			content: {
+				type: "text",
+				text: `\`\`\`\n${text}\n\`\`\``
+			}
+		}];
+	}
+	switch (toolName) {
+		case "bash":
+		case "tmux": return formatBashContent(result);
+		case "read": return formatReadContent(result);
+		case "edit":
+		case "write": return [];
+		case "lsp": return formatLspContent(result);
+		default: return formatFallbackContent(result);
+	}
+}
+function formatBashContent(result) {
+	const { output, exitCode } = extractBashOutput(result);
+	if (output === "" && exitCode === void 0) return [];
+	const parts = [];
+	if (output !== "") parts.push(`\`\`\`console\n${output}\n\`\`\``);
+	if (exitCode !== void 0 && exitCode !== 0) parts.push(`exit code: ${exitCode}`);
+	const text = parts.join("\n\n");
+	if (text === "") return [];
+	return [{
+		type: "content",
+		content: {
+			type: "text",
+			text
+		}
+	}];
+}
+function formatReadContent(result) {
+	const blocks = extractContentBlocks(result);
+	if (blocks.length === 0) {
+		if (typeof result === "object" && result !== null && "content" in result && Array.isArray(result.content) && result.content.length === 0) return [];
+		const text = extractTextContent(result);
+		if (text === "") return [];
+		return [{
+			type: "content",
+			content: {
+				type: "text",
+				text: markdownEscape(text)
+			}
+		}];
+	}
+	const content = [];
+	for (const block of blocks) if (block.type === "text") content.push({
+		type: "content",
+		content: {
+			type: "text",
+			text: markdownEscape(block.text)
+		}
+	});
+	return content;
+}
+function formatLspContent(result) {
+	const text = extractTextContent(result);
+	if (text === "") return [];
+	return [{
+		type: "content",
+		content: {
+			type: "text",
+			text: `\`\`\`\n${text}\n\`\`\``
+		}
+	}];
+}
+function formatFallbackContent(result) {
+	const text = extractTextContent(result);
+	if (text === "") return [];
+	return [{
+		type: "content",
+		content: {
+			type: "text",
+			text
+		}
+	}];
+}
+/**
+* Wrap streaming output text in a console code fence for bash/tmux.
+*
+* Each streaming update is self-contained (full accumulated buffer),
+* following the codex-acp pattern.
+*/
+function wrapStreamingBashOutput(text) {
+	if (text === "") return "";
+	return `\`\`\`console\n${text}\n\`\`\``;
+}
+//#endregion
+//#region src/acp/unreachable.ts
+/**
+* Exhaustive switch/case helper.
+*
+* Logs unknown values instead of silently ignoring them, aiding debugging
+* when the pi SDK adds new event types.
+*/
+function unreachable(value, context) {
+	const label = context !== void 0 ? `[${context}] ` : "";
+	console.warn(`${label}Unhandled value: ${String(value)}`);
+}
 //#endregion
 //#region src/acp/session.ts
 function findUniqueLineNumber(text, needle) {
@@ -210,7 +505,9 @@ function toToolKind(toolName) {
 		case "read": return "read";
 		case "write":
 		case "edit": return "edit";
-		case "bash": return "execute";
+		case "bash":
+		case "tmux": return "execute";
+		case "lsp": return "search";
 		default: return "other";
 	}
 }
@@ -220,6 +517,10 @@ function truncateTitle(text) {
 	if (oneLine.length <= MAX_TITLE_LEN) return oneLine;
 	return `${oneLine.slice(0, MAX_TITLE_LEN - 1)}…`;
 }
+function capitalize(s) {
+	if (s.length === 0) return s;
+	return s.charAt(0).toUpperCase() + s.slice(1);
+}
 /**
 * Build a descriptive tool title from tool name and args.
 *
@@ -235,6 +536,36 @@ function buildToolTitle(toolName, args) {
 			const command = typeof args["command"] === "string" ? args["command"] : typeof args["cmd"] === "string" ? args["cmd"] : void 0;
 			return command !== void 0 ? truncateTitle(`Run ${command}`) : "bash";
 		}
+		case "lsp": {
+			const action = typeof args["action"] === "string" ? args["action"] : void 0;
+			const file = typeof args["file"] === "string" ? args["file"] : void 0;
+			const query = typeof args["query"] === "string" ? args["query"] : void 0;
+			const line = typeof args["line"] === "number" ? args["line"] : void 0;
+			if (action !== void 0) {
+				const target = file !== void 0 ? line !== void 0 ? `${file}:${line}` : file : query;
+				return target !== void 0 ? truncateTitle(`${capitalize(action)} ${target}`) : capitalize(action);
+			}
+			return "LSP";
+		}
+		case "tmux": {
+			const action = typeof args["action"] === "string" ? args["action"] : void 0;
+			const command = typeof args["command"] === "string" ? args["command"] : void 0;
+			const name = typeof args["name"] === "string" ? args["name"] : void 0;
+			if (action === "run" && command !== void 0) return truncateTitle(`Tmux: ${command}`);
+			if (action !== void 0 && name !== void 0) return truncateTitle(`Tmux ${action} ${name}`);
+			if (action !== void 0) return `Tmux ${action}`;
+			return "Tmux";
+		}
+		case "context_tag": {
+			const name = typeof args["name"] === "string" ? args["name"] : void 0;
+			return name !== void 0 ? `Tag ${name}` : "Tag";
+		}
+		case "context_log": return "Context log";
+		case "context_checkout": {
+			const target = typeof args["target"] === "string" ? args["target"] : void 0;
+			return target !== void 0 ? truncateTitle(`Checkout ${target}`) : "Checkout";
+		}
+		case "claudemon": return "Check quota";
 		default: return toolName;
 	}
 }
@@ -269,6 +600,19 @@ function toToolArgs(raw) {
 	const result = toolArgsSchema.safeParse(raw);
 	return result.success ? result.data : {};
 }
+/** Build the `_meta.piAcp` tool name metadata. */
+function buildToolMeta(toolName, extra) {
+	const base = { piAcp: { toolName } };
+	if (extra !== void 0) return {
+		...base,
+		...extra
+	};
+	return base;
+}
+/** Tools that produce terminal-style output. */
+function isTerminalTool(toolName) {
+	return toolName === "bash" || toolName === "tmux";
+}
 var SessionManager$1 = class {
 	sessions = /* @__PURE__ */ new Map();
 	disposeAll() {
@@ -302,12 +646,16 @@ var PiAcpSession = class {
 	cwd;
 	mcpServers;
 	piSession;
-	startupInfo = null;
-	startupInfoSent = false;
+	supportsTerminalOutput;
 	conn;
 	cancelRequested = false;
+	promptRunning = false;
 	pendingTurn = null;
+	/** Queued prompts waiting for the active turn to complete. */
+	pendingMessages = [];
 	currentToolCalls = /* @__PURE__ */ new Map();
+	/** Map of toolCallId -> toolName for streaming updates (Phase 5). */
+	toolCallNames = /* @__PURE__ */ new Map();
 	editSnapshots = /* @__PURE__ */ new Map();
 	lastAssistantStopReason = null;
 	lastEmit = Promise.resolve();
@@ -318,27 +666,32 @@ var PiAcpSession = class {
 		this.mcpServers = opts.mcpServers;
 		this.piSession = opts.piSession;
 		this.conn = opts.conn;
+		this.supportsTerminalOutput = opts.supportsTerminalOutput ?? false;
 		this.unsubscribe = this.piSession.subscribe((ev) => this.handlePiEvent(ev));
 	}
 	dispose() {
 		this.unsubscribe?.();
 		this.piSession.dispose();
 	}
-	setStartupInfo(text) {
-		this.startupInfo = text;
-	}
-	sendStartupInfoIfPending() {
-		if (this.startupInfoSent || this.startupInfo === null) return;
-		this.startupInfoSent = true;
-		this.emit({
-			sessionUpdate: "agent_message_chunk",
-			content: {
-				type: "text",
-				text: this.startupInfo
-			}
+	async prompt(message, images = []) {
+		if (this.promptRunning) return new Promise((resolve, reject) => {
+			this.pendingMessages.push({
+				message,
+				images,
+				resolve,
+				reject
+			});
 		});
+		return this.executePrompt(message, images);
 	}
-	async prompt(message, images = []) {
+	async cancel() {
+		this.cancelRequested = true;
+		for (const pending of this.pendingMessages) pending.resolve("cancelled");
+		this.pendingMessages = [];
+		await this.piSession.abort();
+	}
+	executePrompt(message, images) {
+		this.promptRunning = true;
 		const turnPromise = new Promise((resolve, reject) => {
 			this.cancelRequested = false;
 			this.pendingTurn = {
@@ -356,9 +709,17 @@ var PiAcpSession = class {
 		});
 		return turnPromise;
 	}
-	async cancel() {
-		this.cancelRequested = true;
-		await this.piSession.abort();
+	/**
+	* Dequeue and execute the next pending prompt, if any.
+	* Called after a turn completes.
+	*/
+	dequeueNextPrompt() {
+		const next = this.pendingMessages.shift();
+		if (next === void 0) {
+			this.promptRunning = false;
+			return;
+		}
+		this.executePrompt(next.message, next.images).then(next.resolve, next.reject);
 	}
 	wasCancelRequested() {
 		return this.cancelRequested;
@@ -385,15 +746,17 @@ var PiAcpSession = class {
 				this.handleToolStart(ev.toolCallId, ev.toolName, toToolArgs(ev.args));
 				break;
 			case "tool_execution_update":
-				this.handleToolUpdate(ev.toolCallId, ev.partialResult);
+				this.handleToolUpdate(ev.toolCallId, ev.toolName, ev.partialResult);
 				break;
 			case "tool_execution_end":
-				this.handleToolEnd(ev.toolCallId, ev.result, ev.isError);
+				this.handleToolEnd(ev.toolCallId, ev.toolName, ev.result, ev.isError);
 				break;
 			case "agent_end":
 				this.handleAgentEnd();
 				break;
-			default: break;
+			default:
+				unreachable(ev, "handlePiEvent");
+				break;
 		}
 	}
 	handleMessageUpdate(ame) {
@@ -433,14 +796,16 @@ var PiAcpSession = class {
 					kind: toToolKind(toolCall.name),
 					status,
 					...locations ? { locations } : {},
-					rawInput
+					rawInput,
+					_meta: buildToolMeta(toolCall.name)
 				});
 			} else this.emit({
 				sessionUpdate: "tool_call_update",
 				toolCallId: toolCall.id,
 				status,
 				...locations ? { locations } : {},
-				rawInput
+				rawInput,
+				_meta: buildToolMeta(toolCall.name)
 			});
 		}
 	}
@@ -448,6 +813,7 @@ var PiAcpSession = class {
 		if ("role" in msg && msg.role === "assistant") this.lastAssistantStopReason = msg.stopReason;
 	}
 	handleToolStart(toolCallId, toolName, args) {
+		this.toolCallNames.set(toolCallId, toolName);
 		let line;
 		if ((toolName === "edit" || toolName === "write") && args.path !== void 0) try {
 			const abs = isAbsolute(args.path) ? args.path : resolve(this.cwd, args.path);
@@ -462,6 +828,14 @@ var PiAcpSession = class {
 			if (toolName === "edit") line = findUniqueLineNumber(oldText, args.oldText ?? "");
 		} catch {}
 		const locations = resolveToolPath(args, this.cwd, line);
+		const meta = buildToolMeta(toolName, this.supportsTerminalOutput && isTerminalTool(toolName) ? { terminal_info: {
+			terminal_id: toolCallId,
+			cwd: this.cwd
+		} } : void 0);
+		const terminalContent = this.supportsTerminalOutput && isTerminalTool(toolName) ? [{
+			type: "terminal",
+			terminalId: toolCallId
+		}] : void 0;
 		if (!this.currentToolCalls.has(toolCallId)) {
 			this.currentToolCalls.set(toolCallId, "in_progress");
 			this.emit({
@@ -471,7 +845,9 @@ var PiAcpSession = class {
 				kind: toToolKind(toolName),
 				status: "in_progress",
 				...locations ? { locations } : {},
-				rawInput: args
+				...terminalContent !== void 0 ? { content: terminalContent } : {},
+				rawInput: args,
+				_meta: meta
 			});
 		} else {
 			this.currentToolCalls.set(toolCallId, "in_progress");
@@ -481,61 +857,118 @@ var PiAcpSession = class {
 				title: buildToolTitle(toolName, args),
 				status: "in_progress",
 				...locations ? { locations } : {},
-				rawInput: args
+				...terminalContent !== void 0 ? { content: terminalContent } : {},
+				rawInput: args,
+				_meta: meta
 			});
 		}
 	}
-	handleToolUpdate(toolCallId, partialResult) {
-		const text = toolResultToText(partialResult);
-		this.emit({
-			sessionUpdate: "tool_call_update",
-			toolCallId,
-			status: "in_progress",
-			content: text ? [{
-				type: "content",
-				content: {
-					type: "text",
-					text
-				}
-			}] : null,
-			rawOutput: partialResult
-		});
+	handleToolUpdate(toolCallId, toolName, partialResult) {
+		const name = this.toolCallNames.get(toolCallId) ?? toolName;
+		if (this.supportsTerminalOutput && isTerminalTool(name)) {
+			const text = extractStreamingText(partialResult);
+			this.emit({
+				sessionUpdate: "tool_call_update",
+				toolCallId,
+				status: "in_progress",
+				_meta: buildToolMeta(name, { terminal_output: {
+					terminal_id: toolCallId,
+					data: text
+				} }),
+				rawOutput: partialResult
+			});
+		} else if (isTerminalTool(name)) {
+			const wrapped = wrapStreamingBashOutput(extractStreamingText(partialResult));
+			this.emit({
+				sessionUpdate: "tool_call_update",
+				toolCallId,
+				status: "in_progress",
+				content: wrapped ? [{
+					type: "content",
+					content: {
+						type: "text",
+						text: wrapped
+					}
+				}] : null,
+				_meta: buildToolMeta(name),
+				rawOutput: partialResult
+			});
+		} else {
+			const text = extractStreamingText(partialResult);
+			this.emit({
+				sessionUpdate: "tool_call_update",
+				toolCallId,
+				status: "in_progress",
+				content: text ? [{
+					type: "content",
+					content: {
+						type: "text",
+						text
+					}
+				}] : null,
+				_meta: buildToolMeta(name),
+				rawOutput: partialResult
+			});
+		}
 	}
-	handleToolEnd(toolCallId, result, isError) {
-		const text = toolResultToText(result);
+	handleToolEnd(toolCallId, toolName, result, isError) {
 		const snapshot = this.editSnapshots.get(toolCallId);
 		let content = null;
 		if (!isError && snapshot) try {
 			const newText = readFileSync(snapshot.path, "utf8");
-			if (newText !== snapshot.oldText) content = [{
-				type: "diff",
-				path: snapshot.path,
-				oldText: snapshot.oldText,
-				newText
-			}, ...text ? [{
+			if (newText !== snapshot.oldText) {
+				const formatted = formatToolContent(toolName, result, isError);
+				content = [{
+					type: "diff",
+					path: snapshot.path,
+					oldText: snapshot.oldText,
+					newText
+				}, ...formatted];
+			}
+		} catch {}
+		if (content === null) {
+			const formatted = formatToolContent(toolName, result, isError);
+			content = formatted.length > 0 ? formatted : null;
+		}
+		if (content === null && !isError && toolName !== "edit" && toolName !== "write") {
+			const text = extractStreamingText(result);
+			if (text) content = [{
 				type: "content",
 				content: {
 					type: "text",
 					text
 				}
-			}] : []];
-		} catch {}
-		if (!content && text) content = [{
-			type: "content",
-			content: {
-				type: "text",
-				text
-			}
-		}];
+			}];
+		}
+		if (this.supportsTerminalOutput && isTerminalTool(toolName)) {
+			const outputText = extractStreamingText(result);
+			if (outputText !== "") this.emit({
+				sessionUpdate: "tool_call_update",
+				toolCallId,
+				status: "in_progress",
+				_meta: buildToolMeta(toolName, { terminal_output: {
+					terminal_id: toolCallId,
+					data: outputText
+				} }),
+				rawOutput: result
+			});
+		}
+		const meta = buildToolMeta(toolName, this.supportsTerminalOutput && isTerminalTool(toolName) ? { terminal_exit: {
+			terminal_id: toolCallId,
+			exit_code: extractExitCode(result),
+			signal: null
+		} } : void 0);
 		this.emit({
 			sessionUpdate: "tool_call_update",
 			toolCallId,
 			status: isError ? "failed" : "completed",
 			content,
+			_meta: meta,
 			rawOutput: result
 		});
 		this.currentToolCalls.delete(toolCallId);
 		this.editSnapshots.delete(toolCallId);
+		this.toolCallNames.delete(toolCallId);
 	}
 	handleAgentEnd() {
 		this.emitUsageUpdate();
@@ -544,6 +977,7 @@ var PiAcpSession = class {
 			this.lastAssistantStopReason = null;
 			this.pendingTurn?.resolve(reason);
 			this.pendingTurn = null;
+			this.dequeueNextPrompt();
 		});
 	}
 	/**
@@ -583,6 +1017,42 @@ var PiAcpSession = class {
 		return this.piSession.getSessionStats().cost;
 	}
 };
+function isTextBlock$1(v) {
+	return typeof v === "object" && v !== null && "type" in v && v.type === "text" && "text" in v && typeof v.text === "string";
+}
+function extractStreamingText(result) {
+	if (result === null || result === void 0) return "";
+	if (typeof result === "string") return result;
+	if (typeof result !== "object") return String(result);
+	if ("content" in result && Array.isArray(result.content)) {
+		const texts = [];
+		for (const raw of result.content) if (isTextBlock$1(raw)) texts.push(raw.text);
+		if (texts.length > 0) return texts.join("");
+	}
+	if ("details" in result) {
+		const details = result.details;
+		if (typeof details === "object" && details !== null) {
+			if ("stdout" in details && typeof details.stdout === "string" && details.stdout.trim() !== "") return details.stdout;
+			if ("output" in details && typeof details.output === "string" && details.output.trim() !== "") return details.output;
+		}
+	}
+	if ("output" in result && typeof result.output === "string" && result.output.trim() !== "") return result.output;
+	if ("stdout" in result && typeof result.stdout === "string" && result.stdout.trim() !== "") return result.stdout;
+	return "";
+}
+function extractExitCode(result) {
+	if (result === null || result === void 0 || typeof result !== "object") return null;
+	if ("details" in result) {
+		const details = result.details;
+		if (typeof details === "object" && details !== null) {
+			if ("exitCode" in details && typeof details.exitCode === "number") return details.exitCode;
+			if ("code" in details && typeof details.code === "number") return details.code;
+		}
+	}
+	if ("exitCode" in result && typeof result.exitCode === "number") return result.exitCode;
+	if ("code" in result && typeof result.code === "number") return result.code;
+	return null;
+}
 /**
 * Type guard to narrow AgentSessionEvent to the AgentEvent subset
 * (the variants we handle). Session-specific events like auto_compaction
@@ -715,52 +1185,58 @@ function hasPiAuthConfigured() {
 	return hasAuthJson() || hasCustomProviderKey() || hasProviderEnvVar();
 }
 //#endregion
+//#region package.json
+var name = "@victor-software-house/pi-acp";
+var version = "0.4.0";
+//#endregion
 //#region src/acp/agent.ts
-function builtinAvailableCommands() {
-	return [
-		{
-			name: "compact",
-			description: "Manually compact the session context",
-			input: { hint: "optional custom instructions" }
-		},
-		{
-			name: "autocompact",
-			description: "Toggle automatic context compaction",
-			input: { hint: "on|off|toggle" }
-		},
-		{
-			name: "export",
-			description: "Export session to an HTML file in the session cwd"
-		},
-		{
-			name: "session",
-			description: "Show session stats (messages, tokens, cost, session file)"
-		},
-		{
-			name: "name",
-			description: "Set session display name",
-			input: { hint: "<name>" }
-		},
-		{
-			name: "steering",
-			description: "Get/set pi steering message delivery mode",
-			input: { hint: "(no args to show) all | one-at-a-time" }
-		},
-		{
-			name: "follow-up",
-			description: "Get/set pi follow-up message delivery mode",
-			input: { hint: "(no args to show) all | one-at-a-time" }
-		},
-		{
-			name: "changelog",
-			description: "Show pi changelog"
-		}
-	];
-}
-function mergeCommands(a, b) {
-	const out = [];
+/** Builtin ACP slash commands handled directly by the adapter. */
+const BUILTIN_COMMANDS = [
+	{
+		name: "compact",
+		description: "Manually compact the session context",
+		input: { hint: "optional custom instructions" }
+	},
+	{
+		name: "autocompact",
+		description: "Toggle automatic context compaction",
+		input: { hint: "on|off|toggle" }
+	},
+	{
+		name: "export",
+		description: "Export session to an HTML file in the session cwd"
+	},
+	{
+		name: "session",
+		description: "Show session stats (messages, tokens, cost, session file)"
+	},
+	{
+		name: "name",
+		description: "Set session display name",
+		input: { hint: "<name>" }
+	},
+	{
+		name: "steering",
+		description: "Get/set pi steering message delivery mode",
+		input: { hint: "(no args to show) all | one-at-a-time" }
+	},
+	{
+		name: "follow-up",
+		description: "Get/set pi follow-up message delivery mode",
+		input: { hint: "(no args to show) all | one-at-a-time" }
+	},
+	{
+		name: "changelog",
+		description: "Show pi changelog"
+	}
+];
+/**
+* Deduplicate commands by name. First occurrence wins.
+*/
+function deduplicateCommands(commands) {
 	const seen = /* @__PURE__ */ new Set();
-	for (const c of [...a, ...b]) {
+	const out = [];
+	for (const c of commands) {
 		if (seen.has(c.name)) continue;
 		seen.add(c.name);
 		out.push(c);
@@ -791,12 +1267,17 @@ function truncateSessionTitle(text) {
 	if (oneLine.length <= SESSION_TITLE_MAX) return oneLine;
 	return `${oneLine.slice(0, SESSION_TITLE_MAX - 1)}…`;
 }
-const pkg = readNearestPackageJson(import.meta.url);
 var PiAcpAgent = class {
 	conn;
 	sessions = new SessionManager$1();
 	/** Cache of sessionId → file path, populated by listSessions and newSession. */
 	sessionPaths = /* @__PURE__ */ new Map();
+	/** Parsed client capability flags from initialize(). */
+	clientCapabilities = {
+		terminalOutput: false,
+		terminalAuth: false,
+		gatewayAuth: false
+	};
 	dispose() {
 		this.sessions.disposeAll();
 	}
@@ -806,14 +1287,15 @@ var PiAcpAgent = class {
 	async initialize(params) {
 		const supportedVersion = 1;
 		const requested = params.protocolVersion;
+		this.clientCapabilities = parseClientCapabilities(params.clientCapabilities);
 		return {
 			protocolVersion: requested === supportedVersion ? requested : supportedVersion,
 			agentInfo: {
-				name: pkg.name,
+				name,
 				title: "pi ACP adapter",
-				version: pkg.version
+				version
 			},
-			authMethods: buildAuthMethods({ supportsTerminalAuthMeta: params.clientCapabilities?._meta?.["terminal-auth"] === true }),
+			authMethods: buildAuthMethods({ supportsTerminalAuthMeta: this.clientCapabilities.terminalAuth }),
 			agentCapabilities: {
 				loadSession: true,
 				mcpCapabilities: {
@@ -859,27 +1341,13 @@ var PiAcpAgent = class {
 			cwd: params.cwd,
 			mcpServers: params.mcpServers,
 			piSession,
-			conn: this.conn
+			conn: this.conn,
+			supportsTerminalOutput: this.clientCapabilities.terminalOutput
 		});
 		this.sessions.register(session);
-		const quietStartup = quietStartupEnabled(params.cwd);
-		const updateNotice = buildUpdateNotice();
-		const preludeText = quietStartup ? updateNotice !== null ? `${updateNotice}\n` : "" : buildStartupInfo({
-			cwd: params.cwd,
-			updateNotice
-		});
-		if (preludeText) session.setStartupInfo(preludeText);
 		const modes = buildThinkingModes(piSession);
 		const models = buildModelState(piSession);
 		const configOptions = buildConfigOptions(modes, models);
-		const response = {
-			sessionId: session.sessionId,
-			configOptions,
-			modes,
-			models,
-			_meta: { piAcp: { startupInfo: preludeText || null } }
-		};
-		if (preludeText) setTimeout(() => session.sendStartupInfoIfPending(), 0);
 		const enableSkillCommands = skillCommandsEnabled(params.cwd);
 		setTimeout(() => {
 			(async () => {
@@ -889,13 +1357,18 @@ var PiAcpAgent = class {
 						sessionId: session.sessionId,
 						update: {
 							sessionUpdate: "available_commands_update",
-							availableCommands: mergeCommands(commands, builtinAvailableCommands())
+							availableCommands: deduplicateCommands([...commands, ...BUILTIN_COMMANDS])
 						}
 					});
 				} catch {}
 			})();
 		}, 0);
-		return response;
+		return {
+			sessionId: session.sessionId,
+			configOptions,
+			modes,
+			models
+		};
 	}
 	async authenticate(_params) {
 		return {};
@@ -1009,7 +1482,8 @@ var PiAcpAgent = class {
 							kind: toToolKind(block.name),
 							status: "completed",
 							rawInput: args,
-							...locations ? { locations } : {}
+							...locations ? { locations } : {},
+							_meta: { piAcp: { toolName: block.name } }
 						}
 					});
 				}
@@ -1032,25 +1506,21 @@ var PiAcpAgent = class {
 						kind: toToolKind(toolName),
 						status: "completed",
 						rawInput: null,
-						rawOutput: m
+						rawOutput: m,
+						_meta: { piAcp: { toolName } }
 					}
 				});
-				const text = toolResultToText(m);
+				const content = formatToolContent(toolName, m, isError);
 				await this.conn.sessionUpdate({
 					sessionId: session.sessionId,
 					update: {
 						sessionUpdate: "tool_call_update",
 						toolCallId,
 						status: isError ? "failed" : "completed",
-						content: text ? [{
-							type: "content",
-							content: {
-								type: "text",
-								text
-							}
-						}] : null,
+						content: content.length > 0 ? content : null,
 						rawOutput: m,
-						...locations ? { locations } : {}
+						...locations ? { locations } : {},
+						_meta: { piAcp: { toolName } }
 					}
 				});
 			}
@@ -1109,7 +1579,8 @@ var PiAcpAgent = class {
 			cwd: params.cwd,
 			mcpServers: params.mcpServers,
 			piSession,
-			conn: this.conn
+			conn: this.conn,
+			supportsTerminalOutput: this.clientCapabilities.terminalOutput
 		});
 		this.sessions.register(session);
 		await this.replaySessionHistory(session, piSession.messages);
@@ -1125,7 +1596,7 @@ var PiAcpAgent = class {
 						sessionId: session.sessionId,
 						update: {
 							sessionUpdate: "available_commands_update",
-							availableCommands: mergeCommands(commands, builtinAvailableCommands())
+							availableCommands: deduplicateCommands([...commands, ...BUILTIN_COMMANDS])
 						}
 					});
 				} catch {}
@@ -1134,8 +1605,7 @@ var PiAcpAgent = class {
 		return {
 			configOptions,
 			modes,
-			models,
-			_meta: { piAcp: { startupInfo: null } }
+			models
 		};
 	}
 	async unstable_closeSession(params) {
@@ -1176,7 +1646,8 @@ var PiAcpAgent = class {
 			cwd: params.cwd,
 			mcpServers: params.mcpServers ?? [],
 			piSession,
-			conn: this.conn
+			conn: this.conn,
+			supportsTerminalOutput: this.clientCapabilities.terminalOutput
 		});
 		this.sessions.register(session);
 		this.sessionPaths.set(params.sessionId, sessionFile);
@@ -1189,7 +1660,7 @@ var PiAcpAgent = class {
 						sessionId: session.sessionId,
 						update: {
 							sessionUpdate: "available_commands_update",
-							availableCommands: mergeCommands(commands, builtinAvailableCommands())
+							availableCommands: deduplicateCommands([...commands, ...BUILTIN_COMMANDS])
 						}
 					});
 				} catch {}
@@ -1229,7 +1700,8 @@ var PiAcpAgent = class {
 			cwd: params.cwd,
 			mcpServers: params.mcpServers ?? [],
 			piSession,
-			conn: this.conn
+			conn: this.conn,
+			supportsTerminalOutput: this.clientCapabilities.terminalOutput
 		});
 		this.sessions.register(session);
 		const enableSkillCommands = skillCommandsEnabled(params.cwd);
@@ -1241,7 +1713,7 @@ var PiAcpAgent = class {
 						sessionId: session.sessionId,
 						update: {
 							sessionUpdate: "available_commands_update",
-							availableCommands: mergeCommands(commands, builtinAvailableCommands())
+							availableCommands: deduplicateCommands([...commands, ...BUILTIN_COMMANDS])
 						}
 					});
 				} catch {}
@@ -1273,22 +1745,10 @@ var PiAcpAgent = class {
 	}
 	async unstable_setSessionModel(params) {
 		const session = this.sessions.get(params.sessionId);
-		let provider = null;
-		let modelId = null;
-		if (params.modelId.includes("/")) {
-			const [p, ...rest] = params.modelId.split("/");
-			provider = p ?? null;
-			modelId = rest.join("/");
-		} else modelId = params.modelId;
-		if (provider === null) {
-			const found = session.piSession.modelRegistry.getAvailable().find((m) => m.id === modelId);
-			if (found) {
-				provider = found.provider;
-				modelId = found.id;
-			}
-		}
-		if (provider === null || modelId === null) throw RequestError.invalidParams(`Unknown modelId: ${params.modelId}`);
-		const model = session.piSession.modelRegistry.getAvailable().find((m) => m.provider === provider && m.id === modelId);
+		const available = session.piSession.modelRegistry.getAvailable();
+		const resolved = resolveModelPreference(available, params.modelId);
+		if (resolved === null) throw RequestError.invalidParams(`Unknown modelId: ${params.modelId}`);
+		const model = available.find((m) => m.provider === resolved.provider && m.id === resolved.id);
 		if (!model) throw RequestError.invalidParams(`Unknown modelId: ${params.modelId}`);
 		await session.piSession.setModel(model);
 		this.emitConfigOptionUpdate(session);
@@ -1298,22 +1758,10 @@ var PiAcpAgent = class {
 		const configId = String(params.configId);
 		const value = String(params.value);
 		if (configId === "model") {
-			let provider = null;
-			let modelId = null;
-			if (value.includes("/")) {
-				const [p, ...rest] = value.split("/");
-				provider = p ?? null;
-				modelId = rest.join("/");
-			} else modelId = value;
-			if (provider === null) {
-				const found = session.piSession.modelRegistry.getAvailable().find((m) => m.id === modelId);
-				if (found) {
-					provider = found.provider;
-					modelId = found.id;
-				}
-			}
-			if (provider === null || modelId === null) throw RequestError.invalidParams(`Unknown model: ${value}`);
-			const model = session.piSession.modelRegistry.getAvailable().find((m) => m.provider === provider && m.id === modelId);
+			const available = session.piSession.modelRegistry.getAvailable();
+			const resolved = resolveModelPreference(available, value);
+			if (resolved === null) throw RequestError.invalidParams(`Unknown model: ${value}`);
+			const model = available.find((m) => m.provider === resolved.provider && m.id === resolved.id);
 			if (!model) throw RequestError.invalidParams(`Unknown model: ${value}`);
 			await session.piSession.setModel(model);
 		} else if (configId === "thought_level") {
@@ -1697,64 +2145,6 @@ function buildCommandList(piSession, enableSkillCommands) {
 	});
 	return commands;
 }
-let cachedUpdateNotice;
-function buildUpdateNotice() {
-	if (cachedUpdateNotice !== void 0) return cachedUpdateNotice;
-	try {
-		const installed = VERSION;
-		if (!installed || !isSemver(installed)) {
-			cachedUpdateNotice = null;
-			return null;
-		}
-		const latestRes = spawnSync("npm", [
-			"view",
-			"@mariozechner/pi-coding-agent",
-			"version"
-		], {
-			encoding: "utf-8",
-			timeout: 800
-		});
-		const latest = String(latestRes.stdout ?? "").trim().replace(/^v/i, "");
-		if (!latest || !isSemver(latest)) {
-			cachedUpdateNotice = null;
-			return null;
-		}
-		if (compareSemver(latest, installed) <= 0) {
-			cachedUpdateNotice = null;
-			return null;
-		}
-		cachedUpdateNotice = `New version available: v${latest} (installed v${installed}). Run: \`npm i -g @mariozechner/pi-coding-agent\``;
-		return cachedUpdateNotice;
-	} catch {
-		cachedUpdateNotice = null;
-		return null;
-	}
-}
-function buildStartupInfo(opts) {
-	const md = [];
-	if (VERSION) {
-		md.push(`pi v${VERSION}`);
-		md.push("---");
-		md.push("");
-	}
-	const addSection = (title, items) => {
-		const cleaned = items.map((s) => s.trim()).filter(Boolean);
-		if (cleaned.length === 0) return;
-		md.push(`## ${title}`);
-		for (const item of cleaned) md.push(`- ${item}`);
-		md.push("");
-	};
-	const contextItems = [];
-	const contextPath = join(opts.cwd, "AGENTS.md");
-	if (existsSync(contextPath)) contextItems.push(contextPath);
-	addSection("Context", contextItems);
-	if (opts.updateNotice !== void 0 && opts.updateNotice !== null) {
-		md.push("---");
-		md.push(opts.updateNotice);
-		md.push("");
-	}
-	return `${md.join("\n").trim()}\n`;
-}
 function findChangelog() {
 	try {
 		const which = spawnSync(process.platform === "win32" ? "where" : "which", ["pi"], { encoding: "utf-8" });
@@ -1774,42 +2164,6 @@ function findChangelog() {
 	} catch {}
 	return null;
 }
-function isSemver(v) {
-	return /^\d+\.\d+\.\d+(?:[-+].+)?$/.test(v);
-}
-function compareSemver(a, b) {
-	const pa = a.split(/[.-]/).slice(0, 3).map((n) => Number(n));
-	const pb = b.split(/[.-]/).slice(0, 3).map((n) => Number(n));
-	for (let i = 0; i < 3; i++) {
-		const da = pa[i] ?? 0;
-		const db = pb[i] ?? 0;
-		if (da > db) return 1;
-		if (da < db) return -1;
-	}
-	return 0;
-}
-function readNearestPackageJson(metaUrl) {
-	const fallback = {
-		name: "pi-acp",
-		version: "0.0.0"
-	};
-	try {
-		let dir = dirname(fileURLToPath(metaUrl));
-		for (let i = 0; i < 6; i++) {
-			const p = join(dir, "package.json");
-			if (existsSync(p)) {
-				const raw = JSON.parse(readFileSync(p, "utf-8"));
-				if (typeof raw !== "object" || raw === null) return fallback;
-				return {
-					name: "name" in raw && typeof raw.name === "string" ? raw.name : fallback.name,
-					version: "version" in raw && typeof raw.version === "string" ? raw.version : fallback.version
-				};
-			}
-			dir = dirname(dir);
-		}
-	} catch {}
-	return fallback;
-}
 //#endregion
 //#region src/index.ts
 if (process.argv.includes("--terminal-login")) {