@zhushanwen/pi-todo 0.9.8 → 0.9.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-todo",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "description": "AI-driven todo list for Pi — stateful task management with session persistence and /todos command.",
   "type": "module",
   "main": "src/index.ts",
@@ -29,8 +29,9 @@
     "vitest": "^4.1.8"
   },
   "dependencies": {
-    "@zhushanwen/extension-protocol": "0.15.0",
-    "@zhushanwen/pi-extension-logger": "0.6.1"
+    "@zhushanwen/pi-extension-logger": "0.6.1",
+    "@zhushanwen/extension-protocol": "0.17.0",
+    "@zhushanwen/pi-session-path": "0.1.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "^0.84.4",

package/src/__tests__/active-path.test.ts

@@ -0,0 +1,159 @@
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { describe, expect, it, vi } from "vitest";
+
+import { reconstructState, registerTodoEventHandlers, type RefreshDisplayFn } from "../handlers";
+import { createTodoSessionState } from "../state";
+
+/**
+ * U6b：reconstructState 回放接活跃路径裁剪——从 leafId 沿 parentId 回溯得活跃路径，
+ * 被撤子树的 todo 快照不得进入重建态（不得经 `<todo_context>` 注入模型上下文）。
+ */
+
+interface BranchFixtureEntry {
+	id: string;
+	parentId: string | null;
+	todos?: { id: number; text: string; status: string }[];
+	nextId?: number;
+}
+
+/** todo toolResult 快照 entry（合法 TodoDetails，避免触发脏数据降级路径） */
+function todoEntry(id: string, parentId: string | null, todos: { id: number; text: string; status: string }[], nextId?: number) {
+	return {
+		type: "message",
+		id,
+		parentId,
+		timestamp: "2026-09-24T00:00:00.000Z",
+		message: { role: "toolResult", toolName: "todo", details: { todos, nextId } },
+	};
+}
+
+/** 撤回后真实形态：label entry 落文件尾（parentId = 回退后叶子），leafId 指向它 */
+function labelEntry(id: string, parentId: string | null) {
+	return { type: "label", id, parentId, timestamp: "2026-09-24T00:00:01.000Z", targetId: "u-x", label: "taiji:revoked" };
+}
+
+function makeCtx(entries: BranchFixtureEntry[], leafId: string | null): ExtensionContext {
+	return {
+		sessionManager: {
+			getEntries: () => entries,
+			getLeafId: () => leafId,
+		},
+	} as unknown as ExtensionContext;
+}
+
+describe("reconstructState 活跃路径裁剪（U6b）", () => {
+	it("有分支 fixture：被撤子树的 todo 快照不进重建态——取活跃路径内最后一条", () => {
+		// 树：e1(base) → e2(active-branch)；e1 → e3(revoked-branch，物理后写=被撤子树)；
+		// 撤回落 label 锚 L（parentId = 回退后叶子 e2），leafId = L → 活跃路径 {L, e2, e1}
+		const entries = [
+			todoEntry("e1", null, [{ id: 1, text: "base", status: "pending" }], 2),
+			todoEntry("e2", "e1", [{ id: 1, text: "active-branch", status: "in_progress" }], 2),
+			todoEntry("e3", "e1", [{ id: 1, text: "revoked-branch", status: "completed" }], 2),
+			labelEntry("L", "e2"),
+		];
+
+		const state = createTodoSessionState();
+		reconstructState(state, makeCtx(entries, "L"));
+
+		expect(state.todos).toHaveLength(1);
+		expect(state.todos[0]?.text).toBe("active-branch");
+		// 反向断言：被撤子树快照不进重建态
+		expect(state.todos.map((t) => t.text)).not.toContain("revoked-branch");
+		expect(state.nextId).toBe(2);
+	});
+
+	it("活跃路径内无 todo 快照（撤回点早于全部 todo 操作）→ 重建态为空，不回退到旧分支快照", () => {
+		// 树：e1(普通 message entry) → e2(todo 快照，被撤子树)；撤回后 leafId 指回 e1
+		const entries = [
+			{ type: "message", id: "e1", parentId: null, timestamp: "t", message: { role: "user", content: "hi" } },
+			todoEntry("e2", "e1", [{ id: 1, text: "only-on-revoked-branch", status: "pending" }], 2),
+			labelEntry("L", "e1"),
+		];
+
+		const state = createTodoSessionState();
+		reconstructState(state, makeCtx(entries, "L"));
+
+		expect(state.todos).toHaveLength(0);
+		expect(state.nextId).toBe(1);
+	});
+
+	it("无分支回归：leafId = 文件尾 → 全量回放最后一条（现行为不变）", () => {
+		const entries = [
+			todoEntry("e1", null, [{ id: 1, text: "first", status: "pending" }], 2),
+			todoEntry("e2", "e1", [{ id: 1, text: "first", status: "completed" }, { id: 2, text: "second", status: "in_progress" }], 3),
+		];
+
+		const state = createTodoSessionState();
+		reconstructState(state, makeCtx(entries, "e2"));
+
+		expect(state.todos).toHaveLength(2);
+		expect(state.todos[1]?.text).toBe("second");
+		expect(state.nextId).toBe(3);
+	});
+
+	it("leafId 防御：null / 指向不存在 entry → 回退文件尾全量回放（不静默清空重建态）", () => {
+		const entries = [
+			todoEntry("e1", null, [{ id: 1, text: "first", status: "pending" }], 2),
+			todoEntry("e2", "e1", [{ id: 1, text: "tail-snapshot", status: "pending" }], 2),
+		];
+
+		for (const leafId of [null, "missing-id"]) {
+			const state = createTodoSessionState();
+			reconstructState(state, makeCtx(entries, leafId));
+			expect(state.todos).toHaveLength(1);
+			expect(state.todos[0]?.text).toBe("tail-snapshot");
+		}
+	});
+});
+
+describe("环状 parentId 防御（损坏文件 / 非 pi 产出写入）", () => {
+	it("环状 parentId（a↔b，leafId 指向环内）→ 回溯终止不挂死，重建完成且不抛错", () => {
+		// 环：a.parentId=b、b.parentId=a；leafId=a → 回溯 a→b→(二次命中 a) 守卫终止
+		const entries = [
+			todoEntry("a", "b", [{ id: 1, text: "cycle-a", status: "pending" }], 2),
+			todoEntry("b", "a", [{ id: 1, text: "cycle-b", status: "in_progress" }], 2),
+		];
+
+		const state = createTodoSessionState();
+		expect(() => reconstructState(state, makeCtx(entries, "a"))).not.toThrow();
+
+		// 终止形态（实现语义）：activeIds = {a, b}，回放链上最后一条 todo 快照 b
+		expect(state.todos).toHaveLength(1);
+		expect(state.todos[0]?.text).toBe("cycle-b");
+		expect(state.nextId).toBe(2);
+	});
+});
+
+describe("session_tree handler 回归（重建态与裁剪后一致）", () => {
+	it("触发 session_tree → state 重建为活跃路径态 + refreshDisplay 调用", async () => {
+		const handlers = new Map<string, (event: unknown, ctx: ExtensionContext) => Promise<unknown>>();
+		const pi = {
+			on: vi.fn((event: string, handler: (event: unknown, ctx: ExtensionContext) => Promise<unknown>) => {
+				handlers.set(event, handler);
+			}),
+		} as unknown as ExtensionAPI;
+		const refreshDisplay = vi.fn() as unknown as RefreshDisplayFn;
+
+		const state = createTodoSessionState();
+		// 预填 stale：撤回前的旧分支态（模拟运行中撤回后缓存未失效的窗口）
+		state.todos = [{ id: 1, text: "revoked-branch", status: "completed" }];
+		state.nextId = 2;
+
+		registerTodoEventHandlers(pi, state, refreshDisplay);
+
+		const entries = [
+			todoEntry("e1", null, [{ id: 1, text: "base", status: "pending" }], 2),
+			todoEntry("e2", "e1", [{ id: 1, text: "active-branch", status: "in_progress" }], 2),
+			todoEntry("e3", "e1", [{ id: 1, text: "revoked-branch", status: "completed" }], 2),
+			labelEntry("L", "e2"),
+		];
+		await handlers.get("session_tree")!({ type: "session_tree" }, makeCtx(entries, "L"));
+
+		// 与直接调 reconstructState（裁剪语义）一致：活跃路径内最后一条
+		expect(state.todos).toHaveLength(1);
+		expect(state.todos[0]?.text).toBe("active-branch");
+		expect(refreshDisplay).toHaveBeenCalledTimes(1);
+		// 纯重建体：不注入消息（session_start 块无此副作用，todo handler 本就不 steer——回归锚）
+		expect(handlers.has("session_tree")).toBe(true);
+	});
+});

package/src/__tests__/steer.test.ts

@@ -27,7 +27,7 @@ function todoEntry(todos: Todo[], nextId: number) {
 
 function makeCtx(entries: unknown[]) {
 	return {
-		sessionManager: { getEntries: () => entries },
+		sessionManager: { getLeafId: () => null, getEntries: () => entries },
 	} as unknown as Parameters<typeof reconstructState>[1];
 }
 

package/src/__tests__/todo.test.ts

@@ -115,6 +115,7 @@ describe("reconstructState dirty entry degradation", () => {
 	function makeCtx(details: unknown): Parameters<typeof reconstructState>[1] {
 		return {
 			sessionManager: {
+				getLeafId: () => null,
 				getEntries: () => [
 					{ type: "message", message: { role: "toolResult", toolName: "todo", details } },
 				],

package/src/handlers.ts

@@ -5,6 +5,7 @@
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { getLogger } from "@zhushanwen/pi-extension-logger";
+import { filterActivePath } from "@zhushanwen/pi-session-path";
 
 import {
 	migrateTodo,
@@ -50,8 +51,13 @@ export function buildBeforeAgentStartMessage(state: TodoSessionState): { message
 
 // ── 状态重建 ────────────────────────────────────────
 
+// 活跃路径裁剪（leafId 沿 parentId 回溯，撤回后被撤子树的 todo 快照不进重建输入）
+// 收敛于 @zhushanwen/pi-session-path 单一实现（四包同构副本收编，防御语义与回退
+// 口径见该包 filterActivePath 注释；runtime 侧 entry-tree-builder 保持独立——
+// extension 不能 import runtime 包）。
+
 /**
- * 回放最后一条 todo toolResult 重建 state（纯读，不修改 entries）。
+ * 回放活跃路径内最后一条 todo toolResult 重建 state（纯读，不修改 entries）。
  *
  * H1（C2 决策）：pi 的 SessionManager.getEntries() 返回的是 filter-copy，原先的
  * splice GC 段对副本操作无效，且修改传入 entries 是反模式。删除整段 splice，只保留
@@ -65,7 +71,7 @@ export function reconstructState(state: TodoSessionState, ctx: ExtensionContext)
 	state.completionSteered = false;
 	state.pendingSteerMessage = null;
 
-	const entries = ctx.sessionManager.getEntries();
+	const entries = filterActivePath(ctx.sessionManager);
 
 	for (let i = 0; i < entries.length; i++) {
 		const entry = entries[i];