@zhushanwen/pi-todo 0.9.10 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-todo",
-  "version": "0.9.10",
+  "version": "0.10.0",
   "description": "AI-driven todo list for Pi — stateful task management with session persistence and /todos command.",
   "type": "module",
   "main": "src/index.ts",
@@ -29,15 +29,15 @@
     "vitest": "^4.1.8"
   },
   "dependencies": {
-    "@zhushanwen/pi-extension-logger": "0.6.1",
-    "@zhushanwen/extension-protocol": "0.17.0",
+    "@zhushanwen/extension-protocol": "0.18.0",
+    "@zhushanwen/pi-extension-logger": "0.6.2",
     "@zhushanwen/pi-session-path": "0.1.0"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.84.4",
-    "@earendil-works/pi-tui": "^0.84.4",
-    "@earendil-works/pi-ai": "^0.84.4",
-    "typebox": "*"
+    "@earendil-works/pi-coding-agent": "^1.0.0",
+    "@earendil-works/pi-tui": "^1.0.0",
+    "@earendil-works/pi-ai": "^1.0.0",
+    "typebox": "1.3.27"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-tui": {

package/src/__tests__/commands.test.ts

@@ -0,0 +1,74 @@
+/**
+ * /todos 命令双通道反馈单测（D10①，Q1 裁决）。
+ *
+ * 断言面：notify 通道（清单摘要 / 空态文案 / no-UI 提示）+ widget 通道
+ * （refreshDisplay 强推）；双通道在同一次命令触发中都可达。
+ */
+
+import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import { describe, expect, it, vi } from "vitest";
+
+import { registerTodosCommand } from "../commands";
+import type { RefreshDisplayFn } from "../handlers";
+import { addTodos } from "../model";
+import { createTodoSessionState } from "../state";
+
+type TodosCommandDef = {
+	handler: (args: string | undefined, ctx: ExtensionCommandContext) => Promise<void>;
+};
+
+function mockPi(): ExtensionAPI {
+	return { registerCommand: vi.fn() } as unknown as ExtensionAPI;
+}
+
+/** 注册命令并取回 handler 定义（registerCommand spy 的首次调用参数）。 */
+function registerTodos(def: { state?: ReturnType<typeof createTodoSessionState>; refreshDisplay?: RefreshDisplayFn }): TodosCommandDef {
+	const pi = mockPi();
+	const refreshDisplay = def.refreshDisplay ?? (vi.fn() as unknown as RefreshDisplayFn);
+	const state = def.state ?? createTodoSessionState();
+	registerTodosCommand(pi, state, refreshDisplay);
+	const calls = (pi.registerCommand as unknown as ReturnType<typeof vi.fn>).mock.calls as Array<[string, TodosCommandDef]>;
+	expect(calls[0]?.[0]).toBe("todos");
+	return calls[0][1];
+}
+
+function uiCtx(hasUI: boolean, notify: ReturnType<typeof vi.fn>): ExtensionCommandContext {
+	return { hasUI, ui: { notify }, sessionManager: { getSessionId: () => "s1" } } as unknown as ExtensionCommandContext;
+}
+
+describe("/todos command（D10① notify + widget 双通道）", () => {
+	it("有清单：notify 收到清单摘要（formatTodoList 形态）+ refreshDisplay 被推（widget 通道）", async () => {
+		const state = createTodoSessionState();
+		const added = addTodos(state.todos, state.nextId, ["first"]);
+		state.todos = added.newTodos;
+		state.nextId = added.newNextId;
+		const refreshDisplay = vi.fn() as unknown as RefreshDisplayFn;
+		const def = registerTodos({ state, refreshDisplay });
+		const notify = vi.fn();
+		await def.handler(undefined, uiCtx(true, notify));
+
+		expect(notify).toHaveBeenCalledTimes(1);
+		expect(String(notify.mock.calls[0][0])).toContain("[ ] #1: first");
+		expect(refreshDisplay).toHaveBeenCalledTimes(1);
+	});
+
+	it("空清单：notify 收到显式空态文案（不弹空串）", async () => {
+		const refreshDisplay = vi.fn() as unknown as RefreshDisplayFn;
+		const def = registerTodos({ refreshDisplay });
+		const notify = vi.fn();
+		await def.handler(undefined, uiCtx(true, notify));
+
+		expect(notify).toHaveBeenCalledWith("No todos for the current session", "info");
+		expect(refreshDisplay).toHaveBeenCalledTimes(1);
+	});
+
+	it("无 UI（hasUI=false）：仅 notify error 提示，widget 不推", async () => {
+		const refreshDisplay = vi.fn() as unknown as RefreshDisplayFn;
+		const def = registerTodos({ refreshDisplay });
+		const notify = vi.fn();
+		await def.handler(undefined, uiCtx(false, notify));
+
+		expect(notify).toHaveBeenCalledWith("/todos requires interactive mode", "error");
+		expect(refreshDisplay).not.toHaveBeenCalled();
+	});
+});

package/src/__tests__/entry.test.ts

@@ -0,0 +1,29 @@
+/**
+ * 工厂入口装配单测：默认导出一次性注册 event/tool/command 三通道。
+ *
+ * 断言面：5 个事件 handler（session_start/session_tree/agent_start/
+ * before_agent_start/agent_end）+ todo tool + todos 命令各注册一次；
+ * 命令名锚定 "todos"（/todos 入口漂移 = 用户命令失效）。
+ */
+
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { describe, expect, it, vi } from "vitest";
+
+import todoExtension from "../index";
+
+describe("todo extension 工厂入口", () => {
+	it("注册 5 个事件 handler + todo tool + todos 命令", () => {
+		const pi = {
+			on: vi.fn(),
+			registerTool: vi.fn(),
+			registerCommand: vi.fn(),
+		} as unknown as ExtensionAPI;
+
+		todoExtension(pi);
+
+		expect(pi.on).toHaveBeenCalledTimes(5);
+		expect(pi.registerTool).toHaveBeenCalledTimes(1);
+		expect(pi.registerCommand).toHaveBeenCalledTimes(1);
+		expect((pi.registerCommand as ReturnType<typeof vi.fn>).mock.calls[0]?.[0]).toBe("todos");
+	});
+});

package/src/commands.ts

@@ -1,19 +1,21 @@
 /**
- * /todos 命令注册 — 进入 TodoListComponent TUI 视图（双列布局）。
+ * /todos 命令注册 — notify + widget 双通道反馈（D10①，Q1 裁决）。
  *
- * todo-context 消息不再需要 registerMessageRenderer，
- * 因为所有 context 通过 before_agent_start 的 display:false 注入，
- * 用户在 TUI 中不可见。
+ * 反馈通道从 ctx.ui.custom 的 TUI 组件视图改为双通道：
+ * - notify：formatTodoList 清单摘要（toast 在 taiji RPC 模式可达）；
+ * - widget：refreshDisplay 强推 todo 面板（与 tool/handlers 反馈同一通道）。
+ * ctx.ui.custom 在 RPC 模式恒 undefined（评估组 B 实测），原 TodoListComponent
+ * 组件视图整体退役（component.ts 已删除）。
  */
 
-import type { ExtensionAPI, ExtensionCommandContext, KeybindingsManager, Theme } from "@earendil-works/pi-coding-agent";
-import type { TUI } from "@earendil-works/pi-tui";
+import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 
+import { formatTodoList } from "./model";
 import type { TodoSessionState } from "./state";
-import { TodoListComponent } from "./component";
+import type { RefreshDisplayFn } from "./handlers";
 
 /** 注册 /todos 命令到 pi */
-export function registerTodosCommand(pi: ExtensionAPI, state: TodoSessionState): void {
+export function registerTodosCommand(pi: ExtensionAPI, state: TodoSessionState, refreshDisplay: RefreshDisplayFn): void {
 	pi.registerCommand("todos", {
 		description: "View all todos for the current session",
 		handler: async (_args: string | undefined, ctx: ExtensionCommandContext) => {
@@ -22,13 +24,11 @@ export function registerTodosCommand(pi: ExtensionAPI, state: TodoSessionState):
 				return;
 			}
 
-			// ctx.ui.custom 的 factory 签名为
-			//   (tui: TUI, theme: Theme, keybindings: KeybindingsManager, done: (result) => void)
-			// 返回 Component & { dispose?(): void }。TodoListComponent 实现该形状，
-			// done 接收 result（此处忽略）。
-			await ctx.ui.custom((_tui: TUI, theme: Theme, _kb: KeybindingsManager, done: (result: unknown) => void) => {
-				return new TodoListComponent(state.todos, theme, () => done(undefined));
-			});
+			// widget 通道：强推清单面板（含 setStatus 状态行，空清单时清面板）
+			refreshDisplay(ctx);
+			// notify 通道：清单摘要 toast（空清单给显式空态文案，不弹空串）
+			const summary = formatTodoList(state.todos);
+			ctx.ui.notify(summary === "" ? "No todos for the current session" : summary, "info");
 		},
 	});
 }

package/src/index.ts

@@ -12,8 +12,7 @@
  * - handlers.ts: 5 个事件处理器（session_start/session_tree/agent_start/before_agent_start/agent_end）
  *                + reconstructState（回放最后一条 todo toolResult）+ steer 双机制（autoClear/completion）
  * - render.ts:   状态栏（status line）/ widget（单双列自适应）/ tool result 三层渲染
- * - component.ts: /todos 命令的 TodoListComponent TUI 视图（只读双列）
- * - commands.ts: /todos 命令注册
+ * - commands.ts: /todos 命令注册（notify + widget 双通道反馈，D10①）
  * - index.ts（本文件）: 工厂入口（创建 state + 注册 tool/command/event + makeRefreshDisplay）
  *
  * 错误处理：包内单一 throw 协议——handler 与 model 层纯函数（addTodos / updateTodos）
@@ -74,5 +73,5 @@ export default function (pi: ExtensionAPI) {
 	// ── 注册所有 handler / tool / command ──────────────
 	registerTodoEventHandlers(pi, state, refreshDisplay);
 	registerTodoTool(pi, state, refreshDisplay);
-	registerTodosCommand(pi, state);
+	registerTodosCommand(pi, state, refreshDisplay);
 }

package/src/model.ts

@@ -111,7 +111,7 @@ export function migrateTodo(raw: unknown): Todo {
 
 // ── GUI 渲染辅助 ─────────────────────────────────────
 
-/** completed 计数单一来源：renderStatusText / renderWidgetLines / component 三个消费点共用口径
+/** completed 计数单一来源：renderStatusText / renderWidgetLines 等消费点共用口径
  * （buildGui 的 tab 计数与段内容改由 openTodos/doneTodos 同源复用，不再经本函数）。 */
 export function todoProgress(todos: Todo[]): { completed: number; total: number } {
 	return {

package/src/render.ts

@@ -43,7 +43,7 @@ export function renderStatusText(todoList: Todo[], th: Theme): string {
 
 // ── Widget 双列渲染 ──────────────────────────────────
 
-/** 渲染单条 todo 的 widget 行（不含缩进），供 component.ts 复用。
+/** 渲染单条 todo 的 widget 行（不含缩进）。
  * textColor = 非完成态文本颜色（widget 用 "text"，tool result 列表用 "muted"——历史差异显式保留，未做视觉统一）。 */
 function renderWidgetItem(t: Todo, th: Theme, textColor: ThemeColor = "text"): string {
 	const mark =
@@ -70,7 +70,7 @@ function renderSingleColumn(
 	return todos.map((t) => truncateToWidth(indent + renderWidgetItem(t, th), maxWidth));
 }
 
-/** 双列布局渲染，供 widget 和 component 复用 */
+/** 双列布局渲染，供 widget 复用 */
 const COLUMN_COUNT = 2;
 
 export function renderDualColumn(

package/src/component.ts

@@ -1,75 +0,0 @@
-/**
- * /todos 命令的 TUI 组件 — 独立可关闭的 todo 列表视图（双列布局）。
- */
-
-import type { Theme } from "@earendil-works/pi-coding-agent";
-import { matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
-
-import { todoProgress, type Todo } from "./model";
-import { FALLBACK_TERM_WIDTH, renderDualColumn } from "./render";
-
-const HEADER_PREFIX_DASHES = 3;
-const HEADER_RESERVED_WIDTH = 10;
-
-export class TodoListComponent {
-	private todos: Todo[];
-	private theme: Theme;
-	private onClose: () => void;
-	private cachedWidth?: number;
-	private cachedLines?: string[];
-
-	constructor(todos: Todo[], theme: Theme, onClose: () => void) {
-		this.todos = todos;
-		this.theme = theme;
-		this.onClose = onClose;
-	}
-
-	handleInput(data: string): void {
-		if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
-			this.onClose();
-		}
-	}
-
-	render(width: number): string[] {
-		if (this.cachedLines && this.cachedWidth === width) {
-			return this.cachedLines;
-		}
-
-		const lines: string[] = [];
-		const th = this.theme;
-		const termWidth = width || FALLBACK_TERM_WIDTH;
-		const indent = "  ";
-
-		lines.push("");
-		const title = th.fg("accent", " Todos ");
-		const headerLine =
-			th.fg("borderMuted", "\u2500".repeat(HEADER_PREFIX_DASHES)) + title + th.fg("borderMuted", "\u2500".repeat(Math.max(0, termWidth - HEADER_RESERVED_WIDTH)));
-		lines.push(truncateToWidth(headerLine, termWidth));
-		lines.push("");
-
-		if (this.todos.length === 0) {
-			lines.push(truncateToWidth(`${indent}${th.fg("dim", "No todos yet. Ask the agent to add some!")}`, termWidth));
-		} else {
-			const { completed, total } = todoProgress(this.todos);
-			lines.push(truncateToWidth(`${indent}${th.fg("muted", `${completed}/${total} completed`)}`, termWidth));
-			lines.push("");
-
-			for (const line of renderDualColumn(this.todos, th, termWidth, indent)) {
-				lines.push(line);
-			}
-		}
-
-		lines.push("");
-		lines.push(truncateToWidth(`${indent}${th.fg("dim", "Press Escape to close")}`, termWidth));
-		lines.push("");
-
-		this.cachedWidth = width;
-		this.cachedLines = lines;
-		return lines;
-	}
-
-	invalidate(): void {
-		this.cachedWidth = undefined;
-		this.cachedLines = undefined;
-	}
-}