@agnishc/edb-todo 0.8.2 → 0.10.3

package/src/index.ts

@@ -1,111 +1,249 @@
 /**
  * edb-todo
  *
- * Task management extension that prevents "goal drift" — the tendency for
- * agents to lose track of the original plan as context grows.
+ * Task management extension with pi-tasks tool names, descriptions, and behavior.
  *
- * How it works:
- *   1. The agent uses `todo_write` to plan multi-step work as structured tasks
- *   2. Before every agent turn, active tasks are injected into the system prompt
- *   3. A live widget above the editor shows the task list to the user
- *   4. State is stored in tool-result details and reconstructed from the session
- *      branch, so /tree navigation and forking work correctly
+ * Tools:
+ *   TaskCreate  — Create a structured task
+ *   TaskList    — List all tasks with status and blocked-by info
+ *   TaskGet     — Get full task details, description, dependencies
+ *   TaskUpdate  — Update status, fields, dependencies; status:"deleted" removes
  *
- * Tools:   todo_write   — replace the entire task list (atomic update)
- *          todo_read    — read the current task list
- *          todo_remove  — remove tasks by ID (permanent deletion)
- * Command: /todos       — open interactive full-screen task viewer
+ * Command: /todos — interactive task manager with settings panel
  */
 
+import { join, resolve } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
-import { TodoViewComponent } from "./component";
-import { buildSystemPromptBlock, formatListForLLM } from "./prompt";
-import { TodoRemoveParams, TodoWriteParams } from "./schemas";
-import { reconstructState, store, updateWidget } from "./state";
-import type { TaskDetails, TaskPriority, TaskStatus } from "./types";
+import { AutoClearManager } from "./auto-clear.js";
+import { openTodosMenu, TodoViewComponent } from "./component.js";
+import { loadTodoConfig } from "./config.js";
+import { FileTaskStore } from "./file-store.js";
+import { ProcessTracker } from "./process-tracker.js";
+import { buildSystemPromptBlock, formatListForLLM } from "./prompt.js";
+import { TodoCreateParams, TodoGetParams, TodoUpdateParams } from "./schemas.js";
+import { priorityColor, priorityLabel, renderTaskListResult, TodoWidget } from "./state.js";
+import type { TaskDetails, TaskPriority } from "./types.js";
+
+// ── Constants ──────────────────────────────────────────────────────────────────
+
+const TASK_TOOL_NAMES = new Set(["TaskCreate", "TaskList", "TaskGet", "TaskUpdate", "TaskOutput", "TaskStop"]);
+const REMINDER_INTERVAL = 4;
+const AUTO_CLEAR_DELAY = 4;
+
+const SYSTEM_REMINDER = `<system-reminder>
+The task tools haven't been used recently. If you're working on tasks that would benefit from tracking progress, consider using TaskCreate to add new tasks and TaskUpdate to update task status (set to in_progress when starting, completed when done). Also consider cleaning up the task list if it has become stale. Only use these if relevant to the current work. This is just a gentle reminder - ignore if not applicable. Make sure that you NEVER mention this reminder to the user
+</system-reminder>`;
 
 // ── Extension ──────────────────────────────────────────────────────────────────
 
 export default function todoExtension(pi: ExtensionAPI): void {
-	// ── Session lifecycle ──────────────────────────────────────────────────
-	pi.on("session_start", async (_event, ctx) => {
-		reconstructState(ctx);
-		updateWidget(ctx);
+	let cwd = process.cwd();
+	let cfg = loadTodoConfig(cwd);
+	const taskScope = cfg.taskScope ?? "session";
+
+	function resolveStorePath(sessionId?: string): string | undefined {
+		const envVal = process.env.PI_TODO;
+		if (envVal === "off") return undefined;
+		if (envVal?.startsWith("/")) return envVal;
+		if (envVal?.startsWith(".")) return resolve(envVal);
+		if (envVal) return join(process.env.HOME ?? "~", ".pi", "tasks", `${envVal}.json`);
+
+		if (taskScope === "memory") return undefined;
+		if (taskScope === "session" && sessionId) {
+			return join(cwd, ".pi", "tasks", `tasks-${sessionId}.json`);
+		}
+		if (taskScope === "session") return undefined;
+		return join(cwd, ".pi", "tasks", "tasks.json");
+	}
+
+	let store = new FileTaskStore(resolveStorePath());
+	const tracker = new ProcessTracker();
+	const widget = new TodoWidget(store);
+	const autoClear = new AutoClearManager(
+		() => store,
+		() => cfg.autoClearCompleted ?? "on_list_complete",
+		AUTO_CLEAR_DELAY,
+	);
+
+	let storeUpgraded = false;
+	let persistedTasksShown = false;
+
+	function upgradeStoreIfNeeded(sessionId?: string) {
+		if (storeUpgraded) return;
+		if (taskScope === "session" && !process.env.PI_TODO) {
+			const path = resolveStorePath(sessionId);
+			if (path) {
+				store = new FileTaskStore(path);
+				widget.setStore(store);
+				autoClear.getStore = () => store;
+			}
+		}
+		storeUpgraded = true;
+	}
+
+	function showPersistedTasks(isResume = false) {
+		if (persistedTasksShown) return;
+		persistedTasksShown = true;
+		const tasks = store.list();
+		if (tasks.length > 0) {
+			if (!isResume && tasks.every((t) => t.status === "completed")) {
+				store.clearCompleted();
+				if (taskScope === "session") store.deleteFileIfEmpty();
+			} else {
+				widget.update();
+			}
+		}
+	}
+
+	// ── Turn tracking ──────────────────────────────────────────────────────────
+	let currentTurn = 0;
+	let lastTaskToolUseTurn = 0;
+	let reminderInjectedThisCycle = false;
+
+	pi.on("turn_start", async (_event, ctx) => {
+		currentTurn++;
+		cwd = ctx.cwd;
+		cfg = loadTodoConfig(cwd);
+		widget.setUICtx(ctx.ui);
+		upgradeStoreIfNeeded(ctx.sessionManager.getSessionId());
+		if (autoClear.onTurnStart(currentTurn)) widget.update();
 	});
 
-	pi.on("session_tree", async (_event, ctx) => {
-		reconstructState(ctx);
-		updateWidget(ctx);
+	// ── System-reminder injection ──────────────────────────────────────────────
+	pi.on("tool_result", async (event) => {
+		if (TASK_TOOL_NAMES.has(event.toolName)) {
+			lastTaskToolUseTurn = currentTurn;
+			reminderInjectedThisCycle = false;
+			return {};
+		}
+		if (currentTurn - lastTaskToolUseTurn < REMINDER_INTERVAL) return {};
+		if (reminderInjectedThisCycle) return {};
+		if (store.list().length === 0) return {};
+		reminderInjectedThisCycle = true;
+		lastTaskToolUseTurn = currentTurn;
+		return {
+			content: [...event.content, { type: "text" as const, text: SYSTEM_REMINDER }],
+		};
 	});
 
-	// ── System-prompt injection ────────────────────────────────────────────
-	pi.on("before_agent_start", async (event, _ctx) => {
-		const block = buildSystemPromptBlock();
+	// ── System-prompt injection ────────────────────────────────────────────────
+	pi.on("before_agent_start", async (event, ctx) => {
+		cwd = ctx.cwd;
+		cfg = loadTodoConfig(cwd);
+		widget.setUICtx(ctx.ui);
+		upgradeStoreIfNeeded(ctx.sessionManager.getSessionId());
+		showPersistedTasks();
+		const block = buildSystemPromptBlock(store);
 		if (!block) return;
 		return { systemPrompt: `${event.systemPrompt}\n\n${block}` };
 	});
 
-	// ── Post-turn widget refresh ───────────────────────────────────────────
 	pi.on("agent_end", async (_event, ctx) => {
-		updateWidget(ctx);
+		widget.setUICtx(ctx.ui);
+		widget.update();
+	});
+
+	// ── Session lifecycle ──────────────────────────────────────────────────────
+	pi.on("session_start", async (event, ctx) => {
+		const isResume = event.reason === "resume";
+		cwd = ctx.cwd;
+		cfg = loadTodoConfig(cwd);
+		storeUpgraded = false;
+		persistedTasksShown = false;
+		currentTurn = 0;
+		lastTaskToolUseTurn = 0;
+		reminderInjectedThisCycle = false;
+		autoClear.reset();
+		if (!isResume && taskScope === "memory") store.clearAll();
+		upgradeStoreIfNeeded(ctx.sessionManager.getSessionId());
+		widget.setUICtx(ctx.ui);
+		showPersistedTasks(isResume);
+	});
+
+	pi.on("session_tree", async (_event, ctx) => {
+		widget.setUICtx(ctx.ui);
+		widget.update();
 	});
 
-	// ── Tool: todo_write ───────────────────────────────────────────────────
+	// ── Tool: TaskCreate ───────────────────────────────────────────────────────
 	pi.registerTool({
-		name: "todo_write",
-		label: "Tasks",
-		description:
-			"Write and manage your task list for complex, multi-step work. " +
-			"Provide the COMPLETE updated list — this REPLACES the current list entirely.",
-		promptSnippet:
-			"Create and update a structured task list with statuses (pending / in_progress / completed) and priorities",
+		name: "TaskCreate",
+		label: "TaskCreate",
+		description: `Use this tool to create a structured task list for your current coding session. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.
+It also helps the user understand the progress of the task and overall progress of their requests.
+
+## When to Use This Tool
+
+Use this tool proactively in these scenarios:
+
+- Complex multi-step tasks - When a task requires 3 or more distinct steps or actions
+- Non-trivial and complex tasks - Tasks that require careful planning or multiple operations
+- User explicitly requests todo list - When the user directly asks you to use the todo list
+- User provides multiple tasks - When users provide a list of things to be done (numbered or comma-separated)
+- After receiving new instructions - Immediately capture user requirements as tasks
+- When you start working on a task - Mark it as in_progress BEFORE beginning work
+- After completing a task - Mark it as completed and add any new follow-up tasks discovered during implementation
+
+## When NOT to Use This Tool
+
+Skip using this tool when:
+- There is only a single, straightforward task
+- The task is trivial and tracking it provides no organizational benefit
+- The task can be completed in less than 3 trivial steps
+- The task is purely conversational or informational
+
+NOTE that you should not use this tool if there is only one trivial task to do. In this case you are better off just doing the task directly.
+
+## Task Fields
+
+- **content**: A brief, actionable title in imperative form (e.g., "Fix authentication bug in login flow")
+- **description**: Detailed description of what needs to be done, including context and acceptance criteria
+- **activeForm** (optional): Present continuous form shown in the spinner when in_progress (e.g., "Fixing authentication bug"). If omitted, the spinner shows the content instead.
+- **priority**: high / medium / low
+
+All tasks are created with status \`pending\`.
+
+## Tips
+
+- Create tasks with clear, specific content that describes the outcome
+- Include enough detail in the description for another agent to understand and complete the task
+- After creating tasks, use TaskUpdate to set up dependencies (blocks/blockedBy) if needed
+- Check TaskList first to avoid creating duplicate tasks`,
 		promptGuidelines: [
-			"Use todo_write at the start of any complex, multi-step task to break the work into a clear plan. " +
-				"Tasks should be specific and atomic (one concrete action each).",
-			"Before starting a task, call todo_write to set it to 'in_progress'. " +
-				"Only one task should be 'in_progress' at a time unless tasks are genuinely parallel.",
-			"Immediately after completing a task, call todo_write to mark it 'completed'. " +
-				"Do not batch completions — mark each task done as soon as it is finished. " +
-				"Completed tasks remain visible in the list; they are never automatically deleted.",
-			"todo_write REPLACES the entire list. Always include ALL tasks (both changed and unchanged) in every call.",
-			"To permanently remove tasks, use todo_remove instead of omitting them from todo_write.",
+			"When working on complex multi-step tasks, use TaskCreate to track progress and TaskUpdate to update status.",
+			"Mark tasks as in_progress before starting work and completed when done.",
+			"Use TaskList to check for available work after completing a task.",
 		],
-		parameters: TodoWriteParams,
+		parameters: TodoCreateParams,
 
 		async execute(_id, params, _signal, _onUpdate, ctx) {
-			const now = Date.now();
-			const updated = params.tasks.map((t) => ({
-				id: t.id ?? store.generateId(),
-				content: t.content,
-				status: t.status as TaskStatus,
-				priority: t.priority as TaskPriority,
-				createdAt: now,
-			}));
-
-			store.applyStatusTransitions(updated);
-			store.setTasks(updated);
-			store.syncIdCounter();
-			updateWidget(ctx);
-
+			autoClear.resetBatchCountdown();
+			const task = store.create(params.content, {
+				description: params.description,
+				priority: params.priority as TaskPriority | undefined,
+				activeForm: params.activeForm,
+				metadata: params.metadata,
+			});
+			widget.setUICtx(ctx.ui);
+			widget.update();
 			return {
-				content: [{ type: "text", text: formatListForLLM() }],
-				details: { tasks: [...store.tasks] } satisfies TaskDetails,
+				content: [{ type: "text", text: `Task #${task.id} created successfully: ${task.content}` }],
+				details: { tasks: [...store.list()] } satisfies TaskDetails,
 			};
 		},
 
 		renderCall(args, theme) {
-			const list = (args.tasks as any[]) ?? [];
-			const inProg = list.filter((t: any) => t.status === "in_progress").length;
-			const done = list.filter((t: any) => t.status === "completed").length;
-			const total = list.length;
-
-			let text = theme.fg("toolTitle", theme.bold("todo_write "));
-			text += theme.fg("muted", `${total} task${total !== 1 ? "s" : ""}`);
-			if (inProg > 0) text += `  ${theme.fg("accent", `● ${inProg} active`)}`;
-			if (done > 0) text += `  ${theme.fg("success", `✓ ${done} done`)}`;
-			return new Text(text, 0, 0);
+			const content = (args.content as string) ?? "";
+			const priority = (args.priority as string) ?? "medium";
+			const pColor = priorityColor(priority as TaskPriority);
+			const pLabel = theme.fg(pColor, priorityLabel(priority as TaskPriority));
+			return new Text(
+				`${theme.fg("toolTitle", theme.bold("TaskCreate ")) + pLabel}  ${theme.fg("muted", content)}`,
+				0,
+				0,
+			);
 		},
 
 		renderResult(result, { expanded }, theme) {
@@ -113,23 +251,65 @@ export default function todoExtension(pi: ExtensionAPI): void {
 		},
 	});
 
-	// ── Tool: todo_read ────────────────────────────────────────────────────
+	// ── Tool: TaskList ─────────────────────────────────────────────────────────
 	pi.registerTool({
-		name: "todo_read",
-		label: "Tasks",
-		description: "Read the current task list. Use this to check your tasks and their statuses.",
-		promptSnippet: "Read the current task list and statuses",
+		name: "TaskList",
+		label: "TaskList",
+		description: `Use this tool to list all tasks in the task list.
+
+## When to Use This Tool
+
+- To see what tasks are available to work on (status: pending, not blocked)
+- To check overall progress on the project
+- To find tasks that are blocked and need dependencies resolved
+- After completing a task, to check for newly unblocked work
+- **Prefer working on tasks in ID order** (lowest ID first) when multiple tasks are available
+
+## Output
+
+Returns a summary of each task:
+- **id**: Task identifier (use with TaskGet, TaskUpdate)
+- **content**: Brief description of the task
+- **status**: pending, in_progress, or completed
+- **priority**: high, medium, or low
+- **blockedBy**: Open task IDs that must be resolved first
+
+Use TaskGet with a specific task ID to view full details including description.`,
 		parameters: Type.Object({}),
 
 		async execute() {
+			const tasks = store.list();
+			if (tasks.length === 0)
+				return {
+					content: [{ type: "text", text: "No tasks found" }],
+					details: { tasks: [] } satisfies TaskDetails,
+				};
+
+			const statusOrder: Record<string, number> = { pending: 0, in_progress: 1, completed: 2 };
+			const sorted = [...tasks].sort((a, b) => {
+				const so = (statusOrder[a.status] ?? 0) - (statusOrder[b.status] ?? 0);
+				if (so !== 0) return so;
+				return a.id.localeCompare(b.id);
+			});
+
+			const lines = sorted.map((task) => {
+				let line = `[${task.status}] [${task.priority}] #${task.id} ${task.content}`;
+				const openBlockers = task.blockedBy.filter((bid) => {
+					const b = store.get(bid);
+					return b && b.status !== "completed";
+				});
+				if (openBlockers.length > 0) line += ` [blocked by ${openBlockers.map((id) => `#${id}`).join(", ")}]`;
+				return line;
+			});
+
 			return {
-				content: [{ type: "text", text: formatListForLLM() }],
-				details: { tasks: [...store.tasks] } satisfies TaskDetails,
+				content: [{ type: "text", text: lines.join("\n") }],
+				details: { tasks: sorted } satisfies TaskDetails,
 			};
 		},
 
 		renderCall(_args, theme) {
-			return new Text(theme.fg("toolTitle", theme.bold("todo_read")), 0, 0);
+			return new Text(theme.fg("toolTitle", theme.bold("TaskList")), 0, 0);
 		},
 
 		renderResult(result, { expanded }, theme) {
@@ -137,67 +317,333 @@ export default function todoExtension(pi: ExtensionAPI): void {
 		},
 	});
 
-	// ── Tool: todo_remove ──────────────────────────────────────────────────
+	// ── Tool: TaskGet ──────────────────────────────────────────────────────────
 	pi.registerTool({
-		name: "todo_remove",
-		label: "Tasks",
-		description:
-			"Permanently remove tasks by ID. Use this to clean up tasks that are no longer relevant. " +
-			"Completed tasks normally stay in the list for visibility — only remove if truly unwanted.",
-		promptSnippet: "Remove tasks by ID",
+		name: "TaskGet",
+		label: "TaskGet",
+		description: `Use this tool to retrieve a task by its ID from the task list.
+
+## When to Use This Tool
+
+- When you need the full description and context before starting work on a task
+- To understand task dependencies (what it blocks, what blocks it)
+- After being assigned a task, to get complete requirements
+
+## Output
+
+Returns full task details:
+- **content**: Task title
+- **description**: Detailed requirements and context
+- **status**: pending, in_progress, or completed
+- **priority**: high, medium, or low
+- **blocks**: Tasks waiting on this one to complete
+- **blockedBy**: Tasks that must complete before this one can start
+
+## Tips
+
+- After fetching a task, verify its blockedBy list is empty before beginning work.
+- Use TaskList to see all tasks in summary form.`,
+		parameters: TodoGetParams,
+
+		async execute(_id, params) {
+			const task = store.get(params.id);
+			if (!task) {
+				return {
+					content: [{ type: "text", text: `Task not found` }],
+					details: undefined,
+				};
+			}
+
+			const desc = task.description?.replace(/\\n/g, "\n") ?? "(no description)";
+			const lines: string[] = [
+				`Task #${task.id}: ${task.content}`,
+				`Status: ${task.status}`,
+				`Priority: ${task.priority}`,
+			];
+			if (task.owner) lines.push(`Owner: ${task.owner}`);
+			lines.push(`Description: ${desc}`);
+
+			const openBlockers = task.blockedBy.filter((bid) => {
+				const b = store.get(bid);
+				return b && b.status !== "completed";
+			});
+			if (openBlockers.length > 0) lines.push(`Blocked by: ${openBlockers.map((id) => `#${id}`).join(", ")}`);
+			if (task.blocks.length > 0) lines.push(`Blocks: ${task.blocks.map((id) => `#${id}`).join(", ")}`);
+			const metaKeys = Object.keys(task.metadata);
+			if (metaKeys.length > 0) lines.push(`Metadata: ${JSON.stringify(task.metadata)}`);
+
+			return {
+				content: [{ type: "text", text: lines.join("\n") }],
+				details: { tasks: [task] } satisfies TaskDetails,
+			};
+		},
+
+		renderCall(args, theme) {
+			return new Text(theme.fg("toolTitle", theme.bold("TaskGet ")) + theme.fg("muted", `#${args.id}`), 0, 0);
+		},
+
+		renderResult(result, { expanded }, theme) {
+			return renderTaskListResult((result.details as TaskDetails | undefined)?.tasks ?? [], expanded, theme);
+		},
+	});
+
+	// ── Tool: TaskUpdate ───────────────────────────────────────────────────────
+	pi.registerTool({
+		name: "TaskUpdate",
+		label: "TaskUpdate",
+		description: `Use this tool to update a task in the task list.
+
+## When to Use This Tool
+
+**Before starting work on a task:**
+- Mark it in_progress BEFORE beginning — do not start work without updating status first
+
+**Mark tasks as completed:**
+- When you have completed the work described in a task
+- IMPORTANT: Always mark your tasks as completed when you finish them
+- After completing, call TaskList to find your next task
+
+- ONLY mark a task as completed when you have FULLY accomplished it
+- If you encounter errors, blockers, or cannot finish, keep the task as in_progress
+- When blocked, create a new task describing what needs to be resolved
+- Never mark a task as completed if:
+  - Tests are failing
+  - Implementation is partial
+  - You encountered unresolved errors
+  - You couldn't find necessary files or dependencies
+
+**Delete tasks:**
+- When a task is no longer relevant or was created in error
+- Setting status to \`deleted\` permanently removes the task
+
+**Update task details:**
+- When requirements change or become clearer
+- When establishing dependencies between tasks
+
+## Fields You Can Update
+
+- **status**: pending → in_progress → completed (or deleted to remove)
+- **content**: Change the task title
+- **description**: Change the task description
+- **activeForm**: Spinner text when in_progress (e.g., "Running tests")
+- **priority**: high, medium, or low
+- **owner**: Agent name or owner
+- **metadata**: Merge metadata keys (set a key to null to delete it)
+- **addBlocks**: Task IDs that cannot start until this one completes
+- **addBlockedBy**: Task IDs that must complete before this one can start
+
+## Status Workflow
+
+\`pending\` → \`in_progress\` → \`completed\`
+
+Use \`deleted\` to permanently remove a task.
+
+## Examples
+
+Mark as in progress:
+\`{ "id": "t1", "status": "in_progress" }\`
+
+Mark as completed:
+\`{ "id": "t1", "status": "completed" }\`
+
+Delete a task:
+\`{ "id": "t1", "status": "deleted" }\`
+
+Set dependencies:
+\`{ "id": "t2", "addBlockedBy": ["t1"] }\``,
 		promptGuidelines: [
-			"Use todo_remove to permanently delete tasks that are no longer needed. " +
-				"Completed tasks remain visible by default — only remove if they clutter the list.",
+			"Mark tasks in_progress BEFORE starting work, completed immediately after finishing. Never batch completions.",
+			"ONLY mark completed when fully done — not when tests are failing or implementation is partial.",
 		],
-		parameters: TodoRemoveParams,
+		parameters: TodoUpdateParams,
 
 		async execute(_id, params, _signal, _onUpdate, ctx) {
-			const removed = store.removeByIds(params.ids);
-			updateWidget(ctx);
+			const { id, ...fields } = params;
+			const { task, changedFields, warnings } = store.update(id, fields as any);
+
+			if (changedFields.length === 0 && !task) {
+				return {
+					content: [{ type: "text", text: `Task #${id} not found` }],
+					details: { tasks: [...store.list()] } satisfies TaskDetails,
+				};
+			}
+
+			if (fields.status === "in_progress") {
+				widget.setActiveTask(id);
+				autoClear.resetBatchCountdown();
+			} else if (fields.status === "pending") {
+				autoClear.resetBatchCountdown();
+			} else if (fields.status === "completed") {
+				widget.setActiveTask(id, false);
+				autoClear.trackCompletion(id, currentTurn);
+			} else if (fields.status === "deleted") {
+				widget.setActiveTask(id, false);
+			}
+
+			widget.setUICtx(ctx.ui);
+			widget.update();
+
+			let msg: string;
+			if (changedFields.includes("deleted")) {
+				msg = `→ Updated task #${id} deleted`;
+			} else {
+				msg = `→ Updated task #${id} ${changedFields.join(", ")}`;
+			}
+			if (warnings.length > 0) msg += ` (warning: ${warnings.join("; ")})`;
 
-			if (removed.length === 0) {
+			return {
+				content: [{ type: "text", text: msg }],
+				details: { tasks: [...store.list()] } satisfies TaskDetails,
+			};
+		},
+
+		renderCall(args, theme) {
+			const id = args.id as string;
+			const status = args.status as string | undefined;
+			let extra = "";
+			if (status) extra = `  ${theme.fg("muted", `→ ${status}`)}`;
+			return new Text(theme.fg("toolTitle", theme.bold("TaskUpdate ")) + theme.fg("accent", `#${id}`) + extra, 0, 0);
+		},
+
+		renderResult(result, { expanded }, theme) {
+			return TodoViewComponent.renderTaskResult(result.details as TaskDetails | undefined, expanded, theme);
+		},
+	});
+
+	// ── Tool: TaskOutput ────────────────────────────────────────────
+	pi.registerTool({
+		name: "TaskOutput",
+		label: "TaskOutput",
+		description:
+			"Retrieves output from a running or completed background task process.\n" +
+			"- Takes a task_id parameter identifying the task\n" +
+			"- Returns the task output along with status information\n" +
+			"- Use block=true (default) to wait for task completion\n" +
+			"- Use block=false for a non-blocking check of current status\n" +
+			"- Task IDs can be found using TaskList",
+		parameters: Type.Object({
+			task_id: Type.String({ description: "The task ID to get output from" }),
+			block: Type.Optional(Type.Boolean({ description: "Whether to wait for completion (default: true)" })),
+			timeout: Type.Optional(
+				Type.Number({
+					description: "Max wait time in ms (default: 30000, max: 600000)",
+					minimum: 0,
+					maximum: 600000,
+				}),
+			),
+		}),
+
+		async execute(_id, params, signal) {
+			const { task_id, block = true, timeout = 30000 } = params;
+			const processOutput = tracker.getOutput(task_id);
+
+			if (!processOutput) {
+				const task = store.get(task_id);
+				if (!task) {
+					return {
+						content: [{ type: "text", text: `No task or process found with ID ${task_id}` }],
+						details: undefined,
+					};
+				}
 				return {
-					content: [{ type: "text", text: "No matching tasks found." }],
-					details: { tasks: [...store.tasks] } satisfies TaskDetails,
+					content: [{ type: "text", text: `Task #${task_id} [${task.status}] — no background process attached` }],
+					details: undefined,
 				};
 			}
 
+			if (block && processOutput.status === "running") {
+				const result = await tracker.waitForCompletion(task_id, timeout, signal ?? undefined);
+				if (result) {
+					return {
+						content: [
+							{
+								type: "text",
+								text: `Task #${task_id} (${result.status})${result.exitCode !== undefined ? ` exit ${result.exitCode}` : ""}\n\n${result.output}`,
+							},
+						],
+						details: undefined,
+					};
+				}
+			}
+
 			return {
 				content: [
 					{
 						type: "text",
-						text: `Removed ${removed.length} task${removed.length !== 1 ? "s" : ""}: ${removed.join(", ")}\n\n${formatListForLLM()}`,
+						text: `Task #${task_id} (${processOutput.status})${processOutput.exitCode !== undefined ? ` exit ${processOutput.exitCode}` : ""}\n\n${processOutput.output}`,
 					},
 				],
-				details: { tasks: [...store.tasks] } satisfies TaskDetails,
+				details: undefined,
 			};
 		},
 
 		renderCall(args, theme) {
-			const ids = (args.ids as string[]) ?? [];
-			const idStr = ids.map((id: string) => theme.fg("accent", id)).join(", ");
 			return new Text(
-				theme.fg("toolTitle", theme.bold("todo_remove ")) + theme.fg("muted", `remove ${idStr}`),
+				theme.fg("toolTitle", theme.bold("TaskOutput ")) + theme.fg("muted", `#${args.task_id}`),
 				0,
 				0,
 			);
 		},
+	});
 
-		renderResult(result, { expanded }, theme) {
-			return TodoViewComponent.renderTaskResult(result.details as TaskDetails | undefined, expanded, theme);
+	// ── Tool: TaskStop ──────────────────────────────────────────────
+	pi.registerTool({
+		name: "TaskStop",
+		label: "TaskStop",
+		description:
+			"Stops a running background task process.\n" +
+			"- Sends SIGTERM, waits 5 seconds, then SIGKILL if still running\n" +
+			"- Marks the task as completed after stopping\n" +
+			"- Use this tool when you need to terminate a long-running task",
+		parameters: Type.Object({
+			task_id: Type.String({ description: "The task ID of the background process to stop" }),
+		}),
+
+		async execute(_id, params, _signal, _onUpdate, ctx) {
+			const { task_id } = params;
+			const stopped = await tracker.stop(task_id);
+
+			if (!stopped) {
+				const task = store.get(task_id);
+				if (!task)
+					return {
+						content: [{ type: "text", text: `No running background process for task ${task_id}` }],
+						details: undefined,
+					};
+				return {
+					content: [
+						{ type: "text", text: `Task #${task_id} has no running background process (status: ${task.status})` },
+					],
+					details: undefined,
+				};
+			}
+
+			store.update(task_id, { status: "completed" });
+			autoClear.trackCompletion(task_id, currentTurn);
+			widget.setActiveTask(task_id, false);
+			widget.setUICtx(ctx.ui);
+			widget.update();
+
+			return { content: [{ type: "text", text: `Task #${task_id} stopped successfully` }], details: undefined };
+		},
+
+		renderCall(args, theme) {
+			return new Text(theme.fg("toolTitle", theme.bold("TaskStop ")) + theme.fg("accent", `#${args.task_id}`), 0, 0);
 		},
 	});
 
-	// ── Command: /todos ────────────────────────────────────────────────────
+	// ── Command: /todos ────────────────────────────────────────────────────────
 	pi.registerCommand("todos", {
-		description: "Open the interactive task viewer",
+		description: "Open the interactive task viewer and manager",
 		handler: async (_args, ctx) => {
 			if (!ctx.hasUI) {
-				ctx.ui.notify(store.tasks.length === 0 ? "No tasks yet." : formatListForLLM(), "info");
+				ctx.ui.notify(store.list().length === 0 ? "No tasks yet." : formatListForLLM(store), "info");
 				return;
 			}
-			await ctx.ui.custom<void>((_tui, theme, _kb, done) => {
-				return new TodoViewComponent(store.tasks, theme, () => done());
+			await openTodosMenu(ctx.ui, store, cfg, cwd, (taskId, status) => {
+				if (status === "in_progress") widget.setActiveTask(taskId);
+				else if (status) widget.setActiveTask(taskId, false);
+				widget.update();
 			});
 		},
 	});