@gavin-hu/my-pi-agent 0.11.4 → 0.12.0

package/extensions/plan/steps.ts

@@ -28,7 +28,7 @@ export const PLAN_OUTLINE = [
 	"# <Title>",
 	"",
 	"## Goal",
-	"What this change achieves, in one or two sentences.",
+	"What this change achieves, and what it deliberately does not.",
 	"",
 	"## Context",
 	"The relevant code, constraints, and prior art.",
@@ -37,8 +37,8 @@ export const PLAN_OUTLINE = [
 	"The chosen approach and why; alternatives considered.",
 	"",
 	"## Steps",
-	"- [ ] First concrete step",
-	"- [ ] Next step",
+	"- [ ] Add `parseConfig` in `src/config.ts`, with a test for a missing key",
+	"- [ ] Wire it into `load()` and document the failure in the README",
 	"",
 	"## Risks",
 	"What could go wrong and how it is mitigated.",
@@ -61,6 +61,10 @@ export interface PlanSection {
 	title: string;
 	/** The section's markdown, including its heading line. */
 	text: string;
+	/** 0-based source line of the section's heading (0 for the preamble). */
+	line: number;
+	/** Heading level, or 0 for the preamble before the first heading. */
+	level: number;
 }
 
 /** A top-level list item located in the source. */
@@ -78,10 +82,19 @@ interface PlanListItem {
 /** A top-level numbered or bulleted list item, capturing its parts. */
 const LIST_ITEM = /^([ \t]*)((?:\d+[.)]|[-*+])\s+)(.*\S)\s*$/;
 const CHECKBOX = /^\[([ xX])\]\s*(.*)$/;
-/** A markdown heading outside a fence, capturing its level and text. */
-const HEADING = /^ {0,3}(#{1,6})\s+(.*?)\s*#*\s*$/;
-/** A markdown code-fence opener or closer (backticks or tildes). */
-const FENCE = /^\s{0,3}(`{3,}|~{3,})/;
+/**
+ * A markdown heading outside a fence, capturing its level and text: up to three
+ * leading spaces, a space after the hashes, and a closing hash run only when a
+ * space separates it. Shared with `blocks.ts`, so the section split and the
+ * browser outline read a heading line the same way, and `## C#` keeps its title.
+ */
+export const HEADING = /^ {0,3}(#{1,6})\s+(.*?)(?:\s+#+)?\s*$/;
+/**
+ * A markdown code-fence opener or closer (backticks or tildes). Shared with
+ * `blocks.ts`: a tab-indented fence is prose for both parsers, never code for
+ * one and prose for the other.
+ */
+export const FENCE = /^ {0,3}(`{3,}|~{3,})/;
 const DONE_MARKER = /\[DONE:\d+\]/gi;
 
 /**
@@ -282,13 +295,13 @@ export function setStepStatuses(plan: string, updates: StepUpdate[]): string | u
 }
 
 /**
- * Titles (normalized) whose section text differs between two plan revisions, or
- * that are new in `current`. Revision snapshots are the caller's to provide;
- * strip stored feedback first so a review comment does not look like an edit.
- * Duplicate headings are compared by occurrence, and a changed title marks every
- * section with that title — plans following the canonical outline have none.
+ * Per-section change flags for a second review: `boolean[]` aligned with
+ * `extractPlanSections(current)`, so duplicate headings are flagged by
+ * occurrence rather than by title. Revision snapshots are the caller's to
+ * provide; strip stored feedback first so a review comment does not look like
+ * an edit.
  */
-export function changedSections(previous: string, current: string): Set<string> {
+export function changedSections(previous: string, current: string): boolean[] {
 	const before = new Map<string, string[]>();
 	for (const section of extractPlanSections(previous)) {
 		const texts = before.get(section.title);
@@ -297,14 +310,12 @@ export function changedSections(previous: string, current: string): Set<string>
 	}
 
 	const seen = new Map<string, number>();
-	const changed = new Set<string>();
-	for (const section of extractPlanSections(current)) {
+	return extractPlanSections(current).map((section) => {
 		const index = seen.get(section.title) ?? 0;
 		seen.set(section.title, index + 1);
 		const prior = before.get(section.title)?.[index];
-		if (prior === undefined || prior !== section.text.trim()) changed.add(section.title);
-	}
-	return changed;
+		return prior === undefined || prior !== section.text.trim();
+	});
 }
 
 /**
@@ -323,7 +334,7 @@ export function extractPlanSections(plan: string): PlanSection[] {
 		current = undefined;
 	};
 
-	for (const line of plan.split("\n")) {
+	plan.split("\n").forEach((line, index) => {
 		const fenceMatch = line.match(FENCE);
 		if (fenceMatch) {
 			if (fence === undefined) fence = fenceMatch[1][0];
@@ -332,13 +343,13 @@ export function extractPlanSections(plan: string): PlanSection[] {
 			const heading = line.match(HEADING);
 			if (heading) {
 				flush();
-				current = { title: plainText(heading[2]), text: line };
-				continue;
+				current = { title: plainText(heading[2]), text: line, line: index, level: heading[1].length };
+				return;
 			}
 		}
-		if (current === undefined) current = { title: "", text: line };
+		if (current === undefined) current = { title: "", text: line, line: 0, level: 0 };
 		else current.text += `\n${line}`;
-	}
+	});
 
 	flush();
 	return sections;

package/extensions/plan/todos.ts

@@ -3,25 +3,15 @@
  *
  * `todo` is whole-list replacement, so seeding an approved plan straight over
  * the list would discard whatever the user was already tracking. This module
- * reads the last `todo` result from the session branch — the published state
- * channel, replayed the way the todo extension itself reconstructs it, with no
- * import from that extension — and merges the plan's steps into it: existing
- * items keep their place and status, a step whose text is already present is
- * skipped, and the tool's item cap is respected without dropping anything the
- * user had.
+ * merges the plan's steps into the list `lib/todo-state.ts` replays from the
+ * session branch: existing items keep their place and status, a step whose text
+ * is already present is skipped, and the tool's item cap is respected without
+ * dropping anything the user had.
  */
 
-import { TODO_TOOL } from "../../lib/tool-names.ts";
+import type { ExistingTodo } from "../../lib/todo-state.ts";
 import type { PlanStep } from "./steps.ts";
 
-/** One item in the existing todo list, as the todo tool stores it. */
-export interface ExistingTodo {
-	content: string;
-	status: "pending" | "in_progress" | "completed";
-	/** Present-continuous label the todo tool requires for an in-progress item. */
-	activeForm?: string;
-}
-
 /** The merged list plus the counts the approval message reports. */
 export interface TodoMerge {
 	todos: ExistingTodo[];
@@ -35,52 +25,9 @@ export interface TodoMerge {
 	deferred: number;
 }
 
-/** Minimal shape of a session entry, used for runtime narrowing. */
-interface BranchEntryLike {
-	type?: string;
-	message?: {
-		role?: string;
-		toolName?: string;
-		details?: unknown;
-	};
-}
-
 /** Fallback list cap when the registered todo tool does not advertise one. */
 export const DEFAULT_TODO_MAX = 50;
 
-function isStatus(value: unknown): value is ExistingTodo["status"] {
-	return value === "pending" || value === "in_progress" || value === "completed";
-}
-
-/**
- * The last valid todo list written on the branch, or an empty list. A rejected
- * call carries the unchanged list and is not a state write, so it is skipped;
- * an entry that does not re-validate is ignored rather than wiping a good list.
- */
-export function lastTodos(entries: Iterable<unknown>): ExistingTodo[] {
-	let todos: ExistingTodo[] = [];
-	for (const raw of entries) {
-		const entry = raw as BranchEntryLike;
-		if (entry?.type !== "message") continue;
-		const message = entry.message;
-		if (message?.role !== "toolResult" || message.toolName !== TODO_TOOL) continue;
-		const details = message.details as { todos?: unknown; error?: unknown } | undefined;
-		if (!details || details.error) continue;
-		if (!Array.isArray(details.todos)) continue;
-		todos = details.todos.flatMap((item): ExistingTodo[] => {
-			if (typeof item !== "object" || item === null) return [];
-			const value = item as { content?: unknown; status?: unknown; activeForm?: unknown };
-			if (typeof value.content !== "string" || !isStatus(value.status)) return [];
-			const content = value.content.trim();
-			if (!content) return [];
-			const activeForm =
-				typeof value.activeForm === "string" && value.activeForm.trim() ? value.activeForm.trim() : undefined;
-			return [activeForm ? { content, status: value.status, activeForm } : { content, status: value.status }];
-		});
-	}
-	return todos;
-}
-
 /** Case- and whitespace-insensitive key for recognizing a repeated item. */
 function contentKey(content: string): string {
 	return content.trim().replace(/\s+/g, " ").toLowerCase();

package/extensions/plan/tools.ts

@@ -17,17 +17,16 @@
 
 import { StringEnum } from "@earendil-works/pi-ai";
 import type { ExtensionAPI, ExtensionToolContext } from "@earendil-works/pi-coding-agent";
-import { basename } from "node:path";
 import { Type, type Static } from "typebox";
 import { sanitizeLine } from "../../lib/format.ts";
-import { askHuman } from "../../lib/interaction.ts";
 import { TODO_TOOL } from "../../lib/tool-names.ts";
-import { FULL_SCREEN_OVERLAY, reuseText, toolDetails } from "../../lib/tui/chrome.ts";
+import { lastTodos } from "../../lib/todo-state.ts";
+import { reuseText, toolDetails } from "../../lib/tui/chrome.ts";
 import { rejectionLine, reuseCallText, toolCallTitle } from "../../lib/tui/tool.ts";
 import { paint } from "../../lib/tui/tokens.ts";
 import { expandHint, GLYPHS } from "../../lib/tui/glyphs.ts";
 import { READ_ONLY_SUMMARY } from "./policy.ts";
-import { feedbackSummary, type PlanAnnotation } from "./feedback.ts";
+import { feedbackSummary } from "./feedback.ts";
 import { ENTER_TOOL, EXIT_TOOL, SET_PLAN_STEPS_TOOL, WRITE_PLAN_TOOL, type PlanRuntime } from "./runtime.ts";
 import {
 	MAX_STEP_LENGTH,
@@ -39,10 +38,11 @@ import {
 	type PlanStepSummary,
 	type StepUpdate,
 } from "./steps.ts";
-import { DEFAULT_TODO_MAX, lastTodos, mergeTodos, type TodoMerge } from "./todos.ts";
-import { PlanViewComponent, sanitizePlanText, type PlanViewAction } from "./tui.ts";
+import { DEFAULT_TODO_MAX, mergeTodos, type TodoMerge } from "./todos.ts";
+import { reviewPlan } from "./review.ts";
+import { sanitizePlanText } from "./tui.ts";
 import type { EnterPlanModeDetails, ExitPlanModeDetails, SetPlanStepsDetails, WritePlanDetails } from "./types.ts";
-import { createPlanWebReview, type PlanReviewResult, type PlanReviewSession, type PlanWebReview } from "./web.ts";
+import { createPlanWebReview, type PlanWebReview } from "./web.ts";
 
 const ExitPlanModeParams = Type.Object({
 	plan_path: Type.String({
@@ -204,103 +204,6 @@ function mergeSummary(merged: TodoMerge, steps: PlanStep[]): string {
 	return ` Merged ${counted} into the todo list${suffix}. ${tick}`;
 }
 
-/** The review choice plus the refinement the user typed in the TUI, if any. */
-interface PlanReviewOutcome {
-	action: PlanViewAction;
-	refinement?: string;
-}
-
-/** A dialog-only choice: post the full plan text, then ask again. Never returned. */
-type ReviewChoice = PlanReviewOutcome | { action: "send" };
-
-/** Prompt shown by the dialog-based refine editor in non-TUI modes. */
-const REFINE_PROMPT = "Refine the plan — what should change? (Enter to save, Esc to cancel)";
-
-/** How much of one step the remote digest shows. */
-const DIGEST_STEP_CHARS = 90;
-
-/**
- * A one-message digest of the plan for a remote review.
- *
- * The file is the primary artifact, but a phone client may never render or open
- * it, and the peer still has to choose approve / refine. The digest carries the
- * title, the step count, and the first few steps; the full text follows as a
- * file or as the fallback message.
- */
-function planReviewDigest(content: string): string {
-	const title = /^#\s+(.+)$/m.exec(content)?.[1]?.trim();
-	const steps = extractPlanSteps(content);
-	const count = steps.length;
-	const head = `Plan${title ? `: ${title}` : ""}${count > 0 ? ` (${count} step${count === 1 ? "" : "s"})` : ""}`;
-	const preview = steps.slice(0, 3).map((step, index) => {
-		const text = step.content.replace(/\s+/g, " ").trim();
-		const shown = text.length > DIGEST_STEP_CHARS ? `${text.slice(0, DIGEST_STEP_CHARS - 1)}…` : text;
-		return `${index + 1}. ${shown}`;
-	});
-	const more = count > preview.length ? `… (${count - preview.length} more)` : "";
-	return [head, ...preview, more, "The full plan is attached above, or sent as text if the file failed."]
-		.filter((line) => line !== "")
-		.join("\n");
-}
-
-/**
- * Ask the user to review the plan file. The TUI opens the scrollable review
- * screen (with an inline refine editor); dialog-capable modes (RPC) fall back
- * to a select plus the refine editor; the caller has already refused when there
- * is no UI.
- */
-async function reviewPlan(
-	ctx: ExtensionToolContext,
-	plan: { path: string; relativePath: string; content: string; bytes: number },
-	previous?: string,
-): Promise<PlanReviewOutcome> {
-	// The first pass sends the file (or the full text when it fails) and the
-	// digest; asking for the full plan re-enters with the text only, then shows
-	// the choices again.
-	let sentFullText = false;
-	for (;;) {
-		const outcome = await askHuman<ReviewChoice>(ctx, {
-			custom: async () => {
-				const outcome = await ctx.ui.custom<PlanReviewOutcome | undefined>(
-					(tui, theme, _keybindings, done) =>
-						new PlanViewComponent({
-							plan,
-							previous,
-							theme,
-							onClose: (action, refinement) => done({ action, refinement }),
-							requestRender: () => tui.requestRender(),
-							viewportRows: () => tui.terminal?.rows,
-							tui,
-						}),
-					FULL_SCREEN_OVERLAY,
-				);
-				return outcome ?? { action: "keep" };
-			},
-			dialogs: async () => {
-				const choice = await ctx.ui.select("Plan mode — what next?", [
-					"Approve and execute",
-					"Send the full plan",
-					"Refine the plan",
-					"Keep planning",
-				]);
-				if (choice === "Approve and execute") return { action: "approve" };
-				if (choice === "Send the full plan") return { action: "send" };
-				if (choice === "Refine the plan") return { action: "refine" };
-				return { action: "keep" };
-			},
-			// A remote turn gets the plan file up front, falling back to the full text;
-			// a local TUI turn ignores both and renders the component. The digest goes
-			// out either way so the choices stay answerable when a phone client does not
-			// render the file bubble.
-			file: sentFullText ? undefined : { path: plan.path, name: basename(plan.relativePath) },
-			body: plan.content,
-			note: sentFullText ? undefined : planReviewDigest(plan.content),
-		});
-		if (outcome.action !== "send") return outcome;
-		sentFullText = true;
-	}
-}
-
 export function registerTools(
 	pi: ExtensionAPI,
 	runtime: PlanRuntime,
@@ -320,7 +223,7 @@ export function registerTools(
 		executionMode: "sequential",
 		// readOnlyHint stays true: entering plan mode changes only the session's
 		// tool set, never files or system state, so it needs no approval.
-		annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: false },
+		annotations: { readOnlyHint: true, openWorldHint: false },
 
 		async execute(_toolCallId, _params, _signal, _onUpdate, ctx) {
 			if (runtime.isEnabled()) {
@@ -464,9 +367,9 @@ export function registerTools(
 		executionMode: "sequential",
 		// readOnlyHint stays true: it writes no files, and the review dialog inside
 		// execute is the human gate, so an outer prompt would only double-ask.
-		annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: false },
+		annotations: { readOnlyHint: true, openWorldHint: false },
 
-		async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+		async execute(_toolCallId, params, signal, _onUpdate, ctx) {
 			const planPath = (params as ExitPlanModeArgs).plan_path.trim();
 
 			if (!runtime.isEnabled()) {
@@ -477,7 +380,7 @@ export function registerTools(
 				};
 			}
 
-			let file = await runtime.plans.read(ctx.cwd, planPath);
+			const file = await runtime.plans.read(ctx.cwd, planPath);
 			if (!file) {
 				return {
 					content: [
@@ -510,117 +413,57 @@ export function registerTools(
 				};
 			}
 
-			// What the last review showed this file, so this one can mark the changes.
-			// Mark before presenting: the next review compares against what is on
-			// screen now, not against a revision the user never saw.
-			let presentedPrevious: string | undefined;
-			const present = (candidate: { path: string; relativePath: string; content: string; bytes: number }) => {
-				const previous = runtime.reviewed(candidate.path);
-				runtime.markReviewed(candidate.path, candidate.content);
-				presentedPrevious = previous;
-				return reviewPlan(ctx, candidate, previous);
-			};
-
-			let outcome = await present(file);
-			// Comments carried by a browser approval, reported alongside the approval.
-			let browserComments: PlanAnnotation[] = [];
-			// Review, refine, and browser review all loop back here until the user
-			// approves, keeps planning, or a refinement is handed to the model. The
-			// dialog-based refine editor carries no text from the review screen, so an
-			// empty or cancelled editor returns to the review instead of being reported
-			// as "not approved".
-			for (;;) {
-				if (outcome.action === "browser") {
-					// The review screen that produced this choice already marked the
-					// content it showed, so the page compares against that baseline.
-					const session: PlanReviewSession | undefined = await web
-						.start(ctx.cwd, file, { canApprove: true, previous: presentedPrevious })
-						.catch(() => undefined);
-					if (!session) {
-						ctx.ui.notify("Plan review: could not start the browser review server.", "error");
-						outcome = await present(file);
-						continue;
-					}
-					ctx.ui.notify(`Plan review: opened ${session.url}`, "info");
-					const result: PlanReviewResult = await session.done;
-					await session.close();
-					if (result.status === "approved") {
-						// Approve from the browser is the TUI's approve: keep the comments it
-						// carried and fall through to the shared approval path below.
-						file = result.plan;
-						browserComments = result.annotations;
-						outcome = { action: "approve" };
-						continue;
-					}
-					if (result.status === "saved") {
-						// The comments are already in the file; hand them back as a refinement so
-						// the model revises the same plan and calls exit_plan_mode again.
-						const refinement = feedbackSummary(result.annotations) || "See the review comments in the plan file.";
-						return {
-							content: [
-								{
-									type: "text",
-									text: `The user reviewed the plan in the browser and left feedback:\n${refinement}\nStay in plan mode, revise the plan (write_plan, reusing plan_path), then call exit_plan_mode again.`,
-								},
-							],
-							details: {
-								approved: false,
-								plan: result.plan.content,
-								planPath: result.plan.path,
-								relativePath: result.plan.relativePath,
-								refined: true,
-								refinement,
-							} satisfies ExitPlanModeDetails,
-						};
-					}
-					// Cancelled or the tab closed: re-read the file and review again.
-					file = (await runtime.plans.read(ctx.cwd, file.path)) ?? file;
-					outcome = await present(file);
-					continue;
-				}
-				if (outcome.action === "refine" && !outcome.refinement) {
-					const refinement = (await ctx.ui.editor(REFINE_PROMPT, ""))?.trim();
-					if (refinement) outcome = { action: "refine", refinement };
-					else outcome = await present(file);
-					continue;
-				}
-				if (outcome.action === "refine") {
-					const refinement = outcome.refinement ?? "";
-					return {
-						content: [
-							{
-								type: "text",
-								text: `The user asked to refine the plan: ${refinement}\nStay in plan mode, revise the plan (write_plan, reusing plan_path), then call exit_plan_mode again.`,
-							},
-						],
-						details: {
-							approved: false,
-							plan: file.content,
-							planPath: file.path,
-							relativePath: file.relativePath,
-							refined: true,
-							refinement,
-						} satisfies ExitPlanModeDetails,
-					};
-				}
-				if (outcome.action !== "approve") {
-					return {
-						content: [
-							{ type: "text", text: "Plan not approved. Stay in plan mode, ask what to change, and revise the plan." },
-						],
-						details: {
-							approved: false,
-							plan: file.content,
-							planPath: file.path,
-							relativePath: file.relativePath,
-						} satisfies ExitPlanModeDetails,
-					};
-				}
-				break;
+			// One decision, however the session is attached; `review.ts` owns the loop,
+			// the baseline, and closing the browser review when the turn is aborted.
+			const decision = await reviewPlan({
+				ctx,
+				web,
+				plans: runtime.plans,
+				baselines: runtime,
+				plan: file,
+				signal,
+			});
+
+			if (decision.action === "refine") {
+				// A browser save already wrote its comments into the file; either way the
+				// model revises the same plan and presents it again.
+				const feedback = decision.fromBrowser
+					? `The user reviewed the plan in the browser and left feedback:\n${decision.refinement}`
+					: `The user asked to refine the plan: ${decision.refinement}`;
+				return {
+					content: [
+						{
+							type: "text",
+							text: `${feedback}\nStay in plan mode, revise the plan (write_plan, reusing plan_path), then call exit_plan_mode again.`,
+						},
+					],
+					details: {
+						approved: false,
+						plan: decision.plan.content,
+						planPath: decision.plan.path,
+						relativePath: decision.plan.relativePath,
+						refined: true,
+						refinement: decision.refinement,
+						annotations: decision.comments.length > 0 ? decision.comments : undefined,
+					} satisfies ExitPlanModeDetails,
+				};
+			}
+			if (decision.action === "keep") {
+				return {
+					content: [
+						{ type: "text", text: "Plan not approved. Stay in plan mode, ask what to change, and revise the plan." },
+					],
+					details: {
+						approved: false,
+						plan: decision.plan.content,
+						planPath: decision.plan.path,
+						relativePath: decision.plan.relativePath,
+					} satisfies ExitPlanModeDetails,
+				};
 			}
 
 			runtime.disable(ctx);
-			const { steps, merged, error } = await seedTodos(pi, ctx, file.content);
+			const { steps, merged, error } = await seedTodos(pi, ctx, decision.plan.content);
 			const listing =
 				steps.length > 0
 					? `\n\n${steps
@@ -635,21 +478,22 @@ export function registerTools(
 						: merged
 							? mergeSummary(merged, steps)
 							: ` Could not read the todo list. Record these steps with the todo tool before you start, and tick them off with ${SET_PLAN_STEPS_TOOL}.`;
-			const browserNote = browserComments.length
-				? `\n\nThe user approved from the browser review with these comments:\n${feedbackSummary(browserComments)}`
+			const browserNote = decision.comments.length
+				? `\n\nThe user approved from the browser review with these comments:\n${feedbackSummary(decision.comments)}`
 				: "";
 			return {
 				content: [
 					{
 						type: "text",
-						text: `Plan approved. Plan mode is off and write access is restored. The plan file ${file.relativePath} is the source of truth; follow its steps.${browserNote}${tail}${listing}`,
+						text: `Plan approved. Plan mode is off and write access is restored. The plan file ${decision.plan.relativePath} is the source of truth; follow its steps.${browserNote}${tail}${listing}`,
 					},
 				],
 				details: {
 					approved: true,
-					plan: file.content,
-					planPath: file.path,
-					relativePath: file.relativePath,
+					plan: decision.plan.content,
+					planPath: decision.plan.path,
+					relativePath: decision.plan.relativePath,
+					annotations: decision.comments.length > 0 ? decision.comments : undefined,
 				} satisfies ExitPlanModeDetails,
 			};
 		},

package/extensions/plan/tui.ts

@@ -30,7 +30,7 @@ import {
 	type TuiMouseEvent,
 	type TuiMouseEventResult,
 } from "@earendil-works/pi-tui";
-import { stripControlChars } from "../../lib/format.ts";
+import { sanitizeLine, stripControlChars } from "../../lib/format.ts";
 import {
 	editorTheme,
 	screenHint,
@@ -128,8 +128,11 @@ const TASK_MARKER = /^([-*+]|\d+[.)])(\s+)(\[([ xX])\])(\s*)$/;
 /**
  * Wrap the Markdown theme so task checkboxes read at a glance with the shared
  * `◼`/`◻` vocabulary, the same box the bytefly screen and the question dialog
- * draw. The replacement is one column wide instead of the bracket's three, so a
- * wrapped list continuation shifts left by two.
+ * draw. The box is one column wide instead of the bracket's three, so the two
+ * freed columns are kept as padding: pi-tui derives a continuation line's indent
+ * from the original marker's width, and shortening the marker without padding
+ * hangs every wrapped task line two columns too far right, where the width
+ * truncation clips its tail.
  */
 function planMarkdownTheme(theme: Theme, base: MarkdownTheme): MarkdownTheme {
 	return {
@@ -138,7 +141,9 @@ function planMarkdownTheme(theme: Theme, base: MarkdownTheme): MarkdownTheme {
 			const match = TASK_MARKER.exec(text);
 			if (!match) return base.listBullet(text);
 			const [, bullet, gap, , mark, trail] = match;
-			return `${base.listBullet(`${bullet}${gap}`)}${checkbox(theme, mark.toLowerCase() === "x")}${trail}`;
+			const themed = `${base.listBullet(`${bullet}${gap}`)}${checkbox(theme, mark.toLowerCase() === "x")}`;
+			const pad = Math.max(0, visibleWidth(text) - visibleWidth(themed) - visibleWidth(trail));
+			return `${themed}${" ".repeat(pad)}${trail}`;
 		},
 	};
 }
@@ -205,10 +210,13 @@ export class PlanViewComponent implements Component {
 		const base = this.options.markdownTheme ?? getMarkdownTheme();
 		const theme = planMarkdownTheme(this.theme, base);
 		const current = sanitizePlanText(this.options.plan.content);
+		// Both sides of the diff get the same normalization: the baseline is stored
+		// raw, so sanitizing only `current` would report a tab as a change on every
+		// review.
 		const changed =
 			this.options.previous === undefined
-				? new Set<string>()
-				: changedSections(stripFeedback(this.options.previous), stripFeedback(current));
+				? []
+				: changedSections(stripFeedback(sanitizePlanText(this.options.previous)), stripFeedback(current));
 		const chunks = extractPlanSections(current);
 		const lines: string[] = [];
 		const sections: SectionOffset[] = [];
@@ -221,14 +229,14 @@ export class PlanViewComponent implements Component {
 			sections.push({
 				title: chunk.title,
 				offset: lines.length,
-				...(changed.has(chunk.title) ? { changed: true } : {}),
+				...(changed[index] ? { changed: true } : {}),
 			});
 			lines.push(...rendered);
 			// Sections render independently, so restore the blank line a heading-only
 			// chunk omits before the next section.
 			if (index < chunks.length - 1 && lines.length > 0 && lines[lines.length - 1] !== "") lines.push("");
 		});
-		this.cache = { width, lines, sections, changedCount: chunks.filter((chunk) => changed.has(chunk.title)).length };
+		this.cache = { width, lines, sections, changedCount: changed.filter(Boolean).length };
 		return this.cache;
 	}
 
@@ -363,7 +371,7 @@ export class PlanViewComponent implements Component {
 		const theme = this.theme;
 		const w = Math.max(1, width);
 		const plan = this.options.plan;
-		const title = planTitle(basename(plan.path));
+		const title = sanitizeLine(planTitle(basename(plan.path)));
 
 		const previousWidth = this.cache?.width;
 		const built = plan.content.trim() ? this.build(w) : { width: w, lines: [], sections: [], changedCount: 0 };

package/extensions/plan/types.ts

@@ -2,6 +2,7 @@
  * Shared types for the plan-mode extension.
  */
 
+import type { PlanAnnotation } from "./feedback.ts";
 import type { StepUpdate } from "./steps.ts";
 
 /** Persisted (custom entry) plan-mode state. */
@@ -62,6 +63,8 @@ export interface ExitPlanModeDetails {
 	refined?: boolean;
 	/** The refinement the user typed, when `refined` is true. */
 	refinement?: string;
+	/** Comments the review carried when it approved or requested a refinement. */
+	annotations?: PlanAnnotation[];
 	/** True when no interactive UI was available to ask for approval. */
 	unavailable?: boolean;
 }