@oh-my-pi/pi-coding-agent 15.9.5 → 15.10.0

package/src/web/search/render.ts

@@ -15,23 +15,16 @@ import {
 	formatMoreItems,
 	formatStatusIcon,
 	getDomain,
-	getPreviewLines,
 	PREVIEW_LIMITS,
-	TRUNCATE_LENGTHS,
+	replaceTabs,
 	truncateToWidth,
 } from "../../tools/render-utils";
-import { renderStatusLine, renderTreeList } from "../../tui";
-import { CachedOutputBlock } from "../../tui/output-block";
+import { renderStatusLine, renderTreeList, urlHyperlink } from "../../tui";
+import { CachedOutputBlock, markFramedBlockComponent } from "../../tui/output-block";
 import { getSearchProviderLabel } from "./provider";
 import type { SearchResponse } from "./types";
 
-const MAX_COLLAPSED_ANSWER_LINES = PREVIEW_LIMITS.COLLAPSED_LINES;
-const MAX_SNIPPET_LINES = 2;
-const MAX_SNIPPET_LINE_LEN = TRUNCATE_LENGTHS.LINE;
 const MAX_COLLAPSED_ITEMS = PREVIEW_LIMITS.COLLAPSED_ITEMS;
-const MAX_QUERY_PREVIEW = 2;
-const MAX_QUERY_LEN = 90;
-const MAX_REQUEST_ID_LEN = 36;
 
 function renderFallbackText(contentText: string, expanded: boolean, theme: Theme): Component {
 	const lines = contentText.split("\n").filter(line => line.trim());
@@ -66,6 +59,21 @@ export interface SearchRenderDetails {
 	error?: string;
 }
 
+/** Render a web search failure as a framed error panel, matching the success layout. */
+function renderSearchErrorPanel(message: string, providerLabel: string | undefined, theme: Theme): Component {
+	const header = renderStatusLine({ icon: "error", title: "Web Search", description: providerLabel }, theme);
+	const body = theme.fg("error", `Error: ${replaceTabs(message)}`);
+	const outputBlock = new CachedOutputBlock();
+	return markFramedBlockComponent({
+		render(width: number): string[] {
+			return outputBlock.render({ header, state: "error", sections: [{ lines: [body] }], width }, theme);
+		},
+		invalidate() {
+			outputBlock.invalidate();
+		},
+	});
+}
+
 /** Render web search result with tree-based layout */
 export function renderSearchResult(
 	result: { content: Array<{ type: string; text?: string }>; details?: SearchRenderDetails },
@@ -78,9 +86,12 @@ export function renderSearchResult(
 ): Component {
 	const details = result.details;
 
-	// Handle error case
+	// Handle error case as a framed panel, matching the success layout.
 	if (details?.error) {
-		return new Text(theme.fg("error", `Error: ${details.error}`), 0, 0);
+		const errorProvider = details.response?.provider;
+		const errorProviderLabel =
+			errorProvider && errorProvider !== "none" ? getSearchProviderLabel(errorProvider) : undefined;
+		return renderSearchErrorPanel(details.error, errorProviderLabel, theme);
 	}
 
 	const rawText = result.content?.find(block => block.type === "text")?.text?.trim() ?? "";
@@ -91,8 +102,6 @@ export function renderSearchResult(
 
 	const sources = Array.isArray(response.sources) ? response.sources : [];
 	const sourceCount = sources.length;
-	const citations = Array.isArray(response.citations) ? response.citations : [];
-	const citationCount = citations.length;
 	const searchQueries = Array.isArray(response.searchQueries)
 		? response.searchQueries.filter(item => typeof item === "string")
 		: [];
@@ -118,16 +127,11 @@ export function renderSearchResult(
 		theme,
 	);
 
-	const metaLines: string[] = [];
-	metaLines.push(`${theme.fg("muted", "Provider:")} ${theme.fg("text", providerLabel)}`);
-	if (response.authMode)
-		metaLines.push(
-			`${theme.fg("muted", "Auth:")} ${theme.fg("text", response.authMode === "oauth" ? "OAuth" : response.authMode === "api_key" ? "API key" : response.authMode)}`,
-		);
-	if (response.model) metaLines.push(`${theme.fg("muted", "Model:")} ${theme.fg("text", response.model)}`);
-	metaLines.push(`${theme.fg("muted", "Sources:")} ${theme.fg("text", String(sourceCount))}`);
-	if (citationCount > 0)
-		metaLines.push(`${theme.fg("muted", "Citations:")} ${theme.fg("text", String(citationCount))}`);
+	const authShort =
+		response.authMode === "oauth" ? "OAuth" : response.authMode === "api_key" ? "API" : response.authMode;
+	let providerInfo = response.model ? `${response.model} @ ${providerLabel}` : providerLabel;
+	if (authShort) providerInfo += ` (${authShort})`;
+	const metaLines: string[] = [`${theme.fg("muted", "Provider:")} ${theme.fg("text", providerInfo)}`];
 	if (response.usage) {
 		const usageParts: string[] = [];
 		if (response.usage.inputTokens !== undefined) usageParts.push(`in ${response.usage.inputTokens}`);
@@ -137,22 +141,11 @@ export function renderSearchResult(
 		if (usageParts.length > 0)
 			metaLines.push(`${theme.fg("muted", "Usage:")} ${theme.fg("text", usageParts.join(theme.sep.dot))}`);
 	}
-	if (response.requestId) {
-		metaLines.push(
-			`${theme.fg("muted", "Request:")} ${theme.fg("text", truncateToWidth(response.requestId, MAX_REQUEST_ID_LEN))}`,
-		);
-	}
-	if (searchQueries.length > 0) {
-		const queriesPreview = searchQueries.slice(0, MAX_QUERY_PREVIEW);
-		const queryList = queriesPreview.map(q => truncateToWidth(q, MAX_QUERY_LEN));
-		const suffix = searchQueries.length > queriesPreview.length ? "…" : "";
-		metaLines.push(`${theme.fg("muted", "Queries:")} ${theme.fg("text", queryList.join("; "))}${suffix}`);
-	}
 
 	const answerMarkdown = contentText ? new Markdown(contentText, 0, 0, getMarkdownTheme()) : undefined;
 	const outputBlock = new CachedOutputBlock();
 
-	return {
+	return markFramedBlockComponent({
 		render(width: number): string[] {
 			// Read mutable state at render time
 			const { expanded } = options;
@@ -163,15 +156,15 @@ export function renderSearchResult(
 			let answerLines: string[];
 			if (renderedAnswer.length === 0) {
 				answerLines = [theme.fg("muted", "No answer text returned")];
-			} else if (expanded) {
-				answerLines = renderedAnswer;
-			} else {
-				const collapsedCap = args?.maxAnswerLines ?? MAX_COLLAPSED_ANSWER_LINES;
-				answerLines = renderedAnswer.slice(0, collapsedCap);
+			} else if (args?.maxAnswerLines !== undefined && !expanded) {
+				// CLI compact mode (`omp q`) caps the answer; the TUI passes no cap and shows it in full.
+				answerLines = renderedAnswer.slice(0, args.maxAnswerLines);
 				const remaining = renderedAnswer.length - answerLines.length;
 				if (remaining > 0) {
 					answerLines.push(theme.fg("muted", formatMoreItems(remaining, "line")));
 				}
+			} else {
+				answerLines = renderedAnswer;
 			}
 
 			const sourceTree = renderTreeList(
@@ -187,30 +180,22 @@ export function renderSearchResult(
 								: typeof src.url === "string" && src.url.trim()
 									? src.url
 									: "Untitled";
-						const title = truncateToWidth(titleText, MAX_SNIPPET_LINE_LEN);
 						const url = typeof src.url === "string" ? src.url : "";
 						const domain = url ? getDomain(url) : "";
 						const age =
 							formatAge(src.ageSeconds) || (typeof src.publishedDate === "string" ? src.publishedDate : "");
 						const metaParts: string[] = [];
 						if (domain) metaParts.push(theme.fg("dim", `(${domain})`));
-						if (typeof src.author === "string" && src.author.trim())
-							metaParts.push(theme.fg("muted", truncateToWidth(src.author.trim(), 40)));
 						if (age) metaParts.push(theme.fg("muted", age));
 						const metaSep = theme.fg("dim", theme.sep.dot);
 						const metaSuffix = metaParts.length > 0 ? ` ${metaParts.join(metaSep)}` : "";
-						const srcLines: string[] = [
-							truncateToWidth(`${theme.fg("accent", title)}${metaSuffix}`, MAX_SNIPPET_LINE_LEN),
-						];
-						const snippetText = typeof src.snippet === "string" ? src.snippet : "";
-						if (snippetText.trim()) {
-							const snippetLines = getPreviewLines(snippetText, MAX_SNIPPET_LINES, MAX_SNIPPET_LINE_LEN);
-							for (const snippetLine of snippetLines) {
-								srcLines.push(theme.fg("muted", `${theme.format.dash} ${snippetLine}`));
-							}
-						}
-						if (url) srcLines.push(theme.fg("mdLinkUrl", truncateToWidth(url, MAX_SNIPPET_LINE_LEN)));
-						return srcLines;
+						// One line per source: the title links to its URL, followed by domain · age.
+						// Reserve room for the box borders, the tree branch, and the meta suffix.
+						const lineBudget = Math.max(24, width - 6);
+						const titleBudget = Math.max(12, lineBudget - Bun.stringWidth(metaSuffix));
+						const title = theme.fg("accent", truncateToWidth(titleText, titleBudget));
+						const linkedTitle = url ? urlHyperlink(url, title) : title;
+						return [`${linkedTitle}${metaSuffix}`];
 					},
 				},
 				theme,
@@ -246,7 +231,7 @@ export function renderSearchResult(
 		invalidate() {
 			outputBlock.invalidate();
 		},
-	};
+	});
 }
 
 /** Render web search call (query preview) */

package/src/web/search/types.ts

@@ -33,7 +33,11 @@ export const SEARCH_PROVIDER_OPTIONS = [
 		description: "Automatically uses the first configured web-search provider",
 	},
 	{ value: "tavily", label: "Tavily", description: "Requires TAVILY_API_KEY" },
-	{ value: "perplexity", label: "Perplexity", description: "Requires PERPLEXITY_COOKIES or PERPLEXITY_API_KEY" },
+	{
+		value: "perplexity",
+		label: "Perplexity",
+		description: "Uses auth when configured; explicit selection falls back to anonymous search",
+	},
 	{ value: "brave", label: "Brave", description: "Requires BRAVE_API_KEY" },
 	{ value: "jina", label: "Jina", description: "Requires JINA_API_KEY" },
 	{ value: "kimi", label: "Kimi", description: "Requires MOONSHOT_SEARCH_API_KEY or MOONSHOT_API_KEY" },

package/dist/types/eval/heartbeat.d.ts

@@ -1,45 +0,0 @@
-/**
- * Keepalive for in-flight host-side eval bridge calls.
- *
- * The eval watchdog ({@link ../tools/eval IdleTimeout}) caps a cell's `timeout`
- * as a wall-clock budget on the cell's *own* work, but pauses that budget while
- * a host-side `agent()`/`parallel()` (via `runSubprocess`) or `llm()` (a single
- * completion) call is in flight. Those calls are the only thing that re-arms the
- * watchdog — and they can run for long stretches with **no** status of their own
- * (a subagent's time-to-first-token on a reasoning model, a long quiet nested
- * tool, or the entire body of a oneshot `llm()` call). Without a keepalive the
- * watchdog would mistake that delegated work for the cell stalling and abort it
- * mid-flight, killing the subagent.
- *
- * {@link withBridgeHeartbeat} bridges that gap by emitting a synthetic
- * {@link EVAL_HEARTBEAT_OP} status event immediately when the call begins and
- * then on a fixed cadence until it settles. The event rides the same
- * `emitStatus → onStatus` channel both runtimes already forward, so it re-arms
- * the watchdog without any new plumbing. The heartbeat is the *sole* signal that
- * extends the budget: consumers MUST treat it as a pure keepalive — bump the
- * watchdog and drop it (never persist or render it) — see the executor display
- * sinks and the eval tool's `onStatus` handler. Every other status event
- * (compute helpers, `log()`/`phase()`, tool results) counts against the budget.
- */
-import type { JsStatusEvent } from "./js/shared/types";
-/**
- * Synthetic status op emitted purely to keep the eval idle watchdog alive while
- * a host-side bridge call is in flight. Carries no payload.
- */
-export declare const EVAL_HEARTBEAT_OP = "heartbeat";
-/**
- * Test seam: override the heartbeat cadence so integration tests can exercise
- * the keepalive within a sub-second idle budget. Pass no value to restore the
- * production default.
- */
-export declare function setBridgeHeartbeatIntervalMs(ms?: number): void;
-/**
- * Run {@link operation}, pumping {@link EVAL_HEARTBEAT_OP} status events through
- * {@link emitStatus} — one immediately, then on a fixed cadence — until it
- * settles. The immediate beat pauses the watchdog the instant the call begins,
- * so a bridge call that starts close to the budget edge (after the cell already
- * spent most of it computing) is not aborted before the first interval tick. A
- * no-op wrapper when no `emitStatus` sink is wired (the heartbeat would reach
- * nobody).
- */
-export declare function withBridgeHeartbeat<T>(emitStatus: ((event: JsStatusEvent) => void) | undefined, operation: () => Promise<T>): Promise<T>;

package/src/eval/__tests__/heartbeat.test.ts

@@ -1,84 +0,0 @@
-import { afterEach, describe, expect, it } from "bun:test";
-import { EVAL_HEARTBEAT_OP, setBridgeHeartbeatIntervalMs, withBridgeHeartbeat } from "../heartbeat";
-import type { JsStatusEvent } from "../js/shared/types";
-
-describe("withBridgeHeartbeat", () => {
-	afterEach(() => {
-		setBridgeHeartbeatIntervalMs();
-	});
-
-	it("pumps heartbeat events on cadence while the operation is pending, then stops", async () => {
-		setBridgeHeartbeatIntervalMs(20);
-		const events: JsStatusEvent[] = [];
-
-		const value = await withBridgeHeartbeat(
-			event => events.push(event),
-			async () => {
-				await Bun.sleep(130);
-				return "done";
-			},
-		);
-
-		expect(value).toBe("done");
-		// ~6 ticks fit in 130ms at a 20ms cadence; assert it ticked repeatedly
-		// without pinning the exact count (scheduler jitter).
-		expect(events.length).toBeGreaterThanOrEqual(3);
-		expect(events.every(event => event.op === EVAL_HEARTBEAT_OP)).toBe(true);
-
-		// The interval is cleared once the operation settles: no further ticks.
-		const settledCount = events.length;
-		await Bun.sleep(80);
-		expect(events.length).toBe(settledCount);
-	});
-
-	it("emits a heartbeat immediately so a bridge call extends the budget at once", async () => {
-		// Interval far longer than the operation: the only beat that can fire is
-		// the immediate one at call start. It must still reach the sink.
-		setBridgeHeartbeatIntervalMs(10_000);
-		const events: JsStatusEvent[] = [];
-
-		await withBridgeHeartbeat(
-			event => events.push(event),
-			async () => {
-				await Bun.sleep(30);
-				return "done";
-			},
-		);
-
-		expect(events.length).toBe(1);
-		expect(events[0]?.op).toBe(EVAL_HEARTBEAT_OP);
-	});
-
-	it("runs the operation without emitting when no status sink is wired", async () => {
-		setBridgeHeartbeatIntervalMs(5);
-		let ran = 0;
-
-		const value = await withBridgeHeartbeat(undefined, async () => {
-			ran++;
-			await Bun.sleep(40);
-			return 42;
-		});
-
-		expect(value).toBe(42);
-		expect(ran).toBe(1);
-	});
-
-	it("clears the heartbeat even when the operation throws", async () => {
-		setBridgeHeartbeatIntervalMs(15);
-		const events: JsStatusEvent[] = [];
-
-		await expect(
-			withBridgeHeartbeat(
-				event => events.push(event),
-				async () => {
-					await Bun.sleep(60);
-					throw new Error("boom");
-				},
-			),
-		).rejects.toThrow("boom");
-
-		const afterThrow = events.length;
-		await Bun.sleep(60);
-		expect(events.length).toBe(afterThrow);
-	});
-});