@herbertgao/pi-extensions 2026.9.2 → 2026.9.3

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.2",
+  "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.58.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.5",
+    "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",

package/node_modules/pi-lens/dist/tools/ast-dump.js

@@ -1,103 +0,0 @@
-import { Type } from "../clients/deps/typebox.js";
-import { compactRenderResult } from "./render-compact.js";
-import { LANGUAGES } from "./shared.js";
-function createAstDumpToolWithName(astGrepClient, name) {
-    return {
-        name,
-        label: "AST-Grep Dump",
-        description: "Dump the tree-sitter AST for a source snippet using ast-grep CLI. Use when ast_grep_search returns zero matches and you need exact node kinds, field names, or nesting. Named nodes only by default; includeAnonymous=true shows punctuation/CST nodes too.",
-        promptSnippet: "Inspect AST node kinds before writing ast-grep patterns",
-        renderResult: compactRenderResult(({ details, args, isError, lineCount, text }) => {
-            const lang = details?.lang ?? (typeof args.lang === "string" ? args.lang : "");
-            if (isError) {
-                return `${name} ${lang} — ${text.split("\n")[0] ?? "error"}`.trim();
-            }
-            return `${name} ${lang} — ${lineCount} AST nodes`.replace(/\s+/g, " ");
-        }),
-        parameters: Type.Object({
-            source: Type.String({
-                description: "Source code snippet to parse and dump",
-            }),
-            lang: Type.String({
-                enum: [...LANGUAGES],
-                description: "Target language",
-            }),
-            includeAnonymous: Type.Optional(Type.Boolean({
-                description: "Show anonymous punctuation/CST nodes too (default false)",
-            })),
-        }),
-        async execute(_toolCallId, params, _signal, _onUpdate) {
-            const source = typeof params.source === "string" ? params.source : "";
-            const lang = typeof params.lang === "string"
-                ? params.lang.replace(/^"|"$/g, "")
-                : "";
-            const includeAnonymous = params.includeAnonymous === true;
-            try {
-                if (!source.trim()) {
-                    return {
-                        content: [{ type: "text", text: "source is required" }],
-                        isError: true,
-                        details: { lang, includeAnonymous },
-                    };
-                }
-                if (_signal.aborted) {
-                    return {
-                        content: [
-                            { type: "text", text: "Error: operation aborted" },
-                        ],
-                        isError: true,
-                        details: { lang, includeAnonymous },
-                    };
-                }
-                if (!(await astGrepClient.ensureAvailable())) {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: "ast-grep CLI not found. Install: npm i -D @ast-grep/cli",
-                            },
-                        ],
-                        isError: true,
-                        details: { lang, includeAnonymous },
-                    };
-                }
-                if (_signal.aborted) {
-                    return {
-                        content: [
-                            { type: "text", text: "Error: operation aborted" },
-                        ],
-                        isError: true,
-                        details: { lang, includeAnonymous },
-                    };
-                }
-                const result = await astGrepClient.dumpAst(source, lang, {
-                    includeAnonymous,
-                });
-                if (result.error) {
-                    return {
-                        content: [
-                            { type: "text", text: `Error: ${result.error}` },
-                        ],
-                        isError: true,
-                        details: { lang, includeAnonymous },
-                    };
-                }
-                return {
-                    content: [{ type: "text", text: result.output ?? "" }],
-                    details: { lang, includeAnonymous },
-                };
-            }
-            catch (err) {
-                const message = err instanceof Error ? err.message : String(err);
-                return {
-                    content: [{ type: "text", text: `Error: ${message}` }],
-                    isError: true,
-                    details: { lang, includeAnonymous },
-                };
-            }
-        },
-    };
-}
-export function createAstGrepDumpTool(astGrepClient) {
-    return createAstDumpToolWithName(astGrepClient, "ast_grep_dump");
-}