@oh-my-pi/pi-coding-agent 8.0.20 → 8.2.0

package/src/tools/fetch.ts

@@ -1,26 +1,27 @@
-import { mkdir, rm } from "node:fs/promises";
+import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { type Theme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import fetchDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/fetch.md" with { type: "text" };
-import type { OutputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
-import { ToolAbortError } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
-import { ensureTool } from "@oh-my-pi/pi-coding-agent/utils/tools-manager";
-import { specialHandlers } from "@oh-my-pi/pi-coding-agent/web/scrapers/index";
-import type { RenderResult } from "@oh-my-pi/pi-coding-agent/web/scrapers/types";
-import { finalizeOutput, loadPage, MAX_OUTPUT_CHARS } from "@oh-my-pi/pi-coding-agent/web/scrapers/types";
-import { convertWithMarkitdown, fetchBinary } from "@oh-my-pi/pi-coding-agent/web/scrapers/utils";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { ptree } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { nanoid } from "nanoid";
 import { parse as parseHtml } from "node-html-parser";
-import type { ToolSession } from "./index";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { type Theme, theme } from "../modes/theme/theme";
+import fetchDescription from "../prompts/tools/fetch.md" with { type: "text" };
+import { renderOutputBlock, renderStatusLine } from "../tui";
+import { ensureTool } from "../utils/tools-manager";
+import { specialHandlers } from "../web/scrapers";
+import type { RenderResult } from "../web/scrapers/types";
+import { finalizeOutput, loadPage, MAX_OUTPUT_CHARS } from "../web/scrapers/types";
+import { convertWithMarkitdown, fetchBinary } from "../web/scrapers/utils";
+import type { ToolSession } from ".";
 import { applyListLimit } from "./list-limit";
+import type { OutputMeta } from "./output-meta";
 import { formatExpandHint } from "./render-utils";
+import { ToolAbortError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 
 // =============================================================================
@@ -449,7 +450,6 @@ async function renderHtmlToText(
 	timeout: number,
 	scratchDir: string,
 ): Promise<{ content: string; ok: boolean; method: string }> {
-	await mkdir(scratchDir, { recursive: true });
 	const tmpFile = path.join(scratchDir, `omp-${nanoid()}.html`);
 
 	try {
@@ -478,7 +478,7 @@ async function renderHtmlToText(
 		return { content: "", ok: false, method: "none" };
 	} finally {
 		try {
-			await rm(tmpFile, { force: true });
+			await fs.rm(tmpFile, { force: true });
 		} catch {}
 	}
 }
@@ -497,13 +497,13 @@ function isLowQualityOutput(content: string): boolean {
 		"please enable javascript",
 		"browser not supported",
 	];
-	if (content.length < 1024 && jsGated.some((t) => lower.includes(t))) {
+	if (content.length < 1024 && jsGated.some(t => lower.includes(t))) {
 		return true;
 	}
 
 	// Mostly navigation (high link/menu density)
-	const lines = content.split("\n").filter((l) => l.trim());
-	const shortLines = lines.filter((l) => l.trim().length < 40);
+	const lines = content.split("\n").filter(l => l.trim());
+	const shortLines = lines.filter(l => l.trim().length < 40);
 	if (lines.length > 10 && shortLines.length / lines.length > 0.7) {
 		return true;
 	}
@@ -694,7 +694,7 @@ async function renderUrl(
 	if (isHtml && !raw) {
 		// 5A: Check for page-specific markdown alternate
 		const alternates = parseAlternateLinks(rawContent, finalUrl);
-		const markdownAlt = alternates.find((alt) => alt.endsWith(".md") || alt.includes("markdown"));
+		const markdownAlt = alternates.find(alt => alt.endsWith(".md") || alt.includes("markdown"));
 		if (markdownAlt) {
 			const resolved = markdownAlt.startsWith("http") ? markdownAlt : new URL(markdownAlt, finalUrl).href;
 			const altResult = await loadPage(resolved, { timeout, signal });
@@ -766,7 +766,7 @@ async function renderUrl(
 		}
 
 		// 5E: Check for feed alternates
-		const feedAlternates = alternates.filter((alt) => !alt.endsWith(".md") && !alt.includes("markdown"));
+		const feedAlternates = alternates.filter(alt => !alt.endsWith(".md") && !alt.includes("markdown"));
 		for (const altUrl of feedAlternates.slice(0, 2)) {
 			const resolved = altUrl.startsWith("http") ? altUrl : new URL(altUrl, finalUrl).href;
 			const altResult = await loadPage(resolved, { timeout, signal });
@@ -983,7 +983,7 @@ function getDomain(url: string): string {
 
 /** Count non-empty lines */
 function countNonEmptyLines(text: string): number {
-	return text.split("\n").filter((l) => l.trim()).length;
+	return text.split("\n").filter(l => l.trim()).length;
 }
 
 /** Render fetch call (URL preview) */
@@ -993,8 +993,11 @@ export function renderFetchCall(
 ): Component {
 	const domain = getDomain(args.url);
 	const path = truncate(args.url.replace(/^https?:\/\/[^/]+/, ""), 50, uiTheme.format.ellipsis);
-	const icon = uiTheme.styledSymbol("status.pending", "muted");
-	const text = `${icon} ${uiTheme.fg("toolTitle", "Fetch")} ${uiTheme.fg("accent", domain)}${uiTheme.fg("dim", path)}`;
+	const description = `${domain}${path ? ` ${path}` : ""}`.trim();
+	const meta: string[] = [];
+	if (args.raw) meta.push("raw");
+	if (args.timeout !== undefined) meta.push(`timeout:${args.timeout}s`);
+	const text = renderStatusLine({ icon: "pending", title: "Fetch", description, meta }, uiTheme);
 	return new Text(text, 0, 0);
 }
 
@@ -1012,125 +1015,82 @@ export function renderFetchResult(
 	}
 
 	const domain = getDomain(details.finalUrl);
+	const path = truncate(details.finalUrl.replace(/^https?:\/\/[^/]+/, ""), 50, uiTheme.format.ellipsis);
 	const hasRedirect = details.url !== details.finalUrl;
 	const hasNotes = details.notes.length > 0;
 	const truncation = details.meta?.truncation;
 	const truncated = Boolean(details.truncated || truncation);
-	const statusIcon = truncated
-		? uiTheme.styledSymbol("status.warning", "warning")
-		: uiTheme.styledSymbol("status.success", "success");
-	const expandHint = formatExpandHint(uiTheme, expanded);
-	const expandSuffix = expandHint ? ` ${expandHint}` : "";
-	let text = `${statusIcon} ${uiTheme.fg("accent", `(${domain})`)}${uiTheme.sep.dot}${uiTheme.fg("dim", details.method)}${expandSuffix}`;
-
-	// Get content text
+
+	const header = renderStatusLine(
+		{
+			icon: truncated ? "warning" : "success",
+			title: "Fetch",
+			description: `${domain}${path ? ` ${path}` : ""}`,
+		},
+		uiTheme,
+	);
+
 	const contentText = result.content[0]?.text ?? "";
-	// Extract just the content part (after the --- separator)
 	const contentBody = contentText.includes("---\n\n")
 		? contentText.split("---\n\n").slice(1).join("---\n\n")
 		: contentText;
 	const lineCount = countNonEmptyLines(contentBody);
 	const charCount = contentBody.trim().length;
-	const contentLines = contentBody.split("\n").filter((l) => l.trim());
-
-	if (!expanded) {
-		// Collapsed view: metadata + preview
-		const metaLines: string[] = [
-			`${uiTheme.fg("muted", "Content-Type:")} ${details.contentType || "unknown"}`,
-			`${uiTheme.fg("muted", "Method:")} ${details.method}`,
-		];
-		if (hasRedirect) {
-			metaLines.push(`${uiTheme.fg("muted", "Final URL:")} ${uiTheme.fg("mdLinkUrl", details.finalUrl)}`);
-		}
-		if (truncated) {
-			metaLines.push(uiTheme.fg("warning", `${uiTheme.status.warning} Output truncated`));
-			if (truncation?.artifactId) {
-				metaLines.push(uiTheme.fg("warning", `Full output: artifact://${truncation.artifactId}`));
-			}
-		}
-		if (hasNotes) {
-			metaLines.push(`${uiTheme.fg("muted", "Notes:")} ${details.notes.join("; ")}`);
-		}
-
-		const previewLimit = 3;
-		const previewList = applyListLimit(contentLines, { headLimit: previewLimit });
-		const previewLines = previewList.items.map((line) => truncate(line.trim(), 100, uiTheme.format.ellipsis));
-		const detailLines: string[] = [...metaLines];
-
-		if (previewLines.length === 0) {
-			detailLines.push(uiTheme.fg("dim", "(no content)"));
-		} else {
-			for (const line of previewLines) {
-				detailLines.push(uiTheme.fg("dim", line));
-			}
-		}
-
-		const remaining = Math.max(0, contentLines.length - previewLines.length);
-		if (remaining > 0) {
-			detailLines.push(uiTheme.fg("muted", `${uiTheme.format.ellipsis} ${remaining} more lines`));
-		} else {
-			const lineLabel = `${lineCount} line${lineCount === 1 ? "" : "s"}`;
-			detailLines.push(uiTheme.fg("muted", `${lineLabel}${uiTheme.sep.dot}${charCount} chars`));
-		}
-
-		for (let i = 0; i < detailLines.length; i++) {
-			const isLast = i === detailLines.length - 1;
-			const branch = isLast ? uiTheme.tree.last : uiTheme.tree.vertical;
-			text += `\n ${uiTheme.fg("dim", branch)}  ${detailLines[i]}`;
-		}
-	} else {
-		// Expanded view: structured metadata + bounded content preview
-		const metaLines: string[] = [
-			`${uiTheme.fg("muted", "Content-Type:")} ${details.contentType || "unknown"}`,
-			`${uiTheme.fg("muted", "Method:")} ${details.method}`,
-		];
-		if (hasRedirect) {
-			metaLines.push(`${uiTheme.fg("muted", "Final URL:")} ${uiTheme.fg("mdLinkUrl", details.finalUrl)}`);
-		}
-		const lineLabel = `${lineCount} line${lineCount === 1 ? "" : "s"}`;
-		metaLines.push(`${uiTheme.fg("muted", "Lines:")} ${lineLabel}`);
-		metaLines.push(`${uiTheme.fg("muted", "Chars:")} ${charCount}`);
-		if (truncated) {
-			metaLines.push(uiTheme.fg("warning", `${uiTheme.status.warning} Output truncated`));
-			if (truncation?.artifactId) {
-				metaLines.push(uiTheme.fg("warning", `Full output: artifact://${truncation.artifactId}`));
-			}
-		}
-		if (hasNotes) {
-			metaLines.push(`${uiTheme.fg("muted", "Notes:")} ${details.notes.join("; ")}`);
-		}
+	const contentLines = contentBody.split("\n").filter(l => l.trim());
 
-		text += `\n ${uiTheme.fg("dim", uiTheme.tree.branch)} ${uiTheme.fg("accent", "Metadata")}`;
-		for (let i = 0; i < metaLines.length; i++) {
-			const isLast = i === metaLines.length - 1;
-			const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-			text += `\n ${uiTheme.fg("dim", uiTheme.tree.vertical)}  ${uiTheme.fg("dim", branch)} ${metaLines[i]}`;
-		}
-
-		text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("accent", "Content Preview")}`;
-		const previewLimit = 12;
-		const previewList = applyListLimit(contentLines, { headLimit: previewLimit });
-		const previewLines = previewList.items.map((line) => truncate(line.trim(), 120, uiTheme.format.ellipsis));
-		const remaining = Math.max(0, contentLines.length - previewLines.length);
-		const contentPrefix = uiTheme.fg("dim", " ");
-
-		if (previewLines.length === 0) {
-			text += `\n ${contentPrefix}   ${uiTheme.fg("dim", "(no content)")}`;
-		} else {
-			for (const line of previewLines) {
-				text += `\n ${contentPrefix}   ${uiTheme.fg("dim", line)}`;
-			}
+	const metadataLines: string[] = [
+		`${uiTheme.fg("muted", "Content-Type:")} ${details.contentType || "unknown"}`,
+		`${uiTheme.fg("muted", "Method:")} ${details.method}`,
+	];
+	if (hasRedirect) {
+		metadataLines.push(`${uiTheme.fg("muted", "Final URL:")} ${uiTheme.fg("mdLinkUrl", details.finalUrl)}`);
+	}
+	const lineLabel = `${lineCount} line${lineCount === 1 ? "" : "s"}`;
+	metadataLines.push(`${uiTheme.fg("muted", "Lines:")} ${lineLabel}`);
+	metadataLines.push(`${uiTheme.fg("muted", "Chars:")} ${charCount}`);
+	if (truncated) {
+		metadataLines.push(uiTheme.fg("warning", `${uiTheme.status.warning} Output truncated`));
+		if (truncation?.artifactId) {
+			metadataLines.push(uiTheme.fg("warning", `Full output: artifact://${truncation.artifactId}`));
 		}
+	}
+	if (hasNotes) {
+		metadataLines.push(`${uiTheme.fg("muted", "Notes:")} ${details.notes.join("; ")}`);
+	}
 
-		if (remaining > 0) {
-			text += `\n ${contentPrefix}   ${uiTheme.fg("muted", `${uiTheme.format.ellipsis} ${remaining} more lines`)}`;
-		}
+	const previewLimit = expanded ? 12 : 3;
+	const previewList = applyListLimit(contentLines, { headLimit: previewLimit });
+	const previewLines = previewList.items.map(line => truncate(line.trimEnd(), 120, uiTheme.format.ellipsis));
+	const remaining = Math.max(0, contentLines.length - previewLines.length);
+	const contentPreviewLines =
+		previewLines.length > 0 ? previewLines.map(line => uiTheme.fg("dim", line)) : [uiTheme.fg("dim", "(no content)")];
+	if (remaining > 0) {
+		const hint = formatExpandHint(uiTheme, expanded, true);
+		contentPreviewLines.push(
+			uiTheme.fg("muted", `${uiTheme.format.ellipsis} ${remaining} more lines${hint ? ` ${hint}` : ""}`),
+		);
 	}
 
-	return new Text(text, 0, 0);
+	return {
+		render: (width: number) =>
+			renderOutputBlock(
+				{
+					header,
+					state: truncated ? "warning" : "success",
+					sections: [
+						{ label: uiTheme.fg("toolTitle", "Metadata"), lines: metadataLines },
+						{ label: uiTheme.fg("toolTitle", "Content Preview"), lines: contentPreviewLines },
+					],
+					width,
+				},
+				uiTheme,
+			),
+		invalidate: () => {},
+	};
 }
 
 export const fetchToolRenderer = {
 	renderCall: renderFetchCall,
 	renderResult: renderFetchResult,
+	mergeCallAndResult: true,
 };

package/src/tools/find.ts

@@ -1,23 +1,23 @@
 import path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { getLanguageFromPath, type Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import findDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/find.md" with { type: "text" };
-import type { OutputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
-import { ToolAbortError, ToolError, throwIfAborted } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
-import { ensureTool } from "@oh-my-pi/pi-coding-agent/utils/tools-manager";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { ptree, untilAborted } from "@oh-my-pi/pi-utils";
 import type { Static } from "@sinclair/typebox";
 import { Type } from "@sinclair/typebox";
-
-import type { ToolSession } from "./index";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import type { Theme } from "../modes/theme/theme";
+import findDescription from "../prompts/tools/find.md" with { type: "text" };
+import { renderFileList, renderStatusLine, renderTreeList } from "../tui";
+import { ensureTool } from "../utils/tools-manager";
+import type { ToolSession } from ".";
 import { applyListLimit } from "./list-limit";
+import type { OutputMeta } from "./output-meta";
 import { resolveToCwd } from "./path-utils";
-import { PREVIEW_LIMITS, ToolUIKit } from "./render-utils";
+import { formatCount, formatEmptyMessage, formatErrorMessage, PREVIEW_LIMITS } from "./render-utils";
+import { ToolAbortError, ToolError, throwIfAborted } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { type TruncationResult, truncateHead } from "./truncate";
 
@@ -34,6 +34,7 @@ const findSchema = Type.Object({
 });
 
 const DEFAULT_LIMIT = 1000;
+const FD_TIMEOUT_MS = 5000;
 
 export interface FindToolDetails {
 	truncation?: TruncationResult;
@@ -132,6 +133,11 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 
 		return untilAborted(signal, async () => {
 			const searchPath = resolveToCwd(searchDir || ".", this.session.cwd);
+
+			if (searchPath === "/") {
+				throw new ToolError("Searching from root directory '/' is not allowed");
+			}
+
 			const scopePath = (() => {
 				const relative = path.relative(this.session.cwd, searchPath).replace(/\\/g, "/");
 				return relative.length === 0 ? "." : relative;
@@ -157,7 +163,7 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 				}
 
 				// Relativize paths
-				const relativized = results.map((p) => {
+				const relativized = results.map(p => {
 					if (p.startsWith(searchPath)) {
 						return p.slice(searchPath.length + 1);
 					}
@@ -246,7 +252,9 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 					"--absolute-path",
 					searchPath,
 				];
-				const { stdout: gitignoreStdout } = await runFd(fdPath, gitignoreArgs, signal);
+				const timeoutSignal = AbortSignal.timeout(FD_TIMEOUT_MS);
+				const combinedSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
+				const { stdout: gitignoreStdout } = await runFd(fdPath, gitignoreArgs, combinedSignal);
 				for (const rawLine of gitignoreStdout.split("\n")) {
 					const file = rawLine.trim();
 					if (!file) continue;
@@ -266,8 +274,10 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 			// Pattern and path
 			args.push(effectivePattern, searchPath);
 
-			// Run fd
-			const { stdout, stderr, exitCode } = await runFd(fdPath, args, signal);
+			// Run fd with timeout
+			const mainTimeoutSignal = AbortSignal.timeout(FD_TIMEOUT_MS);
+			const mainCombinedSignal = signal ? AbortSignal.any([signal, mainTimeoutSignal]) : mainTimeoutSignal;
+			const { stdout, stderr, exitCode } = await runFd(fdPath, args, mainCombinedSignal);
 			const output = stdout.trim();
 
 			// fd exit codes: 0 = found files, 1 = no matches, other = error
@@ -320,7 +330,7 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 				const indexed = relativized.map((path, idx) => ({ path, mtime: mtimes[idx] }));
 				indexed.sort((a, b) => b.mtime - a.mtime);
 				relativized.length = 0;
-				relativized.push(...indexed.map((item) => item.path));
+				relativized.push(...indexed.map(item => item.path));
 			}
 
 			const listLimit = applyListLimit(relativized, { limit: effectiveLimit });
@@ -371,10 +381,6 @@ const COLLAPSED_LIST_LIMIT = PREVIEW_LIMITS.COLLAPSED_ITEMS;
 export const findToolRenderer = {
 	inline: true,
 	renderCall(args: FindRenderArgs, uiTheme: Theme): Component {
-		const ui = new ToolUIKit(uiTheme);
-		const label = ui.title("Find");
-		let text = `${uiTheme.format.bullet} ${label} ${uiTheme.fg("accent", args.pattern || "*")}`;
-
 		const meta: string[] = [];
 		if (args.path) meta.push(`in ${args.path}`);
 		if (args.type && args.type !== "all") meta.push(`type:${args.type}`);
@@ -382,8 +388,10 @@ export const findToolRenderer = {
 		if (args.sortByMtime) meta.push("sort:mtime");
 		if (args.limit !== undefined) meta.push(`limit:${args.limit}`);
 
-		text += ui.meta(meta);
-
+		const text = renderStatusLine(
+			{ icon: "pending", title: "Find", description: args.pattern || "*", meta },
+			uiTheme,
+		);
 		return new Text(text, 0, 0);
 	},
 
@@ -391,106 +399,94 @@ export const findToolRenderer = {
 		result: { content: Array<{ type: string; text?: string }>; details?: FindToolDetails; isError?: boolean },
 		{ expanded }: RenderResultOptions,
 		uiTheme: Theme,
+		args?: FindRenderArgs,
 	): Component {
-		const ui = new ToolUIKit(uiTheme);
 		const details = result.details;
 
 		if (result.isError || details?.error) {
-			const errorText = details?.error || result.content?.find((c) => c.type === "text")?.text || "Unknown error";
-			return new Text(`  ${ui.errorMessage(errorText)}`, 0, 0);
+			const errorText = details?.error || result.content?.find(c => c.type === "text")?.text || "Unknown error";
+			return new Text(formatErrorMessage(errorText, uiTheme), 0, 0);
 		}
 
 		const hasDetailedData = details?.fileCount !== undefined;
-		const textContent = result.content?.find((c) => c.type === "text")?.text;
+		const textContent = result.content?.find(c => c.type === "text")?.text;
 
 		if (!hasDetailedData) {
-			if (!textContent || textContent.includes("No files matching") || textContent.trim() === "") {
-				return new Text(`  ${ui.emptyMessage("No files found")}`, 0, 0);
+			if (
+				!textContent ||
+				textContent.includes("No files matching") ||
+				textContent.includes("No files found") ||
+				textContent.trim() === ""
+			) {
+				return new Text(formatEmptyMessage("No files found", uiTheme), 0, 0);
 			}
 
-			const lines = textContent.split("\n").filter((l) => l.trim());
-			const maxLines = expanded ? lines.length : Math.min(lines.length, COLLAPSED_LIST_LIMIT);
-			const displayLines = lines.slice(0, maxLines);
-			const remaining = lines.length - maxLines;
-			const hasMore = remaining > 0;
-
-			const icon = uiTheme.styledSymbol("status.success", "success");
-			const summary = ui.count("file", lines.length);
-			const expandHint = ui.expandHint(expanded, hasMore);
-			let text = `  ${icon} ${uiTheme.fg("dim", summary)}${expandHint}`;
-
-			for (let i = 0; i < displayLines.length; i++) {
-				const isLast = i === displayLines.length - 1 && remaining === 0;
-				const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-				text += `\n  ${uiTheme.fg("dim", branch)} ${uiTheme.fg("accent", displayLines[i])}`;
-			}
-			if (remaining > 0) {
-				text += `\n  ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", ui.moreItems(remaining, "file"))}`;
-			}
-			return new Text(text, 0, 0);
+			const lines = textContent.split("\n").filter(l => l.trim());
+			const header = renderStatusLine(
+				{
+					icon: "success",
+					title: "Find",
+					description: args?.pattern,
+					meta: [formatCount("file", lines.length)],
+				},
+				uiTheme,
+			);
+			const listLines = renderTreeList(
+				{
+					items: lines,
+					expanded,
+					maxCollapsed: COLLAPSED_LIST_LIMIT,
+					itemType: "file",
+					renderItem: line => uiTheme.fg("accent", line),
+				},
+				uiTheme,
+			);
+			return new Text([header, ...listLines].join("\n"), 0, 0);
 		}
 
 		const fileCount = details?.fileCount ?? 0;
-		const truncation = details?.meta?.truncation;
+		const truncation = details?.truncation ?? details?.meta?.truncation;
 		const limits = details?.meta?.limits;
-		const truncated = Boolean(
-			details?.truncated || truncation || limits?.resultLimit || limits?.headLimit || limits?.matchLimit,
-		);
+		const truncated = Boolean(details?.truncated || truncation || details?.resultLimitReached || limits?.resultLimit);
 		const files = details?.files ?? [];
 
 		if (fileCount === 0) {
-			return new Text(`  ${ui.emptyMessage("No files found")}`, 0, 0);
+			const header = renderStatusLine(
+				{ icon: "warning", title: "Find", description: args?.pattern, meta: ["0 files"] },
+				uiTheme,
+			);
+			return new Text([header, formatEmptyMessage("No files found", uiTheme)].join("\n"), 0, 0);
 		}
+		const meta: string[] = [formatCount("file", fileCount)];
+		if (details?.scopePath) meta.push(`in ${details.scopePath}`);
+		if (truncated) meta.push(uiTheme.fg("warning", "truncated"));
+		const header = renderStatusLine(
+			{ icon: truncated ? "warning" : "success", title: "Find", description: args?.pattern, meta },
+			uiTheme,
+		);
 
-		const icon = uiTheme.styledSymbol("status.success", "success");
-		const summaryText = ui.count("file", fileCount);
-		const scopeLabel = ui.scope(details?.scopePath);
-		const maxFiles = expanded ? files.length : Math.min(files.length, COLLAPSED_LIST_LIMIT);
-		const hasMoreFiles = files.length > maxFiles;
-		const expandHint = ui.expandHint(expanded, hasMoreFiles);
-
-		let text = `  ${icon} ${uiTheme.fg("dim", summaryText)}${ui.truncationSuffix(truncated)}${scopeLabel}${expandHint}`;
+		const fileLines = renderFileList(
+			{
+				files: files.map(entry => ({ path: entry, isDirectory: entry.endsWith("/") })),
+				expanded,
+				maxCollapsed: COLLAPSED_LIST_LIMIT,
+			},
+			uiTheme,
+		);
 
 		const truncationReasons: string[] = [];
-		if (limits?.resultLimit) {
-			truncationReasons.push(`limit ${limits.resultLimit.reached} results`);
-		}
-		if (truncation) {
-			truncationReasons.push(truncation.truncatedBy === "lines" ? "line limit" : "size limit");
-		}
-		if (truncation?.artifactId) {
-			truncationReasons.push(`full output: artifact://${truncation.artifactId}`);
+		if (details?.resultLimitReached) truncationReasons.push(`limit ${details.resultLimitReached} results`);
+		if (limits?.resultLimit) truncationReasons.push(`limit ${limits.resultLimit.reached} results`);
+		if (truncation) truncationReasons.push(truncation.truncatedBy === "lines" ? "line limit" : "size limit");
+		const artifactId = truncation && "artifactId" in truncation ? truncation.artifactId : undefined;
+		if (artifactId) truncationReasons.push(`full output: artifact://${artifactId}`);
+
+		const extraLines: string[] = [];
+		if (truncationReasons.length > 0) {
+			extraLines.push(uiTheme.fg("warning", `truncated: ${truncationReasons.join(", ")}`));
 		}
 
-		const hasTruncation = truncationReasons.length > 0;
-
-		if (files.length > 0) {
-			for (let i = 0; i < maxFiles; i++) {
-				const isLast = i === maxFiles - 1 && !hasMoreFiles && !hasTruncation;
-				const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-				const entry = files[i];
-				const isDir = entry.endsWith("/");
-				const entryPath = isDir ? entry.slice(0, -1) : entry;
-				const lang = isDir ? undefined : getLanguageFromPath(entryPath);
-				const entryIcon = isDir
-					? uiTheme.fg("accent", uiTheme.icon.folder)
-					: uiTheme.fg("muted", uiTheme.getLangIcon(lang));
-				text += `\n  ${uiTheme.fg("dim", branch)} ${entryIcon} ${uiTheme.fg("accent", entry)}`;
-			}
-
-			if (hasMoreFiles) {
-				const moreFilesBranch = hasTruncation ? uiTheme.tree.branch : uiTheme.tree.last;
-				text += `\n  ${uiTheme.fg("dim", moreFilesBranch)} ${uiTheme.fg(
-					"muted",
-					ui.moreItems(files.length - maxFiles, "file"),
-				)}`;
-			}
-		}
-
-		if (hasTruncation) {
-			text += `\n  ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("warning", `truncated: ${truncationReasons.join(", ")}`)}`;
-		}
-
-		return new Text(text, 0, 0);
+		return new Text([header, ...fileLines, ...extraLines].join("\n"), 0, 0);
 	},
+	mergeCallAndResult: true,
 };

package/src/tools/gemini-image.ts

@@ -1,15 +1,15 @@
-import { tmpdir } from "node:os";
-import { join } from "node:path";
+import * as os from "node:os";
+import * as path from "node:path";
 import { StringEnum } from "@oh-my-pi/pi-ai";
-import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { CustomTool } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import geminiImageDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/gemini-image.md" with { type: "text" };
-import { detectSupportedImageMimeTypeFromFile } from "@oh-my-pi/pi-coding-agent/utils/mime";
-import { getEnv } from "@oh-my-pi/pi-coding-agent/web/search/auth";
 import { untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { nanoid } from "nanoid";
+import type { ModelRegistry } from "../config/model-registry";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import type { CustomTool } from "../extensibility/custom-tools/types";
+import geminiImageDescription from "../prompts/tools/gemini-image.md" with { type: "text" };
+import { detectSupportedImageMimeTypeFromFile } from "../utils/mime";
+import { getEnv } from "../web/search/auth";
 import { resolveReadPath } from "./path-utils";
 
 const DEFAULT_MODEL = "gemini-3-pro-image-preview";
@@ -151,7 +151,7 @@ function assemblePrompt(params: GeminiImageParams): string {
 	if (params.style) parts.push(params.style);
 
 	// Join with periods for sentence structure
-	let prompt = `${parts.map((p) => p.replace(/[.!,;:]+$/, "")).join(". ")}.`;
+	let prompt = `${parts.map(p => p.replace(/[.!,;:]+$/, "")).join(". ")}.`;
 
 	// Text rendering specs
 	if (params.text) {
@@ -160,7 +160,7 @@ function assemblePrompt(params: GeminiImageParams): string {
 
 	// Edit mode: changes and preserve directives
 	if (params.changes?.length) {
-		prompt += `\n\nChanges:\n${params.changes.map((c) => `- ${c}`).join("\n")}`;
+		prompt += `\n\nChanges:\n${params.changes.map(c => `- ${c}`).join("\n")}`;
 		if (params.preserve) {
 			prompt += `\n\nPreserve: ${params.preserve}`;
 		}
@@ -330,8 +330,8 @@ function collectOpenRouterResponseText(message: OpenRouterMessage | undefined):
 	}
 	if (Array.isArray(message.content)) {
 		const texts = message.content
-			.filter((part) => part.type === "text")
-			.map((part) => part.text)
+			.filter(part => part.type === "text")
+			.map(part => part.text)
 			.filter((text): text is string => Boolean(text));
 		const combined = texts.join("\n").trim();
 		return combined.length > 0 ? combined : undefined;
@@ -489,7 +489,7 @@ function getExtensionForMime(mimeType: string): string {
 async function saveImageToTemp(image: InlineImageData): Promise<string> {
 	const ext = getExtensionForMime(image.mimeType);
 	const filename = `omp-image-${nanoid()}.${ext}`;
-	const filepath = join(tmpdir(), filename);
+	const filepath = path.join(os.tmpdir(), filename);
 	await Bun.write(filepath, Buffer.from(image.data, "base64"));
 	return filepath;
 }
@@ -515,7 +515,7 @@ function buildResponseSummary(
 }
 
 function collectResponseText(parts: GeminiPart[]): string | undefined {
-	const texts = parts.map((part) => part.text).filter((text): text is string => Boolean(text));
+	const texts = parts.map(part => part.text).filter((text): text is string => Boolean(text));
 	const combined = texts.join("\n").trim();
 	return combined.length > 0 ? combined : undefined;
 }