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

package/dist/index.mjs

@@ -2,81 +2,11 @@
 import { homedir, platform } from "node:os";
 import { AgentSideConnection, RequestError, ndJsonStream } from "@agentclientprotocol/sdk";
 import { spawnSync } from "node:child_process";
-import { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
+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 * as z from "zod";
-//#region src/pi-auth/status.ts
-/**
-* Detect whether the user has any pi authentication configured.
-*
-* Checks three sources:
-* 1. auth.json (API keys, OAuth credentials)
-* 2. models.json custom provider apiKey entries
-* 3. Known provider environment variables
-*/
-const modelsConfigSchema = z.object({ providers: z.record(z.string().trim(), z.object({ apiKey: z.string().trim().optional() })).optional() });
-function agentDir() {
-	const env = process.env.PI_CODING_AGENT_DIR;
-	if (env === void 0) return join(homedir(), ".pi", "agent");
-	if (env === "~") return homedir();
-	if (env.startsWith("~/")) return homedir() + env.slice(1);
-	return env;
-}
-function readJsonFile(path) {
-	try {
-		if (!existsSync(path)) return null;
-		const raw = readFileSync(path, "utf-8").trim();
-		if (!raw) return null;
-		return JSON.parse(raw);
-	} catch {
-		return null;
-	}
-}
-function hasAuthJson() {
-	const data = readJsonFile(join(agentDir(), "auth.json"));
-	return typeof data === "object" && data !== null && Object.keys(data).length > 0;
-}
-function hasCustomProviderKey() {
-	const raw = readJsonFile(join(agentDir(), "models.json"));
-	const result = modelsConfigSchema.safeParse(raw);
-	if (!result.success || !result.data.providers) return false;
-	return Object.values(result.data.providers).some((provider) => typeof provider.apiKey === "string" && provider.apiKey.trim().length > 0);
-}
-/** Environment variables that indicate a configured provider API key. */
-const PROVIDER_ENV_VARS = [
-	"ANTHROPIC_API_KEY",
-	"ANTHROPIC_OAUTH_TOKEN",
-	"OPENAI_API_KEY",
-	"AZURE_OPENAI_API_KEY",
-	"GEMINI_API_KEY",
-	"GROQ_API_KEY",
-	"CEREBRAS_API_KEY",
-	"XAI_API_KEY",
-	"OPENROUTER_API_KEY",
-	"AI_GATEWAY_API_KEY",
-	"ZAI_API_KEY",
-	"MISTRAL_API_KEY",
-	"MINIMAX_API_KEY",
-	"MINIMAX_CN_API_KEY",
-	"HF_TOKEN",
-	"OPENCODE_API_KEY",
-	"KIMI_API_KEY",
-	"COPILOT_GITHUB_TOKEN",
-	"GH_TOKEN",
-	"GITHUB_TOKEN"
-];
-function hasProviderEnvVar() {
-	return PROVIDER_ENV_VARS.some((key) => {
-		const val = process.env[key];
-		return typeof val === "string" && val.trim().length > 0;
-	});
-}
-function hasPiAuthConfigured() {
-	return hasAuthJson() || hasCustomProviderKey() || hasProviderEnvVar();
-}
-//#endregion
 //#region src/acp/auth.ts
 const AUTH_METHOD_ID = "pi_terminal_login";
 function buildAuthMethods(opts) {
@@ -111,6 +41,29 @@ 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/pi-settings.ts
 /**
 * Read pi settings from global and project config files.
@@ -261,6 +214,30 @@ function toToolKind(toolName) {
 		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)}…`;
+}
+/**
+* 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";
+		}
+		default: return toolName;
+	}
+}
 /**
 * Map pi assistant stopReason to ACP StopReason.
 * pi: "stop" | "length" | "toolUse" | "error" | "aborted"
@@ -285,8 +262,8 @@ function parseToolInput(tc) {
 	return tc.arguments;
 }
 const toolArgsSchema = z.object({
-	path: z.string().optional(),
-	oldText: z.string().optional()
+	path: z.string().trim().optional(),
+	oldText: z.string().trim().optional()
 }).loose();
 function toToolArgs(raw) {
 	const result = toolArgsSchema.safeParse(raw);
@@ -452,7 +429,7 @@ 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 } : {},
@@ -472,14 +449,17 @@ var PiAcpSession = class {
 	}
 	handleToolStart(toolCallId, toolName, args) {
 		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);
 		if (!this.currentToolCalls.has(toolCallId)) {
@@ -487,7 +467,7 @@ var PiAcpSession = class {
 			this.emit({
 				sessionUpdate: "tool_call",
 				toolCallId,
-				title: toolName,
+				title: buildToolTitle(toolName, args),
 				kind: toToolKind(toolName),
 				status: "in_progress",
 				...locations ? { locations } : {},
@@ -498,6 +478,7 @@ var PiAcpSession = class {
 			this.emit({
 				sessionUpdate: "tool_call_update",
 				toolCallId,
+				title: buildToolTitle(toolName, args),
 				status: "in_progress",
 				...locations ? { locations } : {},
 				rawInput: args
@@ -557,6 +538,7 @@ var PiAcpSession = class {
 		this.editSnapshots.delete(toolCallId);
 	}
 	handleAgentEnd() {
+		this.emitUsageUpdate();
 		this.flushEmits().finally(() => {
 			const reason = this.cancelRequested ? "cancelled" : mapPiStopReason(this.lastAssistantStopReason);
 			this.lastAssistantStopReason = null;
@@ -564,6 +546,42 @@ 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;
+	}
 };
 /**
 * Type guard to narrow AgentSessionEvent to the AgentEvent subset
@@ -584,10 +602,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) {
@@ -631,6 +645,76 @@ function acpPromptToPiMessage(blocks) {
 	};
 }
 //#endregion
+//#region src/pi-auth/status.ts
+/**
+* Detect whether the user has any pi authentication configured.
+*
+* Checks three sources:
+* 1. auth.json (API keys, OAuth credentials)
+* 2. models.json custom provider apiKey entries
+* 3. Known provider environment variables
+*/
+const modelsConfigSchema = z.object({ providers: z.record(z.string().trim(), z.object({ apiKey: z.string().trim().optional() })).optional() });
+function agentDir() {
+	const env = process.env.PI_CODING_AGENT_DIR;
+	if (env === void 0) return join(homedir(), ".pi", "agent");
+	if (env === "~") return homedir();
+	if (env.startsWith("~/")) return homedir() + env.slice(1);
+	return env;
+}
+function readJsonFile(path) {
+	try {
+		if (!existsSync(path)) return null;
+		const raw = readFileSync(path, "utf-8").trim();
+		if (!raw) return null;
+		return JSON.parse(raw);
+	} catch {
+		return null;
+	}
+}
+function hasAuthJson() {
+	const data = readJsonFile(join(agentDir(), "auth.json"));
+	return typeof data === "object" && data !== null && Object.keys(data).length > 0;
+}
+function hasCustomProviderKey() {
+	const raw = readJsonFile(join(agentDir(), "models.json"));
+	const result = modelsConfigSchema.safeParse(raw);
+	if (!result.success || !result.data.providers) return false;
+	return Object.values(result.data.providers).some((provider) => typeof provider.apiKey === "string" && provider.apiKey.trim().length > 0);
+}
+/** Environment variables that indicate a configured provider API key. */
+const PROVIDER_ENV_VARS = [
+	"ANTHROPIC_API_KEY",
+	"ANTHROPIC_OAUTH_TOKEN",
+	"OPENAI_API_KEY",
+	"AZURE_OPENAI_API_KEY",
+	"GEMINI_API_KEY",
+	"GROQ_API_KEY",
+	"CEREBRAS_API_KEY",
+	"XAI_API_KEY",
+	"OPENROUTER_API_KEY",
+	"AI_GATEWAY_API_KEY",
+	"ZAI_API_KEY",
+	"MISTRAL_API_KEY",
+	"MINIMAX_API_KEY",
+	"MINIMAX_CN_API_KEY",
+	"HF_TOKEN",
+	"OPENCODE_API_KEY",
+	"KIMI_API_KEY",
+	"COPILOT_GITHUB_TOKEN",
+	"GH_TOKEN",
+	"GITHUB_TOKEN"
+];
+function hasProviderEnvVar() {
+	return PROVIDER_ENV_VARS.some((key) => {
+		const val = process.env[key];
+		return typeof val === "string" && val.trim().length > 0;
+	});
+}
+function hasPiAuthConfigured() {
+	return hasAuthJson() || hasCustomProviderKey() || hasProviderEnvVar();
+}
+//#endregion
 //#region src/acp/agent.ts
 function builtinAvailableCommands() {
 	return [
@@ -699,10 +783,20 @@ 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();
 	dispose() {
 		this.sessions.disposeAll();
 	}
@@ -729,9 +823,14 @@ var PiAcpAgent = class {
 				promptCapabilities: {
 					image: true,
 					audio: false,
-					embeddedContext: false
+					embeddedContext: true
 				},
-				sessionCapabilities: { list: {} }
+				sessionCapabilities: {
+					list: {},
+					close: {},
+					resume: {},
+					fork: {}
+				}
 			}
 		};
 	}
@@ -742,6 +841,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}`);
 		}
@@ -750,8 +851,11 @@ var PiAcpAgent = class {
 			piSession.dispose();
 			throw RequestError.authRequired({ authMethods: buildAuthMethods() }, "Configure an API key or log in with an OAuth provider.");
 		}
+		const sessionId = piSession.sessionManager.getSessionId();
+		const sessionFile = piSession.sessionManager.getSessionFile();
+		if (sessionFile !== void 0) this.sessionPaths.set(sessionId, sessionFile);
 		const session = new PiAcpSession({
-			sessionId: piSession.sessionManager.getSessionId(),
+			sessionId,
 			cwd: params.cwd,
 			mcpServers: params.mcpServers,
 			piSession,
@@ -765,7 +869,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);
@@ -794,7 +897,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);
@@ -807,64 +912,49 @@ 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();
 	}
-	async listSessions(params) {
-		const cwd = params.cwd;
-		const sessions = (cwd !== void 0 && cwd !== null ? await SessionManager.list(cwd) : await SessionManager.listAll()).map((s) => ({
-			id: s.id,
-			cwd: s.cwd,
-			name: s.name ?? "",
-			modified: s.modified,
-			messageCount: s.messageCount
-		}));
-		if (params.cursor !== void 0 && params.cursor !== null) {
-			const parsed = Number.parseInt(params.cursor, 10);
-			if (!Number.isFinite(parsed) || parsed < 0) throw RequestError.invalidParams(`Invalid cursor: ${params.cursor}`);
-		}
-		const start = params.cursor !== void 0 && params.cursor !== null ? Number.parseInt(params.cursor, 10) : 0;
-		const PAGE_SIZE = 50;
-		return {
-			sessions: sessions.slice(start, start + PAGE_SIZE).map((s) => ({
-				sessionId: s.id,
-				cwd: s.cwd,
-				title: s.name ?? null,
-				updatedAt: s.modified.toISOString()
-			})),
-			nextCursor: start + PAGE_SIZE < sessions.length ? String(start + PAGE_SIZE) : null,
-			_meta: {}
-		};
+	/**
+	* Resolve a session ID to a file path.
+	* Checks the local cache first (populated by listSessions/newSession),
+	* falls back to a full listAll() scan on cache miss.
+	*/
+	async resolveSessionFile(sessionId) {
+		const cached = this.sessionPaths.get(sessionId);
+		if (cached !== void 0) return cached;
+		const all = await SessionManager.listAll();
+		for (const s of all) this.sessionPaths.set(s.id, s.path);
+		return this.sessionPaths.get(sessionId) ?? null;
 	}
-	async loadSession(params) {
-		if (!isAbsolute(params.cwd)) throw RequestError.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
-		this.sessions.close(params.sessionId);
-		const sessionFile = findPiSessionFile(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 msg = e instanceof Error ? e.message : String(e);
-			throw RequestError.internalError({}, `Failed to load pi session: ${msg}`);
-		}
-		const piSession = result.session;
-		const session = new PiAcpSession({
-			sessionId: params.sessionId,
-			cwd: params.cwd,
-			mcpServers: params.mcpServers,
-			piSession,
-			conn: this.conn
-		});
-		this.sessions.register(session);
-		this.sessions.closeAllExcept(session.sessionId);
-		const messages = piSession.messages;
+	/**
+	* 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") {
@@ -879,32 +969,67 @@ var PiAcpAgent = class {
 						}
 					}
 				});
+				continue;
 			}
 			if (m.role === "assistant") {
-				const text = extractAssistantText(m.content);
-				if (text) await this.conn.sessionUpdate({
+				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
+							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 } : {}
+						}
+					});
+				}
+				continue;
 			}
 			if (m.role === "toolResult") {
 				const tr = m;
 				const toolName = tr.toolName;
 				const toolCallId = tr.toolCallId;
 				const isError = tr.isError;
-				await this.conn.sessionUpdate({
+				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: toolName,
-						kind: toolName === "read" ? "read" : toolName === "write" || toolName === "edit" ? "edit" : "other",
+						title: buildToolTitle(toolName, {}),
+						kind: toToolKind(toolName),
 						status: "completed",
 						rawInput: null,
 						rawOutput: m
@@ -924,11 +1049,70 @@ var PiAcpAgent = class {
 								text
 							}
 						}] : null,
-						rawOutput: m
+						rawOutput: m,
+						...locations ? { locations } : {}
 					}
 				});
 			}
 		}
+	}
+	async listSessions(params) {
+		const cwd = params.cwd;
+		const raw = cwd !== void 0 && cwd !== null ? await SessionManager.list(cwd) : await SessionManager.listAll();
+		for (const s of raw) this.sessionPaths.set(s.id, s.path);
+		const sessions = raw.map((s) => ({
+			id: s.id,
+			cwd: s.cwd,
+			name: s.name,
+			firstMessage: s.firstMessage,
+			modified: s.modified,
+			messageCount: s.messageCount
+		}));
+		if (params.cursor !== void 0 && params.cursor !== null) {
+			const parsed = Number.parseInt(params.cursor, 10);
+			if (!Number.isFinite(parsed) || parsed < 0) throw RequestError.invalidParams(`Invalid cursor: ${params.cursor}`);
+		}
+		const start = params.cursor !== void 0 && params.cursor !== null ? Number.parseInt(params.cursor, 10) : 0;
+		const PAGE_SIZE = 50;
+		return {
+			sessions: sessions.slice(start, start + PAGE_SIZE).map((s) => ({
+				sessionId: s.id,
+				cwd: s.cwd,
+				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,
+			_meta: {}
+		};
+	}
+	async loadSession(params) {
+		if (!isAbsolute(params.cwd)) throw RequestError.invalidParams(`cwd must be an absolute path: ${params.cwd}`);
+		this.sessions.close(params.sessionId);
+		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 load pi session: ${msg}`);
+		}
+		const piSession = result.session;
+		const session = new PiAcpSession({
+			sessionId: params.sessionId,
+			cwd: params.cwd,
+			mcpServers: params.mcpServers,
+			piSession,
+			conn: this.conn
+		});
+		this.sessions.register(session);
+		await this.replaySessionHistory(session, piSession.messages);
 		const modes = buildThinkingModes(piSession);
 		const models = buildModelState(piSession);
 		const configOptions = buildConfigOptions(modes, models);
@@ -954,6 +1138,124 @@ 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
+		});
+		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
+		});
+		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);
@@ -1389,45 +1691,21 @@ function buildCommandList(piSession, enableSkillCommands) {
 		});
 	}
 	const runner = piSession.extensionRunner;
-	if (runner) for (const { command } of runner.getRegisteredCommandsWithPaths()) commands.push({
-		name: command.name,
-		description: command.description ?? `(extension)`
+	if (runner) for (const cmd of runner.getRegisteredCommands()) commands.push({
+		name: cmd.name,
+		description: cmd.description ?? "(extension)"
 	});
 	return commands;
 }
-function findPiSessionFile(sessionId) {
-	const sessionsDir = join(piAgentDir(), "sessions");
-	if (!existsSync(sessionsDir)) return null;
-	const walkJsonl = (dir) => {
-		let entries;
-		try {
-			entries = readdirSync(dir);
-		} catch {
-			return null;
-		}
-		for (const name of entries) {
-			const p = join(dir, name);
-			try {
-				const st = statSync(p);
-				if (st.isDirectory()) {
-					const found = walkJsonl(p);
-					if (found !== void 0) return found;
-				} else if (st.isFile() && name.endsWith(".jsonl")) try {
-					const firstLine = readFileSync(p, "utf8").split("\n")[0];
-					if (firstLine === void 0) continue;
-					const header = JSON.parse(firstLine);
-					if (typeof header === "object" && header !== null && "type" in header && header.type === "session" && "id" in header && header.id === sessionId) return p;
-				} catch {}
-			} catch {}
-		}
-		return null;
-	};
-	return walkJsonl(sessionsDir);
-}
+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",
@@ -1437,10 +1715,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;
 	}
 }