@zhushanwen/pi-todo 0.1.6 → 0.3.0

package/src/model.ts

@@ -1,6 +1,7 @@
 /**
  * Todo 数据模型 — 纯函数，不依赖 Pi 运行时。
- * 从 index.ts 提取，便于单元测试。
+ * 四态: pending → in_progress → completed；任一状态 → cancelled
+ * （cancelled 不可恢复；isVerification 标记验证任务，FR-6 completion audit 用）
  */
 
 // ── 数据模型 ─────────────────────────────────────────
@@ -8,11 +9,9 @@
 export interface Todo {
 	id: number;
 	text: string;
-	verifyText?: string;
-	status: "pending" | "in_progress" | "verifying" | "completed" | "failed";
-	verifyAttempts: number;
-	/** 验证结论，verifying/completed 时写入 */
-	evidence?: string;
+	status: "pending" | "in_progress" | "completed" | "cancelled";
+	/** 验证任务标记（FR-6 completion audit）。验证任务必须 completed，不可 cancelled。 */
+	isVerification?: boolean;
 }
 
 export interface TodoDetails {
@@ -30,50 +29,42 @@ export interface TodoDetails {
 	};
 }
 
-export const VALID_STATUSES = ["pending", "in_progress", "verifying", "completed", "failed"] as const;
+export const VALID_STATUSES = ["pending", "in_progress", "completed", "cancelled"] as const;
 
 export type ValidStatus = (typeof VALID_STATUSES)[number];
 
 // ── 迁移/兼容 ───────────────────────────────────────
 
-// ── Stale Context Detection ──────────────────────────
-
-const STALE_CONTEXT_PATTERNS = ["aborted", "context canceled", "stale context", "stalecontext", "extension context no longer active"];
-
-/** 检查错误是否表示 stale / canceled context（如 session 重建 / compact 后） */
-export function isStaleContextError(error: Error | unknown): boolean {
-	const msg = error instanceof Error ? error.message : String(error);
-	const lower = msg.toLowerCase();
-	return STALE_CONTEXT_PATTERNS.some((p) => lower.includes(p));
-}
-
-
-/** 兼容旧格式：旧 entry 可能有 done: boolean，转换为 status；旧数据缺少 verifyText/verifyAttempts 时填充默认值 */
+/** 旧格式迁移：verifying → in_progress，failed → pending，done:boolean → status */
 export function migrateTodo(raw: Todo): Todo {
 	const record = raw as unknown as Record<string, unknown>;
 	const hasValidStatus =
 		typeof record.status === "string" &&
 		VALID_STATUSES.includes(record.status as ValidStatus);
 
-	const status: ValidStatus = hasValidStatus
-		? (record.status as ValidStatus)
-		: (() => {
-				const { done } = record as { done?: boolean };
-				return done === true ? "completed" : "pending";
-			})();
+	let status: ValidStatus;
+	if (hasValidStatus) {
+		status = record.status as ValidStatus;
+	} else {
+		// 极旧格式 done: boolean
+		const { done } = record as { done?: boolean };
+		status = done === true ? "completed" : "pending";
+	}
+
+	// 旧版五态映射（先转 string 避免类型收窄后无法比较）
+	const rawStatus = record.status as string | undefined;
+	if (rawStatus === "verifying") status = "in_progress";
+	if (rawStatus === "failed") status = "pending";
 
 	return {
 		id: record.id as number,
 		text: record.text as string,
 		status,
-		verifyText: typeof record.verifyText === "string" ? (record.verifyText as string) : undefined,
-		verifyAttempts: typeof record.verifyAttempts === "number" ? (record.verifyAttempts as number) : 0,
-		evidence: typeof record.evidence === "string" ? (record.evidence as string) : undefined,
+		// FR-6: 保留 isVerification 标记（可选字段，旧数据可能缺失）
+		isVerification: record.isVerification === true ? true : undefined,
 	};
 }
 
-
-
 // ── 渲染辅助 ─────────────────────────────────────────
 
 export function buildRender(todoList: Todo[]): TodoDetails["_render"] {
@@ -93,7 +84,7 @@ export function getDisplayStatus(t: Todo): string {
 	return migrateTodo(t).status;
 }
 
-// ── Add 逻辑（纯函数，可测试） ─────────────────────
+// ── Add 逻辑 ─────────────────────────────────────────
 
 export interface AddResult {
 	newTodos: Todo[];
@@ -102,18 +93,11 @@ export interface AddResult {
 	resultText?: string;
 }
 
-/**
- * 处理 todo add 的核心逻辑。
- * @param currentTodos 当前 todo 列表
- * @param currentNextId 当前 nextId
- * @param texts 要添加的文本列表
- * @param verifyTexts 可选的验证文本列表
- */
 export function addTodos(
 	currentTodos: Todo[],
 	currentNextId: number,
 	texts: string[],
-	verifyTexts?: string[],
+	isVerification?: boolean,
 ): AddResult {
 	if (!texts || texts.length === 0) {
 		return {
@@ -134,15 +118,6 @@ export function addTodos(
 		};
 	}
 
-	if (verifyTexts !== undefined && verifyTexts.length > trimmed.length) {
-		return {
-			newTodos: currentTodos,
-			newNextId: currentNextId,
-			error: "verifyTexts too long",
-			resultText: "Error: verifyTexts length cannot exceed texts length",
-		};
-	}
-
 	const startId = currentNextId;
 	const newTodos = [...currentTodos];
 	let nextId = currentNextId;
@@ -151,8 +126,8 @@ export function addTodos(
 			id: nextId++,
 			text: trimmed[i],
 			status: "pending" as const,
-			verifyText: verifyTexts?.[i],
-			verifyAttempts: 0,
+			// FR-6: isVerification 标记验证任务（可选，仅 add 时可设）
+			isVerification: isVerification === true ? true : undefined,
 		});
 	}
 	const endId = nextId - 1;
@@ -164,36 +139,18 @@ export function addTodos(
 	};
 }
 
-// ── Update 逻辑（纯函数，可测试） ──────────────────
+// ── Update 逻辑 ──────────────────────────────────────
 
 export interface UpdateResult {
 	updatedTodos: Todo[];
 	error?: string;
 	resultText?: string;
-	/** 拦截的任务 ID 及其原因 */
-	blocked?: Array<{ id: number; text: string; reason: string }>;
 }
 
-/** evidence 最小长度 */
-const MIN_EVIDENCE_LENGTH = 10;
-/** 最大验证重试次数 */
-const MAX_VERIFY_ATTEMPTS = 2;
-
-/**
- * 处理 todo batch update 的核心逻辑。
- * All-or-nothing: 任一验证失败，所有变更不生效。
- *
- * 状态转换规则：
- * - 无 verifyText: in_progress → completed 直接通过
- * - 有 verifyText: in_progress → verifying (需 evidence) → completed (需 evidence)
- * - 有 verifyText: in_progress → completed 需 verified=true + evidence（跳过 verifying）
- * - verifying → in_progress: verifyAttempts++
- */
 export function updateTodos(
 	currentTodos: Todo[],
-	updates: Array<{ id: number; status?: string; text?: string; verified?: boolean; evidence?: string }>,
+	updates: Array<{ id: number; status?: string; text?: string }>,
 ): UpdateResult {
-	// 验证: no duplicate ids
 	const ids = updates.map((u) => u.id);
 	if (new Set(ids).size !== ids.length) {
 		return {
@@ -202,7 +159,6 @@ export function updateTodos(
 			resultText: "Error: duplicate ids in updates",
 		};
 	}
-	// 验证: all ids exist and each has at least one change, and valid status
 	for (const u of updates) {
 		const todo = currentTodos.find((t) => t.id === u.id);
 		if (!todo) {
@@ -226,70 +182,29 @@ export function updateTodos(
 				resultText: `Error: invalid status '${u.status}' for update item id ${u.id}`,
 			};
 		}
-	}
-
-	// 状态转换拦截
-	const blockedItems: Array<{ id: number; text: string; reason: string }> = [];
-
-	for (const u of updates) {
-		if (!u.status) continue;
-		const todo = currentTodos.find((t) => t.id === u.id)!;
-
-		if (u.status === "verifying") {
-			// → verifying: 必须有 verifyText + evidence
-			if (!todo.verifyText) {
-				blockedItems.push({ id: todo.id, text: todo.text, reason: "无 verifyText 的任务不能进入 verifying 状态" });
-			} else if (!u.evidence || u.evidence.trim().length < MIN_EVIDENCE_LENGTH) {
-				blockedItems.push({ id: todo.id, text: todo.text, reason: `进入 verifying 需要 evidence（≥${MIN_EVIDENCE_LENGTH} 字符），说明当前验证进度` });
-			}
-		} else if (u.status === "completed") {
-			if (todo.verifyText && todo.status !== "verifying") {
-				// 有 verifyText 但未经过 verifying → 需要 verified=true + evidence
-				if (u.verified !== true) {
-					blockedItems.push({ id: todo.id, text: todo.text, reason: `有验证要求，请先标 verifying 并传 evidence，或传 verified=true + evidence 跳过` });
-				} else if (!u.evidence || u.evidence.trim().length < MIN_EVIDENCE_LENGTH) {
-					blockedItems.push({ id: todo.id, text: todo.text, reason: `跳过 verifying 直接 completed 时需要 evidence（≥${MIN_EVIDENCE_LENGTH} 字符）` });
-			}
-			} else if (todo.status === "verifying") {
-				// verifying → completed: 需要 evidence
-				if (!u.evidence || u.evidence.trim().length < MIN_EVIDENCE_LENGTH) {
-					blockedItems.push({ id: todo.id, text: todo.text, reason: `从 verifying 到 completed 需要 evidence（≥${MIN_EVIDENCE_LENGTH} 字符），说明验证结论` });
-			}
-			}
+		// FR-6 不变量守卫：(a) cancelled 不可恢复；(b) 验证任务不可 cancelled
+		if (todo.status === "cancelled" && u.status !== undefined) {
+			return {
+				updatedTodos: currentTodos,
+				error: `id ${u.id} is cancelled`,
+				resultText: `Error: Todo #${u.id} is cancelled and cannot be restored`,
+			};
+		}
+		if (todo.isVerification && u.status === "cancelled") {
+			return {
+				updatedTodos: currentTodos,
+				error: `id ${u.id} is verification todo`,
+				resultText: `Error: Todo #${u.id} is a verification todo and cannot be cancelled`,
+			};
 		}
 	}
 
-	if (blockedItems.length > 0) {
-		const lines = blockedItems.map(
-			(b) => `  #${b.id}: ${b.text} — ${b.reason}`,
-		);
-		return {
-			updatedTodos: currentTodos,
-			resultText: `⚠️ 以下任务被拦截:\n${lines.join("\n")}`,
-			blocked: blockedItems,
-		};
-	}
-
-	// Apply all (safe since all validated)
 	const updated = currentTodos.map((t) => {
 		const u = updates.find((u) => u.id === t.id);
 		if (!u) return t;
 		const patch: Partial<Todo> = {};
 		if (u.status) patch.status = u.status as Todo["status"];
 		if (u.text) patch.text = u.text;
-		// verifying 或 completed 时写入 evidence
-		if (u.evidence && (u.status === "verifying" || u.status === "completed")) {
-			patch.evidence = u.evidence.trim();
-		}
-		// verifying/completed → in_progress: verifyAttempts++（验证失败回退）
-		if (
-			u.status === "in_progress" &&
-			t.verifyText &&
-			t.verifyAttempts < MAX_VERIFY_ATTEMPTS &&
-			(t.status === "completed" || t.status === "verifying")
-		) {
-			patch.verifyAttempts = t.verifyAttempts + 1;
-		}
 		return { ...t, ...patch };
 	});
 	return {
@@ -300,25 +215,14 @@ export function updateTodos(
 
 // ── 格式化辅助 ───────────────────────────────────────
 
-/** 格式化单条 todo 为纯文本行（AI 可读），含 verifyText 原文 */
 export function formatTodoLine(t: Todo): string {
 	const mark =
 		t.status === "completed"
 			? "x"
-			: t.status === "verifying"
-				? "v"
-				: t.status === "in_progress"
-					? "~"
-					: t.status === "failed"
-						? "!"
-						: " ";
-	let line = `[${mark}] #${t.id}: ${t.text}`;
-	if (t.status === "verifying" && t.evidence) {
-		line += ` | 验证中: ${t.evidence}`;
-	} else if (t.status === "completed" && t.evidence) {
-		line += ` | 已验证: ${t.evidence}`;
-	} else if (t.verifyText) {
-		line += ` | 验证: ${t.verifyText}`;
-	}
-	return line;
+			: t.status === "in_progress"
+				? "~"
+				: t.status === "cancelled"
+					? "-"
+					: " ";
+	return `[${mark}] #${t.id}: ${t.text}`;
 }

package/src/render.ts

@@ -1,74 +1,136 @@
 /**
- * Todo 渲染函数 — 状态栏、widget、tool result 渲染。
- *
- * 拆分理由：原 src/index.ts 把渲染逻辑与业务逻辑混在一起。提取后 index.ts
- * 工厂只需调用 register* 函数；这些纯函数接受 Todo[] / theme 等入参，
- * 不依赖闭包状态，可独立测试。
+ * Todo 渲染函数 — 状态栏、widget（双列）、tool result 渲染。
  */
 
 import type { Theme } from "@mariozechner/pi-coding-agent";
-import { Text } from "@mariozechner/pi-tui";
+import { truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
 
 import {
-	buildRender,
 	getDisplayStatus,
 	type Todo,
 	type TodoDetails,
 } from "./model";
 
+// ── 常量 ────────────────────────────────────────────
+
 const MAX_COLLAPSED_ITEMS = 5;
+export const FALLBACK_TERM_WIDTH = 80;
+
+/**
+ * Pi 对单个 extension widget 的最大字符串行数为 10（InteractiveMode.MAX_WIDGET_LINES）。
+ * 扩展侧保守使用 max - 1 = 9 行作为阈值，超过时切换为双列布局，避免触发截断。
+ */
+const WIDGET_MAX_LINES = 9;
+const SINGLE_COLUMN_BUDGET = WIDGET_MAX_LINES - 1;
+
+/** 垂直分割线视觉宽度（" │ "） */
+const DIVIDER_VISUAL_WIDTH = 3;
+const ELLIPSIS_MIN_WIDTH = 3;
+
+/** 截断或补齐到精确视觉宽度，截断时追加 "..." */
+function fixedWidth(text: string, width: number): string {
+	const len = visibleWidth(text);
+	if (len <= width) {
+		return text + " ".repeat(width - len);
+	}
+	if (width <= ELLIPSIS_MIN_WIDTH) return "...".slice(0, width);
+	return truncateToWidth(text, width - ELLIPSIS_MIN_WIDTH) + "...";
+}
 
 // ── 状态栏 ────────────────────────────────────────────
 
-/** 渲染状态栏文本 */
 export function renderStatusText(todoList: Todo[], th: Theme): string {
 	if (todoList.length === 0) return "";
 
 	const completed = todoList.filter((t) => getDisplayStatus(t) === "completed").length;
 	const total = todoList.length;
 
-	// 全部完成
 	if (completed === total) {
 		return th.fg("success", `\u2713 ${completed}/${total}`);
 	}
-	// 有未完成
 	return th.fg("accent", "\u2611") + th.fg("muted", ` ${completed}/${total}`);
 }
 
-/** 渲染 widget 行 */
-export function renderWidgetLines(todoList: Todo[], th: Theme): string[] {
+// ── Widget 双列渲染 ──────────────────────────────────
+
+/** 渲染单条 todo 的 widget 行（不含缩进），供 component.ts 复用 */
+function renderWidgetItem(t: Todo, th: Theme): string {
+	const mark =
+		t.status === "completed"
+			? th.fg("success", "\u2713")
+			: t.status === "in_progress"
+				? th.fg("warning", "\u25cf")
+				: t.status === "cancelled"
+					? th.fg("error", "\u2715")
+					: th.fg("dim", "\u25cb");
+	const id = th.fg("accent", `#${t.id}`);
+	const text =
+		t.status === "completed" || t.status === "cancelled" ? th.fg("dim", t.text) : th.fg("text", t.text);
+	return `${mark} ${id} ${text}`;
+}
+
+/** 单列布局渲染（widget 少量任务时使用） */
+const PI_TEXT_PADDING = 2;
+
+function renderSingleColumn(
+	todos: Todo[],
+	th: Theme,
+	termWidth: number,
+	indent: string,
+): string[] {
+	const maxWidth = Math.max(1, termWidth - PI_TEXT_PADDING);
+	return todos.map((t) => truncateToWidth(indent + renderWidgetItem(t, th), maxWidth));
+}
+
+/** 双列布局渲染，供 widget 和 component 复用 */
+const COLUMN_COUNT = 2;
+
+export function renderDualColumn(
+	todos: Todo[],
+	th: Theme,
+	termWidth: number,
+	indent: string,
+): string[] {
+	const colWidth = Math.floor((termWidth - indent.length - DIVIDER_VISUAL_WIDTH) / COLUMN_COUNT);
+	const lines: string[] = [];
+	const half = Math.ceil(todos.length / COLUMN_COUNT);
+	const divider = " " + th.fg("borderMuted", "\u2502") + " ";
+	for (let row = 0; row < half; row++) {
+		const left = fixedWidth(indent + renderWidgetItem(todos[row], th), colWidth);
+		const rightIdx = row + half;
+		const right = rightIdx < todos.length
+			? fixedWidth(renderWidgetItem(todos[rightIdx], th), colWidth)
+			: " ".repeat(colWidth);
+		lines.push(left + divider + right);
+	}
+	return lines;
+}
+
+/** 渲染 widget 行（根据任务数自动选择单列或双列布局） */
+export function renderWidgetLines(
+	todoList: Todo[],
+	th: Theme,
+	termWidth?: number,
+): string[] {
 	if (todoList.length === 0) return [];
 
+	const width = termWidth ?? (process.stdout.columns || FALLBACK_TERM_WIDTH);
 	const lines: string[] = [];
 	const completed = todoList.filter((t) => getDisplayStatus(t) === "completed").length;
 	const total = todoList.length;
 
 	lines.push(th.fg("accent", "\u2611") + th.fg("muted", ` ${completed}/${total}`));
 
-	for (const t of todoList) {
-		const mark =
-			t.status === "completed"
-				? th.fg("success", "\u2713")
-				: t.status === "verifying"
-					? th.fg("warning", "\u25d0")
-					: t.status === "in_progress"
-						? th.fg("warning", "\u25cf")
-						: t.status === "failed"
-							? th.fg("error", "\u2717")
-							: th.fg("dim", "\u25cb");
-		const id = th.fg("accent", `#${t.id}`);
-		const text = t.status === "completed" ? th.fg("dim", t.text) : th.fg("text", t.text);
-		let verifyTag = "";
-		if (t.status === "verifying") {
-			verifyTag = th.fg("warning", ` [验证中${t.evidence ? ": " + t.evidence.slice(0, 30) : ""}]`);
-		} else if (t.verifyText && t.status !== "completed") {
-			verifyTag = th.fg("warning", " [待验证]");
-		} else if (t.status === "completed" && t.verifyText) {
-			verifyTag = th.fg("success", " [已验证]");
-		} else if (t.verifyText === undefined) {
-			verifyTag = th.fg("dim", " [无需验证]");
+	// 标题占 1 行；任务部分超过 WIDGET_MAX_LINES - 1 时启用双列
+	const indent = "  ";
+	if (todoList.length <= SINGLE_COLUMN_BUDGET) {
+		for (const line of renderSingleColumn(todoList, th, width, indent)) {
+			lines.push(line);
+		}
+	} else {
+		for (const line of renderDualColumn(todoList, th, width, indent)) {
+			lines.push(line);
 		}
-		lines.push(`  ${mark} ${id} ${text}${verifyTag}`);
 	}
 
 	return lines;
@@ -76,8 +138,7 @@ export function renderWidgetLines(todoList: Todo[], th: Theme): string[] {
 
 // ── 列表渲染辅助函数 ─────────────────────────────────
 
-/** 拼装 todo 列表的纯文本表示（AI/工具结果消费） */
-export function buildTodoListText(todoList: Todo[], options: { expanded: boolean }, theme: Theme): string {
+function buildTodoListText(todoList: Todo[], options: { expanded: boolean }, theme: Theme): string {
 	if (todoList.length === 0) {
 		return theme.fg("dim", "No todos");
 	}
@@ -88,26 +149,14 @@ export function buildTodoListText(todoList: Todo[], options: { expanded: boolean
 		const mark =
 			status === "completed"
 				? theme.fg("success", "\u2713")
-				: status === "verifying"
-					? theme.fg("warning", "\u25d0")
-					: status === "in_progress"
-						? theme.fg("warning", "\u25cf")
-						: status === "failed"
-							? theme.fg("error", "\u2717")
-							: theme.fg("dim", "\u25cb");
+				: status === "in_progress"
+					? theme.fg("warning", "\u25cf")
+					: status === "cancelled"
+						? theme.fg("error", "\u2715")
+						: theme.fg("dim", "\u25cb");
 		const itemText =
-			status === "completed" ? theme.fg("dim", t.text) : theme.fg("muted", t.text);
-		let verifyTag = "";
-		if (status === "verifying") {
-			verifyTag = theme.fg("warning", ` [验证中${t.evidence ? ": " + t.evidence.slice(0, 30) : ""}]`);
-		} else if (t.verifyText && status !== "completed") {
-			verifyTag = theme.fg("warning", " [待验证]");
-		} else if (status === "completed" && t.verifyText) {
-			verifyTag = theme.fg("success", " [已验证]");
-		} else if (t.verifyText === undefined) {
-			verifyTag = theme.fg("dim", " [无需验证]");
-		}
-		listText += `\n${mark} ${theme.fg("accent", `#${t.id}`)} ${itemText}${verifyTag}`;
+			status === "completed" || status === "cancelled" ? theme.fg("dim", t.text) : theme.fg("muted", t.text);
+		listText += `\n${mark} ${theme.fg("accent", `#${t.id}`)} ${itemText}`;
 	}
 	if (!options.expanded && todoList.length > MAX_COLLAPSED_ITEMS) {
 		listText += `\n${theme.fg("dim", `... ${todoList.length - MAX_COLLAPSED_ITEMS} more`)}`;
@@ -117,7 +166,8 @@ export function buildTodoListText(todoList: Todo[], options: { expanded: boolean
 
 // ── Tool renderResult handler ────────────────────────
 
-/** 渲染 tool execute 返回结果 */
+import { Text } from "@mariozechner/pi-tui";
+
 export function renderTodoResult(result: unknown, options: { expanded: boolean }, theme: Theme): Text {
 	const r = result as { content: Array<{ type: string; text?: string }>; details?: unknown };
 	const details = r.details as TodoDetails | undefined;
@@ -137,17 +187,7 @@ export function renderTodoResult(result: unknown, options: { expanded: boolean }
 			return new Text(buildTodoListText(todoList, options, theme), 0, 0);
 		}
 
-		case "add": {
-			const text = r.content[0];
-			const msg = text?.type === "text" ? (text.text ?? "") : "";
-			const listText = buildTodoListText(todoList, options, theme);
-			return new Text(
-				theme.fg("success", "\u2713 ") + theme.fg("muted", msg) + "\n\n" + listText,
-				0,
-				0,
-			);
-		}
-
+		case "add":
 		case "update":
 		case "delete":
 		case "clear": {
@@ -169,5 +209,3 @@ export function renderTodoResult(result: unknown, options: { expanded: boolean }
 	}
 }
 
-// 重新导出 buildRender 供 tool.ts 使用（避免循环引用）
-export { buildRender };

package/src/state.ts

@@ -12,11 +12,15 @@ import type { Todo } from "./model";
 export interface TodoSessionState {
 	todos: Todo[];
 	nextId: number;
-	// v3: 用户消息轮数与提醒追踪
+	// 用户消息轮数与提醒追踪
 	userMessageCount: number;
 	lastTodoCallCount: number;
 	stallNotified: boolean;
 	allCompletedAtCount: number | null;
+	/** 全部 completed 时已注入 steer，防止重复 */
+	completionSteered: boolean;
+	/** agent_end 设置、before_agent_start 消费的延迟 steer 消息 */
+	pendingSteerMessage: string | null;
 }
 
 export function createTodoSessionState(): TodoSessionState {
@@ -27,5 +31,7 @@ export function createTodoSessionState(): TodoSessionState {
 		lastTodoCallCount: 0,
 		stallNotified: false,
 		allCompletedAtCount: null,
+		completionSteered: false,
+		pendingSteerMessage: null,
 	};
 }