@heyhuynhgiabuu/pi-pretty 0.6.16 → 0.6.18

package/src/index.ts

@@ -1,7 +1,7 @@
 /**
  * pi-pretty — Pretty terminal output for pi built-in tools.
  *
- * Enhances read, bash, ls, find, grep, multi_grep with:
+ * Enhances read, bash, ls, find, and grep with:
  *   • Syntax-highlighted file content (Shiki)
  *   • Colored bash exit status + output
  *   • Tree-view directory listings with file-type icons
@@ -12,30 +12,28 @@
 // Re-export for tests
 export { __imageInternals } from "./image.js";
 
-import type { ExtensionAPI, ExtensionContext, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
-
-import type { PiPrettyDeps } from "./types.js";
-import { getSharedFffService, type FffService } from "./fff.js";
-import { registerReadTool } from "./tools/read.js";
+import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { createFffAutocompleteProvider } from "./autocomplete.js";
+import { getDefaultAgentDir } from "./config.js";
+import { type FffService, getSharedFffService } from "./fff.js";
 import { registerBashTool } from "./tools/bash.js";
-import { registerLsTool } from "./tools/ls.js";
 import { registerFindTool } from "./tools/find.js";
 import { registerGrepTool } from "./tools/grep.js";
-import { registerMultiGrepTool } from "./tools/multi-grep.js";
-import { runMultiGrepRipgrepFallback } from "./multi-grep-fallback.js";
-import { getDefaultAgentDir } from "./config.js";
-import { createFffAutocompleteProvider } from "./autocomplete.js";
-import { registerDefaultCollapsedToolOutput } from "./expand.js";
+import { registerLsTool } from "./tools/ls.js";
+import { registerReadTool } from "./tools/read.js";
+import type { PiPrettyDeps } from "./types.js";
 
 // ---------------------------------------------------------------------------
 // Config
 // ---------------------------------------------------------------------------
 
-function envDisabledTools(): Set<string> {
+const DEFAULT_DISABLED_TOOLS = new Set(["ls"]);
+
+function envTools(name: "PRETTY_DISABLE_TOOLS" | "PRETTY_ENABLE_TOOLS"): Set<string> {
 	return new Set(
-		(process.env.PRETTY_DISABLE_TOOLS ?? "")
+		(process.env[name] ?? "")
 			.split(",")
-			.map((s) => s.trim().toLowerCase())
+			.map((tool) => tool.trim().toLowerCase())
 			.filter(Boolean),
 	);
 }
@@ -47,9 +45,15 @@ function envDisabledTools(): Set<string> {
 export type { PiPrettyDeps };
 
 export default async function piPrettyExtension(pi: ExtensionAPI, deps?: PiPrettyDeps): Promise<void> {
-	const disabledTools = envDisabledTools();
-	const isToolEnabled = (name: string) => !disabledTools.has(name.toLowerCase());
-	registerDefaultCollapsedToolOutput(pi);
+	const disabledTools = envTools("PRETTY_DISABLE_TOOLS");
+	const enabledTools = envTools("PRETTY_ENABLE_TOOLS");
+	const isToolEnabled = (name: string) => {
+		const normalizedName = name.toLowerCase();
+		return (
+			!disabledTools.has(normalizedName) &&
+			(!DEFAULT_DISABLED_TOOLS.has(normalizedName) || enabledTools.has(normalizedName))
+		);
+	};
 	const cwd = process.cwd();
 
 	// ------------------------------------------------------------------
@@ -62,10 +66,7 @@ export default async function piPrettyExtension(pi: ExtensionAPI, deps?: PiPrett
 
 	const maybeGetAgentDir = deps?.sdk?.getAgentDir;
 	const agentDir = typeof maybeGetAgentDir === "function" ? maybeGetAgentDir() : getDefaultAgentDir();
-	let fffService: FffService | null = getSharedFffService(deps?.fffModule, agentDir);
-
-	// Ripgrep fallback for multi_grep
-	const multiGrepFallback = deps?.multiGrepRipgrepFallback ?? runMultiGrepRipgrepFallback;
+	const fffService: FffService | null = getSharedFffService(deps?.fffModule, agentDir);
 
 	// Text component for custom rendering (DI-friendly)
 	const TextComp = deps?.TextComponent;
@@ -78,8 +79,8 @@ export default async function piPrettyExtension(pi: ExtensionAPI, deps?: PiPrett
 		pi.registerCommand("fff-health", {
 			description: "Show FFF file finder health and indexer status",
 			handler: async (_args: string, ctx: ExtensionCommandContext) => {
-				const fff = fffService!;
-				if (!fff.isAvailable) {
+				const fff = fffService;
+				if (!fff || !fff.isAvailable) {
 					ctx.ui.notify("FFF not initialized", "warning");
 					return;
 				}
@@ -229,16 +230,6 @@ export default async function piPrettyExtension(pi: ExtensionAPI, deps?: PiPrett
 	if (isToolEnabled("grep") && createGrepTool) {
 		registerGrepTool(pi, cwd, fffService, createGrepTool(cwd), TextComp);
 	}
-	if (isToolEnabled("multi_grep") && (fffService || createGrepTool)) {
-		registerMultiGrepTool(
-			pi,
-			cwd,
-			fffService,
-			createGrepTool ? createGrepTool(cwd) : undefined,
-			multiGrepFallback,
-			TextComp,
-		);
-	}
 
 	// Fallback padding for SDK-rendered tool bodies. The SDK reads
 	// result.content[0].text and slices collapsed output to roughly the first

package/src/notices.ts

@@ -1,3 +1,3 @@
 /** Stable user-facing strings for FFF/grep tool footers (not source-line titles). */
 
-export const NOTICE_PARTIAL_FILE_INDEX = "FFF index incomplete; results may be missing files";
+export const NOTICE_PARTIAL_FILE_INDEX = "FFF index incomplete; results may be missing files";

package/src/render.ts

@@ -5,49 +5,47 @@
  * They are async only when Shiki syntax highlighting is involved.
  */
 
-import type { BundledLanguage } from "shiki";
-import { codeToANSI } from "@shikijs/cli";
 import { basename, dirname } from "node:path";
-
+import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
+// Top-level value import so jiti's pi-tui alias applies (it only rewrites
+// static top-level import/require, not function-body require — see tui-text.ts).
+import { Text as TuiText, truncateToWidth } from "@earendil-works/pi-tui";
+import { codeToANSI } from "@shikijs/cli";
+import type { BundledLanguage } from "shiki";
 import {
-	TOOL_RESULT_INDENT,
-	RST,
-	FG_LNUM,
+	BG_BASE,
+	BG_ERROR,
+	CACHE_LIMIT,
+	detectLang,
+	dirIcon,
+	FG_BLUE,
 	FG_DIM,
-	FG_RULE,
 	FG_GREEN,
+	FG_LNUM,
 	FG_RED,
+	FG_RULE,
 	FG_YELLOW,
-	FG_BLUE,
-	BG_BASE,
-	BG_ERROR,
-	dirIcon,
-	detectLang,
-	termWidth,
-	MAX_PREVIEW_LINES,
 	MAX_HL_CHARS,
-	CACHE_LIMIT,
+	MAX_PREVIEW_LINES,
+	RST,
 	resolveBaseBackground,
+	TOOL_RESULT_INDENT,
+	termWidth,
 } from "./config.js";
 import {
-	normalizeLineEndings,
-	humanSize,
-	formatElapsedMs,
-	formatCharCount,
-	ELAPSED_KEY,
 	CHARS_KEY,
 	compactErrorLines,
+	ELAPSED_KEY,
+	formatCharCount,
+	formatElapsedMs,
+	humanSize,
+	normalizeLineEndings,
 } 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
-// ---------------------------------------------------------------------------
+import type { RenderCtxLike as RenderContext, ThemeLike } from "./types.js";
 
-/** Lazy accessor to pi-tui's truncateToWidth */
+/** Thin wrapper over pi-tui's truncateToWidth (imported at top level above). */
 function _truncateToWidth(text: string, maxWidth: number, ellipsis?: string, pad?: boolean): string {
-	return require("@earendil-works/pi-tui").truncateToWidth(text, maxWidth, ellipsis, pad);
+	return truncateToWidth(text, maxWidth, ellipsis, pad);
 }
 
 // ---------------------------------------------------------------------------
@@ -73,7 +71,7 @@ function resolveTheme(): BundledTheme {
 	}
 }
 
-let THEME: BundledTheme = resolveTheme();
+const THEME: BundledTheme = resolveTheme();
 const _cache = new Map<string, string[]>();
 
 function _touch(k: string, v: string[]): string[] {
@@ -174,8 +172,7 @@ export function fillToolBackground(text: string, bg = BG_BASE, width?: number):
 				return bg ? bg + stripped : stripped;
 			}
 			const plainLead = line.replace(/\x1b\[[0-9;]*m/g, "");
-			const skipPad =
-				line.startsWith(TOOL_RESULT_INDENT) || plainLead.startsWith(TOOL_RESULT_INDENT);
+			const skipPad = line.startsWith(TOOL_RESULT_INDENT) || plainLead.startsWith(TOOL_RESULT_INDENT);
 			const fitted = _truncateToWidth(line, width, "", !skipPad);
 			const stripped = preserveBoxBackground(fitted);
 			return bg ? bg + stripped : stripped;
@@ -205,6 +202,11 @@ export function renderToolMetrics(result: AgentToolResult<Record<string, unknown
 	return `${FG_DIM}· ${[elapsed, chars].filter(Boolean).join(" · ")}${RST}`;
 }
 
+export function renderToolDuration(result: AgentToolResult<Record<string, unknown>>): string {
+	const details = result.details as Record<string, unknown> | undefined;
+	return formatElapsedMs(details?.[ELAPSED_KEY] as number | undefined);
+}
+
 // ---------------------------------------------------------------------------
 // Error renderer
 // ---------------------------------------------------------------------------
@@ -246,14 +248,7 @@ export async function renderFileContent(
 // Bash — colored exit status
 // ---------------------------------------------------------------------------
 
-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}`;
-
+export function renderBashOutput(text: string): string {
 	const lines = text.split("\n");
 	const maxShow = MAX_PREVIEW_LINES;
 	const show = lines.slice(0, maxShow);
@@ -262,7 +257,7 @@ export function renderBashOutput(text: string, exitCode: number | null): { summa
 	let body = show.join("\n");
 	if (remaining > 0) body += `\n${TOOL_RESULT_INDENT}${FG_DIM}… ${remaining} more lines${RST}`;
 
-	return { summary: codeStr, body };
+	return body;
 }
 
 // ---------------------------------------------------------------------------
@@ -391,7 +386,7 @@ export async function renderGrepResults(text: string, pattern: string): Promise<
 export function makeRenderCall(toolName: string) {
 	return (args: Record<string, unknown>, theme: ThemeLike, ctx: RenderContext) => {
 		resolveBaseBackground(theme);
-		const text = ctx.lastComponent ?? new (require("@earendil-works/pi-tui").Text)("", 0, 0);
+		const text = ctx.lastComponent ?? new TuiText("", 0, 0);
 		const bg = ctx.isError ? BG_ERROR : undefined;
 		text.setText(fillToolBackground(`${theme.fg("toolTitle", theme.bold(toolName))}`, bg));
 		return text;
@@ -401,7 +396,7 @@ export function makeRenderCall(toolName: string) {
 export function makeRenderResult() {
 	return (result: AgentToolResult<Record<string, unknown>>, _opt: unknown, theme: ThemeLike, ctx: RenderContext) => {
 		resolveBaseBackground(theme);
-		const text = ctx.lastComponent ?? new (require("@earendil-works/pi-tui").Text)("", 0, 0);
+		const text = ctx.lastComponent ?? new TuiText("", 0, 0);
 		if (ctx.isError) {
 			text.setText(renderToolError(getTextContent(result) || "Error", theme));
 			return text;
@@ -414,7 +409,13 @@ export function makeRenderResult() {
 			const preview = lines.slice(0, maxShow).join("\n");
 			const more = lines.length > maxShow ? `\n${FG_DIM}... ${lines.length - maxShow} more lines${RST}` : "";
 			const metrics = renderToolMetrics(result);
-			text.setText(fillToolBackground(`${TOOL_RESULT_INDENT}${preview}${more}${metrics ? `\n${TOOL_RESULT_INDENT}${metrics}` : ""}`, undefined, renderWidth));
+			text.setText(
+				fillToolBackground(
+					`${TOOL_RESULT_INDENT}${preview}${more}${metrics ? `\n${TOOL_RESULT_INDENT}${metrics}` : ""}`,
+					undefined,
+					renderWidth,
+				),
+			);
 		} else {
 			text.setText(fillToolBackground(`${TOOL_RESULT_INDENT}${theme.fg("dim", "(no text output)")}`));
 		}

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,