@xynogen/pix-core 0.1.0 → 0.1.2

package/src/tool/ask/rpc.ts

@@ -0,0 +1,84 @@
+import type { Params } from "./schema.js";
+import { SENTINEL_FREEFORM } from "./schema.js";
+import type { QuestionAnswer, QuestionnaireResult } from "./types.js";
+
+// ── RPC / non-TUI fallback ─────────────────────────────────────────────
+// Used when ctx.hasUI is false (headless / JSON / print mode).
+
+export async function rpcFallback(
+	ui: { select: Function; input: Function },
+	params: Params,
+): Promise<QuestionnaireResult> {
+	const answers: QuestionAnswer[] = [];
+	let cancelled = false;
+
+	for (let i = 0; i < params.questions.length; i++) {
+		const q = params.questions[i]!;
+		const header = q.header;
+
+		if (q.multiSelect) {
+			const lines = q.options.map(
+				(o, idx) => `${idx + 1}. ${o.label} — ${o.description}`,
+			);
+			const raw = await ui.input(
+				`${header}: ${q.question}\n\n${lines.join("\n")}\n\nEnter numbers separated by commas:`,
+				"e.g. 1,3",
+			);
+			if (raw == null) {
+				cancelled = true;
+				break;
+			}
+			const indices = String(raw)
+				.split(",")
+				.map((s) => Number(s.trim()))
+				.filter((n) => n >= 1 && n <= q.options.length);
+			const selected = indices.map((n) => q.options[n - 1]?.label);
+			if (selected.length > 0) {
+				answers.push({
+					questionIndex: i,
+					question: q.question,
+					kind: "multi",
+					answer: null,
+					selected,
+				});
+			} else {
+				cancelled = true;
+				break;
+			}
+		} else {
+			const items = q.options.map((o) => `${o.label} — ${o.description}`);
+			items.push(SENTINEL_FREEFORM);
+			const chosen = await ui.select(`${header}: ${q.question}`, items);
+			if (chosen == null) {
+				cancelled = true;
+				break;
+			}
+			if (chosen === SENTINEL_FREEFORM) {
+				const text = await ui.input(q.question, "Type your answer...");
+				if (text == null) {
+					cancelled = true;
+					break;
+				}
+				answers.push({
+					questionIndex: i,
+					question: q.question,
+					kind: "custom",
+					answer: String(text),
+				});
+			} else {
+				const opt = q.options.find(
+					(o) =>
+						chosen === o.label || `${o.label} — ${o.description}` === chosen,
+				)!;
+				answers.push({
+					questionIndex: i,
+					question: q.question,
+					kind: "option",
+					answer: opt?.label ?? String(chosen),
+				});
+			}
+		}
+	}
+
+	return { answers, cancelled };
+}

package/src/tool/ask/schema.ts

@@ -0,0 +1,69 @@
+import { type Static, Type } from "typebox";
+
+// ── Constants ──────────────────────────────────────────────────────────
+
+export const MAX_QUESTIONS = 4;
+export const MIN_OPTIONS = 2;
+export const MAX_OPTIONS = 4;
+export const MAX_HEADER_LENGTH = 16;
+export const MAX_LABEL_LENGTH = 60;
+
+export const SENTINEL_FREEFORM = "Type something.";
+export const SENTINEL_CHAT = "Chat about this";
+export const SENTINEL_NEXT = "Next";
+
+export const SPLIT_PANE_MIN_WIDTH = 84;
+export const SEPARATOR = " │ ";
+
+// ── Schemas ────────────────────────────────────────────────────────────
+
+export const OptionSchema = Type.Object({
+	label: Type.String({
+		maxLength: MAX_LABEL_LENGTH,
+		description: `MAX ${MAX_LABEL_LENGTH} CHARACTERS. Display text for this option. Concise (1-5 words).`,
+	}),
+	description: Type.String({
+		description: "Explanation of what this option means or trade-offs.",
+	}),
+	preview: Type.Optional(
+		Type.String({
+			description:
+				"Optional markdown preview for side-by-side layout (single-select only).",
+		}),
+	),
+});
+
+export const QuestionSchema = Type.Object({
+	question: Type.String({
+		description: "Clear, specific question ending with ?",
+	}),
+	header: Type.String({
+		maxLength: MAX_HEADER_LENGTH,
+		description: `MAX ${MAX_HEADER_LENGTH} CHARS — short chip/tag. E.g. "Auth method", "Approach".`,
+	}),
+	options: Type.Array(OptionSchema, {
+		minItems: MIN_OPTIONS,
+		maxItems: MAX_OPTIONS,
+		description:
+			"2-4 options. 'Type something.' and 'Chat about this' are auto-appended.",
+	}),
+	multiSelect: Type.Optional(
+		Type.Boolean({
+			default: false,
+			description:
+				"Allow multiple selections. Suppresses 'Type something.' row.",
+		}),
+	),
+});
+
+export const QuestionsSchema = Type.Array(QuestionSchema, {
+	minItems: 1,
+	maxItems: MAX_QUESTIONS,
+	description: "1-4 questions",
+});
+
+export const ParamsSchema = Type.Object({ questions: QuestionsSchema });
+
+export type OptionData = Static<typeof OptionSchema>;
+export type QuestionData = Static<typeof QuestionSchema>;
+export type Params = Static<typeof ParamsSchema>;

package/src/tool/ask/single-select-layout.test.ts

@@ -34,7 +34,11 @@ describe("renderSingleSelectRows", () => {
 			allowFreeform: false,
 		});
 
-		const rendered = rows.map((r) => r.line).join(" ").replace(/\s+/g, " ").trim();
+		const rendered = rows
+			.map((r) => r.line)
+			.join(" ")
+			.replace(/\s+/g, " ")
+			.trim();
 		expect(rendered).toContain("want a plan first");
 		expect(rendered).toContain("before touching code");
 		expect(rows.length).toBeGreaterThan(2);
@@ -63,7 +67,12 @@ describe("renderSingleSelectRows", () => {
 		});
 
 		expect(rows.length).toBeLessThanOrEqual(6);
-		expect(rows.map((r) => r.line).join(" ").replace(/\s+/g, " ")).toContain("troubleshooting");
+		expect(
+			rows
+				.map((r) => r.line)
+				.join(" ")
+				.replace(/\s+/g, " "),
+		).toContain("troubleshooting");
 	});
 
 	test("does not duplicate a short word after wrapping an exact-width long word", () => {
@@ -79,15 +88,22 @@ describe("renderSingleSelectRows", () => {
 			allowFreeform: false,
 		});
 
-		expect(rows.map((r) => r.line).filter((line) => line.trim() === "hi")).toHaveLength(1);
-		expect(rows.map((r) => r.line).filter((line) => line.trim() === "aaaaaaaa")).toHaveLength(2);
+		expect(
+			rows.map((r) => r.line).filter((line) => line.trim() === "hi"),
+		).toHaveLength(1);
+		expect(
+			rows.map((r) => r.line).filter((line) => line.trim() === "aaaaaaaa"),
+		).toHaveLength(2);
 	});
 
 	test("marks selected item rows as selected in annotated output", () => {
 		const rows = renderSingleSelectRows({
 			options: [
 				{ title: "Alpha" },
-				{ title: "Beta with a very long title that should wrap to multiple lines when rendered" },
+				{
+					title:
+						"Beta with a very long title that should wrap to multiple lines when rendered",
+				},
 				{ title: "Gamma" },
 			],
 			selectedIndex: 1,

package/src/tool/ask/single-select-layout.ts

@@ -53,7 +53,8 @@ function wrapText(text: string, width: number): string[] {
 			current = "";
 			for (let i = 0; i < word.length; i += width) {
 				const chunk = word.slice(i, i + width);
-				if (chunk.length === width || i + width < word.length) lines.push(chunk);
+				if (chunk.length === width || i + width < word.length)
+					lines.push(chunk);
 				else current = chunk;
 			}
 		}
@@ -89,9 +90,15 @@ function buildItemBlocks(
 	const normalizedWidth = Math.max(12, width);
 	const freeformLabel = "Type something. — Enter a custom response";
 	const commentToggleLabel = `${commentEnabled ? "[✓]" : "[ ]"} Add extra context after selection`;
-	const allItems: ListItem[] = options.map((option) => ({ type: "option", option }));
+	const allItems: ListItem[] = options.map((option) => ({
+		type: "option",
+		option,
+	}));
 	if (allowComment) {
-		allItems.push({ type: "comment-toggle", option: { title: commentToggleLabel } });
+		allItems.push({
+			type: "comment-toggle",
+			option: { title: commentToggleLabel },
+		});
 	}
 	if (allowFreeform) {
 		allItems.push({ type: "freeform", option: { title: freeformLabel } });
@@ -103,18 +110,28 @@ function buildItemBlocks(
 
 		if (item.type === "comment-toggle" || item.type === "freeform") {
 			const prefix = `${pointer}   `;
-			const wrapped = wrapText(item.option.title, Math.max(8, normalizedWidth - prefix.length));
+			const wrapped = wrapText(
+				item.option.title,
+				Math.max(8, normalizedWidth - prefix.length),
+			);
 			wrapped.forEach((line, lineIndex) => {
-				lines.push(padLine(lineIndex === 0 ? prefix : " ".repeat(prefix.length), line));
+				lines.push(
+					padLine(lineIndex === 0 ? prefix : " ".repeat(prefix.length), line),
+				);
 			});
 			return { itemIndex, lines };
 		}
 
 		const numberPrefix = `${pointer} ${itemIndex + 1}. `;
 		const continuationPrefix = " ".repeat(numberPrefix.length);
-		const titleLines = wrapText(item.option.title, Math.max(8, normalizedWidth - numberPrefix.length));
+		const titleLines = wrapText(
+			item.option.title,
+			Math.max(8, normalizedWidth - numberPrefix.length),
+		);
 		titleLines.forEach((line, lineIndex) => {
-			lines.push(padLine(lineIndex === 0 ? numberPrefix : continuationPrefix, line));
+			lines.push(
+				padLine(lineIndex === 0 ? numberPrefix : continuationPrefix, line),
+			);
 		});
 
 		if (item.option.description && !hideDescriptions) {
@@ -151,11 +168,25 @@ export function renderSingleSelectRows({
 	maxRows,
 	hideDescriptions,
 }: RenderSingleSelectRowsParams): AnnotatedRow[] {
-	const itemCount = options.length + (allowComment ? 1 : 0) + (allowFreeform ? 1 : 0);
-	const blocks = buildItemBlocks(options, width, allowFreeform, allowComment, commentEnabled, selectedIndex, hideDescriptions);
+	const itemCount =
+		options.length + (allowComment ? 1 : 0) + (allowFreeform ? 1 : 0);
+	const blocks = buildItemBlocks(
+		options,
+		width,
+		allowFreeform,
+		allowComment,
+		commentEnabled,
+		selectedIndex,
+		hideDescriptions,
+	);
 	const allRows = flatten(blocks, selectedIndex);
 
-	if (!Number.isFinite(maxRows) || !maxRows || maxRows <= 0 || allRows.length <= maxRows) {
+	if (
+		!Number.isFinite(maxRows) ||
+		!maxRows ||
+		maxRows <= 0 ||
+		allRows.length <= maxRows
+	) {
 		return allRows;
 	}
 
@@ -180,17 +211,20 @@ export function renderSingleSelectRows({
 	let usedRows = selectedBlock.lines.length;
 
 	while (true) {
-		const nextCanFit = end < blocks.length && usedRows + blocks[end]!.lines.length <= availableRows;
+		const nextCanFit =
+			end < blocks.length &&
+			usedRows + blocks[end]?.lines.length <= availableRows;
 		if (nextCanFit) {
-			usedRows += blocks[end]!.lines.length;
+			usedRows += blocks[end]?.lines.length;
 			end += 1;
 			continue;
 		}
 
-		const prevCanFit = start > 0 && usedRows + blocks[start - 1]!.lines.length <= availableRows;
+		const prevCanFit =
+			start > 0 && usedRows + blocks[start - 1]?.lines.length <= availableRows;
 		if (prevCanFit) {
 			start -= 1;
-			usedRows += blocks[start]!.lines.length;
+			usedRows += blocks[start]?.lines.length;
 			continue;
 		}
 

package/src/tool/ask/types.ts

@@ -0,0 +1,17 @@
+// ── Answer & result types ──────────────────────────────────────────────
+
+export type AnswerKind = "option" | "custom" | "chat" | "multi";
+
+export interface QuestionAnswer {
+	questionIndex: number;
+	question: string;
+	kind: AnswerKind;
+	answer: string | null;
+	selected?: string[];
+	preview?: string;
+}
+
+export interface QuestionnaireResult {
+	answers: QuestionAnswer[];
+	cancelled: boolean;
+}

package/src/tool/todo/todo.ts

@@ -9,8 +9,8 @@
  * checklist is seeded by the model via the tool's `set` action.
  */
 
-import { Type } from "typebox";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
 
 export type TodoStatus = "pending" | "in_progress" | "done" | "blocked";
 
@@ -44,7 +44,9 @@ export default function registerTodo(pi: ExtensionAPI): void {
 	function todoSummary(): string {
 		if (!todos.length) return "(no todos)";
 		const done = todos.filter((t) => t.status === "done").length;
-		const lines = todos.map((t) => `${TODO_GLYPH[t.status]} ${t.id}. ${t.text}`);
+		const lines = todos.map(
+			(t) => `${TODO_GLYPH[t.status]} ${t.id}. ${t.text}`,
+		);
 		return `Todos ${done}/${todos.length} done:\n${lines.join("\n")}`;
 	}
 
@@ -101,19 +103,24 @@ export default function registerTodo(pi: ExtensionAPI): void {
 			),
 		}),
 		async execute(_id, params) {
+			// AgentToolResult now requires a `details` field. These todo results have
+			// no structured details, so emit `undefined` via small local helpers.
+			const ok = (text: string) => ({
+				content: [{ type: "text" as const, text }],
+				details: undefined,
+			});
+			const fail = (text: string) => ({
+				content: [{ type: "text" as const, text }],
+				details: undefined,
+				isError: true,
+			});
 			switch (params.action) {
 				case "list":
-					return { content: [{ type: "text", text: todoSummary() }] };
+					return ok(todoSummary());
 
 				case "set": {
 					const texts = parseItems(params.items ?? "");
-					if (!texts.length)
-						return {
-							content: [
-								{ type: "text", text: "set requires non-empty `items`." },
-							],
-							isError: true,
-						};
+					if (!texts.length) return fail("set requires non-empty `items`.");
 					nextTodoId = 1;
 					todos = texts.map((text) => ({
 						id: nextTodoId++,
@@ -121,55 +128,35 @@ export default function registerTodo(pi: ExtensionAPI): void {
 						status: "pending" as TodoStatus,
 					}));
 					persistTodos();
-					return { content: [{ type: "text", text: todoSummary() }] };
+					return ok(todoSummary());
 				}
 
 				case "add": {
 					const texts = parseItems(params.items ?? "");
-					if (!texts.length)
-						return {
-							content: [
-								{ type: "text", text: "add requires non-empty `items`." },
-							],
-							isError: true,
-						};
+					if (!texts.length) return fail("add requires non-empty `items`.");
 					for (const text of texts)
 						todos.push({ id: nextTodoId++, text, status: "pending" });
 					persistTodos();
-					return { content: [{ type: "text", text: todoSummary() }] };
+					return ok(todoSummary());
 				}
 
 				case "update": {
 					const t = todos.find((x) => x.id === params.id);
-					if (!t)
-						return {
-							content: [
-								{ type: "text", text: `No todo with id ${params.id}.` },
-							],
-							isError: true,
-						};
+					if (!t) return fail(`No todo with id ${params.id}.`);
 					if (params.status) t.status = params.status;
 					if (params.text) t.text = params.text;
 					persistTodos();
-					return { content: [{ type: "text", text: todoSummary() }] };
+					return ok(todoSummary());
 				}
 
 				case "clear":
 					todos = [];
 					nextTodoId = 1;
 					persistTodos();
-					return { content: [{ type: "text", text: "Todos cleared." }] };
+					return ok("Todos cleared.");
 
 				default:
-					return {
-						content: [
-							{
-								type: "text",
-								text: `Unknown action: ${String(params.action)}`,
-							},
-						],
-						isError: true,
-					};
+					return fail(`Unknown action: ${String(params.action)}`);
 			}
 		},
 	});

package/src/tool/toolbox/toolbox.test.ts

@@ -6,9 +6,9 @@ import registerToolbox, {
 	buildRows,
 	parseTargets,
 	renderList,
-	toggleTool,
-	type ToolRow,
 	type ToggleOps,
+	type ToolRow,
+	toggleTool,
 } from "./toolbox.ts";
 
 // ─── Fixtures ───────────────────────────────────────────────────────────────

package/src/tool/toolbox/toolbox.ts

@@ -18,6 +18,7 @@ import { dirname, join } from "node:path";
 import type {
 	ExtensionAPI,
 	ExtensionContext,
+	Theme,
 	ToolInfo,
 } from "@earendil-works/pi-coding-agent";
 import { DynamicBorder, getAgentDir } from "@earendil-works/pi-coding-agent";
@@ -27,10 +28,12 @@ import {
 	fuzzyFilter,
 	Input,
 	Key,
+	type KeybindingsManager,
 	matchesKey,
 	type SelectItem,
 	SelectList,
 	Text,
+	type TUI,
 	visibleWidth,
 } from "@earendil-works/pi-tui";
 
@@ -339,8 +342,12 @@ export default function registerToolbox(pi: ExtensionAPI): void {
 		};
 	}): Promise<void> {
 		await ctx.ui.custom<null>(
-			// biome-ignore lint: factory signature from ExtensionUIContext.custom
-			(tui: any, theme: any, _kb: unknown, done: (r: null) => void) => {
+			(
+				tui: TUI,
+				theme: Theme,
+				_kb: KeybindingsManager,
+				done: (r: null) => void,
+			) => {
 				const accent = "accent";
 				const mute = (s: string) => theme.fg("muted", s);
 				const container = new Container();

package/src/ui/diagnostics.ts

@@ -9,7 +9,7 @@
  * Registers widget with id "pi-lens" to override external pi-lens widget.
  */
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type { ExtensionAPI, Theme } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth } from "@earendil-works/pi-tui";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
@@ -65,10 +65,7 @@ function recordFileTouched(filePath: string): void {
 
 // ─── Render ───────────────────────────────────────────────────────────────────
 
-function renderWidget(
-	width: number,
-	theme: { fg: (color: string, s: string) => string },
-): string[] {
+function renderWidget(width: number, theme: Theme): string[] {
 	const w = Math.max(1, width || 80);
 
 	const cyan = (s: string) => theme.fg("accent", s);
@@ -117,7 +114,7 @@ export default function (pi: ExtensionAPI) {
 		if (!ctx.ui.setWidget) return;
 		ctx.ui.setWidget(
 			"pi-lens",
-			(tui: { requestRender(): void }, theme: any) => {
+			(tui, theme: Theme) => {
 				requestRenderFn = () => tui.requestRender();
 				return {
 					render: (width: number) => renderWidget(width, theme),

package/src/ui/footer.ts

@@ -12,10 +12,7 @@
  */
 
 import { execFile } from "node:child_process";
-import { join } from "node:path";
 import { promisify } from "node:util";
-import { lookupModelsDev, lookupBenchmark } from "../lib/data";
-import type { ModelsDevModel } from "../lib/data";
 import type {
 	AssistantMessage,
 	AssistantMessageEvent,
@@ -25,6 +22,8 @@ import type {
 	ReadonlyFooterDataProvider,
 } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth } from "@earendil-works/pi-tui";
+import type { ModelsDevModel } from "../lib/data";
+import { lookupBenchmark, lookupModelsDev } from "../lib/data";
 
 // ─── Pure formatting helpers ─────────────────────────────────────────
 
@@ -197,7 +196,7 @@ function renderBranch(
 
 /** "<modelId> [· thinking] [· ctxK · $in/$out]" */
 function renderModel(
-	model: { id?: string; provider?: string } | undefined,
+	model: { id?: string; provider?: string; name?: string } | undefined,
 	thinking: string,
 	theme: Theme,
 ): string {

package/src/ui/welcome.test.ts

@@ -1,14 +1,14 @@
-import { describe, it, expect } from "bun:test";
+import { describe, expect, it } from "bun:test";
 import {
-	shortCwd,
-	statusIcon,
-	renderCheck,
+	type CheckResult,
+	LABEL_WIDTH,
 	LOGO_ROWS,
 	PI_IGNORE_RULES,
-	LABEL_WIDTH,
+	renderCheck,
+	shortCwd,
+	statusIcon,
 	summariseTools,
 	type Theme,
-	type CheckResult,
 } from "./welcome.ts";
 
 const theme: Theme = {

package/src/ui/welcome.ts

@@ -27,7 +27,10 @@
  *   ✓ Ignore  up to date
  */
 
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import type {
+	ExtensionAPI,
+	ExtensionContext,
+} from "@earendil-works/pi-coding-agent";
 
 // ─── Theme shim (same pattern as footer.ts) ───────────────────────────────────
 
@@ -283,7 +286,7 @@ export default function (pi: ExtensionAPI) {
 	let dismissed = false;
 	let requestRender: (() => void) | null = null;
 
-	const dismiss = (ctx: any) => {
+	const dismiss = (ctx: ExtensionContext) => {
 		if (dismissed) return;
 		dismissed = true;
 		requestRender = null;