@zhushanwen/pi-todo 0.1.6 → 0.2.0

package/src/commands.ts

@@ -1,17 +1,15 @@
 /**
- * /todos 命令注册 — 进入 TodoListComponent TUI 视图。
- * registerMessageRenderer for todo-context — 渲染注入的 todo 上下文消息。
+ * /todos 命令注册 — 进入 TodoListComponent TUI 视图（双列布局）。
  *
- * 拆分理由：原 src/index.ts 的 command 注册块与 message renderer 注册块
- * 混合了 TUI 组件定义与注册逻辑。抽出后 index.ts 工厂只需调用本文件
- * 导出的注册函数。
+ * todo-context 消息不再需要 registerMessageRenderer，
+ * 因为所有 context 通过 before_agent_start 的 display:false 注入，
+ * 用户在 TUI 中不可见。
  */
 
 import type { ExtensionAPI, ExtensionCommandContext, Theme } from "@mariozechner/pi-coding-agent";
-import { Text } from "@mariozechner/pi-tui";
 
-import { TodoListComponent } from "./component";
 import type { TodoSessionState } from "./state";
+import { TodoListComponent } from "./component";
 
 /** 注册 /todos 命令到 pi */
 export function registerTodosCommand(pi: ExtensionAPI, state: TodoSessionState): void {
@@ -29,22 +27,3 @@ export function registerTodosCommand(pi: ExtensionAPI, state: TodoSessionState):
 		},
 	});
 }
-
-/** 注册 todo-context 消息渲染器（用于 before_agent_start 注入的 <todo_context> 消息） */
-export function registerTodoContextRenderer(pi: ExtensionAPI): void {
-	pi.registerMessageRenderer("todo-context", (message: Record<string, unknown>, _options: unknown, theme: Theme) => {
-		const content = typeof message.content === "string" ? message.content : JSON.stringify(message.content);
-		const match = content.match(/\[TODO\]\s*(?:Turn \d+ — )?(\d+)\s*tasks?\s*(pending|completed)/);
-		let displayText: string;
-		if (match) {
-			const count = match[1];
-			displayText = match[2] === "completed"
-				? theme.fg("success", `[TODO] All ${count} tasks completed \u2713`)
-				: theme.fg("warning", `[TODO] ${count} tasks pending`);
-		} else {
-			const firstLine = content.split("\n").find((l: string) => l.includes("[TODO]")) || "[TODO]";
-			displayText = theme.fg("accent", firstLine.trim());
-		}
-		return new Text(displayText, 0, 0);
-	});
-}

package/src/component.ts

@@ -1,19 +1,16 @@
 /**
- * /todos 命令的 TUI 组件 — 独立可关闭的 todo 列表视图。
- *
- * 拆分理由：原 src/index.ts 的 TodoListComponent 占用约 85 行，与渲染函数、
- * tool 注册、事件注册混在一起。独立后 commands.ts 只需引用本组件。
+ * /todos 命令的 TUI 组件 — 独立可关闭的 todo 列表视图（双列布局）。
  */
 
 import type { Theme } from "@mariozechner/pi-coding-agent";
 import { matchesKey, truncateToWidth } from "@mariozechner/pi-tui";
 
 import type { Todo } from "./model";
+import { FALLBACK_TERM_WIDTH, renderDualColumn } from "./render";
 
 const HEADER_PREFIX_DASHES = 3;
 const HEADER_RESERVED_WIDTH = 10;
 
-/** /todos 命令的 TUI 组件 — 独立可关闭的 todo 列表视图 */
 export class TodoListComponent {
 	private todos: Todo[];
 	private theme: Theme;
@@ -40,51 +37,31 @@ export class TodoListComponent {
 
 		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, width - HEADER_RESERVED_WIDTH)));
-		lines.push(truncateToWidth(headerLine, width));
+			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(`  ${th.fg("dim", "No todos yet. Ask the agent to add some!")}`, width));
+			lines.push(truncateToWidth(`${indent}${th.fg("dim", "No todos yet. Ask the agent to add some!")}`, termWidth));
 		} else {
 			const completed = this.todos.filter((t) => t.status === "completed").length;
 			const total = this.todos.length;
-			lines.push(truncateToWidth(`  ${th.fg("muted", `${completed}/${total} completed`)}`, width));
+			lines.push(truncateToWidth(`${indent}${th.fg("muted", `${completed}/${total} completed`)}`, termWidth));
 			lines.push("");
 
-			for (const todo of this.todos) {
-				const mark =
-					todo.status === "completed"
-						? th.fg("success", "\u2713")
-						: todo.status === "verifying"
-							? th.fg("warning", "\u25d0")
-							: todo.status === "in_progress"
-								? th.fg("warning", "\u25cf")
-								: todo.status === "failed"
-									? th.fg("error", "\u2717")
-									: th.fg("dim", "\u25cb");
-				const id = th.fg("accent", `#${todo.id}`);
-				const text = todo.status === "completed" ? th.fg("dim", todo.text) : th.fg("text", todo.text);
-				let verifyTag = "";
-				if (todo.status === "verifying") {
-					verifyTag = th.fg("warning", ` [验证中${todo.evidence ? ": " + todo.evidence.slice(0, 30) : ""}]`);
-				} else if (todo.verifyText && todo.status !== "completed") {
-					verifyTag = th.fg("warning", " [待验证]");
-				} else if (todo.status === "completed" && todo.verifyText) {
-					verifyTag = th.fg("success", " [已验证]");
-				} else if (todo.verifyText === undefined) {
-					verifyTag = th.fg("dim", " [无需验证]");
-				}
-				lines.push(truncateToWidth(`  ${mark} ${id} ${text}${verifyTag}`, width));
+			for (const line of renderDualColumn(this.todos, th, termWidth, indent)) {
+				lines.push(line);
 			}
 		}
 
 		lines.push("");
-		lines.push(truncateToWidth(`  ${th.fg("dim", "Press Escape to close")}`, width));
+		lines.push(truncateToWidth(`${indent}${th.fg("dim", "Press Escape to close")}`, termWidth));
 		lines.push("");
 
 		this.cachedWidth = width;

package/src/handlers.ts

@@ -1,13 +1,6 @@
 /**
  * Todo 事件处理器 — session_start / session_tree / agent_start /
  * before_agent_start / agent_end。
- *
- * 拆分理由：原 src/index.ts 中 agent_end 处理器约 60 行、before_agent_start
- * 约 40 行，均超过 §11 "事件处理器 ≤ 20 行" 限制。本文件将每个事件
- * handler 拆为 ≤ 20 行的 orchestrator + 职责单一的子函数。
- *
- * 行为契约：所有 handler 行为与原 index.ts 内的 pi.on 回调完全一致；
- * 任何与原代码的偏差都属于 bug。
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
@@ -18,52 +11,59 @@ import {
 } from "./model";
 import type { TodoSessionState } from "./state";
 
-// ── 常量（与原 index.ts 内联常量保持一致） ──────────
+// ── 常量 ────────────────────────────────────────────
 
-/** v3: 全部完成后保留的轮数，之后再自动 clear */
+/** 全部完成后保留的轮数，之后再自动 clear */
 const AUTO_CLEAR_DELAY_ROUNDS = 2;
-/** v3: Stall 检测阈值（无 todo 活动轮数 → stall 提醒） */
+/** Stall 检测阈值（无 todo 活动轮数 → stall 提醒） */
 const STALL_THRESHOLD = 5;
-/** v3: 提醒间隔（上次 todo 调用后轮数 → 提醒） */
-const REMINDER_INTERVAL = 3;
-/** v3: 最大验证失败次数 */
-const MAX_VERIFY_ATTEMPTS = 2;
+/** 提醒间隔（上次 todo 调用后轮数 → 提醒） */
+const REMINDER_INTERVAL = 2;
 
 // ── 辅助函数 ────────────────────────────────────────
 
-/** 刷新状态栏 + widget（由 index.ts 注入，闭包共享 state） */
 export type RefreshDisplayFn = (ctx: ExtensionContext) => void;
 
-/** 构建 pending 任务的 <todo_context> 字符串（agent_end stall/reminder 共用） */
-function buildPendingContext(state: TodoSessionState, turnCount: number): string {
+/** 构建极简提醒：只含下一个推荐任务 */
+function buildMinimalReminder(state: TodoSessionState): string {
 	const pendingTodos = state.todos.filter((t) => t.status !== "completed");
-	const pendingCount = pendingTodos.length;
-	const completedCount = state.todos.filter((t) => t.status === "completed").length;
-	const lines = pendingTodos
-		.map((t) => {
-			let verifyTag = "";
-			if (t.status === "verifying") {
-				verifyTag = ` [验证中${t.evidence ? ": " + t.evidence : ""}] → 需要 evidence 完成验证`;
-			} else if (t.verifyText) {
-				verifyTag = ` [待验证: ${t.verifyText}]`;
-			}
-			return `#${t.id}: ${t.text}${verifyTag}`;
-		})
-		.join("\n");
-	return `<todo_context>\n[TODO] Turn ${turnCount} — ${pendingCount} tasks pending, ${completedCount} completed\n${lines}\n\nRules:\n- 优先使用 updates[] 批量更新\n- 有 verifyText 的任务: 先标 verifying(evidence="验证进度") → 再标 completed(evidence="验证结论")\n- 无 verifyText 的任务可直接 completed\n- 全部完成后工具自动闭合\n</todo_context>`;
+	if (pendingTodos.length === 0) return "";
+
+	const next = pendingTodos[0];
+	return `<todo_context>\n[TODO] 你有 ${pendingTodos.length} 个未完成任务。下一个应处理：#${next.id} ${next.text}\n</todo_context>`;
+}
+
+/** 构建 before_agent_start 的 todo context */
+function buildBeforeAgentStartMessage(state: TodoSessionState): { message: { customType: string; content: string; display: boolean } } | undefined {
+	if (state.todos.length === 0) return undefined;
+
+	const pendingTodos = state.todos.filter((t) => t.status !== "completed");
+	if (pendingTodos.length === 0) return undefined;
+
+	const lines = pendingTodos.map((t) => `#${t.id}: ${t.text}`);
+	const contextStr =
+		`<todo_context>\n[TODO] ${pendingTodos.length} tasks pending\n${lines.join("\n")}\n</todo_context>`;
+
+	return {
+		message: {
+			customType: "todo-context",
+			content: contextStr,
+			display: false,
+		},
+	};
 }
 
 // ── 状态重建 ────────────────────────────────────────
 
-/** 从 session entries 重建 state（兼容旧 done:boolean 格式 + entry GC） */
 export function reconstructState(state: TodoSessionState, ctx: ExtensionContext): void {
 	state.todos = [];
 	state.nextId = 1;
-	// v3: 重置提醒追踪状态
 	state.userMessageCount = 0;
 	state.lastTodoCallCount = 0;
 	state.stallNotified = false;
 	state.allCompletedAtCount = null;
+	state.completionSteered = false;
+	state.pendingSteerMessage = null;
 
 	const entries = ctx.sessionManager.getEntries();
 	let latestIdx = -1;
@@ -96,49 +96,11 @@ export function reconstructState(state: TodoSessionState, ctx: ExtensionContext)
 			entries.splice(staleIndices[j], 1);
 		}
 	}
-
-	// auto-clear 由 agent_end 延迟处理（AUTO_CLEAR_DELAY_ROUNDS），不再在此立即清空
 }
 
-// ── before_agent_start 子函数 ───────────────────────
-
-/** 构造 before_agent_start 返回的 todo context 消息 */
-function buildBeforeAgentStartMessage(state: TodoSessionState): { message: { customType: string; content: string; display: boolean } } | undefined {
-	if (state.todos.length === 0) return undefined;
+// ── agent_end 子函数 ────────────────────────────────
 
-	const pendingTodos = state.todos.filter((t) => t.status !== "completed");
-	if (pendingTodos.length === 0) return undefined;
-
-	// 格式化 pending 任务 (含 verifying 状态和 verifyText)
-	const lines = pendingTodos.map((t) => {
-		let verifyTag = "";
-		if (t.status === "verifying") {
-			verifyTag = ` [验证中${t.evidence ? ": " + t.evidence : ""}] → 需要 evidence 完成验证`;
-		} else if (t.verifyText) {
-			verifyTag = ` [待验证: ${t.verifyText}]`;
-		}
-		return `#${t.id}: ${t.text}${verifyTag}`;
-	});
-
-	const contextStr =
-		`<todo_context>\n[TODO] ${pendingTodos.length} tasks pending\n${lines.join("\n")}\n\nRules:\n- 有 verifyText 的任务: 先标 verifying(evidence="验证进度") → 再标 completed(evidence="验证结论")\n- 无 verifyText 的任务可直接 completed\n- 全部完成后工具自动闭合\n</todo_context>`;
-
-	return {
-		message: {
-			customType: "todo-context",
-			content: contextStr,
-			display: false,
-		},
-	};
-}
-
-// ── agent_end 4 个子函数 ───────────────────────────
-
-/** 1. Auto-clear: 所有 todo 都 completed → 延迟 N 轮后 clear
- *  返回 { handled, cleared }：
- *  - handled=true → orchestrator 应直接 return（allCompleted 路径或实际已清空）
- *  - cleared=true → 实际清空了 todos，orchestrator 需要 refreshDisplay
- */
+/** 1. Auto-clear */
 function handleAutoClear(state: TodoSessionState): { handled: boolean; cleared: boolean } {
 	const allCompleted = state.todos.every((t) => t.status === "completed");
 	if (!allCompleted) {
@@ -152,51 +114,46 @@ function handleAutoClear(state: TodoSessionState): { handled: boolean; cleared:
 		state.todos = [];
 		state.nextId = 1;
 		state.allCompletedAtCount = null;
+		state.completionSteered = false;
 		return { handled: true, cleared: true };
 	}
 	return { handled: true, cleared: false };
 }
 
-/** 2. Verify 失败处理: verifyAttempts >= MAX 且仍为 completed → 设 failed */
-function handleVerifyFailure(state: TodoSessionState, pi: ExtensionAPI): boolean {
-	const failedIds: number[] = [];
-	for (const t of state.todos) {
-		if (
-			t.status === "completed" &&
-			t.verifyText &&
-			t.verifyAttempts >= MAX_VERIFY_ATTEMPTS
-		) {
-			t.status = "failed";
-			failedIds.push(t.id);
-		}
-	}
-	if (failedIds.length > 0) {
-		pi.sendUserMessage(
-			`<todo_context>\n[TODO] 验证失败: Task ${failedIds.map((id) => "#" + id).join(", ")} 已重试 ${MAX_VERIFY_ATTEMPTS} 次仍未通过，已标记为 failed。请决定是否手动 override。\n</todo_context>`,
-			{ deliverAs: "steer", customType: "todo-context" },
-		);
-		return true;
-	}
-	return false;
+/** 2. 全部 completed 时设置延迟 steer（仅一次），由 before_agent_start 消费 */
+function handleCompletionSteer(state: TodoSessionState): boolean {
+	if (state.completionSteered) return false;
+	const allCompleted = state.todos.length > 0 && state.todos.every((t) => t.status === "completed");
+	if (!allCompleted) return false;
+
+	state.completionSteered = true;
+	state.pendingSteerMessage = `<todo_context>\n[TODO] 所有任务已完成。请快速检查每项任务的交付质量。\n</todo_context>`;
+	return true;
 }
 
-/** 3. Stall 检测: STALL_THRESHOLD 轮未调用 todo 且还有未完成任务 */
-function handleStallDetection(state: TodoSessionState, pi: ExtensionAPI): boolean {
+/** 3. Stall 检测 — 设置延迟 steer */
+function handleStallDetection(state: TodoSessionState): boolean {
 	if (
 		!state.stallNotified &&
 		state.userMessageCount - state.lastTodoCallCount >= STALL_THRESHOLD
 	) {
 		state.stallNotified = true;
-		pi.sendUserMessage(buildPendingContext(state, state.userMessageCount), { deliverAs: "steer", customType: "todo-context" });
+		const reminder = buildMinimalReminder(state);
+		if (reminder) {
+			state.pendingSteerMessage = reminder;
+		}
 		return true;
 	}
 	return false;
 }
 
-/** 4. 提醒: REMINDER_INTERVAL 轮未调用 todo */
-function handleReminder(state: TodoSessionState, pi: ExtensionAPI): boolean {
+/** 4. 提醒 — 设置延迟 steer */
+function handleReminder(state: TodoSessionState): boolean {
 	if (state.userMessageCount - state.lastTodoCallCount >= REMINDER_INTERVAL) {
-		pi.sendUserMessage(buildPendingContext(state, state.userMessageCount), { deliverAs: "steer", customType: "todo-context" });
+		const reminder = buildMinimalReminder(state);
+		if (reminder) {
+			state.pendingSteerMessage = reminder;
+		}
 		return true;
 	}
 	return false;
@@ -204,13 +161,11 @@ function handleReminder(state: TodoSessionState, pi: ExtensionAPI): boolean {
 
 // ── Event handler 注册入口 ──────────────────────────
 
-/** 注册所有 todo 事件处理器到 pi */
 export function registerTodoEventHandlers(
 	pi: ExtensionAPI,
 	state: TodoSessionState,
 	refreshDisplay: RefreshDisplayFn,
 ): void {
-	// session_start / session_tree: 重建 state + 刷新显示
 	pi.on("session_start", async (_event: unknown, ctx: ExtensionContext) => {
 		reconstructState(state, ctx);
 		refreshDisplay(ctx);
@@ -220,18 +175,23 @@ export function registerTodoEventHandlers(
 		refreshDisplay(ctx);
 	});
 
-	// v3: 追踪用户消息轮数
 	pi.on("agent_start", async (_event: unknown, _ctx: ExtensionContext) => {
 		state.userMessageCount++;
 	});
 
-	// v3: Task 6 - before_agent_start 注入 todo context (display: false)
 	pi.on("before_agent_start", async (_event: unknown, ctx: ExtensionContext) => {
 		try {
 			const pendingTodos = state.todos.filter((t) => t.status !== "completed");
 			if (pendingTodos.length > 0) {
 				ctx.ui.setStatus("todo", `📋 ${pendingTodos.length} pending`);
 			}
+			// 优先级 1: agent_end 设置的延迟 steer
+			if (state.pendingSteerMessage) {
+				const msg = state.pendingSteerMessage;
+				state.pendingSteerMessage = null;
+				return { message: { customType: "todo-context", content: msg, display: false } };
+			}
+
 			return buildBeforeAgentStartMessage(state);
 		} catch (e) {
 			console.debug("[todo] before_agent_start error:", e);
@@ -239,15 +199,19 @@ export function registerTodoEventHandlers(
 		}
 	});
 
-	// agent_end: auto-clear + verify-failed + stall + reminder (≤ 20 行 orchestrator)
 	pi.on("agent_end", async (_event: unknown, ctx: ExtensionContext) => {
 		try {
 			if (state.todos.length === 0) return;
+
+			// 全部 completed → 总检查 steer（仅一次）
+			handleCompletionSteer(state);
+
+			// auto-clear
 			const ac = handleAutoClear(state);
 			if (ac.handled) { if (ac.cleared) refreshDisplay(ctx); return; }
-			if (handleVerifyFailure(state, pi)) { refreshDisplay(ctx); return; }
-			if (handleStallDetection(state, pi)) return;
-			handleReminder(state, pi);
+
+			if (handleStallDetection(state)) return;
+			handleReminder(state);
 		} catch (e) {
 			console.debug("[todo] agent_end error:", e);
 		}

package/src/index.ts

@@ -17,13 +17,13 @@
  * - component.ts: TodoListComponent TUI 组件
  * - tool.ts: TodoParams schema + 5 个 action handler + execute dispatcher + registerTodoTool
  * - handlers.ts: 5 个事件处理器 + reconstructState + buildPendingContext
- * - commands.ts: /todos 命令 + todo-context 消息渲染器
+ * - commands.ts: /todos 命令
  * - index.ts（本文件）: 工厂入口（创建 state + 注册所有 handler）
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
 
-import { registerTodoContextRenderer,registerTodosCommand } from "./commands";
+import { registerTodosCommand } from "./commands";
 import { registerTodoEventHandlers } from "./handlers";
 import { renderStatusText, renderWidgetLines } from "./render";
 import { createTodoSessionState } from "./state";
@@ -50,5 +50,4 @@ export default function (pi: ExtensionAPI) {
 	registerTodoEventHandlers(pi, state, refreshDisplay);
 	registerTodoTool(pi, state, refreshDisplay);
 	registerTodosCommand(pi, state);
-	registerTodoContextRenderer(pi);
 }