@oh-my-pi/pi-coding-agent 3.15.0 → 3.20.0

package/src/core/tools/web-fetch.ts

@@ -1,6 +1,4 @@
-import { spawnSync } from "node:child_process";
-import * as fs from "node:fs";
-import * as os from "node:os";
+import { tmpdir } from "node:os";
 import * as path from "node:path";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import { Type } from "@sinclair/typebox";
@@ -197,18 +195,15 @@ function exec(
 	args: string[],
 	options?: { timeout?: number; input?: string | Buffer },
 ): { stdout: string; stderr: string; ok: boolean } {
-	const timeout = (options?.timeout ?? DEFAULT_TIMEOUT) * 1000;
-	const result = spawnSync(cmd, args, {
-		encoding: options?.input instanceof Buffer ? "buffer" : "utf-8",
-		timeout,
-		maxBuffer: MAX_BYTES,
-		input: options?.input,
-		shell: true,
+	const result = Bun.spawnSync([cmd, ...args], {
+		stdin: options?.input ? (options.input as any) : "ignore",
+		stdout: "pipe",
+		stderr: "pipe",
 	});
 	return {
 		stdout: result.stdout?.toString() ?? "",
 		stderr: result.stderr?.toString() ?? "",
-		ok: result.status === 0,
+		ok: result.exitCode === 0,
 	};
 }
 
@@ -217,8 +212,12 @@ function exec(
  */
 function hasCommand(cmd: string): boolean {
 	const checkCmd = isWindows ? "where" : "which";
-	const result = spawnSync(checkCmd, [cmd], { encoding: "utf-8", shell: true });
-	return result.status === 0;
+	const result = Bun.spawnSync([checkCmd, cmd], {
+		stdin: "ignore",
+		stdout: "pipe",
+		stderr: "pipe",
+	});
+	return result.exitCode === 0;
 }
 
 /**
@@ -299,26 +298,27 @@ function looksLikeHtml(content: string): boolean {
 /**
  * Convert binary file to markdown using markitdown
  */
-function convertWithMarkitdown(
+async function convertWithMarkitdown(
 	content: Buffer,
 	extensionHint: string,
 	timeout: number,
-): { content: string; ok: boolean } {
+): Promise<{ content: string; ok: boolean }> {
 	if (!hasCommand("markitdown")) {
 		return { content: "", ok: false };
 	}
 
 	// Write to temp file with extension hint
 	const ext = extensionHint || ".bin";
-	const tmpFile = path.join(os.tmpdir(), `omp-convert-${Date.now()}${ext}`);
+	const tmpDir = tmpdir();
+	const tmpFile = path.join(tmpDir, `omp-convert-${Date.now()}${ext}`);
 
 	try {
-		fs.writeFileSync(tmpFile, content);
+		await Bun.write(tmpFile, content);
 		const result = exec("markitdown", [tmpFile], { timeout });
 		return { content: result.stdout, ok: result.ok };
 	} finally {
 		try {
-			fs.unlinkSync(tmpFile);
+			await Bun.$`rm ${tmpFile}`.quiet();
 		} catch {}
 	}
 }
@@ -531,10 +531,11 @@ function parseFeedToMarkdown(content: string, maxItems = 10): string {
 /**
  * Render HTML to text using lynx
  */
-function renderWithLynx(html: string, timeout: number): { content: string; ok: boolean } {
-	const tmpFile = path.join(os.tmpdir(), `omp-render-${Date.now()}.html`);
+async function renderWithLynx(html: string, timeout: number): Promise<{ content: string; ok: boolean }> {
+	const tmpDir = tmpdir();
+	const tmpFile = path.join(tmpDir, `omp-render-${Date.now()}.html`);
 	try {
-		fs.writeFileSync(tmpFile, html);
+		await Bun.write(tmpFile, html);
 		// Convert path to file URL (handles Windows paths correctly)
 		const normalizedPath = tmpFile.replace(/\\/g, "/");
 		const fileUrl = normalizedPath.startsWith("/") ? `file://${normalizedPath}` : `file:///${normalizedPath}`;
@@ -542,7 +543,7 @@ function renderWithLynx(html: string, timeout: number): { content: string; ok: b
 		return { content: result.stdout, ok: result.ok };
 	} finally {
 		try {
-			fs.unlinkSync(tmpFile);
+			await Bun.$`rm ${tmpFile}`.quiet();
 		} catch {}
 	}
 }
@@ -1752,7 +1753,7 @@ async function handleArxiv(url: string, timeout: number): Promise<RenderResult |
 				notes.push("Fetching PDF for full content...");
 				const pdfResult = await fetchBinary(pdfLink, timeout);
 				if (pdfResult.ok) {
-					const converted = convertWithMarkitdown(pdfResult.buffer, ".pdf", timeout);
+					const converted = await convertWithMarkitdown(pdfResult.buffer, ".pdf", timeout);
 					if (converted.ok && converted.content.length > 500) {
 						md += `---\n\n## Full Paper\n\n${converted.content}\n`;
 						notes.push("PDF converted via markitdown");
@@ -1835,7 +1836,7 @@ async function handleIacr(url: string, timeout: number): Promise<RenderResult |
 			notes.push("Fetching PDF for full content...");
 			const pdfResult = await fetchBinary(pdfUrl, timeout);
 			if (pdfResult.ok) {
-				const converted = convertWithMarkitdown(pdfResult.buffer, ".pdf", timeout);
+				const converted = await convertWithMarkitdown(pdfResult.buffer, ".pdf", timeout);
 				if (converted.ok && converted.content.length > 500) {
 					md += `---\n\n## Full Paper\n\n${converted.content}\n`;
 					notes.push("PDF converted via markitdown");
@@ -1992,7 +1993,7 @@ async function renderUrl(url: string, timeout: number, raw: boolean = false): Pr
 		const binary = await fetchBinary(finalUrl, timeout);
 		if (binary.ok) {
 			const ext = getExtensionHint(finalUrl, binary.contentDisposition) || extHint;
-			const converted = convertWithMarkitdown(binary.buffer, ext, timeout);
+			const converted = await convertWithMarkitdown(binary.buffer, ext, timeout);
 			if (converted.ok && converted.content.trim().length > 50) {
 				notes.push(`Converted with markitdown`);
 				const output = finalizeOutput(converted.content);
@@ -2174,7 +2175,7 @@ async function renderUrl(url: string, timeout: number, raw: boolean = false): Pr
 			};
 		}
 
-		const lynxResult = renderWithLynx(rawContent, timeout);
+		const lynxResult = await renderWithLynx(rawContent, timeout);
 		if (!lynxResult.ok) {
 			notes.push("lynx failed");
 			const output = finalizeOutput(rawContent);
@@ -2198,7 +2199,7 @@ async function renderUrl(url: string, timeout: number, raw: boolean = false): Pr
 				const binary = await fetchBinary(docUrl, timeout);
 				if (binary.ok) {
 					const ext = getExtensionHint(docUrl, binary.contentDisposition);
-					const converted = convertWithMarkitdown(binary.buffer, ext, timeout);
+					const converted = await convertWithMarkitdown(binary.buffer, ext, timeout);
 					if (converted.ok && converted.content.trim().length > lynxResult.content.length) {
 						notes.push(`Extracted and converted document: ${docUrl}`);
 						const output = finalizeOutput(converted.content);
@@ -2384,7 +2385,7 @@ export function renderWebFetchResult(
 		? uiTheme.styledSymbol("status.warning", "warning")
 		: uiTheme.styledSymbol("status.success", "success");
 	const expandHint = expanded ? "" : uiTheme.fg("dim", " (Ctrl+O to expand)");
-	let text = `${statusIcon} ${uiTheme.fg("toolTitle", "Web Fetch")} ${uiTheme.fg("accent", `(${domain})`)}${uiTheme.sep.dot}${uiTheme.fg("dim", details.method)}${expandHint}`;
+	let text = `${statusIcon} ${uiTheme.fg("accent", `(${domain})`)}${uiTheme.sep.dot}${uiTheme.fg("dim", details.method)}${expandHint}`;
 
 	// Get content text
 	const contentText = result.content[0]?.text ?? "";

package/src/core/tools/web-search/index.ts

@@ -20,10 +20,11 @@ import type { CustomTool, CustomToolContext, RenderResultOptions } from "../../c
 import { callExaTool, findApiKey as findExaKey, formatSearchResults, isSearchResponse } from "../exa/mcp-client";
 import { renderExaCall, renderExaResult } from "../exa/render";
 import type { ExaRenderDetails } from "../exa/types";
+import { formatAge } from "../render-utils";
 import { searchAnthropic } from "./providers/anthropic";
 import { searchExa } from "./providers/exa";
 import { findApiKey as findPerplexityKey, searchPerplexity } from "./providers/perplexity";
-import { formatAge, renderWebSearchCall, renderWebSearchResult, type WebSearchRenderDetails } from "./render";
+import { renderWebSearchCall, renderWebSearchResult, type WebSearchRenderDetails } from "./render";
 import type { WebSearchProvider, WebSearchResponse } from "./types";
 
 /** Web search parameters schema */
@@ -31,8 +32,8 @@ export const webSearchSchema = Type.Object({
 	// Common
 	query: Type.String({ description: "Search query" }),
 	provider: Type.Optional(
-		Type.Union([Type.Literal("exa"), Type.Literal("anthropic"), Type.Literal("perplexity")], {
-			description: "Search provider (auto-detected if omitted based on API keys)",
+		Type.Union([Type.Literal("auto"), Type.Literal("exa"), Type.Literal("anthropic"), Type.Literal("perplexity")], {
+			description: "Search provider (auto-detected if omitted or set to auto)",
 		}),
 	),
 	num_results: Type.Optional(Type.Number({ description: "Maximum number of results to return" })),
@@ -81,7 +82,7 @@ export const webSearchSchema = Type.Object({
 
 export type WebSearchParams = {
 	query: string;
-	provider?: "exa" | "anthropic" | "perplexity";
+	provider?: "auto" | "exa" | "anthropic" | "perplexity";
 	num_results?: number;
 	// Anthropic
 	system_prompt?: string;
@@ -198,7 +199,7 @@ async function executeWebSearch(
 	params: WebSearchParams,
 ): Promise<{ content: Array<{ type: "text"; text: string }>; details: WebSearchRenderDetails }> {
 	try {
-		const provider = params.provider ?? (await detectProvider());
+		const provider = params.provider && params.provider !== "auto" ? params.provider : await detectProvider();
 
 		let response: WebSearchResponse;
 		if (provider === "exa") {

package/src/core/tools/web-search/providers/exa.ts

@@ -5,6 +5,8 @@
  * Returns structured search results with optional content extraction.
  */
 
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
 import type { WebSearchResponse, WebSearchSource } from "../types";
 
 const EXA_API_URL = "https://api.exa.ai/search";
@@ -27,10 +29,9 @@ export interface ExaSearchParams {
 async function parseEnvFile(filePath: string): Promise<Record<string, string>> {
 	const result: Record<string, string> = {};
 	try {
-		const file = Bun.file(filePath);
-		if (!(await file.exists())) return result;
+		if (!existsSync(filePath)) return result;
 
-		const content = await file.text();
+		const content = readFileSync(filePath, "utf-8");
 		for (const line of content.split("\n")) {
 			let trimmed = line.trim();
 			if (!trimmed || trimmed.startsWith("#")) continue;
@@ -57,8 +58,8 @@ async function parseEnvFile(filePath: string): Promise<Record<string, string>> {
 	return result;
 }
 
-function getHomeDir(): string | null {
-	return process.env.HOME ?? process.env.USERPROFILE ?? null;
+function getHomeDir(): string {
+	return homedir();
 }
 
 /** Find EXA_API_KEY from environment or .env files */

package/src/core/tools/web-search/render.ts

@@ -8,72 +8,39 @@ import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import type { Theme } from "../../../modes/interactive/theme/theme";
 import type { RenderResultOptions } from "../../custom-tools/types";
+import {
+	formatAge,
+	formatCount,
+	formatExpandHint,
+	formatMoreItems,
+	getDomain,
+	getPreviewLines,
+	getStyledStatusIcon,
+	PREVIEW_LIMITS,
+	TRUNCATE_LENGTHS,
+	truncate,
+} from "../render-utils";
 import type { WebSearchResponse } from "./types";
 
-/** Truncate text to max length with ellipsis */
-export 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}`;
-}
-
-/** Extract domain from URL */
-export function getDomain(url: string): string {
-	try {
-		const u = new URL(url);
-		return u.hostname.replace(/^www\./, "");
-	} catch {
-		return url;
-	}
-}
-
-/** Format age string from seconds */
-export function formatAge(ageSeconds: number | null | undefined): string {
-	if (!ageSeconds) return "";
-	const mins = Math.floor(ageSeconds / 60);
-	const hours = Math.floor(mins / 60);
-	const days = Math.floor(hours / 24);
-	const weeks = Math.floor(days / 7);
-	const months = Math.floor(days / 30);
-
-	if (months > 0) return `${months}mo ago`;
-	if (weeks > 0) return `${weeks}w ago`;
-	if (days > 0) return `${days}d ago`;
-	if (hours > 0) return `${hours}h ago`;
-	if (mins > 0) return `${mins}m ago`;
-	return "just now";
-}
-
-/** Get first N lines of text as preview */
-export 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));
-}
-
-const MAX_COLLAPSED_ANSWER_LINES = 3;
-const MAX_EXPANDED_ANSWER_LINES = 12;
-const MAX_ANSWER_LINE_LEN = 110;
+const MAX_COLLAPSED_ANSWER_LINES = PREVIEW_LIMITS.COLLAPSED_LINES;
+const MAX_EXPANDED_ANSWER_LINES = PREVIEW_LIMITS.EXPANDED_LINES;
+const MAX_ANSWER_LINE_LEN = TRUNCATE_LENGTHS.LINE;
 const MAX_SNIPPET_LINES = 2;
-const MAX_SNIPPET_LINE_LEN = 110;
+const MAX_SNIPPET_LINE_LEN = TRUNCATE_LENGTHS.LINE;
 const MAX_RELATED_QUESTIONS = 6;
 const MAX_QUERY_PREVIEW = 2;
 const MAX_QUERY_LEN = 90;
 const MAX_REQUEST_ID_LEN = 36;
 
-function formatCount(label: string, count: number): string {
-	const safeCount = Number.isFinite(count) ? count : 0;
-	return `${safeCount} ${label}${safeCount === 1 ? "" : "s"}`;
-}
-
 function renderFallbackText(contentText: string, expanded: boolean, theme: Theme): Component {
 	const lines = contentText.split("\n").filter((line) => line.trim());
 	const maxLines = expanded ? lines.length : 6;
 	const displayLines = lines.slice(0, maxLines).map((line) => truncate(line.trim(), 110, theme.format.ellipsis));
 	const remaining = lines.length - displayLines.length;
 
-	const headerIcon = theme.fg("warning", theme.status.warning);
-	const expandHint = expanded ? "" : theme.fg("dim", " (Ctrl+O to expand)");
-	let text = `${headerIcon} ${theme.fg("toolTitle", "Web Search")}${expandHint}`;
+	const headerIcon = getStyledStatusIcon("warning", theme);
+	const expandHint = formatExpandHint(expanded, remaining > 0, theme);
+	let text = `${headerIcon} ${theme.fg("dim", "Response")}${expandHint}`;
 
 	if (displayLines.length === 0) {
 		text += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", "No response data")}`;
@@ -87,10 +54,7 @@ function renderFallbackText(contentText: string, expanded: boolean, theme: Theme
 	}
 
 	if (!expanded && remaining > 0) {
-		text += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
-			"muted",
-			`${theme.format.ellipsis} ${remaining} more line${remaining === 1 ? "" : "s"}`,
-		)}`;
+		text += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", formatMoreItems(remaining, "line", theme))}`;
 	}
 
 	return new Text(text, 0, 0);
@@ -134,6 +98,15 @@ export function renderWebSearchResult(
 		: [];
 	const provider = response.provider;
 
+	// Get answer text
+	const answerText = typeof response.answer === "string" ? response.answer.trim() : "";
+	const contentText = answerText || rawText;
+	const totalAnswerLines = contentText ? contentText.split("\n").filter((l) => l.trim()).length : 0;
+	const answerLimit = expanded ? MAX_EXPANDED_ANSWER_LINES : MAX_COLLAPSED_ANSWER_LINES;
+	const answerPreview = contentText
+		? getPreviewLines(contentText, answerLimit, MAX_ANSWER_LINE_LEN, theme.format.ellipsis)
+		: [];
+
 	// Build header: status icon Web Search (provider) · counts
 	const providerLabel =
 		provider === "anthropic"
@@ -143,53 +116,48 @@ export function renderWebSearchResult(
 				: provider === "exa"
 					? "Exa"
 					: "Unknown";
-	const headerIcon =
-		sourceCount > 0 ? theme.fg("success", theme.status.success) : theme.fg("warning", theme.status.warning);
-	const expandHint = expanded ? "" : theme.fg("dim", " (Ctrl+O to expand)");
-	let text = `${headerIcon} ${theme.fg("toolTitle", "Web Search")} ${theme.fg("dim", `(${providerLabel})`)}${theme.sep.dot}${theme.fg(
+	const headerIcon = getStyledStatusIcon(sourceCount > 0 ? "success" : "warning", theme);
+	const hasMore =
+		totalAnswerLines > answerPreview.length ||
+		sourceCount > 0 ||
+		citationCount > 0 ||
+		relatedCount > 0 ||
+		searchQueries.length > 0;
+	const expandHint = formatExpandHint(expanded, hasMore, theme);
+	let text = `${headerIcon} ${theme.fg("dim", `(${providerLabel})`)}${theme.sep.dot}${theme.fg(
 		"dim",
 		formatCount("source", sourceCount),
 	)}${expandHint}`;
 
-	// Get answer text
-	const answerText = typeof response.answer === "string" ? response.answer.trim() : "";
-	const contentText = answerText || rawText;
-	const totalAnswerLines = contentText ? contentText.split("\n").filter((l) => l.trim()).length : 0;
-	const answerLimit = expanded ? MAX_EXPANDED_ANSWER_LINES : MAX_COLLAPSED_ANSWER_LINES;
-	const answerPreview = contentText
-		? getPreviewLines(contentText, answerLimit, MAX_ANSWER_LINE_LEN, theme.format.ellipsis)
-		: [];
-
 	if (!expanded) {
 		const answerTitle = `${theme.fg("accent", theme.status.info)} ${theme.fg("accent", "Answer")}`;
-		text += `\n ${theme.fg("dim", theme.tree.vertical)} ${answerTitle}`;
+		text += `\n ${theme.fg("dim", theme.tree.branch)} ${answerTitle}`;
+
+		const remaining = totalAnswerLines - answerPreview.length;
+		const allLines: Array<{ text: string; style: "dim" | "muted" }> = [];
 
 		if (answerPreview.length === 0) {
-			text += `\n ${theme.fg("dim", theme.tree.vertical)} ${theme.fg("dim", `${theme.tree.hook} `)}${theme.fg(
-				"muted",
-				"No answer text returned",
-			)}`;
+			allLines.push({ text: "No answer text returned", style: "muted" });
 		} else {
 			for (const line of answerPreview) {
-				text += `\n ${theme.fg("dim", theme.tree.vertical)} ${theme.fg("dim", `${theme.tree.hook} `)}${theme.fg(
-					"dim",
-					line,
-				)}`;
+				allLines.push({ text: line, style: "dim" });
 			}
 		}
-
-		const remaining = totalAnswerLines - answerPreview.length;
 		if (remaining > 0) {
-			text += `\n ${theme.fg("dim", theme.tree.vertical)} ${theme.fg("dim", `${theme.tree.hook} `)}${theme.fg(
-				"muted",
-				`${theme.format.ellipsis} ${remaining} more line${remaining === 1 ? "" : "s"}`,
-			)}`;
+			allLines.push({ text: formatMoreItems(remaining, "line", theme), style: "muted" });
+		}
+
+		for (let i = 0; i < allLines.length; i++) {
+			const { text: lineText, style } = allLines[i];
+			const isLastLine = i === allLines.length - 1;
+			const lineBranch = isLastLine ? theme.tree.last : theme.tree.branch;
+			text += `\n ${theme.fg("dim", theme.tree.vertical)} ${theme.fg("dim", lineBranch)} ${theme.fg(style, lineText)}`;
 		}
 
 		const summary = [
 			formatCount("source", sourceCount),
 			formatCount("citation", citationCount),
-			formatCount("related", relatedCount),
+			formatCount("related question", relatedCount),
 		].join(theme.sep.dot);
 		text += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", summary)}`;
 		return new Text(text, 0, 0);
@@ -201,9 +169,7 @@ export function renderWebSearchResult(
 	);
 	const remainingAnswer = totalAnswerLines - answerPreview.length;
 	if (remainingAnswer > 0) {
-		answerSectionLines.push(
-			theme.fg("muted", `${theme.format.ellipsis} ${remainingAnswer} more line${remainingAnswer === 1 ? "" : "s"}`),
-		);
+		answerSectionLines.push(theme.fg("muted", formatMoreItems(remainingAnswer, "line", theme)));
 	}
 
 	const sourceLines: string[] = [];
@@ -263,14 +229,7 @@ export function renderWebSearchResult(
 			relatedLines.push(theme.fg("muted", `${theme.format.dash} ${related[i]}`));
 		}
 		if (relatedCount > maxRelated) {
-			relatedLines.push(
-				theme.fg(
-					"muted",
-					`${theme.format.ellipsis} ${relatedCount - maxRelated} more question${
-						relatedCount - maxRelated === 1 ? "" : "s"
-					}`,
-				),
-			);
+			relatedLines.push(theme.fg("muted", formatMoreItems(relatedCount - maxRelated, "question", theme)));
 		}
 	}
 
@@ -311,36 +270,29 @@ export function renderWebSearchResult(
 			metaLines.push(theme.fg("muted", `${theme.format.dash} ${truncate(q, MAX_QUERY_LEN, theme.format.ellipsis)}`));
 		}
 		if (searchQueries.length > MAX_QUERY_PREVIEW) {
-			metaLines.push(
-				theme.fg(
-					"muted",
-					`${theme.format.ellipsis} ${searchQueries.length - MAX_QUERY_PREVIEW} more query${
-						searchQueries.length - MAX_QUERY_PREVIEW === 1 ? "" : "s"
-					}`,
-				),
-			);
+			metaLines.push(theme.fg("muted", formatMoreItems(searchQueries.length - MAX_QUERY_PREVIEW, "query", theme)));
 		}
 	}
 
 	const sections: Array<{ title: string; icon: string; lines: string[] }> = [
 		{
 			title: "Answer",
-			icon: theme.fg("accent", theme.status.info),
+			icon: getStyledStatusIcon("info", theme),
 			lines: answerSectionLines,
 		},
 		{
 			title: "Sources",
-			icon: sourceCount > 0 ? theme.fg("success", theme.status.success) : theme.fg("warning", theme.status.warning),
+			icon: getStyledStatusIcon(sourceCount > 0 ? "success" : "warning", theme),
 			lines: sourceLines,
 		},
 		{
 			title: "Related",
-			icon: relatedCount > 0 ? theme.fg("accent", theme.status.info) : theme.fg("warning", theme.status.warning),
+			icon: getStyledStatusIcon(relatedCount > 0 ? "info" : "warning", theme),
 			lines: relatedLines,
 		},
 		{
 			title: "Meta",
-			icon: theme.fg("accent", theme.status.info),
+			icon: getStyledStatusIcon("info", theme),
 			lines: metaLines,
 		},
 	];
@@ -349,11 +301,14 @@ export function renderWebSearchResult(
 		const section = sections[i];
 		const isLast = i === sections.length - 1;
 		const branch = isLast ? theme.tree.last : theme.tree.branch;
-		const indent = isLast ? " " : theme.tree.vertical;
+		const indent = isLast ? "  " : `${theme.tree.vertical} `;
 
 		text += `\n ${theme.fg("dim", branch)} ${section.icon} ${theme.fg("accent", section.title)}`;
-		for (const line of section.lines) {
-			text += `\n ${theme.fg("dim", indent)} ${theme.fg("dim", `${theme.tree.hook} `)}${line}`;
+		for (let j = 0; j < section.lines.length; j++) {
+			const line = section.lines[j];
+			const isLastLine = j === section.lines.length - 1;
+			const lineBranch = isLastLine ? theme.tree.last : theme.tree.branch;
+			text += `\n ${theme.fg("dim", indent)}${theme.fg("dim", lineBranch)} ${line}`;
 		}
 	}
 

package/src/core/voice-controller.ts

@@ -0,0 +1,135 @@
+import { Agent, run, setDefaultOpenAIKey } from "@openai/agents";
+import { z } from "zod";
+import { logger } from "./logger";
+import type { ModelRegistry } from "./model-registry";
+
+const DEFAULT_CONTROLLER_MODEL = process.env.OMP_VOICE_CONTROLLER_MODEL ?? "gpt-4o-mini";
+const DEFAULT_SUMMARY_MODEL = process.env.OMP_VOICE_SUMMARY_MODEL ?? DEFAULT_CONTROLLER_MODEL;
+const MAX_INPUT_CHARS = 8000;
+
+export type VoiceSteeringDecision = { action: "pass" | "ask"; text: string };
+export type VoicePresentationDecision = { action: "skip" | "speak"; text?: string };
+type VoiceSummaryOutput = { text: string };
+
+const steeringSchema: z.ZodType<VoiceSteeringDecision> = z.object({
+	action: z.enum(["pass", "ask"]),
+	text: z.string().min(1),
+});
+
+const presentationSchema: z.ZodType<VoicePresentationDecision> = z.object({
+	action: z.enum(["skip", "speak"]),
+	text: z.string().min(1).optional(),
+});
+
+const summarySchema: z.ZodType<VoiceSummaryOutput> = z.object({
+	text: z.string().min(1),
+});
+
+function normalizeText(text: string): string {
+	return text.replace(/\s+/g, " ").trim();
+}
+
+function truncateText(text: string, maxChars: number): string {
+	if (text.length <= maxChars) return text;
+	return `${text.slice(0, maxChars)}...`;
+}
+
+export class VoiceController {
+	private lastApiKey: string | undefined;
+
+	constructor(private registry: ModelRegistry) {}
+
+	private async ensureApiKey(): Promise<string | null> {
+		const apiKey = await this.registry.getApiKeyForProvider("openai");
+		if (!apiKey) {
+			logger.debug("voice-controller: no OpenAI API key available");
+			return null;
+		}
+		if (apiKey !== this.lastApiKey) {
+			setDefaultOpenAIKey(apiKey);
+			this.lastApiKey = apiKey;
+		}
+		return apiKey;
+	}
+
+	async steerUserInput(text: string): Promise<VoiceSteeringDecision | null> {
+		if (!(await this.ensureApiKey())) return null;
+
+		const normalized = truncateText(normalizeText(text), MAX_INPUT_CHARS);
+		const agent = new Agent({
+			name: "Voice Input Steering",
+			instructions:
+				"You are a voice-input controller for a coding agent. " +
+				"Given a user's speech transcript, decide if it is clear enough to send to the agent. " +
+				"If unclear or missing key details, ask exactly one short question. " +
+				"If clear, rewrite it as a concise instruction for the agent. " +
+				"Keep it short and preserve intent.",
+			model: DEFAULT_CONTROLLER_MODEL,
+			outputType: steeringSchema,
+		});
+
+		try {
+			const result = await run(agent, normalized);
+			return result.finalOutput ?? null;
+		} catch (error) {
+			logger.debug("voice-controller: steering error", {
+				error: error instanceof Error ? error.message : String(error),
+			});
+			return null;
+		}
+	}
+
+	async decidePresentation(text: string): Promise<VoicePresentationDecision | null> {
+		if (!(await this.ensureApiKey())) return null;
+
+		const normalized = truncateText(normalizeText(text), MAX_INPUT_CHARS);
+		const agent = new Agent({
+			name: "Voice Presentation Gate",
+			instructions:
+				"You are a voice presentation gate for a coding agent. " +
+				"Decide whether to speak the assistant response to the user. " +
+				"Speak when there is a decision, summary, or a question for the user. " +
+				"Skip if it is mostly tool output, verbose logs, or not useful to speak. " +
+				"When speaking, respond in 1-3 short sentences (<=45 words) in a casual, concise tone. " +
+				"If user input is needed, ask exactly one short question.",
+			model: DEFAULT_CONTROLLER_MODEL,
+			outputType: presentationSchema,
+		});
+
+		try {
+			const result = await run(agent, normalized);
+			return result.finalOutput ?? null;
+		} catch (error) {
+			logger.debug("voice-controller: presentation error", {
+				error: error instanceof Error ? error.message : String(error),
+			});
+			return null;
+		}
+	}
+
+	async summarizeForVoice(text: string): Promise<string | null> {
+		if (!(await this.ensureApiKey())) return null;
+
+		const normalized = truncateText(normalizeText(text), MAX_INPUT_CHARS);
+		const agent = new Agent({
+			name: "Voice Summary",
+			instructions:
+				"Summarize the assistant response for voice playback. " +
+				"Use 1-2 short sentences. " +
+				"If a question is required from the user, ask one short question.",
+			model: DEFAULT_SUMMARY_MODEL,
+			outputType: summarySchema,
+		});
+
+		try {
+			const result = await run(agent, normalized);
+			const output = result.finalOutput?.text ?? "";
+			return output.trim() || null;
+		} catch (error) {
+			logger.debug("voice-controller: summary error", {
+				error: error instanceof Error ? error.message : String(error),
+			});
+			return null;
+		}
+	}
+}