@oh-my-pi/pi-coding-agent 16.1.13 → 16.1.15

package/src/web/parallel.ts

@@ -3,9 +3,9 @@ import type { AgentStorage } from "../session/agent-storage";
 import { findCredential, withHardTimeout } from "./search/providers/utils";
 
 const PARALLEL_API_URL = "https://api.parallel.ai";
-const PARALLEL_SEARCH_URL = `${PARALLEL_API_URL}/v1beta/search`;
+export const PARALLEL_SEARCH_URL = `${PARALLEL_API_URL}/v1beta/search`;
 const PARALLEL_EXTRACT_URL = `${PARALLEL_API_URL}/v1beta/extract`;
-const PARALLEL_BETA_HEADER = "search-extract-2025-10-10";
+export const PARALLEL_BETA_HEADER = "search-extract-2025-10-10";
 
 export interface ParallelUsageItem {
 	name?: string;
@@ -76,22 +76,6 @@ export class ParallelApiError extends Error {
 	}
 }
 
-export function findParallelApiKey(storage: AgentStorage | null | undefined): string | null {
-	return findCredential(storage, getEnvApiKey("parallel"), "parallel");
-}
-
-export function getParallelExtractContent(document: ParallelExtractDocument): string {
-	const excerptContent = document.excerpts
-		.filter(excerpt => excerpt.trim().length > 0)
-		.join("\n\n")
-		.trim();
-	if (excerptContent.length > 0) {
-		return excerptContent;
-	}
-
-	return document.fullContent?.trim() ?? "";
-}
-
 function isObject(value: unknown): value is object {
 	return typeof value === "object" && value !== null;
 }
@@ -148,7 +132,7 @@ function createParallelApiError(statusCode: number, detail?: string): ParallelAp
 	);
 }
 
-function parseParallelErrorResponse(statusCode: number, responseText: string): ParallelApiError {
+export function parseParallelErrorResponse(statusCode: number, responseText: string): ParallelApiError {
 	const trimmedResponseText = responseText.trim();
 	if (trimmedResponseText.length === 0) {
 		return createParallelApiError(statusCode);
@@ -176,24 +160,6 @@ function getAuthHeaders(apiKey: string): {
 	};
 }
 
-function normalizeSearchMode(mode: ParallelSearchOptions["mode"]): "fast" | "one-shot" {
-	return mode === "research" ? "one-shot" : "fast";
-}
-
-function parseUsageItems(payload: unknown): ParallelUsageItem[] {
-	if (!Array.isArray(payload)) return [];
-
-	const usageItems: ParallelUsageItem[] = [];
-	for (const item of payload) {
-		if (!isObject(item)) continue;
-		usageItems.push({
-			name: getString(item, "name"),
-			count: getNumber(item, "count"),
-		});
-	}
-	return usageItems;
-}
-
 function parseWarnings(payload: unknown): string[] {
 	if (!Array.isArray(payload)) return [];
 
@@ -212,7 +178,24 @@ function parseWarnings(payload: unknown): string[] {
 	return warnings;
 }
 
-function parseSearchPayload(payload: unknown): ParallelSearchResult {
+function parseUsageItems(payload: unknown): ParallelUsageItem[] {
+	if (!Array.isArray(payload)) return [];
+
+	const usageItems: ParallelUsageItem[] = [];
+	for (const item of payload) {
+		if (!isObject(item)) continue;
+		usageItems.push({
+			name: getString(item, "name"),
+			count: getNumber(item, "count"),
+		});
+	}
+	return usageItems;
+}
+
+export function parseParallelSearchPayload(
+	payload: unknown,
+	options?: { parseMetadata?: boolean },
+): ParallelSearchResult {
 	if (!isObject(payload)) {
 		throw new ParallelApiError("Parallel search returned an invalid response payload.");
 	}
@@ -236,14 +219,32 @@ function parseSearchPayload(payload: unknown): ParallelSearchResult {
 		});
 	}
 
+	const parseMetadata = options?.parseMetadata ?? true;
+
 	return {
 		requestId,
 		sources,
-		warnings: parseWarnings(getOwnValue(payload, "warnings")),
-		usage: parseUsageItems(getOwnValue(payload, "usage")),
+		warnings: parseMetadata ? parseWarnings(getOwnValue(payload, "warnings")) : [],
+		usage: parseMetadata ? parseUsageItems(getOwnValue(payload, "usage")) : [],
 	};
 }
 
+export function findParallelApiKey(storage: AgentStorage | null | undefined): string | null {
+	return findCredential(storage, getEnvApiKey("parallel"), "parallel");
+}
+
+export function getParallelExtractContent(document: ParallelExtractDocument): string {
+	const excerptContent = document.excerpts
+		.filter(excerpt => excerpt.trim().length > 0)
+		.join("\n\n")
+		.trim();
+	if (excerptContent.length > 0) {
+		return excerptContent;
+	}
+
+	return document.fullContent?.trim() ?? "";
+}
+
 function parseExtractPayload(payload: unknown): ParallelExtractResult {
 	if (!isObject(payload)) {
 		throw new ParallelApiError("Parallel extract returned an invalid response payload.");
@@ -304,7 +305,7 @@ export async function searchWithParallel(
 		body: JSON.stringify({
 			objective,
 			search_queries: queries,
-			mode: normalizeSearchMode(options.mode),
+			mode: options.mode === "research" ? "one-shot" : "fast",
 			excerpts: {
 				max_chars_per_result: options.maxCharsPerResult ?? 10_000,
 			},
@@ -316,7 +317,7 @@ export async function searchWithParallel(
 	}
 
 	const payload: unknown = await response.json();
-	return parseSearchPayload(payload);
+	return parseParallelSearchPayload(payload);
 }
 
 export async function extractWithParallel(

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

@@ -1,7 +1,14 @@
 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";
+import {
+	PARALLEL_BETA_HEADER,
+	PARALLEL_SEARCH_URL,
+	ParallelApiError,
+	type ParallelSearchResult,
+	parseParallelErrorResponse,
+	parseParallelSearchPayload,
+} from "../../parallel";
 import { clampNumResults } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
@@ -9,103 +16,6 @@ import { classifyProviderHttpError, toSearchSources, withHardTimeout } from "./u
 
 const DEFAULT_NUM_RESULTS = 10;
 const MAX_NUM_RESULTS = 40;
-const PARALLEL_SEARCH_URL = "https://api.parallel.ai/v1beta/search";
-const PARALLEL_BETA_HEADER = "search-extract-2025-10-10";
-
-function isObject(value: unknown): value is object {
-	return typeof value === "object" && value !== null;
-}
-
-function getOwnValue(value: object, key: string): unknown {
-	return Object.getOwnPropertyDescriptor(value, key)?.value;
-}
-
-function getString(value: object, key: string): string | undefined {
-	const field = getOwnValue(value, key);
-	return typeof field === "string" ? field : undefined;
-}
-
-function getObjectArray(value: object, key: string): object[] {
-	const field = getOwnValue(value, key);
-	return Array.isArray(field) ? field.filter(isObject) : [];
-}
-
-function getStringArray(value: object, key: string): string[] {
-	const field = getOwnValue(value, key);
-	return Array.isArray(field) ? field.filter((item): item is string => typeof item === "string") : [];
-}
-
-function extractParallelErrorMessage(payload: unknown): string | null {
-	if (!isObject(payload)) return null;
-
-	const directMessage = getString(payload, "message") ?? getString(payload, "detail") ?? getString(payload, "error");
-	if (directMessage && directMessage.trim().length > 0) {
-		return directMessage.trim();
-	}
-
-	const errorObject = getOwnValue(payload, "error");
-	if (isObject(errorObject)) {
-		const nestedMessage = getString(errorObject, "message") ?? getString(errorObject, "detail");
-		if (nestedMessage && nestedMessage.trim().length > 0) {
-			return nestedMessage.trim();
-		}
-	}
-
-	return null;
-}
-
-function createParallelApiError(statusCode: number, detail?: string): ParallelApiError {
-	return new ParallelApiError(
-		detail ? `Parallel API error (${statusCode}): ${detail}` : `Parallel API error (${statusCode})`,
-		statusCode,
-	);
-}
-
-function parseParallelErrorResponse(statusCode: number, responseText: string): ParallelApiError {
-	const trimmedResponseText = responseText.trim();
-	if (trimmedResponseText.length === 0) {
-		return createParallelApiError(statusCode);
-	}
-
-	try {
-		const payload: unknown = JSON.parse(trimmedResponseText);
-		return createParallelApiError(statusCode, extractParallelErrorMessage(payload) ?? trimmedResponseText);
-	} catch {
-		return createParallelApiError(statusCode, trimmedResponseText);
-	}
-}
-
-function parseSearchPayload(payload: unknown): ParallelSearchResult {
-	if (!isObject(payload)) {
-		throw new ParallelApiError("Parallel search returned an invalid response payload.");
-	}
-
-	const requestId = getString(payload, "search_id") ?? "";
-	const rawResults = getObjectArray(payload, "results");
-	const sources: ParallelSearchSource[] = [];
-
-	for (const item of rawResults) {
-		const url = getString(item, "url");
-		if (!url) continue;
-
-		const excerpts = getStringArray(item, "excerpts");
-		const snippet = excerpts.length > 0 ? excerpts.join("\n\n") : undefined;
-		sources.push({
-			title: getString(item, "title") ?? url,
-			url,
-			snippet,
-			publishedDate: getString(item, "publish_date"),
-			excerpts,
-		});
-	}
-
-	return {
-		requestId,
-		sources,
-		warnings: [],
-		usage: [],
-	};
-}
 
 async function searchWithAuthStorage(
 	objective: string,
@@ -150,12 +60,13 @@ async function searchWithAuthStorage(
 				}),
 				signal: withHardTimeout(params.signal),
 			});
+
 			if (!response.ok) {
 				throw parseParallelErrorResponse(response.status, await response.text());
 			}
 
 			const payload: unknown = await response.json();
-			return parseSearchPayload(payload);
+			return parseParallelSearchPayload(payload, { parseMetadata: false });
 		},
 		{ signal: params.signal },
 	);

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

@@ -833,16 +833,28 @@ export class PerplexityProvider extends SearchProvider {
 	readonly id = "perplexity";
 	readonly label = "Perplexity";
 
+	/**
+	 * Auto-chain admission. Requires a direct Perplexity credential
+	 * (`PERPLEXITY_COOKIES`, OAuth session, or `PERPLEXITY_API_KEY`).
+	 *
+	 * OpenRouter auth is intentionally NOT accepted here: silently using
+	 * OpenRouter's `perplexity/sonar-pro` whenever any OpenRouter key is
+	 * configured surprises users (and bills them) for a path they never
+	 * asked for. The auto chain skips Perplexity in that case and falls
+	 * through to the next configured provider. Users who DO want the
+	 * OpenRouter-backed Perplexity path can still opt in by setting
+	 * `webSearch: perplexity` explicitly — see {@link isExplicitlyAvailable}.
+	 */
 	isAvailable(authStorage: AuthStorage): boolean {
-		return (
-			!!$env.PERPLEXITY_COOKIES?.trim() || authStorage.hasAuth("perplexity") || authStorage.hasAuth("openrouter")
-		);
+		return !!$env.PERPLEXITY_COOKIES?.trim() || authStorage.hasAuth("perplexity");
 	}
 
 	/**
-	 * Perplexity accepts anonymous browser-style ask requests, but keep auto
-	 * provider selection credential-gated so a configured provider keeps priority
-	 * over the anonymous fallback.
+	 * Perplexity accepts anonymous browser-style ask requests, and the
+	 * OpenRouter-backed `perplexity/sonar-pro` path is opt-in through
+	 * explicit selection. Keep auto-chain admission credential-gated so a
+	 * configured provider keeps priority over the anonymous/OpenRouter
+	 * fallbacks.
 	 */
 	isExplicitlyAvailable(_authStorage: AuthStorage): boolean {
 		return true;