@oh-my-pi/pi-tui 18.14.2 → 18.16.0

package/src/status-line/startup.ts

@@ -13,9 +13,9 @@
  * statusLine.attachToEditor(editor, getComposerStyle(shape));
  * ```
  */
+import { type } from "@oh-my-pi/omptype";
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Model } from "@oh-my-pi/pi-catalog/types";
-import { isRecord } from "@oh-my-pi/pi-utils/type-guards";
 import { parseThinkingLevel } from "../thinking";
 import { StatusLineComponent } from "./component";
 import type { CompactionBoundaries } from "./context-usage";
@@ -100,82 +100,48 @@ export function createStartupStatusLine(data: StatusLineStartupData): StatusLine
 	return statusLine;
 }
 
-function isOneOf<T extends string>(values: readonly T[], value: unknown): value is T {
-	return typeof value === "string" && values.some(candidate => candidate === value);
-}
-
-function isOptionalBoolean(value: unknown): boolean {
-	return value === undefined || typeof value === "boolean";
-}
-
-function isSegmentList(value: unknown): boolean {
-	return value === undefined || (Array.isArray(value) && value.every(id => isOneOf(STATUS_LINE_SEGMENT_IDS, id)));
-}
+const SegmentIds = type.enumerated(...STATUS_LINE_SEGMENT_IDS).array();
 
 /** Shallow check of persisted settings; nested segment options are trusted as written by this version. */
-function isStatusLineSettings(value: unknown): value is StatusLineSettings {
-	return (
-		isRecord(value) &&
-		(value.preset === undefined || isOneOf(STATUS_LINE_PRESET_VALUES, value.preset)) &&
-		isSegmentList(value.leftSegments) &&
-		isSegmentList(value.rightSegments) &&
-		(value.separator === undefined || isOneOf(STATUS_LINE_SEPARATOR_VALUES, value.separator)) &&
-		(value.segmentOptions === undefined || isRecord(value.segmentOptions)) &&
-		(value.contextLine === undefined || isOneOf(CONTEXT_LINE_MODE_VALUES, value.contextLine)) &&
-		isOptionalBoolean(value.showHookStatus) &&
-		isOptionalBoolean(value.sessionAccent) &&
-		isOptionalBoolean(value.transparent) &&
-		isOptionalBoolean(value.compactThinkingLevel)
-	);
-}
-
-/** Check the model fields the status line reads; the rest is trusted as serialized by this version. */
-function isPersistedModel(value: unknown): value is Model {
-	return (
-		isRecord(value) &&
-		typeof value.id === "string" &&
-		typeof value.name === "string" &&
-		typeof value.provider === "string" &&
-		typeof value.api === "string" &&
-		typeof value.contextWindow === "number"
-	);
-}
+const StatusLineSettingsShape = type({
+	"preset?": type.enumerated(...STATUS_LINE_PRESET_VALUES),
+	"leftSegments?": SegmentIds,
+	"rightSegments?": SegmentIds,
+	"separator?": type.enumerated(...STATUS_LINE_SEPARATOR_VALUES),
+	"segmentOptions?": "Record<string, unknown>",
+	"contextLine?": type.enumerated(...CONTEXT_LINE_MODE_VALUES),
+	"showHookStatus?": "boolean",
+	"sessionAccent?": "boolean",
+	"transparent?": "boolean",
+	"compactThinkingLevel?": "boolean",
+});
 
-function readCompactionBoundaries(value: unknown): CompactionBoundaries | null | undefined {
-	if (value === null) return null;
-	if (!isRecord(value) || typeof value.thresholdPercent !== "number") return undefined;
-	const speculationPercent = value.speculationPercent;
-	if (speculationPercent !== null && typeof speculationPercent !== "number") return undefined;
-	return { thresholdPercent: value.thresholdPercent, speculationPercent };
-}
+const StartupDataShape = type({
+	"+": "delete",
+	settings: StatusLineSettingsShape,
+	gitEnabled: "boolean",
+	// Only the fields the status line reads; the rest is trusted as serialized by this version.
+	"model?": { id: "string", name: "string", provider: "string", api: "string", contextWindow: "number" },
+	"thinkingLevel?": "string",
+	autoThinking: "boolean",
+	fastMode: "boolean",
+	usingSubscription: "boolean",
+	autoCompactEnabled: "boolean",
+	compactionBoundaries: type({ "+": "delete", thresholdPercent: "number", speculationPercent: "number | null" }).or(
+		"null",
+	),
+});
 
 /** Validate persisted {@link StatusLineStartupData}; `undefined` for anything malformed. */
 export function readStatusLineStartupData(value: unknown): StatusLineStartupData | undefined {
-	if (!isRecord(value) || !isStatusLineSettings(value.settings)) return undefined;
-	const model = value.model;
-	if (model !== undefined && !isPersistedModel(model)) return undefined;
-	const thinkingLevel = typeof value.thinkingLevel === "string" ? parseThinkingLevel(value.thinkingLevel) : undefined;
-	if (value.thinkingLevel !== undefined && thinkingLevel === undefined) return undefined;
-	const compactionBoundaries = readCompactionBoundaries(value.compactionBoundaries);
-	if (
-		typeof value.gitEnabled !== "boolean" ||
-		typeof value.autoThinking !== "boolean" ||
-		typeof value.fastMode !== "boolean" ||
-		typeof value.usingSubscription !== "boolean" ||
-		typeof value.autoCompactEnabled !== "boolean" ||
-		compactionBoundaries === undefined
-	) {
-		return undefined;
-	}
+	const data = StartupDataShape(value);
+	if (data instanceof type.errors) return undefined;
+	const thinkingLevel = data.thinkingLevel === undefined ? undefined : parseThinkingLevel(data.thinkingLevel);
+	if (data.thinkingLevel !== undefined && thinkingLevel === undefined) return undefined;
 	return {
-		settings: value.settings,
-		gitEnabled: value.gitEnabled,
-		model,
+		...data,
+		settings: data.settings as StatusLineSettings,
+		model: data.model as Model | undefined,
 		thinkingLevel,
-		autoThinking: value.autoThinking,
-		fastMode: value.fastMode,
-		usingSubscription: value.usingSubscription,
-		autoCompactEnabled: value.autoCompactEnabled,
-		compactionBoundaries,
 	};
 }

package/src/terminal-capabilities.ts

@@ -67,6 +67,7 @@ export type TerminalId =
 	| "rio"
 	| "tern"
 	| "monstar"
+	| "rex"
 	| "base"
 	| "trueColor";
 
@@ -626,6 +627,8 @@ const KNOWN_TERMINALS = Object.freeze({
 	// OSC 99, and OSC 66 text sizing are outside rio's supported set and keep
 	// the conservative defaults.
 	rio: new TerminalInfo("rio", ImageProtocol.Kitty, true, true),
+	// Rex (TERM_PROGRAM=rex / TERM=xterm-rex): only Kitty graphics is confirmed.
+	rex: new TerminalInfo("rex", ImageProtocol.Kitty, true, false),
 	// Tern (Stencil's terminal, `stencil-term`) sets TERM_PROGRAM=tern and
 	// implements Kitty graphics, OSC 8 and OSC 9/99 notifications. Whether omp
 	// renders natively (Tern Surface Protocol) is decided by the `hello`
@@ -666,6 +669,7 @@ export function detectTerminalId(env: NodeJS.ProcessEnv = Bun.env): TerminalId {
 		if (caseEq(program, "rio")) return "rio";
 		if (caseEq(program, "tern")) return "tern";
 		if (caseEq(program, "monstar")) return "monstar";
+		if (caseEq(program, "rex")) return "rex";
 		return null;
 	}
 
@@ -717,6 +721,7 @@ export function detectTerminalId(env: NodeJS.ProcessEnv = Bun.env): TerminalId {
 
 	if (TERM?.toLowerCase().includes("ghostty")) return "ghostty";
 	if (TERM && caseEq(TERM, "monstar")) return "monstar";
+	if (TERM && caseEq(TERM, "xterm-rex")) return "rex";
 
 	if (COLORTERM) {
 		if (caseEq(COLORTERM, "truecolor") || caseEq(COLORTERM, "24bit")) return "trueColor";

package/src/theme/symbols.ts

@@ -19,6 +19,7 @@ export type SymbolKey =
 	| "status.running"
 	| "status.shadowed"
 	| "status.aborted"
+	/** @deprecated Alias of `status.success`; kept so extensions and theme overrides that name it keep working. */
 	| "status.done"
 	// Navigation
 	| "nav.cursor"
@@ -212,6 +213,8 @@ export type SymbolKey =
 	| "advisor.rail"
 	// Skill callout rail (user turn that opened with a skill chip)
 	| "skill.rail"
+	// /btw steering-prompt rail (the <inject> block a side answer drafted)
+	| "btw.rail"
 	// Language/file type icons
 	| "lang.default"
 	| "lang.typescript"
@@ -404,7 +407,7 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"status.running": "⟳",
 	"status.shadowed": "○",
 	"status.aborted": "⏹",
-	"status.done": "•",
+	"status.done": "✔",
 	// Navigation
 	"nav.cursor": "❯",
 	"nav.selected": "➤",
@@ -598,6 +601,7 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	// Advisor note rail (heavier than md.quoteBorder so notes read as a distinct voice)
 	"advisor.rail": "▎",
 	"skill.rail": "▎",
+	"btw.rail": "▎",
 	// Language/file icons (emoji-centric, no Nerd Font required)
 	"lang.default": "⌘",
 	"lang.typescript": "🟦",
@@ -721,8 +725,8 @@ const NERD_SYMBOLS: SymbolMap = {
 	"status.shadowed": "\uf10c",
 	// pick:  | alt:  
 	"status.aborted": "\uf04d",
-	// pick: • | alt: ● ·
-	"status.done": "•",
+	// alias of status.success
+	"status.done": "\uf00c",
 	// Navigation
 	// pick:  | alt:  
 	"nav.cursor": "\uf054",
@@ -1072,6 +1076,7 @@ const NERD_SYMBOLS: SymbolMap = {
 	// pick: ▎ | alt: ┃ │
 	"advisor.rail": "▎",
 	"skill.rail": "▎",
+	"btw.rail": "▎",
 	// Language icons (nerd font devicons)
 	"lang.default": "",
 	"lang.typescript": "\u{E628}",
@@ -1186,17 +1191,17 @@ const NERD_SYMBOLS: SymbolMap = {
 
 const ASCII_SYMBOLS: SymbolMap = {
 	// Status Indicators
-	"status.success": "[ok]",
-	"status.error": "[!!]",
+	"status.success": "[+]",
+	"status.error": "[-]",
 	"status.warning": "[!]",
 	"status.info": "[i]",
-	"status.pending": "[*]",
+	"status.pending": "[ ]",
 	"status.disabled": "[ ]",
 	"status.enabled": "[x]",
 	"status.running": "[~]",
 	"status.shadowed": "[/]",
-	"status.aborted": "[-]",
-	"status.done": "*",
+	"status.aborted": "[#]",
+	"status.done": "[+]",
 	// Navigation
 	"nav.cursor": ">",
 	"nav.selected": "->",
@@ -1386,6 +1391,7 @@ const ASCII_SYMBOLS: SymbolMap = {
 	"md.colorSwatch": "[]",
 	"advisor.rail": "|",
 	"skill.rail": "|",
+	"btw.rail": "|",
 	// Language icons (ASCII uses abbreviations)
 	"lang.default": "code",
 	"lang.typescript": "ts",
@@ -1502,7 +1508,8 @@ export const SPINNER_FRAMES: Record<SymbolPreset, Record<SpinnerType, string[]>>
 		activity: ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"],
 	},
 	ascii: {
-		status: ["|", "/", "-", "\\"],
+		// Bracketed like the `status.*` glyphs, so a settling call keeps its column width.
+		status: ["[|]", "[/]", "[-]", "[\\]"],
 		activity: ["-", "\\", "|", "/"],
 	},
 };

package/src/theme/theme-class.ts

@@ -243,6 +243,8 @@ export class Theme {
 				logger.debug("Invalid symbol key in override", { key, availableKeys: Object.keys(this.#symbols) });
 			}
 		}
+		// `status.done` aliases `status.success` unless a theme overrides it explicitly.
+		if (!("status.done" in symbolOverrides)) this.#symbols["status.done"] = this.#symbols["status.success"];
 		this.#spinnerFramesOverrides = spinnerFramesOverrides;
 	}
 
@@ -528,6 +530,7 @@ export class Theme {
 			running: this.#symbols["status.running"],
 			shadowed: this.#symbols["status.shadowed"],
 			aborted: this.#symbols["status.aborted"],
+			/** @deprecated Alias of `success`. */
 			done: this.#symbols["status.done"],
 		};
 	}

package/src/tmux.ts

@@ -21,6 +21,7 @@ const CLIENT_TERMINAL_TIMEOUT_MS = 2_000;
 const CLIENT_TERMNAME_PROGRAMS: ReadonlyArray<readonly [RegExp, string]> = [
 	[/^xterm-kitty$/u, "kitty"],
 	[/^xterm-ghostty$/u, "ghostty"],
+	[/^xterm-rex$/u, "rex"],
 	[/^wezterm$/u, "wezterm"],
 ];
 let cachedClientTerminalNames: readonly string[] | undefined;

package/src/tools/agent-tree.ts

@@ -74,20 +74,22 @@ export function renderAgentTreeRow(
 	const task = options.presentation === "task";
 	const live = status === "pending" || status === "running";
 	const failed = status === "failed" || status === "aborted";
-	const iconColor = status === "completed" ? "success" : failed ? "error" : "accent";
 	const nameColor = task && live && options.frozen ? "dim" : task && status === "completed" ? "text" : "accent";
-	const iconStatus = status === "failed" ? "error" : status === "completed" ? "done" : status;
+	const iconStatus = status === "failed" ? "error" : status === "completed" ? "success" : status;
+	// Task rows draw a static glyph, so their bytes hold across spinner frames; eval rows animate.
+	const spinnerFrame = !task && status === "running" ? options.spinnerFrame : undefined;
+	// formatStatusIcon colors every glyph except a raw spinner frame, which eval rows paint accent.
+	// A frozen snapshot of a live Task row dims its glyph with its name, so it stops reading as in flight.
 	const icon =
-		task && !failed
-			? theme.styledSymbol("status.done", nameColor)
-			: !task && status === "completed"
-				? theme.styledSymbol("tool.eval", "accent")
-				: theme.fg(
-						iconColor,
-						formatStatusIcon(iconStatus, theme, status === "running" ? options.spinnerFrame : undefined),
-					);
+		!task && status === "completed"
+			? theme.styledSymbol("tool.eval", "accent")
+			: task && live && options.frozen
+				? theme.fg("dim", status === "running" ? theme.status.running : theme.status.pending)
+				: spinnerFrame === undefined
+					? formatStatusIcon(iconStatus, theme)
+					: theme.fg("accent", formatStatusIcon(iconStatus, theme, spinnerFrame));
 	const lead = `${options.prefix}${options.prefix || !task ? " " : ""}${icon} `;
-	const statusBadge = options.statusBadge ?? (failed ? ` ${formatBadge(status, iconColor, theme)}` : "");
+	const statusBadge = options.statusBadge ?? (failed ? ` ${formatBadge(status, "error", theme)}` : "");
 	const id = Number.isFinite(width)
 		? truncateToWidth(options.id, Math.max(0, width - visibleWidth(lead) - visibleWidth(statusBadge)))
 		: options.id;

package/src/tools/ask.ts

@@ -25,7 +25,13 @@ import { outputBlockContentWidth, renderStatusLine } from "../render";
 import { framedToolCard } from "../render/tool-card";
 import { wrapPrefixedLine } from "../render/hanging-wrap";
 
-import { formatErrorMessage, formatMeta, formatTitle, sanitizeCarriageReturns } from "../render/render-utils";
+import {
+	formatErrorMessage,
+	formatMeta,
+	formatStatusIcon,
+	formatTitle,
+	sanitizeCarriageReturns,
+} from "../render/render-utils";
 
 /** Result for a single question */
 export interface QuestionResult {
@@ -176,10 +182,11 @@ function normalizeRenderQuestions(raw: unknown): NonNullable<AskRenderArgs["ques
 /** Render a custom free-text answer as a status line plus indented continuation rows. */
 function renderCustomInputLines(uiTheme: Theme, customInput: string): string[] {
 	const lines = customInput.split("\n");
-	const out: string[] = [
-		` ${uiTheme.styledSymbol("status.success", "success")} ${uiTheme.fg("toolOutput", lines[0] ?? "")}`,
-	];
-	for (let i = 1; i < lines.length; i++) out.push(`   ${uiTheme.fg("toolOutput", lines[i])}`);
+	const icon = formatStatusIcon("success", uiTheme);
+	// Continuation rows line up under the answer text, past the glyph's own width.
+	const indent = " ".repeat(visibleWidth(icon) + 2);
+	const out: string[] = [` ${icon} ${uiTheme.fg("toolOutput", lines[0] ?? "")}`];
+	for (let i = 1; i < lines.length; i++) out.push(`${indent}${uiTheme.fg("toolOutput", lines[i])}`);
 	return out;
 }
 
@@ -282,7 +289,7 @@ function renderAnswerOptionLines(
 
 	// Nothing was chosen (and no custom answer) → a lone cancelled marker.
 	if (selected.size === 0 && customInput === undefined && note === undefined) {
-		return [` ${uiTheme.styledSymbol("status.warning", "warning")} ${uiTheme.fg("warning", "Cancelled")}`];
+		return [` ${formatStatusIcon("warning", uiTheme)} ${uiTheme.fg("warning", "Cancelled")}`];
 	}
 
 	const out: string[] = [];

package/src/tools/ast-edit.ts

@@ -1,19 +1,24 @@
-import { isRecord, sanitizeText } from "@oh-my-pi/pi-utils";
 import type { Component } from "../tui";
 import { Text } from "../components/text";
-import { replaceTabs } from "../utils";
 import type { Theme } from "../theme/theme";
-import { Ellipsis, fileHyperlink, renderStatusLine, truncateToWidth } from "../render";
+import { Ellipsis, renderStatusLine, truncateToWidth } from "../render";
 import { framedToolCard } from "../render/tool-card";
 import {
 	appendParseErrorsBulletList,
 	formatCount,
 	formatErrorDetail,
-	formatMoreItems,
 	formatParseErrorsCountLabel,
 	PREVIEW_LIMITS,
 } from "../render/render-utils";
-import { classifyGroupedLines, groupLineIndicesByBlank } from "./grouped-file-output";
+import {
+	classifyGroupedLines,
+	createGroupedRowStyler,
+	fitGroupsToBudget,
+	groupedLinkTargets,
+	groupLineIndicesByBlank,
+	groupsByFile,
+	walkGroupedOutput,
+} from "./grouped-file-output";
 import type { OutputMeta } from "./output-meta";
 import type {
 	NativeToolHead,
@@ -59,34 +64,24 @@ interface AstEditRenderArgs {
 const COLLAPSED_CHANGE_LIMIT = PREVIEW_LIMITS.COLLAPSED_LINES * 2;
 
 /**
- * Flatten change groups (line indices, styled on demand) into frame body
- * lines. Groups are separated by a blank line and carry no tree guides — the
- * frame border is the container, so nested `├─ │` gutters would just be
- * noise. Collapsed mode always shows at least the first group, then fills up
- * to `budget` lines before summarizing the rest as `… N more changes`.
+ * Frame body lines for per-file change groups, styled on demand: files apart by
+ * a blank line and without tree guides (the frame border is the container), fit
+ * to `budget` with the rest summarized as `… N more files`.
  */
 function buildChangeBody(
 	groups: readonly (readonly number[])[],
 	styleLine: (index: number) => string,
-	expanded: boolean,
+	isFileRow: (index: number) => boolean,
 	budget: number,
 	theme: Theme,
 ): string[] {
+	const { shown, summary } = fitGroupsToBudget(groups, budget, { isUnit: isFileRow, unit: "file", gap: 1 });
 	const lines: string[] = [];
-	let shown = 0;
-	for (let i = 0; i < groups.length; i++) {
-		const group = groups[i]!;
-		const separator = shown > 0 ? 1 : 0;
-		const remainingAfter = groups.length - (i + 1);
-		const reserved = !expanded && remainingAfter > 0 ? 1 : 0;
-		// Always emit the first group; budget only gates subsequent ones.
-		if (!expanded && shown > 0 && lines.length + separator + group.length + reserved > budget) break;
-		if (separator) lines.push("");
+	for (const group of shown) {
+		if (lines.length > 0) lines.push("");
 		for (const index of group) lines.push(styleLine(index));
-		shown++;
 	}
-	const remaining = groups.length - shown;
-	if (!expanded && remaining > 0) lines.push(theme.fg("muted", formatMoreItems(remaining, "change")));
+	if (summary) lines.push(theme.fg("muted", summary));
 	return lines;
 }
 
@@ -98,9 +93,7 @@ function patternPreview(pat: string | undefined): string | undefined {
 	return collapsed || undefined;
 }
 
-const AST_EDIT_HEADER_RE = /^(#+)\s+(.*)$/;
 const AST_EDIT_CHANGE_LINE_RE = /^([+\- ])\s*(\d+)(?:│|[:|])(.*)$/;
-const AST_EDIT_HEADER_SUFFIX_RE = /\s+\([^)]*\)\s*$/;
 
 /** One file's proposed rewrite: its unified diff text and change counts. */
 interface AstEditFileDiff {
@@ -117,29 +110,15 @@ interface AstEditFileDiff {
  */
 function parseAstEditChanges(lines: readonly string[]): AstEditFileDiff[] {
 	const files: AstEditFileDiff[] = [];
-	const dirs: string[] = [];
 	let file: AstEditFileDiff | undefined;
-	const flush = () => {
-		if (file && file.lines.length > 0) files.push(file);
-		file = undefined;
-	};
-	for (const line of lines) {
-		const header = AST_EDIT_HEADER_RE.exec(line);
-		if (header) {
-			flush();
-			const depth = header[1]!.length;
-			const rest = header[2]!.trimEnd().replace(AST_EDIT_HEADER_SUFFIX_RE, "");
-			dirs.length = depth - 1;
-			if (rest.endsWith("/")) {
-				dirs[depth - 1] = rest.slice(0, -1);
-				continue;
-			}
-			const prefix = dirs.filter(Boolean).join("/");
-			file = { path: prefix ? `${prefix}/${rest}` : rest, lines: [], added: 0, removed: 0 };
+	for (const event of walkGroupedOutput(lines)) {
+		if (event.kind !== "line") {
+			if (file && file.lines.length > 0) files.push(file);
+			file = event.kind === "file" ? { path: event.path, lines: [], added: 0, removed: 0 } : undefined;
 			continue;
 		}
-		if (!file || line.trim().length === 0) continue;
-		const change = AST_EDIT_CHANGE_LINE_RE.exec(line);
+		if (!file) continue;
+		const change = AST_EDIT_CHANGE_LINE_RE.exec(event.text);
 		if (!change) continue;
 		const lineNumber = Number.parseInt(change[2]!, 10);
 		if (file.lastOld === undefined || lineNumber > file.lastOld + 1 || lineNumber < file.lastOld) {
@@ -150,7 +129,7 @@ function parseAstEditChanges(lines: readonly string[]): AstEditFileDiff[] {
 		else if (change[1] === "-") file.removed++;
 		file.lines.push(`${change[1]}${change[3]}`);
 	}
-	flush();
+	if (file && file.lines.length > 0) files.push(file);
 	return files;
 }
 
@@ -248,53 +227,23 @@ export const astEditToolRenderer = {
 
 		const textContent = result.details?.displayContent ?? result.content?.find(c => c.type === "text")?.text ?? "";
 		const allLines = textContent.split("\n");
-		// Resolve hyperlinks over the whole output so nested directory headers
-		// reconstruct across the blank-line groups the tree list collapses by.
+		// Classify the whole output so nested directory headers resolve across blank-line groups.
 		const contexts = classifyGroupedLines(allLines, details?.cwd ?? details?.searchPath, details?.searchPath);
-		// The display lines are sanitized; reconstruct link targets from the original
-		// grouped headers only when they still align with those display lines.
-		const rawDetails = options.renderContext?.rawDetails;
-		const rawContent =
-			isRecord(rawDetails) && typeof rawDetails.displayContent === "string" ? rawDetails.displayContent : undefined;
-		const rawLines = rawContent?.split("\n");
-		const rawCwd = isRecord(rawDetails) && typeof rawDetails.cwd === "string" ? rawDetails.cwd : undefined;
-		const rawSearchPath =
-			isRecord(rawDetails) && typeof rawDetails.searchPath === "string" ? rawDetails.searchPath : undefined;
-		const rawContexts =
-			rawContent !== undefined && rawLines?.length === allLines.length && sanitizeText(rawContent) === textContent
-				? classifyGroupedLines(rawLines, rawCwd ?? rawSearchPath, rawSearchPath)
-				: undefined;
-		// Style lazily: collapsed bodies show only the first groups.
-		const styledLines: (string | undefined)[] = Array.from({ length: allLines.length }, () => undefined);
-		const styleLine = (index: number): string => {
-			const cached = styledLines[index];
-			if (cached !== undefined) return cached;
-			const ctx = contexts[index]!;
-			// Swap the inner code-frame gutter `│` for a space so it does not nest a
-			// second vertical bar inside the frame border.
-			const display = replaceTabs(allLines[index]!.replace("│", " "));
-			let styled: string;
-			const linkPath =
-				ctx.headerPath && rawContexts?.[index]?.kind === ctx.kind && rawContexts[index]?.depth === ctx.depth
-					? (rawContexts[index]?.headerPath ?? ctx.headerPath)
-					: ctx.headerPath;
-			if (ctx.kind === "dir") {
-				const accent = uiTheme.fg("accent", display);
-				styled = linkPath ? fileHyperlink(linkPath, accent) : accent;
-			} else if (ctx.kind === "file") {
-				const tinted = uiTheme.fg(ctx.depth === 1 ? "accent" : "dim", display);
-				styled = linkPath ? fileHyperlink(linkPath, tinted) : tinted;
-			} else if (display.startsWith("+")) {
-				styled = uiTheme.fg("toolDiffAdded", display);
-			} else if (display.startsWith("-")) {
-				styled = uiTheme.fg("toolDiffRemoved", display);
-			} else {
-				styled = uiTheme.fg("toolOutput", display);
-			}
-			styledLines[index] = styled;
-			return styled;
-		};
-		const changeGroups = groupLineIndicesByBlank(allLines).filter(indices => {
+		const styleLine = createGroupedRowStyler(allLines, contexts, uiTheme, {
+			linkTarget: groupedLinkTargets(contexts, textContent, details, options.renderContext?.rawDetails),
+			styleBody: index => {
+				// Swap the code-frame gutter `│` for a space so it does not nest a
+				// second vertical bar inside the frame border.
+				const line = allLines[index]!.replace("│", " ");
+				const color = line.startsWith("+")
+					? "toolDiffAdded"
+					: line.startsWith("-")
+						? "toolDiffRemoved"
+						: "toolOutput";
+				return uiTheme.fg(color, line);
+			},
+		});
+		const changeGroups = groupsByFile(groupLineIndicesByBlank(allLines), contexts).filter(indices => {
 			const first = allLines[indices[0]!]!;
 			return !first.startsWith("Safety cap reached") && !first.startsWith("Parse issues:");
 		});
@@ -321,7 +270,13 @@ export const astEditToolRenderer = {
 			({ contentWidth }) => {
 				const expanded = Boolean(options.expanded);
 				if (bodyMemo === undefined || bodyMemo.expanded !== expanded || bodyMemo.width !== contentWidth) {
-					const changeLines = buildChangeBody(changeGroups, styleLine, expanded, COLLAPSED_CHANGE_LIMIT, uiTheme);
+					const changeLines = buildChangeBody(
+						changeGroups,
+						styleLine,
+						index => contexts[index]!.kind === "file",
+						expanded ? Number.POSITIVE_INFINITY : COLLAPSED_CHANGE_LIMIT,
+						uiTheme,
+					);
 					const lines = [...changeLines, ...extraLines].map(l => truncateToWidth(l, contentWidth, Ellipsis.Omit));
 					while (lines.length > 0 && lines[0].trim() === "") lines.shift();
 					bodyMemo = { expanded, width: contentWidth, lines };