@aeondave/pi-persona 1.17.0 → 1.17.3

package/src/ui/failure-summary.ts

@@ -0,0 +1,55 @@
+import { compactInlineText, sanitizeTerminalText } from "./presentation.ts";
+
+const MAX_INSPECTED_CHARS = 16_384;
+const MAX_SUMMARY_COLUMNS = 140;
+
+/** Display-only cause preview. The caller retains the original error for diagnostics. */
+export function summarizeFailure(error: string): string {
+	let source = sanitizeTerminalText(error.slice(0, MAX_INSPECTED_CHARS)).trim();
+	// Omit only the runtime's identity/model wrapper, not meaningful tags such as [BLOCKED].
+	const wrapperEnd = source.startsWith("[") ? source.indexOf("]") : -1;
+	if (wrapperEnd > 0 && wrapperEnd <= 512 && source.slice(1, wrapperEnd).includes(" · ")) source = source.slice(wrapperEnd + 1).trim();
+	const reason = sanitizeTerminalText(jsonCause(source) ?? source).replace(/\s+/g, " ").trim();
+	if (/^(?:(?:the|this)\s+)?(?:['"`][^'"`]{1,200}['"`]\s+)?model\s+is\s+not\s+supported\s+when\s+using\s+Codex\s+with\s+a\s+ChatGPT\s+account[.!]?$/i.test(reason)) {
+		return "Model not supported by this ChatGPT account.";
+	}
+	return compactInlineText(reason, { maxChars: MAX_SUMMARY_COLUMNS });
+}
+
+/** Scan one bounded object, respecting JSON strings; never retry parsing at every brace. */
+function jsonCause(source: string): string | undefined {
+	const start = source.indexOf("{");
+	if (start < 0) return undefined;
+	let depth = 0;
+	let quoted = false;
+	let escaped = false;
+	for (let index = start; index < source.length; index++) {
+		const char = source[index];
+		if (quoted) {
+			if (escaped) escaped = false;
+			else if (char === "\\") escaped = true;
+			else if (char === '"') quoted = false;
+		} else if (char === '"') quoted = true;
+		else if (char === "{") depth++;
+		else if (char === "}" && --depth === 0) {
+			try { return objectCause(JSON.parse(source.slice(start, index + 1)) as unknown); }
+			catch { return undefined; }
+		}
+	}
+	return undefined;
+}
+
+function objectCause(value: unknown): string | undefined {
+	if (value === null || typeof value !== "object" || Array.isArray(value)) return undefined;
+	const object = value as Record<string, unknown>;
+	for (const field of [object.detail, object.message, object.error]) {
+		if (typeof field === "string" && field.trim()) return field;
+	}
+	if (object.error !== null && typeof object.error === "object" && !Array.isArray(object.error)) {
+		const error = object.error as Record<string, unknown>;
+		for (const field of [error.message, error.detail]) {
+			if (typeof field === "string" && field.trim()) return field;
+		}
+	}
+	return undefined;
+}

package/src/ui/literal-tool-result.ts

@@ -0,0 +1,24 @@
+/** One compact renderer for literal control receipts and diagnostic fallbacks. Pi owns the shell. */
+import { keyHint, type Theme } from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
+import { compactVisibleText, sanitizeTerminalText } from "./presentation.ts";
+
+interface LiteralResult {
+	content: readonly { type: string; text?: string }[];
+	/** Legacy direct renderer calls may carry this; the native host passes it in context. */
+	isError?: boolean;
+}
+
+export function renderLiteralToolResult(
+	result: LiteralResult,
+	{ expanded }: { expanded: boolean },
+	theme: Theme,
+	context?: { isError: boolean },
+): Text {
+	const full = sanitizeTerminalText(result.content.filter((part) => part.type === "text").map((part) => part.text ?? "").join("\n")) || "(no output)";
+	const failed = context?.isError ?? result.isError ?? false;
+	const preview = expanded ? undefined : compactVisibleText(full, { maxLines: 4, maxLineChars: 100 });
+	const heading = failed ? `${theme.fg("error", theme.bold("failed"))}\n` : "";
+	const hint = preview?.truncated ? `\n${theme.fg("dim", keyHint("app.tools.expand", "to expand"))}` : "";
+	return new Text(`${heading}${theme.fg("toolOutput", preview?.text ?? full)}${hint}`, 0, 0);
+}

package/src/ui/model-picker.ts

@@ -5,12 +5,32 @@
  * hundreds of models) and the viewport *follows the selection* — the highlighted
  * row is always on screen, so picking never jumps off the top.
  *
- * The pure parts (filter / viewport window / ordering) are exported and unit-tested;
- * this file's component is the thin pi-tui glue (focus + keyboard + framing).
+ * Machine-facing filtering/ordering remain separate from human fuzzy search.
+ * Only caller-supplied options are eligible; metadata never adds choices.
  */
 
-import type { Theme } from "@earendil-works/pi-coding-agent";
-import { Container, getKeybindings, Spacer, Text, type TUI, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import type { KeybindingsManager, Theme } from "@earendil-works/pi-coding-agent";
+import {
+	Container, CURSOR_MARKER, type Focusable, fuzzyFilter, getKeybindings, Input,
+	renderFakeCursor, setKeybindings, type TUI, truncateToWidth, visibleWidth,
+} from "@earendil-works/pi-tui";
+import { sanitizeTerminalText } from "./presentation.ts";
+
+/** Structural subset of host snapshots; no registry lookup or availability policy here. */
+export interface ModelPickerMetadata {
+	provider: string;
+	id: string;
+	name?: string;
+	contextWindow?: number;
+	reasoning?: boolean;
+	input?: readonly string[];
+}
+
+export interface ModelPickerConfig {
+	currentRef?: string;
+	models?: readonly ModelPickerMetadata[];
+	keybindings?: KeybindingsManager;
+}
 
 const VIEWPORT = 12; // rows shown at once (the rest scrolls)
 
@@ -38,24 +58,48 @@ export function orderModelRefs(refs: string[], sessionProvider?: string): string
 	return [...refs].sort((a, b) => Number(!isSession(a)) - Number(!isSession(b)) || a.localeCompare(b));
 }
 
-/** Is this keystroke a single printable character (a filter keystroke)? */
-function isPrintable(key: string): boolean {
-	if (key.length !== 1) return false;
-	const c = key.charCodeAt(0);
-	return c >= 0x20 && c !== 0x7f;
+/** One safe display line; never use this to rewrite a returned model ref. */
+function displayText(value: string): string {
+	return sanitizeTerminalText(value)
+		.replace(/[\n\r\t\u2028\u2029]/g, " ")
+		.replace(/[\u202a-\u202e\u2066-\u2069]/g, "");
+}
+
+function metadataText(model: ModelPickerMetadata | undefined): string {
+	if (!model) return "";
+	const parts: string[] = [];
+	const context = model.contextWindow;
+	if (context !== undefined && Number.isSafeInteger(context) && context > 0) {
+		const size = context >= 1_000_000 ? `${Math.round(context / 100_000) / 10}m`
+			: context >= 1000 ? `${Math.round(context / 100) / 10}k` : String(context);
+		parts.push(`${size} ctx`);
+	}
+	if (model.reasoning === true) parts.push("reasoning");
+	if (model.input?.includes("image")) parts.push("vision");
+	// Functional metadata gets scarce columns before a potentially long/duplicated display name.
+	if (model.name && model.name !== model.id) parts.push(truncateToWidth(displayText(model.name), 32));
+	return parts.length ? ` · ${parts.join(" · ")}` : "";
 }
 
-export class ModelPicker extends Container {
+export class ModelPicker extends Container implements Focusable {
 	private theme: Theme;
 	private title: string;
 	private options: string[];
 	private sessionProvider: string | undefined;
+	private currentRef: string | undefined;
 	private done: (ref: string | undefined) => void;
 	private tui: TUI;
-	private query = "";
+	private input: Input;
+	private keybindings: ReturnType<typeof getKeybindings>;
+	private models = new Map<string, ModelPickerMetadata>();
+	private list: string[];
 	private selected = 0;
 	private scroll = 0;
-	private lastWidth = 100;
+	private pastePending = false;
+	private pasteTail = "";
+
+	get focused(): boolean { return this.input.focused; }
+	set focused(value: boolean) { this.input.focused = value; }
 
 	constructor(
 		tui: TUI,
@@ -64,97 +108,130 @@ export class ModelPicker extends Container {
 		options: string[],
 		sessionProvider: string | undefined,
 		done: (ref: string | undefined) => void,
+		config: ModelPickerConfig = {},
 	) {
 		super();
 		this.tui = tui;
 		this.theme = theme;
-		this.title = title;
-		this.options = options;
+		this.title = displayText(title);
+		this.options = [...options];
+		this.list = this.options;
 		this.sessionProvider = sessionProvider;
+		this.currentRef = config.currentRef;
 		this.done = done;
-		this.rebuild();
-	}
-
-	private refresh(): void {
-		this.rebuild();
-		this.tui.requestRender();
-	}
-
-	private filtered(): string[] {
-		return filterModels(this.options, this.query);
-	}
-
-	override render(width: number): string[] {
-		this.lastWidth = width;
-		const inner = this.inner();
-		const b = (s: string): string => this.theme.fg("accent", s);
-		const framed = super.render(inner).map((line) => {
-			const pad = " ".repeat(Math.max(0, inner - visibleWidth(line)));
-			return `${b("│")} ${line}${pad} ${b("│")}`;
+		this.keybindings = config.keybindings ?? getKeybindings();
+		for (const model of config.models ?? []) this.models.set(`${model.provider}/${model.id}`, model);
+		this.selected = Math.max(0, this.list.indexOf(config.currentRef ?? ""));
+		this.input = new Input({
+			prompt: "",
+			placeholder: "Search name, id or provider",
+			placeholderStyle: (text) => this.theme.fg("dim", text),
 		});
-		return [b(`┌${"─".repeat(inner + 2)}┐`), ...framed, b(`└${"─".repeat(inner + 2)}┘`)];
+		this.addChild(this.input);
 	}
 
-	private inner(): number {
-		return Math.max(24, Math.min(this.lastWidth - 4, 100));
+	private search(): void {
+		const previous = this.list[this.selected];
+		const query = this.input.getValue().trim();
+		this.list = fuzzyFilter(this.options, query, (ref) =>
+			displayText(`${ref} ${this.models.get(ref)?.name ?? ""}`));
+		// Full qualified refs beat name/token scores, without changing the caller's order at rest.
+		if (query) {
+			const literal = this.list.indexOf(query);
+			const exact = literal >= 0 ? literal : this.list.findIndex((ref) => ref.toLowerCase() === query.toLowerCase());
+			if (exact >= 0) {
+				if (exact > 0) this.list.unshift(...this.list.splice(exact, 1));
+				this.selected = 0; // typing an exact ref must not confirm a surviving fuzzy sibling
+				return;
+			}
+		}
+		this.selected = previous === undefined ? 0 : Math.max(0, this.list.indexOf(previous));
 	}
 
-	private rebuild(): void {
-		this.clear();
+	override render(width: number): string[] {
+		const outer = Math.max(0, Math.min(104, Math.floor(width)));
+		if (outer === 0) return [];
+		const framed = outer >= 8;
+		const inner = framed ? outer - 4 : outer;
 		const t = this.theme;
-		const list = this.filtered();
-		if (this.selected >= list.length) this.selected = Math.max(0, list.length - 1);
-		this.scroll = visibleWindow(this.selected, VIEWPORT, list.length, this.scroll);
-		const w = this.inner() - 1;
-
-		this.addChild(new Text(t.fg("accent", t.bold(this.title)), 1, 0));
-		const counter = t.fg("dim", `type to filter · ${list.length}/${this.options.length}`);
-		const q = this.query ? t.fg("accent", `  «${this.query}»`) : "";
-		this.addChild(new Text(`${counter}${q}`, 1, 0));
-		this.addChild(new Spacer(1));
-
-		if (list.length === 0) {
-			this.addChild(new Text(t.fg("dim", "(no model matches — backspace to widen)"), 1, 0));
+		const fit = (line: string): string => truncateToWidth(line, inner, "…");
+		let inputLine = this.input.render(inner)[0] ?? "";
+		// Native Input can overrun a one-column viewport with a wide cursor grapheme.
+		if (visibleWidth(inputLine) > inner) {
+			inputLine = `${this.focused ? CURSOR_MARKER : ""}${renderFakeCursor(" ")}`;
+		}
+		const lines = [
+			t.fg("accent", t.bold(fit(this.title))),
+			t.fg("dim", fit(`${this.list.length}/${this.options.length} · fuzzy search`)),
+			inputLine,
+			"",
+		];
+		this.scroll = visibleWindow(this.selected, VIEWPORT, this.list.length, this.scroll);
+		if (!this.list.length) {
+			lines.push(t.fg("dim", fit("(no model matches — edit search to widen)")));
 		} else {
-			const end = Math.min(list.length, this.scroll + VIEWPORT);
-			if (this.scroll > 0) this.addChild(new Text(t.fg("dim", `▲ ${this.scroll} above`), 1, 0));
+			const end = Math.min(this.list.length, this.scroll + VIEWPORT);
+			if (this.scroll > 0) lines.push(t.fg("dim", fit(`▲ ${this.scroll} above`)));
 			for (let i = this.scroll; i < end; i++) {
-				const opt = list[i] as string;
-				const star = this.sessionProvider && opt.startsWith(`${this.sessionProvider}/`) ? "★ " : "  ";
-				const text = truncateToWidth(`${star}${opt}`, w);
-				const row = i === this.selected ? t.fg("accent", `▸ ${text}`) : `  ${text}`;
-				this.addChild(new Text(row, 1, 0));
+				const ref = this.list[i]!;
+				const current = ref === this.currentRef ? "✓" : " ";
+				const star = this.sessionProvider && ref.startsWith(`${this.sessionProvider}/`) ? "★" : " ";
+				// Ref comes first; friendly name and bounded, explicit metadata spend only spare columns.
+				const row = fit(`${i === this.selected ? "▸" : " "} ${current}${star} ${displayText(ref)}${metadataText(this.models.get(ref))}`);
+				lines.push(i === this.selected ? t.fg("accent", row) : row);
 			}
-			if (end < list.length) this.addChild(new Text(t.fg("dim", `▼ ${list.length - end} below`), 1, 0));
+			if (end < this.list.length) lines.push(t.fg("dim", fit(`▼ ${this.list.length - end} below`)));
 		}
-
-		this.addChild(new Spacer(1));
-		this.addChild(new Text(t.fg("dim", "↑↓ move   ·   ⏎ select   ·   esc keep default"), 1, 0));
+		const keys = (action: Parameters<typeof this.keybindings.getKeys>[0]): string => this.keybindings.getKeys(action).join("/");
+		lines.push("", t.fg("dim", fit("✓ current · ★ session provider")), t.fg("dim", fit(
+			`${keys("tui.select.up")}/${keys("tui.select.down")} move · ${keys("tui.select.confirm")} select · ${keys("tui.select.cancel")} keep default`,
+		)));
+		if (!framed) return lines;
+		const b = (text: string): string => t.fg("accent", text);
+		return [
+			b(`┌${"─".repeat(inner + 2)}┐`),
+			...lines.map((line) => `${b("│")} ${line}${" ".repeat(Math.max(0, inner - visibleWidth(line)))} ${b("│")}`),
+			b(`└${"─".repeat(inner + 2)}┘`),
+		];
 	}
 
 	handleInput(keyData: string): void {
-		const kb = getKeybindings();
-		const list = this.filtered();
-		if (kb.matches(keyData, "tui.select.up")) {
+		const kb = this.keybindings;
+		// While Input buffers a bracketed paste, even a standalone Enter/Escape
+		// chunk is text, not a picker action. Retain only enough tail to detect
+		// an end marker split across chunks; Input owns the actual paste buffer.
+		const pasteData = this.pasteTail + keyData;
+		const editingPaste = this.pastePending || keyData.includes("\x1b[200~");
+		this.pastePending = editingPaste && !pasteData.includes("\x1b[201~");
+		this.pasteTail = this.pastePending ? pasteData.slice(-5) : "";
+		if (!editingPaste && kb.matches(keyData, "tui.select.up")) {
 			this.selected = Math.max(0, this.selected - 1);
-			this.refresh();
-		} else if (kb.matches(keyData, "tui.select.down")) {
-			this.selected = Math.min(Math.max(0, list.length - 1), this.selected + 1);
-			this.refresh();
-		} else if (kb.matches(keyData, "tui.select.confirm") || keyData === "\n" || keyData === "\r") {
-			this.done(list[this.selected]);
-		} else if (kb.matches(keyData, "tui.select.cancel")) {
+		} else if (!editingPaste && kb.matches(keyData, "tui.select.down")) {
+			this.selected = Math.min(Math.max(0, this.list.length - 1), this.selected + 1);
+		} else if (!editingPaste && kb.matches(keyData, "tui.select.confirm")) {
+			const ref = this.list[this.selected];
+			if (ref !== undefined) this.done(ref);
+			return;
+		} else if (!editingPaste && kb.matches(keyData, "tui.select.cancel")) {
 			this.done(undefined);
-		} else if (keyData === "\x7f" || keyData === "\b") {
-			if (this.query) {
-				this.query = this.query.slice(0, -1);
-				this.selected = 0;
-				this.refresh();
+			return;
+		} else {
+			const before = this.input.getValue();
+			// Input has no per-instance keybindings API (Pi 1.3/1.4). Scope its global
+			// lookup to this synchronous call and restore it even if handling throws.
+			const global = getKeybindings();
+			try {
+				if (global !== kb) setKeybindings(kb);
+				this.input.handleInput(keyData);
+			} finally {
+				if (global !== kb) setKeybindings(global);
 			}
-		} else if (isPrintable(keyData)) {
-			this.query += keyData;
-			this.selected = 0;
-			this.refresh();
+			const value = this.input.getValue();
+			const safe = displayText(value);
+			if (safe !== value) this.input.setValue(safe);
+			if (before !== safe) this.search();
 		}
+		this.invalidate();
+		this.tui.requestRender();
 	}
 }