@victor-software-house/pi-acp 0.1.2 → 0.3.0

package/dist/index.mjs

@@ -41,6 +41,62 @@ function resolveTerminalLaunchCommand() {
 	};
 }
 //#endregion
+//#region src/acp/auth-required.ts
+/**
+* Detect common auth/credential errors from pi and surface them as ACP AUTH_REQUIRED.
+*/
+const AUTH_ERROR_PATTERNS = [
+	"api key",
+	"apikey",
+	"missing key",
+	"no key",
+	"not configured",
+	"unauthorized",
+	"authentication",
+	"permission denied",
+	"forbidden",
+	"401",
+	"403"
+];
+function detectAuthError(err) {
+	const lower = (err instanceof Error ? err.message : String(err ?? "")).toLowerCase();
+	if (!AUTH_ERROR_PATTERNS.some((p) => lower.includes(p))) return null;
+	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/pi-settings.ts
 /**
 * Read pi settings from global and project config files.
@@ -100,62 +156,77 @@ function quietStartupEnabled(cwd) {
 	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);
@@ -163,6 +234,134 @@ 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;
+}
+/**
+* Escape text that would be interpreted as markdown formatting.
+*
+* Prevents file content from being rendered as headings, links, code
+* blocks, or horizontal rules when displayed in an ACP client.
+*/
+function markdownEscape(text) {
+	return text.replace(/^(#{1,6})\s/gm, "\\$1 ").replace(/\[/g, "\\[").replace(/\]/g, "\\]").replace(/^([-*_])\1{2,}$/gm, "\\$1$1$1").replace(/</g, "\\<");
+}
+/**
+* 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/session.ts
 function findUniqueLineNumber(text, needle) {
@@ -187,10 +386,70 @@ 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";
 	}
 }
+const MAX_TITLE_LEN = 80;
+function truncateTitle(text) {
+	const oneLine = text.replace(/\n/g, " ").trim();
+	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.
+*
+* Returns a short human-readable label like "Read src/index.ts" or "Run ls -la".
+*/
+function buildToolTitle(toolName, args) {
+	const p = args.path;
+	switch (toolName) {
+		case "read": return p !== void 0 ? `Read ${p}` : "Read";
+		case "write": return p !== void 0 ? `Write ${p}` : "Write";
+		case "edit": return p !== void 0 ? `Edit ${p}` : "Edit";
+		case "bash": {
+			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;
+	}
+}
 /**
 * Map pi assistant stopReason to ACP StopReason.
 * pi: "stop" | "length" | "toolUse" | "error" | "aborted"
@@ -222,6 +481,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() {
@@ -255,12 +527,15 @@ var PiAcpSession = class {
 	cwd;
 	mcpServers;
 	piSession;
+	supportsTerminalOutput;
 	startupInfo = null;
 	startupInfoSent = false;
 	conn;
 	cancelRequested = false;
 	pendingTurn = null;
 	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();
@@ -271,6 +546,7 @@ 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() {
@@ -338,10 +614,10 @@ 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();
@@ -382,18 +658,20 @@ var PiAcpSession = class {
 				this.emit({
 					sessionUpdate: "tool_call",
 					toolCallId: toolCall.id,
-					title: toolCall.name,
+					title: buildToolTitle(toolCall.name, rawInput),
 					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)
 			});
 		}
 	}
@@ -401,92 +679,152 @@ 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" && args.path !== void 0) try {
+		if ((toolName === "edit" || toolName === "write") && args.path !== void 0) try {
 			const abs = isAbsolute(args.path) ? args.path : resolve(this.cwd, args.path);
-			const oldText = readFileSync(abs, "utf8");
+			let oldText = "";
+			try {
+				oldText = readFileSync(abs, "utf8");
+			} catch {}
 			this.editSnapshots.set(toolCallId, {
 				path: abs,
 				oldText
 			});
-			line = findUniqueLineNumber(oldText, args.oldText ?? "");
+			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({
 				sessionUpdate: "tool_call",
 				toolCallId,
-				title: toolName,
+				title: buildToolTitle(toolName, args),
 				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");
 			this.emit({
 				sessionUpdate: "tool_call_update",
 				toolCallId,
+				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 {}
+		const meta = buildToolMeta(toolName, this.supportsTerminalOutput && isTerminalTool(toolName) ? { terminal_exit: {
+			terminal_id: toolCallId,
+			exit_code: extractExitCode(result),
+			signal: null
+		} } : void 0);
+		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
-			}
-		}];
+			}];
+		}
 		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();
 		this.flushEmits().finally(() => {
 			const reason = this.cancelRequested ? "cancelled" : mapPiStopReason(this.lastAssistantStopReason);
 			this.lastAssistantStopReason = null;
@@ -494,7 +832,79 @@ var PiAcpSession = class {
 			this.pendingTurn = null;
 		});
 	}
+	/**
+	* Emit a usage_update notification with current context and cost data.
+	*/
+	emitUsageUpdate() {
+		const contextUsage = this.piSession.getContextUsage?.();
+		const stats = this.piSession.getSessionStats();
+		const used = contextUsage?.tokens ?? 0;
+		const size = contextUsage?.contextWindow ?? 0;
+		this.emit({
+			sessionUpdate: "usage_update",
+			used,
+			size,
+			cost: stats.cost > 0 ? {
+				amount: stats.cost,
+				currency: "USD"
+			} : null
+		});
+	}
+	/**
+	* Build ACP Usage data from pi session stats for prompt response.
+	*/
+	getUsage() {
+		const stats = this.piSession.getSessionStats();
+		return {
+			inputTokens: stats.tokens.input,
+			outputTokens: stats.tokens.output,
+			cachedReadTokens: stats.tokens.cacheRead,
+			cachedWriteTokens: stats.tokens.cacheWrite
+		};
+	}
+	/**
+	* Get cumulative session cost.
+	*/
+	getCost() {
+		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
@@ -514,10 +924,6 @@ function extractUserMessageText(content) {
 	if (!Array.isArray(content)) return "";
 	return content.filter(isTextBlock).map((b) => b.text).join("");
 }
-function extractAssistantText(content) {
-	if (!Array.isArray(content)) return "";
-	return content.filter(isTextBlock).map((b) => b.text).join("");
-}
 //#endregion
 //#region src/acp/translate/prompt.ts
 function acpPromptToPiMessage(blocks) {
@@ -699,12 +1105,26 @@ function parseArgs(input) {
 	if (current !== "") args.push(current);
 	return args;
 }
+const SESSION_TITLE_MAX = 100;
+function truncateSessionTitle(text) {
+	const trimmed = text.trim();
+	if (trimmed === "") return null;
+	const oneLine = trimmed.replace(/\n/g, " ");
+	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();
 	}
@@ -714,6 +1134,7 @@ 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: {
@@ -721,7 +1142,7 @@ var PiAcpAgent = class {
 				title: "pi ACP adapter",
 				version: pkg.version
 			},
-			authMethods: buildAuthMethods({ supportsTerminalAuthMeta: params.clientCapabilities?._meta?.["terminal-auth"] === true }),
+			authMethods: buildAuthMethods({ supportsTerminalAuthMeta: this.clientCapabilities.terminalAuth }),
 			agentCapabilities: {
 				loadSession: true,
 				mcpCapabilities: {
@@ -731,9 +1152,14 @@ var PiAcpAgent = class {
 				promptCapabilities: {
 					image: true,
 					audio: false,
-					embeddedContext: false
+					embeddedContext: true
 				},
-				sessionCapabilities: { list: {} }
+				sessionCapabilities: {
+					list: {},
+					close: {},
+					resume: {},
+					fork: {}
+				}
 			}
 		};
 	}
@@ -744,6 +1170,8 @@ var PiAcpAgent = class {
 		try {
 			result = await createAgentSession({ cwd: params.cwd });
 		} catch (e) {
+			const authErr = detectAuthError(e);
+			if (authErr !== null) throw authErr;
 			const msg = e instanceof Error ? e.message : String(e);
 			throw RequestError.internalError({}, `Failed to create pi session: ${msg}`);
 		}
@@ -760,7 +1188,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 quietStartup = quietStartupEnabled(params.cwd);
@@ -770,7 +1199,6 @@ var PiAcpAgent = class {
 			updateNotice
 		});
 		if (preludeText) session.setStartupInfo(preludeText);
-		this.sessions.closeAllExcept(session.sessionId);
 		const modes = buildThinkingModes(piSession);
 		const models = buildModelState(piSession);
 		const configOptions = buildConfigOptions(modes, models);
@@ -799,7 +1227,9 @@ var PiAcpAgent = class {
 		}, 0);
 		return response;
 	}
-	async authenticate(_params) {}
+	async authenticate(_params) {
+		return {};
+	}
 	async prompt(params) {
 		const session = this.sessions.get(params.sessionId);
 		const { message, images } = acpPromptToPiMessage(params.prompt);
@@ -812,7 +1242,23 @@ var PiAcpAgent = class {
 			if (handled) return handled;
 		}
 		const result = await session.prompt(message, images);
-		return { stopReason: result === "error" ? "end_turn" : result };
+		const stopReason = result === "error" ? "end_turn" : result;
+		const usage = session.getUsage();
+		const cost = session.getCost();
+		return {
+			stopReason,
+			usage: {
+				inputTokens: usage.inputTokens,
+				outputTokens: usage.outputTokens,
+				cachedReadTokens: usage.cachedReadTokens,
+				cachedWriteTokens: usage.cachedWriteTokens,
+				totalTokens: usage.inputTokens + usage.outputTokens
+			},
+			_meta: cost > 0 ? { cost: {
+				amount: cost,
+				currency: "USD"
+			} } : {}
+		};
 	}
 	async cancel(params) {
 		await this.sessions.get(params.sessionId).cancel();
@@ -829,6 +1275,114 @@ var PiAcpAgent = class {
 		for (const s of all) this.sessionPaths.set(s.id, s.path);
 		return this.sessionPaths.get(sessionId) ?? null;
 	}
+	/**
+	* Replay persisted session messages as ACP session updates.
+	*
+	* Iterates through the message history, emitting structured updates for each
+	* content block type: text, thinking, tool calls, and tool results. A map of
+	* tool call IDs to their invocation data (from assistant messages) is built
+	* to enrich subsequent tool result updates with rawInput and locations.
+	*/
+	async replaySessionHistory(session, messages) {
+		const toolCallMap = /* @__PURE__ */ new Map();
+		for (const m of messages) {
+			if (!("role" in m)) continue;
+			if (m.role === "user") {
+				const text = extractUserMessageText(m.content);
+				if (text) await this.conn.sessionUpdate({
+					sessionId: session.sessionId,
+					update: {
+						sessionUpdate: "user_message_chunk",
+						content: {
+							type: "text",
+							text
+						}
+					}
+				});
+				continue;
+			}
+			if (m.role === "assistant") {
+				const am = m;
+				for (const block of am.content) if (block.type === "text" && block.text) await this.conn.sessionUpdate({
+					sessionId: session.sessionId,
+					update: {
+						sessionUpdate: "agent_message_chunk",
+						content: {
+							type: "text",
+							text: block.text
+						}
+					}
+				});
+				else if (block.type === "thinking" && block.thinking) await this.conn.sessionUpdate({
+					sessionId: session.sessionId,
+					update: {
+						sessionUpdate: "agent_thought_chunk",
+						content: {
+							type: "text",
+							text: block.thinking
+						}
+					}
+				});
+				else if (block.type === "toolCall") {
+					const args = toToolArgs(block.arguments);
+					toolCallMap.set(block.id, {
+						name: block.name,
+						args
+					});
+					const locations = resolveToolPath(args, session.cwd);
+					await this.conn.sessionUpdate({
+						sessionId: session.sessionId,
+						update: {
+							sessionUpdate: "tool_call",
+							toolCallId: block.id,
+							title: buildToolTitle(block.name, args),
+							kind: toToolKind(block.name),
+							status: "completed",
+							rawInput: args,
+							...locations ? { locations } : {},
+							_meta: { piAcp: { toolName: block.name } }
+						}
+					});
+				}
+				continue;
+			}
+			if (m.role === "toolResult") {
+				const tr = m;
+				const toolName = tr.toolName;
+				const toolCallId = tr.toolCallId;
+				const isError = tr.isError;
+				const invocation = toolCallMap.get(toolCallId);
+				const args = invocation?.args;
+				const locations = args !== void 0 ? resolveToolPath(args, session.cwd) : void 0;
+				if (invocation === void 0) await this.conn.sessionUpdate({
+					sessionId: session.sessionId,
+					update: {
+						sessionUpdate: "tool_call",
+						toolCallId,
+						title: buildToolTitle(toolName, {}),
+						kind: toToolKind(toolName),
+						status: "completed",
+						rawInput: null,
+						rawOutput: m,
+						_meta: { piAcp: { toolName } }
+					}
+				});
+				const content = formatToolContent(toolName, m, isError);
+				await this.conn.sessionUpdate({
+					sessionId: session.sessionId,
+					update: {
+						sessionUpdate: "tool_call_update",
+						toolCallId,
+						status: isError ? "failed" : "completed",
+						content: content.length > 0 ? content : null,
+						rawOutput: m,
+						...locations ? { locations } : {},
+						_meta: { piAcp: { toolName } }
+					}
+				});
+			}
+		}
+	}
 	async listSessions(params) {
 		const cwd = params.cwd;
 		const raw = cwd !== void 0 && cwd !== null ? await SessionManager.list(cwd) : await SessionManager.listAll();
@@ -836,7 +1390,8 @@ var PiAcpAgent = class {
 		const sessions = raw.map((s) => ({
 			id: s.id,
 			cwd: s.cwd,
-			name: s.name ?? "",
+			name: s.name,
+			firstMessage: s.firstMessage,
 			modified: s.modified,
 			messageCount: s.messageCount
 		}));
@@ -850,7 +1405,7 @@ var PiAcpAgent = class {
 			sessions: sessions.slice(start, start + PAGE_SIZE).map((s) => ({
 				sessionId: s.id,
 				cwd: s.cwd,
-				title: s.name ?? null,
+				title: (s.name !== void 0 && s.name !== "" ? s.name : null) ?? truncateSessionTitle(s.firstMessage) ?? null,
 				updatedAt: s.modified.toISOString()
 			})),
 			nextCursor: start + PAGE_SIZE < sessions.length ? String(start + PAGE_SIZE) : null,
@@ -870,6 +1425,8 @@ var PiAcpAgent = class {
 				sessionManager: sm
 			});
 		} catch (e) {
+			const authErr = detectAuthError(e);
+			if (authErr !== null) throw authErr;
 			const msg = e instanceof Error ? e.message : String(e);
 			throw RequestError.internalError({}, `Failed to load pi session: ${msg}`);
 		}
@@ -879,75 +1436,11 @@ 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.sessions.closeAllExcept(session.sessionId);
-		const messages = piSession.messages;
-		for (const m of messages) {
-			if (!("role" in m)) continue;
-			if (m.role === "user") {
-				const text = extractUserMessageText(m.content);
-				if (text) await this.conn.sessionUpdate({
-					sessionId: session.sessionId,
-					update: {
-						sessionUpdate: "user_message_chunk",
-						content: {
-							type: "text",
-							text
-						}
-					}
-				});
-			}
-			if (m.role === "assistant") {
-				const text = extractAssistantText(m.content);
-				if (text) await this.conn.sessionUpdate({
-					sessionId: session.sessionId,
-					update: {
-						sessionUpdate: "agent_message_chunk",
-						content: {
-							type: "text",
-							text
-						}
-					}
-				});
-			}
-			if (m.role === "toolResult") {
-				const tr = m;
-				const toolName = tr.toolName;
-				const toolCallId = tr.toolCallId;
-				const isError = tr.isError;
-				await this.conn.sessionUpdate({
-					sessionId: session.sessionId,
-					update: {
-						sessionUpdate: "tool_call",
-						toolCallId,
-						title: toolName,
-						kind: toolName === "read" ? "read" : toolName === "write" || toolName === "edit" ? "edit" : "other",
-						status: "completed",
-						rawInput: null,
-						rawOutput: m
-					}
-				});
-				const text = toolResultToText(m);
-				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,
-						rawOutput: m
-					}
-				});
-			}
-		}
+		await this.replaySessionHistory(session, piSession.messages);
 		const modes = buildThinkingModes(piSession);
 		const models = buildModelState(piSession);
 		const configOptions = buildConfigOptions(modes, models);
@@ -973,6 +1466,126 @@ var PiAcpAgent = class {
 			_meta: { piAcp: { startupInfo: null } }
 		};
 	}
+	async unstable_closeSession(params) {
+		if (this.sessions.maybeGet(params.sessionId) === void 0) throw RequestError.invalidParams(`Unknown sessionId: ${params.sessionId}`);
+		this.sessions.close(params.sessionId);
+		return {};
+	}
+	async unstable_resumeSession(params) {
+		if (!isAbsolute(params.cwd)) throw RequestError.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
+		const existing = this.sessions.maybeGet(params.sessionId);
+		if (existing !== void 0) {
+			const modes = buildThinkingModes(existing.piSession);
+			const models = buildModelState(existing.piSession);
+			return {
+				configOptions: buildConfigOptions(modes, models),
+				modes,
+				models
+			};
+		}
+		const sessionFile = await this.resolveSessionFile(params.sessionId);
+		if (sessionFile === null) throw RequestError.invalidParams(`Unknown sessionId: ${params.sessionId}`);
+		let result;
+		try {
+			const sm = SessionManager.open(sessionFile);
+			result = await createAgentSession({
+				cwd: params.cwd,
+				sessionManager: sm
+			});
+		} catch (e) {
+			const authErr = detectAuthError(e);
+			if (authErr !== null) throw authErr;
+			const msg = e instanceof Error ? e.message : String(e);
+			throw RequestError.internalError({}, `Failed to resume pi session: ${msg}`);
+		}
+		const piSession = result.session;
+		const session = new PiAcpSession({
+			sessionId: params.sessionId,
+			cwd: params.cwd,
+			mcpServers: params.mcpServers ?? [],
+			piSession,
+			conn: this.conn,
+			supportsTerminalOutput: this.clientCapabilities.terminalOutput
+		});
+		this.sessions.register(session);
+		this.sessionPaths.set(params.sessionId, sessionFile);
+		const enableSkillCommands = skillCommandsEnabled(params.cwd);
+		setTimeout(() => {
+			(async () => {
+				try {
+					const commands = buildCommandList(piSession, enableSkillCommands);
+					await this.conn.sessionUpdate({
+						sessionId: session.sessionId,
+						update: {
+							sessionUpdate: "available_commands_update",
+							availableCommands: mergeCommands(commands, builtinAvailableCommands())
+						}
+					});
+				} catch {}
+			})();
+		}, 0);
+		const modes = buildThinkingModes(piSession);
+		const models = buildModelState(piSession);
+		return {
+			configOptions: buildConfigOptions(modes, models),
+			modes,
+			models
+		};
+	}
+	async unstable_forkSession(params) {
+		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}`);
+		let result;
+		try {
+			const sm = SessionManager.forkFrom(sourceFile, params.cwd);
+			result = await createAgentSession({
+				cwd: params.cwd,
+				sessionManager: sm
+			});
+		} catch (e) {
+			const authErr = detectAuthError(e);
+			if (authErr !== null) throw authErr;
+			const msg = e instanceof Error ? e.message : String(e);
+			throw RequestError.internalError({}, `Failed to fork pi session: ${msg}`);
+		}
+		const piSession = result.session;
+		const newSessionId = piSession.sessionManager.getSessionId();
+		const newSessionFile = piSession.sessionManager.getSessionFile();
+		if (newSessionFile !== void 0) this.sessionPaths.set(newSessionId, newSessionFile);
+		const session = new PiAcpSession({
+			sessionId: newSessionId,
+			cwd: params.cwd,
+			mcpServers: params.mcpServers ?? [],
+			piSession,
+			conn: this.conn,
+			supportsTerminalOutput: this.clientCapabilities.terminalOutput
+		});
+		this.sessions.register(session);
+		const enableSkillCommands = skillCommandsEnabled(params.cwd);
+		setTimeout(() => {
+			(async () => {
+				try {
+					const commands = buildCommandList(piSession, enableSkillCommands);
+					await this.conn.sessionUpdate({
+						sessionId: session.sessionId,
+						update: {
+							sessionUpdate: "available_commands_update",
+							availableCommands: mergeCommands(commands, builtinAvailableCommands())
+						}
+					});
+				} catch {}
+			})();
+		}, 0);
+		const modes = buildThinkingModes(piSession);
+		const models = buildModelState(piSession);
+		return {
+			sessionId: newSessionId,
+			configOptions: buildConfigOptions(modes, models),
+			modes,
+			models
+		};
+	}
 	async setSessionMode(params) {
 		const session = this.sessions.get(params.sessionId);
 		const mode = String(params.modeId);
@@ -1414,10 +2027,15 @@ function buildCommandList(piSession, enableSkillCommands) {
 	});
 	return commands;
 }
+let cachedUpdateNotice;
 function buildUpdateNotice() {
+	if (cachedUpdateNotice !== void 0) return cachedUpdateNotice;
 	try {
 		const installed = VERSION;
-		if (!installed || !isSemver(installed)) return null;
+		if (!installed || !isSemver(installed)) {
+			cachedUpdateNotice = null;
+			return null;
+		}
 		const latestRes = spawnSync("npm", [
 			"view",
 			"@mariozechner/pi-coding-agent",
@@ -1427,10 +2045,18 @@ function buildUpdateNotice() {
 			timeout: 800
 		});
 		const latest = String(latestRes.stdout ?? "").trim().replace(/^v/i, "");
-		if (!latest || !isSemver(latest)) return null;
-		if (compareSemver(latest, installed) <= 0) return null;
-		return `New version available: v${latest} (installed v${installed}). Run: \`npm i -g @mariozechner/pi-coding-agent\``;
+		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;
 	}
 }