@heyhuynhgiabuu/pi-pretty 0.6.16 → 0.6.17

package/src/tools/bash.ts

@@ -1,28 +1,12 @@
 /* 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 { SdkToolDef, BashDetails, TextContent, ComponentLike, ThemeLike, RenderCtxLike } from "../types.js";
-import {
-	TOOL_RESULT_INDENT,
-	resolveBaseBackground,
-	termWidth,
-	MAX_PREVIEW_LINES,
-	BG_BASE,
-	BG_ERROR,
-	FG_DIM,
-	FG_RULE,
-	RST,
-} from "../config.js";
-import { wrapExecuteWithMetrics } from "./metrics.js";
-import { collapsedExpandFooter } from "../collapsed-hint.js";
-import { renderBashOutput, renderToolError, renderToolMetrics, fillToolBackground } from "../render.js";
+import type { AgentToolResult, ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
+import { BG_BASE, FG_DIM, MAX_PREVIEW_LINES, resolveBaseBackground, TOOL_RESULT_INDENT, termWidth } from "../config.js";
+import { compactErrorLines, inferBashExitCode, stripBashExitStatusLine } from "../helpers.js";
+import { fillToolBackground, renderToolDuration, renderToolError } from "../render.js";
 import { resolveTextCtor } from "../tui-text.js";
-import { stripBashExitStatusLine, inferBashExitCode, compactErrorLines } from "../helpers.js";
+import type { BashDetails, ComponentLike, RenderCtxLike, SdkToolDef, TextContent, ThemeLike } from "../types.js";
+import { wrapExecuteWithMetrics } from "./metrics.js";
 
 type Result = AgentToolResult<Record<string, unknown>>;
 
@@ -40,8 +24,8 @@ export function registerBashTool(
 		label: "Bash",
 		description: sdkTool.description
 			? `${sdkTool.description} For text search: \`rg -n\`.`
-			: "Execute shell commands. For text search: \`rg -n\`.",
-		promptSnippet: "Execute commands via bash. For text search: \`rg -n\`.",
+			: "Execute shell commands. For text search: `rg -n`.",
+		promptSnippet: "Execute commands via bash. For text search: `rg -n`.",
 		promptGuidelines: [
 			"For text search: `rg -n`. If no results, try `rg -u` (respects .gitignore by default).",
 			"In rg: | means alternation, \\| means literal pipe. Opposite of GNU grep. Never use \\| for alternation.",
@@ -78,14 +62,11 @@ export function registerBashTool(
 				rawCmd.length === 0
 					? theme.fg("toolOutput", "...")
 					: !ctx.expanded && rawCmd.length > headerBudget
-						? rawCmd.slice(0, Math.max(1, headerBudget)) + "…"
+						? `${rawCmd.slice(0, Math.max(1, headerBudget))}…`
 						: rawCmd;
+			const commandLabel = theme.fg(ctx.isError ? "error" : "toolTitle", theme.bold(`$ ${cmd}`));
 			text.setText(
-				fillToolBackground(
-					`\n${TOOL_RESULT_INDENT}${theme.fg("toolTitle", theme.bold(`$ ${cmd}`))}${t}`,
-					ctx.isError ? BG_ERROR : undefined,
-					ctx.expanded ? undefined : tw,
-				),
+				fillToolBackground(`\n${TOOL_RESULT_INDENT}${commandLabel}${t}`, undefined, ctx.expanded ? undefined : tw),
 			);
 			return text;
 		},
@@ -111,26 +92,22 @@ export function registerBashTool(
 
 			if (d?._type === "bashResult") {
 				const isErr = ctx.isError || (d.exitCode !== null && d.exitCode !== 0);
-				const bg = isErr ? BG_ERROR : undefined;
 				const cleaned = stripBashExitStatusLine(d.text);
 				const output = isErr ? compactErrorLines(cleaned).join("\n") : cleaned;
-				const { summary } = renderBashOutput(output, d.exitCode);
 				const lineCount = output.split("\n").length;
-				const info =
-					lineCount > 1
-						? `${TOOL_RESULT_INDENT}${FG_DIM}(${lineCount} lines)${RST} ${renderToolMetrics(result)}`
-						: ` ${renderToolMetrics(result)}`;
-				const header = `${TOOL_RESULT_INDENT}${summary}${info}`;
+				const info = [`${lineCount} lines`, renderToolDuration(result), !ctx.expanded ? "ctrl+o to expand" : ""]
+					.filter(Boolean)
+					.map((part) => theme.fg("dim", part))
+					.join(theme.fg("dim", " · "));
+				const header = `${TOOL_RESULT_INDENT}${info}`;
 				const rw = termWidth();
 
 				const renderFn = (w: number) => {
-					if (!ctx.expanded) {
-						return fillToolBackground([header, collapsedExpandFooter()].join("\n"), bg, w);
-					}
-					if (!output.trim()) return fillToolBackground(header, bg, w);
+					if (!ctx.expanded) return fillToolBackground(`${header}\n`, undefined, w);
+					if (!output.trim()) return fillToolBackground(`${header}\n`, undefined, w);
 					const show = output.split("\n");
-					const out = [header, rule(w), ...show.map((l: string) => `${TOOL_RESULT_INDENT}${l}`)];
-					return fillToolBackground(out.join("\n"), bg, w);
+					const out = [header, "", ...show.map((line: string) => `${TOOL_RESULT_INDENT}${line}`)];
+					return fillToolBackground(`${out.join("\n")}\n`, undefined, w);
 				};
 
 				text.setText(renderFn(rw));
@@ -140,7 +117,7 @@ export function registerBashTool(
 					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)}`;
+						const k = `bash:${ctx.expanded ? "1" : "0"}:${width}:${d.exitCode ?? "killed"}:${output.length}:${renderToolDuration(result)}`;
 						if (key !== k) {
 							text.setText(renderFn(width));
 							key = k;
@@ -157,16 +134,15 @@ export function registerBashTool(
 			}
 			const fc = result.content?.[0];
 			text.setText(
-				fillToolBackground(`${TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "done")}`),
+				fillToolBackground(
+					`${TOOL_RESULT_INDENT}${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 getText(result: Result): string {
 	return (
 		((result.content ?? []) as TextContent[])

package/src/tools/find.ts

@@ -1,20 +1,15 @@
 /* pi-pretty: find tool -- FFF-backed file search with SDK (fd) fallback. */
 
 import { isAbsolute, relative } from "node:path";
-import {
-	type ToolDefinition,
-	type ExtensionAPI,
-	type ExtensionContext,
-	type AgentToolResult,
-} from "@earendil-works/pi-coding-agent";
-import type { SdkToolDef, FindDetails, FffServiceWithCursor, TextContent, ThemeLike, RenderCtxLike } from "../types.js";
-import { TOOL_RESULT_INDENT, BG_ERROR, FG_DIM, RST, resolveBaseBackground } from "../config.js";
+import type { AgentToolResult, ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
+import { BG_ERROR, FG_DIM, RST, resolveBaseBackground, TOOL_RESULT_INDENT } from "../config.js";
+import { isLikelyGlobPattern, normalizeFindGlobPattern } from "../find-glob.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";
-import { isLikelyGlobPattern, normalizeFindGlobPattern } from "../find-glob.js";
+import { fillToolBackground, renderFindResults, renderToolDuration, renderToolError } from "../render.js";
+import { resolveTextCtor } from "../tui-text.js";
+import type { FffServiceWithCursor, FindDetails, RenderCtxLike, SdkToolDef, TextContent, ThemeLike } from "../types.js";
+import { wrapExecuteWithMetrics } from "./metrics.js";
 
 type Result = AgentToolResult<Record<string, unknown>>;
 
@@ -105,7 +100,9 @@ export function registerFindTool(
 					const basePathResult = fff.getBasePath();
 					const basePath = basePathResult.ok ? basePathResult.value : null;
 					const globPattern = buildGlobPattern(pattern, path, basePath);
-					const searchResult = fff.glob(globPattern, { pageSize: effectiveLimit });
+					const searchResult = fff.glob(globPattern, {
+						pageSize: effectiveLimit,
+					});
 
 					if (searchResult.ok) {
 						const items = searchResult.value.items.slice(0, effectiveLimit);
@@ -153,22 +150,15 @@ export function registerFindTool(
 			const a = args as { pattern?: unknown; path?: unknown; limit?: unknown };
 			const text = (ctx as RenderCtxLike).lastComponent ?? new TC("", 0, 0);
 			const pattern = a.pattern == null ? "" : String(a.pattern);
-			const pathArg =
-				a.path == null ? "<missing>" : shortPath(cwd, home, String(a.path));
+			const pathArg = a.path == null ? "<missing>" : shortPath(cwd, home, String(a.path));
 			const limit = a.limit;
-			const findLabel = theme.fg("toolTitle", theme.bold("find"));
-			const patternPart = pattern ? theme.fg("accent", pattern) : "";
+			const findLabel = theme.fg(ctx.isError ? "error" : "toolTitle", theme.bold("✱ find"));
+			const patternPart = pattern ? theme.fg("toolTitle", pattern) : "";
 			const inPart = theme.fg("dim", " in ");
 			const pathPart = theme.fg("toolOutput", pathArg);
-			const limitPart =
-				limit !== undefined && limit !== null ? theme.fg("dim", ` limit ${limit}`) : "";
+			const limitPart = limit !== undefined && limit !== null ? theme.fg("dim", ` limit ${limit}`) : "";
 			const out = `${findLabel} ${patternPart}${inPart}${pathPart}${limitPart}`;
-			text.setText(
-				fillToolBackground(
-					`\n${TOOL_RESULT_INDENT}${out}`,
-					ctx.isError ? BG_ERROR : undefined,
-				),
-			);
+			text.setText(fillToolBackground(`\n${TOOL_RESULT_INDENT}${out}`, ctx.isError ? BG_ERROR : undefined));
 			return text;
 		},
 
@@ -186,17 +176,14 @@ export function registerFindTool(
 					const noticeStr = d.notices?.length
 						? `\n${TOOL_RESULT_INDENT}${theme.fg("warning", `[${d.notices.join(". ")}]`)}`
 						: "";
-					text.setText(
-						fillToolBackground(
-							`\n${TOOL_RESULT_INDENT}${theme.fg("dim", "0 files")}${noticeStr}\n`,
-						),
-					);
+					text.setText(fillToolBackground(`\n${TOOL_RESULT_INDENT}${theme.fg("dim", "0 files")}${noticeStr}\n`));
 					return text;
 				}
 				if (!ctx.expanded) {
+					const duration = renderToolDuration(r);
 					text.setText(
 						fillToolBackground(
-							`${TOOL_RESULT_INDENT}${FG_DIM}${d.matchCount} files — ctrl+o to expand${RST}${renderToolMetrics(r)}\n`,
+							`${TOOL_RESULT_INDENT}${FG_DIM}${d.matchCount} files — ctrl+o to expand${RST}${duration ? `${FG_DIM}· ${duration}${RST}` : ""}\n`,
 						),
 					);
 					return text;
@@ -208,20 +195,19 @@ export function registerFindTool(
 				const noticeStr = d.notices?.length
 					? `\n${TOOL_RESULT_INDENT}${theme.fg("warning", `[${d.notices.join(". ")}]`)}`
 					: "";
+				const duration = renderToolDuration(r);
 				text.setText(
 					fillToolBackground(
-						`\n${TOOL_RESULT_INDENT}${theme.fg("dim", `${d.matchCount} files`)}${renderToolMetrics(r)}\n${rendered}${noticeStr}\n`,
+						`\n${TOOL_RESULT_INDENT}${theme.fg("dim", `${d.matchCount} files`)}${duration ? `${FG_DIM}· ${duration}${RST}` : ""}\n${rendered}${noticeStr}\n`,
 					),
 				);
 				return text;
 			}
 			const fc = r.content?.[0] as TextContent | undefined;
 			text.setText(
-				fillToolBackground(
-					`\n${TOOL_RESULT_INDENT}${theme.fg("dim", fc?.text?.slice(0, 120) ?? "0 files")}\n`,
-				),
+				fillToolBackground(`\n${TOOL_RESULT_INDENT}${theme.fg("dim", fc?.text?.slice(0, 120) ?? "0 files")}\n`),
 			);
 			return text;
 		},
 	} as unknown as ToolDefinition);
-}
+}

package/src/tools/grep.ts

@@ -1,19 +1,14 @@
 /* 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 { SdkToolDef, GrepDetails, FffServiceWithCursor, TextContent, ThemeLike, RenderCtxLike } from "../types.js";
-import { TOOL_RESULT_INDENT, MAX_PREVIEW_LINES, BG_ERROR, FG_DIM, RST, 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 type { AgentToolResult, ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
+import { BG_ERROR, FG_DIM, MAX_PREVIEW_LINES, RST, resolveBaseBackground, TOOL_RESULT_INDENT } from "../config.js";
 import { fffFormatGrepText } from "../fff-helpers.js";
+import { normalizeLineEndings, shortPath } from "../helpers.js";
 import { NOTICE_PARTIAL_FILE_INDEX } from "../notices.js";
+import { fillToolBackground, renderToolError } from "../render.js";
+import { resolveTextCtor } from "../tui-text.js";
+import type { FffServiceWithCursor, GrepDetails, RenderCtxLike, SdkToolDef, TextContent, ThemeLike } from "../types.js";
+import { wrapExecuteWithMetrics } from "./metrics.js";
 
 const invalidArg = "<missing>";
 
@@ -111,7 +106,7 @@ export function registerGrepTool(
 			const limit = args.limit;
 			const literal = args.literal === true;
 			const caseInsensitive = args.caseInsensitive === true || args.ignoreCase === true;
-			let out = `${theme.fg("toolTitle", theme.bold("grep"))} ${theme.fg("accent", `/${pattern || ""}/`)}${theme.fg("toolOutput", ` in ${path}`)}`;
+			let out = `${theme.fg(ctx.isError ? "error" : "toolTitle", theme.bold("✱ grep"))} ${theme.fg("toolTitle", `/${pattern || ""}/`)}${theme.fg("toolOutput", ` in ${path}`)}`;
 			if (glob) out += theme.fg("dim", ` (${String(glob)})`);
 			if (limit !== undefined && limit !== null) out += theme.fg("dim", ` limit ${limit}`);
 			if (literal) out += theme.fg("dim", ` (literal)`);
@@ -158,13 +153,15 @@ export function registerGrepTool(
 				if (remaining > 0) {
 					out.push(theme.fg("muted", `… (${remaining} more ${remaining === 1 ? "line" : "lines"}, to expand)`));
 				}
-				const body = out.map((l) => `${TOOL_RESULT_INDENT}${l}`).join("\n") + "\n\n";
+				const body = `${out.map((l) => `${TOOL_RESULT_INDENT}${l}`).join("\n")}\n\n`;
 				text.setText(fillToolBackground(body, ctx.isError ? BG_ERROR : undefined));
 				return text;
 			}
 			const fc = result.content?.[0];
 			const fallback = fc && "text" in fc ? String(fc.text).slice(0, 120) : "no matches";
-			text.setText(fillToolBackground(`${TOOL_RESULT_INDENT}${theme.fg("dim", fallback)}`, ctx.isError ? BG_ERROR : undefined));
+			text.setText(
+				fillToolBackground(`${TOOL_RESULT_INDENT}${theme.fg("dim", fallback)}`, ctx.isError ? BG_ERROR : undefined),
+			);
 			return text;
 		},
 	} as unknown as ToolDefinition<any, any, any>);

package/src/tools/labels.ts

@@ -0,0 +1,3 @@
+export function customToolTitle(name: string): string {
+	return `⚙ ${name}`;
+}

package/src/tools/ls.ts

@@ -1,17 +1,21 @@
 /* pi-pretty: ls tool -- directory listing with styled output. */
 
+import type { AgentToolResult, ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
 import {
-	type ToolDefinition,
-	type ExtensionAPI,
-	type ExtensionContext,
-	type AgentToolResult,
-} from "@earendil-works/pi-coding-agent";
-import type { SdkToolDef, LsDetails, TextContent, ComponentLike, ThemeLike, RenderCtxLike } from "../types.js";
-import { TOOL_RESULT_INDENT, resolveBaseBackground, termWidth, MAX_PREVIEW_LINES, BG_BASE, BG_ERROR, FG_DIM, RST } from "../config.js";
+	BG_BASE,
+	BG_ERROR,
+	FG_DIM,
+	MAX_PREVIEW_LINES,
+	RST,
+	resolveBaseBackground,
+	TOOL_RESULT_INDENT,
+	termWidth,
+} from "../config.js";
 import { shortPath } from "../helpers.js";
-import { wrapExecuteWithMetrics } from "./metrics.js";
-import { renderTree, renderToolError, renderToolMetrics, fillToolBackground } from "../render.js";
+import { fillToolBackground, renderToolError, renderToolMetrics, renderTree } from "../render.js";
 import { resolveTextCtor } from "../tui-text.js";
+import type { ComponentLike, LsDetails, RenderCtxLike, SdkToolDef, TextContent, ThemeLike } from "../types.js";
+import { wrapExecuteWithMetrics } from "./metrics.js";
 
 type Result = AgentToolResult<Record<string, unknown>>;
 
@@ -91,7 +95,9 @@ export function registerLsTool(
 			}
 			const fc = result.content?.[0];
 			text.setText(
-				fillToolBackground(`${TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "done")}`),
+				fillToolBackground(
+					`${TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "done")}`,
+				),
 			);
 			return text;
 		},

package/src/tools/metrics.ts

@@ -5,7 +5,7 @@
  */
 
 import type { AgentToolResult, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { ELAPSED_KEY, CHARS_KEY } from "../helpers.js";
+import { CHARS_KEY, ELAPSED_KEY } from "../helpers.js";
 
 type ExecuteFn = (
 	tid: string,

package/src/tools/read.ts

@@ -1,40 +1,24 @@
 /* pi-pretty: read tool -- file reading with syntax highlighting and inline image support. */
 
+import type { AgentToolResult, ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
+import { Image as TuiImage } from "@earendil-works/pi-tui";
 import {
-	type ToolDefinition,
-	type ExtensionAPI,
-	type ExtensionContext,
-	type AgentToolResult,
-} from "@earendil-works/pi-coding-agent";
-import type { SdkToolDef, ReadDetails, TextContent, ComponentLike, ThemeLike, RenderCtxLike } from "../types.js";
-import {
-	TOOL_RESULT_INDENT,
-	resolveBaseBackground,
-	termWidth,
-	MAX_PREVIEW_LINES,
 	BG_BASE,
 	BG_ERROR,
 	FG_DIM,
 	FG_LNUM,
 	FG_RULE,
+	MAX_PREVIEW_LINES,
 	RST,
+	resolveBaseBackground,
+	TOOL_RESULT_INDENT,
+	termWidth,
 } from "../config.js";
-import { shortPath, normalizeLineEndings } from "../helpers.js";
-import { wrapExecuteWithMetrics } from "./metrics.js";
-import { renderToolError, renderToolMetrics, fillToolBackground, renderFileContent } from "../render.js";
+import { normalizeLineEndings, shortPath } from "../helpers.js";
+import { fillToolBackground, renderFileContent, renderToolError, renderToolMetrics } from "../render.js";
 import { resolveTextCtor } from "../tui-text.js";
-
-// Simple terminal image support check
-function isImageTerminal(): boolean {
-	const term = (process.env.TERM_PROGRAM ?? process.env.TERM ?? "").toLowerCase();
-	const proto = (process.env.PRETTY_IMAGE_PROTOCOL ?? "").toLowerCase();
-	if (proto === "kitty" || proto === "iterm2") return true;
-	if (proto === "none") return false;
-	return (
-		["ghostty", "kitty", "iterm.app", "wezterm", "mintty"].some((t) => term.includes(t)) ||
-		process.env.LC_TERMINAL === "iTerm2"
-	);
-}
+import type { ReadDetails, RenderCtxLike, SdkToolDef, TextContent, ThemeLike } from "../types.js";
+import { wrapExecuteWithMetrics } from "./metrics.js";
 
 type Result = AgentToolResult<Record<string, unknown>>;
 
@@ -85,7 +69,14 @@ export function registerReadTool(
 			resolveBaseBackground(theme);
 
 			const text = ctx.lastComponent ?? new TC("", 0, 0);
-			text.setText("");
+			if (!ctx.isError) {
+				text.setText("");
+				return text;
+			}
+
+			const path = String(args.path ?? "");
+			const label = theme.fg("error", theme.bold("→ read"));
+			text.setText(fillToolBackground(`\n${TOOL_RESULT_INDENT}${label} ${theme.fg("toolTitle", path)}`, BG_ERROR));
 			return text;
 		},
 
@@ -95,40 +86,25 @@ export function registerReadTool(
 			const text = ctx.lastComponent ?? new TC("", 0, 0);
 
 			if (ctx.isError) {
-				text.setText(renderToolError(getText(result) || "Error", theme));
+				text.setText(fillToolBackground(renderToolError(getText(result) || "Error", theme), BG_ERROR));
 				return text;
 			}
 
 			const d = result.details as ReadDetails | undefined;
 
-			// Image rendering
+			// Image rendering — use pi-tui Image component
 			if (d?._type === "readImage") {
-				if ((ctx as any).showImages && isImageTerminal()) {
-					try {
-						const T = require("@earendil-works/pi-tui").Text as new (
-							t?: string,
-							x?: number,
-							y?: number,
-						) => ComponentLike;
-						const img = new T("", 0, 0);
-						if (d.mimeType.startsWith("image/svg")) {
-							img.setText(d.data);
-						} else {
-							const pngData = (require("@earendil-works/pi-coding-agent") as any).convertToPng?.(d.data) ?? d.data;
-							img.setText(`\x1b_Ga=T,f=100,m=${d.mimeType === "image/png" ? "1" : "0"};${pngData}\x1b\\\\`);
-						}
-						return img;
-					} catch {
-						/* fall through */
-					}
-				}
-				const fc = result.content?.[0];
-				text.setText(
-					fillToolBackground(
-						`${TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 80) : `[image: ${d.filePath}]`)}`,
-					),
+				const mimeType = d.mimeType.startsWith("image/svg") ? "image/svg+xml" : d.mimeType;
+				return new TuiImage(
+					d.data,
+					mimeType,
+					{
+						fallbackColor: (text) => theme.fg("toolTitle", text),
+					},
+					{
+						filename: d.filePath,
+					},
 				);
-				return text;
 			}
 
 			// File content — line-numbered display
@@ -141,7 +117,8 @@ export function registerReadTool(
 				if (!ctx.expanded) {
 					text.setText(
 						fillToolBackground(
-							`\n${TOOL_RESULT_INDENT}${theme.fg("toolTitle", theme.bold("read"))} ${theme.fg("accent", p2)}${theme.fg("dim", off2)}\n${TOOL_RESULT_INDENT}${FG_DIM}${total} lines — ctrl+o to expand${RST}\n`,
+							`\n${TOOL_RESULT_INDENT}${theme.fg("toolTitle", theme.bold("→ read"))} ${theme.fg("toolTitle", p2)}${theme.fg("dim", off2)}\n${TOOL_RESULT_INDENT}${FG_DIM}${total} lines — ctrl+o to expand${RST}\n`,
+							BG_BASE,
 						),
 					);
 					return text;
@@ -152,7 +129,7 @@ export function registerReadTool(
 				const gw = nw + 3;
 				const cw = Math.max(1, tw - gw);
 
-				const header = `${theme.fg("toolTitle", theme.bold("read"))} ${theme.fg("accent", p2)}${theme.fg("dim", off2)}`;
+				const header = `${theme.fg("toolTitle", theme.bold("→ read"))} ${theme.fg("toolTitle", p2)}${theme.fg("dim", off2)}`;
 				const out: string[] = ["", `${TOOL_RESULT_INDENT}${header}`];
 				out.push(`${TOOL_RESULT_INDENT}${FG_RULE}${"─".repeat(tw - 1)}${RST}`);
 				for (let i = 0; i < show.length; i++) {
@@ -169,7 +146,7 @@ export function registerReadTool(
 				}
 				out.push("");
 				const rendered = out.join("\n");
-				text.setText(fillToolBackground(rendered));
+				text.setText(fillToolBackground(rendered, BG_BASE));
 				(ctx as any).state._rt = rendered;
 
 				// Async syntax highlighting via Shiki
@@ -180,7 +157,7 @@ export function registerReadTool(
 							.map((l) => `${TOOL_RESULT_INDENT}${l}`)
 							.join("\n");
 						const rendered = `\n${TOOL_RESULT_INDENT}${header}\n${padded}\n`;
-						text.setText(fillToolBackground(rendered));
+						text.setText(fillToolBackground(rendered, BG_BASE));
 						(ctx as any).state._rt = rendered;
 					})
 					.catch(() => {});
@@ -190,7 +167,10 @@ export function registerReadTool(
 
 			const fc = result.content?.[0];
 			text.setText(
-				fillToolBackground(`${TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "done")}`),
+				fillToolBackground(
+					`${TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "done")}`,
+					BG_BASE,
+				),
 			);
 			return text;
 		},

package/src/tui-text.ts

@@ -13,10 +13,6 @@ type TextCtor = new (t?: string, x?: number, y?: number) => { setText(v: string)
 
 /** No-op stub that satisfies the Text interface so rendering doesn't crash. */
 class StubText {
-	// eslint-disable-next-line @typescript-eslint/no-unused-vars
-	constructor(_t?: string, _x?: number, _y?: number) {
-		// no-op
-	}
 	setText(_v: string): void {
 		// no-op — pi-tui not available
 	}
@@ -26,7 +22,7 @@ let _ctor: TextCtor | null = null;
 let _resolved = false;
 
 function resolve(): TextCtor {
-	if (_resolved) return _ctor!;
+	if (_ctor) return _ctor;
 	_resolved = true;
 	try {
 		// eslint-disable-next-line @typescript-eslint/no-var-requires

package/src/types.ts

@@ -2,21 +2,21 @@
  * pi-pretty shared types.
  */
 
-import type { TextContent, ImageContent } from "@earendil-works/pi-ai";
+import type { ImageContent, TextContent } from "@earendil-works/pi-ai";
 import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
 
 // ---------------------------------------------------------------------------
 // Re-export FFF types needed by tools
 // ---------------------------------------------------------------------------
 
-export type { FileFinder, FileItem, GrepResult, SearchResult, GrepMatch, GrepCursor } from "@ff-labs/fff-node";
+export type { FileFinder, FileItem, GrepCursor, GrepMatch, GrepResult, SearchResult } from "@ff-labs/fff-node";
 
 // ---------------------------------------------------------------------------
 // Content / Result types
 // ---------------------------------------------------------------------------
 
 export type ToolContent = TextContent | ImageContent;
-export type { TextContent, ImageContent };
+export type { ImageContent, TextContent };
 // ---------------------------------------------------------------------------
 // Theme / rendering context types
 // ---------------------------------------------------------------------------
@@ -120,14 +120,6 @@ export interface GrepInput {
 	ignoreCase?: boolean;
 }
 
-export interface MultiGrepInput {
-	patterns: string[];
-	path?: string;
-	constraints?: string;
-	context?: number;
-	limit?: number;
-}
-
 // ---------------------------------------------------------------------------
 // SDK tool definition shape (DI-friendly — accepts both mock and real SDK)
 // ---------------------------------------------------------------------------
@@ -153,29 +145,6 @@ export interface SdkTools {
 	getAgentDir?: () => string;
 }
 
-// ---------------------------------------------------------------------------
-// Multi-grep fallback types
-// ---------------------------------------------------------------------------
-
-export interface MultiGrepFallbackParams {
-	cwd: string;
-	patterns: string[];
-	path?: string;
-	constraints?: string;
-	context?: number;
-	limit: number;
-	ignoreCase: boolean;
-	signal?: AbortSignal;
-}
-
-export interface MultiGrepFallbackResult {
-	text: string;
-	matchCount: number;
-	limitReached: boolean;
-}
-
-export type MultiGrepFallback = (params: MultiGrepFallbackParams) => Promise<MultiGrepFallbackResult>;
-
 // ---------------------------------------------------------------------------
 // FFF service interfaces
 // ---------------------------------------------------------------------------
@@ -224,5 +193,4 @@ export interface PiPrettyDeps {
 	sdk?: SdkTools;
 	TextComponent?: new (text?: string, x?: number, y?: number) => ComponentLike;
 	fffModule?: typeof import("@ff-labs/fff-node");
-	multiGrepRipgrepFallback?: MultiGrepFallback;
 }

package/dist/multi-grep-fallback.d.ts

@@ -1,30 +0,0 @@
-export type ConstraintParseResult = {
-    ok: true;
-    globs: string[];
-    tokens: string[];
-} | {
-    ok: false;
-    error: string;
-};
-export type MultiGrepRipgrepFallbackParams = {
-    cwd: string;
-    patterns: string[];
-    path?: string;
-    constraints?: string;
-    context?: number;
-    limit: number;
-    ignoreCase: boolean;
-    signal?: AbortSignal;
-};
-export type MultiGrepRipgrepFallbackResult = {
-    text: string;
-    matchCount: number;
-    limitReached: boolean;
-};
-export type MultiGrepRipgrepFallback = (params: MultiGrepRipgrepFallbackParams) => Promise<MultiGrepRipgrepFallbackResult>;
-export declare function parseMultiGrepConstraints(constraints: string | undefined): ConstraintParseResult;
-export declare function getMultiGrepRipgrepArgs(params: MultiGrepRipgrepFallbackParams): ConstraintParseResult & {
-    args?: string[];
-};
-export declare function runMultiGrepRipgrepFallback(params: MultiGrepRipgrepFallbackParams): Promise<MultiGrepRipgrepFallbackResult>;
-//# sourceMappingURL=multi-grep-fallback.d.ts.map

package/dist/multi-grep-fallback.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"multi-grep-fallback.d.ts","sourceRoot":"","sources":["../src/multi-grep-fallback.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,qBAAqB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnH,MAAM,MAAM,8BAA8B,GAAG;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,CACtC,MAAM,EAAE,8BAA8B,KAClC,OAAO,CAAC,8BAA8B,CAAC,CAAC;AA8E7C,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,qBAAqB,CAehG;AAqBD,wBAAgB,uBAAuB,CACtC,MAAM,EAAE,8BAA8B,GACpC,qBAAqB,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAI7C;AAED,wBAAsB,2BAA2B,CAChD,MAAM,EAAE,8BAA8B,GACpC,OAAO,CAAC,8BAA8B,CAAC,CAoGzC"}