@oh-my-pi/pi-coding-agent 17.2.3 → 17.2.5

package/src/web/search/providers/browser-page.ts

@@ -26,6 +26,7 @@ interface BrowserFallbackOptions {
 export interface BrowserFetchOptions {
 	fetch?: FetchImpl;
 	signal: AbortSignal;
+	timeoutMs?: number;
 	randomizeHeaders?: boolean;
 	referer?: string;
 	init?: Omit<RequestInit, "headers" | "signal">;
@@ -50,6 +51,7 @@ async function browseHtmlPage(
 	url: string,
 	options: BrowserFallbackOptions,
 	signal: AbortSignal,
+	timeoutMs = SEARCH_HARD_TIMEOUT_MS,
 ): Promise<LoadedHtmlPage> {
 	const { homeUrl, ready } = options;
 	const attempts = Math.max(1, options.attempts ?? 1);
@@ -76,14 +78,14 @@ async function browseHtmlPage(
 		await applyStealthPatches(handle.browser, activePage, handle.stealth);
 		if (homeUrl) {
 			await untilAborted(signal, () =>
-				activePage.goto(homeUrl, { waitUntil: "domcontentloaded", timeout: SEARCH_HARD_TIMEOUT_MS }),
+				activePage.goto(homeUrl, { waitUntil: "domcontentloaded", timeout: timeoutMs }),
 			);
 		}
 		for (let attempt = 0; attempt < attempts; attempt++) {
 			if (attempt > 0 && options.retryDelayMs) await Bun.sleep(options.retryDelayMs);
 
 			const response = await untilAborted(signal, () =>
-				activePage.goto(url, { waitUntil: "domcontentloaded", timeout: SEARCH_HARD_TIMEOUT_MS }),
+				activePage.goto(url, { waitUntil: "domcontentloaded", timeout: timeoutMs }),
 			);
 			if (options.afterNavigation) await options.afterNavigation(activePage, signal);
 			if (ready) {
@@ -113,11 +115,11 @@ export async function browserFetch(url: string, options: BrowserFetchOptions): P
 		page = await fetchHtmlPage(url, options, fetchImpl);
 	} catch (error) {
 		if (options.fetch || !options.browser) throw error;
-		return browseHtmlPage(url, options.browser, options.signal);
+		return browseHtmlPage(url, options.browser, options.signal, options.timeoutMs);
 	}
 
 	if (!options.browser || options.fetch) return page;
 	const isSuccessful = page.status >= 200 && page.status < 300;
 	if (isSuccessful && !options.browser.shouldFallback(page)) return page;
-	return browseHtmlPage(url, options.browser, options.signal);
+	return browseHtmlPage(url, options.browser, options.signal, options.timeoutMs);
 }

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

@@ -145,6 +145,7 @@ function shouldRetryWithNextDefaultModel(error: unknown): boolean {
 
 export interface CodexSearchParams {
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	fetch?: FetchImpl;
 	query: string;
 	system_prompt?: string;
@@ -442,6 +443,7 @@ async function callCodexSearch(
 	query: string,
 	options: {
 		signal?: AbortSignal;
+		timeoutMs?: number;
 		systemPrompt?: string;
 		searchContextSize?: "low" | "medium" | "high";
 		model: CodexModelCandidate;
@@ -496,7 +498,7 @@ async function callCodexSearch(
 		method: "POST",
 		headers,
 		body: JSON.stringify(body),
-		signal: withHardTimeout(options.signal),
+		signal: withHardTimeout(options.signal, options.timeoutMs),
 	});
 
 	if (!response.ok) {
@@ -645,6 +647,7 @@ async function runCodexSearchCandidates(options: {
 		try {
 			return await callCodexSearch(options.auth, options.query, {
 				signal: options.params.signal,
+				timeoutMs: options.params.timeoutMs,
 				systemPrompt: options.params.systemPrompt,
 				searchContextSize: "high",
 				model: candidate,

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

@@ -305,6 +305,7 @@ async function callDuckDuckGoHtml(params: SearchParams, form: URLSearchParams, s
 	const page = await browserFetch(DUCKDUCKGO_HTML_URL, {
 		fetch: params.fetch ?? fetch,
 		signal,
+		timeoutMs: params.timeoutMs,
 		referer: "https://html.duckduckgo.com/",
 		init: {
 			method: "POST",
@@ -334,7 +335,7 @@ async function callDuckDuckGoHtml(params: SearchParams, form: URLSearchParams, s
 /** Execute a DuckDuckGo web search via the no-JS HTML frontend. */
 export async function searchDuckDuckGo(params: SearchParams): Promise<SearchResponse> {
 	const numResults = clampNumResults(params.numSearchResults ?? params.limit, DEFAULT_NUM_RESULTS, MAX_NUM_RESULTS);
-	const signal = withHardTimeout(params.signal);
+	const signal = withHardTimeout(params.signal, params.timeoutMs);
 	const sources: SearchSource[] = [];
 	const seen = new Set<string>();
 	let form: URLSearchParams | undefined = createDuckDuckGoForm(params);

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

@@ -99,7 +99,7 @@ function isBlockedPage(page: LoadedHtmlPage): boolean {
 }
 
 async function callEcosiaHtml(params: SearchParams): Promise<string> {
-	const signal = withHardTimeout(params.signal);
+	const signal = withHardTimeout(params.signal, params.timeoutMs);
 	const url = new URL(ECOSIA_SEARCH_URL);
 	// Ecosia serves Google-backed results, so classic operators pass through
 	// inline; canonicalize aliases (domain: -> site:, since: -> after:) and
@@ -111,6 +111,7 @@ async function callEcosiaHtml(params: SearchParams): Promise<string> {
 		page = await browserFetch(url.href, {
 			fetch: params.fetch,
 			signal,
+			timeoutMs: params.timeoutMs,
 			referer: ECOSIA_HOME_URL,
 			browser: {
 				homeUrl: ECOSIA_HOME_URL,

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

@@ -115,6 +115,7 @@ export interface ExaSearchParams {
 	start_published_date?: string;
 	end_published_date?: string;
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	fetch?: FetchImpl;
 	/**
 	 * Credential source. Resolved before falling back to `EXA_API_KEY` so
@@ -315,7 +316,7 @@ async function callExaSearch(apiKey: string, params: ExaSearchParams): Promise<E
 			"x-api-key": apiKey,
 		},
 		body: JSON.stringify(body),
-		signal: withHardTimeout(params.signal),
+		signal: withHardTimeout(params.signal, params.timeoutMs),
 	});
 
 	if (!response.ok) {
@@ -360,7 +361,7 @@ async function callExaMcpSearch(params: ExaSearchParams): Promise<ExaSearchRespo
 				arguments: buildExaMcpArgs(params),
 			},
 		}),
-		signal: withHardTimeout(params.signal),
+		signal: withHardTimeout(params.signal, params.timeoutMs),
 	});
 	if (!response.ok) {
 		throw new Error(`MCP request failed: ${response.status} ${response.statusText}`);
@@ -478,6 +479,7 @@ export class ExaProvider extends SearchProvider {
 			...directiveParams(parsed),
 			num_results: params.numSearchResults ?? params.limit,
 			signal: params.signal,
+			timeoutMs: params.timeoutMs,
 			authStorage: params.authStorage,
 			sessionId: params.sessionId,
 			fetch: params.fetch,

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

@@ -38,6 +38,7 @@ export interface FirecrawlSearchParams {
 	/** Explicit `tbs` (custom date range); takes precedence over `recency`. */
 	tbs?: string;
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	fetch?: FetchImpl;
 }
 
@@ -91,7 +92,7 @@ async function callFirecrawlSearch(
 		method: "POST",
 		headers,
 		body: JSON.stringify(buildRequestBody(params)),
-		signal: withHardTimeout(params.signal),
+		signal: withHardTimeout(params.signal, params.timeoutMs),
 	});
 
 	if (!response.ok) {
@@ -145,6 +146,7 @@ export async function searchFirecrawl(params: SearchParams): Promise<SearchRespo
 		recency: params.recency,
 		tbs,
 		signal: params.signal,
+		timeoutMs: params.timeoutMs,
 		fetch: params.fetch,
 	};
 	const keyResolver = params.authStorage.resolver("firecrawl", {

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

@@ -61,6 +61,7 @@ export interface GeminiSearchParams extends GeminiToolParams {
 	/** Sampling temperature (0–1). Lower = more focused/factual. */
 	temperature?: number;
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	authStorage: AuthStorage;
 	sessionId?: string;
 	fetch?: FetchImpl;
@@ -309,6 +310,7 @@ async function callGeminiSearch(
 	toolParams: GeminiToolParams,
 	fetchImpl: FetchImpl | undefined,
 	signal: AbortSignal | undefined,
+	timeoutMs: number | undefined,
 	mode?: "auto" | "production" | "sandbox",
 ): Promise<GeminiSearchResult> {
 	let endpoints: string[];
@@ -383,7 +385,7 @@ async function callGeminiSearch(
 			...headers,
 		},
 		body: JSON.stringify(requestBody),
-		signal: withHardTimeout(signal),
+		signal: withHardTimeout(signal, timeoutMs),
 	});
 
 	let response: Response | undefined;
@@ -442,6 +444,7 @@ async function callGeminiDeveloperSearch(
 	toolParams: GeminiToolParams,
 	fetchImpl: FetchImpl | undefined,
 	signal: AbortSignal | undefined,
+	timeoutMs: number | undefined,
 ): Promise<GeminiSearchResult> {
 	const normalizedSystemPrompt = systemPrompt?.toWellFormed();
 	const requestBody: Record<string, unknown> = {
@@ -480,7 +483,7 @@ async function callGeminiDeveloperSearch(
 				Accept: "text/event-stream",
 			},
 			body: JSON.stringify(requestBody),
-			signal: withHardTimeout(signal),
+			signal: withHardTimeout(signal, timeoutMs),
 			fetch: fetchImpl,
 			maxAttempts: MAX_RETRIES + 1,
 			defaultDelayMs: attempt => BASE_DELAY_MS * 2 ** attempt,
@@ -548,6 +551,7 @@ export async function searchGemini(params: GeminiSearchParams): Promise<SearchRe
 					},
 					params.fetch,
 					params.signal,
+					params.timeoutMs,
 					params.antigravityEndpointMode,
 				),
 			{ sessionId: params.sessionId, signal: params.signal, seed: seed.access },
@@ -575,6 +579,7 @@ export async function searchGemini(params: GeminiSearchParams): Promise<SearchRe
 			},
 			params.fetch,
 			params.signal,
+			params.timeoutMs,
 		);
 	}
 
@@ -619,6 +624,7 @@ export class GeminiProvider extends SearchProvider {
 			code_execution: params.codeExecution,
 			url_context: params.urlContext,
 			signal: params.signal,
+			timeoutMs: params.timeoutMs,
 			authStorage: params.authStorage,
 			sessionId: params.sessionId,
 			fetch: params.fetch,

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

@@ -117,13 +117,14 @@ function blockReason(page: LoadedHtmlPage): "javascript" | "traffic" | undefined
 }
 
 async function callGoogleHtml(params: SearchParams, numResults: number): Promise<string> {
-	const signal = withHardTimeout(params.signal);
+	const signal = withHardTimeout(params.signal, params.timeoutMs);
 	const url = buildSearchUrl(params, numResults);
 	let page: LoadedHtmlPage;
 	try {
 		page = await browserFetch(url, {
 			fetch: params.fetch,
 			signal,
+			timeoutMs: params.timeoutMs,
 			referer: GOOGLE_HOME_URL,
 			browser: {
 				homeUrl: GOOGLE_HOME_URL,

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

@@ -22,6 +22,7 @@ export interface JinaSearchParams {
 	/** Single bare host for Jina's `X-Site` in-site search header. */
 	site?: string;
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	fetch?: FetchImpl;
 }
 
@@ -45,6 +46,7 @@ async function callJinaSearch(
 	site?: string,
 	signal?: AbortSignal,
 	fetchImpl: FetchImpl = fetch,
+	timeoutMs?: number,
 ): Promise<JinaSearchResponse> {
 	const requestUrl = `${JINA_SEARCH_URL}/${encodeURIComponent(query)}`;
 	const headers: Record<string, string> = {
@@ -54,7 +56,7 @@ async function callJinaSearch(
 	if (site) headers["X-Site"] = site;
 	const response = await fetchImpl(requestUrl, {
 		headers,
-		signal: withHardTimeout(signal),
+		signal: withHardTimeout(signal, timeoutMs),
 	});
 
 	if (!response.ok) {
@@ -75,7 +77,14 @@ export async function searchJina(params: JinaSearchParams): Promise<SearchRespon
 		throw new Error("JINA_API_KEY not found. Set it in environment or .env file.");
 	}
 
-	const response = await callJinaSearch(apiKey, params.query, params.site, params.signal, params.fetch);
+	const response = await callJinaSearch(
+		apiKey,
+		params.query,
+		params.site,
+		params.signal,
+		params.fetch,
+		params.timeoutMs,
+	);
 	const sources: SearchSource[] = [];
 
 	for (const result of response) {
@@ -128,6 +137,7 @@ export class JinaProvider extends SearchProvider {
 			num_results: params.numSearchResults ?? params.limit,
 			site,
 			signal: params.signal,
+			timeoutMs: params.timeoutMs,
 			fetch: params.fetch,
 		});
 	}

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

@@ -26,6 +26,7 @@ export async function searchKagi(params: {
 	recency?: SearchParams["recency"];
 	parsedQuery?: StructuredQuery;
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	authStorage: AuthStorage;
 	sessionId?: string;
 	fetch?: FetchImpl;
@@ -45,6 +46,7 @@ export async function searchKagi(params: {
 				recency: params.recency,
 				sessionId: params.sessionId,
 				signal: params.signal,
+				timeoutMs: params.timeoutMs,
 				fetch: params.fetch,
 			},
 			params.authStorage,
@@ -87,6 +89,7 @@ export class KagiProvider extends SearchProvider {
 			num_results: params.numSearchResults ?? params.limit,
 			recency: params.recency,
 			signal: params.signal,
+			timeoutMs: params.timeoutMs,
 			authStorage: params.authStorage,
 			sessionId: params.sessionId,
 			fetch: fetchImpl,

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

@@ -42,6 +42,7 @@ export interface KimiSearchParams {
 	num_results?: number;
 	include_content?: boolean;
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	authStorage: AuthStorage;
 	sessionId?: string;
 	fetch?: FetchImpl;
@@ -105,6 +106,7 @@ async function callKimiSearch(
 		limit: number;
 		includeContent: boolean;
 		signal?: AbortSignal;
+		timeoutMs?: number;
 		fetch?: FetchImpl;
 	},
 ): Promise<{ response: KimiSearchResponse; requestId?: string }> {
@@ -122,7 +124,7 @@ async function callKimiSearch(
 			enable_page_crawling: params.includeContent,
 			timeout_seconds: DEFAULT_TIMEOUT_SECONDS,
 		}),
-		signal: withHardTimeout(params.signal),
+		signal: withHardTimeout(params.signal, params.timeoutMs),
 	});
 
 	if (!response.ok) {
@@ -161,6 +163,7 @@ export async function searchKimi(params: KimiSearchParams): Promise<SearchRespon
 				limit,
 				includeContent: params.include_content ?? false,
 				signal: params.signal,
+				timeoutMs: params.timeoutMs,
 				fetch: params.fetch,
 			}),
 		{ signal: params.signal },
@@ -209,6 +212,7 @@ export class KimiProvider extends SearchProvider {
 			parsedQuery: params.parsedQuery,
 			num_results: params.numSearchResults ?? params.limit,
 			signal: params.signal,
+			timeoutMs: params.timeoutMs,
 			authStorage: params.authStorage,
 			sessionId: params.sessionId,
 			fetch: fetchImpl,

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

@@ -137,13 +137,14 @@ function isRobotPage(page: LoadedHtmlPage): boolean {
 }
 
 async function callMojeekHtml(params: SearchParams, numResults: number): Promise<string> {
-	const signal = withHardTimeout(params.signal);
+	const signal = withHardTimeout(params.signal, params.timeoutMs);
 	const url = buildSearchUrl(params, numResults);
 	let page: LoadedHtmlPage;
 	try {
 		page = await browserFetch(url, {
 			fetch: params.fetch,
 			signal,
+			timeoutMs: params.timeoutMs,
 			randomizeHeaders: false,
 			referer: MOJEEK_HOME_URL,
 			browser: {

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

@@ -59,6 +59,7 @@ async function searchWithAuthStorage(
 	queries: string[],
 	params: {
 		signal?: AbortSignal;
+		timeoutMs?: number;
 		fetch?: FetchImpl;
 	},
 	authStorage: AuthStorage,
@@ -97,7 +98,7 @@ async function searchWithAuthStorage(
 					},
 					...(sourcePolicy && { source_policy: sourcePolicy }),
 				}),
-				signal: withHardTimeout(params.signal),
+				signal: withHardTimeout(params.signal, params.timeoutMs),
 			});
 
 			if (!response.ok) {
@@ -116,6 +117,7 @@ export async function searchParallel(
 		query: string;
 		num_results?: number;
 		signal?: AbortSignal;
+		timeoutMs?: number;
 		fetch?: FetchImpl;
 		parsedQuery?: StructuredQuery;
 	},
@@ -134,6 +136,7 @@ export async function searchParallel(
 			[query],
 			{
 				signal: params.signal,
+				timeoutMs: params.timeoutMs,
 				fetch: params.fetch,
 			},
 			authStorage,
@@ -172,6 +175,7 @@ export class ParallelProvider extends SearchProvider {
 				query: params.query,
 				num_results: params.numSearchResults ?? params.limit,
 				signal: params.signal,
+				timeoutMs: params.timeoutMs,
 				fetch: params.fetch,
 				parsedQuery: params.parsedQuery,
 			},

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

@@ -322,6 +322,7 @@ function sourcesFromTextPayload(text: string | undefined): SearchSource[] {
 }
 export interface PerplexitySearchParams {
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	query: string;
 	system_prompt?: string;
 	/** Pre-parsed view of `query` from the search pipeline; parsed locally when absent. */
@@ -498,10 +499,11 @@ async function callPerplexityApi(
 	request: PerplexityRequest,
 	fetchImpl: FetchImpl | undefined,
 	signal?: AbortSignal,
+	timeoutMs?: number,
 ): Promise<SearchResponse> {
 	const metadata: PerplexityApiStreamMetadata = {};
 	const context = buildPerplexityContext(request);
-	const requestSignal = withHardTimeout(signal);
+	const requestSignal = withHardTimeout(signal, timeoutMs);
 	const onSseEvent = (event: { data: string }): void => {
 		collectPerplexityMetadata(metadata, event.data);
 	};
@@ -690,7 +692,7 @@ async function callPerplexityAsk(
 			query_str: effectiveQuery,
 			params: requestParams,
 		}),
-		signal: withHardTimeout(params.signal),
+		signal: withHardTimeout(params.signal, params.timeoutMs),
 	};
 
 	// The consumer ask endpoint intermittently drops the socket before sending an
@@ -902,7 +904,7 @@ export async function searchPerplexity(params: PerplexitySearchParams): Promise<
 	for (const auth of authMethods) {
 		if (auth.type === "api_key") {
 			try {
-				const result = await callPerplexityApi(auth, request, params.fetch, params.signal);
+				const result = await callPerplexityApi(auth, request, params.fetch, params.signal, params.timeoutMs);
 				result.authMode = "api_key";
 				return applySourceLimit(result, params.num_results);
 			} catch (error) {
@@ -978,6 +980,7 @@ export class PerplexityProvider extends SearchProvider {
 	search(params: SearchParams): Promise<SearchResponse> {
 		return searchPerplexity({
 			signal: params.signal,
+			timeoutMs: params.timeoutMs,
 			query: params.query,
 			parsedQuery: params.parsedQuery,
 			temperature: params.temperature,

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

@@ -130,7 +130,7 @@ export async function searchPublicWeb(
 	// hard deadline; the straggler controller lets the aggregate cancel
 	// still-running engines once it decides to return.
 	const straggler = new AbortController();
-	const signal = AbortSignal.any([withHardTimeout(params.signal), straggler.signal]);
+	const signal = AbortSignal.any([withHardTimeout(params.signal, params.timeoutMs), straggler.signal]);
 
 	const responses: (SearchResponse | undefined)[] = new Array(engineIds.length);
 	const failures: { provider: { id: SearchProviderId; label: string }; error: unknown }[] = [];

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

@@ -197,11 +197,12 @@ async function fetchEngineNameMap(
 	auth: SearXNGAuth | null,
 	fetchImpl: FetchImpl | undefined,
 	signal: AbortSignal | undefined,
+	timeoutMs?: number,
 ): Promise<Map<string, string> | null> {
 	try {
 		const response = await (fetchImpl ?? fetch)(`${base}/config`, {
 			headers: buildHeaders(auth),
-			signal: withHardTimeout(signal),
+			signal: withHardTimeout(signal, timeoutMs),
 		});
 		if (!response.ok) return null;
 		const config = (await response.json()) as SearXNGConfig;
@@ -224,11 +225,12 @@ function getEngineNameMap(
 	auth: SearXNGAuth | null,
 	fetchImpl: FetchImpl | undefined,
 	signal: AbortSignal | undefined,
+	timeoutMs?: number,
 ): Promise<Map<string, string> | null> {
 	const base = endpoint.replace(/\/+$/, "");
 	let cached = engineNameMapCache.get(base);
 	if (!cached) {
-		cached = fetchEngineNameMap(base, auth, fetchImpl, signal).then(map => {
+		cached = fetchEngineNameMap(base, auth, fetchImpl, signal, timeoutMs).then(map => {
 			if (!map) engineNameMapCache.delete(base);
 			return map;
 		});
@@ -247,13 +249,14 @@ async function resolveEngineNames(
 	auth: SearXNGAuth | null,
 	fetchImpl: FetchImpl | undefined,
 	signal: AbortSignal | undefined,
+	timeoutMs?: number,
 ): Promise<string | undefined> {
 	const entries = raw
 		.split(",")
 		.map(entry => entry.trim())
 		.filter(Boolean);
 	if (!entries.length) return undefined;
-	const map = await getEngineNameMap(endpoint, auth, fetchImpl, signal);
+	const map = await getEngineNameMap(endpoint, auth, fetchImpl, signal, timeoutMs);
 	if (!map) return entries.join(",");
 	return entries.map(entry => map.get(entry.toLowerCase()) ?? entry).join(",");
 }
@@ -324,6 +327,7 @@ async function callSearXNGSearch(
 		engines?: string;
 		language?: string;
 		signal?: AbortSignal;
+		timeoutMs?: number;
 		fetch?: FetchImpl;
 	},
 	auth: SearXNGAuth | null,
@@ -332,7 +336,7 @@ async function callSearXNGSearch(
 
 	const response = await (params.fetch ?? fetch)(url, {
 		headers,
-		signal: withHardTimeout(params.signal),
+		signal: withHardTimeout(params.signal, params.timeoutMs),
 	});
 
 	if (!response.ok) {
@@ -352,6 +356,7 @@ export async function searchSearXNG(params: {
 	num_results?: number;
 	recency?: "day" | "week" | "month" | "year";
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	fetch?: FetchImpl;
 }): Promise<SearchResponse> {
 	const numResults = clampNumResults(params.num_results, DEFAULT_NUM_RESULTS, MAX_NUM_RESULTS);
@@ -386,7 +391,7 @@ export async function searchSearXNG(params: {
 	if (parsed.lang) language = parsed.lang;
 
 	const engines = configuredEngines
-		? await resolveEngineNames(configuredEngines, endpoint, auth, params.fetch, params.signal)
+		? await resolveEngineNames(configuredEngines, endpoint, auth, params.fetch, params.signal, params.timeoutMs)
 		: undefined;
 
 	const response = await callSearXNGSearch(
@@ -455,6 +460,7 @@ export class SearXNGProvider extends SearchProvider {
 			num_results: params.numSearchResults ?? params.limit,
 			recency: params.recency,
 			signal: params.signal,
+			timeoutMs: params.timeoutMs,
 			fetch: params.fetch,
 		});
 	}

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

@@ -121,10 +121,14 @@ function parseHtmlResults(html: string): ParsedResult[] {
  * any failure (network, non-OK status, challenge shell, markup drift) yields
  * `undefined` and the caller falls back to a direct GET.
  */
-async function fetchFormInputs(fetchImpl: FetchImpl, signal: AbortSignal): Promise<Record<string, string> | undefined> {
+async function fetchFormInputs(
+	fetchImpl: FetchImpl,
+	signal: AbortSignal,
+	timeoutMs?: number,
+): Promise<Record<string, string> | undefined> {
 	let page: LoadedHtmlPage;
 	try {
-		page = await browserFetch(STARTPAGE_HOME_URL, { fetch: fetchImpl, signal });
+		page = await browserFetch(STARTPAGE_HOME_URL, { fetch: fetchImpl, signal, timeoutMs });
 	} catch (error) {
 		if (signal.aborted) throw error;
 		return undefined;
@@ -135,7 +139,7 @@ async function fetchFormInputs(fetchImpl: FetchImpl, signal: AbortSignal): Promi
 
 async function callStartpageHtml(params: SearchParams): Promise<string> {
 	const fetchImpl = params.fetch ?? fetch;
-	const signal = withHardTimeout(params.signal);
+	const signal = withHardTimeout(params.signal, params.timeoutMs);
 	const withDate = params.recency ? RECENCY_TO_STARTPAGE_WITH_DATE[params.recency] : undefined;
 	// Startpage proxies Google, so the operator set works inline; rebuild via
 	// the shared scraper formatter to canonicalize aliases (domain: → site:,
@@ -143,7 +147,7 @@ async function callStartpageHtml(params: SearchParams): Promise<string> {
 	// queries pass through byte-identical.
 	const query = formatScraperQuery(params.query, params.parsedQuery);
 
-	const formInputs = await fetchFormInputs(fetchImpl, signal);
+	const formInputs = await fetchFormInputs(fetchImpl, signal, params.timeoutMs);
 	let page: LoadedHtmlPage;
 	if (formInputs) {
 		const form = new URLSearchParams(formInputs);
@@ -152,6 +156,7 @@ async function callStartpageHtml(params: SearchParams): Promise<string> {
 		page = await browserFetch(STARTPAGE_SEARCH_URL, {
 			fetch: fetchImpl,
 			signal,
+			timeoutMs: params.timeoutMs,
 			referer: STARTPAGE_HOME_URL,
 			init: { method: "POST", body: form.toString() },
 			headers: { "Content-Type": "application/x-www-form-urlencoded" },
@@ -163,6 +168,7 @@ async function callStartpageHtml(params: SearchParams): Promise<string> {
 		page = await browserFetch(url.href, {
 			fetch: fetchImpl,
 			signal,
+			timeoutMs: params.timeoutMs,
 			referer: STARTPAGE_HOME_URL,
 		});
 	}

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

@@ -43,6 +43,7 @@ async function callSyntheticSearch(
 	query: string,
 	signal?: AbortSignal,
 	fetchImpl: FetchImpl = fetch,
+	timeoutMs?: number,
 ): Promise<SyntheticSearchResponse> {
 	const response = await fetchImpl(SYNTHETIC_SEARCH_URL, {
 		method: "POST",
@@ -51,7 +52,7 @@ async function callSyntheticSearch(
 			Authorization: `Bearer ${apiKey}`,
 		},
 		body: JSON.stringify({ query }),
-		signal: withHardTimeout(signal),
+		signal: withHardTimeout(signal, timeoutMs),
 	});
 
 	if (!response.ok) {
@@ -80,10 +81,15 @@ export async function searchSynthetic(params: SearchParamsWithFetch): Promise<Se
 		: params.query;
 
 	const fetchImpl = params.fetch;
-	const data = await withAuth(keyOrResolver, key => callSyntheticSearch(key, query, params.signal, fetchImpl), {
-		signal: params.signal,
-		missingKeyMessage: "Synthetic credentials not found. Set SYNTHETIC_API_KEY or login with 'omp /login synthetic'.",
-	});
+	const data = await withAuth(
+		keyOrResolver,
+		key => callSyntheticSearch(key, query, params.signal, fetchImpl, params.timeoutMs),
+		{
+			signal: params.signal,
+			missingKeyMessage:
+				"Synthetic credentials not found. Set SYNTHETIC_API_KEY or login with 'omp /login synthetic'.",
+		},
+	);
 	const sources: SearchSource[] = [];
 
 	for (const result of data.results ?? []) {

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

@@ -30,6 +30,7 @@ export interface TavilySearchParams {
 	/** `before:` upper bound, ISO `YYYY-MM-DD`, mapped to `end_date`. */
 	end_date?: string;
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	fetch?: FetchImpl;
 }
 
@@ -120,7 +121,7 @@ async function callTavilySearch(apiKey: string, params: TavilySearchParams): Pro
 			Authorization: `Bearer ${apiKey}`,
 		},
 		body: JSON.stringify(buildRequestBody(params)),
-		signal: withHardTimeout(params.signal),
+		signal: withHardTimeout(params.signal, params.timeoutMs),
 	});
 
 	if (!response.ok) {
@@ -189,6 +190,7 @@ export async function searchTavily(params: SearchParams): Promise<SearchResponse
 		num_results: params.numSearchResults ?? params.limit,
 		recency: params.recency,
 		signal: params.signal,
+		timeoutMs: params.timeoutMs,
 		fetch: params.fetch,
 	};
 	if (parsed.hasDirectives) {