@oh-my-pi/pi-coding-agent 15.8.3 → 15.9.1

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

@@ -8,6 +8,7 @@
  */
 import { type AuthStorage, getEnvApiKey } from "@oh-my-pi/pi-ai";
 import { settings } from "../../../config/settings";
+import { callExaTool, findApiKey, isSearchResponse } from "../../../exa/mcp-client";
 
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
@@ -56,6 +57,71 @@ interface ExaSearchResponse {
 	costDollars?: { total: number };
 	searchTime?: number;
 }
+function asRecord(value: unknown): Record<string, unknown> | null {
+	if (typeof value !== "object" || value === null) return null;
+	return value as Record<string, unknown>;
+}
+
+function parseOptionalField(section: string, label: string): string | null | undefined {
+	const regex = new RegExp(`(?:^|\\n)${label}:\\s*([^\\n]*)`);
+	const match = section.match(regex);
+	if (!match) return undefined;
+	const value = match[1].trim();
+	return value.length > 0 ? value : null;
+}
+
+function parseTextField(section: string): string | null | undefined {
+	const match = section.match(/(?:^|\n)Text:\s*([\s\S]*)$/);
+	if (!match) return undefined;
+	const value = match[1].trim();
+	return value.length > 0 ? value : null;
+}
+
+function parseExaMcpTextPayload(payload: unknown): ExaSearchResponse | null {
+	const root = asRecord(payload);
+	if (!root) return null;
+
+	const content = root.content;
+	if (!Array.isArray(content)) return null;
+
+	const textBlocks = content
+		.map(item => {
+			const part = asRecord(item);
+			const text = typeof part?.text === "string" ? part.text : "";
+			return text.replace(/\r\n?/g, "\n").trim();
+		})
+		.filter(text => text.length > 0);
+
+	if (textBlocks.length === 0) return null;
+
+	const sections = textBlocks
+		.join("\n\n")
+		.split(/\n{2,}(?=Title:\s*[^\n]*(?:\n(?:URL|Author|Published Date|Text):))/)
+		.map(section => section.trim())
+		.filter(section => section.startsWith("Title:"));
+
+	const results: ExaSearchResult[] = [];
+	for (const section of sections) {
+		const title = parseOptionalField(section, "Title");
+		const url = parseOptionalField(section, "URL");
+		const author = parseOptionalField(section, "Author");
+		const publishedDate = parseOptionalField(section, "Published Date");
+		const text = parseTextField(section);
+
+		if (!title && !url && !text) continue;
+
+		results.push({
+			title: title ?? undefined,
+			url: url ?? undefined,
+			author: author ?? undefined,
+			publishedDate: publishedDate ?? undefined,
+			text: text ?? undefined,
+		});
+	}
+
+	if (results.length === 0) return null;
+	return { results };
+}
 
 export function normalizeSearchType(type: ExaSearchParamType | undefined): ExaSearchType {
 	if (!type) return "auto";
@@ -133,6 +199,32 @@ async function callExaSearch(apiKey: string, params: ExaSearchParams): Promise<E
 
 	return response.json() as Promise<ExaSearchResponse>;
 }
+function buildExaMcpArgs(params: ExaSearchParams): Record<string, unknown> {
+	const args: Record<string, unknown> = { query: params.query };
+	if (params.num_results !== undefined) args.num_results = params.num_results;
+	if (params.type !== undefined) args.type = params.type;
+	if (params.include_domains !== undefined) args.include_domains = params.include_domains;
+	if (params.exclude_domains !== undefined) args.exclude_domains = params.exclude_domains;
+	if (params.start_published_date !== undefined) args.start_published_date = params.start_published_date;
+	if (params.end_published_date !== undefined) args.end_published_date = params.end_published_date;
+	return args;
+}
+
+async function callExaMcpSearch(params: ExaSearchParams): Promise<ExaSearchResponse> {
+	const response = await callExaTool("web_search_exa", buildExaMcpArgs(params), findApiKey(), {
+		signal: withHardTimeout(params.signal),
+	});
+	if (isSearchResponse(response)) {
+		return response as ExaSearchResponse;
+	}
+
+	const parsed = parseExaMcpTextPayload(response);
+	if (parsed) {
+		return parsed;
+	}
+
+	throw new Error("Exa MCP search returned unexpected response shape.");
+}
 
 /** Execute Exa web search */
 export async function searchExa(params: ExaSearchParams): Promise<SearchResponse> {
@@ -140,11 +232,7 @@ export async function searchExa(params: ExaSearchParams): Promise<SearchResponse
 		? await params.authStorage.getApiKey("exa", params.sessionId, { signal: params.signal })
 		: undefined;
 	const apiKey = storedKey ?? getEnvApiKey("exa");
-	if (!apiKey) {
-		throw new Error("Exa credentials not found. Set EXA_API_KEY or login with 'omp /login exa'.");
-	}
-
-	const response = await callExaSearch(apiKey, params);
+	const response = apiKey ? await callExaSearch(apiKey, params) : await callExaMcpSearch(params);
 
 	// Convert to unified SearchResponse
 	const sources: SearchSource[] = [];
@@ -183,14 +271,30 @@ export class ExaProvider extends SearchProvider {
 	readonly label = "Exa";
 
 	isAvailable(authStorage: AuthStorage): boolean {
+		if (!this.#settingsAllowSearch()) return false;
+		return !!getEnvApiKey("exa") || authStorage.hasAuth("exa");
+	}
+
+	/**
+	 * Exa ships an unauthenticated public MCP fallback, so an explicit
+	 * selection (programmatic or via `providers.webSearch: exa`) routes
+	 * through MCP even when no credential is configured. The auto chain
+	 * still uses {@link isAvailable} so an unrelated configured provider
+	 * keeps priority over the public fallback.
+	 */
+	isExplicitlyAvailable(_authStorage: AuthStorage): boolean {
+		return this.#settingsAllowSearch();
+	}
+
+	#settingsAllowSearch(): boolean {
 		try {
 			if (settings.get("exa.enabled") === false || settings.get("exa.enableSearch") === false) {
 				return false;
 			}
 		} catch {
-			// Settings may be unavailable before CLI initialization; credential availability is still authoritative.
+			// Settings may be unavailable before CLI initialization; assume not disabled.
 		}
-		return authStorage.hasAuth("exa");
+		return true;
 	}
 
 	search(params: SearchParams): Promise<SearchResponse> {

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

@@ -28,7 +28,7 @@ const PERPLEXITY_OAUTH_ASK_URL = "https://www.perplexity.ai/rest/sse/perplexity_
 
 const DEFAULT_MAX_TOKENS = 8192;
 const DEFAULT_TEMPERATURE = 0.2;
-const DEFAULT_NUM_SEARCH_RESULTS = 10;
+const DEFAULT_NUM_SEARCH_RESULTS = 20;
 const OAUTH_EXPIRY_BUFFER_MS = 5 * 60 * 1000;
 const OAUTH_API_VERSION = "2.18";
 const OAUTH_USER_AGENT = "Perplexity/641 CFNetwork/1568 Darwin/25.2.0";
@@ -155,11 +155,11 @@ export interface PerplexitySearchParams {
 	system_prompt?: string;
 	search_recency_filter?: "hour" | "day" | "week" | "month" | "year";
 	num_results?: number;
-	/** Maximum output tokens. Defaults to 4096. */
+	/** Maximum output tokens. Defaults to 8192. */
 	max_tokens?: number;
 	/** Sampling temperature (0–1). Lower = more focused/factual. Defaults to 0.2. */
 	temperature?: number;
-	/** Number of search results to retrieve. Defaults to 10. */
+	/** Number of search results to retrieve. Defaults to 20. */
 	num_search_results?: number;
 	authStorage: AuthStorage;
 	sessionId?: string;
@@ -470,11 +470,14 @@ function parseResponse(response: PerplexityResponse): SearchResponse {
 		}
 	}
 
+	const relatedQuestions = (response.related_questions ?? []).filter(q => q.trim().length > 0);
+
 	return {
 		provider: "perplexity",
 		answer: answer || undefined,
 		sources,
 		citations: citations.length > 0 ? citations : undefined,
+		relatedQuestions: relatedQuestions.length > 0 ? relatedQuestions : undefined,
 		usage: response.usage
 			? {
 					inputTokens: response.usage.prompt_tokens,
@@ -532,11 +535,12 @@ export async function searchPerplexity(params: PerplexitySearchParams): Promise<
 		num_search_results: params.num_search_results ?? DEFAULT_NUM_SEARCH_RESULTS,
 		web_search_options: {
 			search_type: "pro",
-			search_context_size: "medium",
+			search_context_size: "high",
 		},
 		enable_search_classifier: true,
 		reasoning_effort: "medium",
 		language_preference: "en",
+		return_related_questions: true,
 	};
 
 	if (params.search_recency_filter) {

package/src/web/search/types.ts

@@ -4,44 +4,85 @@
  * Unified types for web search responses across supported providers.
  */
 
+export const SEARCH_PROVIDER_ORDER = [
+	"tavily",
+	"perplexity",
+	"brave",
+	"jina",
+	"kimi",
+	"anthropic",
+	"gemini",
+	"codex",
+	"zai",
+	"exa",
+	"parallel",
+	"kagi",
+	"synthetic",
+	"searxng",
+] as const;
+
 /** Supported web search providers */
-export type SearchProviderId =
-	| "exa"
-	| "brave"
-	| "jina"
-	| "kimi"
-	| "zai"
-	| "anthropic"
-	| "perplexity"
-	| "gemini"
-	| "codex"
-	| "tavily"
-	| "parallel"
-	| "kagi"
-	| "synthetic"
-	| "searxng";
+export type SearchProviderId = (typeof SEARCH_PROVIDER_ORDER)[number];
+
+export const SEARCH_PROVIDER_PREFERENCES = ["auto", ...SEARCH_PROVIDER_ORDER] as const;
+
+export const SEARCH_PROVIDER_OPTIONS = [
+	{
+		value: "auto",
+		label: "Auto",
+		description: "Automatically uses the first configured web-search provider",
+	},
+	{ value: "tavily", label: "Tavily", description: "Requires TAVILY_API_KEY" },
+	{ value: "perplexity", label: "Perplexity", description: "Requires PERPLEXITY_COOKIES or PERPLEXITY_API_KEY" },
+	{ value: "brave", label: "Brave", description: "Requires BRAVE_API_KEY" },
+	{ value: "jina", label: "Jina", description: "Requires JINA_API_KEY" },
+	{ value: "kimi", label: "Kimi", description: "Requires MOONSHOT_SEARCH_API_KEY or MOONSHOT_API_KEY" },
+	{
+		value: "anthropic",
+		label: "Anthropic",
+		description: "Claude's native web_search tool (uses Anthropic OAuth or ANTHROPIC_API_KEY)",
+	},
+	{
+		value: "gemini",
+		label: "Gemini",
+		description: "Google Search grounding via Gemini (uses google-gemini-cli or google-antigravity OAuth)",
+	},
+	{
+		value: "codex",
+		label: "OpenAI",
+		description: "OpenAI's native web_search (uses ChatGPT OAuth via /login openai-codex)",
+	},
+	{ value: "zai", label: "Z.AI", description: "Calls Z.AI webSearchPrime MCP" },
+	{ value: "exa", label: "Exa", description: "Uses Exa API when EXA_API_KEY is set; falls back to Exa MCP" },
+	{ value: "parallel", label: "Parallel", description: "Requires PARALLEL_API_KEY" },
+	{ value: "kagi", label: "Kagi", description: "Requires KAGI_API_KEY and Kagi Search API beta access" },
+	{ value: "synthetic", label: "Synthetic", description: "Requires SYNTHETIC_API_KEY" },
+	{ value: "searxng", label: "SearXNG", description: "Requires SEARXNG_ENDPOINT or searxng.endpoint" },
+] as const;
+
+export const SEARCH_PROVIDER_LABELS: Record<SearchProviderId, string> = {
+	tavily: "Tavily",
+	perplexity: "Perplexity",
+	brave: "Brave",
+	jina: "Jina",
+	kimi: "Kimi",
+	anthropic: "Anthropic",
+	gemini: "Gemini",
+	codex: "OpenAI",
+	zai: "Z.AI",
+	exa: "Exa",
+	parallel: "Parallel",
+	kagi: "Kagi",
+	synthetic: "Synthetic",
+	searxng: "SearXNG",
+};
 
 export function isSearchProviderId(value: string): value is SearchProviderId {
-	return [
-		"exa",
-		"brave",
-		"jina",
-		"kimi",
-		"zai",
-		"anthropic",
-		"perplexity",
-		"gemini",
-		"codex",
-		"tavily",
-		"parallel",
-		"kagi",
-		"synthetic",
-		"searxng",
-	].includes(value);
+	return SEARCH_PROVIDER_ORDER.includes(value as SearchProviderId);
 }
 
 export function isSearchProviderPreference(value: string): value is SearchProviderId | "auto" {
-	return value === "auto" || isSearchProviderId(value);
+	return SEARCH_PROVIDER_PREFERENCES.includes(value as SearchProviderId | "auto");
 }
 
 /** Source returned by search (all providers) */
@@ -431,6 +472,7 @@ export interface PerplexityResponse {
 	choices: PerplexityChoice[];
 	citations?: string[] | null;
 	search_results?: PerplexitySearchResult[] | null;
+	related_questions?: string[] | null;
 	type?: PerplexityCompletionResponseType | null;
 	status?: PerplexityCompletionResponseStatus | null;
 }