@oh-my-pi/pi-coding-agent 14.5.9 → 14.5.11

package/src/lsp/client.ts

@@ -47,7 +47,7 @@ function startIdleChecker(): void {
 		const now = Date.now();
 		for (const [key, client] of Array.from(clients.entries())) {
 			if (now - client.lastActivity > idleTimeoutMs) {
-				shutdownClient(key);
+				void shutdownClient(key);
 			}
 		}
 	}, IDLE_CHECK_INTERVAL_MS);
@@ -762,22 +762,25 @@ export async function refreshFile(client: LspClient, filePath: string, signal?:
 /**
  * Shutdown a specific client by key.
  */
-export function shutdownClient(key: string): void {
-	const client = clients.get(key);
-	if (!client) return;
-
-	// Reject all pending requests
+async function shutdownClientInstance(client: LspClient): Promise<void> {
+	const err = new Error("LSP client shutdown");
 	for (const pending of Array.from(client.pendingRequests.values())) {
-		pending.reject(new Error("LSP client shutdown"));
+		pending.reject(err);
 	}
 	client.pendingRequests.clear();
 
-	// Send shutdown request (best effort, don't wait)
-	sendRequest(client, "shutdown", null).catch(() => {});
-
-	// Kill process
+	const timeout = Bun.sleep(5_000);
+	const shutdown = sendRequest(client, "shutdown", null).catch(() => {});
+	await Promise.race([shutdown, timeout]);
 	client.proc.kill();
+	await Promise.race([client.proc.exited.catch(() => {}), Bun.sleep(1_000)]);
+}
+
+export async function shutdownClient(key: string): Promise<void> {
+	const client = clients.get(key);
+	if (!client) return;
 	clients.delete(key);
+	await shutdownClientInstance(client);
 }
 
 // =============================================================================
@@ -890,27 +893,10 @@ export async function sendNotification(client: LspClient, method: string, params
 /**
  * Shutdown all LSP clients.
  */
-export function shutdownAll(): void {
+export async function shutdownAll(): Promise<void> {
 	const clientsToShutdown = Array.from(clients.values());
 	clients.clear();
-
-	const err = new Error("LSP client shutdown");
-	for (const client of clientsToShutdown) {
-		/// Reject all pending requests
-		const reqs = Array.from(client.pendingRequests.values());
-		client.pendingRequests.clear();
-		for (const pending of reqs) {
-			pending.reject(err);
-		}
-
-		void (async () => {
-			// Send shutdown request (best effort, don't wait)
-			const timeout = Bun.sleep(5_000);
-			const result = sendRequest(client, "shutdown", null).catch(() => {});
-			await Promise.race([result, timeout]);
-			client.proc.kill();
-		})().catch(() => {});
-	}
+	await Promise.allSettled(clientsToShutdown.map(client => shutdownClientInstance(client)));
 }
 
 /** Status of an LSP server */
@@ -938,13 +924,19 @@ export function getActiveClients(): LspServerStatus[] {
 
 // Register cleanup on module unload
 if (typeof process !== "undefined") {
-	process.on("beforeExit", shutdownAll);
+	process.on("beforeExit", () => {
+		void shutdownAll();
+	});
 	process.on("SIGINT", () => {
-		shutdownAll();
-		process.exit(0);
+		void (async () => {
+			await shutdownAll();
+			process.exit(0);
+		})();
 	});
 	process.on("SIGTERM", () => {
-		shutdownAll();
-		process.exit(0);
+		void (async () => {
+			await shutdownAll();
+			process.exit(0);
+		})();
 	});
 }

package/src/memories/index.ts

@@ -277,6 +277,11 @@ async function runPhase1(options: {
 			});
 
 			if (result.kind === "failed") {
+				logger.error("Memory phase1 stage1 job failed", {
+					threadId: claim.threadId,
+					rolloutPath: claim.rolloutPath,
+					reason: result.reason,
+				});
 				markStage1Failed(db, {
 					threadId: claim.threadId,
 					ownershipToken: claim.ownershipToken,

package/src/modes/components/settings-defs.ts

@@ -348,7 +348,7 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "kagi", label: "Kagi", description: "Requires KAGI_API_KEY and Kagi Search API beta access" },
 		{ value: "synthetic", label: "Synthetic", description: "Requires SYNTHETIC_API_KEY" },
 		{ value: "parallel", label: "Parallel", description: "Requires PARALLEL_API_KEY" },
-		{ value: "searxng", label: "SearXNG", description: "Self-hosted metasearch; set searxng.endpoint" },
+		{ value: "searxng", label: "SearXNG", description: "Requires searxng.endpoint" },
 	],
 	"providers.image": [
 		{

package/src/modes/controllers/selector-controller.ts

@@ -659,9 +659,9 @@ export class SelectorController {
 							return;
 						}
 
-						// Update UI
+						// Update UI — pass the context built by navigateTree to skip a second O(N) walk.
 						this.ctx.chatContainer.clear();
-						this.ctx.renderInitialMessages();
+						this.ctx.renderInitialMessages(result.sessionContext);
 						await this.ctx.reloadTodos();
 						if (result.editorText && !this.ctx.editor.getText().trim()) {
 							this.ctx.editor.setText(result.editorText);

package/src/modes/controllers/todo-command-controller.ts

@@ -21,7 +21,7 @@ const USAGE = [
 	"  /todo export <path>                Write todos as Markdown to <path>",
 	"  /todo import <path>                Replace todos from Markdown at <path>",
 	"  /todo append [<phase>] <task...>   Append a task; phase fuzzy-matched or auto-created",
-	"  /todo start  <task>                Mark task in_progress (id or fuzzy content)",
+	"  /todo start  <task>                Mark task in_progress (fuzzy content match)",
 	"  /todo done   [<task|phase>]        Mark task/phase/all completed",
 	"  /todo drop   [<task|phase>]        Mark task/phase/all abandoned",
 	"  /todo rm     [<task|phase>]        Remove task/phase/all",
@@ -59,44 +59,9 @@ function tokenize(input: string): string[] {
 }
 
 // =============================================================================
-// Roman numerals + name normalization
+// Name normalization
 // =============================================================================
 
-const ROMAN_PAIRS: Array<[number, string]> = [
-	[1000, "M"],
-	[900, "CM"],
-	[500, "D"],
-	[400, "CD"],
-	[100, "C"],
-	[90, "XC"],
-	[50, "L"],
-	[40, "XL"],
-	[10, "X"],
-	[9, "IX"],
-	[5, "V"],
-	[4, "IV"],
-	[1, "I"],
-];
-
-function toRoman(n: number): string {
-	if (n <= 0) return "I";
-	let out = "";
-	let rem = n;
-	for (const [value, sym] of ROMAN_PAIRS) {
-		while (rem >= value) {
-			out += sym;
-			rem -= value;
-		}
-	}
-	return out;
-}
-
-const PHASE_PREFIX_RE = /^([IVXLCDM]+|[A-Z]|\d+)\.\s*/i;
-
-function stripPrefix(name: string): string {
-	return name.replace(PHASE_PREFIX_RE, "").trim();
-}
-
 function titleCase(s: string): string {
 	return s
 		.split(/\s+/)
@@ -105,13 +70,6 @@ function titleCase(s: string): string {
 		.join(" ");
 }
 
-function buildPhaseName(rawName: string, existingPhases: TodoPhase[]): string {
-	const stripped = stripPrefix(rawName.trim());
-	if (!stripped) return `${toRoman(existingPhases.length + 1)}. Todos`;
-	const titled = titleCase(stripped);
-	return `${toRoman(existingPhases.length + 1)}. ${titled}`;
-}
-
 // =============================================================================
 // Fuzzy matching
 // =============================================================================
@@ -119,20 +77,13 @@ function buildPhaseName(rawName: string, existingPhases: TodoPhase[]): string {
 function findPhaseFuzzy(phases: TodoPhase[], query: string): TodoPhase | undefined {
 	const q = query.trim().toLowerCase();
 	if (!q) return undefined;
-	// Exact id
-	const byId = phases.find(p => p.id.toLowerCase() === q);
-	if (byId) return byId;
 	// Exact name (case-insensitive)
 	const byName = phases.find(p => p.name.toLowerCase() === q);
 	if (byName) return byName;
-	// Stripped name match
-	const strippedQ = stripPrefix(q);
-	const byStripped = phases.find(p => stripPrefix(p.name).toLowerCase() === strippedQ);
-	if (byStripped) return byStripped;
-	// Substring (prefer prefix match on stripped name)
-	const prefixMatches = phases.filter(p => stripPrefix(p.name).toLowerCase().startsWith(strippedQ));
+	// Substring (prefer prefix match)
+	const prefixMatches = phases.filter(p => p.name.toLowerCase().startsWith(q));
 	if (prefixMatches.length === 1) return prefixMatches[0];
-	const subMatches = phases.filter(p => stripPrefix(p.name).toLowerCase().includes(strippedQ));
+	const subMatches = phases.filter(p => p.name.toLowerCase().includes(q));
 	if (subMatches.length === 1) return subMatches[0];
 	return undefined;
 }
@@ -140,9 +91,10 @@ function findPhaseFuzzy(phases: TodoPhase[], query: string): TodoPhase | undefin
 function findTaskFuzzy(phases: TodoPhase[], query: string): { task: TodoItem; phase: TodoPhase } | undefined {
 	const q = query.trim().toLowerCase();
 	if (!q) return undefined;
+	// Exact content (case-insensitive)
 	for (const phase of phases) {
 		for (const task of phase.tasks) {
-			if (task.id.toLowerCase() === q) return { task, phase };
+			if (task.content.toLowerCase() === q) return { task, phase };
 		}
 	}
 	const matches: Array<{ task: TodoItem; phase: TodoPhase }> = [];
@@ -169,7 +121,7 @@ function buildSystemReminder(action: string, phases: TodoPhase[]): string {
 	return [
 		"<system-reminder>",
 		`The user manually modified the todo list (${action}).`,
-		"Current todo list (note task ids may have been reassigned by /todo edit):",
+		"Current todo list:",
 		"",
 		md,
 		"</system-reminder>",
@@ -327,28 +279,24 @@ export class TodoCommandController {
 		if (phaseName) {
 			targetPhase = findPhaseFuzzy(next, phaseName);
 			if (!targetPhase) {
-				const newName = buildPhaseName(phaseName, next);
-				targetPhase = { id: `phase-${next.length + 1}`, name: newName, tasks: [] };
+				targetPhase = { name: titleCase(phaseName), tasks: [] };
 				next.push(targetPhase);
 			}
 		} else if (next.length > 0) {
 			targetPhase = next[next.length - 1];
 		} else {
-			targetPhase = { id: "phase-1", name: `${toRoman(1)}. Todos`, tasks: [] };
+			targetPhase = { name: "Todos", tasks: [] };
 			next.push(targetPhase);
 		}
 
-		const usedTaskIds = new Set(next.flatMap(p => p.tasks.map(t => t.id)));
-		let n = 1;
-		while (usedTaskIds.has(`task-${n}`)) n++;
+		const finalContent = titleCaseSentence(content);
 		targetPhase.tasks.push({
-			id: `task-${n}`,
-			content: titleCaseSentence(content),
+			content: finalContent,
 			status: "pending",
 		});
 
 		this.#commit(next, `/todo append → ${targetPhase.name}`);
-		this.ctx.showStatus(`Appended to ${targetPhase.name}: ${content}`);
+		this.ctx.showStatus(`Appended to ${targetPhase.name}: ${finalContent}`);
 	}
 
 	// ------------------------------------------------------------- start / done / drop / rm
@@ -364,12 +312,12 @@ export class TodoCommandController {
 			this.ctx.showError(`No task matched "${rest}". Use /todo to list current tasks.`);
 			return;
 		}
-		const { phases, errors } = applyOpsToPhases(current, [{ op: "start", task: hit.task.id }]);
+		const { phases, errors } = applyOpsToPhases(current, [{ op: "start", task: hit.task.content }]);
 		if (errors.length > 0) {
 			this.ctx.showError(errors.join("; "));
 			return;
 		}
-		this.#commit(phases, `/todo start ${hit.task.id}`);
+		this.#commit(phases, `/todo start ${hit.task.content}`);
 		this.ctx.showStatus(`Started: ${hit.task.content}`);
 	}
 
@@ -391,19 +339,19 @@ export class TodoCommandController {
 
 		const taskHit = findTaskFuzzy(current, trimmed);
 		if (taskHit) {
-			const { phases, errors } = applyOpsToPhases(current, [{ op, task: taskHit.task.id }]);
+			const { phases, errors } = applyOpsToPhases(current, [{ op, task: taskHit.task.content }]);
 			if (errors.length > 0) {
 				this.ctx.showError(errors.join("; "));
 				return;
 			}
-			this.#commit(phases, `/todo ${op} ${taskHit.task.id}`);
+			this.#commit(phases, `/todo ${op} ${taskHit.task.content}`);
 			this.ctx.showStatus(`Marked ${target}: ${taskHit.task.content}`);
 			return;
 		}
 
 		const phaseHit = findPhaseFuzzy(current, trimmed);
 		if (phaseHit) {
-			const { phases, errors } = applyOpsToPhases(current, [{ op, phase: phaseHit.id }]);
+			const { phases, errors } = applyOpsToPhases(current, [{ op, phase: phaseHit.name }]);
 			if (errors.length > 0) {
 				this.ctx.showError(errors.join("; "));
 				return;
@@ -426,18 +374,18 @@ export class TodoCommandController {
 		}
 		const taskHit = findTaskFuzzy(current, trimmed);
 		if (taskHit) {
-			const { phases, errors } = applyOpsToPhases(current, [{ op: "rm", task: taskHit.task.id }]);
+			const { phases, errors } = applyOpsToPhases(current, [{ op: "rm", task: taskHit.task.content }]);
 			if (errors.length > 0) {
 				this.ctx.showError(errors.join("; "));
 				return;
 			}
-			this.#commit(phases, `/todo rm ${taskHit.task.id}`);
+			this.#commit(phases, `/todo rm ${taskHit.task.content}`);
 			this.ctx.showStatus(`Removed: ${taskHit.task.content}`);
 			return;
 		}
 		const phaseHit = findPhaseFuzzy(current, trimmed);
 		if (phaseHit) {
-			const { phases, errors } = applyOpsToPhases(current, [{ op: "rm", phase: phaseHit.id }]);
+			const { phases, errors } = applyOpsToPhases(current, [{ op: "rm", phase: phaseHit.name }]);
 			if (errors.length > 0) {
 				this.ctx.showError(errors.join("; "));
 				return;
@@ -460,7 +408,7 @@ export class TodoCommandController {
 
 		const current = this.#currentPhases();
 		const initialMarkdown =
-			current.length > 0 ? phasesToMarkdown(current) : "# I. Todos\n- [ ] (replace this with your tasks)\n";
+			current.length > 0 ? phasesToMarkdown(current) : "# Todos\n- [ ] (replace this with your tasks)\n";
 
 		const fileHandle = await this.#openTtyHandle();
 		this.ctx.ui.stop();

package/src/modes/interactive-mode.ts

@@ -14,7 +14,17 @@ import {
 	type UsageReport,
 } from "@oh-my-pi/pi-ai";
 import type { Component, SlashCommand } from "@oh-my-pi/pi-tui";
-import { Container, Loader, Markdown, ProcessTerminal, Spacer, Text, TUI, visibleWidth } from "@oh-my-pi/pi-tui";
+import {
+	Container,
+	clearRenderCache,
+	Loader,
+	Markdown,
+	ProcessTerminal,
+	Spacer,
+	Text,
+	TUI,
+	visibleWidth,
+} from "@oh-my-pi/pi-tui";
 import { APP_NAME, getProjectDir, hsvToRgb, isEnoent, logger, postmortem, prompt } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 import { KeybindingsManager } from "../config/keybindings";
@@ -38,6 +48,7 @@ import { getRecentSessions } from "../session/session-manager";
 import { STTController, type SttState } from "../stt";
 import type { ExitPlanModeDetails, LspStartupServerInfo } from "../tools";
 import { normalizeLocalScheme } from "../tools/path-utils";
+import { formatPhaseDisplayName } from "../tools/todo-write";
 import type { EventBus } from "../utils/event-bus";
 import { getEditorCommand, openInEditor } from "../utils/external-editor";
 import { getSessionAccentAnsi, getSessionAccentHexForTitle } from "../utils/session-color";
@@ -442,6 +453,7 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		// Set up theme file watcher
 		onThemeChange(() => {
+			clearRenderCache();
 			this.ui.invalidate();
 			this.updateEditorBorderColor();
 			this.ui.requestRender();
@@ -696,9 +708,12 @@ export class InteractiveMode implements InteractiveModeContext {
 		const lines = ["", indent + theme.bold(theme.fg("accent", "Todos"))];
 
 		if (!this.todoExpanded) {
-			const activePhase = this.#getActivePhase(phases);
+			const activeIdx = phases.indexOf(this.#getActivePhase(phases) ?? phases[0]);
+			const activePhase = phases[activeIdx];
 			if (!activePhase) return;
-			lines.push(`${indent}${theme.fg("accent", `${hook} ${activePhase.name}`)}`);
+			lines.push(
+				`${indent}${theme.fg("accent", `${hook} ${formatPhaseDisplayName(activePhase.name, activeIdx + 1)}`)}`,
+			);
 			const visibleTasks = activePhase.tasks.slice(0, 5);
 			visibleTasks.forEach((todo, index) => {
 				const prefix = `${indent}${index === 0 ? hook : " "} `;
@@ -712,13 +727,13 @@ export class InteractiveMode implements InteractiveModeContext {
 			return;
 		}
 
-		for (const phase of phases) {
-			lines.push(`${indent}${theme.fg("accent", `${hook} ${phase.name}`)}`);
+		phases.forEach((phase, phaseIndex) => {
+			lines.push(`${indent}${theme.fg("accent", `${hook} ${formatPhaseDisplayName(phase.name, phaseIndex + 1)}`)}`);
 			phase.tasks.forEach((todo, index) => {
 				const prefix = `${indent}${index === 0 ? hook : " "} `;
 				lines.push(this.#formatTodoLine(todo, prefix));
 			});
-		}
+		});
 
 		this.todoContainer.addChild(new Text(lines.join("\n"), 1, 0));
 	}
@@ -867,6 +882,19 @@ export class InteractiveMode implements InteractiveModeContext {
 			} else {
 				await this.session.setModelTemporary(prev.model, prev.thinkingLevel);
 			}
+			// If #applyPlanModeModel queued a deferred switch to the plan-role model
+			// (because the session was streaming on entry), drop it now: we are
+			// leaving plan mode, so flushing it on the next agent_end would land the
+			// session on the plan-role model after the user has exited plan mode
+			// (issue #816). Only clear when the pending target matches the plan-role
+			// model — leave any unrelated user-queued switch intact.
+			const pending = this.#pendingModelSwitch;
+			if (pending) {
+				const planResolution = this.session.resolveRoleModelWithThinking("plan");
+				if (planResolution.model && modelsAreEqual(pending.model, planResolution.model)) {
+					this.#pendingModelSwitch = undefined;
+				}
+			}
 		}
 		this.session.setPlanModeState(undefined);
 		this.planModeEnabled = false;
@@ -1334,8 +1362,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#uiHelpers.renderSessionContext(sessionContext, options);
 	}
 
-	renderInitialMessages(): void {
-		this.#uiHelpers.renderInitialMessages();
+	renderInitialMessages(prebuiltContext?: SessionContext): void {
+		this.#uiHelpers.renderInitialMessages(prebuiltContext);
 	}
 
 	getUserMessageText(message: Message): string {
@@ -1688,7 +1716,6 @@ export class InteractiveMode implements InteractiveModeContext {
 		} else {
 			this.todoPhases = [
 				{
-					id: "default",
 					name: "Todos",
 					tasks: todos as TodoItem[],
 				},

package/src/modes/theme/theme.ts

@@ -2328,8 +2328,14 @@ export function getSymbolTheme(): SymbolTheme {
 	};
 }
 
+let _markdownTheme: MarkdownTheme | undefined;
+let _markdownThemeRef: Theme | undefined;
+
 export function getMarkdownTheme(): MarkdownTheme {
-	return {
+	if (_markdownTheme !== undefined && _markdownThemeRef === theme) {
+		return _markdownTheme;
+	}
+	const markdownTheme: MarkdownTheme = {
 		heading: (text: string) => theme.fg("mdHeading", text),
 		link: (text: string) => theme.fg("mdLink", text),
 		linkUrl: (text: string) => theme.fg("mdLinkUrl", text),
@@ -2355,6 +2361,9 @@ export function getMarkdownTheme(): MarkdownTheme {
 			}
 		},
 	};
+	_markdownTheme = markdownTheme;
+	_markdownThemeRef = theme;
+	return markdownTheme;
 }
 
 export function getSelectListTheme(): SelectListTheme {

package/src/modes/types.ts

@@ -42,7 +42,6 @@ export type SubmittedUserInput = {
 export type TodoStatus = "pending" | "in_progress" | "completed" | "abandoned";
 
 export type TodoItem = {
-	id: string;
 	content: string;
 	status: TodoStatus;
 	details?: string;
@@ -50,7 +49,6 @@ export type TodoItem = {
 };
 
 export type TodoPhase = {
-	id: string;
 	name: string;
 	tasks: TodoItem[];
 };
@@ -159,7 +157,7 @@ export interface InteractiveModeContext {
 		sessionContext: SessionContext,
 		options?: { updateFooter?: boolean; populateHistory?: boolean },
 	): void;
-	renderInitialMessages(): void;
+	renderInitialMessages(prebuiltContext?: SessionContext): void;
 	getUserMessageText(message: Message): string;
 	findLastAssistantMessage(): AssistantMessage | undefined;
 	extractAssistantText(message: AssistantMessage): string;

package/src/modes/utils/ui-helpers.ts

@@ -414,7 +414,7 @@ export class UiHelpers {
 		this.ctx.ui.requestRender();
 	}
 
-	renderInitialMessages(): void {
+	renderInitialMessages(prebuiltContext?: SessionContext): void {
 		// This path is used to rebuild the visible chat transcript (e.g. after custom/debug UI).
 		// Clear existing rendered chat first to avoid duplicating the full session in the container.
 		this.ctx.chatContainer.clear();
@@ -422,8 +422,8 @@ export class UiHelpers {
 		this.ctx.pendingBashComponents = [];
 		this.ctx.pendingPythonComponents = [];
 
-		// Get aligned messages and entries from session context
-		const context = this.ctx.sessionManager.buildSessionContext();
+		// Reuse a pre-built context when available (e.g. from navigateTree) to avoid a second O(N) walk.
+		const context = prebuiltContext ?? this.ctx.sessionManager.buildSessionContext();
 		this.ctx.renderSessionContext(context, {
 			updateFooter: true,
 			populateHistory: true,
@@ -610,9 +610,22 @@ export class UiHelpers {
 				await this.ctx.session.prompt(message.text);
 			}
 
-			const promptPromise = this.ctx.session.prompt(firstPrompt.text).catch((error: unknown) => {
-				restoreQueue(error);
-			});
+			// Pass streamingBehavior so that if the session is still streaming when
+			// compaction-end fires (race window between isStreaming flipping false and
+			// the event landing here), prompt() routes the message into the steer/
+			// follow-up queue instead of throwing AgentBusyError. When the session is
+			// genuinely idle, streamingBehavior is ignored and a fresh prompt runs as
+			// before. This keeps the steer preview honest: if delivery has to be
+			// deferred, the message lands in the same queue every other consumer
+			// (Alt+Up dequeue, post-stream drain) already drains, instead of being
+			// stranded in compactionQueuedMessages with no drainer.
+			const promptPromise = this.ctx.session
+				.prompt(firstPrompt.text, {
+					streamingBehavior: firstPrompt.mode === "followUp" ? "followUp" : "steer",
+				})
+				.catch((error: unknown) => {
+					restoreQueue(error);
+				});
 
 			for (const message of rest) {
 				if (this.ctx.isKnownSlashCommand(message.text)) {

package/src/prompts/system/auto-continue.md

@@ -0,0 +1 @@
+Resume work on the user's most recent intent. Re-read the kept recent messages above the summary to confirm what the user asked for last; if their latest request supersedes earlier plans recorded in the summary, follow the latest request. If there is nothing left to do, say so briefly instead of inventing further work.

package/src/prompts/system/eager-todo.md

@@ -2,7 +2,7 @@
 Before doing substantive work on the upcoming user request, create a comprehensive phased todo first.
 
 You **MUST** call `todo_write` first in this turn.
-You **MUST** initialize the todo list with a single `replace` op.
+You **MUST** initialize the todo list with a single `init` op.
 You **MUST** cover the entire request from investigation through implementation and verification — not just the next immediate step.
 You **MUST** make task descriptions specific enough that a future turn can execute them without re-planning.
 You **MUST** keep task `content` to a short label (5-10 words). Put file paths, implementation steps, and specifics in `details`.

package/src/prompts/tools/github.md

@@ -4,9 +4,9 @@ GitHub CLI tool with a single op-based dispatch. Wraps `gh` for repository, issu
 Pick the operation via `op`. Each op uses a subset of the parameters:
 - `repo_view` — Read repository metadata. Optional `repo` (owner/repo) and `branch`. Falls back to the current checkout or default `gh` repo.
 - `issue_view` — Read an issue. Required `issue` (number or URL). Optional `repo`. Set `comments: false` to skip discussion.
-- `pr_view` — Read a pull request, including reviews and inline review comments. Optional `pr` (number, URL, or branch); omitting it targets the current branch's PR. Optional `repo`. Set `comments: false` for a lighter summary.
-- `pr_diff` — Read a pull request diff. Optional `pr`, `repo`. Set `nameOnly: true` for changed file names. Use `exclude` to drop generated paths from the diff.
-- `pr_checkout` — Check a pull request out into a dedicated git worktree. Optional `pr`, `repo`, `branch` (local), `worktree` (path), `force` (reset existing local branch).
+- `pr_view` — Read one or more pull requests, including reviews and inline review comments. Optional `pr` (number, URL, branch, or array of any — pass an array to fetch multiple PRs in one call); omitting it targets the current branch's PR. Optional `repo`. Set `comments: false` for a lighter summary.
+- `pr_diff` — Read one or more pull request diffs. Optional `pr` (single identifier or array for batch). Optional `repo`. Set `nameOnly: true` for changed file names. Use `exclude` to drop generated paths from the diff.
+- `pr_checkout` — Check one or more pull requests out into dedicated git worktrees. Optional `pr` (number, URL, branch, or array of any of those — pass an array to batch-check-out multiple PRs in one call), `repo`, `force` (reset existing local branch).
 - `pr_push` — Push a checked-out PR branch back to its source branch. Requires the branch to have been checked out via `op: pr_checkout` (carries push metadata). Optional `branch`; defaults to the current checked-out git branch. Optional `forceWithLease`.
 - `search_issues` — Search issues using normal GitHub issue search syntax. Required `query`. Optional `repo`, `limit`.
 - `search_prs` — Search pull requests using normal GitHub PR search syntax. Required `query`. Optional `repo`, `limit`.

package/src/prompts/tools/todo-write.md

@@ -5,23 +5,23 @@ The next pending task is auto-promoted to `in_progress` after each completion.
 
 |`op`|Required fields|Effect|
 |---|---|---|
-|`replace`|`phases`|Replace the full list (initial setup, full restructure)|
-|`start`|`task`|Set task to `in_progress`|
-|`done`|`task` or `phase` (or neither = all)|Mark completed|
-|`drop`|`task` or `phase` (or neither = all)|Mark abandoned|
-|`rm`|`task` or `phase` (or neither = all)|Remove|
-|`append`|`phase`, `items: {id, label}[]`|Append tasks; creates phase if missing|
-|`note`|`task`, `text`|Append a note to `task.notes`. Only use to leave reminders for future-you.|
+|`init`|`list`|Initialize the full list|
+|`start`|`task`|Mark in progress|
+|`done`|`task` or `phase`|Mark completed|
+|`drop`|`task` or `phase`|Mark abandoned|
+|`rm`|`task` or `phase`|Remove|
+|`append`|`phase`, `items: string[]`|Append tasks; lazily creates phase|
+|`note`|`task`, `text`|Append a note to a task. Reminders for future-you only.|
 
 ## Anatomy
-- **Task `label`**: 5–10 words, what is being done, not how.
-- **Phase `name`**: short noun phrase prefixed with a roman numeral — `I. Foundation`, `II. Auth`, `III. Verification`. Single-phase plans still use `I.`. Never use snake_case, arabic numerals, or letter prefixes.
+- **Task content**: 5–10 words, what is being done, not how. Used as the task identifier — unique.
+- **Phase name**: short noun phrase (e.g. `Foundation`, `Auth`, `Verification`). Used as the phase identifier — unique. Do not add prefixes like `1.`, `A)`, `Phase 1:`, etc.
 
 ## Rules
-- Mark tasks done immediately after finishing — never defer.
+- Mark tasks done immediately after finishing.
 - Complete phases in order.
-- On blockers, `append` a new task to the active phase.
-- Keep ids stable once introduced.
+- On blockers, `append` a new task to the active phase to unblock yourself, or `drop`.
+- `task` and `phase` fields reference content/name verbatim; keep them stable once introduced.
 
 ## When to create a list
 - Task requires 3+ distinct steps
@@ -31,17 +31,17 @@ The next pending task is auto-promoted to `in_progress` after each completion.
 
 <examples>
 # Initial setup (multi-phase)
-`{"ops":[{"op":"replace","phases":[{"name":"I. Foundation","tasks":[{"content":"Scaffold crate"},{"content":"Wire workspace"}]},{"name":"II. Auth","tasks":[{"content":"Port credential store"},{"content":"Wire OAuth providers"}]},{"name":"III. Verification","tasks":[{"content":"Run cargo test"}]}]}]}`
-# Initial setup (single phase — still prefixed)
-`{"ops":[{"op":"replace","phases":[{"name":"I. Implementation","tasks":[{"content":"Apply fix"},{"content":"Run tests"}]}]}]}`
+`{"ops":[{"op":"init","list":[{"phase":"Foundation","items":["Scaffold crate","Wire workspace"]},{"phase":"Auth","items":["Port credential store","Wire OAuth providers"]},{"phase":"Verification","items":["Run cargo test"]}]}]}`
+# Initial setup (single phase)
+`{"ops":[{"op":"init","list":[{"phase":"Implementation","items":["Apply fix","Run tests"]}]}]}`
 # Complete one task
-`{"ops":[{"op":"done","task":"task-2"}]}`
+`{"ops":[{"op":"done","task":"Wire workspace"}]}`
 # Complete a whole phase
-`{"ops":[{"op":"done","phase":"II. Auth"}]}`
+`{"ops":[{"op":"done","phase":"Auth"}]}`
 # Remove all tasks
 `{"ops":[{"op":"rm"}]}`
 # Drop one task
-`{"ops":[{"op":"drop","task":"task-7"}]}`
+`{"ops":[{"op":"drop","task":"Run cargo test"}]}`
 # Append tasks to a phase
-`{"ops":[{"op":"append","phase":"II. Auth","items":[{"id":"task-8","label":"Handle retries"},{"id":"task-9","label":"Run tests"}]}]}`
+`{"ops":[{"op":"append","phase":"Auth","items":["Handle retries","Run tests"]}]}`
 </examples>