@herbertgao/pi-extensions 2026.9.1 → 2026.9.3

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

@@ -41,6 +41,8 @@ interface WebSearchConfig {
 
 type ProviderHeaders = Record<string, string | null>;
 
+class CustomOpenAIBaseUrlError extends Error {}
+
 interface OpenAIAuth {
 	provider: string;
 	apiKey: string;
@@ -215,7 +217,7 @@ function toRequestHeaders(headers: ProviderHeaders): Record<string, string> {
 	return requestHeaders;
 }
 
-async function resolvePiAuth(ctx: ExtensionContext, responsesUrl: string, providers: readonly string[], modelOverride?: string): Promise<OpenAIAuth | undefined> {
+async function resolvePiAuth(ctx: ExtensionContext, responsesUrl: string, providers: readonly string[], modelOverride?: string, hasExplicitResponsesUrl = false): Promise<OpenAIAuth | undefined> {
 	let models: ReturnType<typeof ctx.modelRegistry.getAll>;
 	try {
 		models = ctx.modelRegistry.getAll();
@@ -225,19 +227,34 @@ async function resolvePiAuth(ctx: ExtensionContext, responsesUrl: string, provid
 	for (const provider of providers) {
 		const preferred = pickSearchModel(models.filter((model) => model.provider === provider));
 		if (!preferred) continue;
+		let resolved: Awaited<ReturnType<typeof ctx.modelRegistry.getApiKeyAndHeaders>>;
 		try {
-			const resolved = await ctx.modelRegistry.getApiKeyAndHeaders(preferred);
-			if (resolved.ok && resolved.apiKey) {
-				return {
-					provider,
-					apiKey: resolved.apiKey,
-					model: modelOverride ?? preferred.id,
-					headers: resolved.headers ?? {},
-					responsesUrl,
-				};
-			}
+			resolved = await ctx.modelRegistry.getApiKeyAndHeaders(preferred);
 		} catch {
+			continue;
+		}
+		if (!resolved.ok || !resolved.apiKey) continue;
+		// Auth can override the model's base URL. Do not guess Responses/web_search
+		// support from a gateway URL, or pair its credential with the official API.
+		const baseUrl = resolved.baseUrl ?? preferred.baseUrl;
+		const useCodexEndpoint = provider === "openai-codex" || isCodexJwt(resolved.apiKey);
+		if (!hasExplicitResponsesUrl && !useCodexEndpoint && baseUrl !== undefined) {
+			let isOfficial = false;
+			try {
+				isOfficial = new URL(baseUrl).toString().replace(/\/+$/u, "") === "https://api.openai.com/v1";
+			} catch {
+			}
+			if (!isOfficial) {
+				throw new CustomOpenAIBaseUrlError(`OpenAI web search cannot reuse Pi credentials with a custom baseUrl by default. Set openaiResponsesUrl in ${CONFIG_PATH} to the full Responses endpoint for this credential.`);
+			}
 		}
+		return {
+			provider,
+			apiKey: resolved.apiKey,
+			model: modelOverride ?? preferred.id,
+			headers: resolved.headers ?? {},
+			responsesUrl,
+		};
 	}
 	return undefined;
 }
@@ -248,7 +265,7 @@ export async function resolveOpenAIAuth(ctx?: ExtensionContext, signal?: AbortSi
 	const modelOverride = resolveConfiguredSearchModel(config.openaiSearchModel);
 	const providers = resolveConfiguredSearchProviders(config.openaiSearchProviders);
 	if (ctx) {
-		const auth = await resolvePiAuth(ctx, responsesUrl, providers, modelOverride);
+		const auth = await resolvePiAuth(ctx, responsesUrl, providers, modelOverride, config.openaiResponsesUrl !== undefined);
 		if (auth) return auth;
 	}
 
@@ -273,7 +290,12 @@ export async function isOpenAISearchAvailable(ctx?: ExtensionContext): Promise<b
 	const config = loadConfig();
 	const responsesUrl = resolveConfiguredResponsesUrl(config.openaiResponsesUrl);
 	const providers = resolveConfiguredSearchProviders(config.openaiSearchProviders);
-	if (ctx && await resolvePiAuth(ctx, responsesUrl, providers)) return true;
+	try {
+		if (ctx && await resolvePiAuth(ctx, responsesUrl, providers, undefined, config.openaiResponsesUrl !== undefined)) return true;
+	} catch (err) {
+		if (err instanceof CustomOpenAIBaseUrlError) return false;
+		throw err;
+	}
 	return hasCredentialSource({
 		provider: "OpenAI",
 		configuredValue: config.openaiApiKey,

package/node_modules/pi-web-access/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pi-web-access",
-  "version": "0.28.0",
-  "description": "Web search, URL fetching, GitHub repo cloning, PDF extraction, YouTube video understanding, and local video analysis for Pi coding agent. Supports OpenAI, Brave, Parallel, TinyFish, Search1API, Searchinfinity, Querit, Tavily, Firecrawl, Jina, SERPdive, Kagi, Ollama, AnySearch, Bright Data SERP, SerpBase, SearXNG, Exa, Perplexity, Gemini, Kimi, and Mistral.",
+  "version": "0.29.0",
+  "description": "Web search, URL fetching, GitHub repo cloning, PDF extraction, YouTube video understanding, and local video analysis for Pi coding agent. Supports OpenAI, Brave, Parallel, TinyFish, Search1API, Searchinfinity, Querit, Tavily, Firecrawl, Jina, SERPdive, Kagi, Ollama, AnySearch, Bright Data SERP, SerpBase, SerpApi, SearXNG, Exa, Perplexity, Gemini, Kimi, and Mistral.",
   "type": "module",
   "scripts": {
     "test": "node --test",

package/node_modules/pi-web-access/page-query.ts

@@ -1,8 +1,9 @@
-import { complete, type Api, type Message, type Model } from "@earendil-works/pi-ai/compat";
+import type { complete, Api, Message, Model } from "@earendil-works/pi-ai/compat";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { existsSync, readFileSync } from "node:fs";
 import { findModelWithProviderRouting, loadEnabledModelPatterns, modelMatchesEnabledPatterns } from "./summary-model-scope.ts";
 import { getWebSearchConfigPath } from "./utils.ts";
+import { awaitWithAbort } from "./abortable.ts";
 
 const OUTPUT_TOKENS = 2_000;
 const INPUT_CONTEXT_FRACTION = 0.6;
@@ -111,7 +112,9 @@ export async function answerFromPage(
 	if (!auth.ok || !auth.apiKey) throw new Error(`No API key available for answer model ${model.provider}/${model.id}`);
 	const registry = ctx.modelRegistry as typeof ctx.modelRegistry & { complete?: typeof complete };
 	const usesRegistryComplete = typeof registry.complete === "function";
-	const completeFn = usesRegistryComplete ? registry.complete!.bind(registry) : complete;
+	if (signal?.aborted) throw new Error("Aborted");
+	const completeFn = usesRegistryComplete ? registry.complete!.bind(registry) : (await awaitWithAbort(import("@earendil-works/pi-ai/compat"), signal)).complete;
+	if (signal?.aborted) throw new Error("Aborted");
 
 	const contextTokens = model.contextWindow > 0 ? model.contextWindow : FALLBACK_CONTEXT_TOKENS;
 	const maximumInputTokens = Math.max(1, Math.min(

package/node_modules/pi-web-access/query-rewrite.ts

@@ -1,5 +1,6 @@
-import { complete, type Api, type Model, type ProviderHeaders } from "@earendil-works/pi-ai/compat";
+import type { complete, Api, Model, ProviderHeaders } from "@earendil-works/pi-ai/compat";
 import type { SummaryGenerationContext } from "./summary-review.ts";
+import { awaitWithAbort } from "./abortable.ts";
 import { findModelWithProviderRouting, loadEnabledModelPatterns, modelMatchesEnabledPatterns } from "./summary-model-scope.ts";
 
 async function resolveFirstAvailableModel(
@@ -28,7 +29,9 @@ export async function rewriteSearchQuery(
 	]);
 	const registry = ctx.modelRegistry as typeof ctx.modelRegistry & { complete?: typeof complete };
 	const usesRegistryComplete = typeof registry.complete === "function";
-	const completeFn = usesRegistryComplete ? registry.complete!.bind(registry) : complete;
+	if (signal.aborted) throw new Error("Aborted");
+	const completeFn = usesRegistryComplete ? registry.complete!.bind(registry) : (await awaitWithAbort(import("@earendil-works/pi-ai/compat"), signal)).complete;
+	if (signal.aborted) throw new Error("Aborted");
 	const response = await completeFn(
 		model,
 		{

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

@@ -0,0 +1,220 @@
+import { existsSync, readFileSync } from "node:fs";
+import { activityMonitor } from "./activity.ts";
+import type { SearchOptions, SearchResponse } from "./perplexity.ts";
+import { hasCredentialSource, redactCredential, resolveCredential } from "./credential-source.ts";
+import { getWebSearchConfigPath } from "./utils.ts";
+
+const SERPAPI_SEARCH_URL = "https://serpapi.com/search.json";
+const CONFIG_PATH = getWebSearchConfigPath();
+const SEARCH_TIMEOUT_MS = 60_000;
+const RECENCY_TBS: Record<NonNullable<SearchOptions["recencyFilter"]>, string> = {
+	day: "qdr:d",
+	week: "qdr:w",
+	month: "qdr:m",
+	year: "qdr:y",
+};
+
+interface WebSearchConfig {
+	serpapiApiKey?: unknown;
+}
+
+interface SerpApiOrganicResult {
+	title?: unknown;
+	link?: unknown;
+	snippet?: unknown;
+}
+
+let cachedConfig: WebSearchConfig | null = null;
+
+function loadConfig(): WebSearchConfig {
+	if (cachedConfig) return cachedConfig;
+	if (!existsSync(CONFIG_PATH)) {
+		cachedConfig = {};
+		return cachedConfig;
+	}
+	const raw = readFileSync(CONFIG_PATH, "utf-8");
+	let parsed: unknown;
+	try {
+		parsed = JSON.parse(raw);
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		throw new Error(`Failed to parse ${CONFIG_PATH}: ${message}`);
+	}
+	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+		throw new Error(`Invalid config in ${CONFIG_PATH}: expected a JSON object`);
+	}
+	cachedConfig = parsed as WebSearchConfig;
+	return cachedConfig;
+}
+
+async function getApiKey(signal?: AbortSignal): Promise<string | null> {
+	return resolveCredential({
+		provider: "SerpApi",
+		configuredValue: loadConfig().serpapiApiKey,
+		environmentValue: process.env.SERPAPI_KEY,
+		signal,
+	});
+}
+
+async function requireApiKey(signal?: AbortSignal): Promise<string> {
+	const apiKey = await getApiKey(signal);
+	if (!apiKey) {
+		throw new Error(
+			"SerpApi API key not found. Either:\n" +
+			`  1. Create ${CONFIG_PATH} with { "serpapiApiKey": "your-key" }\n` +
+			"  2. Set SERPAPI_KEY environment variable\n" +
+			"Get a key at https://serpapi.com/manage-api-key",
+		);
+	}
+	return apiKey;
+}
+
+function normalizeCount(value: number | undefined): number {
+	if (typeof value !== "number" || !Number.isFinite(value)) return 5;
+	return Math.max(1, Math.min(Math.floor(value), 20));
+}
+
+interface DomainFilters {
+	include: string[];
+	exclude: string[];
+}
+
+function normalizeDomain(value: string): string | null {
+	let input = value.trim().toLowerCase();
+	if (!input) return null;
+	if (input.startsWith("-")) input = input.slice(1).trim();
+	if (!input) return null;
+	try {
+		const parsed = input.includes("://") ? new URL(input) : new URL(`https://${input}`);
+		input = parsed.hostname;
+	} catch {
+		input = input.split("/")[0]?.split(":")[0] ?? "";
+	}
+	input = input.replace(/^\.+|\.+$/g, "");
+	return /^[a-z0-9][a-z0-9.-]*\.[a-z]{2,}$/i.test(input) ? input : null;
+}
+
+function parseDomainFilter(domainFilter: string[] | undefined): DomainFilters {
+	const filters: DomainFilters = { include: [], exclude: [] };
+	for (const raw of domainFilter ?? []) {
+		const domain = normalizeDomain(raw);
+		if (!domain) continue;
+		const target = raw.trim().startsWith("-") ? filters.exclude : filters.include;
+		if (!target.includes(domain)) target.push(domain);
+	}
+	return filters;
+}
+
+function passesDomainFilters(url: string, filters: DomainFilters): boolean {
+	if (filters.include.length === 0 && filters.exclude.length === 0) return true;
+	let hostname: string;
+	try {
+		hostname = new URL(url).hostname.toLowerCase();
+	} catch {
+		return false;
+	}
+	const matches = (domain: string) => hostname === domain || hostname.endsWith(`.${domain}`);
+	if (filters.exclude.some(matches)) return false;
+	return filters.include.length === 0 || filters.include.some(matches);
+}
+
+function buildQuery(query: string, filters: DomainFilters): string {
+	const parts = [query];
+	if (filters.include.length === 1) parts.push(`site:${filters.include[0]}`);
+	if (filters.include.length > 1) parts.push(`(${filters.include.map(domain => `site:${domain}`).join(" OR ")})`);
+	for (const domain of filters.exclude) parts.push(`-site:${domain}`);
+	return parts.join(" ");
+}
+
+function errorMessage(err: unknown): string {
+	return err instanceof Error ? err.message : String(err);
+}
+
+function invalidResponse(message: string): Error {
+	return new Error(`SerpApi returned invalid response: ${message}`);
+}
+
+function parseResponse(value: unknown): SerpApiOrganicResult[] {
+	if (!value || typeof value !== "object" || Array.isArray(value)) throw invalidResponse("expected an object envelope");
+	const envelope = value as Record<string, unknown>;
+	if (typeof envelope.error === "string" && envelope.error.trim()) throw invalidResponse(envelope.error.trim());
+	if (!Array.isArray(envelope.organic_results)) throw invalidResponse("expected organic_results array");
+	return envelope.organic_results as SerpApiOrganicResult[];
+}
+
+function buildAnswer(results: SearchResponse["results"]): string {
+	return results.map((result) => result.snippet
+		? `${result.snippet}\nSource: ${result.title} (${result.url})`
+		: `Source: ${result.title} (${result.url})`).join("\n\n");
+}
+
+export function isSerpApiAvailable(): boolean {
+	return hasCredentialSource({ provider: "SerpApi", configuredValue: loadConfig().serpapiApiKey, environmentValue: process.env.SERPAPI_KEY });
+}
+
+export async function searchWithSerpApi(query: string, options: SearchOptions = {}): Promise<SearchResponse> {
+	const apiKey = await requireApiKey(options.signal);
+	const numResults = normalizeCount(options.numResults);
+	const filters = parseDomainFilter(options.domainFilter);
+	const requestCount = options.domainFilter?.length ? Math.min(20, numResults + 5) : numResults;
+	const url = new URL(SERPAPI_SEARCH_URL);
+	url.searchParams.set("engine", "google");
+	url.searchParams.set("q", buildQuery(query, filters));
+	url.searchParams.set("api_key", apiKey);
+	url.searchParams.set("num", String(requestCount));
+	if (options.recencyFilter) url.searchParams.set("tbs", RECENCY_TBS[options.recencyFilter]);
+	const activityId = activityMonitor.logStart({ type: "api", query });
+	const timeoutSignal = AbortSignal.timeout(SEARCH_TIMEOUT_MS);
+	let response: Response;
+	let entries: SerpApiOrganicResult[];
+	try {
+		response = await fetch(url, {
+			headers: { Accept: "application/json" },
+			signal: options.signal ? AbortSignal.any([timeoutSignal, options.signal]) : timeoutSignal,
+		});
+		if (!response.ok) {
+			const errorText = await response.text();
+			throw new Error(`SerpApi error ${response.status}: ${redactCredential(errorText, apiKey).slice(0, 300)}`);
+		}
+		let rawData: unknown;
+		try {
+			rawData = await response.json();
+		} catch (err) {
+			if (err instanceof Error && err.name === "TimeoutError") throw err;
+			throw new Error(`SerpApi returned invalid JSON: ${errorMessage(err)}`);
+		}
+		entries = parseResponse(rawData);
+	} catch (err) {
+		if (options.signal?.aborted) {
+			activityMonitor.logComplete(activityId, 0);
+			throw new Error("Aborted");
+		}
+		const message = errorMessage(err);
+		const providerTimeout = timeoutSignal.aborted || (err instanceof Error && err.name === "TimeoutError");
+		const outgoing = providerTimeout
+			? new Error(`SerpApi request timed out after ${Math.round(SEARCH_TIMEOUT_MS / 1000)}s`)
+			: (() => {
+				const redactedMessage = redactCredential(message, apiKey);
+				if (redactedMessage === message && err instanceof Error) return err;
+				const redactedError = new Error(redactedMessage);
+				if (err instanceof Error) redactedError.name = err.name;
+				return redactedError;
+			})();
+		activityMonitor.logError(activityId, redactCredential(errorMessage(outgoing), apiKey));
+		throw outgoing;
+	}
+	activityMonitor.logComplete(activityId, response.status);
+	const results: SearchResponse["results"] = [];
+	for (const entry of entries) {
+		if (!entry || typeof entry !== "object") continue;
+		if (typeof entry.link !== "string" || !entry.link) continue;
+		if (!passesDomainFilters(entry.link, filters)) continue;
+		results.push({
+			title: typeof entry.title === "string" && entry.title.trim() ? entry.title.trim() : `Source ${results.length + 1}`,
+			url: entry.link,
+			snippet: typeof entry.snippet === "string" ? entry.snippet : "",
+		});
+		if (results.length >= numResults) break;
+	}
+	return { answer: buildAnswer(results), results };
+}

package/node_modules/pi-web-access/ssrf-protection.ts

@@ -232,6 +232,7 @@ export async function fetchRemoteUrl(
 	const fetchImpl = options.fetch ?? fetch;
 	const maxRedirects = options.maxRedirects ?? DEFAULT_MAX_REDIRECTS;
 	let current = await validateRemoteUrl(url, options);
+	const configuredOrigin = current.origin;
 	let requestInit = init;
 
 	for (let redirects = 0; redirects <= maxRedirects; redirects++) {
@@ -243,7 +244,10 @@ export async function fetchRemoteUrl(
 		if (redirects === maxRedirects) throw new Error(`Too many redirects fetching ${current.toString()}`);
 
 		const from = current;
-		current = await validateRemoteUrl(new URL(location, current), options);
+		const next = new URL(location, current);
+		// allowLoopback exempts an explicitly configured endpoint, never a redirect target: a loopback
+		// base must not be able to pivot the request onto a different loopback origin.
+		current = await validateRemoteUrl(next, next.origin === configuredOrigin ? options : { ...options, allowLoopback: false });
 		if (response.status === 303 || ((response.status === 301 || response.status === 302) && requestInit.method?.toUpperCase() === "POST")) {
 			const { body: _body, ...nextInit } = requestInit;
 			requestInit = { ...nextInit, method: "GET" };

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

@@ -426,8 +426,17 @@ function readCachedFetchData(data: StoredSearchData, now = Date.now()): StoredSe
 	}
 }
 
+function pruneExpiredFetchedResults(now: number): void {
+	for (const [id, data] of storedResults) {
+		if (data.type === "fetch" && now - data.timestamp >= CACHE_TTL_MS) {
+			storedResults.set(id, unavailableFetchData(data, "Cached fetched content is missing or expired"));
+		}
+	}
+}
+
 export function pruneExpiredFetchCache(now = Date.now(), requestedLimits?: Partial<FetchCacheLimits>): void {
 	const limits = cacheLimits(requestedLimits);
+	pruneExpiredFetchedResults(now);
 	try { pruneFetchCache(now, limits); } catch {}
 }
 
@@ -436,6 +445,7 @@ export function storeResult(id: string, data: StoredSearchData): void {
 }
 
 export function storeFetchedContentResult(id: string, data: StoredSearchData & { type: "fetch"; urls: ExtractedContent[] }): StoredSearchData {
+	pruneExpiredFetchedResults(Date.now());
 	let ref: FetchCacheRef | null = null;
 	let cacheError: string | undefined;
 	try {

package/node_modules/pi-web-access/summary-review.ts

@@ -1,5 +1,5 @@
-import { clampThinkingLevel, type ModelThinkingLevel, type ThinkingLevel } from "@earendil-works/pi-ai";
-import { complete, completeSimple, type Api, type Message, type Model } from "@earendil-works/pi-ai/compat";
+import type { ModelThinkingLevel, ThinkingLevel } from "@earendil-works/pi-ai";
+import type { complete, Api, Message, Model } from "@earendil-works/pi-ai/compat";
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { findModelWithProviderRouting, loadEnabledModelPatterns, modelMatchesEnabledPatterns, splitThinkingSuffix, type SummaryThinkingLevel } from "./summary-model-scope.ts";
 import type { QueryResultData } from "./storage.ts";
@@ -204,8 +204,9 @@ function parseModelSelector(value: string): { provider: string; id: string; thin
 	};
 }
 
-function resolveThinkingLevel(model: Model<Api>, requested?: SummaryThinkingLevel): ModelThinkingLevel | undefined {
+async function resolveThinkingLevel(model: Model<Api>, requested?: SummaryThinkingLevel): Promise<ModelThinkingLevel | undefined> {
 	if (!requested) return undefined;
+	const { clampThinkingLevel } = await import("@earendil-works/pi-ai");
 	return clampThinkingLevel(model, requested as ModelThinkingLevel);
 }
 
@@ -295,22 +296,21 @@ export async function generateSummaryDraft(
 	if (!ctx || !ctx.modelRegistry) {
 		throw new Error("Summary generation context unavailable");
 	}
+	if (signal?.aborted) throw new Error("Aborted");
 
 	const registry = ctx.modelRegistry as SummaryModelRegistry;
 	const customCompleteFn = completeFn !== undefined;
 	const usesRegistryComplete = !customCompleteFn && typeof registry.complete === "function";
-	completeFn ??= usesRegistryComplete ? registry.complete!.bind(registry) as CompleteFunction : complete;
+	let piAiCompat: typeof import("@earendil-works/pi-ai/compat") | undefined;
 
 	const generationStartedAt = Date.now();
 	const deadlineController = new AbortController();
 	const deadlineMarker = Symbol("summary-generation-deadline");
 	let deadlineTimer: ReturnType<typeof setTimeout> | undefined;
-	let resolveDeadline!: () => void;
 	const deadlinePromise = new Promise<typeof deadlineMarker>(resolve => {
-		resolveDeadline = () => resolve(deadlineMarker);
 		deadlineTimer = setTimeout(() => {
 			deadlineController.abort();
-			resolveDeadline();
+			resolve(deadlineMarker);
 		}, deadlineMs);
 	});
 
@@ -326,17 +326,24 @@ export async function generateSummaryDraft(
 		? AbortSignal.any([signal, deadlineController.signal])
 		: deadlineController.signal;
 
+	function checkSummaryDeadline(): void {
+		if (signal?.aborted) throw new Error("Aborted");
+		// Imports or synchronous providers can finish before an overdue timer runs.
+		if (deadlineController.signal.aborted || Date.now() - generationStartedAt >= deadlineMs) {
+			deadlineController.abort();
+			throw deadlineMarker;
+		}
+	}
+
 	async function raceSummaryOperation<T>(operation: Promise<T>): Promise<T> {
 		// A provider may ignore AbortSignal and never settle; observe it before racing so
 		// its eventual rejection cannot become an unhandled promise rejection.
 		void operation.then(() => undefined, () => undefined);
+		checkSummaryDeadline();
 		const contenders: Promise<unknown>[] = [operation, deadlinePromise];
 		if (callerAbortPromise) contenders.push(callerAbortPromise);
 		const result = await Promise.race(contenders);
-		if (result === deadlineMarker) {
-			if (signal?.aborted) throw new Error("Aborted");
-			throw deadlineMarker;
-		}
+		checkSummaryDeadline();
 		return result as T;
 	}
 
@@ -345,12 +352,14 @@ export async function generateSummaryDraft(
 		const prompt = buildSummaryPrompt(results, feedback);
 		let resolved: Awaited<ReturnType<typeof resolveSummaryModelCandidates>>;
 		try {
+			checkSummaryDeadline();
+			if (!customCompleteFn && !usesRegistryComplete) {
+				piAiCompat = await raceSummaryOperation(import("@earendil-works/pi-ai/compat"));
+			}
+			completeFn ??= usesRegistryComplete ? registry.complete!.bind(registry) as CompleteFunction : piAiCompat!.complete;
 			resolved = await raceSummaryOperation(resolveSummaryModelCandidates(ctx, modelOverride));
 		} catch (err) {
-			if (signal?.aborted) throw new Error("Aborted");
-			if (err === deadlineMarker || deadlineController.signal.aborted) {
-				return buildFallbackSummary(results, "summary-generation-timeout", Date.now() - generationStartedAt);
-			}
+			checkSummaryDeadline();
 			const message = err instanceof Error ? err.message : String(err);
 			return buildFallbackSummary(results, `summary-model-settings-error: ${message}`, Date.now() - generationStartedAt);
 		}
@@ -364,7 +373,7 @@ export async function generateSummaryDraft(
 					content: [{ type: "text", text: prompt }],
 					timestamp: Date.now(),
 				};
-				const requestedThinkingLevel = resolveThinkingLevel(model, thinkingLevel);
+				const requestedThinkingLevel = await raceSummaryOperation(resolveThinkingLevel(model, thinkingLevel));
 				const enabledThinkingLevel = requestedThinkingLevel && requestedThinkingLevel !== "off"
 					? requestedThinkingLevel as ThinkingLevel
 					: undefined;
@@ -374,8 +383,9 @@ export async function generateSummaryDraft(
 					...(requestedThinkingLevel ? { reasoning: requestedThinkingLevel } : {}),
 					...(enabledThinkingLevel ? { reasoningEffort: enabledThinkingLevel } : {}),
 				};
+				checkSummaryDeadline();
 				const completion = thinkingLevel !== undefined && !customCompleteFn && !usesRegistryComplete
-					? completeSimple(model, { messages: [userMessage] }, { apiKey, headers, signal: completionSignal, ...(enabledThinkingLevel ? { reasoning: enabledThinkingLevel } : {}) })
+					? piAiCompat!.completeSimple(model, { messages: [userMessage] }, { apiKey, headers, signal: completionSignal, ...(enabledThinkingLevel ? { reasoning: enabledThinkingLevel } : {}) })
 					: completeFn(model, { messages: [userMessage] }, completionOptions);
 
 				const response = await raceSummaryOperation(Promise.resolve(completion));
@@ -408,10 +418,7 @@ export async function generateSummaryDraft(
 					},
 				};
 			} catch (err) {
-				if (signal?.aborted) throw new Error("Aborted");
-				if (err === deadlineMarker || deadlineController.signal.aborted) {
-					return buildFallbackSummary(results, "summary-generation-timeout", Date.now() - generationStartedAt);
-				}
+				checkSummaryDeadline();
 				if (isAbortError(err)) throw err;
 				lastError = err instanceof Error ? err.message : String(err);
 			}
@@ -422,6 +429,12 @@ export async function generateSummaryDraft(
 			lastError ? `summary-model-unavailable: ${lastError}` : "summary-model-unavailable",
 			Date.now() - generationStartedAt,
 		);
+	} catch (err) {
+		if (signal?.aborted) throw new Error("Aborted");
+		if (err === deadlineMarker) {
+			return buildFallbackSummary(results, "summary-generation-timeout", Date.now() - generationStartedAt);
+		}
+		throw err;
 	} finally {
 		if (deadlineTimer) clearTimeout(deadlineTimer);
 		if (signal && callerAbortListener) signal.removeEventListener("abort", callerAbortListener);

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

@@ -22,7 +22,7 @@ export function getWebSearchConfigDir(): string {
 		if (existsSync(join(legacyDir, "web-search.json"))) return cachedWebSearchConfigDir = legacyDir;
 		return cachedWebSearchConfigDir = xdgDir;
 	}
-	return cachedWebSearchConfigDir = join(homedir(), ".pi");
+	return cachedWebSearchConfigDir = join(homedir(), ".pi", "agent");
 }
 
 export function getWebSearchConfigPath(): string {
@@ -208,7 +208,7 @@ const proxyStorage = new AsyncLocalStorage<string | null>();
 
 export function normalizeProxyUrl(value: unknown, source: string): string | null {
 	if (value === undefined || value === null) return null;
-	if (typeof value !== "string") throw new Error(`${source} must be an http(s) proxy URL string`);
+	if (typeof value !== "string") throw new Error(`${source} must be an http(s) or socks proxy URL string`);
 	const trimmed = value.trim();
 	if (!trimmed) return null;
 	let parsed: URL;
@@ -217,8 +217,10 @@ export function normalizeProxyUrl(value: unknown, source: string): string | null
 	} catch {
 		throw new Error(`${source} must be a valid proxy URL: ${JSON.stringify(trimmed)}`);
 	}
-	if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
-		throw new Error(`${source} must use the http:// or https:// scheme: ${trimmed}`);
+	if (parsed.protocol !== "http:" && parsed.protocol !== "https:" &&
+		parsed.protocol !== "socks4:" && parsed.protocol !== "socks4a:" &&
+		parsed.protocol !== "socks5:" && parsed.protocol !== "socks5h:") {
+		throw new Error(`${source} must use the http://, https://, or socks scheme: ${trimmed}`);
 	}
 	if (!parsed.hostname) throw new Error(`${source} must include a proxy host: ${trimmed}`);
 	parsed.hash = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herbertgao/pi-extensions",
-  "version": "2026.9.1",
+  "version": "2026.9.3",
   "description": "Aggregate installer for HerbertGao-maintained Pi extensions.",
   "keywords": [
     "extensions",
@@ -47,6 +47,7 @@
     "@herbertgao/pi-cc-extensions": "0.9.0",
     "@herbertgao/pi-subagents": "0.17.1",
     "@herbertgao/resume-from": "0.2.0",
+    "@herbertgao/sol-pi": "0.2.0",
     "@juicesharp/rpiv-ask-user-question": "2.9.0",
     "@juicesharp/rpiv-config": "^2.9.0",
     "@luxusai/pi-hindsight": "0.12.0",
@@ -56,7 +57,7 @@
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@mozilla/readability": "^0.6.0",
     "@napi-rs/keyring": "^1.3.0",
-    "@narumitw/pi-btw": "0.57.0",
+    "@narumitw/pi-btw": "0.58.1",
     "@narumitw/pi-caffeinate": "0.49.7",
     "@narumitw/pi-tui-kit": "^0.59.0",
     "@noble/ed25519": "^3.1.0",
@@ -90,9 +91,9 @@
     "open": "^10.2.0",
     "p-limit": "^6.1.0",
     "pi-footer": "0.5.1",
-    "pi-lens": "4.1.4",
+    "pi-lens": "4.1.6",
     "pi-mcp-adapter": "2.32.1",
-    "pi-web-access": "0.28.0",
+    "pi-web-access": "0.29.0",
     "pidusage": "^4.0.1",
     "promise.try": "^2.0.1",
     "qrcode-terminal": "^0.12.0",
@@ -119,6 +120,7 @@
     "@herbertgao/pi-cc-extensions",
     "@herbertgao/pi-subagents",
     "@herbertgao/resume-from",
+    "@herbertgao/sol-pi",
     "@juicesharp/rpiv-ask-user-question",
     "@luxusai/pi-hindsight",
     "@narumitw/pi-btw",
@@ -144,6 +146,7 @@
     "extensions": [
       "./node_modules/@dietrichgebert/ponytail/pi-extension/index.js",
       "./node_modules/@herbertgao/pi-cc-extensions/extensions/index.ts",
+      "./node_modules/@herbertgao/sol-pi/src/sol-pi/index.ts",
       "./node_modules/@tifan/pi-copy-response/src/index.ts",
       "./node_modules/@herbertgao/resume-from/shims/pi/extensions/resume-from.js",
       "./node_modules/@tifan/pi-handoff/src/index.ts",