@linxiraos/pi-tui 1.1.27 → 1.2.0

package/src/tools/fetch.ts

@@ -282,6 +282,10 @@ export function renderReadUrlResult(
 
 	let lastExpanded: boolean | undefined;
 	let contentPreviewLines: string[] | undefined;
+	const dropPreview = () => {
+		lastExpanded = undefined;
+		contentPreviewLines = undefined;
+	};
 	return framedToolCard(
 		uiTheme,
 		() => {
@@ -315,11 +319,6 @@ export function renderReadUrlResult(
 				applyBg: false,
 			};
 		},
-		{
-			onInvalidate: () => {
-				lastExpanded = undefined;
-				contentPreviewLines = undefined;
-			},
-		},
+		{ onInvalidate: dropPreview, onReleaseRenderCaches: dropPreview },
 	);
 }

package/src/tools/glob.d.ts

@@ -12,6 +12,10 @@ export interface GlobToolDetails {
     fileCount?: number;
     files?: string[];
     truncated?: boolean;
+    /** The scan hit the tool deadline, so the listed files are an incomplete
+     * set rather than a complete answer. Distinct from `truncated`, which also
+     * covers result-limit and output truncation. */
+    timedOut?: boolean;
     error?: string;
     /** Working directory at search time. Used by the renderer to resolve relative
      * file paths to absolute paths for OSC 8 hyperlinks. */

package/src/tools/glob.ts

@@ -18,7 +18,6 @@ import {
 	PREVIEW_LIMITS,
 } from "../render/render-utils";
 import { formatFullOutputReference } from "./output-meta";
-import { tuiText, tuiTextFmt } from "../i18n";
 
 /** Display metadata for glob tool results. */
 export interface GlobToolDetails {
@@ -30,6 +29,10 @@ export interface GlobToolDetails {
 	fileCount?: number;
 	files?: string[];
 	truncated?: boolean;
+	/** The scan hit the tool deadline, so the listed files are an incomplete
+	 * set rather than a complete answer. Distinct from `truncated`, which also
+	 * covers result-limit and output truncation. */
+	timedOut?: boolean;
 	error?: string;
 	/** Working directory at search time. Used by the renderer to resolve relative
 	 * file paths to absolute paths for OSC 8 hyperlinks. */
@@ -134,10 +137,7 @@ export const globToolRenderer = {
 		const details = result.details;
 
 		if (result.isError || details?.error) {
-			const errorText =
-				details?.error ||
-				result.content?.find(c => c.type === "text")?.text ||
-				tuiText("glUnknownError", "Unknown error");
+			const errorText = details?.error || result.content?.find(c => c.type === "text")?.text || "Unknown error";
 			return new Text(formatErrorMessage(errorText, uiTheme), 1, 0);
 		}
 
@@ -151,7 +151,7 @@ export const globToolRenderer = {
 				textContent.includes("No files found") ||
 				textContent.trim() === ""
 			) {
-				return new Text(formatEmptyMessage(tuiText("globNoFiles", "No files found"), uiTheme), 1, 0);
+				return new Text(formatEmptyMessage("No files found", uiTheme), 1, 0);
 			}
 
 			const lines = textContent.split("\n").filter(l => l.trim());
@@ -161,10 +161,7 @@ export const globToolRenderer = {
 					title: "Glob",
 					titleColor: "toolTitle",
 					description: formatGlobRenderPaths(args),
-					meta:
-						lines.length === 1
-							? [tuiText("globFileOne", "1 file")]
-							: [tuiTextFmt("globFileManyFmt", "%d files", lines.length)],
+					meta: [formatCount("file", lines.length)],
 				},
 				uiTheme,
 			);
@@ -191,36 +188,30 @@ export const globToolRenderer = {
 		const truncation = details?.truncation ?? details?.meta?.truncation;
 		const limits = details?.meta?.limits;
 		const truncated = Boolean(details?.truncated || truncation || details?.resultLimitReached || limits?.resultLimit);
+		// A non-empty timed-out result is the case `truncated` alone cannot
+		// explain: the listing is short because the scan died, not because it
+		// finished. Say which one it was.
+		const timedOut = Boolean(details?.timedOut);
 		const files = details?.files ?? [];
 
 		const missingPaths = details?.missingPaths ?? [];
 		const missingNote =
-			missingPaths.length > 0
-				? uiTheme.fg(
-						"warning",
-						tuiTextFmt(
-							"gpSkippedMissingFmt",
-							`skipped missing: ${missingPaths.join(", ")}`,
-							missingPaths.join(", "),
-						),
-					)
-				: undefined;
+			missingPaths.length > 0 ? uiTheme.fg("warning", `skipped missing: ${missingPaths.join(", ")}`) : undefined;
 
 		if (fileCount === 0) {
 			// `truncated` on an empty result means the scan timed out mid-walk —
-			// render "incomplete", not a definitive "No files found".
-			const emptyLabel = truncated
-				? tuiText("globNoMatchesBeforeTimeout", "No matches before timeout (scan incomplete)")
-				: tuiText("globNoFiles", "No files found");
+			// render "incomplete", not a definitive "No files found". `timedOut`
+			// states it outright; the inference stays for old transcripts that
+			// predate the field.
+			const emptyTimedOut = timedOut || truncated;
+			const emptyLabel = emptyTimedOut ? "No matches before timeout (scan incomplete)" : "No files found";
 			const header = renderStatusLine(
 				{
 					icon: "warning",
 					title: "Glob",
 					titleColor: "toolTitle",
 					description: formatGlobRenderPaths(args),
-					meta: truncated
-						? [tuiText("globZeroFiles", "0 files"), uiTheme.fg("warning", tuiText("globTimedOut", "timed out"))]
-						: [tuiText("globZeroFiles", "0 files")],
+					meta: emptyTimedOut ? ["0 files", uiTheme.fg("warning", "timed out")] : ["0 files"],
 				},
 				uiTheme,
 			);
@@ -228,10 +219,9 @@ export const globToolRenderer = {
 			if (missingNote) lines.push(missingNote);
 			return new Text(lines.join("\n"), 1, 0);
 		}
-		const meta: string[] =
-			fileCount === 1 ? [tuiText("globFileOne", "1 file")] : [tuiTextFmt("globFileManyFmt", "%d files", fileCount)];
-		if (details?.scopePath) meta.push(tuiTextFmt("gpInLabelFmt", `in ${details.scopePath}`, details.scopePath));
-		if (truncated) meta.push(uiTheme.fg("warning", tuiText("globTruncated", "truncated")));
+		const meta: string[] = [formatCount("file", fileCount)];
+		if (details?.scopePath) meta.push(`in ${details.scopePath}`);
+		if (truncated) meta.push(uiTheme.fg("warning", timedOut ? "timed out" : "truncated"));
 		const header = renderStatusLine(
 			{
 				...(truncated ? { icon: "warning" as const } : { iconOverride: globStatusIcon(uiTheme) }),
@@ -244,43 +234,15 @@ export const globToolRenderer = {
 		);
 
 		const truncationReasons: string[] = [];
-		if (details?.resultLimitReached)
-			truncationReasons.push(
-				tuiTextFmt(
-					"globLimitResultsFmt",
-					`limit ${details.resultLimitReached} results`,
-					details.resultLimitReached,
-				),
-			);
-		if (limits?.resultLimit)
-			truncationReasons.push(
-				tuiTextFmt(
-					"globLimitResultsFmt",
-					`limit ${limits.resultLimit.reached} results`,
-					limits.resultLimit.reached,
-				),
-			);
-		if (truncation)
-			truncationReasons.push(
-				truncation.truncatedBy === "lines"
-					? tuiText("globLineLimit", "line limit")
-					: tuiText("globSizeLimit", "size limit"),
-			);
+		if (details?.resultLimitReached) truncationReasons.push(`limit ${details.resultLimitReached} results`);
+		if (limits?.resultLimit) truncationReasons.push(`limit ${limits.resultLimit.reached} results`);
+		if (truncation) truncationReasons.push(truncation.truncatedBy === "lines" ? "line limit" : "size limit");
 		const artifactId = truncation && "artifactId" in truncation ? truncation.artifactId : undefined;
 		if (artifactId) truncationReasons.push(formatFullOutputReference(artifactId));
 
 		const extraLines: string[] = [];
 		if (truncationReasons.length > 0) {
-			extraLines.push(
-				uiTheme.fg(
-					"warning",
-					tuiTextFmt(
-						"globTruncatedReasonsFmt",
-						`truncated: ${truncationReasons.join(", ")}`,
-						truncationReasons.join(", "),
-					),
-				),
-			);
+			extraLines.push(uiTheme.fg("warning", `truncated: ${truncationReasons.join(", ")}`));
 		}
 		if (missingNote) extraLines.push(missingNote);
 
@@ -343,6 +305,7 @@ export const globToolRenderer = {
 		const truncation = details.truncation ?? details.meta?.truncation;
 		const limits = details.meta?.limits;
 		const truncated = Boolean(details.truncated || truncation || details.resultLimitReached || limits?.resultLimit);
+		const timedOut = Boolean(details.timedOut);
 		const missingPaths = details.missingPaths ?? [];
 		const missingNote = missingPaths.length > 0 ? `skipped missing: ${missingPaths.join(", ")}` : undefined;
 		const scope = details.scopePath ? `in ${details.scopePath}` : undefined;
@@ -350,7 +313,10 @@ export const globToolRenderer = {
 			const foot = footnoteText(compact([missingNote]));
 			return {
 				// `truncated` on an empty result means the scan timed out mid-walk.
-				tool: { ...globNativeHead(args, compact(["0 files", scope])), note: truncated ? "timed out" : undefined },
+				tool: {
+					...globNativeHead(args, compact(["0 files", scope])),
+					note: timedOut || truncated ? "timed out" : undefined,
+				},
 				tone: "warning",
 				inline: true,
 				body: foot ? [foot] : undefined,
@@ -364,7 +330,9 @@ export const globToolRenderer = {
 		if (artifactId) reasons.push(formatFullOutputReference(artifactId));
 		const head = globNativeHead(args, compact([formatCount("file", details.fileCount), scope]));
 		return {
-			tool: truncated ? { ...head, badges: [{ text: "truncated", tone: "warning" }] } : head,
+			tool: truncated
+				? { ...head, badges: [{ text: timedOut ? "timed out" : "truncated", tone: "warning" }] }
+				: head,
 			inline: true,
 			body: compact<NativeChild>([
 				describeGlobFiles(details.files ?? [], details.cwd),

package/src/tools/grep.ts

@@ -112,11 +112,6 @@ function parseSearchDisplayLineNumber(line: string): number | undefined {
 
 const SEARCH_MATCH_LINE_RE = /^\s*\*\d+(?:│|[:|])/;
 
-interface RenderedSearchLine {
-	raw: string;
-	styled: string;
-}
-
 function isSearchMatchLine(line: string): boolean {
 	return SEARCH_MATCH_LINE_RE.test(line);
 }
@@ -127,61 +122,91 @@ function isSearchHeaderLine(line: string): boolean {
 
 const URL_HEADER_PREFIX_RE = /^#+\s+/;
 
-function renderSearchDisplayLines(
+/**
+ * Build a memoized per-line styler for search display output. Classification
+ * and URL-target tracking walk the whole output once (nested directory stacks
+ * span blank-line groups), but styling and hyperlinking run only for the rows
+ * a preview actually shows.
+ */
+function createSearchLineStyler(
 	lines: readonly string[],
 	headerBase: string | undefined,
 	fileScope: string | undefined,
 	uiTheme: Theme,
 	displayTargets: Record<string, string> | undefined,
-): RenderedSearchLine[] {
+): (index: number) => string {
 	const contexts = classifyGroupedLines(lines, headerBase, fileScope);
 	// `classifyGroupedLines` can't resolve internal URLs (TUI-only), so track the
 	// resolved URL target here and use it for the body lines that follow.
+	const urlRaw: (string | undefined)[] = Array.from({ length: lines.length }, () => undefined);
+	const urlFiles: (string | undefined)[] = Array.from({ length: lines.length }, () => undefined);
 	let urlFile: string | undefined;
-	return lines.map((line, index) => {
+	for (let index = 0; index < lines.length; index++) {
 		const ctx = contexts[index]!;
 		if (ctx.kind === "dir") {
 			urlFile = undefined;
-			const styled = uiTheme.fg("accent", line);
-			return { raw: line, styled: ctx.headerPath ? fileHyperlink(ctx.headerPath, styled) : styled };
-		}
-		if (ctx.kind === "file") {
+		} else if (ctx.kind === "file") {
 			if (ctx.isUrl) {
-				const raw = line
-					.replace(URL_HEADER_PREFIX_RE, "")
+				const raw = lines[index]!.replace(URL_HEADER_PREFIX_RE, "")
 					.trimEnd()
 					.replace(/\s+\([^)]*\)\s*$/, "");
-				const linked = linkUrlLikeSearchHeader(raw, uiTheme.fg("accent", line), displayTargets?.[raw]);
-				urlFile = linked.absPath;
-				return { raw: line, styled: linked.line };
+				urlRaw[index] = raw;
+				urlFile = displayTargets?.[raw];
+			} else {
+				urlFile = undefined;
 			}
-			urlFile = undefined;
-			// Root-level files keep the bright accent; nested file headers are dimmed.
-			const styled = uiTheme.fg(ctx.depth === 1 ? "accent" : "dim", line);
-			return { raw: line, styled: ctx.headerPath ? fileHyperlink(ctx.headerPath, styled) : styled };
+		} else {
+			urlFiles[index] = urlFile;
 		}
-		const styled = uiTheme.fg("toolOutput", line);
-		const lineNumber = parseSearchDisplayLineNumber(line);
-		const filePath = ctx.filePath ?? urlFile;
-		return {
-			raw: line,
-			styled: filePath && lineNumber !== undefined ? fileHyperlink(filePath, styled, { line: lineNumber }) : styled,
-		};
-	});
+	}
+	const styledLines: (string | undefined)[] = Array.from({ length: lines.length }, () => undefined);
+	return index => {
+		const cached = styledLines[index];
+		if (cached !== undefined) return cached;
+		const line = lines[index]!;
+		const ctx = contexts[index]!;
+		let styled: string;
+		if (ctx.kind === "dir") {
+			const accent = uiTheme.fg("accent", line);
+			styled = ctx.headerPath ? fileHyperlink(ctx.headerPath, accent) : accent;
+		} else if (ctx.kind === "file") {
+			const raw = urlRaw[index];
+			if (raw !== undefined) {
+				styled = linkUrlLikeSearchHeader(raw, uiTheme.fg("accent", line), displayTargets?.[raw]).line;
+			} else {
+				// Root-level files keep the bright accent; nested file headers are dimmed.
+				const tinted = uiTheme.fg(ctx.depth === 1 ? "accent" : "dim", line);
+				styled = ctx.headerPath ? fileHyperlink(ctx.headerPath, tinted) : tinted;
+			}
+		} else {
+			const tinted = uiTheme.fg("toolOutput", line);
+			const lineNumber = parseSearchDisplayLineNumber(line);
+			const filePath = ctx.filePath ?? urlFiles[index];
+			styled = filePath && lineNumber !== undefined ? fileHyperlink(filePath, tinted, { line: lineNumber }) : tinted;
+		}
+		styledLines[index] = styled;
+		return styled;
+	};
 }
 
-function compactSearchPreviewGroup(group: RenderedSearchLine[]): RenderedSearchLine[] {
-	const compact = group.filter(line => isSearchHeaderLine(line.raw) || isSearchMatchLine(line.raw));
+function compactSearchPreviewGroup(group: readonly number[], lines: readonly string[]): readonly number[] {
+	const compact = group.filter(index => isSearchHeaderLine(lines[index]!) || isSearchMatchLine(lines[index]!));
 	return compact.length > 0 ? compact : group;
 }
 
-function countPreviewMatches(lines: readonly RenderedSearchLine[], hasMarkedMatches: boolean): number {
-	if (hasMarkedMatches) return lines.reduce((count, line) => count + (isSearchMatchLine(line.raw) ? 1 : 0), 0);
-	return lines.reduce((count, line) => count + (!isSearchHeaderLine(line.raw) && line.raw.length > 0 ? 1 : 0), 0);
+function countPreviewMatches(group: readonly number[], lines: readonly string[], hasMarkedMatches: boolean): number {
+	let count = 0;
+	for (const index of group) {
+		const line = lines[index]!;
+		if (hasMarkedMatches ? isSearchMatchLine(line) : !isSearchHeaderLine(line) && line.length > 0) count++;
+	}
+	return count;
 }
 
 function renderBudgetedSearchGroups(
-	groups: RenderedSearchLine[][],
+	groups: readonly (readonly number[])[],
+	lines: readonly string[],
+	styleLine: (index: number) => string,
 	maxLines: number,
 	matchCount: number,
 	uiTheme: Theme,
@@ -189,7 +214,7 @@ function renderBudgetedSearchGroups(
 ): string[] {
 	if (maxLines <= 0) return [];
 	const renderedGroups = groups
-		.map(group => (compact ? compactSearchPreviewGroup(group) : group))
+		.map(group => (compact ? compactSearchPreviewGroup(group, lines) : group))
 		.filter(group => group.length > 0);
 	if (renderedGroups.length === 0) return [];
 
@@ -198,13 +223,13 @@ function renderBudgetedSearchGroups(
 	let totalFallbackMatches = 0;
 	for (const group of renderedGroups) {
 		totalLines += group.length;
-		totalMarkedMatches += countPreviewMatches(group, true);
-		totalFallbackMatches += countPreviewMatches(group, false);
+		totalMarkedMatches += countPreviewMatches(group, lines, true);
+		totalFallbackMatches += countPreviewMatches(group, lines, false);
 	}
 	const hasMarkedMatches = totalMarkedMatches > 0;
 	const needsSummary = totalLines > maxLines;
 	const contentBudget = needsSummary ? Math.max(maxLines - 1, 0) : maxLines;
-	const visibleGroups: RenderedSearchLine[][] = [];
+	const visibleGroups: (readonly number[])[] = [];
 	let visibleLineCount = 0;
 	let visibleMatches = 0;
 	for (const group of renderedGroups) {
@@ -215,30 +240,30 @@ function renderBudgetedSearchGroups(
 		const visibleGroup = group.slice(0, take);
 		visibleGroups.push(visibleGroup);
 		visibleLineCount += visibleGroup.length;
-		visibleMatches += countPreviewMatches(visibleGroup, hasMarkedMatches);
+		visibleMatches += countPreviewMatches(visibleGroup, lines, hasMarkedMatches);
 	}
 
 	const totalMatches = hasMarkedMatches ? totalMarkedMatches : Math.max(matchCount, totalFallbackMatches);
 	const hiddenMatches = Math.max(totalMatches - visibleMatches, 0);
 	const hiddenLines = Math.max(totalLines - visibleLineCount, 0);
 	const hasSummary = needsSummary && (hiddenMatches > 0 || hiddenLines > 0);
-	const lines: string[] = [];
+	const out: string[] = [];
 	for (let i = 0; i < visibleGroups.length; i++) {
 		const group = visibleGroups[i]!;
 		const isLast = !hasSummary && i === visibleGroups.length - 1;
 		const prefix = `${uiTheme.fg("dim", getTreeBranch(isLast, uiTheme))} `;
 		const continuePrefix = uiTheme.fg("dim", getTreeContinuePrefix(isLast, uiTheme));
-		lines.push(`${prefix}${replaceTabs(group[0]!.styled)}`);
+		out.push(`${prefix}${replaceTabs(styleLine(group[0]!))}`);
 		for (let j = 1; j < group.length; j++) {
-			lines.push(`${continuePrefix}${replaceTabs(group[j]!.styled)}`);
+			out.push(`${continuePrefix}${replaceTabs(styleLine(group[j]!))}`);
 		}
 	}
 	if (hasSummary) {
 		const hiddenLabel =
 			hiddenMatches > 0 ? formatMoreItems(hiddenMatches, "match") : formatMoreItems(hiddenLines, "line");
-		lines.push(`${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", hiddenLabel)}`);
+		out.push(`${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", hiddenLabel)}`);
 	}
-	return lines;
+	return out;
 }
 
 function grepStatusIcon(uiTheme: Theme): string {
@@ -382,14 +407,14 @@ export const grepToolRenderer = {
 		// Header/match display paths are cwd-relative, so resolve them against cwd
 		// (falling back to searchPath for legacy results that predate `cwd`); the
 		// scoped file's absolute path seeds body lines in single-file searches.
-		const renderedLines = renderSearchDisplayLines(
+		const styleLine = createSearchLineStyler(
 			allLines,
 			details?.cwd ?? details?.searchPath,
 			details?.searchPath,
 			uiTheme,
 			details?.displayTargets,
 		);
-		const matchGroups = groupLineIndicesByBlank(allLines).map(indices => indices.map(i => renderedLines[i]!));
+		const matchGroups = groupLineIndicesByBlank(allLines);
 
 		const extraLines: string[] = [];
 		if (missingNote) extraLines.push(missingNote);
@@ -401,7 +426,15 @@ export const grepToolRenderer = {
 					(options.expanded ? EXPANDED_TEXT_LIMIT : COLLAPSED_TEXT_LIMIT) - extraLines.length,
 					0,
 				);
-				const matchLines = renderBudgetedSearchGroups(matchGroups, budget, matchCount, uiTheme, !options.expanded);
+				const matchLines = renderBudgetedSearchGroups(
+					matchGroups,
+					allLines,
+					styleLine,
+					budget,
+					matchCount,
+					uiTheme,
+					!options.expanded,
+				);
 				return [header, ...matchLines, ...extraLines].map(l => truncateToWidth(l, width, Ellipsis.Omit));
 			},
 			{ paddingX: 1 },

package/src/tools/index.ts

@@ -27,6 +27,7 @@ import { todoToolRenderer } from "./todo";
 import { createVibeToolRenderer } from "./vibe";
 import { webSearchToolRenderer } from "./web-search";
 import { writeToolRenderer } from "./write";
+import { yieldToolRenderer } from "./yield";
 import { setXdevRendererLookup } from "./xdev";
 
 export * from "./renderer";
@@ -67,6 +68,7 @@ export const toolRenderers: Record<string, ToolRenderer> = {
 	vibe_kill: createVibeToolRenderer("kill"),
 	vibe_list: createVibeToolRenderer("list"),
 	write: writeToolRenderer,
+	yield: yieldToolRenderer,
 };
 
 // Wire the xd:// render delegation without the xdev module importing this registry.

package/src/tools/lsp.ts

@@ -205,38 +205,56 @@ export function renderResult(
 	if (request?.new_name) requestLines.push(theme.fg("dim", `new name: ${request.new_name}`));
 	if (request?.apply !== undefined) requestLines.push(theme.fg("dim", `apply: ${request.apply ? "true" : "false"}`));
 
-	return framedToolCard(theme, () => {
-		// Read mutable state at render time
-		const { expanded, isPartial, spinnerFrame } = options;
-
-		// Determine label, state, bodyLines based on type + current expanded
-		let label = "Result";
-		let state: "success" | "warning" | "error" = "success";
-		let bodyLines: string[] = [];
-
+	// The body depends only on the (immutable) text, theme and `expanded`; parse
+	// and render it once per expanded state instead of on every spinner frame.
+	const bodies: Array<LspResultBody | undefined> = [undefined, undefined];
+	const renderBody = (expanded: boolean): LspResultBody => {
 		if (codeBlockMatch) {
-			label = "Hover";
-			bodyLines = renderHover(codeBlockMatch, text, lines, expanded, theme);
-		} else if (errorMatch || warningMatch || hasStatusError) {
-			label = "Diagnostics";
+			return {
+				label: "Hover",
+				state: "success",
+				bodyLines: renderHover(codeBlockMatch, text, lines, expanded, theme),
+			};
+		}
+		if (errorMatch || warningMatch || hasStatusError) {
 			const errorCount = errorMatch ? Number.parseInt(errorMatch[1], 10) : 0;
 			const warnCount = warningMatch ? Number.parseInt(warningMatch[1], 10) : 0;
-			state = errorCount > 0 ? "error" : warnCount > 0 ? "warning" : "success";
-			bodyLines = renderDiagnostics(errorMatch, warningMatch, lines, expanded, theme);
-		} else if (refMatch) {
-			label = "References";
-			bodyLines = renderReferences(refMatch, lines, expanded, theme);
-		} else if (symbolsMatch) {
-			label = "Symbols";
-			bodyLines = renderSymbols(symbolsMatch, lines, expanded, theme);
-		} else if (result.details?.action === "diagnostics" && text === "OK") {
-			label = "Diagnostics";
-			state = "success";
-			bodyLines = [`${theme.styledSymbol("tool.lsp", "accent")} ${theme.fg("dim", "OK")}`];
-		} else {
-			label = "Response";
-			bodyLines = renderGeneric(text, lines, expanded, theme);
+			return {
+				label: "Diagnostics",
+				state: errorCount > 0 ? "error" : warnCount > 0 ? "warning" : "success",
+				bodyLines: renderDiagnostics(errorMatch, warningMatch, lines, expanded, theme),
+			};
+		}
+		if (refMatch) {
+			return {
+				label: "References",
+				state: "success",
+				bodyLines: renderReferences(refMatch, lines, expanded, theme),
+			};
 		}
+		if (symbolsMatch) {
+			return { label: "Symbols", state: "success", bodyLines: renderSymbols(symbolsMatch, lines, expanded, theme) };
+		}
+		if (result.details?.action === "diagnostics" && text === "OK") {
+			return {
+				label: "Diagnostics",
+				state: "success",
+				bodyLines: [`${theme.styledSymbol("tool.lsp", "accent")} ${theme.fg("dim", "OK")}`],
+			};
+		}
+		return { label: "Response", state: "success", bodyLines: renderGeneric(text, lines, expanded, theme) };
+	};
+
+	return framedToolCard(theme, () => {
+		// Read mutable state at render time
+		const { expanded, isPartial, spinnerFrame } = options;
+		const slot = expanded ? 1 : 0;
+		let body = bodies[slot];
+		if (!body) {
+			body = renderBody(expanded);
+			bodies[slot] = body;
+		}
+		const { label, state, bodyLines } = body;
 
 		const actionLabel = (request?.action ?? result.details?.action ?? label.toLowerCase()).replace(/_/g, " ");
 		const isSuccess = !isPartial && !result.isError;
@@ -550,36 +568,32 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 		}
 	}
 
-	const isLastSibling = (i: number): boolean => {
+	// One linear pass each: `isLast[i]` — the next symbol at indent <= mine is
+	// not a sibling (monotonic stack, right to left); `prefixes[i]` — per
+	// ancestor level, the nearest earlier symbol at that indent decides the rail.
+	const isLast = Array.from({ length: symbols.length }, () => false);
+	const pending: number[] = [];
+	for (let i = symbols.length - 1; i >= 0; i--) {
 		const myIndent = symbols[i].indent;
-		for (let j = i + 1; j < symbols.length; j++) {
-			const nextIndent = symbols[j].indent;
-			if (nextIndent === myIndent) return false;
-			if (nextIndent < myIndent) return true;
-		}
-		return true;
-	};
-
-	const getPrefix = (i: number): string => {
-		const myIndent = symbols[i].indent;
-		if (myIndent === 0) return " ";
-
-		let prefix = " ";
-		for (let level = 2; level <= myIndent; level += 2) {
-			let ancestorIdx = -1;
-			for (let j = i - 1; j >= 0; j--) {
-				if (symbols[j].indent === level - 2) {
-					ancestorIdx = j;
-					break;
-				}
-			}
-			if (ancestorIdx >= 0 && isLastSibling(ancestorIdx)) {
-				prefix += "   ";
-			} else {
-				prefix += `${theme.tree.vertical}  `;
+		while (pending.length > 0 && symbols[pending[pending.length - 1]].indent > myIndent) pending.pop();
+		const next = pending.length > 0 ? pending[pending.length - 1] : -1;
+		isLast[i] = next < 0 || symbols[next].indent !== myIndent;
+		pending.push(i);
+	}
+	const getPrefixes = (): string[] => {
+		const prefixes: string[] = [];
+		const lastAtIndent = new Map<number, number>();
+		for (let i = 0; i < symbols.length; i++) {
+			const myIndent = symbols[i].indent;
+			let prefix = " ";
+			for (let level = 2; level <= myIndent; level += 2) {
+				const ancestorIdx = lastAtIndent.get(level - 2);
+				prefix += ancestorIdx !== undefined && isLast[ancestorIdx] ? "   " : `${theme.tree.vertical}  `;
 			}
+			prefixes.push(prefix);
+			lastAtIndent.set(myIndent, i);
 		}
-		return prefix;
+		return prefixes;
 	};
 
 	const topLevelCount = symbols.filter(s => s.indent === 0).length;
@@ -587,12 +601,13 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 	if (expanded) {
 		let output = `${icon} ${theme.fg("dim", `in ${fileName}`)}`;
 
+		const prefixes = getPrefixes();
 		for (let i = 0; i < symbols.length; i++) {
 			const sym = symbols[i];
-			const prefix = getPrefix(i);
-			const isLast = isLastSibling(i);
-			const branch = isLast ? theme.tree.last : theme.tree.branch;
-			const detailPrefix = isLast ? "   " : `${theme.tree.vertical}  `;
+			const prefix = prefixes[i];
+			const symIsLast = isLast[i];
+			const branch = symIsLast ? theme.tree.last : theme.tree.branch;
+			const detailPrefix = symIsLast ? "   " : `${theme.tree.vertical}  `;
 			output += `\n${prefix}${theme.fg("dim", branch)} ${theme.fg("accent", sym.icon)} ${theme.fg("accent", sym.name)}`;
 			output += `\n${prefix}${theme.fg("dim", detailPrefix)}${theme.fg("muted", `line ${sym.line}`)}`;
 		}
@@ -681,6 +696,13 @@ interface RawDiagnostic {
 	raw: string;
 }
 
+/** A rendered LSP result body for one `expanded` state. */
+interface LspResultBody {
+	label: string;
+	state: "success" | "warning" | "error";
+	bodyLines: string[];
+}
+
 type DiagnosticItem = ParsedDiagnostic | RawDiagnostic;
 
 function formatDiagnosticMessage(diagnostic: ParsedDiagnostic): string {