@oh-my-pi/pi-coding-agent 15.10.7 → 15.10.9

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

@@ -7,7 +7,7 @@
  * SQLite store, never POSTs the broker sentinel to an OpenAI token endpoint.
  */
 import * as os from "node:os";
-import { type AuthStorage, getBundledModels } from "@oh-my-pi/pi-ai";
+import { type AuthStorage, type FetchImpl, getBundledModels } from "@oh-my-pi/pi-ai";
 import { decodeJwt } from "@oh-my-pi/pi-ai/oauth/openai-codex";
 import { $env, readSseJson } from "@oh-my-pi/pi-utils";
 import packageJson from "../../../../package.json" with { type: "json" };
@@ -66,6 +66,7 @@ function shouldRetryWithNextDefaultModel(error: unknown): boolean {
 
 export interface CodexSearchParams {
 	signal?: AbortSignal;
+	fetch?: FetchImpl;
 	query: string;
 	system_prompt?: string;
 	num_results?: number;
@@ -322,6 +323,7 @@ async function callCodexSearch(
 		systemPrompt?: string;
 		searchContextSize?: "low" | "medium" | "high";
 		modelId: string;
+		fetch?: FetchImpl;
 	},
 ): Promise<{
 	answer: string;
@@ -356,7 +358,8 @@ async function callCodexSearch(
 		instructions: options.systemPrompt ?? DEFAULT_INSTRUCTIONS,
 	};
 
-	const response = await fetch(url, {
+	const fetchImpl = options.fetch ?? fetch;
+	const response = await fetchImpl(url, {
 		method: "POST",
 		headers,
 		body: JSON.stringify(body),
@@ -522,6 +525,7 @@ export async function searchCodex(params: SearchParams): Promise<SearchResponse>
 				systemPrompt: params.systemPrompt,
 				searchContextSize: "high",
 				modelId,
+				fetch: params.fetch,
 			});
 			break;
 		} catch (error) {

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

@@ -6,10 +6,10 @@
  * Requests per-result summaries via `contents.summary` and synthesizes
  * them into a combined `answer` string on the SearchResponse.
  */
-import { type ApiKey, type AuthStorage, getEnvApiKey, withAuth } from "@oh-my-pi/pi-ai";
+import { type ApiKey, type AuthStorage, type FetchImpl, getEnvApiKey, withAuth } from "@oh-my-pi/pi-ai";
 import { settings } from "../../../config/settings";
-import { callExaTool, findApiKey, isSearchResponse } from "../../../exa/mcp-client";
-
+import { findApiKey, isSearchResponse } from "../../../exa/mcp-client";
+import { parseSSE } from "../../../mcp/json-rpc";
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
 import { dateToAgeSeconds } from "../utils";
@@ -32,6 +32,7 @@ export interface ExaSearchParams {
 	start_published_date?: string;
 	end_published_date?: string;
 	signal?: AbortSignal;
+	fetch?: FetchImpl;
 	/**
 	 * Credential source. Resolved before falling back to `EXA_API_KEY` so
 	 * Exa works when the key is stored via the broker/auth pipeline.
@@ -62,6 +63,48 @@ function asRecord(value: unknown): Record<string, unknown> | null {
 	return value as Record<string, unknown>;
 }
 
+function parseJsonContent(text: string): unknown | null {
+	try {
+		return JSON.parse(text) as unknown;
+	} catch {
+		return null;
+	}
+}
+
+function normalizeExaMcpPayload(payload: unknown): unknown {
+	const candidates: unknown[] = [];
+	const root = asRecord(payload);
+
+	if (root) {
+		if (root.structuredContent !== undefined) candidates.push(root.structuredContent);
+		if (root.data !== undefined) candidates.push(root.data);
+		if (root.result !== undefined) candidates.push(root.result);
+		candidates.push(root);
+
+		const content = root.content;
+		if (Array.isArray(content)) {
+			for (const item of content) {
+				const part = asRecord(item);
+				if (!part) continue;
+				const text = part.text;
+				if (typeof text !== "string" || text.trim().length === 0) continue;
+				const parsed = parseJsonContent(text);
+				if (parsed !== null) candidates.push(parsed);
+			}
+		}
+	} else {
+		candidates.push(payload);
+	}
+
+	for (const candidate of candidates) {
+		if (isSearchResponse(candidate)) {
+			return candidate;
+		}
+	}
+
+	return payload;
+}
+
 function parseOptionalField(section: string, label: string): string | null | undefined {
 	const regex = new RegExp(`(?:^|\\n)${label}:\\s*([^\\n]*)`);
 	const match = section.match(regex);
@@ -180,7 +223,8 @@ export function buildExaRequestBody(params: ExaSearchParams): Record<string, unk
 async function callExaSearch(apiKey: string, params: ExaSearchParams): Promise<ExaSearchResponse> {
 	const body = buildExaRequestBody(params);
 
-	const response = await fetch(EXA_API_URL, {
+	const fetchImpl = params.fetch ?? fetch;
+	const response = await fetchImpl(EXA_API_URL, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -211,14 +255,52 @@ function buildExaMcpArgs(params: ExaSearchParams): Record<string, unknown> {
 }
 
 async function callExaMcpSearch(params: ExaSearchParams): Promise<ExaSearchResponse> {
-	const response = await callExaTool("web_search_exa", buildExaMcpArgs(params), findApiKey(), {
+	const query = new URLSearchParams();
+	const apiKey = findApiKey();
+	if (apiKey) query.set("exaApiKey", apiKey);
+	query.set("tools", "web_search_exa");
+	const fetchImpl = params.fetch ?? fetch;
+	const response = await fetchImpl(`https://mcp.exa.ai/mcp?${query.toString()}`, {
+		method: "POST",
+		headers: {
+			"Content-Type": "application/json",
+			Accept: "application/json, text/event-stream",
+		},
+		body: JSON.stringify({
+			jsonrpc: "2.0",
+			id: Math.random().toString(36).slice(2),
+			method: "tools/call",
+			params: {
+				name: "web_search_exa",
+				arguments: buildExaMcpArgs(params),
+			},
+		}),
 		signal: withHardTimeout(params.signal),
 	});
-	if (isSearchResponse(response)) {
-		return response as ExaSearchResponse;
+	if (!response.ok) {
+		throw new Error(`MCP request failed: ${response.status} ${response.statusText}`);
+	}
+	const mcpResponse = parseSSE(await response.text()) as {
+		result?: {
+			content?: Array<{ type: string; text?: string }>;
+		};
+		error?: {
+			code: number;
+			message: string;
+		};
+	} | null;
+	if (!mcpResponse) {
+		throw new Error("Failed to parse MCP response");
+	}
+	if (mcpResponse.error) {
+		throw new Error(`MCP error: ${mcpResponse.error.message}`);
+	}
+	const responsePayload = normalizeExaMcpPayload(mcpResponse.result);
+	if (isSearchResponse(responsePayload)) {
+		return responsePayload as ExaSearchResponse;
 	}
 
-	const parsed = parseExaMcpTextPayload(response);
+	const parsed = parseExaMcpTextPayload(responsePayload);
 	if (parsed) {
 		return parsed;
 	}
@@ -312,6 +394,7 @@ export class ExaProvider extends SearchProvider {
 			signal: params.signal,
 			authStorage: params.authStorage,
 			sessionId: params.sessionId,
+			fetch: params.fetch,
 		});
 	}
 }

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

@@ -11,6 +11,7 @@
 import {
 	ANTIGRAVITY_SYSTEM_INSTRUCTION,
 	type AuthStorage,
+	type FetchImpl,
 	getAntigravityUserAgent,
 	getGeminiCliHeaders,
 } from "@oh-my-pi/pi-ai";
@@ -51,6 +52,7 @@ export interface GeminiSearchParams extends GeminiToolParams {
 	signal?: AbortSignal;
 	authStorage: AuthStorage;
 	sessionId?: string;
+	fetch?: FetchImpl;
 }
 
 export function buildGeminiRequestTools(params: GeminiToolParams): Array<Record<string, Record<string, unknown>>> {
@@ -156,6 +158,7 @@ async function callGeminiSearch(
 	maxOutputTokens: number | undefined,
 	temperature: number | undefined,
 	toolParams: GeminiToolParams,
+	fetchImpl: FetchImpl | undefined,
 	signal: AbortSignal | undefined,
 ): Promise<{
 	answer: string;
@@ -237,6 +240,7 @@ async function callGeminiSearch(
 
 	const response = await fetchWithRetry(urlFor, {
 		...buildInit(),
+		fetch: fetchImpl,
 		maxAttempts: MAX_RETRIES + 1,
 		defaultDelayMs: attempt => BASE_DELAY_MS * 2 ** attempt,
 		maxDelayMs: RATE_LIMIT_BUDGET_MS,
@@ -405,6 +409,7 @@ export async function searchGemini(params: GeminiSearchParams): Promise<SearchRe
 			code_execution: params.code_execution,
 			url_context: params.url_context,
 		},
+		params.fetch,
 		params.signal,
 	);
 
@@ -450,6 +455,7 @@ export class GeminiProvider extends SearchProvider {
 			signal: params.signal,
 			authStorage: params.authStorage,
 			sessionId: params.sessionId,
+			fetch: params.fetch,
 		});
 	}
 }

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

@@ -5,7 +5,7 @@
  * cleaned content.
  */
 
-import { type AuthStorage, getEnvApiKey } from "@oh-my-pi/pi-ai";
+import { type AuthStorage, type FetchImpl, getEnvApiKey } from "@oh-my-pi/pi-ai";
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
 import type { SearchParams } from "./base";
@@ -13,11 +13,13 @@ import { SearchProvider } from "./base";
 import { classifyProviderHttpError, withHardTimeout } from "./utils";
 
 const JINA_SEARCH_URL = "https://s.jina.ai";
+type SearchParamsWithFetch = SearchParams & { fetch?: FetchImpl };
 
 export interface JinaSearchParams {
 	query: string;
 	num_results?: number;
 	signal?: AbortSignal;
+	fetch?: FetchImpl;
 }
 
 interface JinaSearchResult {
@@ -34,9 +36,14 @@ export function findApiKey(): string | null {
 }
 
 /** Call Jina Reader search API. */
-async function callJinaSearch(apiKey: string, query: string, signal?: AbortSignal): Promise<JinaSearchResponse> {
+async function callJinaSearch(
+	apiKey: string,
+	query: string,
+	signal?: AbortSignal,
+	fetchImpl: FetchImpl = fetch,
+): Promise<JinaSearchResponse> {
 	const requestUrl = `${JINA_SEARCH_URL}/${encodeURIComponent(query)}`;
-	const response = await fetch(requestUrl, {
+	const response = await fetchImpl(requestUrl, {
 		headers: {
 			Accept: "application/json",
 			Authorization: `Bearer ${apiKey}`,
@@ -62,7 +69,7 @@ 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.signal);
+	const response = await callJinaSearch(apiKey, params.query, params.signal, params.fetch);
 	const sources: SearchSource[] = [];
 
 	for (const result of response) {
@@ -91,11 +98,14 @@ export class JinaProvider extends SearchProvider {
 		return !!findApiKey();
 	}
 
-	search(params: SearchParams): Promise<SearchResponse> {
+	search(params: SearchParamsWithFetch): Promise<SearchResponse> {
+		const fetchImpl = params.fetch;
+
 		return searchJina({
 			query: params.query,
 			num_results: params.numSearchResults ?? params.limit,
 			signal: params.signal,
+			fetch: fetchImpl,
 		});
 	}
 }

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

@@ -3,7 +3,7 @@
  *
  * Thin wrapper that adapts shared Kagi API utilities to SearchResponse shape.
  */
-import type { AuthStorage } from "@oh-my-pi/pi-ai";
+import type { AuthStorage, FetchImpl } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
 import { KagiApiError, searchWithKagi } from "../../kagi";
@@ -12,6 +12,8 @@ import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
 import { classifyProviderHttpError, toSearchSources } from "./utils";
 
+type SearchParamsWithFetch = SearchParams & { fetch?: FetchImpl };
+
 const DEFAULT_NUM_RESULTS = 10;
 const MAX_NUM_RESULTS = 40;
 
@@ -23,6 +25,7 @@ export async function searchKagi(params: {
 	signal?: AbortSignal;
 	authStorage: AuthStorage;
 	sessionId?: string;
+	fetch?: FetchImpl;
 }): Promise<SearchResponse> {
 	const numResults = clampNumResults(params.num_results, DEFAULT_NUM_RESULTS, MAX_NUM_RESULTS);
 
@@ -34,6 +37,7 @@ export async function searchKagi(params: {
 				recency: params.recency,
 				sessionId: params.sessionId,
 				signal: params.signal,
+				fetch: params.fetch,
 			},
 			params.authStorage,
 		);
@@ -66,7 +70,9 @@ export class KagiProvider extends SearchProvider {
 		return authStorage.hasAuth("kagi");
 	}
 
-	search(params: SearchParams): Promise<SearchResponse> {
+	search(params: SearchParamsWithFetch): Promise<SearchResponse> {
+		const fetchImpl = params.fetch;
+
 		return searchKagi({
 			query: params.query,
 			num_results: params.numSearchResults ?? params.limit,
@@ -74,6 +80,7 @@ export class KagiProvider extends SearchProvider {
 			signal: params.signal,
 			authStorage: params.authStorage,
 			sessionId: params.sessionId,
+			fetch: fetchImpl,
 		});
 	}
 }

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

@@ -4,7 +4,7 @@
  * Uses Moonshot Kimi Code search API to retrieve web results.
  * Endpoint: POST https://api.kimi.com/coding/v1/search
  */
-import { type ApiKey, type AuthStorage, withAuth } from "@oh-my-pi/pi-ai";
+import { type ApiKey, type AuthStorage, type FetchImpl, withAuth } from "@oh-my-pi/pi-ai";
 import { $env } from "@oh-my-pi/pi-utils";
 
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
@@ -14,6 +14,8 @@ import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
 import { classifyProviderHttpError, withHardTimeout } from "./utils";
 
+type SearchParamsWithFetch = SearchParams & { fetch?: FetchImpl };
+
 const KIMI_SEARCH_URL = "https://api.kimi.com/coding/v1/search";
 
 const DEFAULT_NUM_RESULTS = 10;
@@ -27,6 +29,7 @@ export interface KimiSearchParams {
 	signal?: AbortSignal;
 	authStorage: AuthStorage;
 	sessionId?: string;
+	fetch?: FetchImpl;
 }
 
 interface KimiSearchResult {
@@ -78,9 +81,16 @@ async function resolveKey(
 
 async function callKimiSearch(
 	apiKey: string,
-	params: { query: string; limit: number; includeContent: boolean; signal?: AbortSignal },
+	params: {
+		query: string;
+		limit: number;
+		includeContent: boolean;
+		signal?: AbortSignal;
+		fetch?: FetchImpl;
+	},
 ): Promise<{ response: KimiSearchResponse; requestId?: string }> {
-	const response = await fetch(resolveBaseUrl(), {
+	const fetchImpl = params.fetch ?? fetch;
+	const response = await fetchImpl(resolveBaseUrl(), {
 		method: "POST",
 		headers: {
 			Accept: "application/json",
@@ -130,6 +140,7 @@ export async function searchKimi(params: KimiSearchParams): Promise<SearchRespon
 				limit,
 				includeContent: params.include_content ?? false,
 				signal: params.signal,
+				fetch: params.fetch,
 			}),
 		{ signal: params.signal },
 	);
@@ -170,13 +181,16 @@ export class KimiProvider extends SearchProvider {
 		);
 	}
 
-	search(params: SearchParams): Promise<SearchResponse> {
+	search(params: SearchParamsWithFetch): Promise<SearchResponse> {
+		const fetchImpl = params.fetch;
+
 		return searchKimi({
 			query: params.query,
 			num_results: params.numSearchResults ?? params.limit,
 			signal: params.signal,
 			authStorage: params.authStorage,
 			sessionId: params.sessionId,
+			fetch: fetchImpl,
 		});
 	}
 }

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

@@ -1,4 +1,4 @@
-import { type ApiKey, type AuthStorage, getEnvApiKey, withAuth } from "@oh-my-pi/pi-ai";
+import { type ApiKey, type AuthStorage, type FetchImpl, getEnvApiKey, withAuth } from "@oh-my-pi/pi-ai";
 import type { SearchResponse } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
 import { ParallelApiError, type ParallelSearchResult, type ParallelSearchSource } from "../../parallel";
@@ -112,6 +112,7 @@ async function searchWithAuthStorage(
 	queries: string[],
 	params: {
 		signal?: AbortSignal;
+		fetch?: FetchImpl;
 	},
 	authStorage: AuthStorage,
 	sessionId?: string,
@@ -131,7 +132,7 @@ async function searchWithAuthStorage(
 	return withAuth(
 		keyOrResolver,
 		async key => {
-			const response = await fetch(PARALLEL_SEARCH_URL, {
+			const response = await (params.fetch ?? fetch)(PARALLEL_SEARCH_URL, {
 				method: "POST",
 				headers: {
 					Accept: "application/json",
@@ -165,6 +166,7 @@ export async function searchParallel(
 		query: string;
 		num_results?: number;
 		signal?: AbortSignal;
+		fetch?: FetchImpl;
 	},
 	authStorage: AuthStorage,
 	sessionId?: string,
@@ -177,6 +179,7 @@ export async function searchParallel(
 			[params.query],
 			{
 				signal: params.signal,
+				fetch: params.fetch,
 			},
 			authStorage,
 			sessionId,
@@ -213,6 +216,7 @@ export class ParallelProvider extends SearchProvider {
 				query: params.query,
 				num_results: params.numSearchResults ?? params.limit,
 				signal: params.signal,
+				fetch: params.fetch,
 			},
 			params.authStorage,
 			params.sessionId,

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

@@ -8,7 +8,7 @@
  * - Anonymous via `www.perplexity.ai/rest/sse/perplexity_ask`
  */
 
-import { type AuthStorage, getEnvApiKey } from "@oh-my-pi/pi-ai";
+import { type AuthStorage, type FetchImpl, getEnvApiKey } from "@oh-my-pi/pi-ai";
 import { $env, readSseJson } from "@oh-my-pi/pi-utils";
 import type {
 	PerplexityMessageOutput,
@@ -275,6 +275,7 @@ export interface PerplexitySearchParams {
 	num_search_results?: number;
 	authStorage: AuthStorage;
 	sessionId?: string;
+	fetch?: FetchImpl;
 }
 
 /** Find PERPLEXITY_API_KEY from environment or .env files (also checks PPLX_API_KEY) */
@@ -356,9 +357,10 @@ async function findPerplexityAuth(
 async function callPerplexityApi(
 	apiKey: string,
 	request: PerplexityRequest,
+	fetchImpl: FetchImpl | undefined,
 	signal?: AbortSignal,
 ): Promise<PerplexityResponse> {
-	const response = await fetch(PERPLEXITY_API_URL, {
+	const response = await (fetchImpl ?? fetch)(PERPLEXITY_API_URL, {
 		method: "POST",
 		headers: {
 			Authorization: `Bearer ${apiKey}`,
@@ -505,7 +507,7 @@ async function callPerplexityAsk(
 		requestParams.source = "default";
 	}
 
-	const response = await fetch(PERPLEXITY_OAUTH_ASK_URL, {
+	const response = await (params.fetch ?? fetch)(PERPLEXITY_OAUTH_ASK_URL, {
 		method: "POST",
 		headers,
 		body: JSON.stringify({
@@ -686,7 +688,7 @@ export async function searchPerplexity(params: PerplexitySearchParams): Promise<
 		request.search_recency_filter = params.search_recency_filter;
 	}
 
-	const response = await callPerplexityApi(auth.token, request, params.signal);
+	const response = await callPerplexityApi(auth.token, request, params.fetch, params.signal);
 	const result = parseResponse(response);
 	result.authMode = "api_key";
 	return applySourceLimit(result, params.num_results);
@@ -722,6 +724,7 @@ export class PerplexityProvider extends SearchProvider {
 			num_results: params.limit,
 			authStorage: params.authStorage,
 			sessionId: params.sessionId,
+			fetch: params.fetch,
 		});
 	}
 }

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

@@ -25,7 +25,7 @@
  * Reference: https://docs.searxng.org/dev/search_api.html
  */
 
-import type { AuthStorage } from "@oh-my-pi/pi-ai";
+import type { AuthStorage, FetchImpl } from "@oh-my-pi/pi-ai";
 
 import { settings } from "../../../config/settings";
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
@@ -207,12 +207,13 @@ async function callSearXNGSearch(
 		categories?: string;
 		language?: string;
 		signal?: AbortSignal;
+		fetch?: FetchImpl;
 	},
 	auth: SearXNGAuth | null,
 ): Promise<SearXNGResponse> {
 	const { url, headers } = buildRequest(endpoint, params, auth);
 
-	const response = await fetch(url, {
+	const response = await (params.fetch ?? fetch)(url, {
 		headers,
 		signal: withHardTimeout(params.signal),
 	});
@@ -233,6 +234,7 @@ export async function searchSearXNG(params: {
 	num_results?: number;
 	recency?: "day" | "week" | "month" | "year";
 	signal?: AbortSignal;
+	fetch?: FetchImpl;
 }): Promise<SearchResponse> {
 	const numResults = clampNumResults(params.num_results, DEFAULT_NUM_RESULTS, MAX_NUM_RESULTS);
 
@@ -260,6 +262,7 @@ export async function searchSearXNG(params: {
 			...params,
 			categories,
 			language,
+			fetch: params.fetch,
 		},
 		auth,
 	);
@@ -304,6 +307,7 @@ export class SearXNGProvider extends SearchProvider {
 			num_results: params.numSearchResults ?? params.limit,
 			recency: params.recency,
 			signal: params.signal,
+			fetch: params.fetch,
 		});
 	}
 }

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

@@ -5,13 +5,15 @@
  * Endpoint: POST https://api.synthetic.new/v2/search
  */
 
-import { type ApiKey, type AuthStorage, getEnvApiKey, withAuth } from "@oh-my-pi/pi-ai";
+import { type ApiKey, type AuthStorage, type FetchImpl, getEnvApiKey, withAuth } from "@oh-my-pi/pi-ai";
 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";
 
+type SearchParamsWithFetch = SearchParams & { fetch?: FetchImpl };
+
 const SYNTHETIC_SEARCH_URL = "https://api.synthetic.new/v2/search";
 
 interface SyntheticSearchResult {
@@ -39,8 +41,9 @@ async function callSyntheticSearch(
 	apiKey: string,
 	query: string,
 	signal?: AbortSignal,
+	fetchImpl: FetchImpl = fetch,
 ): Promise<SyntheticSearchResponse> {
-	const response = await fetch(SYNTHETIC_SEARCH_URL, {
+	const response = await fetchImpl(SYNTHETIC_SEARCH_URL, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -65,12 +68,13 @@ async function callSyntheticSearch(
 }
 
 /** Execute Synthetic web search. */
-export async function searchSynthetic(params: SearchParams): Promise<SearchResponse> {
+export async function searchSynthetic(params: SearchParamsWithFetch): Promise<SearchResponse> {
 	const keyOrResolver: ApiKey = params.authStorage.resolver("synthetic", {
 		sessionId: params.sessionId,
 	});
 
-	const data = await withAuth(keyOrResolver, key => callSyntheticSearch(key, params.query, params.signal), {
+	const fetchImpl = params.fetch;
+	const data = await withAuth(keyOrResolver, key => callSyntheticSearch(key, params.query, params.signal, fetchImpl), {
 		signal: params.signal,
 		missingKeyMessage: "Synthetic credentials not found. Set SYNTHETIC_API_KEY or login with 'omp /login synthetic'.",
 	});
@@ -104,7 +108,7 @@ export class SyntheticProvider extends SearchProvider {
 		return authStorage.hasAuth("synthetic") || !!getEnvApiKey("synthetic");
 	}
 
-	search(params: SearchParams): Promise<SearchResponse> {
+	search(params: SearchParamsWithFetch): Promise<SearchResponse> {
 		return searchSynthetic(params);
 	}
 }

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

@@ -4,7 +4,7 @@
  * Uses Tavily's agent-focused search API to return structured results with an
  * optional synthesized answer.
  */
-import { type ApiKey, type AuthStorage, getEnvApiKey, withAuth } from "@oh-my-pi/pi-ai";
+import { type ApiKey, type AuthStorage, type FetchImpl, getEnvApiKey, withAuth } from "@oh-my-pi/pi-ai";
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
 import { clampNumResults, dateToAgeSeconds } from "../utils";
@@ -21,6 +21,7 @@ export interface TavilySearchParams {
 	num_results?: number;
 	recency?: "day" | "week" | "month" | "year";
 	signal?: AbortSignal;
+	fetch?: FetchImpl;
 }
 
 interface TavilySearchResult {
@@ -89,7 +90,7 @@ export function buildRequestBody(params: TavilySearchParams): Record<string, unk
 }
 
 async function callTavilySearch(apiKey: string, params: TavilySearchParams): Promise<TavilySearchResponse> {
-	const response = await fetch(TAVILY_SEARCH_URL, {
+	const response = await (params.fetch ?? fetch)(TAVILY_SEARCH_URL, {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/json",
@@ -126,6 +127,7 @@ export async function searchTavily(params: SearchParams): Promise<SearchResponse
 		num_results: params.numSearchResults ?? params.limit,
 		recency: params.recency,
 		signal: params.signal,
+		fetch: params.fetch,
 	};
 	const keyOrResolver: ApiKey = params.authStorage.resolver("tavily", {
 		sessionId: params.sessionId,