@tianshu-ai/tianshu 0.4.19 → 0.4.21

package/plugins/web-search/dist/tools/web-search.js

@@ -27,7 +27,7 @@
 // keys (401/403) don't trigger fallback — that's a config problem
 // the user needs to fix, not a runtime hiccup.
 import { Type } from "typebox";
-import { braveProvider, tavilyProvider, } from "./providers.js";
+import { braveProvider, hostedProvider, searxngProvider, tavilyProvider, } from "./providers.js";
 export function buildWebSearchTool(cfg, health) {
     return {
         schema: {
@@ -60,13 +60,18 @@ export function buildWebSearchTool(cfg, health) {
                 ], {
                     description: "Recency filter. Default is no filter (all results, ranked by relevance).",
                 })),
-                provider: Type.Optional(Type.Union([Type.Literal("tavily"), Type.Literal("brave")], {
-                    description: "Force a specific provider. Default uses the host's preferred provider with automatic fallback.",
+                provider: Type.Optional(Type.Union([
+                    Type.Literal("hosted"),
+                    Type.Literal("searxng"),
+                    Type.Literal("tavily"),
+                    Type.Literal("brave"),
+                ], {
+                    description: "Force a specific provider. Default uses the scheme the host configured.",
                 })),
             }),
         },
         available(_ctx) {
-            return Boolean(cfg.tavilyApiKey ?? cfg.braveApiKey);
+            return isConfigured(cfg);
         },
         async execute(rawArgs, _ctx) {
             const args = rawArgs;
@@ -84,7 +89,10 @@ export function buildWebSearchTool(cfg, health) {
             if (fullOrder.length === 0) {
                 return {
                     ok: false,
-                    text: "web_search has no API keys configured. Open Settings → Plugins → Web Search and add a Tavily or Brave API key.",
+                    text: "web_search is not configured. Open Settings → Plugins → Web " +
+                        "Search and pick a scheme: \"hosted\" (key-free, Exa/Parallel), " +
+                        "\"searxng\" (set your instance URL), or \"tavily\"/\"brave\" " +
+                        "(set an API key).",
                 };
             }
             // Apply health cache: skip providers we already know are
@@ -168,52 +176,97 @@ export function readWebSearchConfig(raw) {
     if (!raw || typeof raw !== "object")
         return {};
     const r = raw;
+    const str = (k) => typeof r[k] === "string" && r[k] ? r[k] : undefined;
+    const scheme = r.scheme === "hosted" ||
+        r.scheme === "searxng" ||
+        r.scheme === "tavily" ||
+        r.scheme === "brave"
+        ? r.scheme
+        : undefined;
     return {
-        tavilyApiKey: typeof r.tavilyApiKey === "string" && r.tavilyApiKey
-            ? r.tavilyApiKey
-            : undefined,
-        braveApiKey: typeof r.braveApiKey === "string" && r.braveApiKey
-            ? r.braveApiKey
-            : undefined,
-        preferredProvider: r.preferredProvider === "tavily" || r.preferredProvider === "brave"
-            ? r.preferredProvider
+        scheme,
+        hostedBackend: r.hostedBackend === "parallel" || r.hostedBackend === "exa"
+            ? r.hostedBackend
             : undefined,
+        exaApiKey: str("exaApiKey"),
+        parallelApiKey: str("parallelApiKey"),
+        searxngBaseUrl: str("searxngBaseUrl"),
+        tavilyApiKey: str("tavilyApiKey"),
+        braveApiKey: str("braveApiKey"),
         timeoutMs: typeof r.timeoutMs === "number" && Number.isFinite(r.timeoutMs)
             ? r.timeoutMs
             : undefined,
     };
 }
+/** Resolve the effective scheme. Explicit `scheme` wins; otherwise
+ *  infer from what's configured, preferring the key-free hosted
+ *  scheme so a fresh install works out of the box. */
+export function effectiveScheme(cfg) {
+    if (cfg.scheme)
+        return cfg.scheme;
+    if (cfg.searxngBaseUrl)
+        return "searxng";
+    if (cfg.tavilyApiKey)
+        return "tavily";
+    if (cfg.braveApiKey)
+        return "brave";
+    return "hosted"; // key-free default
+}
+/** True when the effective scheme has everything it needs to run. */
+export function isConfigured(cfg) {
+    switch (effectiveScheme(cfg)) {
+        case "hosted":
+            return true; // key-free
+        case "searxng":
+            return Boolean(cfg.searxngBaseUrl);
+        case "tavily":
+            return Boolean(cfg.tavilyApiKey);
+        case "brave":
+            return Boolean(cfg.braveApiKey);
+    }
+}
+/** Pack the hosted provider's opaque `key` blob (backend + optional
+ *  api key). See hostedProvider in providers.ts. */
+function hostedKey(cfg) {
+    const backend = cfg.hostedBackend ?? "exa";
+    const apiKey = backend === "parallel" ? cfg.parallelApiKey : cfg.exaApiKey;
+    return JSON.stringify({ backend, apiKey });
+}
 /** Decide which providers to try, in order. Returns at most two
  *  entries (the configured pair, preferred first). */
 function providerOrder(cfg, override) {
-    const haveTavily = !!cfg.tavilyApiKey;
-    const haveBrave = !!cfg.braveApiKey;
-    if (override) {
-        if (override === "tavily" && haveTavily) {
-            return [{ provider: tavilyProvider, key: cfg.tavilyApiKey }];
-        }
-        if (override === "brave" && haveBrave) {
-            return [{ provider: braveProvider, key: cfg.braveApiKey }];
+    // Build the entry for a single scheme, or null when that scheme
+    // isn't usable (missing credential).
+    const entryFor = (scheme) => {
+        switch (scheme) {
+            case "hosted":
+                return { provider: hostedProvider, key: hostedKey(cfg) };
+            case "searxng":
+                return cfg.searxngBaseUrl
+                    ? { provider: searxngProvider, key: cfg.searxngBaseUrl }
+                    : null;
+            case "tavily":
+                return cfg.tavilyApiKey
+                    ? { provider: tavilyProvider, key: cfg.tavilyApiKey }
+                    : null;
+            case "brave":
+                return cfg.braveApiKey
+                    ? { provider: braveProvider, key: cfg.braveApiKey }
+                    : null;
         }
-        // Override asked for a provider with no key configured; skip
-        // it and fall through to the default ordering rather than
-        // returning [], so the agent still gets results.
-    }
-    const preferTavily = (cfg.preferredProvider ?? "tavily") === "tavily";
-    const order = [];
-    if (preferTavily) {
-        if (haveTavily)
-            order.push({ provider: tavilyProvider, key: cfg.tavilyApiKey });
-        if (haveBrave)
-            order.push({ provider: braveProvider, key: cfg.braveApiKey });
-    }
-    else {
-        if (haveBrave)
-            order.push({ provider: braveProvider, key: cfg.braveApiKey });
-        if (haveTavily)
-            order.push({ provider: tavilyProvider, key: cfg.tavilyApiKey });
+    };
+    // Explicit per-call override: honour it if usable, else fall
+    // through to the configured scheme.
+    if (override) {
+        const e = entryFor(override);
+        if (e)
+            return [e];
     }
-    return order;
+    // No cross-scheme fallback: the operator picked a scheme, we use
+    // it. (Mixing a self-hosted SearXNG with a paid Tavily fallback
+    // would be surprising.) Return the single effective scheme.
+    const e = entryFor(effectiveScheme(cfg));
+    return e ? [e] : [];
 }
 function formatSuccess(provider, query, results, priorErrors) {
     const head = priorErrors.length === 0

package/plugins/web-search/dist/tools/web-search.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-search.js","sourceRoot":"","sources":["../../src/tools/web-search.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-search.js","sourceRoot":"","sources":["../../src/tools/web-search.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,EAAE;AACF,mEAAmE;AACnE,8DAA8D;AAC9D,8DAA8D;AAC9D,gEAAgE;AAChE,iDAAiD;AACjD,EAAE;AACF,uBAAuB;AACvB,EAAE;AACF,MAAM;AACN,mBAAmB;AACnB,wBAAwB;AACxB,sBAAsB;AACtB,wCAAwC;AACxC,sCAAsC;AACtC,iEAAiE;AACjE,YAAY;AACZ,UAAU;AACV,QAAQ;AACR,MAAM;AACN,EAAE;AACF,gEAAgE;AAChE,gEAAgE;AAChE,mEAAmE;AACnE,+DAA+D;AAC/D,kEAAkE;AAClE,+CAA+C;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,EACL,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,GAKf,MAAM,gBAAgB,CAAC;AA2BxB,MAAM,UAAU,kBAAkB,CAChC,GAA0B,EAC1B,MAAsB;IAEtB,OAAO;QACL,MAAM,EAAE;YACN,IAAI,EAAE,YAAY;YAClB,WAAW,EACT,4DAA4D;gBAC5D,6DAA6D;gBAC7D,yDAAyD;gBACzD,uDAAuD;gBACvD,wDAAwD;gBACxD,4DAA4D;gBAC5D,kEAAkE;YACpE,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;gBACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;oBACjB,WAAW,EAAE,sCAAsC;iBACpD,CAAC;gBACF,KAAK,EAAE,IAAI,CAAC,QAAQ,CAClB,IAAI,CAAC,MAAM,CAAC;oBACV,WAAW,EAAE,sCAAsC;oBACnD,OAAO,EAAE,CAAC;oBACV,OAAO,EAAE,EAAE;iBACZ,CAAC,CACH;gBACD,QAAQ,EAAE,IAAI,CAAC,QAAQ,CACrB,IAAI,CAAC,MAAM,CAAC;oBACV,WAAW,EACT,+DAA+D;wBAC/D,2CAA2C;iBAC9C,CAAC,CACH;gBACD,SAAS,EAAE,IAAI,CAAC,QAAQ,CACtB,IAAI,CAAC,KAAK,CACR;oBACE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;oBACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;oBACpB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;oBACrB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;iBACrB,EACD;oBACE,WAAW,EACT,0EAA0E;iBAC7E,CACF,CACF;gBACD,QAAQ,EAAE,IAAI,CAAC,QAAQ,CACrB,IAAI,CAAC,KAAK,CACR;oBACE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;oBACtB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;oBACvB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;oBACtB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;iBACtB,EACD;oBACE,WAAW,EACT,yEAAyE;iBAC5E,CACF,CACF;aACF,CAAC;SACH;QACD,SAAS,CAAC,IAAsB;YAC9B,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,IAAsB;YAC3C,MAAM,IAAI,GAAG,OAMZ,CAAC;YACF,MAAM,KAAK,GACT,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC;YAClD,CAAC;YACD,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBACvB,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,IAAI,EAAE,uEAAuE;iBAC9E,CAAC;YACJ,CAAC;YAED,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,IAAI,EACF,8DAA8D;wBAC9D,iEAAiE;wBACjE,+DAA+D;wBAC/D,mBAAmB;iBACtB,CAAC;YACJ,CAAC;YACD,yDAAyD;YACzD,0DAA0D;YAC1D,wDAAwD;YACxD,MAAM,OAAO,GAIR,EAAE,CAAC;YACR,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC1C,IAAI,IAAI,EAAE,CAAC;oBACT,OAAO,CAAC,IAAI,CAAC;wBACX,QAAQ,EAAE,QAAQ,CAAC,IAAI;wBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,OAAO,EAAE,wBAAwB,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,OAAO,EAAE;qBAC3F,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,IAAI,EACF,8DAA8D;wBAC9D,0DAA0D;wBAC1D,4CAA4C;wBAC5C,sDAAsD;wBACtD,OAAO;6BACJ,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,YAAY,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,OAAO,EAAE,CAC5D;6BACA,IAAI,CAAC,IAAI,CAAC;oBACf,IAAI,EAAE,EAAE,OAAO,EAAE;iBAClB,CAAC;YACJ,CAAC;YAED,MAAM,IAAI,GAAe;gBACvB,KAAK,EAAE,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtD,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,IAAI;aACjC,CAAC;YAEF,MAAM,MAAM,GAIP,CAAC,GAAG,OAAO,CAAC,CAAC;YAClB,KAAK,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,KAAK,EAAE,CAAC;gBACtC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;gBACpD,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;oBACrB,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACjD,yDAAyD;wBACzD,qDAAqD;wBACrD,gDAAgD;wBAChD,MAAM,CAAC,IAAI,CAAC;4BACV,QAAQ,EAAE,QAAQ,CAAC,IAAI;4BACvB,MAAM,EAAE,GAAG;4BACX,OAAO,EAAE,cAAc;yBACxB,CAAC,CAAC;wBACH,SAAS;oBACX,CAAC;oBACD,OAAO,aAAa,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAClE,CAAC;gBACD,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACf,wDAAwD;gBACxD,sDAAsD;gBACtD,0DAA0D;gBAC1D,8CAA8C;gBAC9C,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBACzC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;oBACpD,yDAAyD;oBACzD,uDAAuD;oBACvD,kDAAkD;oBAClD,MAAM;gBACR,CAAC;YACH,CAAC;YAED,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC;gBAClC,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;aACxB,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;4BAE4B;AAC5B,MAAM,UAAU,mBAAmB,CAAC,GAAY;IAC9C,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IAC/C,MAAM,CAAC,GAAG,GAA8B,CAAC;IACzC,MAAM,GAAG,GAAG,CAAC,CAAS,EAAsB,EAAE,CAC5C,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAY,CAAC,CAAC,CAAC,SAAS,CAAC;IAClE,MAAM,MAAM,GACV,CAAC,CAAC,MAAM,KAAK,QAAQ;QACrB,CAAC,CAAC,MAAM,KAAK,SAAS;QACtB,CAAC,CAAC,MAAM,KAAK,QAAQ;QACrB,CAAC,CAAC,MAAM,KAAK,OAAO;QAClB,CAAC,CAAC,CAAC,CAAC,MAAM;QACV,CAAC,CAAC,SAAS,CAAC;IAChB,OAAO;QACL,MAAM;QACN,aAAa,EACX,CAAC,CAAC,aAAa,KAAK,UAAU,IAAI,CAAC,CAAC,aAAa,KAAK,KAAK;YACzD,CAAC,CAAC,CAAC,CAAC,aAAa;YACjB,CAAC,CAAC,SAAS;QACf,SAAS,EAAE,GAAG,CAAC,WAAW,CAAC;QAC3B,cAAc,EAAE,GAAG,CAAC,gBAAgB,CAAC;QACrC,cAAc,EAAE,GAAG,CAAC,gBAAgB,CAAC;QACrC,YAAY,EAAE,GAAG,CAAC,cAAc,CAAC;QACjC,WAAW,EAAE,GAAG,CAAC,aAAa,CAAC;QAC/B,SAAS,EACP,OAAO,CAAC,CAAC,SAAS,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,CAAC,CAAC,CAAC,CAAC,SAAS;YACb,CAAC,CAAC,SAAS;KAChB,CAAC;AACJ,CAAC;AAED;;sDAEsD;AACtD,MAAM,UAAU,eAAe,CAAC,GAA0B;IACxD,IAAI,GAAG,CAAC,MAAM;QAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IAClC,IAAI,GAAG,CAAC,cAAc;QAAE,OAAO,SAAS,CAAC;IACzC,IAAI,GAAG,CAAC,YAAY;QAAE,OAAO,QAAQ,CAAC;IACtC,IAAI,GAAG,CAAC,WAAW;QAAE,OAAO,OAAO,CAAC;IACpC,OAAO,QAAQ,CAAC,CAAC,mBAAmB;AACtC,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,YAAY,CAAC,GAA0B;IACrD,QAAQ,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,KAAK,QAAQ;YACX,OAAO,IAAI,CAAC,CAAC,WAAW;QAC1B,KAAK,SAAS;YACZ,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACrC,KAAK,QAAQ;YACX,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACnC,KAAK,OAAO;YACV,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED;oDACoD;AACpD,SAAS,SAAS,CAAC,GAA0B;IAC3C,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,IAAI,KAAK,CAAC;IAC3C,MAAM,MAAM,GAAG,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC;IAC3E,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;AAC7C,CAAC;AAED;sDACsD;AACtD,SAAS,aAAa,CACpB,GAA0B,EAC1B,QAAkC;IAElC,gEAAgE;IAChE,qCAAqC;IACrC,MAAM,QAAQ,GAAG,CACf,MAAoB,EAC8B,EAAE;QACpD,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,QAAQ;gBACX,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3D,KAAK,SAAS;gBACZ,OAAO,GAAG,CAAC,cAAc;oBACvB,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,EAAE,GAAG,CAAC,cAAc,EAAE;oBACxD,CAAC,CAAC,IAAI,CAAC;YACX,KAAK,QAAQ;gBACX,OAAO,GAAG,CAAC,YAAY;oBACrB,CAAC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,CAAC,YAAY,EAAE;oBACrD,CAAC,CAAC,IAAI,CAAC;YACX,KAAK,OAAO;gBACV,OAAO,GAAG,CAAC,WAAW;oBACpB,CAAC,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,CAAC,WAAW,EAAE;oBACnD,CAAC,CAAC,IAAI,CAAC;QACb,CAAC;IACH,CAAC,CAAC;IAEF,6DAA6D;IAC7D,oCAAoC;IACpC,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7B,IAAI,CAAC;YAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,iEAAiE;IACjE,gEAAgE;IAChE,4DAA4D;IAC5D,MAAM,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IACzC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACtB,CAAC;AAED,SAAS,aAAa,CACpB,QAAgB,EAChB,KAAa,EACb,OAAuB,EACvB,WAAyD;IAEzD,MAAM,IAAI,GACR,WAAW,CAAC,MAAM,KAAK,CAAC;QACtB,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,UAAU,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,SAAS,QAAQ,SAAS,KAAK,IAAI;QAC/F,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,UAAU,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,SAAS,QAAQ,WAAW,WAAW,CAAC,MAAM,oBAAoB,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,UAAU,KAAK,IAAI,CAAC;IACzL,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,IAAI,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACvD,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,GAAG,GAAG,IAAI,QAAQ,OAAO,EAAE,CAAC;IACnE,CAAC,CAAC,CAAC;IACH,OAAO;QACL,EAAE,EAAE,IAAI;QACR,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QACrC,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE;KACnC,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CACpB,KAAa,EACb,MAAoE;IAEpE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CACtB,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,YAAY,CAAC,CAAC,MAAM,MAAM,CAAC,CAAC,OAAO,EAAE,CAC5D,CAAC;IACF,OAAO;QACL,0BAA0B,KAAK,uBAAuB;QACtD,GAAG,KAAK;QACR,EAAE;QACF,iEAAiE;YAC/D,gEAAgE;YAChE,2CAA2C;KAC9C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC"}

package/plugins/web-search/manifest.json

@@ -1,15 +1,16 @@
 {
   "id": "web-search",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "displayName": "Web Search",
-  "description": "Web search via Tavily and Brave Search APIs. One tool, two providers, automatic fallback. Set API keys in Settings → Plugins.",
+  "description": "Web search + single-page fetch for agents. Pick a scheme: key-free hosted MCP (Exa/Parallel), self-hosted SearXNG, or keyed Tavily/Brave. web_fetch works with no config.",
   "author": "tianshu-ai",
   "license": "Apache-2.0",
   "permissions": ["network.external"],
   "server": { "entry": "@tianshu-builtin/plugin-web-search/server" },
   "contributes": {
     "tools": [
-      { "id": "web_search", "module": "WebSearchTool", "since": "0.1.0" }
+      { "id": "web_search", "module": "WebSearchTool", "since": "0.1.0" },
+      { "id": "web_fetch", "module": "WebFetchTool", "since": "0.2.0" }
     ],
     "skills": [
       {
@@ -24,30 +25,64 @@
   },
   "configSchema": {
     "fields": [
+      {
+        "key": "scheme",
+        "label": "Search scheme",
+        "kind": "select",
+        "default": "hosted",
+        "options": [
+          { "label": "Hosted MCP (key-free: Exa / Parallel)", "value": "hosted" },
+          { "label": "SearXNG (self-hosted)", "value": "searxng" },
+          { "label": "Tavily (API key)", "value": "tavily" },
+          { "label": "Brave (API key)", "value": "brave" }
+        ],
+        "description": "Which backend web_search uses. \"hosted\" needs no key (uses Exa/Parallel free MCP endpoints). \"searxng\" needs a base URL below. \"tavily\"/\"brave\" need the matching API key. web_fetch always works regardless of this setting."
+      },
+      {
+        "key": "hostedBackend",
+        "label": "Hosted backend",
+        "kind": "select",
+        "default": "exa",
+        "options": [
+          { "label": "Exa", "value": "exa" },
+          { "label": "Parallel", "value": "parallel" }
+        ],
+        "description": "Only used when scheme = hosted. Which free MCP endpoint to query. Both work anonymously; add a key below only if you have one and want higher limits."
+      },
+      {
+        "key": "searxngBaseUrl",
+        "label": "SearXNG base URL",
+        "kind": "string",
+        "placeholder": "https://searx.example.com",
+        "description": "Only used when scheme = searxng. Base URL of your SearXNG instance (its JSON API must be enabled: `search.formats: [json]` in settings.yml). No API key needed."
+      },
+      {
+        "key": "exaApiKey",
+        "label": "Exa API key (optional)",
+        "kind": "secret",
+        "placeholder": "exa-...",
+        "description": "Optional. Only used when scheme = hosted and backend = Exa. Raises limits; the free endpoint works without it. Stored under <tenant>/secrets/, never returned to the browser."
+      },
+      {
+        "key": "parallelApiKey",
+        "label": "Parallel API key (optional)",
+        "kind": "secret",
+        "placeholder": "...",
+        "description": "Optional. Only used when scheme = hosted and backend = Parallel. Raises limits; the free endpoint works without it."
+      },
       {
         "key": "tavilyApiKey",
         "label": "Tavily API key",
         "kind": "secret",
         "placeholder": "tvly-...",
-        "description": "Sign up at tavily.com (free tier 1000 searches/month). Stored under <tenant>/secrets/, never returned to the browser."
+        "description": "Only used when scheme = tavily. Sign up at tavily.com (free tier 1000 searches/month). Stored under <tenant>/secrets/, never returned to the browser."
       },
       {
         "key": "braveApiKey",
         "label": "Brave Search API key",
         "kind": "secret",
         "placeholder": "BSA...",
-        "description": "Optional. Get a free key at api-dashboard.search.brave.com (2000/month). Used as fallback when Tavily fails or returns nothing."
-      },
-      {
-        "key": "preferredProvider",
-        "label": "Preferred provider",
-        "kind": "select",
-        "default": "tavily",
-        "options": [
-          { "label": "Tavily", "value": "tavily" },
-          { "label": "Brave", "value": "brave" }
-        ],
-        "description": "Tried first when both keys are set. The other provider is used as automatic fallback only on transient errors (network / 5xx / 429). Auth failures (401 / 403) park the bad key in the health cache; clear it from Settings after fixing the key."
+        "description": "Only used when scheme = brave. Get a free key at api-dashboard.search.brave.com (2000/month)."
       },
       {
         "key": "timeoutMs",
@@ -58,7 +93,7 @@
         "max": 60000,
         "step": 500,
         "default": 8000,
-        "description": "Network timeout for each provider call. Increase if you hit timeouts on slow networks."
+        "description": "Network timeout for each web_search / web_fetch call. Increase if you hit timeouts on slow networks."
       }
     ]
   }

package/plugins/web-search/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@tianshu-builtin/plugin-web-search",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
-  "description": "Web search tool for tianshu agents (Tavily / Brave Search providers).",
+  "description": "Web search + fetch for tianshu agents. Schemes: key-free hosted MCP (Exa/Parallel), self-hosted SearXNG, or keyed Tavily/Brave.",
   "type": "module",
   "main": "./dist/server.js",
   "types": "./dist/server.d.ts",

package/plugins/web-search/skills/web-search-howto.md

@@ -1,14 +1,23 @@
 ---
 name: web-search-howto
-description: How to use the `web_search` tool for tasks that need fresh information from the open web — current events, recent docs, prices, release notes, anything not in your training set or in the user's local files.
+description: How to use `web_search` and `web_fetch` for tasks that need fresh information from the open web — current events, recent docs, prices, release notes, anything not in your training set or in the user's local files.
 scope: worker
 ---
 
-# Web search
+# Web search & fetch
 
-`web_search` returns a JSON array of `{title, url, content,
-publishedDate}` objects from Tavily or Brave Search (whichever
-the host has an API key for; you don't have to pick).
+This plugin gives you two tools:
+
+- **`web_search`** — returns a JSON array of `{title, url,
+  content, publishedDate}` results. The host picks the backend
+  scheme (you don't): key-free hosted MCP (Exa/Parallel),
+  a self-hosted SearXNG instance, or Tavily/Brave. Same result
+  shape regardless.
+- **`web_fetch`** — fetches ONE URL and returns its readable
+  body as markdown or text. No API key, no JavaScript. Use it
+  to read a page you got from a search result.
+
+## web_search
 
 ## Basic call
 
@@ -34,9 +43,9 @@ snippet is insufficient.
   Biases engines toward language-specific sources. Skip this
   for technical English-language queries; technical content is
   usually English regardless of locale.
-- `provider`: force `"tavily"` or `"brave"` if you want a
-  specific source. Default is "host's preferred provider with
-  fallback".
+- `provider`: force `"hosted"`, `"searxng"`, `"tavily"`, or
+  `"brave"` if you want a specific backend. Default is the
+  scheme the host configured. Usually leave it unset.
 
 ## Anti-patterns
 
@@ -52,14 +61,26 @@ snippet is insufficient.
   cite. Agents who paste 10 result blocks turn answers into
   noise.
 
-## When the snippet isn't enough
+## web_fetch — reading a page
+
+`web_search` `content` is only 1-3 sentences. For the actual
+page body, call `web_fetch`:
+
+```
+web_fetch({ url: "https://example.com/article" })
+```
+
+- `extractMode`: `"markdown"` (default) or `"text"`.
+- `maxChars`: truncate the output (default 20000).
+
+`web_fetch` does a plain HTTP GET and extracts readable
+content — it does **not** run JavaScript. For JS-heavy or
+login-gated pages, use the browser tools instead. It blocks
+private/internal hosts, so you can't fetch `localhost` or
+cloud metadata endpoints.
 
-`content` is 1-3 sentences. For the actual page body, fetch
-the URL through whatever HTTP fetcher you have available
-(`read_file` on a previously-saved page, the browser tools,
-etc.). `web_search` itself does not return page bodies; that's
-intentional — fetching only the URLs you actually need keeps
-the tool fast and cheap.
+Fetch only the URLs you actually need — one or two authoritative
+pages beats fetching every result.
 
 ## Citing sources
 

package/plugins/workboard/dist/client.js

@@ -399,14 +399,14 @@ function BoardCard({ task, meta, busy, compact, agentNames, onDragStart, onDragE
                                                 interventionReason: null,
                                                 interventionAt: null,
                                             });
-                                        }, className: "shrink-0 rounded border border-rose-500/40 px-1 py-px text-[9.5px] font-medium text-rose-100 hover:bg-rose-500/20 disabled:opacity-50", children: "Retry" })] })), (task.labels ?? []).includes("stalled") && (_jsxs("div", { className: "mt-1 flex items-start gap-1 rounded border border-orange-500/40 bg-orange-500/5 px-1.5 py-1 text-[10px] text-orange-200", title: task.failureReason ?? "", onClick: (e) => e.stopPropagation(), children: [_jsx(AlertTriangle, { className: "w-3 h-3 mt-px shrink-0" }), _jsxs("span", { className: "min-w-0 flex-1 break-words line-clamp-3", children: ["stalled", (task.attempts ?? 0) > 0 ? ` after ${task.attempts} attempts` : "", task.failureReason ? `: ${task.failureReason}` : ""] }), _jsx("button", { type: "button", disabled: busy, onClick: (e) => {
+                                        }, className: "shrink-0 rounded bg-rose-600 px-1.5 py-px text-[9.5px] font-medium text-white hover:bg-rose-500 disabled:opacity-50", children: "Retry" })] })), (task.labels ?? []).includes("stalled") && (_jsxs("div", { className: "mt-1 flex items-start gap-1 rounded border border-orange-500/40 bg-orange-500/5 px-1.5 py-1 text-[10px] text-orange-200", title: task.failureReason ?? "", onClick: (e) => e.stopPropagation(), children: [_jsx(AlertTriangle, { className: "w-3 h-3 mt-px shrink-0" }), _jsxs("span", { className: "min-w-0 flex-1 break-words line-clamp-3", children: ["stalled", (task.attempts ?? 0) > 0 ? ` after ${task.attempts} attempts` : "", task.failureReason ? `: ${task.failureReason}` : ""] }), _jsx("button", { type: "button", disabled: busy, onClick: (e) => {
                                             e.stopPropagation();
                                             void onPatch(task.id, {
                                                 labels: (task.labels ?? []).filter((l) => l !== "stalled"),
                                                 attempts: 0,
                                                 failureReason: null,
                                             });
-                                        }, className: "shrink-0 rounded border border-orange-500/40 px-1 py-px text-[9.5px] font-medium text-orange-100 hover:bg-orange-500/15 disabled:opacity-50", children: "Retry" })] })), (task.labels ?? []).includes("draft") && (_jsxs("div", { className: "mt-1 flex items-center gap-1.5", onClick: (e) => e.stopPropagation(), children: [_jsx("span", { className: "inline-block rounded border border-yellow-500/40 bg-yellow-500/5 px-1.5 py-px text-[10px] text-yellow-200", children: "draft - pool will skip" }), _jsx("button", { type: "button", disabled: busy, onClick: (e) => {
+                                        }, className: "shrink-0 rounded bg-orange-600 px-1.5 py-px text-[9.5px] font-medium text-white hover:bg-orange-500 disabled:opacity-50", children: "Retry" })] })), (task.labels ?? []).includes("draft") && (_jsxs("div", { className: "mt-1 flex items-center gap-1.5", onClick: (e) => e.stopPropagation(), children: [_jsx("span", { className: "inline-block rounded border border-yellow-500/40 bg-yellow-500/5 px-1.5 py-px text-[10px] text-yellow-200", children: "draft - pool will skip" }), _jsx("button", { type: "button", disabled: busy, onClick: (e) => {
                                             e.stopPropagation();
                                             void onPatch(task.id, {
                                                 labels: (task.labels ?? []).filter((l) => l !== "draft"),