@heyhuynhgiabuu/pi-pretty 0.6.6 → 0.6.8

package/src/render.ts

@@ -7,22 +7,48 @@
 
 import type { BundledLanguage } from "shiki";
 import { codeToANSI } from "@shikijs/cli";
-import { truncateToWidth } from "@earendil-works/pi-tui";
 import { basename, dirname } from "node:path";
 
 import {
-	RST, FG_LNUM, FG_DIM, FG_RULE, FG_GREEN, FG_RED, FG_YELLOW, FG_BLUE,
-	BG_BASE, BG_ERROR,
-	dirIcon, detectLang, termWidth, MAX_PREVIEW_LINES, MAX_HL_CHARS, CACHE_LIMIT,
+	RST,
+	FG_LNUM,
+	FG_DIM,
+	FG_RULE,
+	FG_GREEN,
+	FG_RED,
+	FG_YELLOW,
+	FG_BLUE,
+	BG_BASE,
+	BG_ERROR,
+	dirIcon,
+	detectLang,
+	termWidth,
+	MAX_PREVIEW_LINES,
+	MAX_HL_CHARS,
+	CACHE_LIMIT,
 	resolveBaseBackground,
 } from "./config.js";
 import {
-	normalizeLineEndings, humanSize, formatElapsedMs, formatCharCount,
-	ELAPSED_KEY, CHARS_KEY, compactErrorLines,
+	normalizeLineEndings,
+	humanSize,
+	formatElapsedMs,
+	formatCharCount,
+	ELAPSED_KEY,
+	CHARS_KEY,
+	compactErrorLines,
 } from "./helpers.js";
 import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
 import type { ThemeLike, RenderCtxLike as RenderContext } from "./types.js";
 
+// ---------------------------------------------------------------------------
+// Lazy imports — avoid top-level require() that blocks module loading
+// ---------------------------------------------------------------------------
+
+/** Lazy accessor to pi-tui's truncateToWidth */
+function _truncateToWidth(text: string, maxWidth: number, ellipsis?: string, pad?: boolean): string {
+	return require("@earendil-works/pi-tui").truncateToWidth(text, maxWidth, ellipsis, pad);
+}
+
 // ---------------------------------------------------------------------------
 // Shiki ANSI cache
 // ---------------------------------------------------------------------------
@@ -113,9 +139,15 @@ export function preserveBoxBackground(ansi: string): string {
 			if (code === 38) {
 				// Foreground extended — keep entire sequence
 				kept.push(parts[i]);
-				if (parts[i + 1] === "5") { kept.push(parts[i + 1]); i += 2; }
-				else if (parts[i + 1] === "2") { kept.push(parts[i + 1], parts[i + 2], parts[i + 3], parts[i + 4]); i += 5; }
-				else { i++; }
+				if (parts[i + 1] === "5") {
+					kept.push(parts[i + 1]);
+					i += 2;
+				} else if (parts[i + 1] === "2") {
+					kept.push(parts[i + 1], parts[i + 2], parts[i + 3], parts[i + 4]);
+					i += 5;
+				} else {
+					i++;
+				}
 			} else if (code === 48) {
 				// Background extended — skip entirely
 				if (parts[i + 1] === "5") i += 3;
@@ -136,7 +168,7 @@ export function fillToolBackground(text: string, bg = BG_BASE, width?: number):
 	return text
 		.split("\n")
 		.map((line) => {
-			const fitted = width ? truncateToWidth(line, width, "") : line;
+			const fitted = width ? _truncateToWidth(line, width, "") : line;
 			const stripped = preserveBoxBackground(fitted);
 			// Apply background to the entire line
 			return bg ? bg + stripped : stripped;
@@ -198,7 +230,7 @@ export async function renderFileContent(
 
 	const out: string[] = [];
 	for (const line of hl) {
-		out.push(truncateToWidth(line ?? "", Math.max(1, tw), `${FG_DIM}›`));
+		out.push(_truncateToWidth(line ?? "", Math.max(1, tw), `${FG_DIM}›`));
 	}
 	return out.join("\n");
 }
@@ -210,9 +242,10 @@ export async function renderFileContent(
 export function renderBashOutput(text: string, exitCode: number | null): { summary: string; body: string } {
 	const isOk = exitCode === 0;
 	const statusIcon = isOk ? "✓" : "✗";
-	const codeStr = exitCode !== null
-		? `${isOk ? FG_GREEN : FG_RED}${statusIcon} exit ${exitCode}${RST}`
-		: `${FG_YELLOW}⚡ killed${RST}`;
+	const codeStr =
+		exitCode !== null
+			? `${isOk ? FG_GREEN : FG_RED}${statusIcon} exit ${exitCode}${RST}`
+			: `${FG_YELLOW}⚡ killed${RST}`;
 
 	const lines = text.split("\n");
 	const maxShow = MAX_PREVIEW_LINES;
@@ -255,44 +288,46 @@ export function renderTree(text: string, _basePath: string): string {
 	return out.join("\n");
 }
 
-    // ---------------------------------------------------------------------------
-    // Find — grouped file list (plain, no tree characters or icons)
-    // ---------------------------------------------------------------------------
-    
-    export function renderFindResults(text: string, theme?: ThemeLike): string {
-    	const lines = text.trim().split("\n").filter(Boolean);
-    	if (!lines.length) return theme ? theme.fg("dim", "(no matches)") : `${FG_DIM}(no matches)${RST}`;
-    
-    	const groups = new Map<string, string[]>();
-    	for (const line of lines) {
-    		const trimmed = line.trim();
-    		const dir = dirname(trimmed) || ".";
-    		const file = basename(trimmed);
-    		if (!groups.has(dir)) groups.set(dir, []);
-    		const bucket = groups.get(dir);
-    		if (bucket) bucket.push(file);
-    	}
-    
-    	const out: string[] = [];
-    	let count = 0;
-    
-    	for (const [dir, files] of groups) {
-    		if (count > 0) out.push("");
-    		const dirColored = theme ? theme.fg("accent", theme.bold(`${dir}/`)) : `${FG_BLUE}\x1b[1m${dir}/${RST}`;
-    		out.push(dirColored);
-    		for (let i = 0; i < files.length; i++) {
-    			if (count >= MAX_PREVIEW_LINES) {
-    				const more = theme ? theme.fg("dim", `… ${lines.length - count} more files`) : `${FG_DIM}… ${lines.length - count} more files${RST}`;
-    				out.push(`  ${more}`);
-    				return out.join("\n");
-    			}
-    		out.push(`  ${files[i]}`);
-    		count++;
-    	}
-    	}
-    
-            	return out.join("\n");
-            }
+// ---------------------------------------------------------------------------
+// Find — grouped file list (plain, no tree characters or icons)
+// ---------------------------------------------------------------------------
+
+export function renderFindResults(text: string, theme?: ThemeLike): string {
+	const lines = text.trim().split("\n").filter(Boolean);
+	if (!lines.length) return theme ? theme.fg("dim", "(no matches)") : `${FG_DIM}(no matches)${RST}`;
+
+	const groups = new Map<string, string[]>();
+	for (const line of lines) {
+		const trimmed = line.trim();
+		const dir = dirname(trimmed) || ".";
+		const file = basename(trimmed);
+		if (!groups.has(dir)) groups.set(dir, []);
+		const bucket = groups.get(dir);
+		if (bucket) bucket.push(file);
+	}
+
+	const out: string[] = [];
+	let count = 0;
+
+	for (const [dir, files] of groups) {
+		if (count > 0) out.push("");
+		const dirColored = theme ? theme.fg("accent", theme.bold(`${dir}/`)) : `${FG_BLUE}\x1b[1m${dir}/${RST}`;
+		out.push(dirColored);
+		for (let i = 0; i < files.length; i++) {
+			if (count >= MAX_PREVIEW_LINES) {
+				const more = theme
+					? theme.fg("dim", `… ${lines.length - count} more files`)
+					: `${FG_DIM}… ${lines.length - count} more files${RST}`;
+				out.push(`  ${more}`);
+				return out.join("\n");
+			}
+			out.push(`  ${files[i]}`);
+			count++;
+		}
+	}
+
+	return out.join("\n");
+}
 
 // ---------------------------------------------------------------------------
 // Grep — highlighted matches with line numbers
@@ -309,7 +344,9 @@ export async function renderGrepResults(text: string, pattern: string): Promise<
 	let re: RegExp | null = null;
 	try {
 		re = new RegExp(`(${pattern})`, "gi");
-	} catch { /* skip highlighting */ }
+	} catch {
+		/* skip highlighting */
+	}
 
 	for (const line of lines) {
 		if (count >= MAX_PREVIEW_LINES) {

package/src/tools/bash.ts

@@ -1,10 +1,25 @@
 /* pi-pretty: bash tool -- command execution with styled output. */
 
-import { type ToolDefinition, type ExtensionAPI, type ExtensionContext, type AgentToolResult } from "@earendil-works/pi-coding-agent";
+import {
+	type ToolDefinition,
+	type ExtensionAPI,
+	type ExtensionContext,
+	type AgentToolResult,
+} from "@earendil-works/pi-coding-agent";
 import type { SdkToolDef, BashDetails, TextContent, ComponentLike, ThemeLike, RenderCtxLike } from "../types.js";
-import { resolveBaseBackground, termWidth, MAX_PREVIEW_LINES, BG_BASE, BG_ERROR, FG_DIM, FG_RULE, RST } from "../config.js";
+import {
+	resolveBaseBackground,
+	termWidth,
+	MAX_PREVIEW_LINES,
+	BG_BASE,
+	BG_ERROR,
+	FG_DIM,
+	FG_RULE,
+	RST,
+} from "../config.js";
 import { wrapExecuteWithMetrics } from "./metrics.js";
 import { renderBashOutput, renderToolError, renderToolMetrics, fillToolBackground } from "../render.js";
+import { resolveTextCtor } from "../tui-text.js";
 import { stripBashExitStatusLine, inferBashExitCode, compactErrorLines } from "../helpers.js";
 
 type Result = AgentToolResult<Record<string, unknown>>;
@@ -16,10 +31,7 @@ export function registerBashTool(
 	sdkTool: SdkToolDef,
 	TextComp?: new (t?: string, x?: number, y?: number) => { setText(v: string): void },
 ): void {
-	const TC = TextComp ?? (() => {
-		const { Text } = require("@earendil-works/pi-tui") as { Text: new (t?: string, x?: number, y?: number) => { setText(v: string): void } };
-		return Text;
-	})();
+	const TC = resolveTextCtor(TextComp);
 
 	pi.registerTool({
 		name: "bash",
@@ -30,10 +42,19 @@ export function registerBashTool(
 
 		execute: wrapExecuteWithMetrics(async (tid, params, sig, _upd, ctx: ExtensionContext) => {
 			try {
-				return await sdkTool.execute(tid, params, sig, undefined, ctx) as Result;
+				return (await sdkTool.execute(tid, params, sig, undefined, ctx)) as Result;
 			} catch (error: unknown) {
 				const msg = error instanceof Error ? error.message : String(error);
-				return { content: [{ type: "text" as const, text: msg }], isError: true, details: { _type: "bashResult", text: msg, exitCode: 1, command: String((params as any).command ?? "") } as BashDetails };
+				return {
+					content: [{ type: "text" as const, text: msg }],
+					isError: true,
+					details: {
+						_type: "bashResult",
+						text: msg,
+						exitCode: 1,
+						command: String((params as any).command ?? ""),
+					} as BashDetails,
+				};
 			}
 		}),
 
@@ -43,23 +64,40 @@ export function registerBashTool(
 			const t = typeof args.timeout === "number" ? ` ${theme.fg("muted", `(timeout ${args.timeout}s)`)}` : "";
 			const tw = termWidth() || 80;
 			const rawCmd = String(args.command ?? "");
-			const cmd = rawCmd.length === 0 ? theme.fg("toolOutput", "...") : (rawCmd.length > tw - 20 ? rawCmd.slice(0, Math.max(1, tw - 20)) + "…" : rawCmd);
+			const cmd =
+				rawCmd.length === 0
+					? theme.fg("toolOutput", "...")
+					: rawCmd.length > tw - 20
+						? rawCmd.slice(0, Math.max(1, tw - 20)) + "…"
+						: rawCmd;
 			const toolWidth = ctx.expanded ? undefined : tw;
-			text.setText(fillToolBackground(`\n  ${theme.fg("toolTitle", theme.bold(`$ ${cmd}`))}${t}`, ctx.isError ? BG_ERROR : undefined, toolWidth));
+			text.setText(
+				fillToolBackground(
+					`\n  ${theme.fg("toolTitle", theme.bold(`$ ${cmd}`))}${t}`,
+					ctx.isError ? BG_ERROR : undefined,
+					toolWidth,
+				),
+			);
 			return text;
 		},
 
 		renderResult(result: Result, _opt: unknown, theme: ThemeLike, ctx: RenderCtxLike) {
 			resolveBaseBackground(theme);
-			
+
 			const text = ctx.lastComponent ?? new TC("", 0, 0);
 
 			const details = result.details;
 			const tc = getText(result);
 			const d: BashDetails | undefined =
-				(details as BashDetails)?._type === "bashResult" ? details as BashDetails
+				(details as BashDetails)?._type === "bashResult"
+					? (details as BashDetails)
 					: tc || ctx.isError
-						? { _type: "bashResult", text: tc || "Error", exitCode: inferBashExitCode(tc, ctx.isError ? 1 : 0), command: "" }
+						? {
+								_type: "bashResult",
+								text: tc || "Error",
+								exitCode: inferBashExitCode(tc, ctx.isError ? 1 : 0),
+								command: "",
+							}
 						: undefined;
 
 			if (d?._type === "bashResult") {
@@ -69,7 +107,10 @@ export function registerBashTool(
 				const output = isErr ? compactErrorLines(cleaned).join("\n") : cleaned;
 				const { summary } = renderBashOutput(output, d.exitCode);
 				const lineCount = output.split("\n").length;
-				const info = lineCount > 1 ? `  ${FG_DIM}(${lineCount} lines)${RST} ${renderToolMetrics(result)}` : ` ${renderToolMetrics(result)}`;
+				const info =
+					lineCount > 1
+						? `  ${FG_DIM}(${lineCount} lines)${RST} ${renderToolMetrics(result)}`
+						: ` ${renderToolMetrics(result)}`;
 				const header = `  ${summary}${info}`;
 				const rw = termWidth();
 
@@ -83,30 +124,44 @@ export function registerBashTool(
 				};
 
 				text.setText(renderFn(rw));
-				const baseRender = typeof (text as ComponentLike).render === "function"
-					? (text as ComponentLike).render.bind(text)
-					: null;
+				const baseRender =
+					typeof (text as ComponentLike).render === "function" ? (text as ComponentLike).render.bind(text) : null;
 				if (baseRender) {
 					let key: string | undefined;
 					(text as unknown as Record<string, unknown>).render = (w: number) => {
 						const width = Math.max(1, Math.floor(w || termWidth()));
 						const k = `bash:${ctx.expanded ? "1" : "0"}:${width}:${d.exitCode ?? "killed"}:${output.length}:${renderToolMetrics(result)}`;
-						if (key !== k) { text.setText(renderFn(width)); key = k; }
+						if (key !== k) {
+							text.setText(renderFn(width));
+							key = k;
+						}
 						return baseRender(width);
 					};
 				}
 				return text;
 			}
 
-			if (ctx.isError) { text.setText(renderToolError(tc || "Error", theme)); return text; }
+			if (ctx.isError) {
+				text.setText(renderToolError(tc || "Error", theme));
+				return text;
+			}
 			const fc = result.content?.[0];
-			text.setText(fillToolBackground(`  ${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "done")}`));
+			text.setText(
+				fillToolBackground(`  ${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "done")}`),
+			);
 			return text;
 		},
 	} as unknown as ToolDefinition<any, any, any>);
 }
 
-function rule(w: number): string { return `${FG_RULE}${"\u2500".repeat(w)}${RST}`; }
+function rule(w: number): string {
+	return `${FG_RULE}${"\u2500".repeat(w)}${RST}`;
+}
 function getText(result: Result): string {
-	return ((result.content ?? []) as TextContent[]).filter((c) => c.type === "text").map((c) => c.text).join("\n") ?? "";
+	return (
+		((result.content ?? []) as TextContent[])
+			.filter((c) => c.type === "text")
+			.map((c) => c.text)
+			.join("\n") ?? ""
+	);
 }

package/src/tools/find.ts

@@ -1,12 +1,27 @@
 /* pi-pretty: find tool -- FFF-backed file search with SDK fallback. */
 
-import { type ToolDefinition, type ExtensionAPI, type ExtensionContext, type AgentToolResult } from "@earendil-works/pi-coding-agent";
+import {
+	type ToolDefinition,
+	type ExtensionAPI,
+	type ExtensionContext,
+	type AgentToolResult,
+} from "@earendil-works/pi-coding-agent";
 import { isAbsolute, relative as toRelative } from "node:path";
-import type { SdkToolDef, FindDetails, FffServiceLike, FileItem, TextContent, ThemeLike, RenderCtxLike, ComponentLike } from "../types.js";
+import type {
+	SdkToolDef,
+	FindDetails,
+	FffServiceLike,
+	FileItem,
+	TextContent,
+	ThemeLike,
+	RenderCtxLike,
+	ComponentLike,
+} from "../types.js";
 import { resolveBaseBackground, BG_ERROR, FG_DIM, RST } from "../config.js";
 import { shortPath } from "../helpers.js";
 import { wrapExecuteWithMetrics } from "./metrics.js";
 import { renderFindResults, renderToolError, renderToolMetrics, fillToolBackground } from "../render.js";
+import { resolveTextCtor } from "../tui-text.js";
 import { NOTICE_PARTIAL_FILE_INDEX } from "../notices.js";
 
 type Result = AgentToolResult<Record<string, unknown>>;
@@ -18,10 +33,7 @@ export function registerFindTool(
 	sdkTool: SdkToolDef,
 	TextComp?: new (t?: string, x?: number, y?: number) => { setText(v: string): void },
 ): void {
-	if (!TextComp) {
-		const { Text } = require("@earendil-works/pi-tui") as { Text: new (t?: string, x?: number, y?: number) => { setText(v: string): void; render(w: number): string[]; invalidate(): void } };
-		TextComp = Text;
-	}
+	const TC = resolveTextCtor(TextComp);
 	const home = process.env.HOME ?? "";
 
 	pi.registerTool({
@@ -49,33 +61,49 @@ export function registerFindTool(
 					}
 					cleanPath = cleanPath.replace(/\/$/, "");
 					const cleanPattern = pattern.startsWith("/") ? pattern.slice(1) : pattern;
-					const globPattern = cleanPath
-						? `${cleanPath}/**/${cleanPattern}`
-						: `**/${cleanPattern}`;
+					const globPattern = cleanPath ? `${cleanPath}/**/${cleanPattern}` : `**/${cleanPattern}`;
 					const searchResult = fff.glob(globPattern, { pageSize: effectiveLimit });
-    					if (searchResult.ok) {
-    						const items: FileItem[] = searchResult.value.items.slice(0, effectiveLimit);
-    						const notices: string[] = [];
-    						if (fffService?.partialIndex) notices.push(NOTICE_PARTIAL_FILE_INDEX);
-    						if (items.length >= effectiveLimit) notices.push(`${effectiveLimit} limit reached`);
-    						if (searchResult.value.totalMatched > items.length) notices.push(`${searchResult.value.totalMatched} total matches`);
-    						const paths = items.map((i) => i.relativePath).join("\n");
-    						return { content: [{ type: "text" as const, text: paths }], details: { _type: "findResult", text: paths, pattern, matchCount: items.length, notices } as FindDetails };
-    					}
-				} catch { /* fall through to SDK */ }
+					if (searchResult.ok) {
+						const items: FileItem[] = searchResult.value.items.slice(0, effectiveLimit);
+						const notices: string[] = [];
+						if (fffService?.partialIndex) notices.push(NOTICE_PARTIAL_FILE_INDEX);
+						if (items.length >= effectiveLimit) notices.push(`${effectiveLimit} limit reached`);
+						if (searchResult.value.totalMatched > items.length)
+							notices.push(`${searchResult.value.totalMatched} total matches`);
+						const paths = items.map((i) => i.relativePath).join("\n");
+						return {
+							content: [{ type: "text" as const, text: paths }],
+							details: {
+								_type: "findResult",
+								text: paths,
+								pattern,
+								matchCount: items.length,
+								notices,
+							} as FindDetails,
+						};
+					}
+				} catch {
+					/* fall through to SDK */
+				}
 			}
 
-			const result = await sdkTool.execute(tid, params, sig, undefined, ctx) as Result;
+			const result = (await sdkTool.execute(tid, params, sig, undefined, ctx)) as Result;
 			const tc = getText(result);
-			result.details = { _type: "findResult", text: tc, pattern, matchCount: tc ? tc.trim().split("\n").filter(Boolean).length : 0 } as FindDetails;
+			result.details = {
+				_type: "findResult",
+				text: tc,
+				pattern,
+				matchCount: tc ? tc.trim().split("\n").filter(Boolean).length : 0,
+			} as FindDetails;
 			return result;
 		}),
 
-    		renderCall(args: any, theme: ThemeLike, ctx: RenderCtxLike) {
+		renderCall(args: any, theme: ThemeLike, ctx: RenderCtxLike) {
 			resolveBaseBackground(theme);
-			const text = ctx.lastComponent ?? new TextComp!("", 0, 0);
+			const text = ctx.lastComponent ?? new TC("", 0, 0);
 			const pattern = args.pattern === null || args.pattern === undefined ? "" : String(args.pattern);
-			const path = args.path === null || args.path === undefined ? "<missing>" : shortPath(cwd, home, String(args.path));
+			const path =
+				args.path === null || args.path === undefined ? "<missing>" : shortPath(cwd, home, String(args.path));
 			const limit = args.limit;
 			const glob = args.glob;
 			const findLabel = theme.fg("toolTitle", theme.bold("find"));
@@ -90,28 +118,51 @@ export function registerFindTool(
 
 		renderResult(result: Result, _opt: unknown, theme: ThemeLike, ctx: RenderCtxLike) {
 			resolveBaseBackground(theme);
-			const text = ctx.lastComponent ?? new TextComp!("", 0, 0);
-			if (ctx.isError) { text.setText(renderToolError(getText(result) || "Error", theme)); return text; }
+			const text = ctx.lastComponent ?? new TC("", 0, 0);
+			if (ctx.isError) {
+				text.setText(renderToolError(getText(result) || "Error", theme));
+				return text;
+			}
 			const d = result.details as FindDetails | undefined;
 			if (d?._type === "findResult") {
-    				if (!d.text.trim()) {
-    					const notices = (d as any).notices as string[] | undefined;
-    					const noticeStr = notices?.length ? `\n  ${theme.fg("warning", `[${notices.join(". ")}]`)}` : "";
-    					text.setText(fillToolBackground(`  \n  ${theme.fg("dim", "0 files")}${noticeStr}\n  `));
-    					return text;
-    				}
-    				const rendered = renderFindResults(d.text, theme).split("\n").map(l => `  ${l}`).join("\n");
-    				const notices = (d as any).notices as string[] | undefined;
-    				const noticeStr = notices?.length ? `\n  ${theme.fg("warning", `[${notices.join(". ")}]`)}` : "";
-    				text.setText(fillToolBackground(`  \n  ${theme.fg("dim", `${d.matchCount} files`)}${renderToolMetrics(result)}\n${rendered}${noticeStr}\n  `));
-    				return text;
+				if (!d.text.trim()) {
+					const notices = (d as any).notices as string[] | undefined;
+					const noticeStr = notices?.length ? `\n  ${theme.fg("warning", `[${notices.join(". ")}]`)}` : "";
+					text.setText(fillToolBackground(`  \n  ${theme.fg("dim", "0 files")}${noticeStr}\n  `));
+					return text;
+				}
+				const rendered = renderFindResults(d.text, theme)
+					.split("\n")
+					.map((l) => `  ${l}`)
+					.join("\n");
+				const notices = (d as any).notices as string[] | undefined;
+				const noticeStr = notices?.length ? `\n  ${theme.fg("warning", `[${notices.join(". ")}]`)}` : "";
+				text.setText(
+					fillToolBackground(
+						`  \n  ${theme.fg("dim", `${d.matchCount} files`)}${renderToolMetrics(result)}\n${rendered}${noticeStr}\n  `,
+					),
+				);
+				return text;
 			}
 			const fc = result.content?.[0];
-			text.setText(fillToolBackground(`  \n  ${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "0 files")}\n  `));
+			text.setText(
+				fillToolBackground(
+					`  \n  ${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "0 files")}\n  `,
+				),
+			);
 			return text;
 		},
 	} as unknown as ToolDefinition<any, any, any>);
 }
 
-function appendNotices(text: string, notices: string[]): string { return notices.length ? `${text}\n\n[${notices.join(". ")}]` : text; }
-function getText(result: Result): string { return ((result.content ?? []) as TextContent[]).filter((c) => c.type === "text").map((c) => c.text ?? "").join("\n") ?? ""; }
+function appendNotices(text: string, notices: string[]): string {
+	return notices.length ? `${text}\n\n[${notices.join(". ")}]` : text;
+}
+function getText(result: Result): string {
+	return (
+		((result.content ?? []) as TextContent[])
+			.filter((c) => c.type === "text")
+			.map((c) => c.text ?? "")
+			.join("\n") ?? ""
+	);
+}

package/src/tools/grep.ts

@@ -1,12 +1,17 @@
 /* pi-pretty: grep tool -- FFF-backed text search with SDK fallback. */
 
-import { type ToolDefinition, type ExtensionAPI, type ExtensionContext, type AgentToolResult } from "@earendil-works/pi-coding-agent";
+import {
+	type ToolDefinition,
+	type ExtensionAPI,
+	type ExtensionContext,
+	type AgentToolResult,
+} from "@earendil-works/pi-coding-agent";
 import type { SdkToolDef, GrepDetails, FffServiceWithCursor, TextContent, ThemeLike, RenderCtxLike } from "../types.js";
-import { keyHint } from "@earendil-works/pi-coding-agent";
 import { MAX_PREVIEW_LINES, BG_ERROR, resolveBaseBackground } from "../config.js";
 import { shortPath, normalizeLineEndings } from "../helpers.js";
 import { wrapExecuteWithMetrics } from "./metrics.js";
 import { renderToolError, fillToolBackground } from "../render.js";
+import { resolveTextCtor } from "../tui-text.js";
 import { fffFormatGrepText } from "../fff-helpers.js";
 import { NOTICE_PARTIAL_FILE_INDEX } from "../notices.js";
 
@@ -21,7 +26,7 @@ export function registerGrepTool(
 	sdkTool: SdkToolDef,
 	TextComp?: new (t?: string, x?: number, y?: number) => { setText(v: string): void },
 ): void {
-	const T = TextComp ?? (() => { const m = require("@earendil-works/pi-tui") as { Text: new (t?: string, x?: number, y?: number) => { setText(v: string): void } }; return m.Text; })();
+	const T = resolveTextCtor(TextComp);
 	const home = process.env.HOME ?? "";
 
 	pi.registerTool({
@@ -45,7 +50,12 @@ export function registerGrepTool(
 					const fff = fffService.getFinder();
 					if (!fff) throw new Error("FFF finder not available");
 					const effectiveLimit = Math.max(1, limit);
-					const grepResult = fff.grep(pattern, { pageSize: effectiveLimit, mode: literal ? "plain" : "regex", beforeContext: context, afterContext: context });
+					const grepResult = fff.grep(pattern, {
+						pageSize: effectiveLimit,
+						mode: literal ? "plain" : "regex",
+						beforeContext: context,
+						afterContext: context,
+					});
 					if (grepResult.ok) {
 						const grep = grepResult.value;
 						const items = grep.items.slice(0, effectiveLimit);
@@ -59,15 +69,36 @@ export function registerGrepTool(
 							notices.push(`More results available: cursor="${cursorId}"`);
 						}
 						const text = appendNotices(fffFormatGrepText(items, effectiveLimit), notices);
-						return { content: [{ type: "text" as const, text }], details: { _type: "grepResult", text, pattern, matchCount: items.length } as GrepDetails };
+						return {
+							content: [{ type: "text" as const, text }],
+							details: {
+								_type: "grepResult",
+								text,
+								pattern,
+								matchCount: items.length,
+							} as GrepDetails,
+						};
 					}
-				} catch { /* fall through */ }
+				} catch {
+					/* fall through */
+				}
 			}
 
-			const result = await sdkTool.execute(tid, p, sig, undefined, ctx) as Result;
-			for (const c of (result.content ?? []) as any[]) { if (c.type === "text") c.text = normalizeLineEndings(c.text); }
-			const tc = ((result.content ?? []) as TextContent[]).filter((c) => c.type === "text").map((c) => c.text).join("\n") ?? "";
-			result.details = { _type: "grepResult", text: tc, pattern, matchCount: tc ? tc.trim().split("\n").filter(Boolean).length : 0 } as GrepDetails;
+			const result = (await sdkTool.execute(tid, p, sig, undefined, ctx)) as Result;
+			for (const c of (result.content ?? []) as any[]) {
+				if (c.type === "text") c.text = normalizeLineEndings(c.text);
+			}
+			const tc =
+				((result.content ?? []) as TextContent[])
+					.filter((c) => c.type === "text")
+					.map((c) => c.text)
+					.join("\n") ?? "";
+			result.details = {
+				_type: "grepResult",
+				text: tc,
+				pattern,
+				matchCount: tc ? tc.trim().split("\n").filter(Boolean).length : 0,
+			} as GrepDetails;
 			return result;
 		}),
 
@@ -92,7 +123,18 @@ export function registerGrepTool(
 		renderResult(result: Result, _opt: unknown, theme: ThemeLike, ctx: RenderCtxLike) {
 			resolveBaseBackground(theme);
 			const text = ctx.lastComponent ?? new T("", 0, 0);
-			if (ctx.isError) { text.setText(renderToolError(((result.content ?? []) as TextContent[]).filter((c) => c.type === "text").map((c) => c.text).join("\n") || "Error", theme)); return text; }
+			if (ctx.isError) {
+				text.setText(
+					renderToolError(
+						((result.content ?? []) as TextContent[])
+							.filter((c) => c.type === "text")
+							.map((c) => c.text)
+							.join("\n") || "Error",
+						theme,
+					),
+				);
+				return text;
+			}
 			const d = result.details as GrepDetails | undefined;
 			if (d?._type === "grepResult" && d.text) {
 				const lines = d.text.split("\n");
@@ -105,7 +147,7 @@ export function registerGrepTool(
 					out.push(theme.fg("toolOutput", line));
 				}
 				if (remaining > 0) {
-					out.push(theme.fg("muted", `… (${remaining} more ${remaining === 1 ? "line" : "lines"}, ${keyHint("app.tools.expand", "to expand")})`));
+					out.push(theme.fg("muted", `… (${remaining} more ${remaining === 1 ? "line" : "lines"}, to expand)`));
 				}
 				const body = out.map((l) => `  ${l}`).join("\n") + "\n\n";
 				text.setText(fillToolBackground(body, ctx.isError ? BG_ERROR : undefined));
@@ -119,4 +161,6 @@ export function registerGrepTool(
 	} as unknown as ToolDefinition<any, any, any>);
 }
 
-function appendNotices(text: string, notices: string[]): string { return notices.length ? `${text}\n\n[${notices.join(". ")}]` : text; }
+function appendNotices(text: string, notices: string[]): string {
+	return notices.length ? `${text}\n\n[${notices.join(". ")}]` : text;
+}