@oh-my-pi/pi-coding-agent 17.2.12 → 17.2.13

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

@@ -62,6 +62,7 @@ interface SearXNGResult {
 	title?: string;
 	url?: string;
 	content?: string;
+	snippet?: string;
 	engine?: string;
 	publishedDate?: string;
 	/** SearXNG sometimes uses publishedDate, sometimes just date */
@@ -76,6 +77,7 @@ interface SearXNGResponse {
 	suggestions?: string[];
 	corrections?: string[];
 	unresponsive_engines?: Array<[string, string]>;
+	answers?: unknown[];
 }
 
 interface SearXNGAuth {
@@ -272,6 +274,61 @@ function stripExternalBangs(query: string): string {
 		.join(" ");
 }
 
+/** Extract displayable text from both legacy string answers and modern
+ *  structured answer plugins (legacy, translations, weather). */
+function extractAnswerText(answer: unknown): string | undefined {
+	if (typeof answer === "string") return answer.trim() || undefined;
+	if (!answer || typeof answer !== "object") return undefined;
+
+	const record = answer as Record<string, unknown>;
+	if (typeof record.answer === "string") return record.answer.trim() || undefined;
+
+	if (Array.isArray(record.translations)) {
+		const translations: string[] = [];
+		for (const item of record.translations) {
+			if (!item || typeof item !== "object") continue;
+			const text = (item as Record<string, unknown>).text;
+			if (typeof text === "string" && text.trim()) translations.push(text.trim());
+			if (translations.length === 3) break;
+		}
+		if (translations.length) return translations.join("\n");
+	}
+
+	if (record.current && typeof record.current === "object") {
+		const current = record.current as Record<string, unknown>;
+		if (typeof current.summary === "string" && current.summary.trim()) return current.summary.trim();
+		const location =
+			current.location && typeof current.location === "object"
+				? (current.location as Record<string, unknown>).name
+				: undefined;
+		const temperature =
+			current.temperature && typeof current.temperature === "object"
+				? (current.temperature as Record<string, unknown>)
+				: undefined;
+		const temperatureText =
+			temperature && (typeof temperature.val === "string" || typeof temperature.val === "number")
+				? `${temperature.val}${typeof temperature.unit === "string" ? temperature.unit : ""}`
+				: undefined;
+		const condition = typeof current.condition === "string" ? current.condition : undefined;
+		const parts = [location, temperatureText, condition].filter(
+			(part): part is string => typeof part === "string" && part.trim().length > 0,
+		);
+		if (parts.length) return parts.join(": ");
+	}
+
+	return undefined;
+}
+
+function formatAnswers(answers: unknown[] | undefined): string | undefined {
+	const texts: string[] = [];
+	for (const answer of answers ?? []) {
+		const text = extractAnswerText(answer);
+		if (text) texts.push(text);
+		if (texts.length === 3) break;
+	}
+	return texts.length ? texts.join("\n\n") : undefined;
+}
+
 /** Build the search URL and headers for a SearXNG request */
 function buildRequest(
 	endpoint: string,
@@ -282,6 +339,7 @@ function buildRequest(
 		categories?: string;
 		engines?: string;
 		language?: string;
+		safesearch?: 0 | 1 | 2;
 		signal?: AbortSignal;
 	},
 	auth: SearXNGAuth | null,
@@ -308,6 +366,10 @@ function buildRequest(
 		url.searchParams.set("engines", params.engines);
 	}
 
+	if (params.safesearch !== undefined) {
+		url.searchParams.set("safesearch", String(params.safesearch));
+	}
+
 	if (params.language) {
 		url.searchParams.set("language", params.language);
 	}
@@ -326,6 +388,7 @@ async function callSearXNGSearch(
 		categories?: string;
 		engines?: string;
 		language?: string;
+		safesearch?: 0 | 1 | 2;
 		signal?: AbortSignal;
 		timeoutMs?: number;
 		fetch?: FetchImpl;
@@ -372,12 +435,23 @@ export async function searchSearXNG(params: {
 
 	let categories: string | undefined;
 	let language: string | undefined;
+	let configuredSafesearch: number | undefined;
 	try {
 		categories = settings.get("searxng.categories") ?? undefined;
 		language = settings.get("searxng.language") ?? undefined;
+		configuredSafesearch = settings.get("searxng.safesearch");
 	} catch {
 		// Settings not initialized yet
 	}
+	if (
+		configuredSafesearch !== undefined &&
+		configuredSafesearch !== 0 &&
+		configuredSafesearch !== 1 &&
+		configuredSafesearch !== 2
+	) {
+		throw new Error("searxng.safesearch must be 0 (off), 1 (moderate), or 2 (strict).");
+	}
+	const safesearch = configuredSafesearch;
 	const configuredEngines = findEngines();
 
 	// SearXNG forwards `q` to downstream engines, so build it with the shared
@@ -402,6 +476,7 @@ export async function searchSearXNG(params: {
 			categories,
 			engines,
 			language,
+			safesearch,
 			fetch: params.fetch,
 		},
 		auth,
@@ -415,7 +490,7 @@ export async function searchSearXNG(params: {
 		sources.push({
 			title: result.title ?? result.url,
 			url: result.url,
-			snippet: result.content?.trim() || undefined,
+			snippet: (result.content ?? result.snippet)?.trim() || undefined,
 			publishedDate: publishedDate ?? undefined,
 			ageSeconds: dateToAgeSeconds(publishedDate),
 		});
@@ -435,6 +510,7 @@ export async function searchSearXNG(params: {
 
 	return {
 		provider: "searxng",
+		answer: formatAnswers(response.answers),
 		sources: limitedSources,
 		relatedQuestions: response.suggestions?.length ? response.suggestions : undefined,
 	};

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

@@ -34,17 +34,10 @@ export interface TavilySearchParams {
 	fetch?: FetchImpl;
 }
 
-interface TavilySearchResult {
-	title?: string | null;
-	url?: string | null;
-	content?: string | null;
-	published_date?: string | null;
-}
-
 interface TavilySearchResponse {
-	answer?: string | null;
-	results?: TavilySearchResult[];
-	request_id?: string | null;
+	answer?: unknown;
+	results?: unknown;
+	request_id?: unknown;
 }
 
 function asRecord(value: unknown): Record<string, unknown> | null {
@@ -141,28 +134,36 @@ async function callTavilySearch(apiKey: string, params: TavilySearchParams): Pro
 		throw new SearchProviderError("tavily", `Tavily API error (${response.status}): ${message}`, response.status);
 	}
 
-	return (await response.json()) as TavilySearchResponse;
+	const payload: unknown = await response.json();
+	return asRecord(payload) ?? {};
 }
 
 function toSearchResponse(response: TavilySearchResponse, numResults: number): SearchResponse {
 	const sources: SearchSource[] = [];
 
-	for (const result of response.results ?? []) {
-		if (!result.url) continue;
-		sources.push({
-			title: result.title ?? result.url,
-			url: result.url,
-			snippet: result.content ?? undefined,
-			publishedDate: result.published_date ?? undefined,
-			ageSeconds: dateToAgeSeconds(result.published_date ?? undefined),
-		});
+	if (Array.isArray(response.results)) {
+		for (const value of response.results) {
+			const result = asRecord(value);
+			if (!result || typeof result.url !== "string" || !result.url) continue;
+			const title = typeof result.title === "string" && result.title ? result.title : result.url;
+			const snippet = typeof result.content === "string" ? result.content : undefined;
+			const publishedDate = typeof result.published_date === "string" ? result.published_date : undefined;
+			sources.push({
+				title,
+				url: result.url,
+				snippet,
+				publishedDate,
+				ageSeconds: dateToAgeSeconds(publishedDate),
+			});
+		}
 	}
 
+	const answer = typeof response.answer === "string" ? response.answer.trim() || undefined : undefined;
 	return {
 		provider: "tavily",
-		answer: response.answer?.trim() || undefined,
+		answer,
 		sources: sources.slice(0, numResults),
-		requestId: response.request_id ?? undefined,
+		requestId: typeof response.request_id === "string" ? response.request_id : undefined,
 		authMode: "api_key",
 	};
 }

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

@@ -19,7 +19,7 @@ const MAX_NUM_RESULTS = 20;
 const MAX_PAGE = 10;
 
 /** TinyFish is SERP-backed: common Google-style operators pass through. */
-const TINYFISH_QUERY_SYNTAX: QuerySyntax = { phrases: true, negation: true, site: true, filetype: true };
+const TINYFISH_QUERY_SYNTAX: QuerySyntax = { phrases: true, negation: true, filetype: true };
 
 const RECENCY_MINUTES: Record<NonNullable<SearchParams["recency"]>, number> = {
 	day: 1440,
@@ -33,6 +33,8 @@ export interface TinyFishSearchParams {
 	num_results?: number;
 	recency?: SearchParams["recency"];
 	page?: number;
+	include_domains?: string[];
+	exclude_domains?: string[];
 	signal?: AbortSignal;
 	timeoutMs?: number;
 	fetch?: FetchImpl;
@@ -66,6 +68,12 @@ async function callTinyFishSearch(apiKey: string, params: TinyFishSearchParams):
 	if (params.recency) {
 		url.searchParams.set("recency_minutes", String(RECENCY_MINUTES[params.recency]));
 	}
+	if (params.include_domains?.length) {
+		url.searchParams.set("include_domains", params.include_domains.join(","));
+	}
+	if (params.exclude_domains?.length) {
+		url.searchParams.set("exclude_domains", params.exclude_domains.join(","));
+	}
 	if (params.num_results !== undefined) {
 		url.searchParams.set("num_results", String(params.num_results));
 	}
@@ -96,18 +104,35 @@ async function callTinyFishSearch(apiKey: string, params: TinyFishSearchParams):
 	return (await response.json()) as TinyFishSearchResponse;
 }
 
-function appendTinyFishSources(sources: SearchSource[], results: readonly TinyFishSearchResult[]): void {
+function appendTinyFishSources(
+	sources: SearchSource[],
+	results: readonly TinyFishSearchResult[],
+	seenUrls: Set<string>,
+): void {
 	for (const result of results) {
-		if (!result.url) continue;
+		const url = result.url?.trim();
+		if (!url || seenUrls.has(url)) continue;
+		seenUrls.add(url);
+		const siteName = result.site_name?.trim();
 		sources.push({
-			title: result.title ?? result.site_name ?? result.url,
-			url: result.url,
-			snippet: result.snippet ?? undefined,
-			author: result.site_name ?? undefined,
+			title: result.title?.trim() || siteName || url,
+			url,
+			snippet: result.snippet?.replace(/\s+/g, " ").trim() || undefined,
+			author: siteName || undefined,
 		});
 	}
 }
 
+/** Bare hosts from `site:` values; path constraints remain centrally post-filtered. */
+function siteHosts(sites: readonly string[]): string[] {
+	const hosts = new Set<string>();
+	for (const site of sites) {
+		const host = site.split("/", 1)[0];
+		if (host) hosts.add(host);
+	}
+	return [...hosts];
+}
+
 /** Execute TinyFish web search. */
 export async function searchTinyFish(params: SearchParams): Promise<SearchResponse> {
 	const numResults = clampNumResults(params.numSearchResults ?? params.limit, DEFAULT_NUM_RESULTS, MAX_NUM_RESULTS);
@@ -121,6 +146,12 @@ export async function searchTinyFish(params: SearchParams): Promise<SearchRespon
 		timeoutMs: params.timeoutMs,
 		fetch: params.fetch,
 	};
+	if (parsed.hasDirectives) {
+		const includeDomains = siteHosts(parsed.sites);
+		const excludeDomains = siteHosts(parsed.excludedSites);
+		if (includeDomains.length > 0) tinyFishParams.include_domains = includeDomains;
+		if (excludeDomains.length > 0) tinyFishParams.exclude_domains = excludeDomains;
+	}
 	const keyOrResolver: ApiKey = params.authStorage.resolver("tinyfish", {
 		sessionId: params.sessionId,
 	});
@@ -128,11 +159,14 @@ export async function searchTinyFish(params: SearchParams): Promise<SearchRespon
 		keyOrResolver,
 		async key => {
 			const collected: SearchSource[] = [];
+			const seenUrls = new Set<string>();
 			for (let page = 0; page <= MAX_PAGE && collected.length < numResults; page += 1) {
 				const searchPage = await callTinyFishSearch(key, { ...tinyFishParams, page });
-				const results = searchPage.results ?? [];
-				appendTinyFishSources(collected, results);
-				if (results.length < pageSize) break;
+				if (!Array.isArray(searchPage.results)) {
+					throw new Error("TinyFish Search API returned an unexpected response shape");
+				}
+				appendTinyFishSources(collected, searchPage.results, seenUrls);
+				if (searchPage.results.length < pageSize) break;
 			}
 
 			return collected.slice(0, numResults);

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

@@ -25,6 +25,8 @@ interface XAIUrlCitationAnnotation {
 	title?: string | null;
 	text?: string | null;
 	cited_text?: string | null;
+	start_index?: number | null;
+	end_index?: number | null;
 }
 
 interface XAIResponseContentPart {
@@ -34,9 +36,20 @@ interface XAIResponseContentPart {
 	annotations?: XAIUrlCitationAnnotation[] | null;
 }
 
+interface XAIWebSearchSource {
+	url?: string | null;
+	source_website_url?: string | null;
+	title?: string | null;
+	caption?: string | null;
+}
+
 interface XAIResponseOutputItem {
+	type?: string;
 	content?: XAIResponseContentPart[] | null;
 	annotations?: XAIUrlCitationAnnotation[] | null;
+	action?: { sources?: XAIWebSearchSource[] | null } | null;
+	sources?: XAIWebSearchSource[] | null;
+	results?: XAIWebSearchSource[] | null;
 }
 
 interface XAIResponsesUsage {
@@ -161,7 +174,12 @@ async function callXAIResponses(
 		throwXAIResponsesError(response.status, await response.text());
 	}
 
-	return (await response.json()) as XAIResponsesResponse;
+	try {
+		return (await response.json()) as XAIResponsesResponse;
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		throw new SearchProviderError("xai", `xAI Responses API returned invalid JSON: ${message}`, response.status);
+	}
 }
 
 function addCitationSource(
@@ -189,38 +207,77 @@ function addCitationSource(
 		citedText: sourceSnippet,
 	});
 }
+function extractSnippetAround(
+	text: string | null | undefined,
+	start: number | null | undefined,
+	end: number | null | undefined,
+): string | undefined {
+	if (!text || typeof start !== "number" || typeof end !== "number") return undefined;
+	const before = Math.max(0, start - 100);
+	const after = Math.min(text.length, end + 100);
+	const snippet = text
+		.slice(before, after)
+		.replace(/\[([^\]]*)\]\([^)]*\)/g, "$1")
+		.trim();
+	if (!snippet) return undefined;
+	return snippet.length > 300 ? `${snippet.slice(0, 297)}...` : snippet;
+}
 
 function collectAnnotationSources(
 	annotations: readonly XAIUrlCitationAnnotation[] | null | undefined,
 	sources: SearchSource[],
 	citations: SearchCitation[],
 	seenUrls: Set<string>,
+	contentText?: string | null,
 ): void {
-	if (!annotations) return;
+	if (!Array.isArray(annotations)) return;
 	for (const annotation of annotations) {
-		if (annotation.type !== "url_citation" || !annotation.url) continue;
+		if (!annotation || typeof annotation !== "object") continue;
+		if (annotation.type !== "url_citation" || typeof annotation.url !== "string") continue;
 		addCitationSource(
 			sources,
 			citations,
 			seenUrls,
 			annotation.url,
 			annotation.title,
-			annotation.cited_text ?? annotation.text,
+			annotation.cited_text ??
+				annotation.text ??
+				extractSnippetAround(contentText, annotation.start_index, annotation.end_index),
 		);
 	}
 }
 
+function collectWebSearchSources(
+	item: XAIResponseOutputItem,
+	sources: SearchSource[],
+	citations: SearchCitation[],
+	seenUrls: Set<string>,
+): void {
+	if (item.type !== "web_search_call") return;
+	for (const group of [item.action?.sources, item.sources, item.results]) {
+		if (!Array.isArray(group)) continue;
+		for (const source of group) {
+			if (!source || typeof source !== "object") continue;
+			const url = source.url ?? source.source_website_url;
+			if (typeof url !== "string") continue;
+			addCitationSource(sources, citations, seenUrls, url, source.title ?? source.caption);
+		}
+	}
+}
+
 function parseAnswer(response: XAIResponsesResponse): string | undefined {
 	const topLevelText = response.output_text?.trim();
 	if (topLevelText) return topLevelText;
 
 	const answerParts: string[] = [];
-	for (const item of response.output ?? []) {
-		for (const part of item.content ?? []) {
+	const output = Array.isArray(response.output) ? response.output : [];
+	for (const item of output) {
+		if (!item || typeof item !== "object") continue;
+		const content = Array.isArray(item.content) ? item.content : [];
+		for (const part of content) {
+			if (!part || typeof part !== "object") continue;
 			const text = part.output_text ?? part.text;
-			if ((part.type === "output_text" || part.type === "text") && text?.trim()) {
-				answerParts.push(text.trim());
-			}
+			if (text?.trim()) answerParts.push(text.trim());
 		}
 	}
 
@@ -259,13 +316,23 @@ function parseResponse(response: XAIResponsesResponse, resultCap: number): Searc
 	const seenUrls = new Set<string>();
 
 	collectAnnotationSources(response.annotations, sources, citations, seenUrls);
-	for (const item of response.output ?? []) {
+	const output = Array.isArray(response.output) ? response.output : [];
+	for (const item of output) {
+		if (!item || typeof item !== "object") continue;
 		collectAnnotationSources(item.annotations, sources, citations, seenUrls);
-		for (const part of item.content ?? []) {
-			collectAnnotationSources(part.annotations, sources, citations, seenUrls);
+		const content = Array.isArray(item.content) ? item.content : [];
+		for (const part of content) {
+			if (!part || typeof part !== "object") continue;
+			collectAnnotationSources(part.annotations, sources, citations, seenUrls, part.output_text ?? part.text);
 		}
 	}
-	for (const url of response.citations ?? []) {
+	for (const item of output) {
+		if (!item || typeof item !== "object") continue;
+		collectWebSearchSources(item, sources, citations, seenUrls);
+	}
+	const topLevelCitations = Array.isArray(response.citations) ? response.citations : [];
+	for (const url of topLevelCitations) {
+		if (typeof url !== "string") continue;
 		addCitationSource(sources, citations, seenUrls, url);
 	}
 	const limited = applyResultCap(sources, citations, resultCap);
@@ -354,7 +421,11 @@ export async function searchXAI(params: SearchParams): Promise<SearchResponse> {
 		signal: params.signal,
 		missingKeyMessage: 'xAI credentials not found. Set XAI_API_KEY or configure an API key for provider "xai".',
 	});
-	return parseResponse(response, resultCap);
+	const parsed = parseResponse(response, resultCap);
+	if (!parsed.answer && parsed.sources.length === 0) {
+		throw new SearchProviderError("xai", "xAI web_search returned no answer or sources", 502);
+	}
+	return parsed;
 }
 
 /** Search provider for xAI web search. */