@victor-software-house/pi-acp 0.3.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";
@@ -97,6 +96,102 @@ function parseClientCapabilities(caps) {
 	};
 }
 //#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.
@@ -149,12 +244,6 @@ 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/tool-content.ts
 const textBlockSchema = z.object({
@@ -249,13 +338,31 @@ function extractContentBlocks(result) {
 	return blocks;
 }
 /**
-* Escape text that would be interpreted as markdown formatting.
+* 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.
 *
-* Prevents file content from being rendered as headings, links, code
-* blocks, or horizontal rules when displayed in an ACP client.
+* 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) {
-	return text.replace(/^(#{1,6})\s/gm, "\\$1 ").replace(/\[/g, "\\[").replace(/\]/g, "\\]").replace(/^([-*_])\1{2,}$/gm, "\\$1$1$1").replace(/</g, "\\<");
+	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.
@@ -363,6 +470,18 @@ function wrapStreamingBashOutput(text) {
 	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) {
 	if (!needle) return void 0;
@@ -528,11 +647,12 @@ var PiAcpSession = class {
 	mcpServers;
 	piSession;
 	supportsTerminalOutput;
-	startupInfo = null;
-	startupInfoSent = false;
 	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();
@@ -553,21 +673,25 @@ var PiAcpSession = class {
 		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 = {
@@ -585,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;
@@ -622,7 +754,9 @@ var PiAcpSession = class {
 			case "agent_end":
 				this.handleAgentEnd();
 				break;
-			default: break;
+			default:
+				unreachable(ev, "handlePiEvent");
+				break;
 		}
 	}
 	handleMessageUpdate(ame) {
@@ -792,11 +926,6 @@ var PiAcpSession = class {
 				}, ...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;
@@ -811,6 +940,24 @@ var PiAcpSession = class {
 				}
 			}];
 		}
+		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,
@@ -830,6 +977,7 @@ var PiAcpSession = class {
 			this.lastAssistantStopReason = null;
 			this.pendingTurn?.resolve(reason);
 			this.pendingTurn = null;
+			this.dequeueNextPrompt();
 		});
 	}
 	/**
@@ -1037,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);
@@ -1113,7 +1267,6 @@ 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();
@@ -1138,9 +1291,9 @@ var PiAcpAgent = class {
 		return {
 			protocolVersion: requested === supportedVersion ? requested : supportedVersion,
 			agentInfo: {
-				name: pkg.name,
+				name,
 				title: "pi ACP adapter",
-				version: pkg.version
+				version
 			},
 			authMethods: buildAuthMethods({ supportsTerminalAuthMeta: this.clientCapabilities.terminalAuth }),
 			agentCapabilities: {
@@ -1192,24 +1345,9 @@ var PiAcpAgent = class {
 			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 () => {
@@ -1219,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 {};
@@ -1453,7 +1596,7 @@ var PiAcpAgent = class {
 						sessionId: session.sessionId,
 						update: {
 							sessionUpdate: "available_commands_update",
-							availableCommands: mergeCommands(commands, builtinAvailableCommands())
+							availableCommands: deduplicateCommands([...commands, ...BUILTIN_COMMANDS])
 						}
 					});
 				} catch {}
@@ -1462,8 +1605,7 @@ var PiAcpAgent = class {
 		return {
 			configOptions,
 			modes,
-			models,
-			_meta: { piAcp: { startupInfo: null } }
+			models
 		};
 	}
 	async unstable_closeSession(params) {
@@ -1518,7 +1660,7 @@ var PiAcpAgent = class {
 						sessionId: session.sessionId,
 						update: {
 							sessionUpdate: "available_commands_update",
-							availableCommands: mergeCommands(commands, builtinAvailableCommands())
+							availableCommands: deduplicateCommands([...commands, ...BUILTIN_COMMANDS])
 						}
 					});
 				} catch {}
@@ -1571,7 +1713,7 @@ var PiAcpAgent = class {
 						sessionId: session.sessionId,
 						update: {
 							sessionUpdate: "available_commands_update",
-							availableCommands: mergeCommands(commands, builtinAvailableCommands())
+							availableCommands: deduplicateCommands([...commands, ...BUILTIN_COMMANDS])
 						}
 					});
 				} catch {}
@@ -1603,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);
@@ -1628,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") {
@@ -2027,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" });
@@ -2104,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")) {