@herbertgao/pi-extensions 2026.9.17 → 2026.9.19

package/node_modules/pi-web-access/exa.ts

@@ -16,11 +16,6 @@ interface WebSearchConfig {
 	exaBaseUrl?: unknown;
 }
 
-interface ExaAnswerResponse {
-	answer?: string;
-	citations?: Array<{ url?: string; title?: string; text?: string; publishedDate?: string }>;
-}
-
 interface ExaSearchResponse {
 	results?: Array<{
 		title?: string;
@@ -146,6 +141,16 @@ function normalizeHighlights(value: unknown): string[] {
 	return value.filter((item): item is string => typeof item === "string" && item.trim().length > 0);
 }
 
+function fallbackSourceLabel(url: string | undefined, index: number): string {
+	try {
+		const hostname = url ? new URL(url).hostname : "";
+		if (hostname) return hostname;
+	} catch {
+		// Invalid URLs use the generic label.
+	}
+	return `Source ${index + 1}`;
+}
+
 function buildAnswerFromSearchResults(results: ExaSearchResponse["results"]): string {
 	if (!results?.length) return "";
 	const parts: string[] = [];
@@ -157,20 +162,20 @@ function buildAnswerFromSearchResults(results: ExaSearchResponse["results"]): st
 			? highlights.join(" ")
 			: typeof item.text === "string" ? item.text.trim().slice(0, 1000) : "";
 		if (!content) continue;
-		const sourceTitle = item.title || `Source ${i + 1}`;
+		const sourceTitle = item.title || fallbackSourceLabel(item.url, i);
 		parts.push(`${content}\nSource: ${sourceTitle} (${item.url})`);
 	}
 	return parts.join("\n\n");
 }
 
-function mapResults(results: ExaSearchResponse["results"] | ExaAnswerResponse["citations"]): SearchResponse["results"] {
+function mapResults(results: ExaSearchResponse["results"]): SearchResponse["results"] {
 	if (!Array.isArray(results)) return [];
 	const mapped: SearchResponse["results"] = [];
 	for (let i = 0; i < results.length; i++) {
 		const item = results[i];
 		if (!item?.url) continue;
 		mapped.push({
-			title: item.title || `Source ${i + 1}`,
+			title: item.title || fallbackSourceLabel(item.url, i),
 			url: item.url,
 			snippet: "",
 		});
@@ -180,15 +185,9 @@ function mapResults(results: ExaSearchResponse["results"] | ExaAnswerResponse["c
 
 function mapInlineContent(results: ExaSearchResponse["results"]): ExtractedContent[] {
 	if (!results?.length) return [];
-	return results
-		.filter((r): r is NonNullable<ExaSearchResponse["results"]>[number] & { url: string; text: string } =>
-			!!r?.url && typeof r.text === "string" && r.text.length > 0)
-		.map(r => ({
-			url: r.url,
-			title: r.title || "",
-			content: r.text,
-			error: null,
-		}));
+	return results.flatMap((r, i) => r?.url && typeof r.text === "string" && r.text.length > 0
+		? [{ url: r.url, title: r.title || fallbackSourceLabel(r.url, i), content: r.text, error: null }]
+		: []);
 }
 
 function toSearchResponse(
@@ -318,21 +317,16 @@ function buildAnswerFromMcpResults(results: McpParsedResult[]): string {
 		const result = results[i];
 		const snippet = result.content.replace(/\s+/g, " ").trim().slice(0, 500);
 		if (!snippet) continue;
-		const sourceTitle = result.title || `Source ${i + 1}`;
+		const sourceTitle = result.title || fallbackSourceLabel(result.url, i);
 		parts.push(`${snippet}\nSource: ${sourceTitle} (${result.url})`);
 	}
 	return parts.join("\n\n");
 }
 
 function mapMcpInlineContent(results: McpParsedResult[]): ExtractedContent[] {
-	return results
-		.filter(result => result.content.length > 0)
-		.map(result => ({
-			url: result.url,
-			title: result.title,
-			content: result.content,
-			error: null,
-		}));
+	return results.flatMap((result, i) => result.content.length > 0
+		? [{ url: result.url, title: result.title || fallbackSourceLabel(result.url, i), content: result.content, error: null }]
+		: []);
 }
 
 function buildMcpQuery(query: string, options: ExaSearchOptions): string {
@@ -458,35 +452,9 @@ export async function searchWithExa(query: string, options: ExaSearchOptions = {
 	}
 
 	const apiBaseUrl = getApiBaseUrl();
-	const useSearch = options.includeContent
-		|| !!options.recencyFilter
-		|| !!options.domainFilter?.length
-		|| !!(options.numResults && options.numResults !== 5);
-
 	const activityId = activityMonitor.logStart({ type: "api", query });
 
 	try {
-		if (!useSearch) {
-			const response = await fetchWithCredentialRedirects(`${apiBaseUrl}/answer`, {
-				method: "POST",
-				headers: exaApiHeaders(apiKey),
-				body: JSON.stringify({ query }),
-				signal: requestSignal(options.signal),
-			}, ["x-api-key"]);
-
-			if (!response.ok) {
-				const errorText = redactCredential(await response.text(), apiKey);
-				throw new Error(`Exa API error ${response.status}: ${errorText.slice(0, 300)}`);
-			}
-
-			const data = await response.json() as ExaAnswerResponse;
-			activityMonitor.logComplete(activityId, response.status);
-			return {
-				answer: data.answer || "",
-				results: mapResults(data.citations),
-			};
-		}
-
 		const response = await fetchWithCredentialRedirects(`${apiBaseUrl}/search`, {
 			method: "POST",
 			headers: exaApiHeaders(apiKey),

package/node_modules/pi-web-access/extract.ts

@@ -173,13 +173,14 @@ const REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);
 async function fetchAuthenticatedRemoteUrl(
 	url: string,
 	init: RequestInit,
-	validationOptions: { ssrf: SsrfConfig; domainPolicy: DomainPolicy; lookup?: Lookup },
+	validationOptions: { ssrf: SsrfConfig; domainPolicy: DomainPolicy; lookup?: Lookup; proxy?: string },
 	profile: AuthFetchProfile,
 ): Promise<Response> {
 	let current = await validateRemoteUrl(url, {
 		allowRanges: validationOptions.ssrf.allowRanges,
 		trustEnvProxy: validationOptions.ssrf.trustEnvProxy,
 		domainPolicy: validationOptions.domainPolicy,
+		proxy: validationOptions.proxy,
 		...(validationOptions.lookup ? { lookup: validationOptions.lookup } : {}),
 	});
 	let requestInit = init;
@@ -196,6 +197,7 @@ async function fetchAuthenticatedRemoteUrl(
 			allowRanges: validationOptions.ssrf.allowRanges,
 			trustEnvProxy: validationOptions.ssrf.trustEnvProxy,
 			domainPolicy: validationOptions.domainPolicy,
+			proxy: validationOptions.proxy,
 			...(validationOptions.lookup ? { lookup: validationOptions.lookup } : {}),
 		});
 		authFetchRedirectGuard(profile, from, current);
@@ -287,6 +289,21 @@ function notFoundGuidance(result: ExtractedContent, toolNames?: RegisteredToolNa
 	return lines.join("\n");
 }
 
+
+/** Fallback-list hint for the keyless Jina Reader. Returns null when Jina
+ * already ran for this fetch, and otherwise names only the config change still
+ * missing, so users keep their existing or default provider order. */
+function jinaReaderGuidance(routing: FetchRouting, providerOrder: FetchProvider[], needsRemoteOptIn: boolean): string | null {
+	if (providerOrder.includes("jina")) return null;
+	const privacy = "target URLs are fetched through Jina's infrastructure";
+	const optInCaveat = "this also allows the other hosted providers in your fetch provider order";
+	if (routing.providers.includes("jina")) {
+		return `  • Enable the keyless Jina Reader fallback: set fetchRouting.allowRemoteHostedProviders to true in ${WEB_SEARCH_CONFIG_PATH} (Jina is already in your fetch provider order; ${optInCaveat}; ${privacy})`;
+	}
+	return needsRemoteOptIn
+		? `  • Enable the keyless Jina Reader fallback: add "jina" to your existing fetchRouting.providers and set fetchRouting.allowRemoteHostedProviders to true in ${WEB_SEARCH_CONFIG_PATH} (${optInCaveat}; ${privacy})`
+		: `  • Enable the keyless Jina Reader fallback: add "jina" to your existing fetchRouting.providers in ${WEB_SEARCH_CONFIG_PATH} (${privacy})`;
+}
 function abortedResult(url: string): ExtractedContent {
 	return { url, title: "", content: "", error: "Aborted" };
 }
@@ -527,6 +544,7 @@ export async function extractContent(
 				allowRanges: ssrf.allowRanges,
 				trustEnvProxy: ssrf.trustEnvProxy,
 				domainPolicy,
+				proxy: options?.proxy,
 				...(options?.lookup ? { lookup: options.lookup } : {}),
 			});
 		} catch (err) {
@@ -1020,6 +1038,7 @@ export async function extractContent(
 	}
 
 	const searchToolName = options?.toolNames?.webSearch;
+	const jinaHint = jinaReaderGuidance(fetchRouting, providerOrder, Boolean(remoteUrl) && !fetchRouting.allowRemoteHostedProviders);
 	const guidance = [
 		finalHttpResult?.error ?? "No fetch_content provider returned content",
 		...(firecrawlError ? [`Firecrawl fallback failed: ${firecrawlError}`] : []),
@@ -1034,6 +1053,7 @@ export async function extractContent(
 		...(brightdataError ? [`Bright Data fallback failed: ${brightdataError}`] : []),
 		"",
 		"Fallback options:",
+		...(jinaHint ? [jinaHint] : []),
 		`  • Set firecrawlBaseUrl in ${WEB_SEARCH_CONFIG_PATH} to a self-hosted Firecrawl instance`,
 		`  • Set crawl4aiBaseUrl in ${WEB_SEARCH_CONFIG_PATH} to a self-hosted Crawl4AI instance`,
 		`  • Set tinyfishApiKey in ${WEB_SEARCH_CONFIG_PATH} or TINYFISH_API_KEY`,
@@ -1050,6 +1070,18 @@ export async function extractContent(
 	return { ...(finalHttpResult ?? { url, title: "", content: "", error: null }), error: guidance };
 }
 
+// Cloudflare interstitials served with HTTP 200. The header is authoritative for
+// any text response; the body check is HTML-only and needs both challenge-platform
+// markers so a generic "Just a moment..." page never matches.
+function isCloudflareChallenge(response: Response, text: string, isHTML: boolean): boolean {
+	if (response.status !== 200) return false;
+	if (response.headers.get("cf-mitigated") === "challenge") return true;
+	return isHTML &&
+		/<title>\s*Just a moment\.\.\.\s*<\/title>/i.test(text) &&
+		text.includes("window._cf_chl_opt") &&
+		text.includes("/cdn-cgi/challenge-platform/");
+}
+
 function isLikelyJSRendered(html: string): boolean {
 	const bodyMatch = html.match(/<body[^>]*>([\s\S]*?)<\/body>/i);
 	if (!bodyMatch) return false;
@@ -1162,7 +1194,6 @@ async function extractViaHttp(
 		const ssrf = loadSsrfConfig();
 		const domainPolicy = loadFetchContentDomainPolicy();
 		const authProfile = options?.authFetchProfile;
-		const trustEnvProxy = options?.proxy === undefined && ssrf.trustEnvProxy;
 		const requestInit: ProxiedRequestInit = {
 			signal: controller.signal,
 			__proxy: options?.proxy,
@@ -1179,14 +1210,15 @@ async function extractViaHttp(
 			},
 		};
 		const response = authProfile
-			? await fetchAuthenticatedRemoteUrl(url, requestInit, { ssrf: { ...ssrf, trustEnvProxy }, domainPolicy, ...(options?.lookup ? { lookup: options.lookup } : {}) }, authProfile)
+			? await fetchAuthenticatedRemoteUrl(url, requestInit, { ssrf, domainPolicy, proxy: options?.proxy, ...(options?.lookup ? { lookup: options.lookup } : {}) }, authProfile)
 			: await fetchRemoteUrl(
 				url,
 				requestInit,
 				{
 					allowRanges: ssrf.allowRanges,
-					trustEnvProxy,
+					trustEnvProxy: ssrf.trustEnvProxy,
 					domainPolicy,
+					proxy: options?.proxy,
 					...(options?.lookup ? { lookup: options.lookup } : {}),
 				},
 			);
@@ -1310,6 +1342,11 @@ async function extractViaHttp(
 		const text = await readTextResponseWithLimit(response, maxResponseSize);
 		const isHTML = contentType.includes("text/html") || contentType.includes("application/xhtml+xml");
 
+		if (isCloudflareChallenge(response, text, isHTML)) {
+			activityMonitor.logComplete(activityId, response.status);
+			return { url, title: "", content: "", error: `HTTP ${response.status}: Blocked by Cloudflare challenge page`, status: response.status };
+		}
+
 		if (!isHTML) {
 			activityMonitor.logComplete(activityId, response.status);
 			const title = extractTextTitle(text, url);

package/node_modules/pi-web-access/gemini-search.ts

@@ -22,6 +22,7 @@ import { isSearch1APIAvailable, searchWithSearch1API } from "./search1api.ts";
 import { isSearchinfinityAvailable, searchWithSearchinfinity } from "./searchinfinity.ts";
 import { isQueritAvailable, searchWithQuerit } from "./querit.ts";
 import { isTavilyAvailable, searchWithTavily } from "./tavily.ts";
+import { isYouAvailable, searchWithYou } from "./you.ts";
 import { isFirecrawlAvailable, searchWithFirecrawl } from "./firecrawl.ts";
 import { isJinaSearchAvailable, searchWithJina } from "./jina-search.ts";
 import { isSerpdiveAvailable, searchWithSerpdive } from "./serpdive.ts";
@@ -39,12 +40,13 @@ import { isSerpApiAvailable, searchWithSerpApi } from "./serpapi.ts";
 import { isSerperAvailable, searchWithSerper } from "./serper.ts";
 import { isSerplyAvailable, searchWithSerply } from "./serply.ts";
 import { isBaizhiAvailable, searchWithBaizhi } from "./baizhi.ts";
+import { isZaiAvailable, searchWithZai } from "./zai.ts";
 import { isValyuAvailable, searchWithValyu } from "./valyu.ts";
 import { isKimiSearchAvailable, searchWithKimi } from "./kimi-search.ts";
 import { isMistralAvailable, searchWithMistral } from "./mistral-search.ts";
 import { getWebSearchConfigPath } from "./utils.ts";
 
-export const RESOLVED_SEARCH_PROVIDERS = ["openai", "brave", "parallel", "parallel-mcp", "tinyfish", "search1api", "searchinfinity", "querit", "tavily", "firecrawl", "jina", "searxng", "duckduckgo", "perplexity", "gemini", "kimi", "exa", "serpdive", "kagi", "ollama", "anysearch", "xai", "mistral", "brightdata", "serpbase", "serpapi", "serper", "serply", "valyu", "bocha", "xcrawl", "baizhi"] as const;
+export const RESOLVED_SEARCH_PROVIDERS = ["openai", "brave", "parallel", "parallel-mcp", "tinyfish", "search1api", "searchinfinity", "querit", "tavily", "you", "firecrawl", "jina", "searxng", "duckduckgo", "perplexity", "gemini", "kimi", "exa", "serpdive", "kagi", "ollama", "anysearch", "xai", "mistral", "brightdata", "serpbase", "serpapi", "serper", "serply", "valyu", "bocha", "xcrawl", "baizhi", "zai"] as const;
 export const SEARCH_PROVIDERS = ["auto", "all", ...RESOLVED_SEARCH_PROVIDERS] as const;
 
 export type ResolvedSearchProvider = typeof RESOLVED_SEARCH_PROVIDERS[number];
@@ -109,7 +111,7 @@ export interface AttributedSearchResponse extends SearchResponse {
 
 const CONFIG_PATH = getWebSearchConfigPath();
 const DEFAULT_SEARCH_MODEL = "gemini-3.6-flash";
-// Explicit-only providers (Parallel MCP, DuckDuckGo, Kimi, AnySearch, XCrawl, xAI, Mistral, Bright Data, SerpBase, SerpApi, Serper, Serply, Valyu) are deliberately absent:
+// Explicit-only providers (Parallel MCP, DuckDuckGo, Kimi, AnySearch, XCrawl, xAI, Mistral, Bright Data, SerpBase, SerpApi, Serper, Serply, You.com, Valyu, Baizhi, Z.ai) are deliberately absent:
 // `all` must never fan out to an opt-in or paid provider without the user asking for it.
 export const ALL_SEARCH_PROVIDERS: ResolvedSearchProvider[] = ["searxng", "openai", "exa", "brave", "parallel", "tinyfish", "search1api", "searchinfinity", "querit", "tavily", "firecrawl", "jina", "serpdive", "kagi", "ollama", "perplexity", "gemini", "bocha"];
 const VALID_ROUTING_KINDS = ["transient", "quota", "network", "invalid-response", "unsupported"] as const;
@@ -389,6 +391,7 @@ async function searchWithResolvedProvider(
 	if (provider === "searchinfinity") return { ...(await searchWithSearchinfinity(query, options)), provider };
 	if (provider === "querit") return { ...(await searchWithQuerit(query, options)), provider };
 	if (provider === "tavily") return { ...(await searchWithTavily(query, options)), provider };
+	if (provider === "you") return { ...(await searchWithYou(query, options)), provider };
 	if (provider === "firecrawl") return { ...(await searchWithFirecrawl(query, options)), provider };
 	if (provider === "jina") return { ...(await searchWithJina(query, options)), provider };
 	if (provider === "serpdive") return { ...(await searchWithSerpdive(query, options)), provider };
@@ -404,6 +407,7 @@ async function searchWithResolvedProvider(
 	if (provider === "serper") return { ...(await searchWithSerper(query, options)), provider };
 	if (provider === "serply") return { ...(await searchWithSerply(query, options)), provider };
 	if (provider === "baizhi") return { ...(await searchWithBaizhi(query, options)), provider };
+	if (provider === "zai") return { ...(await searchWithZai(query, options)), provider };
 	if (provider === "valyu") return { ...(await searchWithValyu(query, options)), provider };
 	if (provider === "xcrawl") return { ...(await searchWithXCrawl(query, options)), provider };
 	if (provider === "perplexity") return { ...(await searchWithPerplexity(query, options)), provider };
@@ -440,6 +444,7 @@ async function isResolvedProviderAvailable(provider: ResolvedSearchProvider, opt
 	if (provider === "searchinfinity") return isSearchinfinityAvailable();
 	if (provider === "querit") return isQueritAvailable();
 	if (provider === "tavily") return isTavilyAvailable();
+	if (provider === "you") return isYouAvailable();
 	if (provider === "firecrawl") return isFirecrawlAvailable();
 	if (provider === "jina") return isJinaSearchAvailable();
 	if (provider === "serpdive") return isSerpdiveAvailable();
@@ -455,6 +460,7 @@ async function isResolvedProviderAvailable(provider: ResolvedSearchProvider, opt
 	if (provider === "serper") return isSerperAvailable();
 	if (provider === "serply") return isSerplyAvailable();
 	if (provider === "baizhi") return isBaizhiAvailable();
+	if (provider === "zai") return isZaiAvailable();
 	if (provider === "valyu") return isValyuAvailable();
 	if (provider === "xcrawl") return isXcrawlAvailable();
 	if (provider === "perplexity") return isPerplexityAvailable();
@@ -496,7 +502,9 @@ export function providerLabel(provider: ResolvedSearchProvider): string {
 	if (provider === "serpapi") return "SerpApi";
 	if (provider === "serper") return "Serper";
 	if (provider === "serply") return "Serply";
+	if (provider === "you") return "You.com";
 	if (provider === "baizhi") return "Baizhi";
+	if (provider === "zai") return "Z.ai";
 	if (provider === "valyu") return "Valyu";
 	return provider.charAt(0).toUpperCase() + provider.slice(1);
 }
@@ -525,7 +533,7 @@ async function searchWithProviders(
 			: await isResolvedProviderAvailable(provider, options),
 	})))).filter((entry) => entry.available).map((entry) => entry.provider);
 	if (providers.length === 0) {
-		throw new Error("No configured search provider available for provider \"all\". Parallel MCP, DuckDuckGo, Kimi, AnySearch, xAI, Mistral, Bright Data, SerpBase, SerpApi, Serper, Serply, Valyu, and XCrawl are excluded.");
+		throw new Error("No configured search provider available for provider \"all\". Parallel MCP, DuckDuckGo, Kimi, AnySearch, xAI, Mistral, Bright Data, SerpBase, SerpApi, Serper, Serply, You.com, Valyu, Baizhi, Z.ai, and XCrawl are excluded.");
 	}
 
 	const settled = await Promise.allSettled(
@@ -820,7 +828,7 @@ export async function search(query: string, options: FullSearchOptions = {}): Pr
 		"  3. Set OPENAI_API_KEY, BRAVE_API_KEY, PARALLEL_API_KEY, TINYFISH_API_KEY, SEARCH1API_KEY, SEARCHINFINITY_API_KEY, QUERIT_API_KEY, TAVILY_API_KEY, FIRECRAWL_BASE_URL, JINA_API_KEY, SERPDIVE_API_KEY, KAGI_API_KEY, BOCHA_API_KEY, OLLAMA_API_KEY, SEARXNG_BASE_URL, EXA_API_KEY, PERPLEXITY_API_KEY, GEMINI_API_KEY, or CLOUDFLARE_API_KEY env vars\n" +
 		"  4. Set GOOGLE_GEMINI_BASE_URL with CLOUDFLARE_API_KEY for Cloudflare AI Gateway routing\n" +
 		"  5. Sign into gemini.google.com in a supported Chromium-based browser\n" +
-		"  6. Explicitly select provider: \"anysearch\" for anonymous AnySearch, \"xcrawl\" for XCrawl, \"xai\" for Grok, \"mistral\" for Mistral Conversations web search, \"brightdata\" with brightdataSerpZone for paid Bright Data SERP, \"serpbase\", \"serpapi\", \"serper\", or \"serply\" for Google SERP, or \"valyu\" for research search"
+		"  6. Explicitly select provider: \"anysearch\" for anonymous AnySearch, \"xcrawl\" for XCrawl, \"xai\" for Grok, \"mistral\" for Mistral Conversations web search, \"brightdata\" with brightdataSerpZone for paid Bright Data SERP, \"serpbase\", \"serpapi\", \"serper\", or \"serply\" for Google SERP, \"you\" for You.com, \"zai\" for Z.ai GLM Coding Plan search, or \"valyu\" for research search"
 	);
 }
 

package/node_modules/pi-web-access/index.ts

@@ -55,6 +55,7 @@ import { isSearch1APIAvailable } from "./search1api.ts";
 import { isSearchinfinityAvailable } from "./searchinfinity.ts";
 import { isQueritAvailable } from "./querit.ts";
 import { isTavilyAvailable } from "./tavily.ts";
+import { isYouAvailable } from "./you.ts";
 import { isFirecrawlAvailable } from "./firecrawl.ts";
 import { isJinaSearchAvailable } from "./jina-search.ts";
 import { isSerpdiveAvailable } from "./serpdive.ts";
@@ -73,10 +74,11 @@ import { isSerpApiAvailable } from "./serpapi.ts";
 import { isSerperAvailable } from "./serper.ts";
 import { isSerplyAvailable } from "./serply.ts";
 import { isBaizhiAvailable } from "./baizhi.ts";
+import { isZaiAvailable } from "./zai.ts";
 import { isValyuAvailable } from "./valyu.ts";
 import { isXcrawlAvailable } from "./xcrawl.ts";
 import { buildSearchErrorPlan, type SearchErrorDetails, type SearchErrorPlan } from "./render-search-error.ts";
-import { findModelWithProviderRouting, loadEnabledModelPatterns, modelMatchesEnabledPatterns, splitThinkingSuffix } from "./summary-model-scope.ts";
+import { findModelWithProviderRouting, isModelInScope, splitThinkingSuffix } from "./summary-model-scope.ts";
 import { registerCuratorRunLifecycle, resolveWebSearchWorkflow, type WebSearchWorkflow } from "./curator-run.ts";
 import {
 	buildResearchArtifact,
@@ -86,7 +88,7 @@ import {
 	type RecencyFilter,
 	type ResearchArtifact,
 } from "./source-check.ts";
-import { registerWebToolActivation, type WebActivationTool } from "./tool-activation.ts";
+import { registerWebToolActivation } from "./tool-activation.ts";
 
 // Match pi-ai's StringEnum without loading its compat barrel during registration.
 function StringEnum<T extends string[]>(values: T, options?: { description?: string; default?: T[number] }) {
@@ -157,7 +159,9 @@ interface WebSearchConfig {
 	serpapiApiKey?: unknown;
 	serperApiKey?: unknown;
 	serplyApiKey?: unknown;
+	youApiKey?: unknown;
 	baizhiApiKey?: unknown;
+	zaiApiKey?: unknown;
 	tinyfishApiKey?: unknown;
 	valyuApiKey?: unknown;
 	xaiApiKey?: unknown;
@@ -179,6 +183,7 @@ interface WebSearchConfig {
 		allowedProviders?: unknown;
 	};
 	tools?: Partial<Record<keyof ToolNames, { enabled?: boolean }>>;
+	toolActivation?: unknown;
 	commands?: Partial<Record<"websearch" | "curator" | "search" | "google-account", { enabled?: boolean }>>;
 	toolNames?: Partial<ToolNames>;
 	shortcuts?: {
@@ -471,6 +476,7 @@ async function getProviderAvailability(ctx: ExtensionContext): Promise<ProviderA
 		searchinfinity: allowedProviders.has("searchinfinity") && isSearchinfinityAvailable(),
 		querit: allowedProviders.has("querit") && isQueritAvailable(),
 		tavily: allowedProviders.has("tavily") && isTavilyAvailable(),
+		you: allowedProviders.has("you") && isYouAvailable(),
 		firecrawl: allowedProviders.has("firecrawl") && isFirecrawlAvailable(),
 		jina: allowedProviders.has("jina") && isJinaSearchAvailable(),
 		serpdive: allowedProviders.has("serpdive") && isSerpdiveAvailable(),
@@ -493,6 +499,7 @@ async function getProviderAvailability(ctx: ExtensionContext): Promise<ProviderA
 		serper: allowedProviders.has("serper") && isSerperAvailable(),
 		serply: allowedProviders.has("serply") && isSerplyAvailable(),
 		baizhi: allowedProviders.has("baizhi") && isBaizhiAvailable(),
+		zai: allowedProviders.has("zai") && isZaiAvailable(),
 		valyu: allowedProviders.has("valyu") && isValyuAvailable(),
 	};
 	return {
@@ -1069,6 +1076,10 @@ function handleSessionChange(ctx: ExtensionContext): void {
 export default function (pi: ExtensionAPI) {
 	const initConfig = loadConfigForExtensionInit();
 	const fetchModeConfig = resolveFetchModeConfig(initConfig);
+	const toolActivation = initConfig.toolActivation ?? "auto";
+	if (toolActivation !== "auto" && toolActivation !== "dynamic" && toolActivation !== "eager") {
+		throw new Error(`toolActivation in ${WEB_SEARCH_CONFIG_PATH} must be "auto", "dynamic", or "eager"`);
+	}
 	const allowedSearchProviders = initConfig.webSearch?.allowedProviders === undefined ? RESOLVED_SEARCH_PROVIDERS : getAllowedSearchProviders();
 	const allEligibleProviders = allowedSearchProviders.filter(provider => ALL_SEARCH_PROVIDERS.includes(provider));
 	const allExcludedProviders = allowedSearchProviders.filter(provider => !ALL_SEARCH_PROVIDERS.includes(provider));
@@ -1297,27 +1308,16 @@ export default function (pi: ExtensionAPI) {
 			summaryModels.push({ value, label: value });
 		};
 
-		let enabledModelPatterns: string[] | null = null;
-		let scopeLoaded = true;
-		try {
-			enabledModelPatterns = loadEnabledModelPatterns(summaryContext);
-			const availableModels = summaryContext.modelRegistry.getAvailable();
-			for (const model of availableModels) {
-				if (!modelMatchesEnabledPatterns(model, enabledModelPatterns)) continue;
-				const value = `${model.provider}/${model.id}`;
-				availableValues.add(value);
-				addModel(model.provider, model.id);
-			}
-		} catch (err) {
-			scopeLoaded = false;
-			const message = err instanceof Error ? err.message : String(err);
-			console.error(`Failed to load summary models: ${message}`);
+		for (const model of summaryContext.modelRegistry.getAvailable()) {
+			if (!isModelInScope(model, summaryContext.scopedModels)) continue;
+			availableValues.add(`${model.provider}/${model.id}`);
+			addModel(model.provider, model.id);
 		}
 
 		const currentModelValue = summaryContext.model
 			? `${summaryContext.model.provider}/${summaryContext.model.id}`
 			: null;
-		if (scopeLoaded && summaryContext.model && currentModelValue && !seen.has(currentModelValue) && modelMatchesEnabledPatterns(summaryContext.model, enabledModelPatterns)) {
+		if (summaryContext.model && currentModelValue && !seen.has(currentModelValue) && isModelInScope(summaryContext.model, summaryContext.scopedModels)) {
 			addModel(summaryContext.model.provider, summaryContext.model.id);
 		}
 
@@ -1352,12 +1352,12 @@ export default function (pi: ExtensionAPI) {
 		};
 
 		let defaultSummaryModel: string | null = null;
-		if (scopeLoaded && configuredSummaryModel.length > 0) {
+		if (configuredSummaryModel.length > 0) {
 			defaultSummaryModel = availableValues.has(configuredSummaryModel)
 				? configuredSummaryModel
 				: resolveAvailableModelValue(configuredSummaryModel);
 		}
-		if (scopeLoaded && !defaultSummaryModel) {
+		if (!defaultSummaryModel) {
 			for (const preferred of preferredDefaults) {
 				const model = findModelWithProviderRouting(summaryContext.modelRegistry, preferred.provider, preferred.id);
 				const value = model ? `${model.provider}/${model.id}` : null;
@@ -1913,8 +1913,7 @@ export default function (pi: ExtensionAPI) {
 					model: ctx.model,
 					modelRegistry: ctx.modelRegistry,
 					sessionManager: ctx.sessionManager,
-					cwd: ctx.cwd,
-					isProjectTrusted: () => ctx.isProjectTrusted(),
+					scopedModels: ctx.scopedModels,
 				};
 				const summaryModelChoices = await loadSummaryModelChoices(summaryContext);
 
@@ -2143,8 +2142,7 @@ export default function (pi: ExtensionAPI) {
 					model: ctx.model,
 					modelRegistry: ctx.modelRegistry,
 					sessionManager: ctx.sessionManager,
-					cwd: ctx.cwd,
-					isProjectTrusted: () => ctx.isProjectTrusted(),
+					scopedModels: ctx.scopedModels,
 				};
 				const summaryModelChoices = await loadSummaryModelChoices(summaryContext);
 				const generated = await generateSummaryDraft(
@@ -2185,13 +2183,11 @@ export default function (pi: ExtensionAPI) {
 			}
 			if (queryList.length === 1) {
 				const q = queryList[0];
-				const display = q.length > 60 ? q.slice(0, 57) + "..." : q;
-				return new Text(theme.fg("toolTitle", theme.bold("search ")) + theme.fg("accent", `"${display}"`), 0, 0);
+				return new Text(theme.fg("toolTitle", theme.bold("search ")) + theme.fg("accent", `"${q}"`), 0, 0);
 			}
 			const lines = [theme.fg("toolTitle", theme.bold("search ")) + theme.fg("accent", `${queryList.length} queries`)];
 			for (const q of queryList.slice(0, 5)) {
-				const display = q.length > 50 ? q.slice(0, 47) + "..." : q;
-				lines.push(theme.fg("muted", `  "${display}"`));
+				lines.push(theme.fg("muted", `  "${q}"`));
 			}
 			if (queryList.length > 5) {
 				lines.push(theme.fg("muted", `  ... and ${queryList.length - 5} more`));
@@ -2759,13 +2755,11 @@ export default function (pi: ExtensionAPI) {
 			}
 			const lines: string[] = [];
 			if (urlList.length === 1) {
-				const display = urlList[0].length > 60 ? urlList[0].slice(0, 57) + "..." : urlList[0];
-				lines.push(theme.fg("toolTitle", theme.bold("fetch ")) + theme.fg("accent", display));
+				lines.push(theme.fg("toolTitle", theme.bold("fetch ")) + theme.fg("accent", urlList[0]));
 			} else {
 				lines.push(theme.fg("toolTitle", theme.bold("fetch ")) + theme.fg("accent", `${urlList.length} URLs`));
 				for (const u of urlList.slice(0, 5)) {
-					const display = u.length > 60 ? u.slice(0, 57) + "..." : u;
-					lines.push(theme.fg("muted", "  " + display));
+					lines.push(theme.fg("muted", "  " + u));
 				}
 				if (urlList.length > 5) {
 					lines.push(theme.fg("muted", `  ... and ${urlList.length - 5} more`));
@@ -3264,13 +3258,12 @@ export default function (pi: ExtensionAPI) {
 	});
 	}
 
-	const activationTools: WebActivationTool[] = [
+	if (toolActivation !== "eager") registerWebToolActivation(pi, [
 		...(webSearchEnabled ? [{ name: toolNames.webSearch, capability: "search" as const }] : []),
 		...(sourceCheckEnabled ? [{ name: toolNames.sourceCheck, capability: "source-check" as const }] : []),
 		...(fetchContentEnabled ? [{ name: toolNames.fetchContent, capability: "fetch" as const }] : []),
 		...(getSearchContentEnabled ? [{ name: toolNames.getSearchContent, capability: "stored-content" as const }] : []),
-	];
-	registerWebToolActivation(pi, activationTools);
+	], toolActivation);
 
 	if (isCommandEnabled(initConfig, "websearch")) pi.registerCommand("websearch", {
 		description: "Open web search curator",
@@ -3308,8 +3301,7 @@ export default function (pi: ExtensionAPI) {
 				model: ctx.model,
 				modelRegistry: ctx.modelRegistry,
 				sessionManager: ctx.sessionManager,
-				cwd: ctx.cwd,
-				isProjectTrusted: () => ctx.isProjectTrusted(),
+				scopedModels: ctx.scopedModels,
 			};
 			const summaryModelChoices = await loadSummaryModelChoices(summaryContext);