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

package/src/tools/fetch.ts

@@ -1,27 +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 { renderOutputBlock, renderStatusLine } from "@oh-my-pi/pi-coding-agent/tui";
-import { ensureTool } from "@oh-my-pi/pi-coding-agent/utils/tools-manager";
-import { specialHandlers } from "@oh-my-pi/pi-coding-agent/web/scrapers";
-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 { 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";
 
 // =============================================================================
@@ -450,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 {
@@ -479,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 {}
 	}
 }
@@ -498,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;
 	}
@@ -695,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 });
@@ -767,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 });
@@ -984,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) */
@@ -1037,7 +1036,7 @@ export function renderFetchResult(
 		: contentText;
 	const lineCount = countNonEmptyLines(contentBody);
 	const charCount = contentBody.trim().length;
-	const contentLines = contentBody.split("\n").filter((l) => l.trim());
+	const contentLines = contentBody.split("\n").filter(l => l.trim());
 
 	const metadataLines: string[] = [
 		`${uiTheme.fg("muted", "Content-Type:")} ${details.contentType || "unknown"}`,
@@ -1061,12 +1060,10 @@ export function renderFetchResult(
 
 	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 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)")];
+		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(

package/src/tools/find.ts

@@ -1,24 +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 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";
 import { ptree, untilAborted } from "@oh-my-pi/pi-utils";
 import type { Static } from "@sinclair/typebox";
 import { Type } from "@sinclair/typebox";
-
+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 { 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";
 
@@ -164,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);
 					}
@@ -331,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 });
@@ -405,12 +404,12 @@ export const findToolRenderer = {
 		const details = result.details;
 
 		if (result.isError || details?.error) {
-			const errorText = details?.error || result.content?.find((c) => c.type === "text")?.text || "Unknown error";
+			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 (
@@ -422,7 +421,7 @@ export const findToolRenderer = {
 				return new Text(formatEmptyMessage("No files found", uiTheme), 0, 0);
 			}
 
-			const lines = textContent.split("\n").filter((l) => l.trim());
+			const lines = textContent.split("\n").filter(l => l.trim());
 			const header = renderStatusLine(
 				{
 					icon: "success",
@@ -438,7 +437,7 @@ export const findToolRenderer = {
 					expanded,
 					maxCollapsed: COLLAPSED_LIST_LIMIT,
 					itemType: "file",
-					renderItem: (line) => uiTheme.fg("accent", line),
+					renderItem: line => uiTheme.fg("accent", line),
 				},
 				uiTheme,
 			);
@@ -468,7 +467,7 @@ export const findToolRenderer = {
 
 		const fileLines = renderFileList(
 			{
-				files: files.map((entry) => ({ path: entry, isDirectory: entry.endsWith("/") })),
+				files: files.map(entry => ({ path: entry, isDirectory: entry.endsWith("/") })),
 				expanded,
 				maxCollapsed: COLLAPSED_LIST_LIMIT,
 			},

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;
 }

package/src/tools/grep.ts

@@ -1,24 +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 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";
 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 { 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 { 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";
 
@@ -73,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 {
@@ -287,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 "";
 					}
@@ -303,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 = {
@@ -371,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);
@@ -383,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,
 						})),
@@ -401,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,
@@ -547,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,
 				})),
@@ -632,18 +632,18 @@ export const grepToolRenderer = {
 		const details = result.details;
 
 		if (result.isError || details?.error) {
-			const errorText = details?.error || result.content?.find((c) => c.type === "text")?.text || "Unknown error";
+			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(formatEmptyMessage("No matches found", uiTheme), 0, 0);
 			}
-			const lines = textContent.split("\n").filter((line) => line.trim() !== "");
+			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)] },
@@ -655,7 +655,7 @@ export const grepToolRenderer = {
 					expanded,
 					maxCollapsed: COLLAPSED_TEXT_LIMIT,
 					itemType: "item",
-					renderItem: (line) => uiTheme.fg("toolOutput", line),
+					renderItem: line => uiTheme.fg("toolOutput", line),
 				},
 				uiTheme,
 			);
@@ -699,15 +699,15 @@ export const grepToolRenderer = {
 		);
 
 		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 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),
+					renderItem: line => uiTheme.fg("toolOutput", line),
 				},
 				uiTheme,
 			);
@@ -715,11 +715,11 @@ export const grepToolRenderer = {
 		}
 
 		const fileEntries: Array<{ path: string; count?: number }> = details?.fileMatches?.length
-			? details.fileMatches.map((entry) => ({ path: entry.path, count: entry.count }))
-			: files.map((path) => ({ path }));
+			? details.fileMatches.map(entry => ({ path: entry.path, count: entry.count }))
+			: files.map(path => ({ path }));
 		const fileLines = renderFileList(
 			{
-				files: fileEntries.map((entry) => ({
+				files: fileEntries.map(entry => ({
 					path: entry.path,
 					isDirectory: entry.path.endsWith("/"),
 					meta: entry.count !== undefined ? `(${entry.count} match${entry.count !== 1 ? "es" : ""})` : undefined,

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";
-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";
-export { EditTool, type EditToolDetails } from "@oh-my-pi/pi-coding-agent/patch";
-export { BUNDLED_AGENTS, TaskTool } from "@oh-my-pi/pi-coding-agent/task";
+} 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";
+} from "../web/search";
 export { AskTool, type AskToolDetails } from "./ask";
 export { BashTool, type BashToolDetails, type BashToolOptions } from "./bash";
 export { CalculatorTool, type CalculatorToolDetails } from "./calculator";
@@ -59,36 +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";
-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";
-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";
-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>;
 
@@ -153,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,
 };
 
@@ -212,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;
@@ -221,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),
@@ -264,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;