@linxiraos/pi-tui 1.2.1 → 1.3.0

package/src/tools/find.ts

@@ -27,11 +27,16 @@ import {
 import type { Theme, ThemeColor } from "../theme/theme";
 import type { Component } from "../tui";
 import type { OutputMeta } from "./output-meta";
-import type { NativeToolHead, NativeToolView, RenderResultOptions, ToolRenderer } from "./renderer";
+import type {
+	NativeToolHead,
+	NativeToolView,
+	RenderResultContextOptions,
+	RenderResultOptions,
+	ToolRenderer,
+} from "./renderer";
 import type { TspTone } from "@linxiraos/pi-wire";
 import { code, col, compact, keyed, node, span, text } from "../native/describe";
 import type { NativeChild, NativeNode } from "../native/node";
-import { getLanguageFromPath } from "../lang-from-path";
 import { fileHref, fileRow, inlineErrorView } from "./native-view";
 import { splitUrlScheme } from "./url-scheme-host";
 
@@ -57,12 +62,22 @@ export interface FindHit {
 	truncated: boolean;
 }
 
+/**
+ * How much of a search the judge actually covered. `unavailable`: every judge
+ * request failed, so an empty result is not evidence of absence. `partial`:
+ * some requests failed. `complete`: none failed (or none were needed).
+ */
+export type FindCoverage = "complete" | "partial" | "unavailable";
+
 /** Search accounting reported alongside the hits. */
 export interface FindStats {
 	/** Eligible files under the root. */
 	listed: number;
 	requests: number;
-	errors: number;
+	/** Judge requests that failed outright; decides {@link FindCoverage}. */
+	failed: number;
+	/** Questions a successful response left without a usable answer. */
+	unanswered: number;
 	/** Entries judged by name. */
 	judged: number;
 	/** Files whose content was read and sent. */
@@ -87,6 +102,7 @@ export interface FindToolDetails {
 	/** Verified-passage probability at or above which a file is a hit. */
 	threshold: number;
 	hits: FindHit[];
+	coverage: FindCoverage;
 	stats: FindStats;
 	elapsedMs: number;
 	/** Session cwd; hit paths are relative to it. */
@@ -129,13 +145,32 @@ function gauge(p: number, theme: Theme): string {
 	});
 }
 
-function renderHit(hit: FindHit, rangeLimit: number, cwd: string | undefined, theme: Theme): string[] {
+/** Raw metadata is used only for file link targets, never for displayed text. */
+function findLinkTargets(details: FindToolDetails, rawDetails: unknown) {
+	const raw = rawDetails !== null && typeof rawDetails === "object" ? rawDetails : undefined;
+	const cwd = raw && "cwd" in raw && typeof raw.cwd === "string" ? raw.cwd : details.cwd;
+	const rawHits: unknown[] = raw && "hits" in raw && Array.isArray(raw.hits) ? raw.hits : [];
+	return {
+		cwd,
+		rel(hit: FindHit, index: number): string {
+			const candidate = rawHits[index];
+			return candidate !== null &&
+				typeof candidate === "object" &&
+				"rel" in candidate &&
+				typeof candidate.rel === "string"
+				? candidate.rel
+				: hit.rel;
+		},
+	};
+}
+
+function renderHit(hit: FindHit, rangeLimit: number, cwd: string | undefined, rawRel: string, theme: Theme): string[] {
 	// `scheme://` hits (e.g. virtual docs) are not files under `cwd`: link the
 	// URL itself instead of joining it onto a filesystem base.
 	const isUrlHit = splitUrlScheme(hit.rel) !== undefined;
 	const link = (text: string, line?: number): string => {
 		if (isUrlHit) return uriHyperlink(line === undefined ? hit.rel : `${hit.rel}:${line}`, text);
-		const absPath = cwd === undefined ? undefined : path.join(cwd, hit.rel);
+		const absPath = cwd === undefined ? undefined : path.join(cwd, rawRel);
 		return absPath === undefined ? text : fileHyperlink(absPath, text, { line });
 	};
 	const coverage = hit.truncated ? `${hit.linesSeen} lines judged, partial` : `${hit.linesSeen} lines judged`;
@@ -161,7 +196,7 @@ function scoreTone(p: number): TspTone {
  * One hit (§7.3 find): a 22px row of the score bar, the path and `12 lines
  * judged`, then its strongest ranges as numbered `code` (no path header).
  */
-function describeHit(hit: FindHit, rangeLimit: number, cwd: string | undefined): NativeNode {
+function describeHit(hit: FindHit, rangeLimit: number, cwd: string | undefined, rawRel: string): NativeNode {
 	const ranges = [...hit.ranges].sort((a, b) => b.p - a.p || a.start - b.start).slice(0, rangeLimit);
 	const tone = scoreTone(hit.contentScore);
 	const score = hit.contentScore.toFixed(2);
@@ -175,13 +210,17 @@ function describeHit(hit: FindHit, rangeLimit: number, cwd: string | undefined):
 				"muted",
 			),
 		],
-		href: isUrlHit || cwd === undefined ? undefined : fileHref(path.join(cwd, hit.rel)),
+		href: isUrlHit || cwd === undefined ? undefined : fileHref(path.join(cwd, rawRel)),
 		key: "hit",
 	});
-	const lang = getLanguageFromPath(hit.rel);
 	const snippets = ranges.map(range =>
 		keyed(
-			code(range.snippet.trimEnd(), { lang, start: range.start, numbers: true, title: range.p.toFixed(2) }),
+			code(range.snippet.trimEnd(), {
+				path: hit.rel,
+				start: range.start,
+				numbers: true,
+				title: range.p.toFixed(2),
+			}),
 			`${range.start}-${range.end}`,
 		),
 	);
@@ -222,7 +261,7 @@ export const findToolRenderer = {
 
 	renderResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: FindToolDetails; isError?: boolean },
-		options: RenderResultOptions,
+		options: RenderResultContextOptions,
 		uiTheme: Theme,
 		args?: FindRenderArgs,
 	): Component {
@@ -250,6 +289,7 @@ export const findToolRenderer = {
 		}
 
 		const { hits, stats, threshold } = details;
+		const linkTargets = findLinkTargets(details, options.renderContext?.rawDetails);
 		const description = quoteQuery(details.query);
 		const scope = details.scopePath === undefined ? [] : [`in ${details.scopePath}`];
 		const meta = [
@@ -261,16 +301,21 @@ export const findToolRenderer = {
 			`$${stats.cost.toFixed(4)}`,
 			formatDuration(details.elapsedMs),
 		];
-		if (stats.errors > 0) meta.push(uiTheme.fg("warning", `${stats.errors} failed`));
+		const failed = stats.failed > 0 ? `${stats.failed}/${stats.requests} requests failed` : undefined;
+		if (failed) meta.push(uiTheme.fg("warning", failed));
 
 		if (hits.length === 0) {
 			const emptyMeta = ["0 hits", ...scope, `$${stats.cost.toFixed(4)}`, formatDuration(details.elapsedMs)];
-			if (stats.errors > 0) emptyMeta.push(uiTheme.fg("warning", `${stats.errors} failed`));
+			if (failed) emptyMeta.push(uiTheme.fg("warning", failed));
 			const header = renderStatusLine(
 				{ icon: "warning", title: "Find", titleColor: "toolTitle", description, meta: emptyMeta },
 				uiTheme,
 			);
-			const lines = [header, formatEmptyMessage("No relevant passages found", uiTheme)];
+			const empty =
+				details.coverage === "partial"
+					? "No relevant passages found in the judged files"
+					: "No relevant passages found";
+			const lines = [header, formatEmptyMessage(empty, uiTheme)];
 			for (const failure of stats.failures) lines.push(uiTheme.fg("warning", failure));
 			return new Text(lines.join("\n"), 1, 0);
 		}
@@ -296,8 +341,14 @@ export const findToolRenderer = {
 						maxCollapsed: COLLAPSED_HITS,
 						maxCollapsedLines: PREVIEW_LIMITS.EXPANDED_LINES,
 						itemType: "hit",
-						renderItem: hit =>
-							renderHit(hit, expanded ? RANGES_EXPANDED : RANGES_COLLAPSED, details.cwd, uiTheme),
+						renderItem: (hit, context) =>
+							renderHit(
+								hit,
+								expanded ? RANGES_EXPANDED : RANGES_COLLAPSED,
+								linkTargets.cwd,
+								linkTargets.rel(hit, context.index),
+								uiTheme,
+							),
 					},
 					uiTheme,
 				);
@@ -329,7 +380,7 @@ export const findToolRenderer = {
 	 */
 	describeResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: FindToolDetails; isError?: boolean },
-		options: RenderResultOptions,
+		options: RenderResultContextOptions,
 		args?: FindRenderArgs,
 	): NativeToolView {
 		const details = result.details;
@@ -343,8 +394,10 @@ export const findToolRenderer = {
 			};
 		}
 		const { hits, stats, threshold } = details;
+		const linkTargets = findLinkTargets(details, options.renderContext?.rawDetails);
 		const scope = details.scopePath === undefined ? undefined : `in ${details.scopePath}`;
-		const failed = stats.errors > 0 ? [span(`${stats.errors} failed`, "warning")] : undefined;
+		const failed =
+			stats.failed > 0 ? [span(`${stats.failed}/${stats.requests} requests failed`, "warning")] : undefined;
 		const accounting = [
 			`${stats.filesRead} files read`,
 			`τ ${threshold.toFixed(2)}`,
@@ -382,7 +435,7 @@ export const findToolRenderer = {
 			),
 			inline: true,
 			body: compact<NativeChild>([
-				...shown.map(hit => describeHit(hit, rangeLimit, details.cwd)),
+				...shown.map((hit, index) => describeHit(hit, rangeLimit, linkTargets.cwd, linkTargets.rel(hit, index))),
 				...failures,
 				foot,
 			]),

package/src/tools/glob.d.ts

@@ -1,5 +1,5 @@
 import type { Component } from "../tui";
-import type { NativeToolView, RenderResultOptions } from "./renderer";
+import type { NativeToolView, RenderResultContextOptions, RenderResultOptions } from "./renderer";
 import { type Theme } from "../theme/theme";
 import type { OutputMeta } from "./output-meta";
 import type { TruncationResult } from "./streaming-output";
@@ -42,7 +42,7 @@ export declare const globToolRenderer: {
         }>;
         details?: GlobToolDetails;
         isError?: boolean;
-    }, options: RenderResultOptions, uiTheme: Theme, args?: GlobRenderArgs): Component;
+    }, options: RenderResultContextOptions, uiTheme: Theme, args?: GlobRenderArgs): Component;
     describeCall(args: GlobRenderArgs): NativeToolView;
     /**
      * Inline (§7.3 glob): `Glob “pattern”  5 files`, then the files as rows
@@ -55,7 +55,7 @@ export declare const globToolRenderer: {
         }>;
         details?: GlobToolDetails;
         isError?: boolean;
-    }, _options: RenderResultOptions, args?: GlobRenderArgs): NativeToolView;
+    }, options: RenderResultContextOptions, args?: GlobRenderArgs): NativeToolView;
     mergeCallAndResult: true;
 };
 export {};

package/src/tools/glob.ts

@@ -1,6 +1,12 @@
 import type { Component } from "../tui";
 import { Text } from "../components/text";
-import type { NativeToolHead, NativeToolView, RenderResultOptions, ToolRenderer } from "./renderer";
+import type {
+	NativeToolHead,
+	NativeToolView,
+	RenderResultContextOptions,
+	RenderResultOptions,
+	ToolRenderer,
+} from "./renderer";
 import { col, compact, keyed, node, row, span, text } from "../native/describe";
 import type { NativeChild, NativeNode } from "../native/node";
 import { fileHref, fileRow, footnoteText, inlineErrorView, resultText } from "./native-view";
@@ -68,13 +74,33 @@ const NATIVE_LIST_MAX = 6;
 /** Collapsed clamp: the whole ≤ 6-row list, or about six rows of chips. */
 const NATIVE_PREVIEW_LINES = 8;
 
-/**
- * Native glob files: 22px path rows when there are few, else a wrap of
- * chips (glyph and name, the full path in the tooltip). Paths link when the
- * search `cwd` is known.
- */
-function describeGlobFiles(files: readonly string[], cwd: string | undefined): NativeNode {
-	const links = files.map(file => (cwd && !file.endsWith("/") ? fileHref(path.resolve(cwd, file)) : undefined));
+/** Use original filesystem paths for existing links, never for displayed labels or extra links. */
+function globLinkPaths(
+	details: GlobToolDetails | undefined,
+	rawDetails: unknown,
+): { cwd: string | undefined; files: readonly unknown[] } {
+	const raw = rawDetails && typeof rawDetails === "object" ? rawDetails : undefined;
+	const rawCwd = raw && "cwd" in raw && typeof raw.cwd === "string" ? raw.cwd : undefined;
+	const rawFiles = raw && "files" in raw && Array.isArray(raw.files) ? raw.files : undefined;
+	const files = details?.files ?? [];
+	return {
+		cwd: details?.cwd ? (rawCwd ?? details.cwd) : undefined,
+		files: rawFiles?.length === files.length ? rawFiles : files,
+	};
+}
+
+/** Native glob files: path rows when few, otherwise wrapped chips; links require a known cwd. */
+function describeGlobFiles(
+	files: readonly string[],
+	cwd: string | undefined,
+	rawFiles: readonly unknown[] = files,
+): NativeNode {
+	const links = files.map((file, i) => {
+		const rawFile = rawFiles[i];
+		return cwd && !file.endsWith("/")
+			? fileHref(path.resolve(cwd, typeof rawFile === "string" ? rawFile : file))
+			: undefined;
+	});
 	if (files.length <= NATIVE_LIST_MAX) {
 		return col(
 			files.map((file, i) => fileRow(file, { href: links[i] })),
@@ -130,11 +156,12 @@ export const globToolRenderer = {
 
 	renderResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: GlobToolDetails; isError?: boolean },
-		options: RenderResultOptions,
+		options: RenderResultContextOptions,
 		uiTheme: Theme,
 		args?: GlobRenderArgs,
 	): Component {
 		const details = result.details;
+		const linkPaths = globLinkPaths(details, options.renderContext?.rawDetails);
 
 		if (result.isError || details?.error) {
 			const errorText = details?.error || result.content?.find(c => c.type === "text")?.text || "Unknown error";
@@ -249,14 +276,20 @@ export const globToolRenderer = {
 		return createCachedComponent(
 			() => options.expanded,
 			width => {
-				const cwd = details?.cwd;
+				const cwd = linkPaths.cwd;
 				const fileLines = renderFileList(
 					{
-						files: files.map(entry => ({
-							path: entry,
-							isDirectory: entry.endsWith("/"),
-							absPath: cwd && !entry.endsWith("/") ? path.resolve(cwd, entry) : undefined,
-						})),
+						files: files.map((entry, index) => {
+							const rawFile = linkPaths.files[index];
+							return {
+								path: entry,
+								isDirectory: entry.endsWith("/"),
+								absPath:
+									cwd && !entry.endsWith("/")
+										? path.resolve(cwd, typeof rawFile === "string" ? rawFile : entry)
+										: undefined,
+							};
+						}),
 						expanded: options.expanded,
 						maxCollapsed: PREVIEW_LIMITS.COLLAPSED_ITEMS,
 						hyperlinkFn: fileHyperlink,
@@ -278,10 +311,11 @@ export const globToolRenderer = {
 	 */
 	describeResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: GlobToolDetails; isError?: boolean },
-		_options: RenderResultOptions,
+		options: RenderResultContextOptions,
 		args?: GlobRenderArgs,
 	): NativeToolView {
 		const details = result.details;
+		const linkPaths = globLinkPaths(details, options.renderContext?.rawDetails);
 		if (result.isError || details?.error) {
 			return inlineErrorView(globNativeHead(args), details?.error || resultText(result) || "Unknown error");
 		}
@@ -335,7 +369,7 @@ export const globToolRenderer = {
 				: head,
 			inline: true,
 			body: compact<NativeChild>([
-				describeGlobFiles(details.files ?? [], details.cwd),
+				describeGlobFiles(details.files ?? [], linkPaths.cwd, linkPaths.files),
 				footnoteText(compact([reasons.length > 0 && `truncated: ${reasons.join(", ")}`, missingNote])),
 			]),
 			preview: { lines: NATIVE_PREVIEW_LINES },

package/src/tools/grep.d.ts

@@ -1,5 +1,5 @@
 import type { Component } from "../tui";
-import type { NativeToolView, RenderResultOptions } from "./renderer";
+import type { NativeToolView, RenderResultContextOptions, RenderResultOptions } from "./renderer";
 import { type Theme } from "../theme/theme";
 import type { OutputMeta } from "./output-meta";
 import type { TruncationResult } from "./streaming-output";
@@ -58,7 +58,7 @@ export declare const grepToolRenderer: {
         }>;
         details?: GrepToolDetails;
         isError?: boolean;
-    }, options: RenderResultOptions, uiTheme: Theme, args?: GrepRenderArgs): Component;
+    }, options: RenderResultContextOptions, uiTheme: Theme, args?: GrepRenderArgs): Component;
     describeCall(args: GrepRenderArgs): NativeToolView;
     /**
      * Inline (§7.3 grep): `Grep “pattern”  5 matches · 2 files  in src`, then

package/src/tools/grep.ts

@@ -1,7 +1,14 @@
+import * as path from "node:path";
+import { isRecord, sanitizeText } from "@linxiraos/pi-utils";
 import type { Component } from "../tui";
 import { Text } from "../components/text";
-import type { NativeToolHead, NativeToolView, RenderResultOptions, ToolRenderer } from "./renderer";
-import { getLanguageFromPath } from "../lang-from-path";
+import type {
+	NativeToolHead,
+	NativeToolView,
+	RenderResultContextOptions,
+	RenderResultOptions,
+	ToolRenderer,
+} from "./renderer";
 import { compact } from "../native/describe";
 import type { NativeChild } from "../native/node";
 import { footnoteText, inlineErrorView, resultText } from "./native-view";
@@ -89,10 +96,82 @@ const NATIVE_COLLAPSED_FILES = 2;
 
 const SEARCH_CODE_FRAME_LINE_RE = /^\s*\*?(\d+)│/;
 
-function searchScopeMeta(details: GrepToolDetails | undefined): string | undefined {
+function searchScopeMeta(details: GrepToolDetails | undefined, searchPath?: string): string | undefined {
 	if (!details?.scopePath) return undefined;
-	const label = details.searchPath ? fileHyperlink(details.searchPath, details.scopePath) : details.scopePath;
-	return tuiTextFmt("gpInLabelFmt", `in ${label}`, label);
+	const label = searchPath ? fileHyperlink(searchPath, details.scopePath) : details.scopePath;
+	return `in ${label}`;
+}
+
+function isStringArray(value: unknown): value is string[] {
+	return Array.isArray(value) && value.every((item: unknown) => typeof item === "string");
+}
+
+function isStringRecord(value: unknown): value is Record<string, string> {
+	if (!isRecord(value)) return false;
+	for (const key in value) {
+		if (typeof value[key] !== "string") return false;
+	}
+	return true;
+}
+
+function samePath(filePath: string): string {
+	return filePath;
+}
+
+/** Keep only path metadata from the original details; display text always comes from sanitized details. */
+function grepLinkTargets(details: GrepToolDetails | undefined, rawDetails: unknown) {
+	if (details === rawDetails) {
+		return {
+			target: samePath,
+			searchPath: details?.searchPath,
+			fileScope: details?.searchPath,
+			displayTargets: details?.displayTargets,
+		};
+	}
+	const raw = typeof rawDetails === "object" && rawDetails !== null ? rawDetails : {};
+	const rawCwd = "cwd" in raw && typeof raw.cwd === "string" ? raw.cwd : undefined;
+	const rawSearchPath = "searchPath" in raw && typeof raw.searchPath === "string" ? raw.searchPath : undefined;
+	const rawFiles = "files" in raw && isStringArray(raw.files) ? raw.files : undefined;
+	const rawDisplayTargets =
+		"displayTargets" in raw && isStringRecord(raw.displayTargets) ? raw.displayTargets : undefined;
+	let displayTargets = details?.displayTargets;
+	if (rawDisplayTargets) {
+		displayTargets = {};
+		for (const label in rawDisplayTargets) {
+			displayTargets[sanitizeText(label)] = rawDisplayTargets[label]!;
+		}
+	}
+
+	const pathTargets = new Map<string, string>();
+	const displayBase = details?.cwd ?? details?.searchPath;
+	const rawBase = rawCwd ?? rawSearchPath ?? displayBase;
+	if (displayBase && rawBase && rawFiles && details?.files) {
+		for (let index = 0; index < Math.min(details.files.length, rawFiles.length); index++) {
+			const displayFile = path.resolve(displayBase, details.files[index]!);
+			const rawFile = path.resolve(rawBase, rawFiles[index]!);
+			pathTargets.set(displayFile, rawFile);
+			// Folded directory headers must retain the original path as well.
+			let displayDir = path.dirname(displayFile);
+			let rawDir = path.dirname(rawFile);
+			while (displayDir !== path.dirname(displayDir) && rawDir !== path.dirname(rawDir)) {
+				pathTargets.set(displayDir, rawDir);
+				displayDir = path.dirname(displayDir);
+				rawDir = path.dirname(rawDir);
+			}
+		}
+	}
+	const target = (displayPath: string): string => {
+		const known = pathTargets.get(displayPath);
+		if (known) return known;
+		if (rawCwd && details?.cwd) return path.resolve(rawCwd, path.relative(details.cwd, displayPath));
+		return displayPath;
+	};
+	return {
+		target,
+		searchPath: rawSearchPath ?? details?.searchPath,
+		fileScope: rawSearchPath ?? details?.searchPath,
+		displayTargets,
+	};
 }
 
 function linkUrlLikeSearchHeader(
@@ -134,6 +213,7 @@ function createSearchLineStyler(
 	fileScope: string | undefined,
 	uiTheme: Theme,
 	displayTargets: Record<string, string> | undefined,
+	target: (displayPath: string) => string,
 ): (index: number) => string {
 	const contexts = classifyGroupedLines(lines, headerBase, fileScope);
 	// `classifyGroupedLines` can't resolve internal URLs (TUI-only), so track the
@@ -168,7 +248,7 @@ function createSearchLineStyler(
 		let styled: string;
 		if (ctx.kind === "dir") {
 			const accent = uiTheme.fg("accent", line);
-			styled = ctx.headerPath ? fileHyperlink(ctx.headerPath, accent) : accent;
+			styled = ctx.headerPath ? fileHyperlink(target(ctx.headerPath), accent) : accent;
 		} else if (ctx.kind === "file") {
 			const raw = urlRaw[index];
 			if (raw !== undefined) {
@@ -176,12 +256,12 @@ function createSearchLineStyler(
 			} 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;
+				styled = ctx.headerPath ? fileHyperlink(target(ctx.headerPath), tinted) : tinted;
 			}
 		} else {
 			const tinted = uiTheme.fg("toolOutput", line);
 			const lineNumber = parseSearchDisplayLineNumber(line);
-			const filePath = ctx.filePath ?? urlFiles[index];
+			const filePath = ctx.filePath ? target(ctx.filePath) : urlFiles[index];
 			styled = filePath && lineNumber !== undefined ? fileHyperlink(filePath, tinted, { line: lineNumber }) : tinted;
 		}
 		styledLines[index] = styled;
@@ -290,7 +370,7 @@ export const grepToolRenderer = {
 
 	renderResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: GrepToolDetails; isError?: boolean },
-		options: RenderResultOptions,
+		options: RenderResultContextOptions,
 		uiTheme: Theme,
 		args?: GrepRenderArgs,
 	): Component {
@@ -345,6 +425,7 @@ export const grepToolRenderer = {
 				{ paddingX: 1 },
 			);
 		}
+		const linkTargets = grepLinkTargets(details, options.renderContext?.rawDetails);
 
 		const matchCount = details?.matchCount ?? 0;
 		const fileCount = details?.fileCount ?? 0;
@@ -366,8 +447,8 @@ export const grepToolRenderer = {
 				: undefined;
 
 		if (matchCount === 0) {
-			const meta = [tuiText("agrpZeroMatches", "0 matches")];
-			const scopeMeta = searchScopeMeta(details);
+			const meta = ["0 matches"];
+			const scopeMeta = searchScopeMeta(details, linkTargets.searchPath);
 			if (scopeMeta) meta.push(scopeMeta);
 			const header = renderStatusLine(
 				{ icon: "warning", title: "Grep", titleColor: "toolTitle", description: args?.pattern, meta },
@@ -378,14 +459,9 @@ export const grepToolRenderer = {
 			return new Text(lines.join("\n"), 1, 0);
 		}
 
-		const matchMeta =
-			matchCount === 1
-				? tuiText("grepMatchOne", "1 match")
-				: tuiTextFmt("grepMatchManyFmt", "%d matches", matchCount);
-		const fileMeta =
-			fileCount === 1 ? tuiText("grepFileOne", "1 file") : tuiTextFmt("grepFileManyFmt", "%d files", fileCount);
-		const meta = [matchMeta, fileMeta];
-		const scopeMeta = searchScopeMeta(details);
+		const summaryParts = [formatCount("match", matchCount), formatCount("file", fileCount)];
+		const meta = [...summaryParts];
+		const scopeMeta = searchScopeMeta(details, linkTargets.searchPath);
 		if (scopeMeta) meta.push(scopeMeta);
 		if (truncated) meta.push(uiTheme.fg("warning", tuiText("grepTruncated", "truncated")));
 		const description = args?.pattern ?? undefined;
@@ -410,9 +486,10 @@ export const grepToolRenderer = {
 		const styleLine = createSearchLineStyler(
 			allLines,
 			details?.cwd ?? details?.searchPath,
-			details?.searchPath,
+			linkTargets.fileScope,
 			uiTheme,
-			details?.displayTargets,
+			linkTargets.displayTargets,
+			linkTargets.target,
 		);
 		const matchGroups = groupLineIndicesByBlank(allLines);
 
@@ -493,8 +570,8 @@ export const grepToolRenderer = {
 			inline: true,
 			body: compact<NativeChild>([
 				...describeGroupedOutput(textContent.split("\n"), {
-					lang: getLanguageFromPath,
 					maxFiles: options.expanded ? undefined : NATIVE_COLLAPSED_FILES,
+					file: details?.files?.length === 1 ? details.files[0] : undefined,
 				}),
 				foot,
 			]),

package/src/tools/grouped-file-output.d.ts

@@ -110,10 +110,13 @@ export interface NumberedLine {
  * Numbered `code` for possibly non-contiguous source lines: one block per run
  * of consecutive line numbers (`start` = the run's first line, match lines
  * `mark`ed), with a `…` row wherever the numbers jump or an elision marker
- * (`n: null`) sits. No path header: the row or head above names the file.
+ * (`n: null`) sits. `path` is the file the lines come from: Tern picks their
+ * grammar from it and draws no header (the row or head above names the file).
+ * `wrap` soft-wraps long lines instead of scrolling the block sideways.
  */
 export declare function numberedCode(lines: readonly NumberedLine[], opts?: {
-    lang?: string;
+    path?: string;
+    wrap?: boolean;
 }): NativeNode[];
 /**
  * Describe grouped search output (grep / ast-grep / ast-edit display content)
@@ -121,9 +124,11 @@ export declare function numberedCode(lines: readonly NumberedLine[], opts?: {
  * header's suffix or the match count as a chip), then its lines as
  * {@link numberedCode} with match lines marked and `…` between non-adjacent
  * runs. Unnumbered body lines stay plain `code`. `maxFiles` keeps only the
- * first files (the caller says how many were left out).
+ * first files (the caller says how many were left out). `file` owns the lines
+ * before any header: a single-file search prints none, yet its lines get the
+ * same file row as a directory search's.
  */
 export declare function describeGroupedOutput(lines: readonly string[], options?: {
-    lang?: (path: string) => string | undefined;
     maxFiles?: number;
+    file?: string;
 }): NativeNode[];

package/src/tools/grouped-file-output.ts

@@ -314,9 +314,14 @@ export interface NumberedLine {
  * Numbered `code` for possibly non-contiguous source lines: one block per run
  * of consecutive line numbers (`start` = the run's first line, match lines
  * `mark`ed), with a `…` row wherever the numbers jump or an elision marker
- * (`n: null`) sits. No path header: the row or head above names the file.
+ * (`n: null`) sits. `path` is the file the lines come from: Tern picks their
+ * grammar from it and draws no header (the row or head above names the file).
+ * `wrap` soft-wraps long lines instead of scrolling the block sideways.
  */
-export function numberedCode(lines: readonly NumberedLine[], opts: { lang?: string } = {}): NativeNode[] {
+export function numberedCode(
+	lines: readonly NumberedLine[],
+	opts: { path?: string; wrap?: boolean } = {},
+): NativeNode[] {
 	const out: NativeNode[] = [];
 	let run: { start: number; text: string[]; marks: { line: number; tone: TspTone }[] } | undefined;
 	const flush = () => {
@@ -328,7 +333,8 @@ export function numberedCode(lines: readonly NumberedLine[], opts: { lang?: stri
 				code(run.text.join("\n"), {
 					start: run.start,
 					numbers: true,
-					lang: opts.lang,
+					path: opts.path,
+					wrap: opts.wrap,
 					marks: run.marks.length > 0 ? run.marks : undefined,
 				}),
 				`c${run.start}`,
@@ -356,22 +362,26 @@ export function numberedCode(lines: readonly NumberedLine[], opts: { lang?: stri
  * header's suffix or the match count as a chip), then its lines as
  * {@link numberedCode} with match lines marked and `…` between non-adjacent
  * runs. Unnumbered body lines stay plain `code`. `maxFiles` keeps only the
- * first files (the caller says how many were left out).
+ * first files (the caller says how many were left out). `file` owns the lines
+ * before any header: a single-file search prints none, yet its lines get the
+ * same file row as a directory search's.
  */
 export function describeGroupedOutput(
 	lines: readonly string[],
-	options: { lang?: (path: string) => string | undefined; maxFiles?: number } = {},
+	options: { maxFiles?: number; file?: string } = {},
 ): NativeNode[] {
 	const files: NativeNode[] = [];
 	const loose: NativeNode[] = [];
 	let current: { path: string; suffix?: string; children: NativeNode[]; marks: number } | undefined;
 	let numbered: NumberedLine[] = [];
 	let plain: string[] = [];
+	// `options.file` until the first line or header claims it.
+	let headless = options.file;
 
 	const flushLines = () => {
 		const target = current?.children ?? loose;
 		if (numbered.length > 0) {
-			target.push(...numberedCode(numbered, { lang: current ? options.lang?.(current.path) : undefined }));
+			target.push(...numberedCode(numbered, { path: current?.path }));
 			numbered = [];
 		}
 		if (plain.length > 0) {
@@ -397,11 +407,16 @@ export function describeGroupedOutput(
 
 	for (const event of walkGroupedOutput(lines)) {
 		if (event.kind !== "line") {
+			headless = undefined;
 			flushFile();
 			if (options.maxFiles !== undefined && files.length >= options.maxFiles) break;
 			if (event.kind === "file") current = { path: event.path, suffix: event.suffix, children: [], marks: 0 };
 			continue;
 		}
+		if (headless !== undefined) {
+			current = { path: headless, children: [], marks: 0 };
+			headless = undefined;
+		}
 		if (GROUPED_GAP_LINE_RE.test(event.text)) {
 			numbered.push({ n: null, text: "" });
 			continue;