@heyhuynhgiabuu/pi-pretty 0.6.7 → 0.6.8

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

@@ -11,6 +11,7 @@ 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";
 
@@ -25,14 +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({

package/src/tools/ls.ts

@@ -1,11 +1,17 @@
 /* pi-pretty: ls tool -- directory listing 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, LsDetails, TextContent, ComponentLike, ThemeLike, RenderCtxLike } from "../types.js";
 import { resolveBaseBackground, termWidth, MAX_PREVIEW_LINES, BG_BASE, BG_ERROR, FG_DIM, RST } from "../config.js";
 import { shortPath } from "../helpers.js";
 import { wrapExecuteWithMetrics } from "./metrics.js";
 import { renderTree, renderToolError, renderToolMetrics, fillToolBackground } from "../render.js";
+import { resolveTextCtor } from "../tui-text.js";
 
 type Result = AgentToolResult<Record<string, unknown>>;
 
@@ -17,10 +23,7 @@ export function registerLsTool(
 	TextComp?: new (t?: string, x?: number, y?: number) => { setText(v: string): void },
 ): void {
 	const home = process.env.HOME ?? "";
-	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: "ls",
@@ -30,9 +33,14 @@ export function registerLsTool(
 		renderShell: "self",
 
 		execute: wrapExecuteWithMetrics(async (tid, params, sig, _upd, ctx: ExtensionContext) => {
-			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: "lsResult", text: tc, path: String((params as any).path ?? ""), entryCount: tc ? tc.trim().split("\n").filter(Boolean).length : 0 } as LsDetails;
+			result.details = {
+				_type: "lsResult",
+				text: tc,
+				path: String((params as any).path ?? ""),
+				entryCount: tc ? tc.trim().split("\n").filter(Boolean).length : 0,
+			} as LsDetails;
 			return result;
 		}),
 
@@ -40,7 +48,10 @@ export function registerLsTool(
 			resolveBaseBackground(theme);
 			const text = ctx.lastComponent ?? new TC("", 0, 0);
 			const rawPath = args.path;
-			const path = rawPath === null || rawPath === undefined || String(rawPath).length === 0 ? "" : shortPath(cwd, home, String(rawPath));
+			const path =
+				rawPath === null || rawPath === undefined || String(rawPath).length === 0
+					? ""
+					: shortPath(cwd, home, String(rawPath));
 			const limit = args.limit;
 			let out = theme.fg("toolTitle", theme.bold("ls"));
 			if (path) out += ` ${theme.fg("accent", path)}`;
@@ -51,22 +62,39 @@ export function registerLsTool(
 
 		renderResult(result: Result, _opt: unknown, theme: ThemeLike, ctx: RenderCtxLike) {
 			resolveBaseBackground(theme);
-			
+
 			const text = ctx.lastComponent ?? new TC("", 0, 0);
-			if (ctx.isError) { text.setText(renderToolError(getText(result) || "Error", theme)); return text; }
+			if (ctx.isError) {
+				text.setText(renderToolError(getText(result) || "Error", theme));
+				return text;
+			}
 			const d = result.details as LsDetails | undefined;
 			if (d?._type === "lsResult" && d.text) {
-				const rendered = renderTree(d.text, d.path).split("\n").map(l => `  ${l}`).join("\n");
-				text.setText(fillToolBackground(`  \n  ${FG_DIM}${d.entryCount} entries${RST}${renderToolMetrics(result)}\n${rendered}\n  `));
+				const rendered = renderTree(d.text, d.path)
+					.split("\n")
+					.map((l) => `  ${l}`)
+					.join("\n");
+				text.setText(
+					fillToolBackground(
+						`  \n  ${FG_DIM}${d.entryCount} entries${RST}${renderToolMetrics(result)}\n${rendered}\n  `,
+					),
+				);
 				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 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") ?? ""
+	);
 }