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

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

@@ -34,6 +34,7 @@ export interface TinyFishSearchParams {
 	recency?: SearchParams["recency"];
 	page?: number;
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	fetch?: FetchImpl;
 }
 
@@ -78,7 +79,7 @@ async function callTinyFishSearch(apiKey: string, params: TinyFishSearchParams):
 			Accept: "application/json",
 			"X-API-Key": apiKey,
 		},
-		signal: withHardTimeout(params.signal),
+		signal: withHardTimeout(params.signal, params.timeoutMs),
 	});
 
 	if (!response.ok) {
@@ -117,6 +118,7 @@ export async function searchTinyFish(params: SearchParams): Promise<SearchRespon
 		num_results: pageSize,
 		recency: params.recency,
 		signal: params.signal,
+		timeoutMs: params.timeoutMs,
 		fetch: params.fetch,
 	};
 	const keyOrResolver: ApiKey = params.authStorage.resolver("tinyfish", {

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

@@ -1,5 +1,10 @@
 import type { AgentStorage } from "../../../session/agent-storage";
-import { SearchProviderError, type SearchProviderId, type SearchSource } from "../../../web/search/types";
+import {
+	DEFAULT_WEB_SEARCH_TIMEOUT_SECONDS,
+	SearchProviderError,
+	type SearchProviderId,
+	type SearchSource,
+} from "../../../web/search/types";
 import { dateToAgeSeconds } from "../utils";
 
 /**
@@ -44,16 +49,13 @@ export function findCredential(
 }
 
 /**
- * Default hard ceiling for a single web-search round-trip. 60s tolerates
- * legitimate slow LLM-mediated responses (anthropic web_search_20250305,
- * perplexity, gemini, codex) while still guaranteeing the session unfreezes
- * within a minute if Bun's `AbortSignal` fails to propagate on Windows.
- *
- * Pure search APIs (brave, exa, jina, tavily, searxng, synthetic, zai)
- * settle far faster in practice; reusing the same ceiling keeps the wiring
- * uniform without compromising correctness.
+ * The 60-second default tolerates legitimate slow LLM-mediated responses
+ * (Anthropic web_search_20250305, Perplexity, Gemini, Codex) while bounding
+ * Windows stalls when Bun's `AbortSignal` fails to propagate. Callers may
+ * configure a longer provider deadline, capped at five minutes by the
+ * dispatcher; pure search APIs typically settle far faster.
  */
-export const SEARCH_HARD_TIMEOUT_MS = 60_000;
+export const SEARCH_HARD_TIMEOUT_MS = DEFAULT_WEB_SEARCH_TIMEOUT_SECONDS * 1_000;
 
 /**
  * Compose a caller-supplied {@link AbortSignal} with a hard timeout so an

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

@@ -14,7 +14,7 @@ const XAI_WEB_SEARCH_MODEL = "grok-4.5";
 // grok-4.5 defaults reasoning.effort to "high"; xAI documents "low" for
 // latency-sensitive agentic use and simple tool calling
 // (docs.x.ai/developers/model-capabilities/text/reasoning). Web search is
-// exactly that and runs under a 60s hard timeout, so pin the search calls low.
+// latency-sensitive, so pin these calls low regardless of their configured timeout.
 const XAI_WEB_SEARCH_REASONING_EFFORT = "low";
 const DEFAULT_NUM_RESULTS = 10;
 const MAX_NUM_RESULTS = 30;
@@ -139,7 +139,7 @@ async function postXAIResponses(
 			Authorization: `Bearer ${apiKey}`,
 		},
 		body: JSON.stringify(body),
-		signal: withHardTimeout(params.signal),
+		signal: withHardTimeout(params.signal, params.timeoutMs),
 	});
 }
 

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

@@ -38,6 +38,7 @@ export interface ZaiSearchParams {
 	query: string;
 	num_results?: number;
 	signal?: AbortSignal;
+	timeoutMs?: number;
 	fetch?: FetchImpl;
 	authStorage: AuthStorage;
 	sessionId?: string;
@@ -121,6 +122,7 @@ async function postZaiMcp(
 	signal: AbortSignal | undefined,
 	fetchImpl: FetchImpl,
 	expectResponse: boolean,
+	timeoutMs?: number,
 ): Promise<ZaiMcpPostResult> {
 	const headers: Record<string, string> = {
 		Authorization: `Bearer ${apiKey}`,
@@ -144,7 +146,7 @@ async function postZaiMcp(
 		method: "POST",
 		headers,
 		body: JSON.stringify(body),
-		signal: withHardTimeout(signal),
+		signal: withHardTimeout(signal, timeoutMs),
 	});
 
 	if (!response.ok) {
@@ -211,6 +213,7 @@ async function callZaiTool(
 	args: Record<string, unknown>,
 	signal: AbortSignal | undefined,
 	fetchImpl: FetchImpl,
+	timeoutMs?: number,
 ): Promise<unknown> {
 	const initialized = await postZaiMcp(
 		apiKey,
@@ -224,12 +227,22 @@ async function callZaiTool(
 		signal,
 		fetchImpl,
 		true,
+		timeoutMs,
 	);
 	if (initialized.parsed !== undefined) {
 		readJsonRpcPayload(initialized.parsed);
 	}
 
-	await postZaiMcp(apiKey, "notifications/initialized", {}, initialized.sessionId, signal, fetchImpl, false);
+	await postZaiMcp(
+		apiKey,
+		"notifications/initialized",
+		{},
+		initialized.sessionId,
+		signal,
+		fetchImpl,
+		false,
+		timeoutMs,
+	);
 
 	const toolCall = await postZaiMcp(
 		apiKey,
@@ -242,6 +255,7 @@ async function callZaiTool(
 		signal,
 		fetchImpl,
 		true,
+		timeoutMs,
 	);
 	const payload = readJsonRpcPayload(toolCall.parsed);
 	const resultRecord = isRecord(payload.result) ? payload.result : null;
@@ -279,7 +293,7 @@ async function callZaiSearch(apiKey: string, params: ZaiSearchParams): Promise<u
 	let lastError: unknown;
 	for (let i = 0; i < attempts.length; i++) {
 		try {
-			return await callZaiTool(apiKey, attempts[i], params.signal, fetchImpl);
+			return await callZaiTool(apiKey, attempts[i], params.signal, fetchImpl, params.timeoutMs);
 		} catch (error) {
 			lastError = error;
 			const isLastAttempt = i === attempts.length - 1;
@@ -429,6 +443,7 @@ export class ZaiProvider extends SearchProvider {
 			query: parsed.hasDirectives ? formatQuery(parsed, ZAI_QUERY_SYNTAX) : params.query,
 			num_results: params.numSearchResults ?? params.limit,
 			signal: params.signal,
+			timeoutMs: params.timeoutMs,
 			authStorage: params.authStorage,
 			sessionId: params.sessionId,
 			fetch: fetchOverride,

package/src/web/search/types.ts

@@ -89,6 +89,12 @@ export const SEARCH_PROVIDER_OPTIONS = [
 	},
 ] as const;
 
+/** Default hard timeout for each web-search provider transport. */
+export const DEFAULT_WEB_SEARCH_TIMEOUT_SECONDS = 60;
+
+/** Maximum configurable hard timeout for each web-search provider transport. */
+export const MAX_WEB_SEARCH_TIMEOUT_SECONDS = 300;
+
 /** Supported web search providers (every option except `auto`). */
 export type SearchProviderId = Exclude<(typeof SEARCH_PROVIDER_OPTIONS)[number]["value"], "auto">;