@humain/terminal 0.1.1 → 0.2.2

package/dist/humain/web-access/vendor/index.js

@@ -9,7 +9,6 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 import { Box, Text, truncateToWidth } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import pLimit from "p-limit";
-import { StringEnum } from "@earendil-works/pi-ai/compat";
 import { normalizeFetchContentParams } from "./fetch-params.js";
 import { resolveAuthFetchProfile } from "./auth-fetch.js";
 import { findContent } from "./content-find.js";
@@ -56,12 +55,23 @@ import { isMistralAvailable } from "./mistral-search.js";
 import { isKimiSearchAvailable } from "./kimi-search.js";
 import { isBrightDataAvailable } from "./brightdata.js";
 import { isSerpBaseAvailable } from "./serpbase.js";
+import { isSerpApiAvailable } from "./serpapi.js";
 import { isSerperAvailable } from "./serper.js";
 import { isValyuAvailable } from "./valyu.js";
 import { isXcrawlAvailable } from "./xcrawl.js";
 import { buildSearchErrorPlan } from "./render-search-error.js";
 import { findModelWithProviderRouting, loadEnabledModelPatterns, modelMatchesEnabledPatterns, splitThinkingSuffix } from "./summary-model-scope.js";
+import { registerCuratorRunLifecycle, resolveWebSearchWorkflow } from "./curator-run.js";
 import { buildResearchArtifact, withClaimAssessment, storeResearchArtifact, getResearchArtifact, } from "./source-check.js";
+// Match pi-ai's StringEnum without loading its compat barrel during registration.
+function StringEnum(values, options) {
+    return Type.Unsafe({
+        type: "string",
+        enum: values,
+        ...(options?.description && { description: options.description }),
+        ...(options?.default && { default: options.default }),
+    });
+}
 const WEB_SEARCH_CONFIG_PATH = getWebSearchConfigPath();
 let extractModulePromise;
 async function fetchAllContent(urls, signal, options) {
@@ -252,16 +262,6 @@ function normalizeCuratorTimeoutSeconds(value) {
         return undefined;
     return Math.min(normalized, MAX_CURATOR_TIMEOUT_SECONDS);
 }
-function resolveWorkflow(input, hasUI) {
-    const normalized = typeof input === "string" ? input.trim().toLowerCase() : "";
-    if (normalized === "auto-summary")
-        return "auto-summary";
-    if (!hasUI)
-        return "none";
-    if (normalized === "none")
-        return "none";
-    return "summary-review";
-}
 function normalizeQueryList(queryList) {
     const normalized = [];
     for (const query of queryList) {
@@ -354,6 +354,7 @@ async function getProviderAvailability(ctx) {
         mistral: isMistralAvailable(),
         brightdata: isBrightDataAvailable(),
         serpbase: isSerpBaseAvailable(),
+        serpapi: isSerpApiAvailable(),
         serper: isSerperAvailable(),
         valyu: isValyuAvailable(),
     };
@@ -904,6 +905,7 @@ function handleSessionChange(ctx) {
 }
 export default function (pi) {
     const initConfig = loadConfigForExtensionInit();
+    const curatorRunState = registerCuratorRunLifecycle(pi);
     installGlobalProxyFetch();
     const toolNames = resolveToolNames(initConfig);
     const webSearchEnabled = isToolEnabled(initConfig, "webSearch");
@@ -1341,6 +1343,8 @@ export default function (pi) {
                 onSubmit(payload) {
                     if (pendingCurates.get(callId) !== pc)
                         return;
+                    if (payload.autoApproveRemainingSearches)
+                        curatorRunState.approveRemainingSearches();
                     searchAbort.abort();
                     const filtered = payload.selectedQueryIndices.length > 0
                         ? filterByQueryIndices(payload.selectedQueryIndices, pc.searchResults)
@@ -1569,7 +1573,7 @@ export default function (pi) {
         pi.registerTool({
             name: toolNames.webSearch,
             label: "Web Search",
-            description: `Search the web using OpenAI, Brave, Parallel, Parallel MCP, TinyFish, Search1API, Searchinfinity, Querit, Tavily, Firecrawl, Jina, SERPdive, Kagi, Bocha, Ollama, SearXNG, DuckDuckGo, Exa, Perplexity, Gemini, Kimi, AnySearch, XCrawl, Valyu, xAI, Mistral, Bright Data, SerpBase, or Serper. Pass a provider array to search only those providers simultaneously, or use provider "all" to search every eligible provider except Parallel MCP, DuckDuckGo, Kimi, AnySearch, XCrawl, Valyu, xAI, Mistral, Bright Data, SerpBase, and Serper. Returns an AI-synthesized answer with source citations. OpenAI search uses a Codex subscription or OpenAI API key; Kimi search uses a Kimi Code Plan authenticated through /login kimi-coding; xAI search uses a SuperGrok/X Premium subscription or xAI API key; Mistral search uses a Mistral API key. Parallel MCP, DuckDuckGo, Kimi, AnySearch, XCrawl, Valyu, xAI, Mistral, Bright Data, SerpBase, and Serper are available only when explicitly selected. For comprehensive research, prefer queries (plural) with 2-4 varied angles over a single query — each query gets its own synthesized answer, so varying phrasing and scope gives much broader coverage. When includeContent is true, full page content is fetched in the background. Searches auto-open the interactive browser curator and stream results live; set workflow to "none" to skip curation or "auto-summary" for a model-generated summary without the browser curator. The configured provider is used when provider is omitted or set to auto; omit provider unless explicitly overriding it. Without a configured provider, SearXNG is preferred first for local/private search. When the active Pi model is openai-codex, Codex-backed OpenAI search is preferred next. Otherwise Exa is preferred before OpenAI, then Brave, Parallel, TinyFish, Search1API, Searchinfinity, Querit, Tavily, Firecrawl, Jina, SERPdive, Kagi, Bocha, Ollama, Perplexity, Gemini API, or Gemini Web.`,
+            description: `Search the web using OpenAI, Brave, Parallel, Parallel MCP, TinyFish, Search1API, Searchinfinity, Querit, Tavily, Firecrawl, Jina, SERPdive, Kagi, Bocha, Ollama, SearXNG, DuckDuckGo, Exa, Perplexity, Gemini, Kimi, AnySearch, XCrawl, Valyu, xAI, Mistral, Bright Data, SerpBase, SerpApi, or Serper. Pass a provider array to search only those providers simultaneously, or use provider "all" to search every eligible provider except Parallel MCP, DuckDuckGo, Kimi, AnySearch, XCrawl, Valyu, xAI, Mistral, Bright Data, SerpBase, SerpApi, and Serper. Returns an AI-synthesized answer with source citations. OpenAI search uses a Codex subscription or OpenAI API key; Kimi search uses a Kimi Code Plan authenticated through /login kimi-coding; xAI search uses a SuperGrok/X Premium subscription or xAI API key; Mistral search uses a Mistral API key. Parallel MCP, DuckDuckGo, Kimi, AnySearch, XCrawl, Valyu, xAI, Mistral, Bright Data, SerpBase, SerpApi, and Serper are available only when explicitly selected. For comprehensive research, prefer queries (plural) with 2-4 varied angles over a single query — each query gets its own synthesized answer, so varying phrasing and scope gives much broader coverage. When includeContent is true, full page content is fetched in the background. Searches auto-open the interactive browser curator and stream results live; set workflow to "none" to skip curation or "auto-summary" for a model-generated summary without the browser curator. The configured provider is used when provider is omitted or set to auto; omit provider unless explicitly overriding it. Without a configured provider, SearXNG is preferred first for local/private search. When the active Pi model is openai-codex, Codex-backed OpenAI search is preferred next. Otherwise Exa is preferred before OpenAI, then Brave, Parallel, TinyFish, Search1API, Searchinfinity, Querit, Tavily, Firecrawl, Jina, SERPdive, Kagi, Bocha, Ollama, Perplexity, Gemini API, or Gemini Web.`,
             promptSnippet: "Use for web research questions. Prefer {queries:[...]} with 2-4 varied angles over a single query for broader coverage. Omit provider unless explicitly overriding the configured default.",
             parameters: Type.Object({
                 query: Type.Optional(Type.String({ description: "Single search query. For research tasks, prefer 'queries' with multiple varied angles instead." })),
@@ -1578,12 +1582,12 @@ export default function (pi) {
                 includeContent: Type.Optional(Type.Boolean({ description: "Fetch full page content (async)" })),
                 recencyFilter: Type.Optional(StringEnum(["day", "week", "month", "year"], { description: "Filter by recency" })),
                 domainFilter: Type.Optional(Type.Array(Type.String(), { description: "Limit to domains (prefix with - to exclude)" })),
-                provider: Type.Optional(searchProviderSchema("Search provider or non-empty list of providers to search simultaneously; use all to search every eligible provider except Parallel MCP, DuckDuckGo, Kimi, AnySearch, XCrawl, Valyu, xAI, Mistral, Bright Data, SerpBase, and Serper, omit this field to use the configured provider, or use auto when none is configured")),
+                provider: Type.Optional(searchProviderSchema("Search provider or non-empty list of providers to search simultaneously; use all to search every eligible provider except Parallel MCP, DuckDuckGo, Kimi, AnySearch, XCrawl, Valyu, xAI, Mistral, Bright Data, SerpBase, SerpApi, and Serper, omit this field to use the configured provider, or use auto when none is configured")),
                 workflow: Type.Optional(StringEnum(["none", "summary-review", "auto-summary"], {
                     description: "Search workflow mode: none = no curator, summary-review = open curator with auto summary draft (default), auto-summary = generate summary without opening curator",
                 })),
                 proxy: Type.Optional(Type.String({
-                    description: "http(s) proxy URL (e.g. http://host:port) used for every outbound request in this call (search APIs and content fetches). Node fetch ignores HTTP(S)_PROXY env vars, so set this (or `proxy` in web-search.json) when direct access is blocked; empty string forces direct access.",
+                    description: "http(s) or socks proxy URL (e.g. http://host:port or socks5h://host:port) used for every outbound request in this call (search APIs and content fetches). Node fetch ignores HTTP(S)_PROXY env vars, so set this (or `proxy` in web-search.json) when direct access is blocked; empty string forces direct access.",
                 })),
             }),
             async execute(callId, params, signal, onUpdate, ctx) {
@@ -1593,7 +1597,7 @@ export default function (pi) {
                         : (params.query !== undefined ? expandQueryString(params.query) : []);
                     const queryList = normalizeQueryList(rawQueryList);
                     const configWorkflow = loadConfigForExtensionInit().workflow;
-                    const workflow = resolveWorkflow(params.workflow ?? configWorkflow, ctx?.hasUI !== false);
+                    const workflow = curatorRunState.resolve(params.workflow, configWorkflow, ctx?.hasUI !== false);
                     const shouldCurate = workflow === "summary-review";
                     const recencyFilter = normalizeRecencyFilter(params.recencyFilter);
                     if (queryList.length === 0) {
@@ -2111,9 +2115,9 @@ export default function (pi) {
                 fetchContent: Type.Optional(Type.Boolean({ description: "Fetch up to 5 result pages for exact passage extraction." })),
                 recencyFilter: Type.Optional(StringEnum(["day", "week", "month", "year"], { description: "Filter by recency." })),
                 domainFilter: Type.Optional(Type.Array(Type.String(), { description: "Limit to domains; prefix with - to exclude." })),
-                provider: Type.Optional(searchProviderSchema("Search provider or non-empty list of providers to search simultaneously; all searches every eligible provider except Parallel MCP, DuckDuckGo, Kimi, AnySearch, XCrawl, Valyu, xAI, Mistral, Bright Data, SerpBase, and Serper")),
+                provider: Type.Optional(searchProviderSchema("Search provider or non-empty list of providers to search simultaneously; all searches every eligible provider except Parallel MCP, DuckDuckGo, Kimi, AnySearch, XCrawl, Valyu, xAI, Mistral, Bright Data, SerpBase, SerpApi, and Serper")),
                 proxy: Type.Optional(Type.String({
-                    description: "http(s) proxy URL (e.g. http://host:port) used for every outbound request in this call (search APIs and result-page fetches). Empty string forces direct access.",
+                    description: "http(s) or socks proxy URL (e.g. http://host:port or socks5h://host:port) used for every outbound request in this call (search APIs and result-page fetches). Empty string forces direct access.",
                 })),
             }),
             async execute(_callId, params, signal, _onUpdate, ctx) {
@@ -2239,7 +2243,7 @@ export default function (pi) {
                     description: "Opt into an authFetch profile for local browser-cookie fetching. Use a profile name, or true only when exactly one profile exists.",
                 })),
                 proxy: Type.Optional(Type.String({
-                    description: "http(s) proxy URL (e.g. http://host:port) used for this fetch. Needed when the target is unreachable directly; localhost and NO_PROXY hosts always bypass the proxy. Empty string forces direct access.",
+                    description: "http(s) or socks proxy URL (e.g. http://host:port or socks5h://host:port) used for this fetch. Needed when the target is unreachable directly; localhost and NO_PROXY hosts always bypass the proxy. Empty string forces direct access.",
                 })),
             }),
             async execute(_toolCallId, params, signal, onUpdate, ctx) {
@@ -3103,7 +3107,7 @@ export default function (pi) {
                 const arg = args.trim().toLowerCase();
                 let newWorkflow;
                 if (arg.length === 0) {
-                    const current = resolveWorkflow(loadConfigForExtensionInit().workflow, true);
+                    const current = resolveWebSearchWorkflow(loadConfigForExtensionInit().workflow, true);
                     newWorkflow = current === "none" ? "summary-review" : "none";
                 }
                 else if (arg === "on") {