@zhushanwen/pi-todo 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-todo",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "AI-driven todo list for Pi — stateful task management with session persistence and /todos command.",
   "type": "module",
   "main": "src/index.ts",
@@ -22,7 +22,18 @@
     "index.ts"
   ],
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": "*"
+    "@mariozechner/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
+    "@earendil-works/pi-ai": "*",
+    "@sinclair/typebox": "*"
+  },
+  "peerDependenciesMeta": {
+    "@earendil-works/pi-tui": {
+      "optional": true
+    },
+    "@earendil-works/pi-ai": {
+      "optional": true
+    }
   },
   "scripts": {
     "typecheck": "npx tsc --noEmit"

package/src/index.ts

@@ -186,38 +186,6 @@ function renderWidgetLines(todoList: Todo[], th: Theme): string[] {
 	return lines;
 }
 
-/** 更新状态栏和 widget */
-function refreshDisplay(ctx: ExtensionContext): void {
-	const statusText = renderStatusText(todos, ctx.ui.theme);
-	ctx.ui.setStatus("todo", statusText || undefined);
-
-	if (todos.length === 0) {
-		ctx.ui.setWidget("todo", undefined);
-	} else {
-		ctx.ui.setWidget("todo", renderWidgetLines(todos, ctx.ui.theme));
-	}
-}
-
-// ── 模块级状态 ───────────────────────────────────────
-
-let todos: Todo[] = [];
-let nextId = 1;
-
-// v3: 用户消息轮数与提醒追踪
-let userMessageCount: number = 0;
-// null 表示未全部完成；设置后保留 AUTO_CLEAR_DELAY_ROUNDS 轮再清空
-let allCompletedAtCount: number | null = null;
-// 均用 number（初始 0），与 userMessageCount 直接做差值比较
-let lastTodoCallCount: number = 0;
-let lastReminderCount: number = 0;
-
-/** v3: 自动清空延迟轮数（全部完成后保留 N 轮用户消息） */
-const AUTO_CLEAR_DELAY_ROUNDS = 2;
-/** v3: Verification Nudge 触发阈值（完成 N 个任务以上时检查） */
-const VERIFICATION_NUDGE_THRESHOLD = 3;
-/** v3: Todo Reminder 触发间隔（N 轮未调用 todo 工具时提醒） */
-const TODO_REMINDER_INTERVAL = 10;
-
 /** 构建 _render 描述符 */
 function buildRender(todoList: Todo[]): TodoDetails["_render"] {
 	const completed = todoList.filter((t) => t.status === "completed").length;
@@ -232,251 +200,12 @@ function buildRender(todoList: Todo[]): TodoDetails["_render"] {
 	};
 }
 
-// ── Tool execute handler ─────────────────────────────
-
-function executeTodoAction(params: { action: string; text?: string; id?: number; texts?: string[]; ids?: number[]; status?: string }, ctx: ExtensionContext) {
-	let resultText = "";
-
-	// v3: 追踪 todo 工具调用轮数
-	lastTodoCallCount = userMessageCount;
-
-	switch (params.action) {
-		case "list": {
-			resultText = todos.length
-				? todos
-						.map((t) => {
-							const mark =
-								t.status === "completed"
-									? "x"
-									: t.status === "in_progress"
-										? "~"
-										: " ";
-							return `[${mark}] #${t.id}: ${t.text}`;
-						})
-						.join("\n")
-				: "\u6682\u65e0 todo";
-			break;
-		}
-
-		case "add": {
-			if (!params.texts || params.texts.length === 0) {
-				return {
-					content: [{ type: "text" as const, text: "\u9519\u8bef\uff1aadd \u9700\u8981 texts \u53c2\u6570\uff08\u975e\u7a7a\u6570\u7ec4\uff09" }],
-					details: {
-						action: "add" as const,
-						todos: [...todos],
-						nextId,
-						error: "texts required",
-						_render: buildRender(todos),
-				} as TodoDetails,
-				};
-			}
-			const trimmed = params.texts.map((t) => t.trim()).filter((t) => t.length > 0);
-			if (trimmed.length === 0) {
-				return {
-					content: [{ type: "text" as const, text: "\u9519\u8bef\uff1atexts \u4e2d\u81f3\u5c11\u9700\u8981\u4e00\u4e2a\u975e\u7a7a\u5b57\u7b26\u4e32" }],
-					details: {
-						action: "add" as const,
-						todos: [...todos],
-						nextId,
-						error: "all texts empty",
-						_render: buildRender(todos),
-				} as TodoDetails,
-				};
-			}
-			const startId = nextId;
-			for (const t of trimmed) {
-				todos.push({ id: nextId++, text: t, status: "pending" });
-			}
-			const endId = nextId - 1;
-			resultText = `\u5df2\u6dfb\u52a0 ${trimmed.length} \u9879 todo (#${startId}-#${endId})`;
-			// v3: 新增 todo 表示未全部完成
-			allCompletedAtCount = null;
-			break;
-		}
-
-		case "update": {
-			if (params.id === undefined) {
-				return {
-					content: [{ type: "text" as const, text: "\u9519\u8bef\uff1aupdate \u9700\u8981 id \u53c2\u6570" }],
-					details: {
-						action: "update" as const,
-						todos: [...todos],
-						nextId,
-						error: "id required",
-						_render: buildRender(todos),
-				} as TodoDetails,
-				};
-			}
-			if (params.status === undefined && params.text === undefined) {
-				return {
-					content: [{ type: "text" as const, text: "\u9519\u8bef\uff1aupdate \u81f3\u5c11\u9700\u8981 status \u6216 text \u53c2\u6570" }],
-					details: {
-						action: "update" as const,
-						todos: [...todos],
-						nextId,
-						error: "need status or text",
-						_render: buildRender(todos),
-				} as TodoDetails,
-				};
-			}
-			if (params.text !== undefined && params.text === "") {
-				return {
-					content: [{ type: "text" as const, text: "\u9519\u8bef\uff1atext \u4e0d\u80fd\u4e3a\u7a7a\u5b57\u7b26\u4e32" }],
-					details: {
-						action: "update" as const,
-						todos: [...todos],
-						nextId,
-						error: "text empty",
-						_render: buildRender(todos),
-				} as TodoDetails,
-				};
-			}
-			if (
-				params.status !== undefined &&
-				!VALID_STATUSES.includes(params.status as (typeof VALID_STATUSES)[number])
-			) {
-				return {
-					content: [
-						{
-							type: "text" as const,
-							text: `\u9519\u8bef\uff1astatus \u53ea\u63a5\u53d7 ${VALID_STATUSES.join(" / ")}`,
-						},
-					],
-					details: {
-						action: "update" as const,
-						todos: [...todos],
-						nextId,
-						error: `invalid status: ${params.status}`,
-						_render: buildRender(todos),
-				} as TodoDetails,
-				};
-			}
-
-			const todo = todos.find((t) => t.id === params.id);
-			if (!todo) {
-				return {
-					content: [{ type: "text" as const, text: `Todo #${params.id} \u4e0d\u5b58\u5728` }],
-					details: {
-						action: "update" as const,
-						todos: [...todos],
-						nextId,
-						error: `#${params.id} not found`,
-						_render: buildRender(todos),
-				} as TodoDetails,
-				};
-			}
-
-			// T5 完成引导：判断是否是最后一个 pending 即将完成
-			const incompleteBefore = todos.filter(
-				(t) => t.status !== "completed",
-			);
-			const isLastCompletion =
-				params.status === "completed" &&
-				incompleteBefore.length === 1 &&
-				incompleteBefore[0].id === todo.id;
-
-			if (params.status !== undefined) {
-				todo.status = params.status as Todo["status"];
-			}
-			if (params.text !== undefined) {
-				todo.text = params.text;
-			}
-
-			const parts: string[] = [`\u5df2\u66f4\u65b0 todo #${todo.id}`];
-			if (params.status !== undefined) parts.push(`\u72b6\u6001 \u2192 ${params.status}`);
-			if (params.text !== undefined) parts.push(`\u6587\u672c \u2192 "${todo.text}"`);
-			resultText = parts.join("\uff0c");
-
-			if (isLastCompletion) {
-				resultText += "\n\n\u6240\u6709 todo \u5df2\u5b8c\u6210\u3002\u8bf7\u603b\u7ed3\u5de5\u4f5c\u6210\u679c\u3002";
-			}
-
-			// v3: 检查是否所有 todo 已完成
-			const allCompleted = todos.every((t) => t.status === "completed");
-			if (allCompleted && todos.length > 0) {
-				allCompletedAtCount = userMessageCount;
-			} else {
-				allCompletedAtCount = null;
-			}
-			break;
-		}
-
-		case "delete": {
-			if (!params.ids || params.ids.length === 0) {
-				return {
-					content: [{ type: "text" as const, text: "\u9519\u8bef\uff1adelete \u9700\u8981 ids \u53c2\u6570\uff08\u975e\u7a7a\u6570\u7ec4\uff09" }],
-					details: {
-						action: "delete" as const,
-						todos: [...todos],
-						nextId,
-						error: "ids required",
-						_render: buildRender(todos),
-				} as TodoDetails,
-				};
-			}
-			const uniqueIds = [...new Set(params.ids)];
-			const missing = uniqueIds.filter((id) => !todos.some((t) => t.id === id));
-			if (missing.length > 0) {
-				const missingStr = missing.map((id) => `#${id}`).join(", ");
-				return {
-					content: [{ type: "text" as const, text: `\u9519\u8bef\uff1aTodo ${missingStr} \u4e0d\u5b58\u5728` }],
-					details: {
-						action: "delete" as const,
-						todos: [...todos],
-						nextId,
-						error: `#${missing.map((id) => id).join(", #")} not found`,
-						_render: buildRender(todos),
-				} as TodoDetails,
-				};
-			}
-			const removedIds: number[] = [];
-			for (const id of uniqueIds) {
-				const idx = todos.findIndex((t) => t.id === id);
-				if (idx !== -1) {
-					todos.splice(idx, 1);
-					removedIds.push(id);
-				}
-			}
-			resultText = `\u5df2\u5220\u9664 ${removedIds.length} \u9879 (#${removedIds.join(", #")})\uff0c\u5269\u4f59 ${todos.length} \u9879`;
-			break;
-		}
-
-		case "clear": {
-			const count = todos.length;
-			todos = [];
-			nextId = 1;
-			resultText = count > 0 ? `\u5df2\u6e05\u7a7a ${count} \u9879 todo` : "\u6682\u65e0 todo\uff0c\u65e0\u9700\u6e05\u7a7a";
-			// v3: 手动清空后重置
-			allCompletedAtCount = null;
-			break;
-		}
-
-		default:
-			return {
-				content: [{ type: "text" as const, text: `\u672a\u77e5 action: ${params.action}` }],
-				details: {
-					action: "list" as const,
-					todos: [...todos],
-					nextId,
-					error: `unknown action: ${params.action}`,
-					_render: buildRender(todos),
-				} as TodoDetails,
-			};
-	}
-
-	refreshDisplay(ctx);
-
-	return {
-		content: [{ type: "text" as const, text: resultText }],
-		details: {
-			action: params.action as TodoDetails["action"],
-			todos: [...todos],
-			nextId,
-			_render: buildRender(todos),
-		} as TodoDetails,
-	};
-}
+/** v3: 自动清空延迟轮数（全部完成后保留 N 轮用户消息） */
+const AUTO_CLEAR_DELAY_ROUNDS = 2;
+/** v3: Verification Nudge 触发阈值（完成 N 个任务以上时检查） */
+const VERIFICATION_NUDGE_THRESHOLD = 3;
+/** v3: Todo Reminder 触发间隔（N 轮未调用 todo 工具时提醒） */
+const TODO_REMINDER_INTERVAL = 10;
 
 // ── 列表渲染辅助函数 ─────────────────────────────────
 
@@ -560,7 +289,277 @@ function renderTodoResult(result: unknown, options: { expanded: boolean }, theme
 // ── 扩展入口 ─────────────────────────────────────────
 
 export default function (pi: ExtensionAPI) {
-	const reconstructState = (ctx: ExtensionContext) => {
+	// ── 闭包内状态（session 隔离） ─────────────────────
+	let todos: Todo[] = [];
+	let nextId = 1;
+
+	// v3: 用户消息轮数与提醒追踪
+	let userMessageCount = 0;
+	let allCompletedAtCount: number | null = null;
+	let lastTodoCallCount = 0;
+	let lastReminderCount = 0;
+
+	// ── 刷新显示（依赖闭包 state） ─────────────────────
+	function refreshDisplay(ctx: ExtensionContext): void {
+		const statusText = renderStatusText(todos, ctx.ui.theme);
+		ctx.ui.setStatus("todo", statusText || undefined);
+		if (todos.length === 0) {
+			ctx.ui.setWidget("todo", undefined);
+		} else {
+			ctx.ui.setWidget("todo", renderWidgetLines(todos, ctx.ui.theme));
+		}
+	}
+
+	// ── Tool execute handler ─────────────────────────────
+	function executeTodoAction(
+		params: { action: string; text?: string; id?: number; texts?: string[]; ids?: number[]; status?: string },
+		ctx: ExtensionContext,
+	) {
+		let resultText = "";
+
+		// v3: 追踪 todo 工具调用轮数
+		lastTodoCallCount = userMessageCount;
+
+		switch (params.action) {
+			case "list": {
+				resultText = todos.length
+					? todos
+							.map((t) => {
+								const mark =
+									t.status === "completed"
+										? "x"
+										: t.status === "in_progress"
+											? "~"
+											: " ";
+								return `[${mark}] #${t.id}: ${t.text}`;
+							})
+							.join("\n")
+					: "\u6682\u65e0 todo";
+				break;
+			}
+
+			case "add": {
+				if (!params.texts || params.texts.length === 0) {
+					return {
+						content: [{ type: "text" as const, text: "\u9519\u8bef\uff1aadd \u9700\u8981 texts \u53c2\u6570\uff08\u975e\u7a7a\u6570\u7ec4\uff09" }],
+						details: {
+							action: "add" as const,
+							todos: [...todos],
+							nextId,
+							error: "texts required",
+							_render: buildRender(todos),
+					} as TodoDetails,
+					};
+				}
+				const trimmed = params.texts.map((t) => t.trim()).filter((t) => t.length > 0);
+				if (trimmed.length === 0) {
+					return {
+						content: [{ type: "text" as const, text: "\u9519\u8bef\uff1atexts \u4e2d\u81f3\u5c11\u9700\u8981\u4e00\u4e2a\u975e\u7a7a\u5b57\u7b26\u4e32" }],
+						details: {
+							action: "add" as const,
+							todos: [...todos],
+							nextId,
+							error: "all texts empty",
+							_render: buildRender(todos),
+					} as TodoDetails,
+					};
+				}
+				const startId = nextId;
+				for (const t of trimmed) {
+					todos.push({ id: nextId++, text: t, status: "pending" });
+				}
+				const endId = nextId - 1;
+				resultText = `\u5df2\u6dfb\u52a0 ${trimmed.length} \u9879 todo (#${startId}-#${endId})`;
+				// v3: 新增 todo 表示未全部完成
+				allCompletedAtCount = null;
+				break;
+			}
+
+			case "update": {
+				if (params.id === undefined) {
+					return {
+						content: [{ type: "text" as const, text: "\u9519\u8bef\uff1aupdate \u9700\u8981 id \u53c2\u6570" }],
+						details: {
+							action: "update" as const,
+							todos: [...todos],
+							nextId,
+							error: "id required",
+							_render: buildRender(todos),
+					} as TodoDetails,
+					};
+				}
+				if (params.status === undefined && params.text === undefined) {
+					return {
+						content: [{ type: "text" as const, text: "\u9519\u8bef\uff1aupdate \u81f3\u5c11\u9700\u8981 status \u6216 text \u53c2\u6570" }],
+						details: {
+							action: "update" as const,
+							todos: [...todos],
+							nextId,
+							error: "need status or text",
+							_render: buildRender(todos),
+					} as TodoDetails,
+					};
+				}
+				if (params.text !== undefined && params.text === "") {
+					return {
+						content: [{ type: "text" as const, text: "\u9519\u8bef\uff1atext \u4e0d\u80fd\u4e3a\u7a7a\u5b57\u7b26\u4e32" }],
+						details: {
+							action: "update" as const,
+							todos: [...todos],
+							nextId,
+							error: "text empty",
+							_render: buildRender(todos),
+					} as TodoDetails,
+					};
+				}
+				if (
+					params.status !== undefined &&
+					!VALID_STATUSES.includes(params.status as (typeof VALID_STATUSES)[number])
+				) {
+					return {
+						content: [
+							{
+								type: "text" as const,
+								text: `\u9519\u8bef\uff1astatus \u53ea\u63a5\u53d7 ${VALID_STATUSES.join(" / ")}`,
+							},
+						],
+						details: {
+							action: "update" as const,
+							todos: [...todos],
+							nextId,
+							error: `invalid status: ${params.status}`,
+							_render: buildRender(todos),
+					} as TodoDetails,
+					};
+				}
+
+				const todo = todos.find((t) => t.id === params.id);
+				if (!todo) {
+					return {
+						content: [{ type: "text" as const, text: `Todo #${params.id} \u4e0d\u5b58\u5728` }],
+						details: {
+							action: "update" as const,
+							todos: [...todos],
+							nextId,
+							error: `#${params.id} not found`,
+							_render: buildRender(todos),
+					} as TodoDetails,
+					};
+				}
+
+				// T5 完成引导：判断是否是最后一个 pending 即将完成
+				const incompleteBefore = todos.filter(
+					(t) => t.status !== "completed",
+				);
+				const isLastCompletion =
+					params.status === "completed" &&
+					incompleteBefore.length === 1 &&
+					incompleteBefore[0].id === todo.id;
+
+				if (params.status !== undefined) {
+					todo.status = params.status as Todo["status"];
+				}
+				if (params.text !== undefined) {
+					todo.text = params.text;
+				}
+
+				const parts: string[] = [`\u5df2\u66f4\u65b0 todo #${todo.id}`];
+				if (params.status !== undefined) parts.push(`\u72b6\u6001 \u2192 ${params.status}`);
+				if (params.text !== undefined) parts.push(`\u6587\u672c \u2192 "${todo.text}"`);
+				resultText = parts.join("\uff0c");
+
+				if (isLastCompletion) {
+					resultText += "\n\n\u6240\u6709 todo \u5df2\u5b8c\u6210\u3002\u8bf7\u603b\u7ed3\u5de5\u4f5c\u6210\u679c\u3002";
+				}
+
+				// v3: 检查是否所有 todo 已完成
+				const allCompleted = todos.every((t) => t.status === "completed");
+				if (allCompleted && todos.length > 0) {
+					allCompletedAtCount = userMessageCount;
+				} else {
+					allCompletedAtCount = null;
+				}
+				break;
+			}
+
+			case "delete": {
+				if (!params.ids || params.ids.length === 0) {
+					return {
+						content: [{ type: "text" as const, text: "\u9519\u8bef\uff1adelete \u9700\u8981 ids \u53c2\u6570\uff08\u975e\u7a7a\u6570\u7ec4\uff09" }],
+						details: {
+							action: "delete" as const,
+							todos: [...todos],
+							nextId,
+							error: "ids required",
+							_render: buildRender(todos),
+					} as TodoDetails,
+					};
+				}
+				const uniqueIds = [...new Set(params.ids)];
+				const missing = uniqueIds.filter((id) => !todos.some((t) => t.id === id));
+				if (missing.length > 0) {
+					const missingStr = missing.map((id) => `#${id}`).join(", ");
+					return {
+						content: [{ type: "text" as const, text: `\u9519\u8bef\uff1aTodo ${missingStr} \u4e0d\u5b58\u5728` }],
+						details: {
+							action: "delete" as const,
+							todos: [...todos],
+							nextId,
+							error: `#${missing.map((id) => id).join(", #")} not found`,
+							_render: buildRender(todos),
+					} as TodoDetails,
+					};
+				}
+				const removedIds: number[] = [];
+				for (const id of uniqueIds) {
+					const idx = todos.findIndex((t) => t.id === id);
+					if (idx !== -1) {
+						todos.splice(idx, 1);
+						removedIds.push(id);
+					}
+				}
+				resultText = `\u5df2\u5220\u9664 ${removedIds.length} \u9879 (#${removedIds.join(", #")})\uff0c\u5269\u4f59 ${todos.length} \u9879`;
+				break;
+			}
+
+			case "clear": {
+				const count = todos.length;
+				todos = [];
+				nextId = 1;
+				resultText = count > 0 ? `\u5df2\u6e05\u7a7a ${count} \u9879 todo` : "\u6682\u65e0 todo\uff0c\u65e0\u9700\u6e05\u7a7a";
+				// v3: 手动清空后重置
+				allCompletedAtCount = null;
+				break;
+			}
+
+			default:
+				return {
+					content: [{ type: "text" as const, text: `\u672a\u77e5 action: ${params.action}` }],
+					details: {
+						action: "list" as const,
+						todos: [...todos],
+						nextId,
+						error: `unknown action: ${params.action}`,
+						_render: buildRender(todos),
+					} as TodoDetails,
+				};
+		}
+
+		refreshDisplay(ctx);
+
+		return {
+			content: [{ type: "text" as const, text: resultText }],
+			details: {
+				action: params.action as TodoDetails["action"],
+				todos: [...todos],
+				nextId,
+				_render: buildRender(todos),
+			} as TodoDetails,
+		};
+	}
+
+	// ── 状态重建 ───────────────────────────────────────
+	function reconstructState(ctx: ExtensionContext) {
 		todos = [];
 		nextId = 1;
 
@@ -601,8 +600,9 @@ export default function (pi: ExtensionAPI) {
 				entries.splice(staleIndices[j], 1);
 			}
 		}
-	};
+	}
 
+	// ── 事件处理器 ──────────────────────────────────────
 	pi.on("session_start", async (_event: any, ctx: ExtensionContext) => {
 		reconstructState(ctx);
 		refreshDisplay(ctx);
@@ -676,6 +676,7 @@ export default function (pi: ExtensionAPI) {
 		}
 	});
 
+	// ── Tool: todo ──────────────────────────────────────
 	pi.registerTool({
 		name: "todo",
 		label: "Todo",
@@ -701,7 +702,7 @@ export default function (pi: ExtensionAPI) {
 		parameters: TodoParams,
 
 		async execute(_toolCallId: string, params: Static<typeof TodoParams>, _signal: AbortSignal | undefined, _onUpdate: any, ctx: ExtensionContext) {
-			const result = await executeTodoAction(params as any, ctx);
+			const result = executeTodoAction(params as any, ctx);
 			// Append input params to error results for debugging
 			const details = result.details as { error?: string } | undefined;
 			if (details?.error) {
@@ -729,6 +730,7 @@ export default function (pi: ExtensionAPI) {
 		},
 	});
 
+	// ── Command: /todos ─────────────────────────────────
 	pi.registerCommand("todos", {
 		description: "\u67e5\u770b\u5f53\u524d\u5206\u652f\u7684\u6240\u6709 todo",
 		handler: async (_args: string | undefined, ctx: ExtensionCommandContext) => {