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

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

@@ -1,6 +1,6 @@
 import { getAgentDbPath } from "@oh-my-pi/pi-utils";
 import { AgentStorage } from "../../../session/agent-storage";
-import type { SearchSource } from "../../../web/search/types";
+import { SearchProviderError, type SearchProviderId, type SearchSource } from "../../../web/search/types";
 import { dateToAgeSeconds } from "../utils";
 
 /**
@@ -49,6 +49,36 @@ export async function isApiKeyAvailable(findApiKey: () => string | null | Promis
 	}
 }
 
+/**
+ * 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.
+ */
+export const SEARCH_HARD_TIMEOUT_MS = 60_000;
+
+/**
+ * Compose a caller-supplied {@link AbortSignal} with a hard timeout so an
+ * outbound `fetch()` is guaranteed to settle within `ms` even when the
+ * runtime fails to propagate cancellation to the underlying transport.
+ *
+ * Bun's WinHTTP backend on Windows is known to ignore `AbortSignal` once a
+ * TCP/TLS connection stalls (oven-sh/bun#15275, oven-sh/bun#18536); without
+ * this safety net a stalled web-search request freezes the entire session
+ * because the user's Esc is never delivered to the native layer.
+ *
+ * @param signal - Caller cancellation signal, if any.
+ * @param ms - Hard timeout in milliseconds. Defaults to {@link SEARCH_HARD_TIMEOUT_MS}.
+ */
+export function withHardTimeout(signal: AbortSignal | undefined, ms: number = SEARCH_HARD_TIMEOUT_MS): AbortSignal {
+	const timeout = AbortSignal.timeout(ms);
+	return signal ? AbortSignal.any([signal, timeout]) : timeout;
+}
+
 /**
  * Map a provider's raw source list to the unified SearchSource shape,
  * clamped to the requested result count and annotated with ageSeconds.
@@ -70,3 +100,35 @@ export function toSearchSources(
 		ageSeconds: dateToAgeSeconds(source.publishedDate),
 	}));
 }
+
+/**
+ * Quota/auth signals across providers. Telemetry on 15.1.7/15.1.8 showed users
+ * hitting credit-exhaustion and 401/402/403 responses that were surfaced as
+ * raw HTTP error text. Map those into compact, provider-tagged messages so
+ * the orchestrator can chain-advance cleanly and the final summary stays
+ * legible when every provider rejects the request.
+ *
+ * Returns `null` when the response does not match a known quota/auth signal,
+ * leaving the caller to throw its provider-specific fallback error.
+ */
+const CREDIT_BODY_PATTERN = /credits?\s*(?:exhausted|exceeded)|quota|insufficient/i;
+
+export function classifyProviderHttpError(
+	provider: SearchProviderId,
+	status: number,
+	body: string,
+): SearchProviderError | null {
+	if (CREDIT_BODY_PATTERN.test(body)) {
+		return new SearchProviderError(provider, `${provider}: credits exhausted`, status);
+	}
+	if (status === 402) {
+		return new SearchProviderError(provider, `${provider}: 402 credits exhausted`, status);
+	}
+	if (status === 401) {
+		return new SearchProviderError(provider, `${provider}: 401 unauthorized`, status);
+	}
+	if (status === 403) {
+		return new SearchProviderError(provider, `${provider}: 403 forbidden`, status);
+	}
+	return null;
+}

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

@@ -11,7 +11,7 @@ import { SearchProviderError } from "../../../web/search/types";
 import { 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 ZAI_MCP_URL = "https://api.z.ai/api/mcp/web_search_prime/mcp";
 const ZAI_TOOL_NAME = "web_search_prime";
@@ -73,11 +73,13 @@ async function callZaiTool(apiKey: string, args: Record<string, unknown>, signal
 				arguments: args,
 			},
 		}),
-		signal,
+		signal: withHardTimeout(signal),
 	});
 
 	if (!response.ok) {
 		const errorText = await response.text();
+		const classified = classifyProviderHttpError("zai", response.status, errorText);
+		if (classified) throw classified;
 		throw new SearchProviderError("zai", `Z.AI MCP error (${response.status}): ${errorText}`, response.status);
 	}