@oh-my-pi/pi-coding-agent 3.15.1 → 3.20.1

package/src/core/tools/context.ts

@@ -1,21 +1,21 @@
 import type { AgentToolContext } from "@oh-my-pi/pi-agent-core";
 import type { CustomToolContext } from "../custom-tools/types";
-import type { HookUIContext } from "../hooks/types";
+import type { ExtensionUIContext } from "../extensions/types";
 
 declare module "@oh-my-pi/pi-agent-core" {
 	interface AgentToolContext extends CustomToolContext {
-		ui?: HookUIContext;
+		ui?: ExtensionUIContext;
 		hasUI?: boolean;
 	}
 }
 
 export interface ToolContextStore {
 	getContext(): AgentToolContext;
-	setUIContext(uiContext: HookUIContext, hasUI: boolean): void;
+	setUIContext(uiContext: ExtensionUIContext, hasUI: boolean): void;
 }
 
 export function createToolContextStore(getBaseContext: () => CustomToolContext): ToolContextStore {
-	let uiContext: HookUIContext | undefined;
+	let uiContext: ExtensionUIContext | undefined;
 	let hasUI = false;
 
 	return {

package/src/core/tools/exa/mcp-client.ts

@@ -4,6 +4,8 @@
  * Client for interacting with Exa MCP servers via JSON-RPC 2.0 over HTTPS.
  */
 
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
 import type { TSchema } from "@sinclair/typebox";
 import type { CustomTool } from "../../custom-tools/types";
 import { logger } from "../../logger";
@@ -26,14 +28,13 @@ export async function findApiKey(): Promise<string | null> {
 
 	// Try loading from .env files in cwd and home
 	const cwd = process.cwd();
-	const home = process.env.HOME ?? process.env.USERPROFILE ?? "~";
+	const home = homedir();
 
 	for (const dir of [cwd, home]) {
 		const envPath = `${dir}/.env`;
 		try {
-			const file = Bun.file(envPath);
-			if (await file.exists()) {
-				const content = await file.text();
+			if (existsSync(envPath)) {
+				const content = readFileSync(envPath, "utf-8");
 				const match = content.match(/^EXA_API_KEY=(.+)$/m);
 				if (match?.[1]) {
 					return match[1].trim().replace(/^["']|["']$/g, "");

package/src/core/tools/exa/render.ts

@@ -9,29 +9,37 @@ import { Text } from "@oh-my-pi/pi-tui";
 import type { Theme } from "../../../modes/interactive/theme/theme";
 import type { RenderResultOptions } from "../../custom-tools/types";
 import { logger } from "../../logger";
+import {
+	formatCount,
+	formatExpandHint,
+	formatMoreItems,
+	getDomain,
+	getPreviewLines,
+	getStyledStatusIcon,
+	PREVIEW_LIMITS,
+	TRUNCATE_LENGTHS,
+	truncate,
+} from "../render-utils";
 import type { ExaRenderDetails } from "./types";
 
-/** Truncate text to max length with ellipsis */
-function truncate(text: string, maxLen: number, ellipsis: string): string {
-	if (text.length <= maxLen) return text;
-	const sliceLen = Math.max(0, maxLen - ellipsis.length);
-	return `${text.slice(0, sliceLen)}${ellipsis}`;
+const COLLAPSED_PREVIEW_LINES = PREVIEW_LIMITS.COLLAPSED_LINES;
+const COLLAPSED_PREVIEW_LINE_LEN = TRUNCATE_LENGTHS.LONG;
+const EXPANDED_TEXT_LINES = 5;
+const EXPANDED_TEXT_LINE_LEN = 90;
+const MAX_TITLE_LEN = TRUNCATE_LENGTHS.TITLE;
+const MAX_HIGHLIGHT_LEN = TRUNCATE_LENGTHS.CONTENT;
+
+function renderErrorMessage(message: string, theme: Theme): Text {
+	const clean = message.replace(/^Error:\s*/, "").trim();
+	return new Text(
+		`${getStyledStatusIcon("error", theme)} ${theme.fg("error", `Error: ${clean || "Unknown error"}`)}`,
+		0,
+		0,
+	);
 }
 
-/** Extract domain from URL */
-function getDomain(url: string): string {
-	try {
-		const u = new URL(url);
-		return u.hostname.replace(/^www\./, "");
-	} catch {
-		return url;
-	}
-}
-
-/** Get first N lines of text as preview */
-function getPreviewLines(text: string, maxLines: number, maxLineLen: number, ellipsis: string): string[] {
-	const lines = text.split("\n").filter((l) => l.trim());
-	return lines.slice(0, maxLines).map((l) => truncate(l.trim(), maxLineLen, ellipsis));
+function renderEmptyMessage(message: string, theme: Theme): Text {
+	return new Text(`${getStyledStatusIcon("warning", theme)} ${theme.fg("muted", message)}`, 0, 0);
 }
 
 /** Render Exa result with tree-based layout */
@@ -43,26 +51,42 @@ export function renderExaResult(
 	const { expanded } = options;
 	const details = result.details;
 
-	// Handle error case
 	if (details?.error) {
 		logger.error("Exa render error", { error: details.error, toolName: details.toolName });
-		return new Text(uiTheme.fg("error", `Error: ${details.error}`), 0, 0);
+		return renderErrorMessage(details.error, uiTheme);
 	}
 
 	const response = details?.response;
 	if (!response) {
-		// Non-search response: show raw result
 		if (details?.raw) {
 			const rawText = typeof details.raw === "string" ? details.raw : JSON.stringify(details.raw, null, 2);
-			const preview = expanded ? rawText : truncate(rawText, 200, uiTheme.format.ellipsis);
-			const toolLabel = details?.toolName ?? "Exa";
-			return new Text(
-				`${uiTheme.fg("success", uiTheme.format.bullet)} ${uiTheme.fg("toolTitle", toolLabel)}\n ${uiTheme.fg("dim", uiTheme.tree.vertical)}  ${preview}`,
-				0,
-				0,
-			);
+			const rawLines = rawText.split("\n").filter((l) => l.trim());
+			const maxLines = expanded ? rawLines.length : Math.min(rawLines.length, COLLAPSED_PREVIEW_LINES);
+			const displayLines = rawLines.slice(0, maxLines);
+			const remaining = rawLines.length - maxLines;
+			const expandHint = formatExpandHint(expanded, remaining > 0, uiTheme);
+
+			let text = `${getStyledStatusIcon("info", uiTheme)} ${uiTheme.fg("dim", "Raw response")}${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",
+					truncate(displayLines[i], COLLAPSED_PREVIEW_LINE_LEN, uiTheme.format.ellipsis),
+				)}`;
+			}
+
+			if (remaining > 0) {
+				text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg(
+					"muted",
+					formatMoreItems(remaining, "line", uiTheme),
+				)}`;
+			}
+
+			return new Text(text, 0, 0);
 		}
-		return new Text(uiTheme.fg("error", "No response data"), 0, 0);
+		return renderEmptyMessage("No response data", uiTheme);
 	}
 
 	const results = response.results ?? [];
@@ -70,118 +94,135 @@ export function renderExaResult(
 	const cost = response.costDollars?.total;
 	const time = response.searchTime;
 
-	// Build header: Exa Search · N results · $X.XX · Xs
-	const icon =
-		resultCount > 0 ? uiTheme.fg("success", uiTheme.format.bullet) : uiTheme.fg("warning", uiTheme.format.bullet);
-	const expandHint = expanded ? "" : uiTheme.fg("dim", " (Ctrl+O for full results)");
-	const toolLabel = details?.toolName ?? "Exa Search";
+	const icon = getStyledStatusIcon(resultCount > 0 ? "success" : "warning", uiTheme);
 
-	let headerParts = `${icon} ${uiTheme.fg("toolTitle", toolLabel)}${uiTheme.sep.dot}${uiTheme.fg(
-		"dim",
-		`${resultCount} result${resultCount !== 1 ? "s" : ""}`,
-	)}`;
+	const metaParts = [formatCount("result", resultCount)];
+	if (cost !== undefined) metaParts.push(`cost:$${cost.toFixed(4)}`);
+	if (time !== undefined) metaParts.push(`time:${time.toFixed(2)}s`);
+	const summaryText = metaParts.join(uiTheme.sep.dot);
 
-	if (cost !== undefined) {
-		headerParts += `${uiTheme.sep.dot}${uiTheme.fg("muted", `$${cost.toFixed(4)}`)}`;
-	}
-	if (time !== undefined) {
-		headerParts += `${uiTheme.sep.dot}${uiTheme.fg("muted", `${time.toFixed(2)}s`)}`;
+	let hasMorePreview = false;
+	if (!expanded && resultCount > 0) {
+		const previewText = results[0].text ?? results[0].title ?? "";
+		const totalLines = previewText.split("\n").filter((l) => l.trim()).length;
+		hasMorePreview = totalLines > COLLAPSED_PREVIEW_LINES || resultCount > 1;
 	}
+	const expandHint = formatExpandHint(expanded, hasMorePreview, uiTheme);
 
-	let text = headerParts + expandHint;
+	let text = `${icon} ${uiTheme.fg("dim", summaryText)}${expandHint}`;
 
 	if (!expanded) {
-		// Collapsed view: show 3-line preview from first result
-		if (resultCount > 0) {
-			const first = results[0];
-			const previewText = first.text ?? first.title ?? "";
-			const previewLines = getPreviewLines(previewText, 3, 100, uiTheme.format.ellipsis);
-
-			for (const line of previewLines) {
-				text += `\n ${uiTheme.fg("dim", uiTheme.tree.vertical)}  ${uiTheme.fg("dim", line)}`;
-			}
+		if (resultCount === 0) {
+			text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", "No results")}`;
+			return new Text(text, 0, 0);
+		}
+
+		const first = results[0];
+		const previewText = first.text ?? first.title ?? "";
+		const previewLines = previewText
+			? getPreviewLines(previewText, COLLAPSED_PREVIEW_LINES, COLLAPSED_PREVIEW_LINE_LEN, uiTheme.format.ellipsis)
+			: [];
+		const safePreviewLines = previewLines.length > 0 ? previewLines : ["No preview text"];
+		const totalLines = previewText.split("\n").filter((l) => l.trim()).length;
+		const remainingLines = Math.max(0, totalLines - previewLines.length);
+		const extraItems: string[] = [];
+		if (remainingLines > 0) {
+			extraItems.push(formatMoreItems(remainingLines, "line", uiTheme));
+		}
+		if (resultCount > 1) {
+			extraItems.push(formatMoreItems(resultCount - 1, "result", uiTheme));
+		}
+
+		for (let i = 0; i < safePreviewLines.length; i++) {
+			const isLast = i === safePreviewLines.length - 1 && extraItems.length === 0;
+			const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
+			const line = safePreviewLines[i];
+			const color = line === "No preview text" ? "muted" : "toolOutput";
+			text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg(color, line)}`;
+		}
+
+		for (let i = 0; i < extraItems.length; i++) {
+			const isLast = i === extraItems.length - 1;
+			const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
+			text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg("muted", extraItems[i])}`;
+		}
 
-			const totalLines = previewText.split("\n").filter((l) => l.trim()).length;
-			if (totalLines > 3) {
-				text += `\n ${uiTheme.fg("dim", uiTheme.tree.vertical)}  ${uiTheme.fg(
+		return new Text(text, 0, 0);
+	}
+
+	if (resultCount === 0) {
+		text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", "No results")}`;
+		return new Text(text, 0, 0);
+	}
+
+	for (let i = 0; i < results.length; i++) {
+		const res = results[i];
+		const isLast = i === results.length - 1;
+		const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
+		const cont = isLast ? " " : uiTheme.tree.vertical;
+
+		const title = truncate(res.title ?? "Untitled", MAX_TITLE_LEN, uiTheme.format.ellipsis);
+		const domain = res.url ? getDomain(res.url) : "";
+		const domainPart = domain ? uiTheme.fg("dim", ` (${domain})`) : "";
+
+		text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg("accent", title)}${domainPart}`;
+
+		if (res.url) {
+			text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
+				"mdLinkUrl",
+				res.url,
+			)}`;
+		}
+
+		if (res.author) {
+			text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
+				"muted",
+				`Author: ${res.author}`,
+			)}`;
+		}
+
+		if (res.publishedDate) {
+			text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
+				"muted",
+				`Published: ${res.publishedDate}`,
+			)}`;
+		}
+
+		if (res.text) {
+			const textLines = res.text.split("\n").filter((l) => l.trim());
+			const displayLines = textLines.slice(0, EXPANDED_TEXT_LINES);
+			for (const line of displayLines) {
+				text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
+					"toolOutput",
+					truncate(line.trim(), EXPANDED_TEXT_LINE_LEN, uiTheme.format.ellipsis),
+				)}`;
+			}
+			if (textLines.length > EXPANDED_TEXT_LINES) {
+				text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
 					"muted",
-					`${uiTheme.format.ellipsis} ${totalLines - 3} more lines`,
+					formatMoreItems(textLines.length - EXPANDED_TEXT_LINES, "line", uiTheme),
 				)}`;
 			}
+		}
 
-			if (resultCount > 1) {
-				text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg(
+		if (res.highlights?.length) {
+			text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
+				"accent",
+				"Highlights",
+			)}`;
+			const maxHighlights = Math.min(res.highlights.length, 3);
+			for (let j = 0; j < maxHighlights; j++) {
+				const h = res.highlights[j];
+				text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
 					"muted",
-					`${resultCount - 1} more result${resultCount !== 2 ? "s" : ""}`,
+					`${uiTheme.format.dash} ${truncate(h, MAX_HIGHLIGHT_LEN, uiTheme.format.ellipsis)}`,
 				)}`;
 			}
-		}
-	} else {
-		// Expanded view: full results tree
-		if (resultCount > 0) {
-			text += `\n ${uiTheme.fg("dim", uiTheme.tree.vertical)}`;
-			text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("accent", "Results")}`;
-
-			for (let i = 0; i < results.length; i++) {
-				const res = results[i];
-				const isLast = i === results.length - 1;
-				const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-				const cont = isLast ? " " : uiTheme.tree.vertical;
-
-				// Title + domain
-				const title = truncate(res.title ?? "Untitled", 60, uiTheme.format.ellipsis);
-				const domain = res.url ? getDomain(res.url) : "";
-				const domainPart = domain ? uiTheme.fg("dim", ` (${domain})`) : "";
-
-				text += `\n ${uiTheme.fg("dim", " ")} ${uiTheme.fg("dim", branch)} ${uiTheme.fg("accent", title)}${domainPart}`;
-
-				// URL
-				if (res.url) {
-					text += `\n ${uiTheme.fg("dim", cont)}   ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg("mdLinkUrl", res.url)}`;
-				}
-
-				// Author
-				if (res.author) {
-					text += `\n ${uiTheme.fg("dim", cont)}   ${uiTheme.fg("muted", `Author: ${res.author}`)}`;
-				}
-
-				// Published date
-				if (res.publishedDate) {
-					text += `\n ${uiTheme.fg("dim", cont)}   ${uiTheme.fg("muted", `Published: ${res.publishedDate}`)}`;
-				}
-
-				// Text content
-				if (res.text) {
-					const textLines = res.text.split("\n").filter((l) => l.trim());
-					const displayLines = textLines.slice(0, 5); // Show first 5 lines
-					for (const line of displayLines) {
-						text += `\n ${uiTheme.fg("dim", cont)}   ${truncate(line.trim(), 90, uiTheme.format.ellipsis)}`;
-					}
-					if (textLines.length > 5) {
-						text += `\n ${uiTheme.fg("dim", cont)}   ${uiTheme.fg(
-							"muted",
-							`${uiTheme.format.ellipsis} ${textLines.length - 5} more lines`,
-						)}`;
-					}
-				}
-
-				// Highlights
-				if (res.highlights?.length) {
-					text += `\n ${uiTheme.fg("dim", cont)}   ${uiTheme.fg("accent", "Highlights:")}`;
-					for (let j = 0; j < Math.min(res.highlights.length, 3); j++) {
-						const h = res.highlights[j];
-						text += `\n ${uiTheme.fg("dim", cont)}   ${uiTheme.fg(
-							"muted",
-							`${uiTheme.format.bullet} ${truncate(h, 80, uiTheme.format.ellipsis)}`,
-						)}`;
-					}
-					if (res.highlights.length > 3) {
-						text += `\n ${uiTheme.fg("dim", cont)}   ${uiTheme.fg(
-							"muted",
-							`${uiTheme.format.ellipsis} ${res.highlights.length - 3} more`,
-						)}`;
-					}
-				}
+			if (res.highlights.length > maxHighlights) {
+				text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(
+					"muted",
+					formatMoreItems(res.highlights.length - maxHighlights, "highlight", uiTheme),
+				)}`;
 			}
 		}
 	}
@@ -191,10 +232,14 @@ export function renderExaResult(
 
 /** Render Exa call (query/args preview) */
 export function renderExaCall(args: Record<string, unknown>, toolName: string, uiTheme: Theme): Component {
-	const query = typeof args.query === "string" ? truncate(args.query, 80, uiTheme.format.ellipsis) : "";
+	const toolLabel = toolName || "Exa Search";
+	const query = typeof args.query === "string" ? truncate(args.query, 80, uiTheme.format.ellipsis) : "?";
 	const numResults = typeof args.num_results === "number" ? args.num_results : undefined;
-	const detail = numResults ? uiTheme.fg("dim", ` (${numResults} results)`) : "";
 
-	const text = `${uiTheme.fg("toolTitle", toolName)} ${uiTheme.fg("muted", query)}${detail}`;
+	let text = `${uiTheme.fg("toolTitle", toolLabel)} ${uiTheme.fg("accent", query)}`;
+	if (numResults !== undefined) {
+		text += ` ${uiTheme.fg("muted", `results:${numResults}`)}`;
+	}
+
 	return new Text(text, 0, 0);
 }

package/src/core/tools/find.ts

@@ -83,8 +83,14 @@ export function createFindTool(cwd: string): AgentTool<typeof findSchema> {
 				const shouldSortByMtime = sortByMtime ?? false;
 
 				// Build fd arguments
+				// When pattern contains path separators (e.g. "reports/**"), use --full-path
+				// so fd matches against the full path, not just the filename.
+				// Also prepend **/ to anchor the pattern at any depth in the search path.
+				const hasPathSeparator = pattern.includes("/") || pattern.includes("\\");
+				const effectivePattern = hasPathSeparator && !pattern.startsWith("**/") ? `**/${pattern}` : pattern;
 				const args: string[] = [
 					"--glob", // Use glob pattern
+					...(hasPathSeparator ? ["--full-path"] : []),
 					"--color=never", // No ANSI colors
 					"--max-results",
 					String(effectiveLimit),
@@ -127,7 +133,7 @@ export function createFindTool(cwd: string): AgentTool<typeof findSchema> {
 				}
 
 				// Pattern and path
-				args.push(pattern, searchPath);
+				args.push(effectivePattern, searchPath);
 
 				// Run fd
 				const result = Bun.spawnSync([fdPath, ...args], {