@heyhuynhgiabuu/pi-pretty 0.6.15 → 0.6.16

package/src/tools/find.ts

@@ -1,35 +1,85 @@
-/* pi-pretty: find tool -- FFF-backed file search with SDK fallback. */
+/* 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 { isAbsolute, relative as toRelative } from "node:path";
-import type {
-	SdkToolDef,
-	FindDetails,
-	FffServiceLike,
-	FileItem,
-	TextContent,
-	ThemeLike,
-	RenderCtxLike,
-	ComponentLike,
-} from "../types.js";
-import { resolveBaseBackground, BG_ERROR, FG_DIM, RST } from "../config.js";
+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 { 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";
 
 type Result = AgentToolResult<Record<string, unknown>>;
 
+function getText(result: Result): string {
+	return (result.content ?? [])
+		.filter((c) => c.type === "text")
+		.map((c) => (c as TextContent).text ?? "")
+		.join("\n");
+}
+
+function buildGlobPattern(pattern: string, path: string | undefined, basePath: string | null): string {
+	const raw = pattern.startsWith("/") ? pattern.slice(1) : pattern;
+	const normalized = normalizeFindGlobPattern(raw);
+	let cleanPath = path ?? "";
+	if (cleanPath && isAbsolute(cleanPath) && basePath) {
+		cleanPath = relative(basePath, cleanPath) || "";
+	}
+	cleanPath = cleanPath.replace(/\/$/, "");
+	if (cleanPath) {
+		if (normalized.startsWith("**/")) {
+			return `${cleanPath}/${normalized}`;
+		}
+		if (normalized.includes("/")) {
+			return `${cleanPath}/${normalized}`;
+		}
+		return `${cleanPath}/**/${normalized}`;
+	}
+	return normalized.startsWith("**/") || normalized.includes("/") ? normalized : `**/${normalized}`;
+}
+
+function appendFindNotices(result: Result, extra: string[]): Result {
+	if (extra.length === 0) return result;
+	const d = result.details;
+	if (!d || d._type !== "findResult") return result;
+	const prev = Array.isArray(d.notices) ? (d.notices as string[]) : [];
+	return { ...result, details: { ...d, notices: [...prev, ...extra] } };
+}
+
+async function sdkFindAsFindResult(
+	sdkTool: SdkToolDef,
+	tid: string,
+	params: Record<string, unknown>,
+	sig: AbortSignal | undefined,
+	ctx: ExtensionContext,
+	pattern: string,
+	extraNotices: string[],
+): Promise<Result> {
+	const result = (await sdkTool.execute(tid, params, sig, undefined, ctx)) as Result;
+	const tc = getText(result);
+	const prev = (result.details as FindDetails | undefined)?.notices ?? [];
+	const notices = [...(Array.isArray(prev) ? prev : []), ...extraNotices];
+	result.details = {
+		_type: "findResult",
+		text: tc,
+		pattern,
+		matchCount: tc ? tc.trim().split("\n").filter(Boolean).length : 0,
+		notices,
+	};
+	return result;
+}
+
 export function registerFindTool(
 	pi: ExtensionAPI,
 	cwd: string,
-	fffService: FffServiceLike | null | undefined,
+	fffService: FffServiceWithCursor | null | undefined,
 	sdkTool: SdkToolDef,
 	TextComp?: new (t?: string, x?: number, y?: number) => { setText(v: string): void },
 ): void {
@@ -44,32 +94,38 @@ export function registerFindTool(
 		renderShell: "self",
 
 		execute: wrapExecuteWithMetrics(async (tid, params, sig, _upd, ctx: ExtensionContext) => {
-			const pattern = String((params as any).pattern ?? "");
-			const path = (params as any).path ? String((params as any).path) : undefined;
-			const limit = (params as any).limit;
-			const glob = (params as any).glob;
-
+			const pattern = String(params.pattern ?? "");
+			const path = params.path ? String(params.path) : undefined;
+			const limit = params.limit;
 			const fff = fffService?.isAvailable ? fffService.getFinder() : null;
+
 			if (fff) {
 				try {
 					const effectiveLimit = Math.max(1, typeof limit === "number" ? limit : 100);
 					const basePathResult = fff.getBasePath();
 					const basePath = basePathResult.ok ? basePathResult.value : null;
-					let cleanPath = path ?? "";
-					if (cleanPath && isAbsolute(cleanPath) && basePath) {
-						cleanPath = toRelative(basePath, cleanPath) || "";
-					}
-					cleanPath = cleanPath.replace(/\/$/, "");
-					const cleanPattern = pattern.startsWith("/") ? pattern.slice(1) : pattern;
-					const globPattern = cleanPath ? `${cleanPath}/**/${cleanPattern}` : `**/${cleanPattern}`;
+					const globPattern = buildGlobPattern(pattern, path, basePath);
 					const searchResult = fff.glob(globPattern, { pageSize: effectiveLimit });
+
 					if (searchResult.ok) {
-						const items: FileItem[] = searchResult.value.items.slice(0, effectiveLimit);
+						const items = 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)
+						if (searchResult.value.totalMatched > items.length) {
 							notices.push(`${searchResult.value.totalMatched} total matches`);
+						}
+
+						if (items.length === 0 && isLikelyGlobPattern(pattern)) {
+							return sdkFindAsFindResult(sdkTool, tid, params, sig, ctx, pattern, [
+								"FFF glob returned no matches; results from SDK find (fd).",
+								...notices,
+							]);
+						}
+
+						if (items.length > 0) notices.push("Search engine: FFF glob.");
+						else if (notices.length === 0) notices.push("Search engine: FFF glob (no matches).");
+
 						const paths = items.map((i) => i.relativePath).join("\n");
 						return {
 							content: [{ type: "text" as const, text: paths }],
@@ -79,7 +135,7 @@ export function registerFindTool(
 								pattern,
 								matchCount: items.length,
 								notices,
-							} as FindDetails,
+							},
 						};
 					}
 				} catch {
@@ -87,82 +143,85 @@ export function registerFindTool(
 				}
 			}
 
-			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;
-			return result;
+			return sdkFindAsFindResult(sdkTool, tid, params, sig, ctx, pattern, [
+				fff ? "FFF find unavailable; results from SDK find (fd)." : "Search engine: SDK find (fd).",
+			]);
 		}),
 
 		renderCall(args: any, theme: ThemeLike, ctx: RenderCtxLike) {
 			resolveBaseBackground(theme);
-			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 limit = args.limit;
-			const glob = args.glob;
+			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 limit = a.limit;
 			const findLabel = theme.fg("toolTitle", theme.bold("find"));
 			const patternPart = pattern ? theme.fg("accent", pattern) : "";
 			const inPart = theme.fg("dim", " in ");
-			const pathPart = theme.fg("toolOutput", path);
-			const limitPart = limit !== undefined && limit !== null ? theme.fg("dim", ` limit ${limit}`) : "";
+			const pathPart = theme.fg("toolOutput", pathArg);
+			const limitPart =
+				limit !== undefined && limit !== null ? theme.fg("dim", ` limit ${limit}`) : "";
 			const out = `${findLabel} ${patternPart}${inPart}${pathPart}${limitPart}`;
-			text.setText(fillToolBackground(`  \n  ${out}`, ctx.isError ? BG_ERROR : undefined));
+			text.setText(
+				fillToolBackground(
+					`\n${TOOL_RESULT_INDENT}${out}`,
+					ctx.isError ? BG_ERROR : undefined,
+				),
+			);
 			return text;
 		},
 
 		renderResult(result: Result, _opt: unknown, theme: ThemeLike, ctx: RenderCtxLike) {
 			resolveBaseBackground(theme);
-			const text = ctx.lastComponent ?? new TC("", 0, 0);
+			const r = result;
+			const text = (ctx as RenderCtxLike).lastComponent ?? new TC("", 0, 0);
 			if (ctx.isError) {
-				text.setText(renderToolError(getText(result) || "Error", theme));
+				text.setText(renderToolError(getText(r) || "Error", theme));
 				return text;
 			}
-			const d = result.details as FindDetails | undefined;
+			const d = r.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  `));
+					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`,
+						),
+					);
+					return text;
+				}
+				if (!ctx.expanded) {
+					text.setText(
+						fillToolBackground(
+							`${TOOL_RESULT_INDENT}${FG_DIM}${d.matchCount} files — ctrl+o to expand${RST}${renderToolMetrics(r)}\n`,
+						),
+					);
 					return text;
 				}
 				const rendered = renderFindResults(d.text, theme)
 					.split("\n")
-					.map((l) => `  ${l}`)
+					.map((l) => `${TOOL_RESULT_INDENT}${l}`)
 					.join("\n");
-				const notices = (d as any).notices as string[] | undefined;
-				const noticeStr = notices?.length ? `\n  ${theme.fg("warning", `[${notices.join(". ")}]`)}` : "";
+				const noticeStr = d.notices?.length
+					? `\n${TOOL_RESULT_INDENT}${theme.fg("warning", `[${d.notices.join(". ")}]`)}`
+					: "";
 				text.setText(
 					fillToolBackground(
-						`  \n  ${theme.fg("dim", `${d.matchCount} files`)}${renderToolMetrics(result)}\n${rendered}${noticeStr}\n  `,
+						`\n${TOOL_RESULT_INDENT}${theme.fg("dim", `${d.matchCount} files`)}${renderToolMetrics(r)}\n${rendered}${noticeStr}\n`,
 					),
 				);
 				return text;
 			}
-			const fc = result.content?.[0];
+			const fc = r.content?.[0] as TextContent | undefined;
 			text.setText(
 				fillToolBackground(
-					`  \n  ${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "0 files")}\n  `,
+					`\n${TOOL_RESULT_INDENT}${theme.fg("dim", 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") ?? ""
-	);
-}
+	} as unknown as ToolDefinition);
+}

package/src/tools/grep.ts

@@ -7,7 +7,7 @@ import {
 	type AgentToolResult,
 } from "@earendil-works/pi-coding-agent";
 import type { SdkToolDef, GrepDetails, FffServiceWithCursor, TextContent, ThemeLike, RenderCtxLike } from "../types.js";
-import { MAX_PREVIEW_LINES, BG_ERROR, resolveBaseBackground } from "../config.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";
@@ -116,7 +116,7 @@ export function registerGrepTool(
 			if (limit !== undefined && limit !== null) out += theme.fg("dim", ` limit ${limit}`);
 			if (literal) out += theme.fg("dim", ` (literal)`);
 			if (caseInsensitive) out += theme.fg("dim", ` (case-insensitive)`);
-			text.setText(fillToolBackground(`\n  ${out}`, ctx.isError ? BG_ERROR : undefined));
+			text.setText(fillToolBackground(`\n${TOOL_RESULT_INDENT}${out}`, ctx.isError ? BG_ERROR : undefined));
 			return text;
 		},
 
@@ -138,7 +138,16 @@ export function registerGrepTool(
 			const d = result.details as GrepDetails | undefined;
 			if (d?._type === "grepResult" && d.text) {
 				const lines = d.text.split("\n");
-				const maxShow = ctx.expanded ? lines.length : Math.min(lines.length, MAX_PREVIEW_LINES);
+				if (!ctx.expanded) {
+					text.setText(
+						fillToolBackground(
+							`${TOOL_RESULT_INDENT}${FG_DIM}${lines.length} lines — ctrl+o to expand${RST}\n`,
+							ctx.isError ? BG_ERROR : undefined,
+						),
+					);
+					return text;
+				}
+				const maxShow = lines.length;
 				const show = lines.slice(0, maxShow);
 				const remaining = lines.length - maxShow;
 				const out: string[] = [];
@@ -149,13 +158,13 @@ export function registerGrepTool(
 				if (remaining > 0) {
 					out.push(theme.fg("muted", `… (${remaining} more ${remaining === 1 ? "line" : "lines"}, to expand)`));
 				}
-				const body = out.map((l) => `  ${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(`  ${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/ls.ts

@@ -7,7 +7,7 @@ import {
 	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 { TOOL_RESULT_INDENT, 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";
@@ -56,7 +56,7 @@ export function registerLsTool(
 			let out = theme.fg("toolTitle", theme.bold("ls"));
 			if (path) out += ` ${theme.fg("accent", path)}`;
 			if (limit !== undefined && limit !== null) out += theme.fg("toolOutput", ` (limit ${limit})`);
-			text.setText(fillToolBackground(`  \n  ${out}`, ctx.isError ? BG_ERROR : undefined));
+			text.setText(fillToolBackground(`\n${TOOL_RESULT_INDENT}${out}`, ctx.isError ? BG_ERROR : undefined));
 			return text;
 		},
 
@@ -70,20 +70,28 @@ export function registerLsTool(
 			}
 			const d = result.details as LsDetails | undefined;
 			if (d?._type === "lsResult" && d.text) {
+				if (!ctx.expanded) {
+					text.setText(
+						fillToolBackground(
+							`${TOOL_RESULT_INDENT}${FG_DIM}${d.entryCount} entries — ctrl+o to expand${RST}${renderToolMetrics(result)}\n`,
+						),
+					);
+					return text;
+				}
 				const rendered = renderTree(d.text, d.path)
 					.split("\n")
-					.map((l) => `  ${l}`)
+					.map((l) => `${TOOL_RESULT_INDENT}${l}`)
 					.join("\n");
 				text.setText(
 					fillToolBackground(
-						`  \n  ${FG_DIM}${d.entryCount} entries${RST}${renderToolMetrics(result)}\n${rendered}\n  `,
+						`\n${TOOL_RESULT_INDENT}${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")}`),
+				fillToolBackground(`${TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "done")}`),
 			);
 			return text;
 		},

package/src/tools/multi-grep.ts

@@ -16,7 +16,7 @@ import type {
 	ThemeLike,
 	RenderCtxLike,
 } from "../types.js";
-import { resolveBaseBackground, MAX_PREVIEW_LINES, BG_ERROR, FG_DIM, FG_LNUM, FG_RULE, RST } from "../config.js";
+import { TOOL_RESULT_INDENT, resolveBaseBackground, MAX_PREVIEW_LINES, BG_ERROR, FG_DIM, FG_LNUM, FG_RULE, RST } from "../config.js";
 import { shortPath, normalizeLineEndings } from "../helpers.js";
 import { wrapExecuteWithMetrics } from "./metrics.js";
 import { renderToolError, renderToolMetrics, fillToolBackground } from "../render.js";
@@ -256,7 +256,7 @@ export function registerMultiGrepTool(
 			let out = `${theme.fg("toolTitle", theme.bold("mgrep"))} ${theme.fg("accent", `/${patternStr || ""}/`)}${theme.fg("toolOutput", ` in ${path}`)}`;
 			if (literal) out += theme.fg("dim", ` (literal)`);
 			if (limit !== undefined) out += theme.fg("dim", ` limit ${limit}`);
-			text.setText(fillToolBackground(`\n  ${out}`, ctx.isError ? BG_ERROR : undefined));
+			text.setText(fillToolBackground(`\n${TOOL_RESULT_INDENT}${out}`, ctx.isError ? BG_ERROR : undefined));
 			return text;
 		},
 
@@ -271,7 +271,15 @@ export function registerMultiGrepTool(
 			const d = result.details as GrepDetails | undefined;
 			if (d?._type === "grepResult" && d.text) {
 				const lines = d.text.split("\n");
-				const maxShow = ctx.expanded ? lines.length : Math.min(lines.length, MAX_PREVIEW_LINES);
+				if (!ctx.expanded) {
+					text.setText(
+						fillToolBackground(
+							`${TOOL_RESULT_INDENT}${FG_DIM}${lines.length} lines — ctrl+o to expand${RST}${renderToolMetrics(result)}\n`,
+						),
+					);
+					return text;
+				}
+				const maxShow = lines.length;
 				const show = lines.slice(0, maxShow);
 				const nw = Math.max(3, 5);
 
@@ -288,27 +296,27 @@ export function registerMultiGrepTool(
 						const [, file, lineNo, content] = fileMatch;
 						if (file !== currentFile) {
 							if (currentFile) out.push("");
-							out.push(`  ${theme.fg("accent", theme.bold(file))}`);
+							out.push(`${TOOL_RESULT_INDENT}${theme.fg("accent", theme.bold(file))}`);
 							currentFile = file;
 						}
 						let display = content;
 						if (hlRe) display = content.replace(hlRe, (m) => `${RST}${theme.fg("warning", theme.bold(m))}${RST}`);
 						const padded = `${FG_LNUM}${String(lineNo).padStart(nw)}${RST} ${FG_RULE}│${RST} ${display}${RST}`;
-						out.push(`  ${padded}`);
+						out.push(`${TOOL_RESULT_INDENT}${padded}`);
 					} else if (line.trim()) {
-						out.push(`  ${FG_DIM}  ${line.trim()}${RST}`);
+						out.push(`${TOOL_RESULT_INDENT}${FG_DIM}${line.trim()}${RST}`);
 					}
 				}
 				const preview = out.join("\n");
-				const more = lines.length > maxShow ? `\n${FG_DIM}  ... ${lines.length - maxShow} more lines${RST}` : "";
+				const more = lines.length > maxShow ? `\n${TOOL_RESULT_INDENT}${FG_DIM}... ${lines.length - maxShow} more lines${RST}` : "";
 				text.setText(
-					fillToolBackground(`  ${FG_DIM}${d.matchCount} matches${RST}${renderToolMetrics(result)}\n${preview}${more}`),
+					fillToolBackground(`${TOOL_RESULT_INDENT}${FG_DIM}${d.matchCount} matches${RST}${renderToolMetrics(result)}\n${preview}${more}`),
 				);
 				return text;
 			}
 			const fc = result.content?.[0];
 			text.setText(
-				fillToolBackground(`  ${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "no matches")}`),
+				fillToolBackground(`${TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 120) : "no matches")}`),
 			);
 			return text;
 		},

package/src/tools/read.ts

@@ -8,6 +8,7 @@ import {
 } 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,
@@ -124,7 +125,7 @@ export function registerReadTool(
 				const fc = result.content?.[0];
 				text.setText(
 					fillToolBackground(
-						`  ${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 80) : `[image: ${d.filePath}]`)}`,
+						`${TOOL_RESULT_INDENT}${theme.fg("dim", fc && "text" in fc ? String(fc.text).slice(0, 80) : `[image: ${d.filePath}]`)}`,
 					),
 				);
 				return text;
@@ -135,28 +136,36 @@ export function registerReadTool(
 				const tw = termWidth();
 				const lines = d.content.split("\n");
 				const total = lines.length;
-				const maxShow = ctx.expanded ? lines.length : Math.min(lines.length, MAX_PREVIEW_LINES);
+				const p2 = shortPath(cwd, home, String(d.filePath ?? ""));
+				const off2 = typeof d.offset === "number" ? `:${d.offset}` : "";
+				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`,
+						),
+					);
+					return text;
+				}
+				const maxShow = lines.length;
 				const show = lines.slice(0, maxShow);
 				const nw = Math.max(3, String(total).length);
 				const gw = nw + 3;
 				const cw = Math.max(1, tw - gw);
 
-				const p2 = shortPath(cwd, home, String(d.filePath ?? ""));
-				const off2 = typeof d.offset === "number" ? `:${d.offset}` : "";
 				const header = `${theme.fg("toolTitle", theme.bold("read"))} ${theme.fg("accent", p2)}${theme.fg("dim", off2)}`;
-				const out: string[] = ["", `  ${header}`];
-				out.push(`  ${FG_RULE}${"─".repeat(tw - 2)}${RST}`);
+				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++) {
 					const ln = (d.offset || 0) + i + 1;
 					const code = show[i] ?? "";
 					const display = code.length > cw ? code.slice(0, cw) + `${FG_DIM}›${RST}` : code;
 					const lineNo = String(ln);
 					out.push(
-						`  ${FG_LNUM}${" ".repeat(Math.max(0, nw - lineNo.length))}${lineNo}${RST} ${FG_RULE}│${RST} ${display}${RST}`,
+						`${TOOL_RESULT_INDENT}${FG_LNUM}${" ".repeat(Math.max(0, nw - lineNo.length))}${lineNo}${RST} ${FG_RULE}│${RST} ${display}${RST}`,
 					);
 				}
 				if (total > maxShow) {
-					out.push(`  ${FG_DIM}  … ${total - maxShow} more lines (${total} total)${RST}`);
+					out.push(`${TOOL_RESULT_INDENT}${FG_DIM}… ${total - maxShow} more lines (${total} total)${RST}`);
 				}
 				out.push("");
 				const rendered = out.join("\n");
@@ -168,9 +177,9 @@ export function registerReadTool(
 					.then((hl) => {
 						const padded = hl
 							.split("\n")
-							.map((l) => `  ${l}`)
+							.map((l) => `${TOOL_RESULT_INDENT}${l}`)
 							.join("\n");
-						const rendered = `\n  ${header}\n${padded}\n`;
+						const rendered = `\n${TOOL_RESULT_INDENT}${header}\n${padded}\n`;
 						text.setText(fillToolBackground(rendered));
 						(ctx as any).state._rt = rendered;
 					})
@@ -181,7 +190,7 @@ export function registerReadTool(
 
 			const fc = result.content?.[0];
 			text.setText(
-				fillToolBackground(`  ${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/types.ts

@@ -73,6 +73,7 @@ export interface FindDetails extends Record<string, unknown> {
 	text: string;
 	pattern: string;
 	matchCount: number;
+	notices?: string[];
 }
 
 export interface GrepDetails extends Record<string, unknown> {