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

package/src/tools/find.ts

@@ -3,10 +3,11 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 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 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 { renderFileList, renderStatusLine, renderTreeList } from "@oh-my-pi/pi-coding-agent/tui";
 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";
@@ -14,10 +15,10 @@ 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 type { ToolSession } from ".";
 import { applyListLimit } from "./list-limit";
 import { resolveToCwd } from "./path-utils";
-import { PREVIEW_LIMITS, ToolUIKit } from "./render-utils";
+import { formatCount, formatEmptyMessage, formatErrorMessage, PREVIEW_LIMITS } from "./render-utils";
 import { toolResult } from "./tool-result";
 import { type TruncationResult, truncateHead } from "./truncate";
 
@@ -34,6 +35,7 @@ const findSchema = Type.Object({
 });
 
 const DEFAULT_LIMIT = 1000;
+const FD_TIMEOUT_MS = 5000;
 
 export interface FindToolDetails {
 	truncation?: TruncationResult;
@@ -132,6 +134,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;
@@ -246,7 +253,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 +275,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
@@ -371,10 +382,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 +389,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 +400,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);
+			return new Text(formatErrorMessage(errorText, uiTheme), 0, 0);
 		}
 
 		const hasDetailedData = details?.fileCount !== undefined;
 		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 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/grep.ts

@@ -3,10 +3,11 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 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 type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import grepDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/grep.md" with { type: "text" };
 import type { OutputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
 import { ToolAbortError, ToolError } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
+import { renderFileList, renderStatusLine, renderTreeList } from "@oh-my-pi/pi-coding-agent/tui";
 import { ensureTool } from "@oh-my-pi/pi-coding-agent/utils/tools-manager";
 import { untilAborted } from "@oh-my-pi/pi-coding-agent/utils/utils";
 import type { Component } from "@oh-my-pi/pi-tui";
@@ -14,10 +15,10 @@ import { Text } from "@oh-my-pi/pi-tui";
 import { ptree, readLines } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
 import { $ } from "bun";
-import type { ToolSession } from "./index";
+import type { ToolSession } from ".";
 import { applyListLimit } from "./list-limit";
 import { resolveToCwd } from "./path-utils";
-import { PREVIEW_LIMITS, ToolUIKit } from "./render-utils";
+import { formatCount, formatEmptyMessage, formatErrorMessage, PREVIEW_LIMITS } from "./render-utils";
 import { toolResult } from "./tool-result";
 import { DEFAULT_MAX_COLUMN, type TruncationResult, truncateHead, truncateLine } from "./truncate";
 
@@ -600,10 +601,6 @@ const COLLAPSED_TEXT_LIMIT = PREVIEW_LIMITS.COLLAPSED_LINES * 2;
 export const grepToolRenderer = {
 	inline: true,
 	renderCall(args: GrepRenderArgs, uiTheme: Theme): Component {
-		const ui = new ToolUIKit(uiTheme);
-		const label = ui.title("Grep");
-		let text = `${uiTheme.format.bullet} ${label} ${uiTheme.fg("accent", args.pattern || "?")}`;
-
 		const meta: string[] = [];
 		if (args.path) meta.push(`in ${args.path}`);
 		if (args.glob) meta.push(`glob:${args.glob}`);
@@ -619,8 +616,10 @@ export const grepToolRenderer = {
 		if (args.context !== undefined) meta.push(`context:${args.context}`);
 		if (args.limit !== undefined) meta.push(`limit:${args.limit}`);
 
-		text += ui.meta(meta);
-
+		const text = renderStatusLine(
+			{ icon: "pending", title: "Grep", description: args.pattern || "?", meta },
+			uiTheme,
+		);
 		return new Text(text, 0, 0);
 	},
 
@@ -628,13 +627,13 @@ export const grepToolRenderer = {
 		result: { content: Array<{ type: string; text?: string }>; details?: GrepToolDetails; isError?: boolean },
 		{ expanded }: RenderResultOptions,
 		uiTheme: Theme,
+		args?: GrepRenderArgs,
 	): 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);
+			return new Text(formatErrorMessage(errorText, uiTheme), 0, 0);
 		}
 
 		const hasDetailedData = details?.matchCount !== undefined || details?.fileCount !== undefined;
@@ -642,31 +641,25 @@ export const grepToolRenderer = {
 		if (!hasDetailedData) {
 			const textContent = result.content?.find((c) => c.type === "text")?.text;
 			if (!textContent || textContent === "No matches found") {
-				return new Text(`  ${ui.emptyMessage("No matches found")}`, 0, 0);
+				return new Text(formatEmptyMessage("No matches found", uiTheme), 0, 0);
 			}
-
 			const lines = textContent.split("\n").filter((line) => line.trim() !== "");
-			const maxLines = expanded ? lines.length : Math.min(lines.length, COLLAPSED_TEXT_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("item", 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("toolOutput", displayLines[i])}`;
-			}
-
-			if (remaining > 0) {
-				text += `\n  ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", ui.moreItems(remaining, "item"))}`;
-			}
-
-			return new Text(text, 0, 0);
+			const description = args?.pattern ?? undefined;
+			const header = renderStatusLine(
+				{ icon: "success", title: "Grep", description, meta: [formatCount("item", lines.length)] },
+				uiTheme,
+			);
+			const listLines = renderTreeList(
+				{
+					items: lines,
+					expanded,
+					maxCollapsed: COLLAPSED_TEXT_LIMIT,
+					itemType: "item",
+					renderItem: (line) => uiTheme.fg("toolOutput", line),
+				},
+				uiTheme,
+			);
+			return new Text([header, ...listLines].join("\n"), 0, 0);
 		}
 
 		const matchCount = details?.matchCount ?? 0;
@@ -685,79 +678,70 @@ export const grepToolRenderer = {
 		const files = details?.files ?? [];
 
 		if (matchCount === 0) {
-			return new Text(`  ${ui.emptyMessage("No matches found")}`, 0, 0);
+			const header = renderStatusLine(
+				{ icon: "warning", title: "Grep", description: args?.pattern, meta: ["0 matches"] },
+				uiTheme,
+			);
+			return new Text([header, formatEmptyMessage("No matches found", uiTheme)].join("\n"), 0, 0);
 		}
 
-		const icon = uiTheme.styledSymbol("status.success", "success");
 		const summaryParts =
 			mode === "files_with_matches"
-				? [ui.count("file", fileCount)]
-				: [ui.count("match", matchCount), ui.count("file", fileCount)];
-		const summaryText = summaryParts.join(uiTheme.sep.dot);
-		const scopeLabel = ui.scope(details?.scopePath);
+				? [formatCount("file", fileCount)]
+				: [formatCount("match", matchCount), formatCount("file", fileCount)];
+		const meta = [...summaryParts];
+		if (details?.scopePath) meta.push(`in ${details.scopePath}`);
+		if (truncated) meta.push(uiTheme.fg("warning", "truncated"));
+		const description = args?.pattern ?? undefined;
+		const header = renderStatusLine(
+			{ icon: truncated ? "warning" : "success", title: "Grep", description, meta },
+			uiTheme,
+		);
+
+		if (mode === "content") {
+			const textContent = result.content?.find((c) => c.type === "text")?.text ?? "";
+			const contentLines = textContent.split("\n").filter((line) => line.trim().length > 0);
+			const matchLines = renderTreeList(
+				{
+					items: contentLines,
+					expanded,
+					maxCollapsed: COLLAPSED_TEXT_LIMIT,
+					itemType: "match",
+					renderItem: (line) => uiTheme.fg("toolOutput", line),
+				},
+				uiTheme,
+			);
+			return new Text([header, ...matchLines].join("\n"), 0, 0);
+		}
 
 		const fileEntries: Array<{ path: string; count?: number }> = details?.fileMatches?.length
 			? details.fileMatches.map((entry) => ({ path: entry.path, count: entry.count }))
 			: files.map((path) => ({ path }));
-		const maxFiles = expanded ? fileEntries.length : Math.min(fileEntries.length, COLLAPSED_LIST_LIMIT);
-		const hasMoreFiles = fileEntries.length > maxFiles;
-		const expandHint = ui.expandHint(expanded, hasMoreFiles);
-
-		let text = `  ${icon} ${uiTheme.fg("dim", summaryText)}${ui.truncationSuffix(truncated)}${scopeLabel}${expandHint}`;
+		const fileLines = renderFileList(
+			{
+				files: fileEntries.map((entry) => ({
+					path: entry.path,
+					isDirectory: entry.path.endsWith("/"),
+					meta: entry.count !== undefined ? `(${entry.count} match${entry.count !== 1 ? "es" : ""})` : undefined,
+				})),
+				expanded,
+				maxCollapsed: COLLAPSED_LIST_LIMIT,
+			},
+			uiTheme,
+		);
 
 		const truncationReasons: string[] = [];
-		if (limits?.matchLimit) {
-			truncationReasons.push(`limit ${limits.matchLimit.reached} matches`);
-		}
-		if (limits?.resultLimit) {
-			truncationReasons.push(`limit ${limits.resultLimit.reached} results`);
-		}
-		if (limits?.headLimit) {
-			truncationReasons.push(`head limit ${limits.headLimit.reached}`);
-		}
-		if (truncation) {
-			truncationReasons.push(truncation.truncatedBy === "lines" ? "line limit" : "size limit");
-		}
-		if (limits?.columnTruncated) {
-			truncationReasons.push(`line length ${limits.columnTruncated.maxColumn}`);
-		}
-		if (truncation?.artifactId) {
-			truncationReasons.push(`full output: artifact://${truncation.artifactId}`);
-		}
+		if (limits?.matchLimit) truncationReasons.push(`limit ${limits.matchLimit.reached} matches`);
+		if (limits?.resultLimit) truncationReasons.push(`limit ${limits.resultLimit.reached} results`);
+		if (limits?.headLimit) truncationReasons.push(`head limit ${limits.headLimit.reached}`);
+		if (truncation) truncationReasons.push(truncation.truncatedBy === "lines" ? "line limit" : "size limit");
+		if (limits?.columnTruncated) truncationReasons.push(`line length ${limits.columnTruncated.maxColumn}`);
+		if (truncation?.artifactId) truncationReasons.push(`full output: artifact://${truncation.artifactId}`);
 
-		const hasTruncation = truncationReasons.length > 0;
-
-		if (fileEntries.length > 0) {
-			for (let i = 0; i < maxFiles; i++) {
-				const entry = fileEntries[i];
-				const isLast = i === maxFiles - 1 && !hasMoreFiles && !hasTruncation;
-				const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-				const isDir = entry.path.endsWith("/");
-				const entryPath = isDir ? entry.path.slice(0, -1) : entry.path;
-				const lang = isDir ? undefined : getLanguageFromPath(entryPath);
-				const entryIcon = isDir
-					? uiTheme.fg("accent", uiTheme.icon.folder)
-					: uiTheme.fg("muted", uiTheme.getLangIcon(lang));
-				const countLabel =
-					entry.count !== undefined
-						? ` ${uiTheme.fg("dim", `(${entry.count} match${entry.count !== 1 ? "es" : ""})`)}`
-						: "";
-				text += `\n  ${uiTheme.fg("dim", branch)} ${entryIcon} ${uiTheme.fg("accent", entry.path)}${countLabel}`;
-			}
+		const extraLines =
+			truncationReasons.length > 0 ? [uiTheme.fg("warning", `truncated: ${truncationReasons.join(", ")}`)] : [];
 
-			if (hasMoreFiles) {
-				const moreFilesBranch = hasTruncation ? uiTheme.tree.branch : uiTheme.tree.last;
-				text += `\n  ${uiTheme.fg("dim", moreFilesBranch)} ${uiTheme.fg(
-					"muted",
-					ui.moreItems(fileEntries.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/index.ts

@@ -1,5 +1,5 @@
 // Exa MCP tools (22 tools)
-export { exaTools } from "@oh-my-pi/pi-coding-agent/exa/index";
+export { exaTools } from "@oh-my-pi/pi-coding-agent/exa";
 export type { ExaRenderDetails, ExaSearchResponse, ExaSearchResult } from "@oh-my-pi/pi-coding-agent/exa/types";
 export {
 	type FileDiagnosticsResult,
@@ -11,9 +11,9 @@ export {
 	type LspWarmupOptions,
 	type LspWarmupResult,
 	warmupLspServers,
-} from "@oh-my-pi/pi-coding-agent/lsp/index";
+} from "@oh-my-pi/pi-coding-agent/lsp";
 export { EditTool, type EditToolDetails } from "@oh-my-pi/pi-coding-agent/patch";
-export { BUNDLED_AGENTS, TaskTool } from "@oh-my-pi/pi-coding-agent/task/index";
+export { BUNDLED_AGENTS, TaskTool } from "@oh-my-pi/pi-coding-agent/task";
 export {
 	companyWebSearchTools,
 	exaWebSearchTools,
@@ -31,7 +31,7 @@ export {
 	webSearchCustomTool,
 	webSearchDeepTool,
 	webSearchLinkedinTool,
-} from "@oh-my-pi/pi-coding-agent/web/search/index";
+} from "@oh-my-pi/pi-coding-agent/web/search";
 export { AskTool, type AskToolDetails } from "./ask";
 export { BashTool, type BashToolDetails, type BashToolOptions } from "./bash";
 export { CalculatorTool, type CalculatorToolDetails } from "./calculator";
@@ -64,12 +64,13 @@ import type { BashInterceptorRule } from "@oh-my-pi/pi-coding-agent/config/setti
 import type { InternalUrlRouter } from "@oh-my-pi/pi-coding-agent/internal-urls";
 import { getPreludeDocs, warmPythonEnvironment } from "@oh-my-pi/pi-coding-agent/ipy/executor";
 import { checkPythonKernelAvailability } from "@oh-my-pi/pi-coding-agent/ipy/kernel";
-import { LspTool } from "@oh-my-pi/pi-coding-agent/lsp/index";
+import { LspTool } from "@oh-my-pi/pi-coding-agent/lsp";
 import { EditTool } from "@oh-my-pi/pi-coding-agent/patch";
 import type { ArtifactManager } from "@oh-my-pi/pi-coding-agent/session/artifacts";
-import { TaskTool } from "@oh-my-pi/pi-coding-agent/task/index";
+import { TaskTool } from "@oh-my-pi/pi-coding-agent/task";
+import type { AgentOutputManager } from "@oh-my-pi/pi-coding-agent/task/output-manager";
 import type { EventBus } from "@oh-my-pi/pi-coding-agent/utils/event-bus";
-import { WebSearchTool } from "@oh-my-pi/pi-coding-agent/web/search/index";
+import { WebSearchTool } from "@oh-my-pi/pi-coding-agent/web/search";
 import { logger } from "@oh-my-pi/pi-utils";
 import { AskTool } from "./ask";
 import { BashTool } from "./bash";
@@ -125,6 +126,8 @@ export interface ToolSession {
 	mcpManager?: import("../mcp/manager").MCPManager;
 	/** Internal URL router for agent:// and skill:// URLs */
 	internalRouter?: InternalUrlRouter;
+	/** Agent output manager for unique agent:// IDs across task invocations */
+	agentOutputManager?: AgentOutputManager;
 	/** Settings manager for passing to subagents (avoids SQLite access in workers) */
 	settingsManager?: { serialize: () => import("@oh-my-pi/pi-coding-agent/config/settings-manager").Settings };
 	/** Settings manager (optional) */