@linxiraos/pi-tui 1.2.0 → 1.3.0

package/src/tmux.d.ts

@@ -1,6 +1,14 @@
 export { wrapTmuxPassthrough } from "./multiplexers/tmux";
 /** Pass a control sequence through tmux, leaving direct-terminal output unchanged. */
 export declare function wrapTmuxPassthroughIfNeeded(payload: string, env?: NodeJS.ProcessEnv): string;
+/**
+ * Emulator name candidates from a `#{client_termtype}<TAB>#{client_termname}`
+ * line, best first: the terminal-type reply (tmux 3.4+, XTVERSION), then the
+ * emulator the client's `TERM` names when it ships its own terminfo entry. Both
+ * are kept because the reply can name an unrecognized program (a nested tmux
+ * answers `tmux 3.4`) while `TERM` still identifies the emulator.
+ */
+export declare function tmuxClientProgramsFromReport(report: string): string[];
 /**
  * Whether the terminal hosting this tmux session draws TSP programs natively:
  * it sets the session user option `@tern-tsp` while it watches the session.
@@ -12,10 +20,37 @@ export declare function tmuxSessionSpeaksTsp(env?: NodeJS.ProcessEnv): boolean;
  */
 export declare function setTmuxPaneApcTitles(on: boolean, env?: NodeJS.ProcessEnv): void;
 /**
- * Resolve the terminal emulator name recorded for this tmux client.
+ * Resolve the terminal emulator names recorded for this tmux client, best first.
  *
  * tmux overwrites pane identity variables with its own values, but retains the
- * attached client's terminal-type reply in `#{client_termtype}`. The local IPC
- * query runs once per process and degrades to `null` when unavailable.
+ * attached client's terminal-type reply in `#{client_termtype}` and its `TERM`
+ * in `#{client_termname}` (see {@link tmuxClientProgramsFromReport}). The local
+ * IPC query runs once per process and degrades to `[]` when unavailable.
+ */
+export declare function resolveTmuxClientTerminalNames(env?: NodeJS.ProcessEnv): readonly string[];
+/**
+ * Whether tmux draws SIXEL to the client attached to this session: its
+ * effective terminal description for that client carries `Sxl`.
+ *
+ * A tmux built with SIXEL answers every pane's DA1 with attribute 4 and draws a
+ * `SIXEL IMAGE (WxH)` text placeholder for clients without SIXEL, so the pane's
+ * DA1 says nothing about the outer terminal. tmux itself renders SIXEL only
+ * when the client's terminal has `Sxl`, whether from terminfo,
+ * `terminal-overrides`, or the `sixel` feature (DA1 or `terminal-features`),
+ * and `show-messages -T` reports that merged description. The TUI consults
+ * this before trusting the pane's DA1 attribute. Queried once per tmux
+ * session; `false` outside tmux, with no attached client, or when the query
+ * fails. Nested tmux usually reports no `Sxl`: the inner client's terminal is
+ * the outer tmux, whose DA1 starts with level 1, which tmux does not parse
+ * for features.
+ */
+export declare function tmuxClientRendersSixel(env?: NodeJS.ProcessEnv): boolean;
+/**
+ * Whether tmux forwards this pane's `\x1bPtmux;…\x1b\\` passthrough envelopes
+ * to the attached client. tmux 3.3+ defaults `allow-passthrough` to `off` and
+ * then silently drops every wrapped sequence, so Kitty graphics sent through
+ * the envelope never reach a Kitty-capable outer terminal. Resolves the
+ * effective pane value (pane → window → global). Queried once per pane;
+ * `false` outside tmux or when the query fails.
  */
-export declare function resolveTmuxClientTerminalName(env?: NodeJS.ProcessEnv): string | null;
+export declare function tmuxPaneAllowsPassthrough(env?: NodeJS.ProcessEnv): boolean;

package/src/tmux.ts

@@ -10,24 +10,55 @@ export function wrapTmuxPassthroughIfNeeded(payload: string, env: NodeJS.Process
 }
 
 const CLIENT_TERMTYPE_NAME = /^([A-Za-z][A-Za-z0-9._+-]*)(?=\s|\(|$)/u;
-const CLIENT_TERMTYPE_TIMEOUT_MS = 500;
-let cachedClientTerminalName: string | null | undefined;
+// One `tmux display-message` round trip over the server socket, which answers in
+// single-digit milliseconds when healthy. 500ms kept losing the race on a loaded
+// machine (fork/exec of the tmux client alone can exceed it on a saturated box),
+// and a lost race is indistinguishable from "not tmux": the process then falls
+// back to the true-color profile for the whole session. 2s bounds the startup
+// stall only when tmux is genuinely wedged.
+const CLIENT_TERMINAL_TIMEOUT_MS = 2_000;
+/** Client `TERM` values that name their emulator; tmux records this on every version. */
+const CLIENT_TERMNAME_PROGRAMS: ReadonlyArray<readonly [RegExp, string]> = [
+	[/^xterm-kitty$/u, "kitty"],
+	[/^xterm-ghostty$/u, "ghostty"],
+	[/^wezterm$/u, "wezterm"],
+];
+let cachedClientTerminalNames: readonly string[] | undefined;
 
-function queryTmuxClientTerminalName(env: NodeJS.ProcessEnv): string | null {
+/**
+ * Emulator name candidates from a `#{client_termtype}<TAB>#{client_termname}`
+ * line, best first: the terminal-type reply (tmux 3.4+, XTVERSION), then the
+ * emulator the client's `TERM` names when it ships its own terminfo entry. Both
+ * are kept because the reply can name an unrecognized program (a nested tmux
+ * answers `tmux 3.4`) while `TERM` still identifies the emulator.
+ */
+export function tmuxClientProgramsFromReport(report: string): string[] {
+	// Split before trimming: an empty terminal type leaves the line starting with the tab.
+	const [termtype = "", termname = ""] = report.split("\t");
+	const programs: string[] = [];
+	const program = CLIENT_TERMTYPE_NAME.exec(termtype.trim())?.[1];
+	if (program) programs.push(program);
+	const term = termname.trim().toLowerCase();
+	const termProgram = CLIENT_TERMNAME_PROGRAMS.find(([pattern]) => pattern.test(term))?.[1];
+	if (termProgram) programs.push(termProgram);
+	return programs;
+}
+
+function queryTmuxClientTerminalNames(env: NodeJS.ProcessEnv): readonly string[] {
 	const tmux = $which("tmux", { PATH: env.PATH });
-	if (!tmux) return null;
+	if (!tmux) return [];
 	try {
-		const result = Bun.spawnSync([tmux, "display-message", "-p", "#{client_termtype}"], {
+		const result = Bun.spawnSync([tmux, "display-message", "-p", "#{client_termtype}\t#{client_termname}"], {
 			env,
 			stdout: "pipe",
 			stderr: "ignore",
-			timeout: CLIENT_TERMTYPE_TIMEOUT_MS,
+			timeout: CLIENT_TERMINAL_TIMEOUT_MS,
 			killSignal: "SIGKILL",
 		});
-		if (result.exitCode !== 0) return null;
-		return CLIENT_TERMTYPE_NAME.exec(result.stdout.toString().trim())?.[1] ?? null;
+		if (result.exitCode !== 0) return [];
+		return tmuxClientProgramsFromReport(result.stdout.toString());
 	} catch {
-		return null;
+		return [];
 	}
 }
 
@@ -75,14 +106,77 @@ export function setTmuxPaneApcTitles(on: boolean, env: NodeJS.ProcessEnv = Bun.e
 }
 
 /**
- * Resolve the terminal emulator name recorded for this tmux client.
+ * Resolve the terminal emulator names recorded for this tmux client, best first.
  *
  * tmux overwrites pane identity variables with its own values, but retains the
- * attached client's terminal-type reply in `#{client_termtype}`. The local IPC
- * query runs once per process and degrades to `null` when unavailable.
+ * attached client's terminal-type reply in `#{client_termtype}` and its `TERM`
+ * in `#{client_termname}` (see {@link tmuxClientProgramsFromReport}). The local
+ * IPC query runs once per process and degrades to `[]` when unavailable.
  */
-export function resolveTmuxClientTerminalName(env: NodeJS.ProcessEnv = Bun.env): string | null {
-	if (!tmuxMultiplexer.isInside(env) || isBunTestRuntime()) return null;
-	if (cachedClientTerminalName === undefined) cachedClientTerminalName = queryTmuxClientTerminalName(env);
-	return cachedClientTerminalName;
+export function resolveTmuxClientTerminalNames(env: NodeJS.ProcessEnv = Bun.env): readonly string[] {
+	if (!tmuxMultiplexer.isInside(env) || isBunTestRuntime()) return [];
+	cachedClientTerminalNames ??= queryTmuxClientTerminalNames(env);
+	return cachedClientTerminalNames;
+}
+
+const SIXEL_CAPABILITY = /^\s*\d+: Sxl: \(flag\) true$/mu;
+let cachedClientSixel: { tmux: string; renders: boolean } | undefined;
+
+function queryTmuxClientRendersSixel(env: NodeJS.ProcessEnv): boolean {
+	const client = runTmux(["display-message", "-p", "#{client_name}"], env)?.trim();
+	if (!client) return false;
+	return SIXEL_CAPABILITY.test(runTmux(["show-messages", "-T", "-t", client], env) ?? "");
+}
+
+/**
+ * Whether tmux draws SIXEL to the client attached to this session: its
+ * effective terminal description for that client carries `Sxl`.
+ *
+ * A tmux built with SIXEL answers every pane's DA1 with attribute 4 and draws a
+ * `SIXEL IMAGE (WxH)` text placeholder for clients without SIXEL, so the pane's
+ * DA1 says nothing about the outer terminal. tmux itself renders SIXEL only
+ * when the client's terminal has `Sxl`, whether from terminfo,
+ * `terminal-overrides`, or the `sixel` feature (DA1 or `terminal-features`),
+ * and `show-messages -T` reports that merged description. The TUI consults
+ * this before trusting the pane's DA1 attribute. Queried once per tmux
+ * session; `false` outside tmux, with no attached client, or when the query
+ * fails. Nested tmux usually reports no `Sxl`: the inner client's terminal is
+ * the outer tmux, whose DA1 starts with level 1, which tmux does not parse
+ * for features.
+ */
+export function tmuxClientRendersSixel(env: NodeJS.ProcessEnv = Bun.env): boolean {
+	const tmux = env.TMUX;
+	if (!tmux) return false;
+	if (cachedClientSixel?.tmux !== tmux) cachedClientSixel = { tmux, renders: queryTmuxClientRendersSixel(env) };
+	return cachedClientSixel.renders;
+}
+
+let cachedPanePassthrough: { key: string; allowed: boolean } | undefined;
+
+function queryTmuxPaneAllowsPassthrough(env: NodeJS.ProcessEnv): boolean {
+	const pane = env.TMUX_PANE;
+	const target = pane ? ["-t", pane] : [];
+	const value = runTmux(["show-options", "-Apqv", ...target, "allow-passthrough"], env)?.trim();
+	if (value === undefined) return false;
+	// tmux before 3.3 has no `allow-passthrough` option (`-q` prints nothing)
+	// and always forwards DCS passthrough.
+	return value === "" || value === "on" || value === "all";
+}
+
+/**
+ * Whether tmux forwards this pane's `\x1bPtmux;…\x1b\\` passthrough envelopes
+ * to the attached client. tmux 3.3+ defaults `allow-passthrough` to `off` and
+ * then silently drops every wrapped sequence, so Kitty graphics sent through
+ * the envelope never reach a Kitty-capable outer terminal. Resolves the
+ * effective pane value (pane → window → global). Queried once per pane;
+ * `false` outside tmux or when the query fails.
+ */
+export function tmuxPaneAllowsPassthrough(env: NodeJS.ProcessEnv = Bun.env): boolean {
+	const tmux = env.TMUX;
+	if (!tmux) return false;
+	const key = `${tmux}\0${env.TMUX_PANE ?? ""}`;
+	if (cachedPanePassthrough?.key !== key) {
+		cachedPanePassthrough = { key, allowed: queryTmuxPaneAllowsPassthrough(env) };
+	}
+	return cachedPanePassthrough.allowed;
 }

package/src/tools/ask.ts

@@ -23,6 +23,7 @@ import { getMarkdownTheme, type Theme } from "../theme/theme";
 
 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 { tuiText, tuiTextFmt } from "../i18n";
@@ -203,20 +204,27 @@ export function optionMarker(uiTheme: Theme, multi: boolean | undefined, selecte
 	return selected ? uiTheme.radio.selected : uiTheme.radio.unselected;
 }
 
+function wrapOptionLabel(marker: string, label: string, width: number): string[] {
+	const prefix = ` ${marker} `;
+	return wrapPrefixedLine(prefix, " ".repeat(visibleWidth(prefix)), label, width);
+}
+
 /** Render the offered options for a question form as flat marker bullets (no tree guides). */
 function renderQuestionOptionLines(
 	uiTheme: Theme,
 	mdTheme: MarkdownTheme,
 	options: AskRenderOption[],
 	multi: boolean | undefined,
+	width: number,
 ): string[] {
 	const out: string[] = [];
 	for (const opt of options) {
 		const optLabel = renderInlineMarkdown(opt.label, mdTheme, t => uiTheme.fg("muted", t));
-		out.push(` ${uiTheme.fg("dim", optionMarker(uiTheme, multi, false))} ${optLabel}`);
+		out.push(...wrapOptionLabel(uiTheme.fg("dim", optionMarker(uiTheme, multi, false)), optLabel, width));
 		if (opt.description?.trim()) {
 			const description = renderInlineMarkdown(opt.description.trim(), mdTheme, t => uiTheme.fg("dim", t));
-			out.push(`   ${uiTheme.fg("dim", "↳")} ${description}`);
+			const prefix = `   ${uiTheme.fg("dim", "↳")} `;
+			out.push(...wrapPrefixedLine(prefix, " ".repeat(visibleWidth(prefix)), description, width));
 		}
 	}
 	return out;
@@ -261,6 +269,7 @@ function renderAnswerOptionLines(
 	customInput: string | undefined,
 	note: string | undefined,
 	width: number,
+	contentWidth: number,
 	selectedIndices?: ReadonlySet<number>,
 ): string[] {
 	const selected = new Set(selectedOptions ?? []);
@@ -283,7 +292,7 @@ function renderAnswerOptionLines(
 		const labelStyled = renderInlineMarkdown(label, mdTheme, t =>
 			isSelected ? uiTheme.fg("toolOutput", t) : uiTheme.fg("muted", t),
 		);
-		out.push(` ${markerStyled} ${labelStyled}`);
+		out.push(...wrapOptionLabel(markerStyled, labelStyled, contentWidth));
 	}
 	if (customInput !== undefined) out.push(...renderCustomInputLines(uiTheme, customInput));
 	if (note !== undefined) out.push(...renderNoteLines(uiTheme, note, width));
@@ -461,7 +470,7 @@ export const askToolRenderer = {
 					? tuiText("askQuestionOne", "1 question")
 					: tuiTextFmt("askQuestionManyFmt", "%d questions", questions.length),
 			)}`;
-			return framedToolCard(uiTheme, ({ width }) => {
+			return framedToolCard(uiTheme, ({ width, contentWidth }) => {
 				const sections = questions.map(q => {
 					const meta: string[] = [];
 					if (q.multi) meta.push(tuiText("askMultiMeta", "multi"));
@@ -470,7 +479,7 @@ export const askToolRenderer = {
 					// md() returns a shared cached array (module-level Markdown LRU) — copy before appending.
 					const mdLines = md(q.question, width);
 					const lines = q.options?.length
-						? [...mdLines, ...renderQuestionOptionLines(uiTheme, mdTheme, q.options, q.multi)]
+						? [...mdLines, ...renderQuestionOptionLines(uiTheme, mdTheme, q.options, q.multi, contentWidth)]
 						: mdLines;
 					return { label: `${uiTheme.fg("dim", `[${q.id}]`)}${metaStr}`, content: lines };
 				});
@@ -496,11 +505,11 @@ export const askToolRenderer = {
 		if (questionOptions?.length) meta.push(`options:${questionOptions.length}`);
 		const header = `${label}${formatMeta(meta, uiTheme)}`;
 		const multi = args.multi;
-		return framedToolCard(uiTheme, ({ width }) => {
+		return framedToolCard(uiTheme, ({ width, contentWidth }) => {
 			// md() returns a shared cached array (module-level Markdown LRU) — copy before appending.
 			const mdLines = md(question, width);
 			const bodyLines = questionOptions?.length
-				? [...mdLines, ...renderQuestionOptionLines(uiTheme, mdTheme, questionOptions, multi)]
+				? [...mdLines, ...renderQuestionOptionLines(uiTheme, mdTheme, questionOptions, multi, contentWidth)]
 				: mdLines;
 			return {
 				header,
@@ -570,7 +579,7 @@ export const askToolRenderer = {
 				},
 				uiTheme,
 			);
-			return framedToolCard(uiTheme, ({ width }) => {
+			return framedToolCard(uiTheme, ({ width, contentWidth }) => {
 				const rawResults = rawDetails.results ?? [];
 				const sections = results.map((r, index) => {
 					// Sanitizing preserves order and length, so raw indices align with `r`.
@@ -587,6 +596,7 @@ export const askToolRenderer = {
 							r.customInput,
 							r.note,
 							width,
+							contentWidth,
 							selectedIndicesFor(raw?.options, raw?.selectedOptions),
 						),
 					];
@@ -625,7 +635,7 @@ export const askToolRenderer = {
 		const dCustom = details.customInput;
 		const dNote = details.note;
 		const dTimedOut = details.timedOut;
-		return framedToolCard(uiTheme, ({ width }) => {
+		return framedToolCard(uiTheme, ({ width, contentWidth }) => {
 			// md() returns a shared cached array (module-level Markdown LRU) — copy before appending.
 			const bodyLines = [
 				...md(question, width),
@@ -638,6 +648,7 @@ export const askToolRenderer = {
 					dCustom,
 					dNote,
 					width,
+					contentWidth,
 					selectedIndicesFor(rawDetails.options, rawDetails.selectedOptions),
 				),
 			];

package/src/tools/ast-edit.d.ts

@@ -1,7 +1,7 @@
 import type { Component } from "../tui";
 import type { Theme } from "../theme/theme";
 import type { OutputMeta } from "./output-meta";
-import type { NativeToolView, RenderResultOptions } from "./renderer";
+import type { NativeToolView, RenderResultContextOptions, RenderResultOptions } from "./renderer";
 /** Display metadata returned by ast-edit. */
 export interface AstEditToolDetails {
     totalReplacements: number;
@@ -47,7 +47,7 @@ export declare const astEditToolRenderer: {
         }>;
         details?: AstEditToolDetails;
         isError?: boolean;
-    }, options: RenderResultOptions, uiTheme: Theme, args?: AstEditRenderArgs): Component;
+    }, options: RenderResultContextOptions, uiTheme: Theme, args?: AstEditRenderArgs): Component;
     describeCall(args: AstEditRenderArgs): NativeToolView;
     describeResult(result: {
         content: Array<{

package/src/tools/ast-edit.ts

@@ -1,3 +1,4 @@
+import { isRecord, sanitizeText } from "@linxiraos/pi-utils";
 import type { Component } from "../tui";
 import { Text } from "../components/text";
 import { replaceTabs } from "../utils";
@@ -14,11 +15,16 @@ import {
 } from "../render/render-utils";
 import { classifyGroupedLines, groupLineIndicesByBlank } from "./grouped-file-output";
 import type { OutputMeta } from "./output-meta";
-import type { NativeToolHead, NativeToolView, RenderResultOptions, ToolRenderer } from "./renderer";
+import type {
+	NativeToolHead,
+	NativeToolView,
+	RenderResultContextOptions,
+	RenderResultOptions,
+	ToolRenderer,
+} from "./renderer";
 import { code, compact, diff, node, span, text } from "../native/describe";
 import type { NativeChild, NativeNode } from "../native/node";
 import { diffStatsMeta, displayPath, errorText, fileDiffSection, noteText, resultText, statsText } from "./native-view";
-import { getLanguageFromPath } from "../lang-from-path";
 
 /** Display metadata returned by ast-edit. */
 export interface AstEditToolDetails {
@@ -148,9 +154,9 @@ function parseAstEditChanges(lines: readonly string[]): AstEditFileDiff[] {
 	return files;
 }
 
-/** A file's proposed rewrite as a `diff`: highlighted by the path's language, no path header. */
+/** A file's proposed rewrite as a `diff`: Tern highlights it by the file's grammar and draws no path header. */
 function astEditDiff(file: AstEditFileDiff): NativeNode {
-	return diff(file.lines.join("\n"), { lang: getLanguageFromPath(file.path) });
+	return diff(file.lines.join("\n"), { path: file.path });
 }
 
 /** The single rewrite pattern (`target:"pattern"`), or the rewrite count, for the head. */
@@ -190,7 +196,7 @@ export const astEditToolRenderer = {
 
 	renderResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: AstEditToolDetails; isError?: boolean },
-		options: RenderResultOptions,
+		options: RenderResultContextOptions,
 		uiTheme: Theme,
 		args?: AstEditRenderArgs,
 	): Component {
@@ -245,6 +251,19 @@ export const astEditToolRenderer = {
 		// Resolve hyperlinks over the whole output so nested directory headers
 		// reconstruct across the blank-line groups the tree list collapses by.
 		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 => {
@@ -255,12 +274,16 @@ export const astEditToolRenderer = {
 			// 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 = ctx.headerPath ? fileHyperlink(ctx.headerPath, accent) : accent;
+				styled = linkPath ? fileHyperlink(linkPath, accent) : accent;
 			} else if (ctx.kind === "file") {
 				const tinted = uiTheme.fg(ctx.depth === 1 ? "accent" : "dim", display);
-				styled = ctx.headerPath ? fileHyperlink(ctx.headerPath, tinted) : tinted;
+				styled = linkPath ? fileHyperlink(linkPath, tinted) : tinted;
 			} else if (display.startsWith("+")) {
 				styled = uiTheme.fg("toolDiffAdded", display);
 			} else if (display.startsWith("-")) {

package/src/tools/ast-grep.d.ts

@@ -1,7 +1,7 @@
 import type { Component } from "../tui";
 import type { Theme } from "../theme/theme";
 import type { OutputMeta } from "./output-meta";
-import type { RenderResultOptions, NativeToolView } from "./renderer";
+import type { NativeToolView, RenderResultContextOptions, RenderResultOptions } from "./renderer";
 /** Display metadata returned by ast-grep. */
 export interface AstGrepToolDetails {
     matchCount: number;
@@ -46,7 +46,7 @@ export declare const astGrepToolRenderer: {
         }>;
         details?: AstGrepToolDetails;
         isError?: boolean;
-    }, options: RenderResultOptions, uiTheme: Theme, args?: AstGrepRenderArgs): Component;
+    }, options: RenderResultContextOptions, uiTheme: Theme, args?: AstGrepRenderArgs): Component;
     describeCall(args: AstGrepRenderArgs): NativeToolView;
     describeResult(result: {
         content: Array<{

package/src/tools/ast-grep.ts

@@ -1,3 +1,4 @@
+import { isRecord, sanitizeText } from "@linxiraos/pi-utils";
 import type { Component } from "../tui";
 import { Text } from "../components/text";
 import type { Theme } from "../theme/theme";
@@ -13,13 +14,11 @@ import {
 	toPathList,
 } from "../render/render-utils";
 import { classifyGroupedLines, describeGroupedOutput, groupLineIndicesByBlank } from "./grouped-file-output";
-import { getLanguageFromPath } from "../lang-from-path";
 import { code, compact, node, span } from "../native/describe";
 import type { NativeChild } from "../native/node";
 import { errorText, noteText, resultText, toolHead } from "./native-view";
 import type { OutputMeta } from "./output-meta";
-import { tuiText, tuiTextFmt } from "../i18n";
-import type { RenderResultOptions, ToolRenderer, NativeToolView } from "./renderer";
+import type { NativeToolView, RenderResultContextOptions, RenderResultOptions, ToolRenderer } from "./renderer";
 
 /** Display metadata returned by ast-grep. */
 export interface AstGrepToolDetails {
@@ -61,8 +60,7 @@ export const astGrepToolRenderer = {
 	renderCall(args: AstGrepRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const meta: string[] = [];
 		const scopePaths = toPathList(args.path ?? args.paths);
-		if (scopePaths.length)
-			meta.push(tuiTextFmt("gpInLabelFmt", `in ${scopePaths.join(", ")}`, scopePaths.join(", ")));
+		if (scopePaths.length) meta.push(`in ${scopePaths.join(", ")}`);
 		if (args.skip !== undefined && args.skip > 0) meta.push(`skip:${args.skip}`);
 
 		const description = args.pat ?? "?";
@@ -72,15 +70,14 @@ export const astGrepToolRenderer = {
 
 	renderResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: AstGrepToolDetails; isError?: boolean },
-		options: RenderResultOptions,
+		options: RenderResultContextOptions,
 		uiTheme: Theme,
 		args?: AstGrepRenderArgs,
 	): Component {
 		const details = result.details;
 
 		if (result.isError) {
-			const errorText =
-				result.content?.find(c => c.type === "text")?.text || tuiText("glUnknownError", "Unknown error");
+			const errorText = result.content?.find(c => c.type === "text")?.text || "Unknown error";
 			return new Text(formatErrorMessage(errorText, uiTheme), 0, 0);
 		}
 
@@ -91,33 +88,23 @@ export const astGrepToolRenderer = {
 
 		if (matchCount === 0) {
 			const description = args?.pat;
-			const meta = [tuiText("agrpZeroMatches", "0 matches")];
-			if (details?.scopePath) meta.push(tuiTextFmt("gpInLabelFmt", `in ${details.scopePath}`, details.scopePath));
-			if (filesSearched > 0) meta.push(tuiTextFmt("agrpSearchedFmt", `searched ${filesSearched}`, filesSearched));
+			const meta = ["0 matches"];
+			if (details?.scopePath) meta.push(`in ${details.scopePath}`);
+			if (filesSearched > 0) meta.push(`searched ${filesSearched}`);
 			const header = renderStatusLine({ icon: "warning", title: "AST Grep", description, meta }, uiTheme);
-			const lines = [header, formatEmptyMessage(tuiText("agrpNoMatches", "No matches found"), uiTheme)];
+			const lines = [header, formatEmptyMessage("No matches found", uiTheme)];
 			if (details?.parseErrors?.length) {
-				lines.push(
-					uiTheme.fg(
-						"warning",
-						tuiText("agrpMisScoped", "Query may be mis-scoped; narrow `path` before concluding absence"),
-					),
-				);
+				lines.push(uiTheme.fg("warning", "Query may be mis-scoped; narrow `path` before concluding absence"));
 				appendParseErrorsBulletList(lines, details.parseErrors, uiTheme, details.parseErrorsTotal);
 			}
 			return new Text(lines.join("\n"), 0, 0);
 		}
 
-		const matchMeta =
-			matchCount === 1
-				? tuiText("agrpMatchOne", "1 match")
-				: tuiTextFmt("agrpMatchManyFmt", "%d matches", matchCount);
-		const fileMeta =
-			fileCount === 1 ? tuiText("agrpFileOne", "1 file") : tuiTextFmt("agrpFileManyFmt", "%d files", fileCount);
-		const meta = [matchMeta, fileMeta];
-		if (details?.scopePath) meta.push(tuiTextFmt("gpInLabelFmt", `in ${details.scopePath}`, details.scopePath));
-		meta.push(tuiTextFmt("agrpSearchedFmt", `searched ${filesSearched}`, filesSearched));
-		if (limitReached) meta.push(uiTheme.fg("warning", tuiText("tLimitReached", "limit reached")));
+		const summaryParts = [formatCount("match", matchCount), formatCount("file", fileCount)];
+		const meta = [...summaryParts];
+		if (details?.scopePath) meta.push(`in ${details.scopePath}`);
+		meta.push(`searched ${filesSearched}`);
+		if (limitReached) meta.push(uiTheme.fg("warning", "limit reached"));
 		const description = args?.pat;
 		const header = renderStatusLine(
 			{
@@ -136,6 +123,20 @@ export const astGrepToolRenderer = {
 		// Resolve hyperlinks over the whole output so nested directory headers
 		// reconstruct across the blank-line groups the tree list collapses by.
 		const contexts = classifyGroupedLines(allLines, details?.cwd ?? details?.searchPath, details?.searchPath);
+		// The displayed lines are sanitized, but OSC 8 destinations must retain the
+		// original path bytes. Only substitute targets for headers already linked
+		// by the sanitized output; never let raw text create additional links.
+		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: the collapsed tree list only renders the first few groups,
 		// so a large result never styles/hyperlinks rows nobody sees.
 		const styledLines: (string | undefined)[] = Array.from({ length: allLines.length }, () => undefined);
@@ -144,13 +145,18 @@ export const astGrepToolRenderer = {
 			if (cached !== undefined) return cached;
 			const line = allLines[index]!;
 			const ctx = contexts[index]!;
+			const rawContext = rawContexts?.[index];
+			const target =
+				ctx.headerPath && rawContext?.kind === ctx.kind && rawContext.depth === ctx.depth
+					? (rawContext.headerPath ?? ctx.headerPath)
+					: ctx.headerPath;
 			let styled: string;
 			if (ctx.kind === "dir") {
 				const accent = uiTheme.fg("accent", line);
-				styled = ctx.headerPath ? fileHyperlink(ctx.headerPath, accent) : accent;
+				styled = target ? fileHyperlink(target, accent) : accent;
 			} else if (ctx.kind === "file") {
 				const tinted = uiTheme.fg(ctx.depth === 1 ? "accent" : "dim", line);
-				styled = ctx.headerPath ? fileHyperlink(ctx.headerPath, tinted) : tinted;
+				styled = target ? fileHyperlink(target, tinted) : tinted;
 			} else {
 				styled = uiTheme.fg(line.startsWith("  meta:") ? "dim" : "toolOutput", line);
 			}
@@ -174,9 +180,7 @@ export const astGrepToolRenderer = {
 
 		const extraLines: string[] = [];
 		if (limitReached) {
-			extraLines.push(
-				uiTheme.fg("warning", tuiText("agrpLimitNarrowPath", "limit reached; narrow path or increase limit")),
-			);
+			extraLines.push(uiTheme.fg("warning", "limit reached; narrow path or use skip"));
 		}
 		if (details?.parseErrors?.length) {
 			extraLines.push(
@@ -274,8 +278,8 @@ export const astGrepToolRenderer = {
 		return {
 			head,
 			body: compact<NativeChild>([
-				...describeGroupedOutput(kept, { lang: getLanguageFromPath }),
-				limitReached && noteText("limit reached; narrow path or increase limit", "warning"),
+				...describeGroupedOutput(kept),
+				limitReached && noteText("limit reached; narrow path or use skip", "warning"),
 				parseNote,
 			]),
 			preview: { lines: COLLAPSED_MATCH_LIMIT },

package/src/tools/bash.d.ts

@@ -18,6 +18,8 @@ export interface BashToolDetails {
     requestedTimeoutSeconds?: number;
     timeoutDisabled?: boolean;
     wallTimeMs?: number;
+    /** False when no wall-time footer was emitted; absent on older results. */
+    wallTimeNoticeEmitted?: boolean;
     /** Exit code of a command that ran to completion but failed (non-zero). */
     exitCode?: number;
     /** True when the command was killed by its timeout deadline (not a failure). */
@@ -31,12 +33,15 @@ export interface BashToolDetails {
         timedOut: boolean;
         pid?: number;
     };
+    /** Background job behind the call; `cancelled`: killed (`proc://<id>/kill`) before it finished. */
     async?: {
-        state: "running" | "completed" | "failed";
+        state: "running" | "completed" | "failed" | "cancelled";
         jobId: string;
         type: "bash";
     };
 }
+/** Minimum duration for a model-facing wall-time notice; shorter runs keep timing only in details. */
+export declare const WALL_TIME_NOTICE_MIN_MS = 1000;
 /** Formats the model-facing command duration notice. */
 export declare function formatWallTimeNotice(wallTimeMs: number): string;
 /** Formats the model-facing command exit status notice. */