@xynogen/pix-core 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-core",
-	"version": "0.1.5",
+	"version": "0.1.7",
 	"description": "Pi extension — core UI/UX bundle (welcome banner, footer, model picker, self-update)",
 	"type": "module",
 	"main": "src/index.ts",

package/src/commands/models/models.ts

@@ -24,6 +24,7 @@ import {
 	visibleWidth,
 } from "@earendil-works/pi-tui";
 import { lookupBenchmark, lookupModelsDev } from "../../lib/data";
+import { patchOutBuiltinModelCommand } from "./patch-builtin";
 
 // ─── Pure logic (exported for tests) ─────────────────────────────────────────
 
@@ -352,6 +353,10 @@ export async function showEnhancedPicker(
 }
 
 export default function modelPickerExtension(pi: ExtensionAPI) {
+	// Remove Pi's built-in /model so only the enhanced /models picker remains.
+	// Self-healing: re-applies on every load, so a Pi upgrade can't restore it.
+	patchOutBuiltinModelCommand();
+
 	const handler = async (_args: unknown, ctx: ExtensionContext) => {
 		await showEnhancedPicker(pi, ctx);
 	};

package/src/commands/models/patch-builtin.test.ts

@@ -0,0 +1,66 @@
+import { describe, expect, it } from "bun:test";
+import { mkdtempSync, readFileSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+// Pure replacement tested in isolation (the exported fn resolves the host
+// package, which isn't present in the test sandbox).
+const MODEL_COMMAND_LINE =
+	'{ name: "model", description: "Select model (opens selector UI)" },';
+
+function escapeRegExp(text: string): string {
+	return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+function patchSource(source: string): string {
+	if (!source.includes(MODEL_COMMAND_LINE)) return source;
+	return source.replace(
+		new RegExp(`[ \\t]*${escapeRegExp(MODEL_COMMAND_LINE)}\\n?`),
+		"",
+	);
+}
+
+const UNPATCHED = `export const BUILTIN_SLASH_COMMANDS = [
+    { name: "settings", description: "Open settings menu" },
+    { name: "model", description: "Select model (opens selector UI)" },
+    { name: "login", description: "Configure provider authentication" },
+];
+`;
+
+describe("patch-builtin /model removal", () => {
+	it("removes the built-in /model line and keeps neighbors", () => {
+		const out = patchSource(UNPATCHED);
+		expect(out).not.toContain('name: "model"');
+		expect(out).toContain('name: "settings"');
+		expect(out).toContain('name: "login"');
+	});
+
+	it("is idempotent — second pass is a no-op", () => {
+		const once = patchSource(UNPATCHED);
+		const twice = patchSource(once);
+		expect(twice).toBe(once);
+	});
+
+	it("leaves an already-clean file untouched", () => {
+		const clean = `export const X = [\n    { name: "login" },\n];\n`;
+		expect(patchSource(clean)).toBe(clean);
+	});
+
+	it("does not strip the plural /models entry", () => {
+		const withPlural = `[
+    { name: "models", description: "Enhanced picker" },
+    { name: "model", description: "Select model (opens selector UI)" },
+]`;
+		const out = patchSource(withPlural);
+		expect(out).toContain('name: "models"');
+		expect(out).not.toContain('{ name: "model", description');
+	});
+
+	it("round-trips through disk", () => {
+		const dir = mkdtempSync(join(tmpdir(), "pix-patch-"));
+		const file = join(dir, "slash-commands.js");
+		writeFileSync(file, UNPATCHED, "utf8");
+		writeFileSync(file, patchSource(readFileSync(file, "utf8")), "utf8");
+		expect(readFileSync(file, "utf8")).not.toContain('name: "model"');
+	});
+});

package/src/commands/models/patch-builtin.ts

@@ -0,0 +1,60 @@
+/**
+ * patch-builtin.ts — strip Pi's built-in /model slash command at load time.
+ *
+ * Built-in commands can't be removed via the extension API, so we edit Pi's
+ * compiled slash-commands.js directly. Done on every load: idempotent and
+ * self-healing across Pi upgrades, so no manual repatch is ever needed.
+ */
+
+import { readFileSync, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import { dirname, resolve } from "node:path";
+
+const HOST_PACKAGE = "@earendil-works/pi-coding-agent";
+const MODEL_COMMAND_LINE =
+	'{ name: "model", description: "Select model (opens selector UI)" },';
+
+/** Locate the host's compiled slash-commands.js, or null if it can't be found. */
+function findSlashCommandsFile(): string | null {
+	try {
+		const require = createRequire(import.meta.url);
+		const entry = require.resolve(HOST_PACKAGE);
+		return resolve(dirname(entry), "core", "slash-commands.js");
+	} catch {
+		return null;
+	}
+}
+
+/**
+ * Remove the built-in /model command line from Pi's slash-commands.js.
+ * Idempotent: returns silently if the file is missing or already patched.
+ */
+export function patchOutBuiltinModelCommand(): void {
+	const file = findSlashCommandsFile();
+	if (!file) return;
+
+	let source: string;
+	try {
+		source = readFileSync(file, "utf8");
+	} catch {
+		return; // file not present (different Pi layout) — nothing to do
+	}
+
+	if (!source.includes(MODEL_COMMAND_LINE)) return; // already patched
+
+	const patched = source.replace(
+		new RegExp(`[ \\t]*${escapeRegExp(MODEL_COMMAND_LINE)}\\n?`),
+		"",
+	);
+	if (patched === source) return;
+
+	try {
+		writeFileSync(file, patched, "utf8");
+	} catch {
+		// Read-only install — leave /model in place rather than crash.
+	}
+}
+
+function escapeRegExp(text: string): string {
+	return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}

package/src/tool/todo/todo.test.ts

@@ -1,5 +1,12 @@
 import { describe, expect, test } from "bun:test";
-import registerTodo from "./todo.ts";
+import registerTodo, { renderTodoLines, type TodoItem } from "./todo.ts";
+
+// Stub theme tags each fragment with its color/bold so assertions can verify
+// which status got which tint, without depending on real ANSI codes.
+const tagTheme = {
+	fg: (color: string, text: string) => `[${color}]${text}[/]`,
+	bold: (text: string) => `<b>${text}</b>`,
+};
 
 // ─── Helpers ────────────────────────────────────────────────────────────────
 
@@ -600,3 +607,40 @@ describe("restore", () => {
 		expect(text(result)).toBe("(no todos)");
 	});
 });
+
+describe("renderTodoLines (colored TUI render)", () => {
+	const items: TodoItem[] = [
+		{ id: 1, text: "alpha", status: "done" },
+		{ id: 2, text: "bravo", status: "in_progress" },
+		{ id: 3, text: "charlie", status: "pending" },
+		{ id: 4, text: "delta", status: "blocked" },
+	];
+
+	test("empty list renders muted placeholder", () => {
+		expect(renderTodoLines([], tagTheme)).toBe("[muted](no todos)[/]");
+	});
+
+	test("tints each glyph by status", () => {
+		const out = renderTodoLines(items, tagTheme);
+		expect(out).toContain("[success]●[/]"); // done
+		expect(out).toContain("[accent]◐[/]"); // in_progress
+		expect(out).toContain("[muted]○[/]"); // pending
+		expect(out).toContain("[error]⊘[/]"); // blocked
+	});
+
+	test("highlights the in-progress row bold + accent", () => {
+		const out = renderTodoLines(items, tagTheme);
+		expect(out).toContain("<b>[accent]2. bravo[/]</b>");
+	});
+
+	test("dims completed rows and uses text color for active-but-not-running", () => {
+		const out = renderTodoLines(items, tagTheme);
+		expect(out).toContain("[muted]1. alpha[/]"); // done body muted
+		expect(out).toContain("[text]3. charlie[/]"); // pending body text
+	});
+
+	test("shows the done/total count header", () => {
+		const out = renderTodoLines(items, tagTheme);
+		expect(out).toContain("[muted]Todos 1/4 done:[/]");
+	});
+});

package/src/tool/todo/todo.ts

@@ -10,6 +10,7 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 
 export type TodoStatus = "pending" | "in_progress" | "done" | "blocked";
@@ -27,6 +28,38 @@ const TODO_GLYPH: Record<TodoStatus, string> = {
 	blocked: "⊘",
 };
 
+/** Theme color key per status — drives both glyph and (for active) row tint. */
+const TODO_COLOR: Record<TodoStatus, string> = {
+	pending: "muted",
+	in_progress: "accent",
+	done: "success",
+	blocked: "error",
+};
+
+export type TodoTheme = {
+	fg: (color: string, text: string) => string;
+	bold: (text: string) => string;
+};
+
+/** Colored checklist for the TUI: glyphs tinted by status, active row bold. */
+export function renderTodoLines(items: TodoItem[], theme: TodoTheme): string {
+	if (!items.length) return theme.fg("muted", "(no todos)");
+	const done = items.filter((t) => t.status === "done").length;
+	const head = theme.fg("muted", `Todos ${done}/${items.length} done:`);
+	const lines = items.map((t) => {
+		const color = TODO_COLOR[t.status];
+		const glyph = theme.fg(color, TODO_GLYPH[t.status]);
+		const body = `${t.id}. ${t.text}`;
+		// Highlight the in-flight task so the eye lands on it first.
+		const label =
+			t.status === "in_progress"
+				? theme.bold(theme.fg("accent", body))
+				: theme.fg(t.status === "done" ? "muted" : "text", body);
+		return `${glyph} ${label}`;
+	});
+	return `${head}\n${lines.join("\n")}`;
+}
+
 const parseItems = (raw: string): string[] =>
 	raw
 		.split("\n")
@@ -102,6 +135,10 @@ export default function registerTodo(pi: ExtensionAPI): void {
 				}),
 			),
 		}),
+		renderResult(_result, _options, theme) {
+			return new Text(renderTodoLines(todos, theme as TodoTheme), 0, 0);
+		},
+
 		async execute(_id, params) {
 			// AgentToolResult now requires a `details` field. These todo results have
 			// no structured details, so emit `undefined` via small local helpers.