@gavin-hu/my-pi-agent 0.15.0 → 0.16.0

package/extensions/job/tools.ts

@@ -9,17 +9,9 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { sanitizeLine } from "../../lib/format.ts";
 import { errorResult } from "../../lib/tool-result.ts";
 import { reuseText, toolDetails } from "../../lib/tui/chrome.ts";
-import {
-	elapsedSuffix,
-	errorLine,
-	rejectionLine,
-	reuseCallText,
-	syncElapsedTimer,
-	toolCallTitle,
-} from "../../lib/tui/tool.ts";
+import { callLine, detailsOrLine, elapsedSuffix, rejectionLine, syncElapsedTimer } from "../../lib/tui/tool.ts";
 import { SEPARATORS } from "../../lib/tui/glyphs.ts";
 import { paint } from "../../lib/tui/tokens.ts";
 import {
@@ -229,30 +221,19 @@ export function registerTools(pi: ExtensionAPI, runtime: JobsRuntime): void {
 
 		renderCall(args, theme, context) {
 			const action = typeof args.action === "string" ? args.action : "job";
-			const text = reuseCallText(context.lastComponent, "", "middle");
-			text.setText(
-				toolCallTitle(theme, `${TOOL_NAME} `) +
-					paint(
-						theme,
-						"meta",
-						sanitizeLine(formatCallText(action, args as Record<string, unknown>, context.argsComplete)),
-					),
-			);
-			return text;
+			const subject = formatCallText(action, args as Record<string, unknown>, context.argsComplete);
+			return callLine(theme, context.lastComponent, TOOL_NAME, subject, "middle");
 		},
 
 		renderResult(result, options, theme, context) {
 			const text = reuseText(context.lastComponent);
 			const startedAt = syncElapsedTimer(options.isPartial, context);
-			const details = toolDetails<JobDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, options.expanded));
-				return text;
-			}
-			if (details.error) {
-				text.setText(errorLine(theme, details.error));
+			const outcome = detailsOrLine(theme, result, options.expanded, toolDetails<JobDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
+			const details = outcome.details;
 
 			if (options.isPartial) {
 				const id = details.job?.id;

package/extensions/memory/commands.ts

@@ -10,7 +10,7 @@
  */
 
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-import { withRailsSuppressed } from "../../lib/rails.ts";
+import { withPolledScreen } from "../../lib/screen-session.ts";
 import { messageOf } from "./errors.ts";
 import { formatHealth, memoryHealth } from "./doctor.ts";
 import { formatNotice, scopeLabel } from "./format.ts";
@@ -55,49 +55,35 @@ async function openPicker(pi: ExtensionAPI, runtime: MemoryRuntime, ctx: Extensi
 		return;
 	}
 
-	let timer: ReturnType<typeof setInterval> | undefined;
-	const stopTimer = (): void => {
-		if (timer) clearInterval(timer);
-		timer = undefined;
-	};
-
-	// The dock screen owns the editor slot; hide the rails for its lifetime.
-	try {
-		await withRailsSuppressed(pi, () =>
-			ctx.ui.custom<void>((tui, theme, _keybindings, done) => {
-				const component = new MemoryPickerComponent(
-					tui,
-					theme,
-					{
-						entries: () => runtime.entries(),
-						trusted: () => runtime.trusted(),
-						refresh: () => runtime.refresh().changed.length > 0,
-						add: (scope, text) => runtime.add(scope, text),
-						update: (scope, from, to) => runtime.update(scope, from, to),
-						forget: (scope, entry) => runtime.forget(scope, entry),
-						merge: (scope, first, second, merged) => runtime.merge(scope, first, second, merged),
-						move: (from, to, text) => runtime.move(from, to, text),
-					},
-					() => {
-						stopTimer();
-						done();
-					},
-					() => tui.requestRender(),
-					() => tui.terminal?.rows,
-				);
-
-				// Pick up an external edit while the screen is open, repainting only on a change.
-				timer = setInterval(() => {
-					if (runtime.refresh().changed.length > 0) tui.requestRender();
-				}, PICKER_POLL_MS);
-				timer.unref?.();
-
-				return component;
-			}),
-		);
-	} finally {
-		stopTimer();
-	}
+	await withPolledScreen(
+		pi,
+		ctx,
+		(screen) =>
+			new MemoryPickerComponent(
+				screen.tui,
+				screen.theme,
+				{
+					entries: () => runtime.entries(),
+					trusted: () => runtime.trusted(),
+					refresh: () => runtime.refresh().changed.length > 0,
+					add: (scope, text) => runtime.add(scope, text),
+					update: (scope, from, to) => runtime.update(scope, from, to),
+					forget: (scope, entry) => runtime.forget(scope, entry),
+					merge: (scope, first, second, merged) => runtime.merge(scope, first, second, merged),
+					move: (from, to, text) => runtime.move(from, to, text),
+				},
+				screen.close,
+				screen.requestRender,
+				screen.viewportRows,
+			),
+		{
+			pollMs: PICKER_POLL_MS,
+			// Pick up an external edit while the screen is open, repainting only on a change.
+			poll: (_component, handles) => {
+				if (runtime.refresh().changed.length > 0) handles.requestRender();
+			},
+		},
+	);
 }
 
 export function registerCommands(pi: ExtensionAPI, runtime: MemoryRuntime): void {

package/extensions/memory/tools.ts

@@ -10,10 +10,8 @@
 
 import type { JsonValue } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { sanitizeLine } from "../../lib/format.ts";
+import { callLine, detailsOrLine } from "../../lib/tui/tool.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 { messageOf } from "./errors.ts";
 import { formatCallText, formatResultText, scopeLabel } from "./format.ts";
 import type { MemoryRuntime } from "./runtime.ts";
@@ -139,27 +137,21 @@ export function registerTools(pi: ExtensionAPI, runtime: MemoryRuntime): void {
 		},
 
 		renderCall(args, theme, context) {
-			const text = reuseCallText(context.lastComponent);
 			const body = formatCallText(
 				args as { action?: unknown; text?: unknown; to?: unknown; scope?: unknown },
 				context.argsComplete,
 			);
-			text.setText(toolCallTitle(theme, `${TOOL_NAME} `) + paint(theme, "meta", body));
-			return text;
+			return callLine(theme, context.lastComponent, TOOL_NAME, body);
 		},
 
 		renderResult(result, { expanded }, theme, context) {
 			const text = reuseText(context.lastComponent);
-			const details = toolDetails<MemoryDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, expanded));
-				return text;
-			}
-			if (details.error) {
-				text.setText(paint(theme, "bad", `Error: ${sanitizeLine(details.error)}`));
+			const outcome = detailsOrLine(theme, result, expanded, toolDetails<MemoryDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
-			text.setText(formatResultText(details, expanded));
+			text.setText(formatResultText(outcome.details, expanded));
 			return text;
 		},
 	});

package/extensions/plan/tools/enter.ts

@@ -10,7 +10,7 @@ import { Type } from "typebox";
 import { reuseText, toolDetails } from "../../../lib/tui/chrome.ts";
 import { GLYPHS } from "../../../lib/tui/glyphs.ts";
 import { paint } from "../../../lib/tui/tokens.ts";
-import { rejectionLine, reuseCallText, toolCallTitle } from "../../../lib/tui/tool.ts";
+import { callLine, detailsOrLine } from "../../../lib/tui/tool.ts";
 import { PLAN_CONSENT, READ_ONLY_SUMMARY } from "../../../lib/plan-entry.ts";
 import { ENTER_TOOL, type PlanRuntime } from "../runtime.ts";
 import type { EnterPlanModeDetails } from "../types.ts";
@@ -72,18 +72,17 @@ export function registerEnterTool(pi: ExtensionAPI, runtime: PlanRuntime): void
 		},
 
 		renderCall(_args, theme, context) {
-			const text = reuseCallText(context?.lastComponent);
-			text.setText(toolCallTitle(theme, `${ENTER_TOOL} `) + paint(theme, "meta", "requested plan mode"));
-			return text;
+			return callLine(theme, context?.lastComponent, ENTER_TOOL, "requested plan mode");
 		},
 
 		renderResult(result, options, theme, context) {
 			const text = reuseText(context?.lastComponent);
-			const details = toolDetails<EnterPlanModeDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, options.expanded));
+			const outcome = detailsOrLine(theme, result, options.expanded, toolDetails<EnterPlanModeDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
+			const details = outcome.details;
 			if (details.unavailable) text.setText(paint(theme, "warn", "No UI to confirm plan mode"));
 			else if (details.already) text.setText(paint(theme, "meta", "Already in plan mode"));
 			else if (details.entered) text.setText(paint(theme, "ok", `${GLYPHS.check} Plan mode enabled`));

package/extensions/plan/tools/exit.ts

@@ -17,7 +17,7 @@ import { GOAL_TOOL } from "../../../lib/tool-names.ts";
 import { reuseText, toolDetails } from "../../../lib/tui/chrome.ts";
 import { GLYPHS } from "../../../lib/tui/glyphs.ts";
 import { paint } from "../../../lib/tui/tokens.ts";
-import { moreHint, rejectionLine, reuseCallText, toolCallTitle } from "../../../lib/tui/tool.ts";
+import { callLine, detailsOrLine, moreHint } from "../../../lib/tui/tool.ts";
 import { feedbackSummary } from "../feedback.ts";
 import { mergeSummary, overCap, preview, verificationNote } from "../format.ts";
 import { sanitizePlanText } from "../plan-text.ts";
@@ -256,18 +256,17 @@ export function registerExitTool(pi: ExtensionAPI, runtime: PlanRuntime, web: Pl
 		},
 
 		renderCall(_args, theme, context) {
-			const text = reuseCallText(context?.lastComponent);
-			text.setText(toolCallTitle(theme, `${EXIT_TOOL} `) + paint(theme, "meta", "submitted a plan"));
-			return text;
+			return callLine(theme, context?.lastComponent, EXIT_TOOL, "submitted a plan");
 		},
 
 		renderResult(result, { expanded }, theme, context) {
 			const text = reuseText(context?.lastComponent);
-			const details = toolDetails<ExitPlanModeDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, expanded));
+			const outcome = detailsOrLine(theme, result, expanded, toolDetails<ExitPlanModeDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
+			const details = outcome.details;
 			const heading = details.unavailable
 				? paint(theme, "warn", "No UI to approve the plan")
 				: details.approved

package/extensions/plan/tools/steps.ts

@@ -12,7 +12,7 @@ import { Type, type Static } from "typebox";
 import { reuseText, toolDetails } from "../../../lib/tui/chrome.ts";
 import { GLYPHS } from "../../../lib/tui/glyphs.ts";
 import { paint } from "../../../lib/tui/tokens.ts";
-import { rejectionLine, reuseCallText, toolCallTitle } from "../../../lib/tui/tool.ts";
+import { callLine, detailsOrLine } from "../../../lib/tui/tool.ts";
 import { describeUpdates, stepLabel } from "../format.ts";
 import { SET_PLAN_STEPS_TOOL, type PlanRuntime } from "../runtime.ts";
 import { extractPlanSteps } from "../steps.ts";
@@ -103,7 +103,6 @@ export function registerSetPlanStepsTool(pi: ExtensionAPI, runtime: PlanRuntime)
 		},
 
 		renderCall(args, theme, context) {
-			const text = reuseCallText(context?.lastComponent);
 			const updates = (args as Partial<SetPlanStepsArgs>).updates;
 			const label =
 				updates && updates.length === 1 && updates[0]?.step !== undefined
@@ -111,17 +110,17 @@ export function registerSetPlanStepsTool(pi: ExtensionAPI, runtime: PlanRuntime)
 					: updates && updates.length > 1
 						? `${updates.length} steps`
 						: "steps";
-			text.setText(toolCallTitle(theme, `${SET_PLAN_STEPS_TOOL} `) + paint(theme, "meta", label));
-			return text;
+			return callLine(theme, context?.lastComponent, SET_PLAN_STEPS_TOOL, label);
 		},
 
 		renderResult(result, options, theme, context) {
 			const text = reuseText(context?.lastComponent);
-			const details = toolDetails<SetPlanStepsDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, options.expanded));
+			const outcome = detailsOrLine(theme, result, options.expanded, toolDetails<SetPlanStepsDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
+			const details = outcome.details;
 			const completed = details.updates.filter((update) => update.status === "completed").map((u) => u.step);
 			const pending = details.updates.filter((update) => update.status === "pending").map((u) => u.step);
 			const heading =

package/extensions/plan/tools/write.ts

@@ -11,7 +11,7 @@ import { sanitizeLine } from "../../../lib/format.ts";
 import { reuseText, toolDetails } from "../../../lib/tui/chrome.ts";
 import { GLYPHS } from "../../../lib/tui/glyphs.ts";
 import { paint } from "../../../lib/tui/tokens.ts";
-import { rejectionLine, reuseCallText, toolCallTitle } from "../../../lib/tui/tool.ts";
+import { callLine, detailsOrLine } from "../../../lib/tui/tool.ts";
 import { overCap, stepElisionNote } from "../format.ts";
 import { WRITE_PLAN_TOOL, type PlanRuntime } from "../runtime.ts";
 import { MAX_STEPS, PLAN_OUTLINE, planStepSummary } from "../steps.ts";
@@ -106,21 +106,20 @@ export function registerWriteTool(pi: ExtensionAPI, runtime: PlanRuntime): void
 		},
 
 		renderCall(args, theme, context) {
-			const text = reuseCallText(context?.lastComponent);
 			const title = (args as Partial<WritePlanArgs>).title;
-			const suffix = title ? paint(theme, "meta", sanitizeLine(title)) : paint(theme, "meta", "plan");
-			text.setText(toolCallTitle(theme, `${WRITE_PLAN_TOOL} `) + suffix);
-			return text;
+			return callLine(theme, context?.lastComponent, WRITE_PLAN_TOOL, title ? sanitizeLine(title) : "plan");
 		},
 
 		renderResult(result, options, theme, context) {
 			const text = reuseText(context?.lastComponent);
-			const details = toolDetails<WritePlanDetails>(result.details);
-			if (!details) {
-				text.setText(rejectionLine(theme, result, options.expanded));
+			const outcome = detailsOrLine(theme, result, options.expanded, toolDetails<WritePlanDetails>(result.details));
+			if ("line" in outcome) {
+				text.setText(outcome.line);
 				return text;
 			}
-			text.setText(paint(theme, "ok", `${GLYPHS.check} Saved plan `) + paint(theme, "meta", details.relativePath));
+			text.setText(
+				paint(theme, "ok", `${GLYPHS.check} Saved plan `) + paint(theme, "meta", outcome.details.relativePath),
+			);
 			return text;
 		},
 	});

package/extensions/plan/web-router.ts

@@ -13,6 +13,7 @@
  */
 
 import {
+	eventHeaders,
 	isLocalHostHeader,
 	jsonError,
 	jsonHeaders,
@@ -48,17 +49,6 @@ export interface ReviewContext {
 	onCancel: () => void;
 }
 
-/**
- * The event stream's headers: the one response that is not the page policy, because
- * it is a long-lived `text/event-stream` rather than a document.
- */
-const EVENT_HEADERS: Record<string, string> = {
-	"Content-Type": "text/event-stream; charset=utf-8",
-	"Cache-Control": "no-store",
-	Connection: "keep-alive",
-	"X-Accel-Buffering": "no",
-};
-
 /**
  * Parse and validate an `{ annotations }` request body. Returns the annotations,
  * or an error response to send instead.
@@ -127,7 +117,7 @@ export async function handleReviewRequest(
 	if (pathname === "/" || pathname === "/index.html") {
 		return { status: 200, headers: pageHeaders(), body: renderReviewPage(await ctx.page()) };
 	}
-	if (pathname === "/events") return { status: 200, headers: { ...EVENT_HEADERS }, stream: true };
+	if (pathname === "/events") return { status: 200, headers: eventHeaders(), stream: true };
 	if (pathname === "/api/cancel") {
 		if (method.toUpperCase() !== "POST") return jsonError(405, "Use POST to cancel.");
 		ctx.onCancel();

package/extensions/plan/web.ts

@@ -14,8 +14,16 @@ import { randomBytes } from "node:crypto";
 import { createServer, type IncomingMessage, type ServerResponse } from "node:http";
 import { basename } from "node:path";
 import { openInBrowser } from "../../lib/browser.ts";
-import { bindLoopback, createCloser, jsonHeaders, respond, type ServeResponse } from "../../lib/http/index.ts";
+import {
+	bindLoopback,
+	createCloser,
+	jsonHeaders,
+	openEventStream,
+	respond,
+	type ServeResponse,
+} from "../../lib/http/index.ts";
 import { fenceLanguage, highlightLines } from "../../lib/highlight.ts";
+import { type ArmTimer, defaultTimer } from "../../lib/timer.ts";
 import { codeBody, fenceInfo, planBlocks } from "./blocks.ts";
 import {
 	MAX_ANNOTATIONS,
@@ -75,6 +83,14 @@ export interface PlanWebReviewDeps {
 	port?: number;
 	/** Override the closed-tab grace; the default leaves a reload time to reconnect. */
 	dropGraceMs?: number;
+	/**
+	 * Override the timer that arms the closed-tab grace.
+	 *
+	 * The grace is a race against the browser's reload, so a test drives it by
+	 * hand: a few tens of milliseconds of deadline makes the test fail when the
+	 * machine is busy, which is a fact about the runner and not about the code.
+	 */
+	schedule?: ArmTimer;
 	/** Override the accepted body size; a test keeps it small. */
 	maxBodyBytes?: number;
 }
@@ -138,12 +154,15 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 		const done = new Promise<PlanReviewResult>((resolve) => {
 			resolveDone = resolve;
 		});
-		let dropTimer: NodeJS.Timeout | undefined;
+		let cancelDrop: (() => void) | undefined;
+		const clearDrop = (): void => {
+			cancelDrop?.();
+			cancelDrop = undefined;
+		};
 		const finish = (result: PlanReviewResult): void => {
 			if (settled) return;
 			settled = true;
-			clearTimeout(dropTimer);
-			dropTimer = undefined;
+			clearDrop();
 			resolveDone(result);
 		};
 
@@ -251,13 +270,13 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 		const clients = new Set<ServerResponse>();
 		let hadClient = false;
 		const dropGrace = deps.dropGraceMs ?? DROP_GRACE_MS;
+		const schedule = deps.schedule ?? defaultTimer;
 		const scheduleDrop = (): void => {
-			if (clients.size > 0 || !hadClient || settled || dropTimer) return;
-			dropTimer = setTimeout(() => {
-				dropTimer = undefined;
+			if (clients.size > 0 || !hadClient || settled || cancelDrop) return;
+			cancelDrop = schedule(dropGrace, () => {
+				cancelDrop = undefined;
 				if (clients.size === 0) finish({ status: "cancelled" });
-			}, dropGrace);
-			(dropTimer as { unref?: () => void }).unref?.();
+			});
 		};
 
 		const server = createServer((request, response) => {
@@ -282,14 +301,10 @@ export function createPlanWebReview(store: PlanStore, deps: PlanWebReviewDeps =
 					};
 				}
 				if (result.stream) {
-					response.writeHead(result.status, result.headers);
-					response.write("retry: 2000\n\n");
+					openEventStream(response, result);
 					hadClient = true;
 					clients.add(response);
-					if (dropTimer) {
-						clearTimeout(dropTimer);
-						dropTimer = undefined;
-					}
+					clearDrop();
 					request.on("close", () => {
 						clients.delete(response);
 						scheduleDrop();

package/extensions/question/tools.ts

@@ -7,7 +7,7 @@ import { askHuman } from "../../lib/interaction.ts";
 import { sanitizeLine } from "../../lib/format.ts";
 import { withRailsSuppressed } from "../../lib/rails.ts";
 import { reuseText, toolDetails } from "../../lib/tui/chrome.ts";
-import { rejectionLine, reuseCallText, toolCallTitle } from "../../lib/tui/tool.ts";
+import { detailsOrLine, reuseCallText, toolCallTitle } from "../../lib/tui/tool.ts";
 import { paint } from "../../lib/tui/tokens.ts";
 import { GLYPHS } from "../../lib/tui/glyphs.ts";
 import { ASK_USER_QUESTION_TOOL } from "../../lib/tool-names.ts";
@@ -94,11 +94,12 @@ export function registerTools(pi: ExtensionAPI): void {
 
 		renderResult(result, options, theme, context) {
 			const component = reuseText(context?.lastComponent);
-			const details = toolDetails<AskResult>(result.details);
-			if (!details) {
-				component.setText(rejectionLine(theme, result, options.expanded));
+			const outcome = detailsOrLine(theme, result, options.expanded, toolDetails<AskResult>(result.details));
+			if ("line" in outcome) {
+				component.setText(outcome.line);
 				return component;
 			}
+			const details = outcome.details;
 			if (details.unavailable) {
 				component.setText(paint(theme, "bad", UNAVAILABLE_TEXT));
 				return component;

package/extensions/rewind/checklist.ts

@@ -82,8 +82,15 @@ export abstract class ChecklistScreen<T> implements Component {
 	/** A verb other than navigation, toggle, all, none, and enter. */
 	protected verb?(data: string): void;
 
-	/** The row under the cursor. */
-	protected get focused(): T | undefined {
+	/**
+	 * The row under the cursor.
+	 *
+	 * Not named `focused`: Pi's `Focusable` check is `"focused" in component`, and a
+	 * component that answers it is handed the focus flag by assignment, which a
+	 * read-only accessor turns into a process-ending `TypeError`. The checklist
+	 * tracks its own cursor and needs no hardware cursor.
+	 */
+	protected get focusedRow(): T | undefined {
 		return this.rows()[this.cursor.selected];
 	}
 
@@ -107,7 +114,7 @@ export abstract class ChecklistScreen<T> implements Component {
 		}
 		if (navigateList(data, this.cursor, this.rows().length)) return;
 		if (data === " ") {
-			const row = this.focused;
+			const row = this.focusedRow;
 			if (row !== undefined) this.toggle(row);
 			this.options.requestRender();
 			return;

package/extensions/rewind/git.ts

@@ -20,6 +20,7 @@ import {
 	gitDir,
 	repoRoot,
 	revParse,
+	revParseMany,
 	runGitOrThrow as run,
 	type RunGit,
 } from "../../lib/git/index.ts";
@@ -27,7 +28,7 @@ import { parseNameStatus, parseNumStat, type ChangedPath, type PathStat } from "
 
 // Re-export exactly the shared helpers this extension consumes, so rewind code
 // has one git import surface instead of reaching into `lib/git` directly.
-export { GitError, currentBranch, gitDir, repoRoot, revParse, type RunGit };
+export { GitError, currentBranch, gitDir, repoRoot, revParse, revParseMany, type RunGit };
 
 /** Timeout budget for one git command issued by this extension. */
 const SNAPSHOT_TIMEOUT_MS = 30_000;
@@ -262,20 +263,32 @@ export async function applyPatchReverse(runGit: RunGit, cwd: string, patch: stri
 	}
 }
 
-/** Label of an in-progress git operation that a rewind must not clobber, if any. */
+/**
+ * The markers an interrupted git operation leaves, in precedence order: the
+ * first one present names the operation a rewind would clobber.
+ */
+const BUSY_MARKERS: ReadonlyArray<readonly [string, string]> = [
+	["MERGE_HEAD", "merge"],
+	["rebase-merge", "rebase"],
+	["rebase-apply", "rebase"],
+	["CHERRY_PICK_HEAD", "cherry-pick"],
+	["REVERT_HEAD", "revert"],
+	["BISECT_LOG", "bisect"],
+];
+
+/**
+ * Label of an in-progress git operation that a rewind must not clobber, if any.
+ *
+ * `rev-parse --git-path` prints one path per argument, so all six markers are one
+ * git call: a clean repository — the common case, where every one of them is
+ * missing — would otherwise pay six spawns to learn nothing is in progress.
+ */
 export async function busyGitState(runGit: RunGit, cwd: string): Promise<string | undefined> {
-	const markers: Array<[string, string]> = [
-		["MERGE_HEAD", "merge"],
-		["rebase-merge", "rebase"],
-		["rebase-apply", "rebase"],
-		["CHERRY_PICK_HEAD", "cherry-pick"],
-		["REVERT_HEAD", "revert"],
-		["BISECT_LOG", "bisect"],
-	];
-	for (const [name, label] of markers) {
-		const result = await runGit(["rev-parse", "--git-path", name], { cwd });
-		if (result.code !== 0) continue;
-		const path = result.stdout.trim();
+	const result = await runGit(["rev-parse", ...BUSY_MARKERS.flatMap(([name]) => ["--git-path", name])], { cwd });
+	if (result.code !== 0) return undefined;
+	const paths = result.stdout.split("\n");
+	for (const [index, [, label]] of BUSY_MARKERS.entries()) {
+		const path = paths[index]?.trim();
 		if (path && existsSync(resolve(cwd, path))) return label;
 	}
 	return undefined;

package/extensions/rewind/hunk-picker.ts

@@ -94,7 +94,7 @@ export class HunkPickerComponent extends ChecklistScreen<HunkRow> {
 
 	/** The focused hunk's first removed and added line. */
 	protected detailLines(width: number): string[] {
-		const focused = this.focused;
+		const focused = this.focusedRow;
 		if (!focused) return [];
 		return previewOf(focused.hunk).map((line) => {
 			const role = line.startsWith("+") ? "ok" : line.startsWith("-") ? "bad" : "meta";

package/extensions/rewind/path-picker.ts

@@ -137,7 +137,7 @@ export class PathPickerComponent extends ChecklistScreen<Row> {
 
 	/** What the focused row will do, in words. */
 	protected detailLines(width: number): string[] {
-		const row = this.focused;
+		const row = this.focusedRow;
 		if (!row) return [];
 		const text =
 			row.kind === "group"

package/extensions/rewind/review-tui.ts

@@ -133,7 +133,7 @@ export class ReviewListComponent extends ChecklistScreen<ReviewEntry> {
 	}
 
 	protected onEnter(): void {
-		const entry = this.focused;
+		const entry = this.focusedRow;
 		if (entry) this.close({ kind: "diff", path: entry.path });
 	}
 
@@ -142,7 +142,7 @@ export class ReviewListComponent extends ChecklistScreen<ReviewEntry> {
 	}
 
 	protected verb(data: string): void {
-		const entry = this.focused;
+		const entry = this.focusedRow;
 		if (!entry) return;
 		if (data === "r") {
 			const paths = this.chosen.size > 0 ? [...this.chosen] : [entry.path];
@@ -174,7 +174,7 @@ export class ReviewListComponent extends ChecklistScreen<ReviewEntry> {
 
 	protected detailLines(width: number): string[] {
 		const detail: string[] = [];
-		const focused = this.focused;
+		const focused = this.focusedRow;
 		if (focused) detail.push(clip(`  ${paint(this.theme, "meta", formatReviewDetail(focused))}`, width));
 		const selectionLine =
 			this.chosen.size > 0