@oh-my-pi/pi-coding-agent 12.16.0 → 12.17.0

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## [Unreleased]
 
+## [12.17.0] - 2026-02-21
+### Added
+
+- Added timeout protection (5 seconds) for system prompt preparation with graceful fallback to minimal context on timeout
+
+### Changed
+
+- Replaced glob-based AGENTS.md discovery with depth-limited directory traversal (depth 1-4) for improved performance and control
+- Refactored system prompt preparation to parallelize file loading operations with a 5-second timeout to prevent startup hangs
+- Unified `renderCall` signatures to `(args, options, theme)` across all tool renderers and extension types
+
 ## [12.16.0] - 2026-02-21
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "12.16.0",
+	"version": "12.17.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"bin": {
@@ -85,12 +85,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "0.6.0",
-		"@oh-my-pi/omp-stats": "12.16.0",
-		"@oh-my-pi/pi-agent-core": "12.16.0",
-		"@oh-my-pi/pi-ai": "12.16.0",
-		"@oh-my-pi/pi-natives": "12.16.0",
-		"@oh-my-pi/pi-tui": "12.16.0",
-		"@oh-my-pi/pi-utils": "12.16.0",
+		"@oh-my-pi/omp-stats": "12.17.0",
+		"@oh-my-pi/pi-agent-core": "12.17.0",
+		"@oh-my-pi/pi-ai": "12.17.0",
+		"@oh-my-pi/pi-natives": "12.17.0",
+		"@oh-my-pi/pi-tui": "12.17.0",
+		"@oh-my-pi/pi-utils": "12.17.0",
 		"@sinclair/typebox": "^0.34.48",
 		"@xterm/headless": "^6.0.0",
 		"ajv": "^8.18.0",

package/src/extensibility/custom-tools/types.ts

@@ -182,7 +182,7 @@ export interface CustomTool<TParams extends TSchema = TSchema, TDetails = any> {
 	/** Called on session lifecycle events - use to reconstruct state or cleanup resources */
 	onSession?: (event: CustomToolSessionEvent, ctx: CustomToolContext) => void | Promise<void>;
 	/** Custom rendering for tool call display - return a Component */
-	renderCall?: (args: Static<TParams>, theme: Theme) => Component;
+	renderCall?: (args: Static<TParams>, options: RenderResultOptions, theme: Theme) => Component;
 
 	/** Custom rendering for tool result display - return a Component */
 	renderResult?: (

package/src/extensibility/extensions/types.ts

@@ -304,7 +304,7 @@ export interface ToolDefinition<TParams extends TSchema = TSchema, TDetails = un
 	onSession?: (event: ToolSessionEvent, ctx: ExtensionContext) => void | Promise<void>;
 
 	/** Custom rendering for tool call display */
-	renderCall?: (args: Static<TParams>, theme: Theme) => Component;
+	renderCall?: (args: Static<TParams>, options: ToolRenderResultOptions, theme: Theme) => Component;
 
 	/** Custom rendering for tool result display */
 	renderResult?: (

package/src/extensibility/extensions/wrapper.ts

@@ -18,7 +18,7 @@ export class RegisteredToolAdapter implements AgentTool<any, any, any> {
 	declare parameters: any;
 	declare label: string;
 
-	renderCall?: (args: any, theme: any) => any;
+	renderCall?: (args: any, options: any, theme: any) => any;
 	renderResult?: (result: any, options: any, theme: any, args?: any) => any;
 
 	constructor(
@@ -32,7 +32,8 @@ export class RegisteredToolAdapter implements AgentTool<any, any, any> {
 		// enters the custom-renderer path, gets undefined back, and silently
 		// discards tool result text (extensions without renderers show blank).
 		if (registeredTool.definition.renderCall) {
-			this.renderCall = (args: any, theme: any) => registeredTool.definition.renderCall!(args, theme as Theme);
+			this.renderCall = (args: any, options: any, theme: any) =>
+				registeredTool.definition.renderCall!(args, options, theme as Theme);
 		}
 		if (registeredTool.definition.renderResult) {
 			this.renderResult = (result: any, options: any, theme: any, args?: any) =>

package/src/lsp/render.ts

@@ -31,7 +31,7 @@ import type { LspParams, LspToolDetails } from "./types";
  * Render the LSP tool call in the TUI.
  * Shows: "lsp <operation> <file/filecount>"
  */
-export function renderCall(args: LspParams, theme: Theme): Text {
+export function renderCall(args: LspParams, _options: RenderResultOptions, theme: Theme): Text {
 	const actionLabel = (args.action ?? "request").replace(/_/g, " ");
 	const queryPreview = args.query ? truncateToWidth(args.query, TRUNCATE_LENGTHS.SHORT) : undefined;
 

package/src/mcp/tool-bridge.ts

@@ -198,7 +198,7 @@ export class MCPTool implements CustomTool<TSchema, MCPToolDetails> {
 		this.mcpServerName = connection.name;
 	}
 
-	renderCall(args: unknown, theme: Theme) {
+	renderCall(args: unknown, _options: RenderResultOptions, theme: Theme) {
 		return renderMCPCall((args ?? {}) as Record<string, unknown>, theme, this.label);
 	}
 
@@ -304,7 +304,7 @@ export class DeferredMCPTool implements CustomTool<TSchema, MCPToolDetails> {
 		this.#fallbackProviderName = source?.providerName;
 	}
 
-	renderCall(args: unknown, theme: Theme) {
+	renderCall(args: unknown, _options: RenderResultOptions, theme: Theme) {
 		return renderMCPCall((args ?? {}) as Record<string, unknown>, theme, this.label);
 	}
 

package/src/modes/components/tool-execution.ts

@@ -391,7 +391,7 @@ export class ToolExecutionComponent extends Container {
 			const shouldRenderCall = !this.#result || !mergeCallAndResult;
 			if (shouldRenderCall && tool.renderCall) {
 				try {
-					const callComponent = tool.renderCall(this.#getCallArgsForRender(), theme);
+					const callComponent = tool.renderCall(this.#getCallArgsForRender(), this.#renderState, theme);
 					if (callComponent) {
 						this.#contentBox.addChild(ensureInvalidate(callComponent));
 					}
@@ -453,7 +453,7 @@ export class ToolExecutionComponent extends Container {
 			if (shouldRenderCall) {
 				// Render call component
 				try {
-					const callComponent = renderer.renderCall(this.#getCallArgsForRender(), theme, this.#renderState);
+					const callComponent = renderer.renderCall(this.#getCallArgsForRender(), this.#renderState, theme);
 					if (callComponent) {
 						this.#contentBox.addChild(ensureInvalidate(callComponent));
 					}

package/src/patch/shared.ts

@@ -19,7 +19,6 @@ import {
 	ToolUIKit,
 	truncateDiffByHunk,
 } from "../tools/render-utils";
-import type { RenderCallOptions } from "../tools/renderers";
 import { Ellipsis, Hasher, type RenderCache, renderStatusLine, truncateToWidth } from "../tui";
 import type { DiffError, DiffResult, Operation } from "./types";
 
@@ -254,7 +253,7 @@ function renderDiffSection(
 export const editToolRenderer = {
 	mergeCallAndResult: true,
 
-	renderCall(args: EditRenderArgs, uiTheme: Theme, options?: RenderCallOptions): Component {
+	renderCall(args: EditRenderArgs, options: RenderResultOptions, uiTheme: Theme): Component {
 		const ui = new ToolUIKit(uiTheme);
 		const rawPath = args.file_path || args.path || "";
 		const filePath = shortenPath(rawPath);

package/src/system-prompt.ts

@@ -1,8 +1,11 @@
 /**
  * System prompt construction and project context loading
  */
+
+import * as fs from "node:fs";
 import * as os from "node:os";
-import { $env, hasFsCode, isEnoent, logger } from "@oh-my-pi/pi-utils";
+import * as path from "node:path";
+import { $env, hasFsCode, isEnoent, logger, untilAborted } from "@oh-my-pi/pi-utils";
 import { getGpuCachePath, getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import { $ } from "bun";
 import { contextFileCapability } from "./capability/context-file";
@@ -49,47 +52,38 @@ async function loadPreloadedSkillContents(preloadedSkills: Skill[]): Promise<Pre
  * Returns structured git data or null if not in a git repo.
  */
 export async function loadGitContext(cwd: string): Promise<GitContext | null> {
-	const runGit = async (args: string[], timeoutMs = 1500): Promise<string | null> => {
+	const timeout = 3000;
+	const abortSignal = AbortSignal.timeout(timeout);
+
+	const git = async (...args: string[]): Promise<string | null> => {
 		const proc = Bun.spawn(["git", ...args], {
 			cwd,
 			stdout: "pipe",
 			stderr: "ignore",
+			timeout: timeout,
+		});
+		return untilAborted(abortSignal, async () => {
+			const exitCode = await proc.exited;
+			const stdout = await proc.stdout.text();
+			return exitCode === 0 ? stdout.trim() : null;
 		});
-		const stdoutPromise = proc.stdout ? new Response(proc.stdout).text() : Promise.resolve("");
-		const race = await Promise.race([
-			proc.exited.then(() => "exited" as const),
-			Bun.sleep(timeoutMs).then(() => "timeout" as const),
-		]);
-
-		if (race === "timeout") {
-			proc.kill();
-			await stdoutPromise.catch(() => null);
-			logger.debug("Git context command timed out", { cwd, args, timeoutMs });
-			return null;
-		}
-
-		const exitCode = await proc.exited;
-		const stdout = await stdoutPromise.catch(() => "");
-		if (exitCode !== 0) return null;
-
-		const trimmed = stdout.trim();
-		return trimmed.length > 0 ? trimmed : "";
 	};
+
 	// Check if inside a git repo
-	const isGitRepo = await runGit(["rev-parse", "--is-inside-work-tree"]);
+	const isGitRepo = await git("rev-parse", "--is-inside-work-tree");
 	if (isGitRepo !== "true") return null;
-	const currentBranch = await runGit(["rev-parse", "--abbrev-ref", "HEAD"]);
+	const currentBranch = await git("rev-parse", "--abbrev-ref", "HEAD");
 	if (!currentBranch) return null;
 	let mainBranch = "main";
-	const mainExists = await runGit(["rev-parse", "--verify", "main"]);
+	const mainExists = await git("rev-parse", "--verify", "main");
 	if (mainExists === null) {
-		const masterExists = await runGit(["rev-parse", "--verify", "master"]);
+		const masterExists = await git("rev-parse", "--verify", "master");
 		if (masterExists !== null) mainBranch = "master";
 	}
 
 	const [status, commits] = await Promise.all([
-		runGit(["status", "--porcelain", "--untracked-files=no"], 2000),
-		runGit(["log", "--oneline", "-5"]),
+		git("status", "--porcelain", "--untracked-files=no"),
+		git("log", "--oneline", "-5"),
 	]);
 	return {
 		isRepo: true,
@@ -117,8 +111,11 @@ function parseWmicTable(output: string, header: string): string | null {
 	return filtered[0] ?? null;
 }
 
-const AGENTS_MD_PATTERN = "**/AGENTS.md";
+const AGENTS_MD_MIN_DEPTH = 1;
+const AGENTS_MD_MAX_DEPTH = 4;
 const AGENTS_MD_LIMIT = 200;
+const SYSTEM_PROMPT_PREP_TIMEOUT_MS = 5000;
+const AGENTS_MD_EXCLUDED_DIRS = new Set(["node_modules", ".git"]);
 
 interface AgentsMdSearch {
 	scopePath: string;
@@ -131,27 +128,75 @@ function normalizePath(value: string): string {
 	return value.replace(/\\/g, "/");
 }
 
-function listAgentsMdFiles(root: string, limit: number): string[] {
+function shouldSkipAgentsDir(name: string): boolean {
+	if (AGENTS_MD_EXCLUDED_DIRS.has(name)) return true;
+	return name.startsWith(".");
+}
+
+async function collectAgentsMdFiles(
+	root: string,
+	dir: string,
+	depth: number,
+	limit: number,
+	discovered: Set<string>,
+): Promise<void> {
+	if (depth > AGENTS_MD_MAX_DEPTH || discovered.size >= limit) {
+		return;
+	}
+
+	let entries: fs.Dirent[];
 	try {
-		const entries = Array.from(
-			new Bun.Glob(AGENTS_MD_PATTERN).scanSync({ cwd: root, onlyFiles: true, dot: false, absolute: false }),
-		);
-		const normalized = entries
-			.map(entry => normalizePath(entry))
-			.filter(entry => entry.length > 0 && !entry.includes("node_modules"))
-			.sort();
-		return normalized.length > limit ? normalized.slice(0, limit) : normalized;
+		entries = await fs.promises.readdir(dir, { withFileTypes: true });
+	} catch {
+		return;
+	}
+
+	if (depth >= AGENTS_MD_MIN_DEPTH) {
+		const hasAgentsMd = entries.some(entry => entry.isFile() && entry.name === "AGENTS.md");
+		if (hasAgentsMd) {
+			const relPath = normalizePath(path.relative(root, path.join(dir, "AGENTS.md")));
+			if (relPath.length > 0) {
+				discovered.add(relPath);
+			}
+			if (discovered.size >= limit) {
+				return;
+			}
+		}
+	}
+
+	if (depth === AGENTS_MD_MAX_DEPTH) {
+		return;
+	}
+
+	const childDirs = entries
+		.filter(entry => entry.isDirectory() && !shouldSkipAgentsDir(entry.name))
+		.map(entry => entry.name)
+		.sort();
+
+	await Promise.all(
+		childDirs.map(async child => {
+			if (discovered.size >= limit) return;
+			await collectAgentsMdFiles(root, path.join(dir, child), depth + 1, limit, discovered);
+		}),
+	);
+}
+
+async function listAgentsMdFiles(root: string, limit: number): Promise<string[]> {
+	try {
+		const discovered = new Set<string>();
+		await collectAgentsMdFiles(root, root, 0, limit, discovered);
+		return Array.from(discovered).sort().slice(0, limit);
 	} catch {
 		return [];
 	}
 }
 
-function buildAgentsMdSearch(cwd: string): AgentsMdSearch {
-	const files = listAgentsMdFiles(cwd, AGENTS_MD_LIMIT);
+async function buildAgentsMdSearch(cwd: string): Promise<AgentsMdSearch> {
+	const files = await listAgentsMdFiles(cwd, AGENTS_MD_LIMIT);
 	return {
 		scopePath: ".",
 		limit: AGENTS_MD_LIMIT,
-		pattern: AGENTS_MD_PATTERN,
+		pattern: `AGENTS.md depth ${AGENTS_MD_MIN_DEPTH}-${AGENTS_MD_MAX_DEPTH}`,
 		files,
 	};
 }
@@ -463,12 +508,114 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		rules,
 	} = options;
 	const resolvedCwd = cwd ?? getProjectDir();
-	const resolvedCustomPrompt = await resolvePromptInput(customPrompt, "system prompt");
-	const resolvedAppendPrompt = await resolvePromptInput(appendSystemPrompt, "append system prompt");
+	const preloadedSkills = providedPreloadedSkills;
+
+	const prepPromise = (async () => {
+		const systemPromptCustomizationPromise = (async () => {
+			const customization = await loadSystemPromptFiles({ cwd: resolvedCwd });
+			debugStartup("system-prompt:loadSystemPromptFiles:done");
+			return customization;
+		})();
+		const contextFilesPromise = providedContextFiles
+			? Promise.resolve(providedContextFiles)
+			: loadProjectContextFiles({ cwd: resolvedCwd });
+		const agentsMdSearchPromise = buildAgentsMdSearch(resolvedCwd);
+		const skillsPromise: Promise<Skill[]> =
+			providedSkills !== undefined
+				? Promise.resolve(providedSkills)
+				: skillsSettings?.enabled !== false
+					? loadSkills({ ...skillsSettings, cwd: resolvedCwd }).then(result => result.skills)
+					: Promise.resolve([]);
+		const preloadedSkillContentsPromise = (async () => {
+			debugStartup("system-prompt:loadPreloadedSkills:start");
+			const loaded = preloadedSkills ? await loadPreloadedSkillContents(preloadedSkills) : [];
+			debugStartup("system-prompt:loadPreloadedSkills:done");
+			return loaded;
+		})();
+		const gitPromise = (async () => {
+			debugStartup("system-prompt:loadGitContext:start");
+			const loaded = await loadGitContext(resolvedCwd);
+			debugStartup("system-prompt:loadGitContext:done");
+			return loaded;
+		})();
+
+		const [
+			resolvedCustomPrompt,
+			resolvedAppendPrompt,
+			systemPromptCustomization,
+			contextFiles,
+			agentsMdSearch,
+			skills,
+			preloadedSkillContents,
+			git,
+		] = await Promise.all([
+			resolvePromptInput(customPrompt, "system prompt"),
+			resolvePromptInput(appendSystemPrompt, "append system prompt"),
+			systemPromptCustomizationPromise,
+			contextFilesPromise,
+			agentsMdSearchPromise,
+			skillsPromise,
+			preloadedSkillContentsPromise,
+			gitPromise,
+		]);
 
-	// Load SYSTEM.md customization (prepended to prompt)
-	const systemPromptCustomization = await loadSystemPromptFiles({ cwd: resolvedCwd });
-	debugStartup("system-prompt:loadSystemPromptFiles:done");
+		return {
+			resolvedCustomPrompt,
+			resolvedAppendPrompt,
+			systemPromptCustomization,
+			contextFiles,
+			agentsMdSearch,
+			skills,
+			preloadedSkillContents,
+			git,
+		};
+	})();
+
+	const prepResult = await Promise.race([
+		prepPromise
+			.then(value => ({ type: "ready" as const, value }))
+			.catch(error => ({ type: "error" as const, error })),
+		Bun.sleep(SYSTEM_PROMPT_PREP_TIMEOUT_MS).then(() => ({ type: "timeout" as const })),
+	]);
+
+	let resolvedCustomPrompt: string | undefined;
+	let resolvedAppendPrompt: string | undefined;
+	let systemPromptCustomization: string | null = null;
+	let contextFiles: Array<{ path: string; content: string; depth?: number }> = providedContextFiles ?? [];
+	let agentsMdSearch: AgentsMdSearch = {
+		scopePath: ".",
+		limit: AGENTS_MD_LIMIT,
+		pattern: `AGENTS.md depth ${AGENTS_MD_MIN_DEPTH}-${AGENTS_MD_MAX_DEPTH}`,
+		files: [],
+	};
+	let skills: Skill[] = providedSkills ?? [];
+	let preloadedSkillContents: PreloadedSkill[] = [];
+	let git: GitContext | null = null;
+
+	if (prepResult.type === "timeout") {
+		logger.warn("System prompt preparation timed out; using minimal startup context", {
+			cwd: resolvedCwd,
+			timeoutMs: SYSTEM_PROMPT_PREP_TIMEOUT_MS,
+		});
+		process.stderr.write(
+			`Warning: system prompt preparation timed out after ${SYSTEM_PROMPT_PREP_TIMEOUT_MS}ms; using minimal startup context.\n`,
+		);
+	} else if (prepResult.type === "error") {
+		logger.warn("System prompt preparation failed; using minimal startup context", {
+			cwd: resolvedCwd,
+			error: String(prepResult.error),
+		});
+		process.stderr.write("Warning: system prompt preparation failed; using minimal startup context.\n");
+	} else {
+		resolvedCustomPrompt = prepResult.value.resolvedCustomPrompt;
+		resolvedAppendPrompt = prepResult.value.resolvedAppendPrompt;
+		systemPromptCustomization = prepResult.value.systemPromptCustomization;
+		contextFiles = prepResult.value.contextFiles;
+		agentsMdSearch = prepResult.value.agentsMdSearch;
+		skills = prepResult.value.skills;
+		preloadedSkillContents = prepResult.value.preloadedSkillContents;
+		git = prepResult.value.git;
+	}
 
 	const now = new Date();
 	const date = now.toLocaleDateString("en-CA", {
@@ -487,10 +634,6 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		timeZoneName: "short",
 	});
 
-	// Resolve context files: use provided or discover
-	const contextFiles = providedContextFiles ?? (await loadProjectContextFiles({ cwd: resolvedCwd }));
-	const agentsMdSearch = buildAgentsMdSearch(resolvedCwd);
-
 	// Build tool descriptions array
 	// Priority: toolNames (explicit list) > tools (Map) > defaults
 	// Default includes both bash and python; actual availability determined by settings in createTools
@@ -512,19 +655,6 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		name,
 		description: tools?.get(name)?.description ?? "",
 	}));
-	// Resolve skills: use provided or discover
-	const skills =
-		providedSkills ??
-		(skillsSettings?.enabled !== false ? (await loadSkills({ ...skillsSettings, cwd: resolvedCwd })).skills : []);
-	const preloadedSkills = providedPreloadedSkills;
-	debugStartup("system-prompt:loadPreloadedSkills:start");
-	const preloadedSkillContents = preloadedSkills ? await loadPreloadedSkillContents(preloadedSkills) : [];
-	debugStartup("system-prompt:loadPreloadedSkills:done");
-
-	// Get git context
-	debugStartup("system-prompt:loadGitContext:start");
-	const git = await loadGitContext(resolvedCwd);
-	debugStartup("system-prompt:loadGitContext:done");
 
 	// Filter skills to only include those with read tool
 	const hasRead = tools?.has("read");

package/src/task/render.ts

@@ -445,7 +445,7 @@ function formatOutputInline(data: unknown, theme: Theme, maxWidth = 80): string
 /**
  * Render the tool call arguments.
  */
-export function renderCall(args: TaskParams, theme: Theme): Component {
+export function renderCall(args: TaskParams, _options: RenderResultOptions, theme: Theme): Component {
 	const lines: string[] = [];
 	lines.push(renderStatusLine({ icon: "pending", title: "Task", description: args.agent }, theme));
 

package/src/tools/ask.ts

@@ -380,7 +380,7 @@ interface AskRenderArgs {
 }
 
 export const askToolRenderer = {
-	renderCall(args: AskRenderArgs, uiTheme: Theme): Component {
+	renderCall(args: AskRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const ui = new ToolUIKit(uiTheme);
 		const label = ui.title("Ask");
 

package/src/tools/bash.ts

@@ -237,7 +237,7 @@ function formatBashCommand(args: BashRenderArgs, _uiTheme: Theme): string {
 export const BASH_PREVIEW_LINES = 10;
 
 export const bashToolRenderer = {
-	renderCall(args: BashRenderArgs, uiTheme: Theme): Component {
+	renderCall(args: BashRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const cmdText = formatBashCommand(args, uiTheme);
 		const text = renderStatusLine({ icon: "pending", title: "Bash", description: cmdText }, uiTheme);
 		return new Text(text, 0, 0);

package/src/tools/calculator.ts

@@ -444,7 +444,7 @@ export const calculatorToolRenderer = {
 	 * Render the tool call header showing the first expression and count.
 	 * Format: "Calc <expression> (N calcs)"
 	 */
-	renderCall(args: CalculatorRenderArgs, uiTheme: Theme): Component {
+	renderCall(args: CalculatorRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const count = args.calculations?.length ?? 0;
 		const firstExpression = args.calculations?.[0]?.expression;
 		const description = firstExpression ? truncateToWidth(firstExpression, TRUNCATE_LENGTHS.TITLE) : undefined;

package/src/tools/fetch.ts

@@ -967,6 +967,7 @@ function countNonEmptyLines(text: string): number {
 /** Render fetch call (URL preview) */
 export function renderFetchCall(
 	args: { url?: string; timeout?: number; raw?: boolean },
+	_options: RenderResultOptions,
 	uiTheme: Theme = theme,
 ): Component {
 	const url = args.url ?? "";

package/src/tools/find.ts

@@ -407,7 +407,7 @@ const COLLAPSED_LIST_LIMIT = PREVIEW_LIMITS.COLLAPSED_ITEMS;
 
 export const findToolRenderer = {
 	inline: true,
-	renderCall(args: FindRenderArgs, uiTheme: Theme): Component {
+	renderCall(args: FindRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const meta: string[] = [];
 		if (args.limit !== undefined) meta.push(`limit:${args.limit}`);
 

package/src/tools/grep.ts

@@ -309,7 +309,7 @@ const COLLAPSED_TEXT_LIMIT = PREVIEW_LIMITS.COLLAPSED_LINES * 2;
 
 export const grepToolRenderer = {
 	inline: true,
-	renderCall(args: GrepRenderArgs, uiTheme: Theme): Component {
+	renderCall(args: GrepRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const meta: string[] = [];
 		if (args.path) meta.push(`in ${args.path}`);
 		if (args.glob) meta.push(`glob:${args.glob}`);

package/src/tools/notebook.ts

@@ -203,7 +203,7 @@ interface NotebookRenderArgs {
 const COLLAPSED_TEXT_LIMIT = PREVIEW_LIMITS.COLLAPSED_LINES * 2;
 
 export const notebookToolRenderer = {
-	renderCall(args: NotebookRenderArgs, uiTheme: Theme): Component {
+	renderCall(args: NotebookRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const meta: string[] = [];
 		const notebookPath = args.notebookPath ?? args.notebook_path;
 		const cellNumber = args.cellNumber ?? args.cell_index;

package/src/tools/python.ts

@@ -834,7 +834,7 @@ function formatCellOutputLines(
 }
 
 export const pythonToolRenderer = {
-	renderCall(args: PythonRenderArgs, uiTheme: Theme): Component {
+	renderCall(args: PythonRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const ui = new ToolUIKit(uiTheme);
 		const cells = args.cells ?? [];
 		const cwd = getProjectDir();

package/src/tools/read.ts

@@ -1077,7 +1077,7 @@ interface ReadRenderArgs {
 }
 
 export const readToolRenderer = {
-	renderCall(args: ReadRenderArgs, uiTheme: Theme): Component {
+	renderCall(args: ReadRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const rawPath = args.file_path || args.path || "";
 		const filePath = shortenPath(rawPath);
 		const offset = args.offset;

package/src/tools/renderers.ts

@@ -23,12 +23,8 @@ import { sshToolRenderer } from "./ssh";
 import { todoWriteToolRenderer } from "./todo-write";
 import { writeToolRenderer } from "./write";
 
-export interface RenderCallOptions {
-	spinnerFrame?: number;
-}
-
 type ToolRenderer = {
-	renderCall: (args: unknown, theme: Theme, options?: RenderCallOptions) => Component;
+	renderCall: (args: unknown, options: RenderResultOptions, theme: Theme) => Component;
 	renderResult: (
 		result: { content: Array<{ type: string; text?: string }>; details?: unknown; isError?: boolean },
 		options: RenderResultOptions & { renderContext?: Record<string, unknown> },

package/src/tools/review.ts

@@ -104,7 +104,7 @@ export const reportFindingTool: AgentTool<typeof ReportFindingParams, ReportFind
 		};
 	},
 
-	renderCall(args, theme): Component {
+	renderCall(args, _options, theme): Component {
 		const { label, icon, color } = getPriorityDisplay(args.priority, theme);
 		const titleText = String(args.title).replace(/^\[P\d\]\s*/, "");
 		return new Text(

package/src/tools/ssh.ts

@@ -229,7 +229,7 @@ interface SshRenderContext {
 }
 
 export const sshToolRenderer = {
-	renderCall(args: SshRenderArgs, uiTheme: Theme): Component {
+	renderCall(args: SshRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const host = args.host || "…";
 		const command = args.command || "…";
 		const text = renderStatusLine({ icon: "pending", title: "SSH", description: `[${host}] $ ${command}` }, uiTheme);

package/src/tools/todo-write.ts

@@ -214,7 +214,7 @@ interface TodoWriteRenderArgs {
 }
 
 export const todoWriteToolRenderer = {
-	renderCall(args: TodoWriteRenderArgs, uiTheme: Theme): Component {
+	renderCall(args: TodoWriteRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const count = args.todos?.length ?? 0;
 		const meta = count > 0 ? [`${count} items`] : ["empty"];
 		const text = renderStatusLine({ icon: "pending", title: "Todo Write", meta }, uiTheme);

package/src/tools/write.ts

@@ -28,7 +28,6 @@ import {
 	shortenPath,
 	ToolUIKit,
 } from "./render-utils";
-import type { RenderCallOptions } from "./renderers";
 
 const writeSchema = Type.Object({
 	path: Type.String({ description: "Path to the file to write (relative or absolute)" }),
@@ -189,7 +188,7 @@ function renderContentPreview(content: string, expanded: boolean, uiTheme: Theme
 }
 
 export const writeToolRenderer = {
-	renderCall(args: WriteRenderArgs, uiTheme: Theme, options?: RenderCallOptions): Component {
+	renderCall(args: WriteRenderArgs, options: RenderResultOptions, uiTheme: Theme): Component {
 		const ui = new ToolUIKit(uiTheme);
 		const rawPath = args.file_path || args.path || "";
 		const filePath = shortenPath(rawPath);

package/src/web/search/index.ts

@@ -285,8 +285,8 @@ export const webSearchCustomTool: CustomTool<typeof webSearchSchema, SearchRende
 		return executeSearch(toolCallId, params);
 	},
 
-	renderCall(args: SearchParams, theme: Theme) {
-		return renderSearchCall(args, theme);
+	renderCall(args: SearchParams, options: RenderResultOptions, theme: Theme) {
+		return renderSearchCall(args, options, theme);
 	},
 
 	renderResult(result, options: RenderResultOptions, theme: Theme) {
@@ -405,7 +405,7 @@ Parameters:
 		return executeExaTool("web_search_exa", args, "web_search_deep");
 	},
 
-	renderCall(args, theme) {
+	renderCall(args, _options, theme) {
 		return renderExaCall(args as Record<string, unknown>, "Deep Search", theme);
 	},
 
@@ -436,7 +436,7 @@ Parameters:
 		return executeExaTool("get_code_context_exa", params as Record<string, unknown>, "web_search_code_context");
 	},
 
-	renderCall(args, theme) {
+	renderCall(args, _options, theme) {
 		return renderExaCall(args as Record<string, unknown>, "Code Search", theme);
 	},
 
@@ -464,7 +464,7 @@ Parameters:
 		return executeExaTool("crawling", params as Record<string, unknown>, "web_search_crawl");
 	},
 
-	renderCall(args, theme) {
+	renderCall(args, _options, theme) {
 		const url = (args as { url: string }).url;
 		return renderExaCall({ query: url }, "Crawl URL", theme);
 	},
@@ -495,7 +495,7 @@ Parameters:
 		return executeExaTool("linkedin_search", params as Record<string, unknown>, "web_search_linkedin");
 	},
 
-	renderCall(args, theme) {
+	renderCall(args, _options, theme) {
 		return renderExaCall(args as Record<string, unknown>, "LinkedIn Search", theme);
 	},
 
@@ -525,7 +525,7 @@ Parameters:
 		return executeExaTool("company_research", params as Record<string, unknown>, "web_search_company");
 	},
 
-	renderCall(args, theme) {
+	renderCall(args, _options, theme) {
 		const name = (args as { company_name: string }).company_name;
 		return renderExaCall({ query: name }, "Company Research", theme);
 	},

package/src/web/search/render.ts

@@ -283,6 +283,7 @@ export function renderSearchResult(
 /** Render web search call (query preview) */
 export function renderSearchCall(
 	args: { query?: string; provider?: string; [key: string]: unknown },
+	_options: RenderResultOptions,
 	theme: Theme,
 ): Component {
 	const provider = args.provider ?? "auto";