@humain/terminal 0.0.3-beta.2 → 0.0.4-beta.1

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

@@ -8,11 +8,12 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 };
 import { Box, Text, truncateToWidth } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
-import { StringEnum, complete } from "@earendil-works/pi-ai/compat";
+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";
 import { answerFromPage } from "./page-query.js";
+import { rewriteSearchQuery } from "./query-rewrite.js";
 import { clearCloneCache } from "./github-extract.js";
 import { getConfiguredSearchRouting, normalizeSearchProviderSelection, RESOLVED_SEARCH_PROVIDERS, SEARCH_PROVIDERS, search } from "./gemini-search.js";
 import { formatSeconds, getWebSearchConfigDir, getWebSearchConfigPath, resolveCuratorNetworkConfig } from "./utils.js";
@@ -34,6 +35,7 @@ import { isBrowserCookieAccessAllowed } from "./gemini-web-config.js";
 import { isBraveAvailable } from "./brave.js";
 import { isOpenAISearchAvailable } from "./openai-search.js";
 import { isParallelAvailable } from "./parallel.js";
+import { isParallelMcpAvailable } from "./parallel-mcp.js";
 import { isTinyFishAvailable } from "./tinyfish.js";
 import { isSearch1APIAvailable } from "./search1api.js";
 import { isSearchinfinityAvailable } from "./searchinfinity.js";
@@ -51,8 +53,10 @@ import { isAnySearchAvailable } from "./anysearch.js";
 import { isXaiSearchAvailable } from "./xai-search.js";
 import { isBrightDataAvailable } from "./brightdata.js";
 import { isSerpBaseAvailable } from "./serpbase.js";
+import { isSerperAvailable } from "./serper.js";
+import { isValyuAvailable } from "./valyu.js";
 import { buildSearchErrorPlan } from "./render-search-error.js";
-import { findModelWithProviderRouting, loadEnabledModelPatterns, modelMatchesEnabledPatterns } from "./summary-model-scope.js";
+import { findModelWithProviderRouting, loadEnabledModelPatterns, modelMatchesEnabledPatterns, splitThinkingSuffix } from "./summary-model-scope.js";
 import { buildResearchArtifact, withClaimAssessment, storeResearchArtifact, getResearchArtifact, } from "./source-check.js";
 const WEB_SEARCH_CONFIG_PATH = getWebSearchConfigPath();
 let extractModulePromise;
@@ -273,6 +277,7 @@ async function getProviderAvailability(ctx) {
         openai: await isOpenAISearchAvailable(ctx),
         brave: isBraveAvailable(),
         parallel: isParallelAvailable(),
+        "parallel-mcp": isParallelMcpAvailable(),
         tinyfish: isTinyFishAvailable(),
         search1api: isSearch1APIAvailable(),
         searchinfinity: isSearchinfinityAvailable(),
@@ -293,10 +298,12 @@ async function getProviderAvailability(ctx) {
         xai: await isXaiSearchAvailable(ctx),
         brightdata: isBrightDataAvailable(),
         serpbase: isSerpBaseAvailable(),
+        serper: isSerperAvailable(),
+        valyu: isValyuAvailable(),
     };
     return {
-        // DuckDuckGo, AnySearch, xAI, Bright Data, and SerpBase are explicit-only, so they never make `all` eligible.
-        all: Object.entries(providers).some(([provider, available]) => provider !== "duckduckgo" && provider !== "anysearch" && provider !== "xai" && provider !== "brightdata" && provider !== "serpbase" && provider !== "gemini" && available) || geminiApiAvail,
+        // Parallel MCP, DuckDuckGo, AnySearch, xAI, Bright Data, SerpBase, Serper, and Valyu are explicit-only, so they never make `all` eligible.
+        all: Object.entries(providers).some(([provider, available]) => provider !== "parallel-mcp" && provider !== "duckduckgo" && provider !== "anysearch" && provider !== "xai" && provider !== "brightdata" && provider !== "serpbase" && provider !== "serper" && provider !== "valyu" && provider !== "gemini" && available) || geminiApiAvail,
         ...providers,
     };
 }
@@ -825,9 +832,14 @@ export default function (pi) {
             };
             pi.appendEntry("web-search-results", storeFetchedContentResult(fetchId, data));
             const ok = fetched.filter(f => !f.error).length;
+            const availability = ok === fetched.length
+                ? "Full page content now available."
+                : ok > 0
+                    ? "Partial page content now available."
+                    : "No page content was fetched. Stored fetch diagnostics are available.";
             pi.sendMessage({
                 customType: "web-search-content-ready",
-                content: `Content fetched for ${ok}/${fetched.length} URLs [${fetchId}]. Full page content now available.`,
+                content: `Content fetched for ${ok}/${fetched.length} URLs [${fetchId}]. ${availability}`,
                 display: true,
             }, { triggerTurn: true });
         })
@@ -908,42 +920,6 @@ export default function (pi) {
             },
         };
     }
-    async function resolveFirstAvailableModel(ctx, candidates) {
-        const enabledModelPatterns = loadEnabledModelPatterns(ctx);
-        for (const { provider, id } of candidates) {
-            const model = findModelWithProviderRouting(ctx.modelRegistry, provider, id);
-            if (!model || !modelMatchesEnabledPatterns(model, enabledModelPatterns))
-                continue;
-            const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
-            if (auth.ok && auth.apiKey)
-                return { model, apiKey: auth.apiKey, headers: auth.headers };
-        }
-        throw new Error(`No enabled model available: ${candidates.map(c => `${c.provider}/${c.id}`).join(", ")}`);
-    }
-    async function rewriteSearchQuery(query, ctx, signal) {
-        const { model, apiKey, headers } = await resolveFirstAvailableModel(ctx, [
-            { provider: "anthropic", id: "claude-haiku-4-5" },
-            { provider: "google", id: "gemini-3.6-flash" },
-            { provider: "openai", id: "gpt-4.1-mini" },
-        ]);
-        const response = await complete(model, {
-            messages: [{
-                    role: "user",
-                    content: [{ type: "text", text: `Rewrite this web search query to get better, more specific results. Add relevant year qualifiers, precise technical terms, and specificity. Return ONLY the improved query text, nothing else.\n\nQuery: ${query}` }],
-                    timestamp: Date.now(),
-                }],
-        }, { apiKey, headers, signal });
-        if (response.stopReason === "aborted")
-            throw new Error("Aborted");
-        const contentParts = Array.isArray(response.content) ? response.content : [];
-        const text = contentParts
-            .map(part => part.type === "text" ? part.text : "")
-            .join("")
-            .trim();
-        if (!text)
-            throw new Error("Rewrite returned empty response");
-        return text;
-    }
     async function generateSummaryForSelectedIndices(selectedQueryIndices, resultsByIndex, summaryContext, signal, modelOverride, feedback) {
         const selectedResults = [];
         for (const qi of selectedQueryIndices) {
@@ -1010,17 +986,28 @@ export default function (pi) {
         const configuredSummaryModel = typeof config.summaryModel === "string" ? config.summaryModel.trim() : "";
         const preferredDefaults = [
             { provider: "anthropic", id: "claude-haiku-4-5" },
-            { provider: "openai-codex", id: "gpt-5.3-codex-spark" },
+            { provider: "openai-codex", id: "gpt-5.6-luna" },
+            { provider: "openai-codex", id: "gpt-5.6-terra" },
+            { provider: "google", id: "gemini-3.6-flash" },
+            { provider: "openai", id: "gpt-5-mini" },
+            { provider: "deepseek", id: "deepseek-v4-flash" },
         ];
         const resolveAvailableModelValue = (selector) => {
-            const slashIndex = selector.indexOf("/");
-            if (slashIndex <= 0 || slashIndex >= selector.length - 1)
+            const parsed = splitThinkingSuffix(selector);
+            const slashIndex = parsed.value.indexOf("/");
+            if (slashIndex <= 0 || slashIndex >= parsed.value.length - 1)
                 return null;
-            const model = findModelWithProviderRouting(summaryContext.modelRegistry, selector.slice(0, slashIndex), selector.slice(slashIndex + 1));
+            const model = findModelWithProviderRouting(summaryContext.modelRegistry, parsed.value.slice(0, slashIndex), parsed.value.slice(slashIndex + 1));
             if (!model)
                 return null;
             const value = `${model.provider}/${model.id}`;
-            return availableValues.has(value) ? value : null;
+            if (!availableValues.has(value))
+                return null;
+            if (selector !== value && !seen.has(selector)) {
+                seen.add(selector);
+                summaryModels.push({ value: selector, label: selector });
+            }
+            return selector;
         };
         let defaultSummaryModel = null;
         if (scopeLoaded && configuredSummaryModel.length > 0) {
@@ -1447,7 +1434,7 @@ export default function (pi) {
         pi.registerTool({
             name: toolNames.webSearch,
             label: "Web Search",
-            description: `Search the web using OpenAI, Brave, Parallel, TinyFish, Search1API, Searchinfinity, Querit, Tavily, Firecrawl, Jina, SERPdive, Kagi, Bocha, Ollama, SearXNG, DuckDuckGo, Exa, Perplexity, Gemini, AnySearch, xAI, Bright Data, or SerpBase. Pass a provider array to search only those providers simultaneously, or use provider "all" to search every eligible provider except DuckDuckGo, AnySearch, xAI, Bright Data, and SerpBase. Returns an AI-synthesized answer with source citations. OpenAI search uses a Codex subscription or OpenAI API key; xAI search uses a SuperGrok/X Premium subscription or xAI API key. DuckDuckGo, AnySearch, xAI, Bright Data, and SerpBase 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, auto-selects OpenAI when suitable and available, then Exa, Brave, Parallel, TinyFish, Search1API, Searchinfinity, Querit, Tavily, Firecrawl, Jina, SERPdive, Kagi, Bocha, Ollama, Perplexity, Gemini API, or Gemini Web. When SearXNG is configured, it is preferred first for local/private 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, AnySearch, Valyu, xAI, 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, AnySearch, Valyu, xAI, Bright Data, SerpBase, and Serper. Returns an AI-synthesized answer with source citations. OpenAI search uses a Codex subscription or OpenAI API key; xAI search uses a SuperGrok/X Premium subscription or xAI API key. Parallel MCP, DuckDuckGo, AnySearch, Valyu, xAI, 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, auto-selects OpenAI when suitable and available, then Exa, Brave, Parallel, TinyFish, Search1API, Searchinfinity, Querit, Tavily, Firecrawl, Jina, SERPdive, Kagi, Bocha, Ollama, Perplexity, Gemini API, or Gemini Web. When SearXNG is configured, it is preferred first for local/private search.`,
             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." })),
@@ -1456,7 +1443,7 @@ 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 DuckDuckGo, AnySearch, xAI, Bright Data, and SerpBase, 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, AnySearch, xAI, Bright Data, SerpBase, Serper, and Valyu, 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",
                 })),
@@ -1959,7 +1946,7 @@ 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 DuckDuckGo, AnySearch, xAI, Bright Data, and SerpBase")),
+                provider: Type.Optional(searchProviderSchema("Search provider or non-empty list of providers to search simultaneously; all searches every eligible provider except DuckDuckGo, AnySearch, xAI, Bright Data, SerpBase, Serper, and Valyu")),
             }),
             async execute(_callId, params, signal, _onUpdate, ctx) {
                 const claim = typeof params.claim === "string" ? params.claim.trim() : "";