@oh-my-pi/pi-coding-agent 15.1.8 → 15.2.1

package/src/tui/file-list.ts

@@ -7,6 +7,9 @@ import { renderTreeList } from "./tree-list";
 
 export interface FileEntry {
 	path: string;
+	/** Absolute filesystem path. When provided together with {@link FileListOptions.hyperlinkFn}, the
+	 * rendered path text is wrapped in an OSC 8 hyperlink. */
+	absPath?: string;
 	isDirectory?: boolean;
 	meta?: string;
 }
@@ -16,10 +19,13 @@ export interface FileListOptions {
 	expanded?: boolean;
 	maxCollapsed?: number;
 	showIcons?: boolean;
+	/** When provided, called with the entry's absolute path and the ANSI-styled display string to
+	 * optionally wrap the path in an OSC 8 hyperlink. Only invoked when {@link FileEntry.absPath} is set. */
+	hyperlinkFn?: (absPath: string, displayText: string) => string;
 }
 
 export function renderFileList(options: FileListOptions, theme: Theme): string[] {
-	const { files, expanded = false, maxCollapsed = 8, showIcons = true } = options;
+	const { files, expanded = false, maxCollapsed = 8, showIcons = true, hyperlinkFn } = options;
 
 	return renderTreeList(
 		{
@@ -39,7 +45,9 @@ export function renderFileList(options: FileListOptions, theme: Theme): string[]
 				const labelColor = isDirectory ? "accent" : "toolOutput";
 				const meta = entry.meta ? ` ${theme.fg("dim", entry.meta)}` : "";
 				const iconPrefix = icon ? `${icon} ` : "";
-				return `${iconPrefix}${theme.fg(labelColor, displayPath)}${meta}`;
+				const pathStr = theme.fg(labelColor, displayPath);
+				const linkedPath = entry.absPath && hyperlinkFn ? hyperlinkFn(entry.absPath, pathStr) : pathStr;
+				return `${iconPrefix}${linkedPath}${meta}`;
 			},
 		},
 		theme,

package/src/tui/hyperlink.ts

@@ -0,0 +1,126 @@
+/**
+ * OSC 8 terminal hyperlink support for file paths.
+ *
+ * Wraps display text in `ESC ] 8 ; id=HASH ; URI ESC \ TEXT ESC ] 8 ; ; ESC \`
+ * sequences when the active terminal supports hyperlinks and the user setting
+ * permits it. Falls back to plain text when disabled.
+ */
+import { TERMINAL } from "@oh-my-pi/pi-tui";
+import { settings } from "../config/settings";
+import {
+	LocalProtocolHandler,
+	memoryRootsFromRegistry,
+	parseInternalUrl,
+	resolveLocalUrlToPath,
+	resolveMemoryUrlToPath,
+} from "../internal-urls";
+
+const OSC = "\x1b]";
+const ST = "\x1b\\";
+
+/** Stable 8-char hex ID derived from a URI — hints terminals to coalesce identical adjacent links. */
+function buildLinkId(uri: string): string {
+	let h = 0;
+	for (let i = 0; i < uri.length; i++) {
+		// FNV-1a-inspired mix — good enough for a UI hint, no deps
+		h = (Math.imul(31, h) + uri.charCodeAt(i)) | 0;
+	}
+	return (h >>> 0).toString(16).padStart(8, "0");
+}
+
+/** Build a `file://` URI for an absolute path with optional line/col query params. */
+function buildFileUri(absPath: string, opts?: { line?: number; col?: number }): string {
+	// Normalize backslashes for Windows paths before constructing the URL.
+	const normalized = absPath.replaceAll("\\", "/");
+	const prefix = normalized.startsWith("/") ? "file://" : "file:///";
+	// Split on slashes, encode each component, reassemble.
+	const encoded = normalized
+		.split("/")
+		.map(segment => encodeURIComponent(segment))
+		.join("/");
+	const params: string[] = [];
+	if (opts?.line !== undefined) params.push(`line=${opts.line}`);
+	if (opts?.col !== undefined) params.push(`col=${opts.col}`);
+	const query = params.length > 0 ? `?${params.join("&")}` : "";
+	return `${prefix}${encoded}${query}`;
+}
+
+/**
+ * Returns true when OSC 8 hyperlinks should be emitted.
+ *
+ * Respects `tui.hyperlinks` setting:
+ * - `"off"`: never
+ * - `"auto"`: when `process.stdout.isTTY`, `NO_COLOR` is unset, and the detected terminal reports hyperlink support
+ * - `"always"`: unconditionally (useful for viewers that support OSC 8 without advertising it)
+ */
+export function isHyperlinkEnabled(): boolean {
+	const mode = settings.get("tui.hyperlinks");
+	if (mode === "off") return false;
+	if (mode === "always") return true;
+	// auto: respect terminal capabilities and NO_COLOR
+	if (Bun.env.NO_COLOR) return false;
+	if (!process.stdout.isTTY) return false;
+	return TERMINAL.hyperlinks;
+}
+
+/**
+ * Wrap `displayText` in an OSC 8 hyperlink pointing at the given absolute file path.
+ *
+ * Returns `displayText` unchanged when hyperlinks are disabled or when
+ * the text already contains an OSC 8 sequence (prevents double-wrapping).
+ *
+ * The caller is responsible for passing an absolute path. Relative paths
+ * produce invalid `file://` URIs and are accepted silently to avoid runtime
+ * errors in renderer hot paths.
+ *
+ * @param absPath - Absolute filesystem path
+ * @param displayText - Text to render as the hyperlink anchor (may contain ANSI codes)
+ * @param opts - Optional line/col position appended as `?line=N&col=M` query params
+ */
+export function fileHyperlink(absPath: string, displayText: string, opts?: { line?: number; col?: number }): string {
+	if (!isHyperlinkEnabled()) return displayText;
+	// Do not double-wrap if the text already embeds an OSC 8 sequence.
+	if (displayText.includes("\x1b]8;")) return displayText;
+	const uri = buildFileUri(absPath, opts);
+	const id = buildLinkId(uri);
+	return `${OSC}8;id=${id};${uri}${ST}${displayText}${OSC}8;;${ST}`;
+}
+
+/**
+ * Synchronously resolve a filesystem-backed internal URL (e.g. `local://foo.md`,
+ * `memory://root/notes.md`) to its absolute filesystem path. Returns `undefined`
+ * for inputs that aren't fs-backed, aren't resolvable in the current session
+ * registry, or fail to parse.
+ *
+ * Used by renderers to wrap fs-backed internal URLs in OSC 8 hyperlinks even
+ * when the resolved path isn't yet available from tool result details (e.g.
+ * during the call/streaming phase before a result lands).
+ *
+ * Async-resolved schemes (`artifact://`, `agent://`, `skill://`, `rule://`,
+ * `omp://`) are not handled here — those rely on `details.resolvedPath` set
+ * by the read tool's router resolution.
+ */
+export function tryResolveInternalUrlSync(input: string): string | undefined {
+	try {
+		if (input.startsWith("local://")) {
+			const opts = LocalProtocolHandler.resolveOptions();
+			if (!opts) return undefined;
+			return resolveLocalUrlToPath(input, opts);
+		}
+		if (input.startsWith("memory://")) {
+			const url = parseInternalUrl(input);
+			const roots = memoryRootsFromRegistry();
+			for (const root of roots) {
+				try {
+					return resolveMemoryUrlToPath(url, root);
+				} catch {
+					// Try the next root; some sessions may not have this namespace mounted.
+				}
+			}
+			return undefined;
+		}
+	} catch {
+		return undefined;
+	}
+	return undefined;
+}

package/src/tui/index.ts

@@ -4,6 +4,7 @@
 
 export * from "./code-cell";
 export * from "./file-list";
+export * from "./hyperlink";
 export * from "./output-block";
 export * from "./status-line";
 export * from "./tree-list";

package/src/utils/tool-choice.ts

@@ -2,7 +2,8 @@ import type { Api, Model, ToolChoice } from "@oh-my-pi/pi-ai";
 
 /**
  * Build a provider-aware tool choice that targets one specific tool when supported.
- * Some providers only support "any tool" forcing, not a named tool.
+ * Providers that only expose required/any forcing may still honor named choices by
+ * narrowing their request tool list before transport.
  */
 export function buildNamedToolChoice(toolName: string, model?: Model<Api>): ToolChoice | undefined {
 	if (!model) return undefined;
@@ -20,12 +21,11 @@ export function buildNamedToolChoice(toolName: string, model?: Model<Api>): Tool
 		return { type: "function", name: toolName };
 	}
 
-	if (
-		model.api === "google-generative-ai" ||
-		model.api === "google-gemini-cli" ||
-		model.api === "google-vertex" ||
-		model.api === "ollama-chat"
-	) {
+	if (model.api === "ollama-chat") {
+		return { type: "function", name: toolName };
+	}
+
+	if (model.api === "google-generative-ai" || model.api === "google-gemini-cli" || model.api === "google-vertex") {
 		return "required";
 	}
 

package/src/web/kagi.ts

@@ -1,5 +1,5 @@
 import { getEnvApiKey } from "@oh-my-pi/pi-ai";
-import { findCredential } from "./search/providers/utils";
+import { findCredential, withHardTimeout } from "./search/providers/utils";
 
 const KAGI_SEARCH_URL = "https://kagi.com/api/v0/search";
 
@@ -138,7 +138,7 @@ export async function searchWithKagi(query: string, options: KagiSearchOptions =
 
 	const response = await fetch(requestUrl, {
 		headers: getAuthHeaders(apiKey),
-		signal: options.signal,
+		signal: withHardTimeout(options.signal),
 	});
 	if (!response.ok) {
 		throw parseKagiErrorResponse(response.status, await response.text());

package/src/web/parallel.ts

@@ -1,5 +1,5 @@
 import { getEnvApiKey } from "@oh-my-pi/pi-ai";
-import { findCredential } from "./search/providers/utils";
+import { findCredential, withHardTimeout } from "./search/providers/utils";
 
 const PARALLEL_API_URL = "https://api.parallel.ai";
 const PARALLEL_SEARCH_URL = `${PARALLEL_API_URL}/v1beta/search`;
@@ -304,7 +304,7 @@ export async function searchWithParallel(
 				max_chars_per_result: options.maxCharsPerResult ?? 10_000,
 			},
 		}),
-		signal: options.signal,
+		signal: withHardTimeout(options.signal),
 	});
 	if (!response.ok) {
 		throw parseParallelErrorResponse(response.status, await response.text());
@@ -335,7 +335,7 @@ export async function extractWithParallel(
 			excerpts: options.excerpts ?? true,
 			full_content: options.fullContent ?? false,
 		}),
-		signal: options.signal,
+		signal: withHardTimeout(options.signal),
 	});
 	if (!response.ok) {
 		throw parseParallelErrorResponse(response.status, await response.text());

package/src/web/search/index.ts

@@ -14,6 +14,7 @@ import webSearchSystemPrompt from "../../prompts/system/web-search.md" with { ty
 import webSearchDescription from "../../prompts/tools/web-search.md" with { type: "text" };
 import type { ToolSession } from "../../tools";
 import { formatAge } from "../../tools/render-utils";
+import { throwIfAborted } from "../../tools/tool-errors";
 import { getSearchProvider, getSearchProviderLabel, resolveProviderChain, type SearchProvider } from "./provider";
 import { renderSearchCall, renderSearchResult, type SearchRenderDetails } from "./render";
 import type { SearchProviderId, SearchResponse } from "./types";
@@ -35,10 +36,6 @@ export interface SearchQueryParams extends SearchToolParams {
 	provider?: SearchProviderId | "auto";
 }
 
-function formatProviderList(providers: SearchProvider[]): string {
-	return providers.map(provider => provider.label).join(", ");
-}
-
 function formatProviderError(error: unknown, provider: SearchProvider): string {
 	if (error instanceof SearchProviderError) {
 		if (error.provider === "anthropic" && error.status === 404) {
@@ -137,9 +134,8 @@ async function executeSearch(
 		};
 	}
 
-	let lastError: unknown;
+	const failures: Array<{ provider: SearchProvider; error: unknown }> = [];
 	let lastProvider = providers[0];
-
 	for (const provider of providers) {
 		lastProvider = provider;
 		try {
@@ -161,14 +157,29 @@ async function executeSearch(
 				details: { response },
 			};
 		} catch (error) {
-			lastError = error;
+			// Surface user-initiated cancellation immediately so the session sees
+			// a clean abort instead of a generic "all providers failed" message.
+			// Without this, an AbortError from `fetch()` is treated as a provider
+			// failure and the loop falls through to the next provider (or to the
+			// summary error), masking the cancellation.
+			throwIfAborted(signal);
+			failures.push({ provider, error });
 		}
 	}
 
-	const baseMessage = formatProviderError(lastError, lastProvider);
+	const lastFailure = failures[failures.length - 1];
+	const baseMessage = lastFailure
+		? formatProviderError(lastFailure.error, lastFailure.provider)
+		: `Unknown error from ${lastProvider.label}`;
 	const message =
 		providers.length > 1
-			? `All web search providers failed (${formatProviderList(providers)}). Last error: ${baseMessage}`
+			? `All web search providers failed: ${failures
+					.map(f =>
+						f.error instanceof SearchProviderError
+							? f.error.message
+							: `${f.provider.id}: ${formatProviderError(f.error, f.provider)}`,
+					)
+					.join("; ")}`
 			: baseMessage;
 
 	return {

package/src/web/search/providers/anthropic.ts

@@ -24,12 +24,12 @@ import type {
 import { SearchProviderError } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+import { classifyProviderHttpError, withHardTimeout } from "./utils";
 
 const DEFAULT_MODEL = "claude-haiku-4-5";
 const DEFAULT_MAX_TOKENS = 4096;
 const WEB_SEARCH_TOOL_NAME = "web_search";
 const WEB_SEARCH_TOOL_TYPE = "web_search_20250305";
-
 export interface AnthropicSearchParams {
 	query: string;
 	system_prompt?: string;
@@ -118,11 +118,13 @@ async function callSearch(
 		method: "POST",
 		headers,
 		body: JSON.stringify(body),
-		signal,
+		signal: withHardTimeout(signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("anthropic", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError(
 			"anthropic",
 			`Anthropic API error (${response.status}): ${errorText}`,

package/src/web/search/providers/brave.ts

@@ -10,7 +10,7 @@ import { SearchProviderError } from "../../../web/search/types";
 import { clampNumResults, dateToAgeSeconds } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
-import { isApiKeyAvailable } from "./utils";
+import { classifyProviderHttpError, isApiKeyAvailable, withHardTimeout } from "./utils";
 
 const BRAVE_SEARCH_URL = "https://api.search.brave.com/res/v1/web/search";
 const DEFAULT_NUM_RESULTS = 10;
@@ -85,11 +85,13 @@ async function callBraveSearch(
 			Accept: "application/json",
 			"X-Subscription-Token": apiKey,
 		},
-		signal: params.signal,
+		signal: withHardTimeout(params.signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("brave", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError("brave", `Brave API error (${response.status}): ${errorText}`, response.status);
 	}
 

package/src/web/search/providers/codex.ts

@@ -15,6 +15,7 @@ import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+import { classifyProviderHttpError, withHardTimeout } from "./utils";
 
 const CODEX_BASE_URL = "https://chatgpt.com/backend-api";
 const CODEX_RESPONSES_PATH = "/codex/responses";
@@ -338,11 +339,13 @@ async function callCodexSearch(
 		method: "POST",
 		headers,
 		body: JSON.stringify(body),
-		signal: options.signal,
+		signal: withHardTimeout(options.signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("codex", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError("codex", `Codex API error (${response.status}): ${errorText}`, response.status);
 	}
 

package/src/web/search/providers/exa.ts

@@ -14,6 +14,7 @@ import { SearchProviderError } from "../../../web/search/types";
 import { dateToAgeSeconds } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+import { classifyProviderHttpError, withHardTimeout } from "./utils";
 
 const EXA_API_URL = "https://api.exa.ai/search";
 
@@ -180,11 +181,13 @@ async function callExaSearch(apiKey: string, params: ExaSearchParams): Promise<E
 			"x-api-key": apiKey,
 		},
 		body: JSON.stringify(body),
-		signal: params.signal,
+		signal: withHardTimeout(params.signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("exa", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError("exa", `Exa API error (${response.status}): ${errorText}`, response.status);
 	}
 

package/src/web/search/providers/gemini.ts

@@ -15,6 +15,7 @@ import type { SearchCitation, SearchResponse, SearchSource } from "../../../web/
 import { SearchProviderError } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+import { classifyProviderHttpError, withHardTimeout } from "./utils";
 
 const DEFAULT_ENDPOINT = "https://cloudcode-pa.googleapis.com";
 const ANTIGRAVITY_DAILY_ENDPOINT = "https://daily-cloudcode-pa.googleapis.com";
@@ -310,7 +311,7 @@ async function callGeminiSearch(
 			...headers,
 		},
 		body: JSON.stringify(requestBody),
-		signal,
+		signal: withHardTimeout(signal),
 	});
 	const urlFor = (attempt: number) =>
 		`${endpoints[Math.min(attempt, endpoints.length - 1)]}/v1internal:streamGenerateContent?alt=sse`;
@@ -340,6 +341,8 @@ async function callGeminiSearch(
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("gemini", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError(
 			"gemini",
 			`Gemini Cloud Code API error (${response.status}): ${errorText}`,

package/src/web/search/providers/jina.ts

@@ -10,7 +10,7 @@ import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
-import { isApiKeyAvailable } from "./utils";
+import { classifyProviderHttpError, isApiKeyAvailable, withHardTimeout } from "./utils";
 
 const JINA_SEARCH_URL = "https://s.jina.ai";
 
@@ -41,11 +41,13 @@ async function callJinaSearch(apiKey: string, query: string, signal?: AbortSigna
 			Accept: "application/json",
 			Authorization: `Bearer ${apiKey}`,
 		},
-		signal,
+		signal: withHardTimeout(signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("jina", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError("jina", `Jina API error (${response.status}): ${errorText}`, response.status);
 	}
 

package/src/web/search/providers/kagi.ts

@@ -9,7 +9,7 @@ import { findKagiApiKey, KagiApiError, searchWithKagi } from "../../kagi";
 import { clampNumResults } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
-import { toSearchSources } from "./utils";
+import { classifyProviderHttpError, toSearchSources } from "./utils";
 
 const DEFAULT_NUM_RESULTS = 10;
 const MAX_NUM_RESULTS = 40;
@@ -36,6 +36,10 @@ export async function searchKagi(params: {
 		};
 	} catch (err) {
 		if (err instanceof KagiApiError) {
+			if (typeof err.statusCode === "number") {
+				const classified = classifyProviderHttpError("kagi", err.statusCode, err.message);
+				if (classified) throw classified;
+			}
 			throw new SearchProviderError("kagi", err.message, err.statusCode);
 		}
 		throw err;

package/src/web/search/providers/kimi.ts

@@ -11,7 +11,7 @@ import { SearchProviderError } from "../../../web/search/types";
 import { clampNumResults, dateToAgeSeconds } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
-import { findCredential, isApiKeyAvailable } from "./utils";
+import { classifyProviderHttpError, findCredential, isApiKeyAvailable, withHardTimeout } from "./utils";
 
 const KIMI_SEARCH_URL = "https://api.kimi.com/coding/v1/search";
 
@@ -78,11 +78,13 @@ async function callKimiSearch(
 			enable_page_crawling: params.includeContent,
 			timeout_seconds: DEFAULT_TIMEOUT_SECONDS,
 		}),
-		signal: params.signal,
+		signal: withHardTimeout(params.signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("kimi", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError(
 			"kimi",
 			`Kimi search API error (${response.status}): ${errorText}`,

package/src/web/search/providers/parallel.ts

@@ -4,7 +4,7 @@ import { findParallelApiKey, ParallelApiError, searchWithParallel } from "../../
 import { clampNumResults } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
-import { toSearchSources } from "./utils";
+import { classifyProviderHttpError, toSearchSources } from "./utils";
 
 const DEFAULT_NUM_RESULTS = 10;
 const MAX_NUM_RESULTS = 40;
@@ -30,6 +30,10 @@ export async function searchParallel(params: {
 		};
 	} catch (err) {
 		if (err instanceof ParallelApiError) {
+			if (typeof err.statusCode === "number") {
+				const classified = classifyProviderHttpError("parallel", err.statusCode, err.message);
+				if (classified) throw classified;
+			}
 			throw new SearchProviderError("parallel", err.message, err.statusCode);
 		}
 		throw err;

package/src/web/search/providers/perplexity.ts

@@ -22,6 +22,7 @@ import { SearchProviderError } from "../../../web/search/types";
 import { dateToAgeSeconds } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+import { classifyProviderHttpError, withHardTimeout } from "./utils";
 
 const PERPLEXITY_API_URL = "https://api.perplexity.ai/chat/completions";
 const PERPLEXITY_OAUTH_ASK_URL = "https://www.perplexity.ai/rest/sse/perplexity_ask";
@@ -247,11 +248,13 @@ async function callPerplexityApi(
 			"Content-Type": "application/json",
 		},
 		body: JSON.stringify(request),
-		signal,
+		signal: withHardTimeout(signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("perplexity", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError(
 			"perplexity",
 			`Perplexity API error (${response.status}): ${errorText}`,
@@ -364,11 +367,13 @@ async function callPerplexityOAuth(
 				skip_search_enabled: true,
 			},
 		}),
-		signal: params.signal,
+		signal: withHardTimeout(params.signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("perplexity", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError(
 			"perplexity",
 			`Perplexity OAuth API error (${response.status}): ${errorText}`,

package/src/web/search/providers/searxng.ts

@@ -31,6 +31,7 @@ import { SearchProviderError } from "../../../web/search/types";
 import { clampNumResults, dateToAgeSeconds } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+import { classifyProviderHttpError, withHardTimeout } from "./utils";
 
 const DEFAULT_NUM_RESULTS = 10;
 const MAX_NUM_RESULTS = 20;
@@ -211,11 +212,13 @@ async function callSearXNGSearch(
 
 	const response = await fetch(url, {
 		headers,
-		signal: params.signal,
+		signal: withHardTimeout(params.signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("searxng", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError("searxng", `SearXNG API error (${response.status}): ${errorText}`, response.status);
 	}
 

package/src/web/search/providers/synthetic.ts

@@ -10,7 +10,7 @@ import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
-import { findCredential, isApiKeyAvailable } from "./utils";
+import { classifyProviderHttpError, findCredential, isApiKeyAvailable, withHardTimeout } from "./utils";
 
 const SYNTHETIC_SEARCH_URL = "https://api.synthetic.new/v2/search";
 
@@ -43,11 +43,13 @@ async function callSyntheticSearch(
 			Authorization: `Bearer ${apiKey}`,
 		},
 		body: JSON.stringify({ query }),
-		signal,
+		signal: withHardTimeout(signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("synthetic", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError(
 			"synthetic",
 			`Synthetic API error (${response.status}): ${errorText}`,

package/src/web/search/providers/tavily.ts

@@ -10,7 +10,7 @@ import { SearchProviderError } from "../../../web/search/types";
 import { clampNumResults, dateToAgeSeconds } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
-import { findCredential, isApiKeyAvailable } from "./utils";
+import { classifyProviderHttpError, findCredential, isApiKeyAvailable, withHardTimeout } from "./utils";
 
 const TAVILY_SEARCH_URL = "https://api.tavily.com/search";
 const DEFAULT_NUM_RESULTS = 5;
@@ -92,11 +92,13 @@ async function callTavilySearch(apiKey: string, params: TavilySearchParams): Pro
 			Authorization: `Bearer ${apiKey}`,
 		},
 		body: JSON.stringify(buildRequestBody(params)),
-		signal: params.signal,
+		signal: withHardTimeout(params.signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("tavily", response.status, errorText);
+		if (classified) throw classified;
 		let message = errorText.trim();
 		if (message.length === 0) {
 			message = response.statusText;