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

package/src/tools/grep.ts

@@ -1,23 +1,24 @@
 import nodePath 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 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 { 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";
 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 { renderPromptTemplate } from "../config/prompt-templates";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import type { Theme } from "../modes/theme/theme";
+import grepDescription from "../prompts/tools/grep.md" with { type: "text" };
+import { renderFileList, renderStatusLine, renderTreeList } from "../tui";
+import { ensureTool } from "../utils/tools-manager";
+import { untilAborted } from "../utils/utils";
+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 } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { DEFAULT_MAX_COLUMN, type TruncationResult, truncateHead, truncateLine } from "./truncate";
 
@@ -72,8 +73,8 @@ export interface GrepOperations {
 }
 
 const defaultGrepOperations: GrepOperations = {
-	isDirectory: async (p) => (await Bun.file(p).stat()).isDirectory(),
-	readFile: (p) => Bun.file(p).text(),
+	isDirectory: async p => (await Bun.file(p).stat()).isDirectory(),
+	readFile: p => Bun.file(p).text(),
 };
 
 export interface GrepToolOptions {
@@ -286,7 +287,7 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 
 			// For simple output modes (files_with_matches, count), process text directly
 			if (effectiveOutputMode === "files_with_matches" || effectiveOutputMode === "count") {
-				const stdout = await child.text().catch((x) => {
+				const stdout = await child.text().catch(x => {
 					if (x instanceof ptree.Exception && x.exitCode === 1) {
 						return "";
 					}
@@ -302,7 +303,7 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 				const lines = stdout
 					.trim()
 					.split("\n")
-					.filter((line) => line.length > 0);
+					.filter(line => line.length > 0);
 
 				if (lines.length === 0) {
 					const details: GrepToolDetails = {
@@ -370,7 +371,7 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 
 				// For count mode, format as "path:count"
 				if (effectiveOutputMode === "count") {
-					const formatted = processedLines.map((line) => {
+					const formatted = processedLines.map(line => {
 						const separatorIndex = line.lastIndexOf(":");
 						const relative = formatPath(separatorIndex === -1 ? line : line.slice(0, separatorIndex));
 						const count = separatorIndex === -1 ? "0" : line.slice(separatorIndex + 1);
@@ -382,7 +383,7 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 						matchCount: simpleMatchCount,
 						fileCount,
 						files: simpleFileList,
-						fileMatches: simpleFileList.map((path) => ({
+						fileMatches: simpleFileList.map(path => ({
 							path,
 							count: simpleFileMatchCounts.get(path) ?? 0,
 						})),
@@ -400,7 +401,7 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 				}
 
 				// For files_with_matches, format paths
-				const formatted = processedLines.map((line) => formatPath(line));
+				const formatted = processedLines.map(line => formatPath(line));
 				const output = formatted.join("\n");
 				const details: GrepToolDetails = {
 					scopePath,
@@ -546,7 +547,7 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 				matchCount,
 				fileCount: files.size,
 				files: fileList,
-				fileMatches: fileList.map((path) => ({
+				fileMatches: fileList.map(path => ({
 					path,
 					count: fileMatchCounts.get(path) ?? 0,
 				})),
@@ -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,45 +627,39 @@ 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);
+			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?.matchCount !== undefined || details?.fileCount !== undefined;
 
 		if (!hasDetailedData) {
-			const textContent = result.content?.find((c) => c.type === "text")?.text;
+			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);
-			}
-
-			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(formatEmptyMessage("No matches found", uiTheme), 0, 0);
 			}
-
-			return new Text(text, 0, 0);
+			const lines = textContent.split("\n").filter(line => line.trim() !== "");
+			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);
-
-		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}`;
+				? [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,
+		);
 
-		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 (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 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 fileEntries: Array<{ path: string; count?: number }> = details?.fileMatches?.length
+			? details.fileMatches.map(entry => ({ path: entry.path, count: entry.count }))
+			: files.map(path => ({ path }));
+		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,
+		);
 
-			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"),
-				)}`;
-			}
-		}
+		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 (hasTruncation) {
-			text += `\n  ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("warning", `truncated: ${truncationReasons.join(", ")}`)}`;
-		}
+		const extraLines =
+			truncationReasons.length > 0 ? [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,6 +1,38 @@
+import type { AgentTool } from "@oh-my-pi/pi-agent-core";
+import { logger } from "@oh-my-pi/pi-utils";
+import type { BashInterceptorRule } from "../config/settings-manager";
+import type { InternalUrlRouter } from "../internal-urls";
+import { getPreludeDocs, warmPythonEnvironment } from "../ipy/executor";
+import { checkPythonKernelAvailability } from "../ipy/kernel";
+import { LspTool } from "../lsp";
+import { EditTool } from "../patch";
+import type { ArtifactManager } from "../session/artifacts";
+import { TaskTool } from "../task";
+import type { AgentOutputManager } from "../task/output-manager";
+import type { EventBus } from "../utils/event-bus";
+import { time } from "../utils/timings";
+import { WebSearchTool } from "../web/search";
+import { AskTool } from "./ask";
+import { BashTool } from "./bash";
+import { CalculatorTool } from "./calculator";
+import { CompleteTool } from "./complete";
+import { FetchTool } from "./fetch";
+import { FindTool } from "./find";
+import { GrepTool } from "./grep";
+import { LsTool } from "./ls";
+import { NotebookTool } from "./notebook";
+import { wrapToolsWithMetaNotice } from "./output-meta";
+import { PythonTool } from "./python";
+import { ReadTool } from "./read";
+import { reportFindingTool } from "./review";
+import { loadSshTool } from "./ssh";
+import { TodoWriteTool } from "./todo-write";
+import { WriteTool } from "./write";
+
 // Exa MCP tools (22 tools)
-export { exaTools } from "@oh-my-pi/pi-coding-agent/exa/index";
-export type { ExaRenderDetails, ExaSearchResponse, ExaSearchResult } from "@oh-my-pi/pi-coding-agent/exa/types";
+
+export { exaTools } from "../exa";
+export type { ExaRenderDetails, ExaSearchResponse, ExaSearchResult } from "../exa/types";
 export {
 	type FileDiagnosticsResult,
 	type FileFormatResult,
@@ -11,9 +43,9 @@ export {
 	type LspWarmupOptions,
 	type LspWarmupResult,
 	warmupLspServers,
-} from "@oh-my-pi/pi-coding-agent/lsp/index";
-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";
+} from "../lsp";
+export { EditTool, type EditToolDetails } from "../patch";
+export { BUNDLED_AGENTS, TaskTool } from "../task";
 export {
 	companyWebSearchTools,
 	exaWebSearchTools,
@@ -31,7 +63,7 @@ export {
 	webSearchCustomTool,
 	webSearchDeepTool,
 	webSearchLinkedinTool,
-} from "@oh-my-pi/pi-coding-agent/web/search/index";
+} from "../web/search";
 export { AskTool, type AskToolDetails } from "./ask";
 export { BashTool, type BashToolDetails, type BashToolOptions } from "./bash";
 export { CalculatorTool, type CalculatorToolDetails } from "./calculator";
@@ -59,35 +91,6 @@ export {
 } from "./truncate";
 export { WriteTool, type WriteToolDetails } from "./write";
 
-import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import type { BashInterceptorRule } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-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 { 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 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 { logger } from "@oh-my-pi/pi-utils";
-import { AskTool } from "./ask";
-import { BashTool } from "./bash";
-import { CalculatorTool } from "./calculator";
-import { CompleteTool } from "./complete";
-import { FetchTool } from "./fetch";
-import { FindTool } from "./find";
-import { GrepTool } from "./grep";
-import { LsTool } from "./ls";
-import { NotebookTool } from "./notebook";
-import { wrapToolsWithMetaNotice } from "./output-meta";
-import { PythonTool } from "./python";
-import { ReadTool } from "./read";
-import { reportFindingTool } from "./review";
-import { loadSshTool } from "./ssh";
-import { TodoWriteTool } from "./todo-write";
-import { WriteTool } from "./write";
-
 /** Tool type (AgentTool from pi-ai) */
 export type Tool = AgentTool<any, any, any>;
 
@@ -125,6 +128,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) */
@@ -150,26 +155,26 @@ type ToolFactory = (session: ToolSession) => Tool | null | Promise<Tool | null>;
 
 export const BUILTIN_TOOLS: Record<string, ToolFactory> = {
 	ask: AskTool.createIf,
-	bash: (s) => new BashTool(s),
-	python: (s) => new PythonTool(s),
-	calc: (s) => new CalculatorTool(s),
+	bash: s => new BashTool(s),
+	python: s => new PythonTool(s),
+	calc: s => new CalculatorTool(s),
 	ssh: loadSshTool,
-	edit: (s) => new EditTool(s),
-	find: (s) => new FindTool(s),
-	grep: (s) => new GrepTool(s),
-	ls: (s) => new LsTool(s),
+	edit: s => new EditTool(s),
+	find: s => new FindTool(s),
+	grep: s => new GrepTool(s),
+	ls: s => new LsTool(s),
 	lsp: LspTool.createIf,
-	notebook: (s) => new NotebookTool(s),
-	read: (s) => new ReadTool(s),
+	notebook: s => new NotebookTool(s),
+	read: s => new ReadTool(s),
 	task: TaskTool.create,
-	todo_write: (s) => new TodoWriteTool(s),
-	fetch: (s) => new FetchTool(s),
-	web_search: (s) => new WebSearchTool(s),
-	write: (s) => new WriteTool(s),
+	todo_write: s => new TodoWriteTool(s),
+	fetch: s => new FetchTool(s),
+	web_search: s => new WebSearchTool(s),
+	write: s => new WriteTool(s),
 };
 
 export const HIDDEN_TOOLS: Record<string, ToolFactory> = {
-	complete: (s) => new CompleteTool(s),
+	complete: s => new CompleteTool(s),
 	report_finding: () => reportFindingTool,
 };
 
@@ -209,6 +214,7 @@ function getPythonModeFromEnv(): PythonToolMode | null {
  * Create tools from BUILTIN_TOOLS registry.
  */
 export async function createTools(session: ToolSession, toolNames?: string[]): Promise<Tool[]> {
+	time("createTools:start");
 	const includeComplete = session.requireCompleteTool === true;
 	const enableLsp = session.enableLsp ?? true;
 	const requestedTools = toolNames && toolNames.length > 0 ? [...new Set(toolNames)] : undefined;
@@ -218,18 +224,21 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 		pythonMode !== "bash-only" &&
 		(requestedTools === undefined || requestedTools.includes("python") || pythonMode === "ipy-only");
 	const isTestEnv = process.env.BUN_ENV === "test" || process.env.NODE_ENV === "test";
+	const skipPythonWarm = isTestEnv || process.env.OMP_PYTHON_SKIP_CHECK === "1";
 	if (shouldCheckPython) {
 		const availability = await checkPythonKernelAvailability(session.cwd);
+		time("createTools:pythonCheck");
 		pythonAvailable = availability.ok;
 		if (!availability.ok) {
 			logger.warn("Python kernel unavailable, falling back to bash", {
 				reason: availability.reason,
 			});
-		} else if (!isTestEnv && getPreludeDocs().length === 0) {
+		} else if (!skipPythonWarm && getPreludeDocs().length === 0) {
 			const sessionFile = session.getSessionFile?.() ?? undefined;
 			const warmSessionId = sessionFile ? `session:${sessionFile}:cwd:${session.cwd}` : `cwd:${session.cwd}`;
 			try {
 				await warmPythonEnvironment(session.cwd, warmSessionId, session.settings?.getPythonSharedGateway?.());
+				time("createTools:warmPython");
 			} catch (err) {
 				logger.warn("Failed to warm Python environment", {
 					error: err instanceof Error ? err.message : String(err),
@@ -261,22 +270,38 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 		requestedTools.push("complete");
 	}
 
-	const filteredRequestedTools = requestedTools?.filter((name) => name in allTools && isToolAllowed(name));
+	const filteredRequestedTools = requestedTools?.filter(name => name in allTools && isToolAllowed(name));
 
 	const entries =
 		filteredRequestedTools !== undefined
-			? filteredRequestedTools.map((name) => [name, allTools[name]] as const)
+			? filteredRequestedTools.map(name => [name, allTools[name]] as const)
 			: [
 					...Object.entries(BUILTIN_TOOLS).filter(([name]) => isToolAllowed(name)),
 					...(includeComplete ? ([["complete", HIDDEN_TOOLS.complete]] as const) : []),
 				];
-	const results = await Promise.all(entries.map(([, factory]) => factory(session)));
-	const tools = results.filter((t): t is Tool => t !== null);
+	time("createTools:beforeFactories");
+	const slowTools: Array<{ name: string; ms: number }> = [];
+	const results = await Promise.all(
+		entries.map(async ([name, factory]) => {
+			const start = performance.now();
+			const tool = await factory(session);
+			const elapsed = performance.now() - start;
+			if (elapsed > 5) {
+				slowTools.push({ name, ms: Math.round(elapsed) });
+			}
+			return { name, tool };
+		}),
+	);
+	time("createTools:afterFactories");
+	if (slowTools.length > 0 && process.env.OMP_TIMING === "1") {
+		logger.debug("Tool factory timings", { slowTools });
+	}
+	const tools = results.filter(r => r.tool !== null).map(r => r.tool as Tool);
 	const wrappedTools = wrapToolsWithMetaNotice(tools);
 
 	if (filteredRequestedTools !== undefined) {
 		const allowed = new Set(filteredRequestedTools);
-		return wrappedTools.filter((tool) => allowed.has(tool.name));
+		return wrappedTools.filter(tool => allowed.has(tool.name));
 	}
 
 	return wrappedTools;

package/src/tools/list-limit.ts

@@ -1,4 +1,4 @@
-import type { LimitsMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
+import type { LimitsMeta } from "./output-meta";
 
 export interface ListLimitResult<T> {
 	items: T[];