@xynogen/pix-todo 0.1.12 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-todo",
-	"version": "0.1.12",
+	"version": "0.1.14",
 	"description": "Pi tool — durable execution checklist (todo)",
 	"type": "module",
 	"main": "src/index.ts",
@@ -34,6 +34,7 @@
 		"access": "public"
 	},
 	"dependencies": {
+		"@xynogen/pix-pretty": "^1.7.20",
 		"typebox": "^1.1.38"
 	},
 	"peerDependencies": {

package/src/todo.test.ts

@@ -26,6 +26,7 @@ function makeHost(
 		data?: unknown;
 	}> = [],
 ) {
+	let capturedParameters: unknown;
 	let capturedExecute:
 		| ((
 				id: string,
@@ -46,14 +47,21 @@ function makeHost(
 				context: unknown,
 		  ) => { render(width: number): string[] })
 		| null = null;
+	let capturedRenderCall:
+		| ((args: unknown, theme: unknown, context: unknown) => { render(width: number): string[] })
+		| null = null;
 
 	const pi = {
 		registerTool(def: {
 			name: string;
+			parameters: unknown;
 			execute: typeof capturedExecute;
+			renderCall?: typeof capturedRenderCall;
 			renderResult?: typeof capturedRender;
 		}) {
+			capturedParameters = def.parameters;
 			capturedExecute = def.execute;
+			if (def.renderCall) capturedRenderCall = def.renderCall;
 			if (def.renderResult) capturedRender = def.renderResult;
 		},
 		appendEntry(type: string, data: unknown) {
@@ -82,10 +90,18 @@ function makeHost(
 	return {
 		pi,
 		sessionManager,
+		get parameters() {
+			if (!capturedParameters) throw new Error("parameters not captured");
+			return capturedParameters;
+		},
 		get execute() {
 			if (!capturedExecute) throw new Error("execute not captured");
 			return capturedExecute;
 		},
+		get renderCall() {
+			if (!capturedRenderCall) throw new Error("renderCall not captured");
+			return capturedRenderCall;
+		},
 		get render() {
 			if (!capturedRender) throw new Error("render not captured");
 			return capturedRender;
@@ -119,6 +135,30 @@ function text(result: { content: Array<{ type: string; text: string }> }) {
 	return result.content.map((c) => c.text).join("\n");
 }
 
+// ─── Tool schema ────────────────────────────────────────────────────────────
+
+test("todo exposes action and status as guided string enums", () => {
+	const host = makeHost();
+	registerTodo(host.pi);
+	const schema = host.parameters as {
+		properties: {
+			action: { type?: string; enum?: string[]; description?: string };
+			status: { type?: string; enum?: string[]; description?: string };
+		};
+	};
+	const action = schema.properties.action;
+	const status = schema.properties.status;
+
+	expect(action.type).toBe("string");
+	expect(action.enum).toEqual(["list", "set", "add", "update", "clear"]);
+	expect(action.description).toContain('"list" shows items');
+	expect(action.description).toContain('"update" changes one item by id');
+	expect(status?.type).toBe("string");
+	expect(status?.enum).toEqual(["pending", "in_progress", "done", "blocked"]);
+	expect(status?.description).toContain('"pending" = not started');
+	expect(status?.description).toContain('"blocked" = cannot proceed');
+});
+
 // ─── parseItems (via set/add) ───────────────────────────────────────────────
 
 describe("todo actions", () => {
@@ -741,6 +781,15 @@ describe("renderTodoLines (colored TUI render)", () => {
 	});
 });
 
+describe("todo card layout", () => {
+	test("keeps the call row empty so the collapsed card is one line", () => {
+		const host = makeHost();
+		registerTodo(host.pi);
+		const call = host.renderCall({ action: "list" }, tagTheme, {});
+		expect(call.render(80).join("\n")).toBe("");
+	});
+});
+
 describe("renderResult snapshot isolation", () => {
 	// The card snapshots `todos` on first render; later execute() mutations must
 	// NOT bleed into an already-rendered card. Guards the invariant the inline
@@ -770,15 +819,19 @@ describe("renderResult snapshot isolation", () => {
 });
 
 describe("renderTodoSummaryLine (collapsed one-liner)", () => {
-	test("empty list renders muted placeholder", () => {
-		expect(renderTodoSummaryLine([], tagTheme)).toBe("[muted](no todos)[/]");
+	test("empty list renders a compact tool row", () => {
+		expect(renderTodoSummaryLine([], tagTheme)).toBe(
+			"[success]✓[/] [toolTitle]<b>todo</b>[/] [muted]empty[/]",
+		);
 	});
 
-	test("renders single dim done/total line with check", () => {
+	test("renders active work and progress in one row", () => {
 		const items: TodoItem[] = [
 			{ id: 1, text: "a", status: "done" },
-			{ id: 2, text: "b", status: "pending" },
+			{ id: 2, text: "b", status: "in_progress" },
 		];
-		expect(renderTodoSummaryLine(items, tagTheme)).toBe("[muted]Todos 1/2 done ✓[/]");
+		expect(renderTodoSummaryLine(items, tagTheme)).toBe(
+			"[success]✓[/] [toolTitle]<b>todo</b>[/] [muted]#2 b[/] [dim]·[/] [dim]1/2 done[/]",
+		);
 	});
 });

package/src/todo.ts

@@ -13,6 +13,7 @@ import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
+import { formatCollapsedToolRow } from "@xynogen/pix-pretty/utils";
 import { Type } from "typebox";
 
 import { once } from "./once.ts";
@@ -99,9 +100,19 @@ export type TodoTheme = {
 
 /** One-line dim summary used once a card has collapsed. */
 export function renderTodoSummaryLine(items: TodoItem[], theme: TodoTheme): string {
-	if (!items.length) return theme.fg("muted", "(no todos)");
+	if (!items.length) return formatCollapsedToolRow(theme, "todo", "empty");
 	const done = items.filter((t) => t.status === "done").length;
-	return theme.fg("muted", `Todos ${done}/${items.length} done ✓`);
+	const active = items.find((t) => t.status === "in_progress");
+	const blocked = items.filter((t) => t.status === "blocked").length;
+	const meta = [`${done}/${items.length} done`, blocked > 0 ? `${blocked} blocked` : ""]
+		.filter(Boolean)
+		.join(" · ");
+	const target = active
+		? `#${active.id} ${active.text}`
+		: done === items.length
+			? "complete"
+			: "checklist";
+	return formatCollapsedToolRow(theme, "todo", target, meta);
 }
 
 /** Colored checklist for the TUI: glyphs tinted by status, active row bold. */
@@ -178,16 +189,11 @@ export default function registerTodo(pi: ExtensionAPI): void {
 				"Call `todo(action:'list')` to recover your place after long runs or context compaction.",
 			],
 			parameters: Type.Object({
-				action: Type.Union(
-					[
-						Type.Literal("list"),
-						Type.Literal("set"),
-						Type.Literal("add"),
-						Type.Literal("update"),
-						Type.Literal("clear"),
-					],
-					{ description: "Operation to perform" },
-				),
+				action: Type.Enum(["list", "set", "add", "update", "clear"] as const, {
+					type: "string",
+					description:
+						'Required operation: "list" shows items; "set" replaces all from items; "add" appends items; "update" changes one item by id; "clear" removes all.',
+				}),
 				items: Type.Optional(
 					Type.String({
 						description: "For set/add: newline-separated or numbered list of todo texts.",
@@ -195,15 +201,11 @@ export default function registerTodo(pi: ExtensionAPI): void {
 				),
 				id: Type.Optional(Type.Number({ description: "For update: target todo id." })),
 				status: Type.Optional(
-					Type.Union(
-						[
-							Type.Literal("pending"),
-							Type.Literal("in_progress"),
-							Type.Literal("done"),
-							Type.Literal("blocked"),
-						],
-						{ description: "For update: new status." },
-					),
+					Type.Enum(["pending", "in_progress", "done", "blocked"] as const, {
+						type: "string",
+						description:
+							'For update: "pending" = not started; "in_progress" = active; "done" = finished; "blocked" = cannot proceed.',
+					}),
 				),
 				text: Type.Optional(
 					Type.String({
@@ -211,6 +213,11 @@ export default function registerTodo(pi: ExtensionAPI): void {
 					}),
 				),
 			}),
+			// The result already owns the checklist and its collapsed `✓ todo …` row.
+			// Keeping the call renderer empty prevents a duplicate standalone header.
+			renderCall() {
+				return new Text("", 0, 0);
+			},
 			renderResult(_result, _options, theme, context) {
 				// Snapshot this row's todos once (live `todos` mutate across calls;
 				// a card should keep the state it was created with).