mitsupi 1.0.2 → 1.0.3

package/pi-extensions/todos.ts

@@ -1,13 +1,35 @@
 /**
- * Todo storage settings are kept in <todo-dir>/settings.json.
+ * This extension stores todo items as files under <todo-dir> (defaults to .pi/todos,
+ * or the path in PI_TODO_PATH).  Each todo is a standalone markdown file named
+ * <id>.md and an optional <id>.lock file is used while a session is editing it.
+ *
+ * File format in .pi/todos:
+ * - The file starts with a JSON object (not YAML) containing the front matter:
+ *   { id, title, tags, status, created_at, assigned_to_session }
+ * - After the JSON block comes optional markdown body text separated by a blank line.
+ * - Example:
+ *   {
+ *     "id": "deadbeef",
+ *     "title": "Add tests",
+ *     "tags": ["qa"],
+ *     "status": "open",
+ *     "created_at": "2026-01-25T17:00:00.000Z",
+ *     "assigned_to_session": "session.json"
+ *   }
+ *
+ *   Notes about the work go here.
  *
+ * Todo storage settings are kept in <todo-dir>/settings.json.
  * Defaults:
  * {
  *   "gc": true,   // delete closed todos older than gcDays on startup
  *   "gcDays": 7   // age threshold for GC (days since created_at)
  * }
+ *
+ * Use `/todos` to bring up the visual todo manager or just let the LLM use them
+ * naturally.
  */
-import { DynamicBorder, getMarkdownTheme, keyHint, type ExtensionAPI, type ExtensionContext, type Theme } from "@mariozechner/pi-coding-agent";
+import { DynamicBorder, copyToClipboard, getMarkdownTheme, keyHint, type ExtensionAPI, type ExtensionContext, type Theme } from "@mariozechner/pi-coding-agent";
 import { StringEnum } from "@mariozechner/pi-ai";
 import { Type } from "@sinclair/typebox";
 import path from "node:path";
@@ -33,9 +55,10 @@ import {
 } from "@mariozechner/pi-tui";
 
 const TODO_DIR_NAME = ".pi/todos";
-const TODO_PATH_ENV = "PI_ISSUE_PATH";
+const TODO_PATH_ENV = "PI_TODO_PATH";
 const TODO_SETTINGS_NAME = "settings.json";
 const TODO_ID_PREFIX = "TODO-";
+const TODO_ID_PATTERN = /^[a-f0-9]{8}$/i;
 const DEFAULT_TODO_SETTINGS = {
 	gc: true,
 	gcDays: 7,
@@ -48,6 +71,7 @@ interface TodoFrontMatter {
 	tags: string[];
 	status: string;
 	created_at: string;
+	assigned_to_session?: string;
 }
 
 interface TodoRecord extends TodoFrontMatter {
@@ -67,7 +91,17 @@ interface TodoSettings {
 }
 
 const TodoParams = Type.Object({
-	action: StringEnum(["list", "list-all", "get", "create", "update", "append", "delete"] as const),
+	action: StringEnum([
+		"list",
+		"list-all",
+		"get",
+		"create",
+		"update",
+		"append",
+		"delete",
+		"claim",
+		"release",
+	] as const),
 	id: Type.Optional(
 		Type.String({ description: "Todo id (TODO-<hex> or raw hex filename)" }),
 	),
@@ -77,17 +111,39 @@ const TodoParams = Type.Object({
 	body: Type.Optional(
 		Type.String({ description: "Long-form details (markdown). Update replaces; append adds." }),
 	),
+	force: Type.Optional(Type.Boolean({ description: "Override another session's assignment" })),
 });
 
-type TodoAction = "list" | "list-all" | "get" | "create" | "update" | "append" | "delete";
-
-type TodoOverlayAction = "work" | "refine" | "close" | "reopen" | "delete" | "cancel" | "actions";
-
-type TodoMenuAction = TodoOverlayAction | "copy-path" | "close-dialog" | "view";
+type TodoAction =
+	| "list"
+	| "list-all"
+	| "get"
+	| "create"
+	| "update"
+	| "append"
+	| "delete"
+	| "claim"
+	| "release";
+
+type TodoOverlayAction = "back" | "work";
+
+type TodoMenuAction =
+	| "work"
+	| "refine"
+	| "close"
+	| "reopen"
+	| "release"
+	| "delete"
+	| "copy"
+	| "view";
 
 type TodoToolDetails =
-	| { action: "list" | "list-all"; todos: TodoFrontMatter[]; error?: string }
-	| { action: "get" | "create" | "update" | "append" | "delete"; todo: TodoRecord; error?: string };
+	| { action: "list" | "list-all"; todos: TodoFrontMatter[]; currentSessionId?: string; error?: string }
+	| {
+			action: "get" | "create" | "update" | "append" | "delete" | "claim" | "release";
+			todo: TodoRecord;
+			error?: string;
+		};
 
 function formatTodoId(id: string): string {
 	return `${TODO_ID_PREFIX}${id}`;
@@ -104,6 +160,14 @@ function normalizeTodoId(id: string): string {
 	return trimmed;
 }
 
+function validateTodoId(id: string): { id: string } | { error: string } {
+	const normalized = normalizeTodoId(id);
+	if (!normalized || !TODO_ID_PATTERN.test(normalized)) {
+		return { error: "Invalid todo id. Expected TODO-<hex>." };
+	}
+	return { id: normalized.toLowerCase() };
+}
+
 function displayTodoId(id: string): string {
 	return formatTodoId(normalizeTodoId(id));
 }
@@ -112,18 +176,28 @@ function isTodoClosed(status: string): boolean {
 	return ["closed", "done"].includes(status.toLowerCase());
 }
 
+function clearAssignmentIfClosed(todo: TodoFrontMatter): void {
+	if (isTodoClosed(getTodoStatus(todo))) {
+		todo.assigned_to_session = undefined;
+	}
+}
+
 function sortTodos(todos: TodoFrontMatter[]): TodoFrontMatter[] {
 	return [...todos].sort((a, b) => {
 		const aClosed = isTodoClosed(a.status);
 		const bClosed = isTodoClosed(b.status);
 		if (aClosed !== bClosed) return aClosed ? 1 : -1;
+		const aAssigned = !aClosed && Boolean(a.assigned_to_session);
+		const bAssigned = !bClosed && Boolean(b.assigned_to_session);
+		if (aAssigned !== bAssigned) return aAssigned ? -1 : 1;
 		return (a.created_at || "").localeCompare(b.created_at || "");
 	});
 }
 
 function buildTodoSearchText(todo: TodoFrontMatter): string {
 	const tags = todo.tags.join(" ");
-	return `${formatTodoId(todo.id)} ${todo.id} ${todo.title} ${tags} ${todo.status}`.trim();
+	const assignment = todo.assigned_to_session ? `assigned:${todo.assigned_to_session}` : "";
+	return `${formatTodoId(todo.id)} ${todo.id} ${todo.title} ${tags} ${todo.status} ${assignment}`.trim();
 }
 
 function filterTodos(todos: TodoFrontMatter[], query: string): TodoFrontMatter[] {
@@ -160,6 +234,9 @@ function filterTodos(todos: TodoFrontMatter[], query: string): TodoFrontMatter[]
 			const aClosed = isTodoClosed(a.todo.status);
 			const bClosed = isTodoClosed(b.todo.status);
 			if (aClosed !== bClosed) return aClosed ? 1 : -1;
+			const aAssigned = !aClosed && Boolean(a.todo.assigned_to_session);
+			const bAssigned = !bClosed && Boolean(b.todo.assigned_to_session);
+			if (aAssigned !== bAssigned) return aAssigned ? -1 : 1;
 			return a.score - b.score;
 		})
 		.map((match) => match.todo);
@@ -177,6 +254,7 @@ class TodoSelectorComponent extends Container implements Focusable {
 	private theme: Theme;
 	private headerText: Text;
 	private hintText: Text;
+	private currentSessionId?: string;
 
 	private _focused = false;
 	get focused(): boolean {
@@ -194,11 +272,13 @@ class TodoSelectorComponent extends Container implements Focusable {
 		onSelect: (todo: TodoFrontMatter) => void,
 		onCancel: () => void,
 		initialSearchInput?: string,
+		currentSessionId?: string,
 		private onQuickAction?: (todo: TodoFrontMatter, action: "work" | "refine") => void,
 	) {
 		super();
 		this.tui = tui;
 		this.theme = theme;
+		this.currentSessionId = currentSessionId;
 		this.allTodos = todos;
 		this.filteredTodos = todos;
 		this.onSelectCallback = onSelect;
@@ -293,12 +373,14 @@ class TodoSelectorComponent extends Container implements Focusable {
 			const titleColor = isSelected ? "accent" : closed ? "dim" : "text";
 			const statusColor = closed ? "dim" : "success";
 			const tagText = todo.tags.length ? ` [${todo.tags.join(", ")}]` : "";
+			const assignmentText = renderAssignmentSuffix(this.theme, todo, this.currentSessionId);
 			const line =
 				prefix +
 				this.theme.fg("accent", formatTodoId(todo.id)) +
 				" " +
 				this.theme.fg(titleColor, todo.title || "(untitled)") +
 				this.theme.fg("muted", tagText) +
+				assignmentText +
 				" " +
 				this.theme.fg(statusColor, `(${todo.status || "open"})`);
 			this.listContainer.addChild(new Text(line, 0, 0));
@@ -358,6 +440,113 @@ class TodoSelectorComponent extends Container implements Focusable {
 	}
 }
 
+class TodoActionMenuComponent extends Container {
+	private selectList: SelectList;
+	private onSelectCallback: (action: TodoMenuAction) => void;
+	private onCancelCallback: () => void;
+
+	constructor(
+		theme: Theme,
+		todo: TodoRecord,
+		onSelect: (action: TodoMenuAction) => void,
+		onCancel: () => void,
+	) {
+		super();
+		this.onSelectCallback = onSelect;
+		this.onCancelCallback = onCancel;
+
+		const closed = isTodoClosed(todo.status);
+		const title = todo.title || "(untitled)";
+		const options: SelectItem[] = [
+			{ value: "view", label: "view", description: "View todo" },
+			{ value: "work", label: "work", description: "Work on todo" },
+			{ value: "refine", label: "refine", description: "Refine task" },
+			...(closed
+				? [{ value: "reopen", label: "reopen", description: "Reopen todo" }]
+				: [{ value: "close", label: "close", description: "Close todo" }]),
+			...(todo.assigned_to_session
+				? [{ value: "release", label: "release", description: "Release assignment" }]
+				: []),
+			{ value: "copy", label: "copy", description: "Copy path to clipboard" },
+			{ value: "delete", label: "delete", description: "Delete todo" },
+		];
+
+		this.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+		this.addChild(
+			new Text(
+				theme.fg(
+					"accent",
+					theme.bold(`Actions for ${formatTodoId(todo.id)} "${title}"`),
+				),
+			),
+		);
+
+		this.selectList = new SelectList(options, options.length, {
+			selectedPrefix: (text) => theme.fg("accent", text),
+			selectedText: (text) => theme.fg("accent", text),
+			description: (text) => theme.fg("muted", text),
+			scrollInfo: (text) => theme.fg("dim", text),
+			noMatch: (text) => theme.fg("warning", text),
+		});
+
+		this.selectList.onSelect = (item) => this.onSelectCallback(item.value as TodoMenuAction);
+		this.selectList.onCancel = () => this.onCancelCallback();
+
+		this.addChild(this.selectList);
+		this.addChild(new Text(theme.fg("dim", "Enter to confirm • Esc back")));
+		this.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+	}
+
+	handleInput(keyData: string): void {
+		this.selectList.handleInput(keyData);
+	}
+
+	override invalidate(): void {
+		super.invalidate();
+	}
+}
+
+class TodoDeleteConfirmComponent extends Container {
+	private selectList: SelectList;
+	private onConfirm: (confirmed: boolean) => void;
+
+	constructor(theme: Theme, message: string, onConfirm: (confirmed: boolean) => void) {
+		super();
+		this.onConfirm = onConfirm;
+
+		const options: SelectItem[] = [
+			{ value: "yes", label: "Yes" },
+			{ value: "no", label: "No" },
+		];
+
+		this.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+		this.addChild(new Text(theme.fg("accent", message)));
+
+		this.selectList = new SelectList(options, options.length, {
+			selectedPrefix: (text) => theme.fg("accent", text),
+			selectedText: (text) => theme.fg("accent", text),
+			description: (text) => theme.fg("muted", text),
+			scrollInfo: (text) => theme.fg("dim", text),
+			noMatch: (text) => theme.fg("warning", text),
+		});
+
+		this.selectList.onSelect = (item) => this.onConfirm(item.value === "yes");
+		this.selectList.onCancel = () => this.onConfirm(false);
+
+		this.addChild(this.selectList);
+		this.addChild(new Text(theme.fg("dim", "Enter to confirm • Esc back")));
+		this.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+	}
+
+	handleInput(keyData: string): void {
+		this.selectList.handleInput(keyData);
+	}
+
+	override invalidate(): void {
+		super.invalidate();
+	}
+}
+
 class TodoDetailOverlayComponent {
 	private todo: TodoRecord;
 	private theme: Theme;
@@ -384,7 +573,11 @@ class TodoDetailOverlayComponent {
 	handleInput(keyData: string): void {
 		const kb = getEditorKeybindings();
 		if (kb.matches(keyData, "selectCancel")) {
-			this.onAction("cancel");
+			this.onAction("back");
+			return;
+		}
+		if (kb.matches(keyData, "selectConfirm")) {
+			this.onAction("work");
 			return;
 		}
 		if (kb.matches(keyData, "selectUp")) {
@@ -403,30 +596,6 @@ class TodoDetailOverlayComponent {
 			this.scrollBy(this.viewHeight || 1);
 			return;
 		}
-		if (keyData === "r" || keyData === "R") {
-			this.onAction("refine");
-			return;
-		}
-		if (keyData === "c" || keyData === "C") {
-			this.onAction("close");
-			return;
-		}
-		if (keyData === "o" || keyData === "O") {
-			this.onAction("reopen");
-			return;
-		}
-		if (keyData === "w" || keyData === "W") {
-			this.onAction("work");
-			return;
-		}
-		if (keyData === "a" || keyData === "A") {
-			this.onAction("actions");
-			return;
-		}
-		if (keyData === "d" || keyData === "D") {
-			this.onAction("delete");
-			return;
-		}
 	}
 
 	render(width: number): string[] {
@@ -512,16 +681,9 @@ class TodoDetailOverlayComponent {
 	}
 
 	private buildActionLine(width: number): string {
-		const closed = isTodoClosed(this.todo.status);
-		const refine = this.theme.fg("accent", "r") + this.theme.fg("muted", " refine task");
-		const work = this.theme.fg("accent", "w") + this.theme.fg("muted", " work on todo");
-		const close = this.theme.fg("accent", "c") + this.theme.fg("muted", " close task");
-		const reopen = this.theme.fg("accent", "o") + this.theme.fg("muted", " reopen task");
-		const statusAction = closed ? reopen : close;
-		const actions = this.theme.fg("accent", "a") + this.theme.fg("muted", " actions");
-		const del = this.theme.fg("error", "d") + this.theme.fg("muted", " delete todo");
+		const work = this.theme.fg("accent", "enter") + this.theme.fg("muted", " work on todo");
 		const back = this.theme.fg("dim", "esc back");
-		const pieces = [work, refine, statusAction, actions, del, back];
+		const pieces = [work, back];
 
 		let line = pieces.join(this.theme.fg("muted", " • "));
 		if (this.totalLines > this.viewHeight) {
@@ -548,6 +710,14 @@ function getTodosDir(cwd: string): string {
 	return path.resolve(cwd, TODO_DIR_NAME);
 }
 
+function getTodosDirLabel(cwd: string): string {
+	const overridePath = process.env[TODO_PATH_ENV];
+	if (overridePath && overridePath.trim()) {
+		return path.resolve(cwd, overridePath.trim());
+	}
+	return TODO_DIR_NAME;
+}
+
 function getTodoSettingsPath(todosDir: string): string {
 	return path.join(todosDir, TODO_SETTINGS_NAME);
 }
@@ -564,26 +734,15 @@ function normalizeTodoSettings(raw: Partial<TodoSettings>): TodoSettings {
 async function readTodoSettings(todosDir: string): Promise<TodoSettings> {
 	const settingsPath = getTodoSettingsPath(todosDir);
 	let data: Partial<TodoSettings> = {};
-	let shouldWrite = false;
 
 	try {
 		const raw = await fs.readFile(settingsPath, "utf8");
 		data = JSON.parse(raw) as Partial<TodoSettings>;
 	} catch {
-		shouldWrite = true;
+		data = {};
 	}
 
-	const normalized = normalizeTodoSettings(data);
-	if (
-		shouldWrite ||
-		data.gc === undefined ||
-		data.gcDays === undefined ||
-		!Number.isFinite(data.gcDays)
-	) {
-		await fs.writeFile(settingsPath, JSON.stringify(normalized, null, 2) + "\n", "utf8");
-	}
-
-	return normalized;
+	return normalizeTodoSettings(data);
 }
 
 async function garbageCollectTodos(todosDir: string, settings: TodoSettings): Promise<void> {
@@ -628,24 +787,6 @@ function getLockPath(todosDir: string, id: string): string {
 	return path.join(todosDir, `${id}.lock`);
 }
 
-function stripQuotes(value: string): string {
-	const trimmed = value.trim();
-	if ((trimmed.startsWith("\"") && trimmed.endsWith("\"")) || (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
-		return trimmed.slice(1, -1);
-	}
-	return trimmed;
-}
-
-function parseTagsInline(value: string): string[] {
-	const inner = value.trim().slice(1, -1);
-	if (!inner.trim()) return [];
-	return inner
-		.split(",")
-		.map((item) => stripQuotes(item))
-		.map((item) => item.trim())
-		.filter(Boolean);
-}
-
 function parseFrontMatter(text: string, idFallback: string): TodoFrontMatter {
 	const data: TodoFrontMatter = {
 		id: idFallback,
@@ -653,67 +794,86 @@ function parseFrontMatter(text: string, idFallback: string): TodoFrontMatter {
 		tags: [],
 		status: "open",
 		created_at: "",
+		assigned_to_session: undefined,
 	};
 
-	let currentKey: string | null = null;
-	for (const rawLine of text.split(/\r?\n/)) {
-		const line = rawLine.trim();
-		if (!line) continue;
+	const trimmed = text.trim();
+	if (!trimmed) return data;
 
-		const listMatch = currentKey === "tags" ? line.match(/^-\s*(.+)$/) : null;
-		if (listMatch) {
-			data.tags.push(stripQuotes(listMatch[1]));
-			continue;
+	try {
+		const parsed = JSON.parse(trimmed) as Partial<TodoFrontMatter> | null;
+		if (!parsed || typeof parsed !== "object") return data;
+		if (typeof parsed.id === "string" && parsed.id) data.id = parsed.id;
+		if (typeof parsed.title === "string") data.title = parsed.title;
+		if (typeof parsed.status === "string" && parsed.status) data.status = parsed.status;
+		if (typeof parsed.created_at === "string") data.created_at = parsed.created_at;
+		if (typeof parsed.assigned_to_session === "string" && parsed.assigned_to_session.trim()) {
+			data.assigned_to_session = parsed.assigned_to_session;
+		}
+		if (Array.isArray(parsed.tags)) {
+			data.tags = parsed.tags.filter((tag): tag is string => typeof tag === "string");
 		}
+	} catch {
+		return data;
+	}
+
+	return data;
+}
 
-		const match = line.match(/^(?<key>[a-zA-Z0-9_]+):\s*(?<value>.*)$/);
-		if (!match?.groups) continue;
+function findJsonObjectEnd(content: string): number {
+	let depth = 0;
+	let inString = false;
+	let escaped = false;
 
-		const key = match.groups.key;
-		const value = match.groups.value ?? "";
-		currentKey = null;
+	for (let i = 0; i < content.length; i += 1) {
+		const char = content[i];
 
-		if (key === "tags") {
-			if (!value) {
-				currentKey = "tags";
+		if (inString) {
+			if (escaped) {
+				escaped = false;
 				continue;
 			}
-			if (value.startsWith("[") && value.endsWith("]")) {
-				data.tags = parseTagsInline(value);
+			if (char === "\\") {
+				escaped = true;
 				continue;
 			}
-			data.tags = [stripQuotes(value)].filter(Boolean);
+			if (char === "\"") {
+				inString = false;
+			}
 			continue;
 		}
 
-		switch (key) {
-			case "id":
-				data.id = stripQuotes(value) || data.id;
-				break;
-			case "title":
-				data.title = stripQuotes(value);
-				break;
-			case "status":
-				data.status = stripQuotes(value) || data.status;
-				break;
-			case "created_at":
-				data.created_at = stripQuotes(value);
-				break;
-			default:
-				break;
+		if (char === "\"") {
+			inString = true;
+			continue;
+		}
+
+		if (char === "{") {
+			depth += 1;
+			continue;
+		}
+
+		if (char === "}") {
+			depth -= 1;
+			if (depth === 0) return i;
 		}
 	}
 
-	return data;
+	return -1;
 }
 
 function splitFrontMatter(content: string): { frontMatter: string; body: string } {
-	const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?/);
-	if (!match) {
+	if (!content.startsWith("{")) {
 		return { frontMatter: "", body: content };
 	}
-	const frontMatter = match[1] ?? "";
-	const body = content.slice(match[0].length);
+
+	const endIndex = findJsonObjectEnd(content);
+	if (endIndex === -1) {
+		return { frontMatter: "", body: content };
+	}
+
+	const frontMatter = content.slice(0, endIndex + 1);
+	const body = content.slice(endIndex + 1).replace(/^\r?\n+/, "");
 	return { frontMatter, body };
 }
 
@@ -726,31 +886,29 @@ function parseTodoContent(content: string, idFallback: string): TodoRecord {
 		tags: parsed.tags ?? [],
 		status: parsed.status,
 		created_at: parsed.created_at,
+		assigned_to_session: parsed.assigned_to_session,
 		body: body ?? "",
 	};
 }
 
-function escapeYaml(value: string): string {
-	return value.replace(/\\/g, "\\\\").replace(/\"/g, "\\\"");
-}
-
 function serializeTodo(todo: TodoRecord): string {
-	const tags = todo.tags ?? [];
-	const lines = [
-		"---",
-		`id: \"${escapeYaml(todo.id)}\"`,
-		`title: \"${escapeYaml(todo.title)}\"`,
-		"tags:",
-		...tags.map((tag) => `  - \"${escapeYaml(tag)}\"`),
-		`status: \"${escapeYaml(todo.status)}\"`,
-		`created_at: \"${escapeYaml(todo.created_at)}\"`,
-		"---",
-		"",
-	];
+	const frontMatter = JSON.stringify(
+		{
+			id: todo.id,
+			title: todo.title,
+			tags: todo.tags ?? [],
+			status: todo.status,
+			created_at: todo.created_at,
+			assigned_to_session: todo.assigned_to_session || undefined,
+		},
+		null,
+		2,
+	);
 
 	const body = todo.body ?? "";
 	const trimmedBody = body.replace(/^\n+/, "").replace(/\s+$/, "");
-	return `${lines.join("\n")}${trimmedBody ? `${trimmedBody}\n` : ""}`;
+	if (!trimmedBody) return `${frontMatter}\n`;
+	return `${frontMatter}\n\n${trimmedBody}\n`;
 }
 
 async function ensureTodosDir(todosDir: string) {
@@ -877,6 +1035,7 @@ async function listTodos(todosDir: string): Promise<TodoFrontMatter[]> {
 				tags: parsed.tags ?? [],
 				status: parsed.status,
 				created_at: parsed.created_at,
+				assigned_to_session: parsed.assigned_to_session,
 			});
 		} catch {
 			// ignore unreadable todo
@@ -909,6 +1068,7 @@ function listTodosSync(todosDir: string): TodoFrontMatter[] {
 				tags: parsed.tags ?? [],
 				status: parsed.status,
 				created_at: parsed.created_at,
+				assigned_to_session: parsed.assigned_to_session,
 			});
 		} catch {
 			// ignore
@@ -926,36 +1086,61 @@ function getTodoStatus(todo: TodoFrontMatter): string {
 	return todo.status || "open";
 }
 
+function formatAssignmentSuffix(todo: TodoFrontMatter): string {
+	return todo.assigned_to_session ? ` (assigned: ${todo.assigned_to_session})` : "";
+}
+
+function renderAssignmentSuffix(
+	theme: Theme,
+	todo: TodoFrontMatter,
+	currentSessionId?: string,
+): string {
+	if (!todo.assigned_to_session) return "";
+	const isCurrent = todo.assigned_to_session === currentSessionId;
+	const color = isCurrent ? "success" : "dim";
+	const suffix = isCurrent ? ", current" : "";
+	return theme.fg(color, ` (assigned: ${todo.assigned_to_session}${suffix})`);
+}
+
 function formatTodoHeading(todo: TodoFrontMatter): string {
 	const tagText = todo.tags.length ? ` [${todo.tags.join(", ")}]` : "";
-	return `${formatTodoId(todo.id)} ${getTodoTitle(todo)}${tagText}`;
+	return `${formatTodoId(todo.id)} ${getTodoTitle(todo)}${tagText}${formatAssignmentSuffix(todo)}`;
 }
 
 function buildRefinePrompt(todoId: string, title: string): string {
 	return (
 		`let's refine task ${formatTodoId(todoId)} "${title}": ` +
-		"Please rewrite the todo body with a thorough, structured description so an engineer or agent can work without extra investigation. " +
-		"Include: Context, Goals, Scope/Non-scope, Checklist, Acceptance Criteria, and Risks/Open questions.\n\n"
+		"Ask me for the missing details needed to refine the todo together. Do not rewrite the todo yet and do not make assumptions. " +
+		"Ask clear, concrete questions and wait for my answers before drafting any structured description.\n\n"
 	);
 }
 
-function splitTodosByStatus(todos: TodoFrontMatter[]): { openTodos: TodoFrontMatter[]; closedTodos: TodoFrontMatter[] } {
+function splitTodosByAssignment(todos: TodoFrontMatter[]): {
+	assignedTodos: TodoFrontMatter[];
+	openTodos: TodoFrontMatter[];
+	closedTodos: TodoFrontMatter[];
+} {
+	const assignedTodos: TodoFrontMatter[] = [];
 	const openTodos: TodoFrontMatter[] = [];
 	const closedTodos: TodoFrontMatter[] = [];
 	for (const todo of todos) {
 		if (isTodoClosed(getTodoStatus(todo))) {
 			closedTodos.push(todo);
+			continue;
+		}
+		if (todo.assigned_to_session) {
+			assignedTodos.push(todo);
 		} else {
 			openTodos.push(todo);
 		}
 	}
-	return { openTodos, closedTodos };
+	return { assignedTodos, openTodos, closedTodos };
 }
 
 function formatTodoList(todos: TodoFrontMatter[]): string {
 	if (!todos.length) return "No todos.";
 
-	const { openTodos } = splitTodosByStatus(todos);
+	const { assignedTodos, openTodos, closedTodos } = splitTodosByAssignment(todos);
 	const lines: string[] = [];
 	const pushSection = (label: string, sectionTodos: TodoFrontMatter[]) => {
 		lines.push(`${label} (${sectionTodos.length}):`);
@@ -968,7 +1153,9 @@ function formatTodoList(todos: TodoFrontMatter[]): string {
 		}
 	};
 
+	pushSection("Assigned todos", assignedTodos);
 	pushSection("Open todos", openTodos);
+	pushSection("Closed todos", closedTodos);
 	return lines.join("\n");
 }
 
@@ -978,10 +1165,11 @@ function serializeTodoForAgent(todo: TodoRecord): string {
 }
 
 function serializeTodoListForAgent(todos: TodoFrontMatter[]): string {
-	const { openTodos, closedTodos } = splitTodosByStatus(todos);
+	const { assignedTodos, openTodos, closedTodos } = splitTodosByAssignment(todos);
 	const mapTodo = (todo: TodoFrontMatter) => ({ ...todo, id: formatTodoId(todo.id) });
 	return JSON.stringify(
 		{
+			assigned: assignedTodos.map(mapTodo),
 			open: openTodos.map(mapTodo),
 			closed: closedTodos.map(mapTodo),
 		},
@@ -990,22 +1178,29 @@ function serializeTodoListForAgent(todos: TodoFrontMatter[]): string {
 	);
 }
 
-function renderTodoHeading(theme: Theme, todo: TodoFrontMatter): string {
+function renderTodoHeading(theme: Theme, todo: TodoFrontMatter, currentSessionId?: string): string {
 	const closed = isTodoClosed(getTodoStatus(todo));
 	const titleColor = closed ? "dim" : "text";
 	const tagText = todo.tags.length ? theme.fg("dim", ` [${todo.tags.join(", ")}]`) : "";
+	const assignmentText = renderAssignmentSuffix(theme, todo, currentSessionId);
 	return (
 		theme.fg("accent", formatTodoId(todo.id)) +
 		" " +
 		theme.fg(titleColor, getTodoTitle(todo)) +
-		tagText
+		tagText +
+		assignmentText
 	);
 }
 
-function renderTodoList(theme: Theme, todos: TodoFrontMatter[], expanded: boolean): string {
+function renderTodoList(
+	theme: Theme,
+	todos: TodoFrontMatter[],
+	expanded: boolean,
+	currentSessionId?: string,
+): string {
 	if (!todos.length) return theme.fg("dim", "No todos");
 
-	const { openTodos, closedTodos } = splitTodosByStatus(todos);
+	const { assignedTodos, openTodos, closedTodos } = splitTodosByAssignment(todos);
 	const lines: string[] = [];
 	const pushSection = (label: string, sectionTodos: TodoFrontMatter[]) => {
 		lines.push(theme.fg("muted", `${label} (${sectionTodos.length})`));
@@ -1015,18 +1210,24 @@ function renderTodoList(theme: Theme, todos: TodoFrontMatter[], expanded: boolea
 		}
 		const maxItems = expanded ? sectionTodos.length : Math.min(sectionTodos.length, 3);
 		for (let i = 0; i < maxItems; i++) {
-			lines.push(`  ${renderTodoHeading(theme, sectionTodos[i])}`);
+			lines.push(`  ${renderTodoHeading(theme, sectionTodos[i], currentSessionId)}`);
 		}
 		if (!expanded && sectionTodos.length > maxItems) {
 			lines.push(theme.fg("dim", `  ... ${sectionTodos.length - maxItems} more`));
 		}
 	};
 
-	pushSection("Open todos", openTodos);
-	if (expanded && closedTodos.length) {
-		lines.push("");
-		pushSection("Closed todos", closedTodos);
-	}
+	const sections: Array<{ label: string; todos: TodoFrontMatter[] }> = [
+		{ label: "Assigned todos", todos: assignedTodos },
+		{ label: "Open todos", todos: openTodos },
+		{ label: "Closed todos", todos: closedTodos },
+	];
+
+	sections.forEach((section, index) => {
+		if (index > 0) lines.push("");
+		pushSection(section.label, section.todos);
+	});
+
 	return lines.join("\n");
 }
 
@@ -1074,7 +1275,11 @@ async function updateTodoStatus(
 	status: string,
 	ctx: ExtensionContext,
 ): Promise<TodoRecord | { error: string }> {
-	const normalizedId = normalizeTodoId(id);
+	const validated = validateTodoId(id);
+	if ("error" in validated) {
+		return { error: validated.error };
+	}
+	const normalizedId = validated.id;
 	const filePath = getTodoPath(todosDir, normalizedId);
 	if (!existsSync(filePath)) {
 		return { error: `Todo ${displayTodoId(id)} not found` };
@@ -1084,6 +1289,89 @@ async function updateTodoStatus(
 		const existing = await ensureTodoExists(filePath, normalizedId);
 		if (!existing) return { error: `Todo ${displayTodoId(id)} not found` } as const;
 		existing.status = status;
+		clearAssignmentIfClosed(existing);
+		await writeTodoFile(filePath, existing);
+		return existing;
+	});
+
+	if (typeof result === "object" && "error" in result) {
+		return { error: result.error };
+	}
+
+	return result;
+}
+
+async function claimTodoAssignment(
+	todosDir: string,
+	id: string,
+	ctx: ExtensionContext,
+	force = false,
+): Promise<TodoRecord | { error: string }> {
+	const validated = validateTodoId(id);
+	if ("error" in validated) {
+		return { error: validated.error };
+	}
+	const normalizedId = validated.id;
+	const filePath = getTodoPath(todosDir, normalizedId);
+	if (!existsSync(filePath)) {
+		return { error: `Todo ${displayTodoId(id)} not found` };
+	}
+	const sessionId = ctx.sessionManager.getSessionId();
+	const result = await withTodoLock(todosDir, normalizedId, ctx, async () => {
+		const existing = await ensureTodoExists(filePath, normalizedId);
+		if (!existing) return { error: `Todo ${displayTodoId(id)} not found` } as const;
+		if (isTodoClosed(existing.status)) {
+			return { error: `Todo ${displayTodoId(id)} is closed` } as const;
+		}
+		const assigned = existing.assigned_to_session;
+		if (assigned && assigned !== sessionId && !force) {
+			return {
+				error: `Todo ${displayTodoId(id)} is already assigned to session ${assigned}. Use force to override.`,
+			} as const;
+		}
+		if (assigned !== sessionId) {
+			existing.assigned_to_session = sessionId;
+			await writeTodoFile(filePath, existing);
+		}
+		return existing;
+	});
+
+	if (typeof result === "object" && "error" in result) {
+		return { error: result.error };
+	}
+
+	return result;
+}
+
+async function releaseTodoAssignment(
+	todosDir: string,
+	id: string,
+	ctx: ExtensionContext,
+	force = false,
+): Promise<TodoRecord | { error: string }> {
+	const validated = validateTodoId(id);
+	if ("error" in validated) {
+		return { error: validated.error };
+	}
+	const normalizedId = validated.id;
+	const filePath = getTodoPath(todosDir, normalizedId);
+	if (!existsSync(filePath)) {
+		return { error: `Todo ${displayTodoId(id)} not found` };
+	}
+	const sessionId = ctx.sessionManager.getSessionId();
+	const result = await withTodoLock(todosDir, normalizedId, ctx, async () => {
+		const existing = await ensureTodoExists(filePath, normalizedId);
+		if (!existing) return { error: `Todo ${displayTodoId(id)} not found` } as const;
+		const assigned = existing.assigned_to_session;
+		if (!assigned) {
+			return existing;
+		}
+		if (assigned !== sessionId && !force) {
+			return {
+				error: `Todo ${displayTodoId(id)} is assigned to session ${assigned}. Use force to release.`,
+			} as const;
+		}
+		existing.assigned_to_session = undefined;
 		await writeTodoFile(filePath, existing);
 		return existing;
 	});
@@ -1100,7 +1388,11 @@ async function deleteTodo(
 	id: string,
 	ctx: ExtensionContext,
 ): Promise<TodoRecord | { error: string }> {
-	const normalizedId = normalizeTodoId(id);
+	const validated = validateTodoId(id);
+	if ("error" in validated) {
+		return { error: validated.error };
+	}
+	const normalizedId = validated.id;
 	const filePath = getTodoPath(todosDir, normalizedId);
 	if (!existsSync(filePath)) {
 		return { error: `Todo ${displayTodoId(id)} not found` };
@@ -1128,14 +1420,16 @@ export default function todosExtension(pi: ExtensionAPI) {
 		await garbageCollectTodos(todosDir, settings);
 	});
 
+	const todosDirLabel = getTodosDirLabel(process.cwd());
+
 	pi.registerTool({
 		name: "todo",
 		label: "Todo",
 		description:
-			"Manage file-based todos in .pi/todos (list, list-all, get, create, update, append, delete). " +
+			`Manage file-based todos in ${todosDirLabel} (list, list-all, get, create, update, append, delete, claim, release). ` +
 			"Title is the short summary; body is long-form markdown notes (update replaces, append adds). " +
 			"Todo ids are shown as TODO-<hex>; id parameters accept TODO-<hex> or the raw hex filename. " +
-			"Close todos when the work is done. Set PI_ISSUE_PATH to override the todo directory.",
+			"Close todos when the work is done.",
 		parameters: TodoParams,
 
 		async execute(_toolCallId, params, _onUpdate, ctx) {
@@ -1145,18 +1439,21 @@ export default function todosExtension(pi: ExtensionAPI) {
 			switch (action) {
 				case "list": {
 					const todos = await listTodos(todosDir);
-					const { openTodos } = splitTodosByStatus(todos);
+					const { assignedTodos, openTodos } = splitTodosByAssignment(todos);
+					const listedTodos = [...assignedTodos, ...openTodos];
+					const currentSessionId = ctx.sessionManager.getSessionId();
 					return {
-						content: [{ type: "text", text: serializeTodoListForAgent(openTodos) }],
-						details: { action: "list", todos: openTodos },
+						content: [{ type: "text", text: serializeTodoListForAgent(listedTodos) }],
+						details: { action: "list", todos: listedTodos, currentSessionId },
 					};
 				}
 
 				case "list-all": {
 					const todos = await listTodos(todosDir);
+					const currentSessionId = ctx.sessionManager.getSessionId();
 					return {
 						content: [{ type: "text", text: serializeTodoListForAgent(todos) }],
-						details: { action: "list-all", todos },
+						details: { action: "list-all", todos, currentSessionId },
 					};
 				}
 
@@ -1167,8 +1464,15 @@ export default function todosExtension(pi: ExtensionAPI) {
 							details: { action: "get", error: "id required" },
 						};
 					}
-					const normalizedId = normalizeTodoId(params.id);
-					const displayId = displayTodoId(params.id);
+					const validated = validateTodoId(params.id);
+					if ("error" in validated) {
+						return {
+							content: [{ type: "text", text: validated.error }],
+							details: { action: "get", error: validated.error },
+						};
+					}
+					const normalizedId = validated.id;
+					const displayId = formatTodoId(normalizedId);
 					const filePath = getTodoPath(todosDir, normalizedId);
 					const todo = await ensureTodoExists(filePath, normalizedId);
 					if (!todo) {
@@ -1227,8 +1531,15 @@ export default function todosExtension(pi: ExtensionAPI) {
 							details: { action: "update", error: "id required" },
 						};
 					}
-					const normalizedId = normalizeTodoId(params.id);
-					const displayId = displayTodoId(params.id);
+					const validated = validateTodoId(params.id);
+					if ("error" in validated) {
+						return {
+							content: [{ type: "text", text: validated.error }],
+							details: { action: "update", error: validated.error },
+						};
+					}
+					const normalizedId = validated.id;
+					const displayId = formatTodoId(normalizedId);
 					const filePath = getTodoPath(todosDir, normalizedId);
 					if (!existsSync(filePath)) {
 						return {
@@ -1246,6 +1557,7 @@ export default function todosExtension(pi: ExtensionAPI) {
 						if (params.tags !== undefined) existing.tags = params.tags;
 						if (params.body !== undefined) existing.body = params.body;
 						if (!existing.created_at) existing.created_at = new Date().toISOString();
+						clearAssignmentIfClosed(existing);
 
 						await writeTodoFile(filePath, existing);
 						return existing;
@@ -1272,8 +1584,15 @@ export default function todosExtension(pi: ExtensionAPI) {
 							details: { action: "append", error: "id required" },
 						};
 					}
-					const normalizedId = normalizeTodoId(params.id);
-					const displayId = displayTodoId(params.id);
+					const validated = validateTodoId(params.id);
+					if ("error" in validated) {
+						return {
+							content: [{ type: "text", text: validated.error }],
+							details: { action: "append", error: validated.error },
+						};
+					}
+					const normalizedId = validated.id;
+					const displayId = formatTodoId(normalizedId);
 					const filePath = getTodoPath(todosDir, normalizedId);
 					if (!existsSync(filePath)) {
 						return {
@@ -1305,6 +1624,58 @@ export default function todosExtension(pi: ExtensionAPI) {
 					};
 				}
 
+				case "claim": {
+					if (!params.id) {
+						return {
+							content: [{ type: "text", text: "Error: id required" }],
+							details: { action: "claim", error: "id required" },
+						};
+					}
+					const result = await claimTodoAssignment(
+						todosDir,
+						params.id,
+						ctx,
+						Boolean(params.force),
+					);
+					if (typeof result === "object" && "error" in result) {
+						return {
+							content: [{ type: "text", text: result.error }],
+							details: { action: "claim", error: result.error },
+						};
+					}
+					const updatedTodo = result as TodoRecord;
+					return {
+						content: [{ type: "text", text: serializeTodoForAgent(updatedTodo) }],
+						details: { action: "claim", todo: updatedTodo },
+					};
+				}
+
+				case "release": {
+					if (!params.id) {
+						return {
+							content: [{ type: "text", text: "Error: id required" }],
+							details: { action: "release", error: "id required" },
+						};
+					}
+					const result = await releaseTodoAssignment(
+						todosDir,
+						params.id,
+						ctx,
+						Boolean(params.force),
+					);
+					if (typeof result === "object" && "error" in result) {
+						return {
+							content: [{ type: "text", text: result.error }],
+							details: { action: "release", error: result.error },
+						};
+					}
+					const updatedTodo = result as TodoRecord;
+					return {
+						content: [{ type: "text", text: serializeTodoForAgent(updatedTodo) }],
+						details: { action: "release", todo: updatedTodo },
+					};
+				}
+
 				case "delete": {
 					if (!params.id) {
 						return {
@@ -1313,8 +1684,14 @@ export default function todosExtension(pi: ExtensionAPI) {
 						};
 					}
 
-					const normalizedId = normalizeTodoId(params.id);
-					const result = await deleteTodo(todosDir, normalizedId, ctx);
+					const validated = validateTodoId(params.id);
+					if ("error" in validated) {
+						return {
+							content: [{ type: "text", text: validated.error }],
+							details: { action: "delete", error: validated.error },
+						};
+					}
+					const result = await deleteTodo(todosDir, validated.id, ctx);
 					if (typeof result === "object" && "error" in result) {
 						return {
 							content: [{ type: "text", text: result.error }],
@@ -1361,9 +1738,9 @@ export default function todosExtension(pi: ExtensionAPI) {
 			}
 
 			if (details.action === "list" || details.action === "list-all") {
-				let text = renderTodoList(theme, details.todos, expanded);
+				let text = renderTodoList(theme, details.todos, expanded, details.currentSessionId);
 				if (!expanded) {
-					const { closedTodos } = splitTodosByStatus(details.todos);
+					const { closedTodos } = splitTodosByAssignment(details.todos);
 					if (closedTodos.length) {
 						text = appendExpandHint(theme, text);
 					}
@@ -1386,7 +1763,11 @@ export default function todosExtension(pi: ExtensionAPI) {
 							? "Appended to"
 							: details.action === "delete"
 								? "Deleted"
-								: null;
+								: details.action === "claim"
+									? "Claimed"
+									: details.action === "release"
+										? "Released"
+										: null;
 			if (actionLabel) {
 				const lines = text.split("\n");
 				lines[0] = theme.fg("success", "✓ ") + theme.fg("muted", `${actionLabel} `) + lines[0];
@@ -1419,6 +1800,7 @@ export default function todosExtension(pi: ExtensionAPI) {
 		handler: async (args, ctx) => {
 			const todosDir = getTodosDir(ctx.cwd);
 			const todos = await listTodos(todosDir);
+			const currentSessionId = ctx.sessionManager.getSessionId();
 			const searchTerm = (args ?? "").trim();
 
 			if (!ctx.hasUI) {
@@ -1432,17 +1814,50 @@ export default function todosExtension(pi: ExtensionAPI) {
 			await ctx.ui.custom<void>((tui, theme, _kb, done) => {
 				rootTui = tui;
 				let selector: TodoSelectorComponent | null = null;
+				let actionMenu: TodoActionMenuComponent | null = null;
+				let deleteConfirm: TodoDeleteConfirmComponent | null = null;
+				let activeComponent:
+					| {
+							render: (width: number) => string[];
+							invalidate: () => void;
+							handleInput?: (data: string) => void;
+							focused?: boolean;
+						}
+					| null = null;
+				let wrapperFocused = false;
+
+				const setActiveComponent = (
+					component:
+						| {
+								render: (width: number) => string[];
+								invalidate: () => void;
+								handleInput?: (data: string) => void;
+								focused?: boolean;
+							}
+						| null,
+				) => {
+					if (activeComponent && "focused" in activeComponent) {
+						activeComponent.focused = false;
+					}
+					activeComponent = component;
+					if (activeComponent && "focused" in activeComponent) {
+						activeComponent.focused = wrapperFocused;
+					}
+					tui.requestRender();
+				};
 
-				const addTodoPathToPrompt = (todoId: string) => {
+				const copyTodoPathToClipboard = (todoId: string) => {
 					const filePath = getTodoPath(todosDir, todoId);
 					const relativePath = path.relative(ctx.cwd, filePath);
 					const displayPath =
 						relativePath && !relativePath.startsWith("..") ? relativePath : filePath;
-					const mention = `@${displayPath}`;
-					const current = ctx.ui.getEditorText();
-					const separator = current && !current.endsWith(" ") ? " " : "";
-					ctx.ui.setEditorText(`${current}${separator}${mention}`);
-					ctx.ui.notify(`Added ${mention} to prompt`, "info");
+					try {
+						copyToClipboard(displayPath);
+						ctx.ui.notify(`Copied ${displayPath} to clipboard`, "info");
+					} catch (error) {
+						const message = error instanceof Error ? error.message : String(error);
+						ctx.ui.notify(message, "error");
+					}
 				};
 
 				const resolveTodoRecord = async (todo: TodoFrontMatter): Promise<TodoRecord | null> => {
@@ -1455,7 +1870,7 @@ export default function todosExtension(pi: ExtensionAPI) {
 					return record;
 				};
 
-				const openTodoOverlay = async (record: TodoRecord) => {
+				const openTodoOverlay = async (record: TodoRecord): Promise<TodoOverlayAction> => {
 					const action = await ctx.ui.custom<TodoOverlayAction>(
 						(overlayTui, overlayTheme, _overlayKb, overlayDone) =>
 							new TodoDetailOverlayComponent(overlayTui, overlayTheme, record, overlayDone),
@@ -1465,65 +1880,62 @@ export default function todosExtension(pi: ExtensionAPI) {
 						},
 					);
 
-					if (!action || action === "cancel") return;
-					if (action === "actions") {
-						await showActionMenu(record);
-						return;
-					}
-					await applyTodoAction(record, action);
+					return action ?? "back";
 				};
 
-				const applyTodoAction = async (record: TodoRecord, action: TodoMenuAction) => {
-					if (action === "cancel") return;
-					if (action === "close-dialog") {
-						done();
-						return;
-					}
+				const applyTodoAction = async (
+					record: TodoRecord,
+					action: TodoMenuAction,
+				): Promise<"stay" | "exit"> => {
 					if (action === "refine") {
 						const title = record.title || "(untitled)";
 						nextPrompt = buildRefinePrompt(record.id, title);
 						done();
-						return;
+						return "exit";
 					}
 					if (action === "work") {
 						const title = record.title || "(untitled)";
 						nextPrompt = `work on todo ${formatTodoId(record.id)} "${title}"`;
 						done();
-						return;
+						return "exit";
 					}
 					if (action === "view") {
-						await openTodoOverlay(record);
-						return;
+						return "stay";
 					}
-					if (action === "copy-path") {
-						addTodoPathToPrompt(record.id);
-						return;
+					if (action === "copy") {
+						copyTodoPathToClipboard(record.id);
+						return "stay";
 					}
 
-					if (action === "delete") {
-						const ok = await ctx.ui.confirm(
-							"Delete todo",
-							`Delete todo ${formatTodoId(record.id)}? This cannot be undone.`,
-						);
-						if (!ok) {
-							return;
+					if (action === "release") {
+						const result = await releaseTodoAssignment(todosDir, record.id, ctx, true);
+						if ("error" in result) {
+							ctx.ui.notify(result.error, "error");
+							return "stay";
 						}
+						const updatedTodos = await listTodos(todosDir);
+						selector?.setTodos(updatedTodos);
+						ctx.ui.notify(`Released todo ${formatTodoId(record.id)}`, "info");
+						return "stay";
+					}
+
+					if (action === "delete") {
 						const result = await deleteTodo(todosDir, record.id, ctx);
 						if ("error" in result) {
 							ctx.ui.notify(result.error, "error");
-							return;
+							return "stay";
 						}
 						const updatedTodos = await listTodos(todosDir);
 						selector?.setTodos(updatedTodos);
 						ctx.ui.notify(`Deleted todo ${formatTodoId(record.id)}`, "info");
-						return;
+						return "stay";
 					}
 
 					const nextStatus = action === "close" ? "closed" : "open";
 					const result = await updateTodoStatus(todosDir, record.id, nextStatus, ctx);
 					if ("error" in result) {
 						ctx.ui.notify(result.error, "error");
-						return;
+						return "stay";
 					}
 
 					const updatedTodos = await listTodos(todosDir);
@@ -1532,87 +1944,58 @@ export default function todosExtension(pi: ExtensionAPI) {
 						`${action === "close" ? "Closed" : "Reopened"} todo ${formatTodoId(record.id)}`,
 						"info",
 					);
+					return "stay";
+				};
+
+				const handleActionSelection = async (record: TodoRecord, action: TodoMenuAction) => {
+					if (action === "view") {
+						const overlayAction = await openTodoOverlay(record);
+						if (overlayAction === "work") {
+							await applyTodoAction(record, "work");
+							return;
+						}
+						if (actionMenu) {
+							setActiveComponent(actionMenu);
+						}
+						return;
+					}
+
+					if (action === "delete") {
+						const message = `Delete todo ${formatTodoId(record.id)}? This cannot be undone.`;
+						deleteConfirm = new TodoDeleteConfirmComponent(theme, message, (confirmed) => {
+							if (!confirmed) {
+								setActiveComponent(actionMenu);
+								return;
+							}
+							void (async () => {
+								await applyTodoAction(record, "delete");
+								setActiveComponent(selector);
+							})();
+						});
+						setActiveComponent(deleteConfirm);
+						return;
+					}
+
+					const result = await applyTodoAction(record, action);
+					if (result === "stay") {
+						setActiveComponent(selector);
+					}
 				};
 
 				const showActionMenu = async (todo: TodoFrontMatter | TodoRecord) => {
 					const record = "body" in todo ? todo : await resolveTodoRecord(todo);
 					if (!record) return;
-					const options: SelectItem[] = [
-						{ value: "view", label: "view", description: "View todo" },
-						{ value: "work", label: "work", description: "Work on todo" },
-						{ value: "refine", label: "refine", description: "Refine task" },
-						{ value: "close", label: "close", description: "Close todo" },
-						{ value: "reopen", label: "reopen", description: "Reopen todo" },
-						{ value: "copy-path", label: "copy", description: "Copy todo path into prompt" },
-						{ value: "delete", label: "delete", description: "Delete todo" },
-					];
-					const title = record.title || "(untitled)";
-					const selection = await ctx.ui.custom<TodoMenuAction | null>(
-						(overlayTui, overlayTheme, _overlayKb, overlayDone) => {
-							const container = new Container();
-							container.addChild(
-								new Text(
-									overlayTheme.fg(
-										"accent",
-										overlayTheme.bold(`Actions for ${formatTodoId(record.id)} "${title}"`),
-									),
-								),
-							);
-							container.addChild(new Spacer(1));
-
-							const selectList = new SelectList(options, options.length, {
-								selectedPrefix: (text) => overlayTheme.fg("accent", text),
-								selectedText: (text) => overlayTheme.fg("accent", text),
-								description: (text) => overlayTheme.fg("muted", text),
-								scrollInfo: (text) => overlayTheme.fg("dim", text),
-								noMatch: (text) => overlayTheme.fg("warning", text),
-							});
-
-							selectList.onSelect = (item) => overlayDone(item.value as TodoMenuAction);
-							selectList.onCancel = () => overlayDone(null);
-
-							container.addChild(selectList);
-							container.addChild(new Spacer(1));
-							container.addChild(
-								new Text(overlayTheme.fg("dim", "Press enter to confirm or esc to cancel")),
-							);
-
-							return {
-								render(width: number) {
-									const innerWidth = Math.max(10, width - 2);
-									const contentLines = container.render(innerWidth);
-									const borderColor = (text: string) => overlayTheme.fg("accent", text);
-									const top = borderColor(`┌${"─".repeat(innerWidth)}┐`);
-									const bottom = borderColor(`└${"─".repeat(innerWidth)}┘`);
-									const framed = contentLines.map((line) => {
-										const truncated = truncateToWidth(line, innerWidth);
-										const padding = Math.max(0, innerWidth - visibleWidth(truncated));
-										return (
-											borderColor("│") + truncated + " ".repeat(padding) + borderColor("│")
-										);
-									});
-									return [top, ...framed, bottom].map((line) => truncateToWidth(line, width));
-								},
-								invalidate() {
-									container.invalidate();
-								},
-								handleInput(data: string) {
-									selectList.handleInput(data);
-									overlayTui.requestRender();
-								},
-							};
+					actionMenu = new TodoActionMenuComponent(
+						theme,
+						record,
+						(action) => {
+							void handleActionSelection(record, action);
 						},
-						{
-							overlay: true,
-							overlayOptions: { width: "70%", maxHeight: "60%", anchor: "center" },
+						() => {
+							setActiveComponent(selector);
 						},
 					);
-
-					if (!selection) {
-						tui.requestRender();
-						return;
-					}
-					await applyTodoAction(record, selection);
+					setActiveComponent(actionMenu);
 				};
 
 				const handleSelect = async (todo: TodoFrontMatter) => {
@@ -1628,6 +2011,7 @@ export default function todosExtension(pi: ExtensionAPI) {
 					},
 					() => done(),
 					searchTerm || undefined,
+					currentSessionId,
 					(todo, action) => {
 						const title = todo.title || "(untitled)";
 						nextPrompt =
@@ -1638,7 +2022,30 @@ export default function todosExtension(pi: ExtensionAPI) {
 					},
 				);
 
-				return selector;
+				setActiveComponent(selector);
+
+				const rootComponent = {
+					get focused() {
+						return wrapperFocused;
+					},
+					set focused(value: boolean) {
+						wrapperFocused = value;
+						if (activeComponent && "focused" in activeComponent) {
+							activeComponent.focused = value;
+						}
+					},
+					render(width: number) {
+						return activeComponent ? activeComponent.render(width) : [];
+					},
+					invalidate() {
+						activeComponent?.invalidate();
+					},
+					handleInput(data: string) {
+						activeComponent?.handleInput?.(data);
+					},
+				};
+
+				return rootComponent;
 			});
 
 			if (nextPrompt) {