dsh-free-search 0.4.4 → 0.4.5

package/README.en.md

@@ -49,7 +49,7 @@ This plugin provides multiple free search engines with automatic fallback, compl
 | `deepseek-official` | DeepSeek Official | Paid | Requires `DEEPSEEK_API_KEY` |
 
 - **Default engine is `bing`** (free and most stable), ready to use out of the box after installation.
-- Free engines automatically fall back to other free engines upon failure. Paid engines report clear error messages when keys are missing or invalid, avoiding silent fallbacks.
+- **Auto-failover**: any engine failure (rate-limited free engine, or missing/invalid paid key, network error) automatically falls back to a working free engine (Bing/AnySearch etc.) with a note attached to the results — a search never fails outright because of engine issues.
 - **Official Links in Settings**: Free engines display "Visit Website →", while paid engines display "Get API Key →" (opens in a new tab):
   - Exa: <https://dashboard.exa.ai/api-keys>
   - Perplexity: <https://www.perplexity.ai/settings/api>
@@ -86,7 +86,8 @@ After installation, navigate to **Settings → Plugins → Configurable** tab
 
 - **Search engine**: Select an engine from the dropdown; changes take effect immediately upon saving.
 - **API keys**: Enter keys for Exa / Perplexity / DeepSeek (password fields; displayed as "configured" once saved).
-- **Use Bing default**: stage a switch back to the stable free Bing engine; `Discard` only cancels unsaved edits.
+- **Use Bing default**: stage a switch back to the stable free Bing engine; `Discard` only cancels unsaved edits
+- **Platform search**: check GitHub / V2EX / Bilibili to enable them for the `platform_search` tool (disabled platforms are skipped).
 
 <table align="center" style="border: none; border-collapse: collapse;">
   <tr style="border: none;">

package/README.md

@@ -49,7 +49,7 @@ dsh 默认的搜索 provider 依赖 DeepSeek 官方 API key（`DEEPSEEK_API_KEY`
 | `deepseek-official` | DeepSeek 官方 | 付费 | 需 `DEEPSEEK_API_KEY` |
 
 - **默认引擎为 `bing`**（免费且最稳定），安装后开箱即用。
-- 免费引擎失败会自动回退到其他免费引擎；付费引擎缺 key 或 key 无效时报清晰错误，不会静默切换。
+- **自动回退**：任何引擎失败（免费引擎限流/反爬，付费引擎缺 key/无效/网络错误）都会自动回退到可用的免费引擎（Bing/AnySearch 等），并在结果中附带回退提示——搜索不会因引擎问题直接失败。
 - **设置页有官网链接**：免费引擎显示"访问官网 →"，付费引擎显示"获取 API Key →"（新标签页打开）：
   - Exa：<https://dashboard.exa.ai/api-keys>
   - Perplexity：<https://www.perplexity.ai/settings/api>
@@ -85,8 +85,9 @@ dsh web
 安装后，打开 **设置 → 插件 → 可配置** 标签页 → **Free Search** 卡片（官方设置页）：
 
 - **Search engine**：下拉框切换引擎，保存即生效
-- **API keys**：为 Exa / Perplexity / DeepSeek 填写 key（密码框，保存后只显示"已配置"）
-- **Use Bing default**：把当前搜索引擎切回稳定的免费 Bing；`Discard` 只撤销尚未保存的编辑
+- **API keys**：为 Exa / Perplexity / DeepSeek 填写 key（密码框，保存后只显示"已配置"）
+- **Use Bing default**：把当前搜索引擎切回稳定的免费 Bing；`Discard` 只撤销尚未保存的编辑
+- **Platform search**：勾选启用 GitHub / V2EX / Bilibili 平台搜索（`platform_search` 工具按此过滤）
 
 <table align="center" style="border: none; border-collapse: collapse;">
   <tr style="border: none;">

package/lib/client.js

@@ -31,6 +31,9 @@ window.__ModuleLoader__.load({
       ".dshfs-input:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:1px}",
       ".dshfs-input:disabled{opacity:.6;cursor:default}",
       ".dshfs-hint{color:var(--dsw-alias-label-secondary);margin:0;font-size:12px}",
+      ".dshfs-platforms{display:flex;gap:10px;flex-wrap:wrap}",
+      ".dshfs-platform{display:flex;align-items:center;gap:5px;color:var(--dsw-alias-label-primary);font-size:13px;cursor:pointer}",
+      ".dshfs-platform input{accent-color:var(--dsw-alias-state-business-primary)}",
       ".dshfs-link{color:var(--dsw-alias-state-business-primary);font-size:12px;text-decoration:none;align-self:flex-start;padding:2px 0}",
       ".dshfs-link:hover{text-decoration:underline}",
       ".dshfs-btn{font:inherit;cursor:pointer;border-radius:6px;padding:5px 12px;font-size:13px;transition:background-color .13s,border-color .13s,color .13s}",
@@ -89,6 +92,7 @@ window.__ModuleLoader__.load({
       const [exaKey, setExaKey] = react.useState("");
       const [perplexityKey, setPerplexityKey] = react.useState("");
       const [deepseekKey, setDeepseekKey] = react.useState("");
+      const [platforms, setPlatforms] = react.useState(["github", "v2ex", "bilibili"]);
       const [keysConfigured, setKeysConfigured] = react.useState({});
       const [dirty, setDirty] = react.useState(false);
       const [saving, setSaving] = react.useState(false);
@@ -105,6 +109,7 @@ window.__ModuleLoader__.load({
               setExaKey(v.exaApiKey ?? "");
               setPerplexityKey(v.perplexityApiKey ?? "");
               setDeepseekKey(v.deepseekApiKey ?? "");
+              setPlatforms(Array.isArray(v.platforms) && v.platforms.length > 0 ? v.platforms : ["github", "v2ex", "bilibili"]);
               // secrets 字段标记哪些 key 已配置（值被脱敏，仅显示"已配置"）
               const configured = {};
               for (const secret of view.secrets ?? []) {
@@ -146,6 +151,7 @@ window.__ModuleLoader__.load({
           if (exaKey.trim()) ops.push({ op: "set", path: ["exaApiKey"], value: exaKey.trim() });
           if (perplexityKey.trim()) ops.push({ op: "set", path: ["perplexityApiKey"], value: perplexityKey.trim() });
           if (deepseekKey.trim()) ops.push({ op: "set", path: ["deepseekApiKey"], value: deepseekKey.trim() });
+          ops.push({ op: "set", path: ["platforms"], value: platforms });
           const result = await bridgeMutate({ ns: NS, ops });
           if (result.ok) {
             setDirty(false);
@@ -291,6 +297,44 @@ window.__ModuleLoader__.load({
                       }),
                     ],
                   }),
+                  react_jsx_runtime.jsx("div", {
+                    className: "dshfs-field",
+                    children: [
+                      react_jsx_runtime.jsx("div", {
+                        className: "dshfs-label",
+                        children: "Platform search (platform_search tool)",
+                      }),
+                      react_jsx_runtime.jsx("div", {
+                        className: "dshfs-platforms",
+                        children: [
+                          ["github", "GitHub"], ["v2ex", "V2EX"], ["bilibili", "Bilibili"],
+                        ].map(([id, label]) =>
+                          react_jsx_runtime.jsx("label", {
+                            className: "dshfs-platform",
+                            children: [
+                              react_jsx_runtime.jsx("input", {
+                                type: "checkbox",
+                                checked: platforms.includes(id),
+                                disabled: !ready || saving,
+                                onChange: (e) => {
+                                  setPlatforms((prev) =>
+                                    e.target.checked ? [...prev, id] : prev.filter((p) => p !== id)
+                                  );
+                                  setDirty(true);
+                                  setFailed(false);
+                                },
+                              }),
+                              label,
+                            ],
+                          }, id)
+                        ),
+                      }),
+                      react_jsx_runtime.jsx("p", {
+                        className: "dshfs-hint",
+                        children: "Enable platforms for the agent's platform_search tool. Disabled platforms are skipped.",
+                      }),
+                    ],
+                  }),
                   !ready
                     ? react_jsx_runtime.jsx("p", {
                         className: "dshfs-hint",

package/lib/index.js

@@ -742,6 +742,7 @@ const Config = z.object({
   region: z.string(),
   bingMarket: z.string().default("zh-CN"),
   searxngInstances: z.array(z.string()),
+  platforms: z.array(z.string()).default(["github", "v2ex", "bilibili"]),
   exaApiKey: z.string().role("secret"),
   perplexityApiKey: z.string().role("secret"),
   deepseekApiKey: z.string().role("secret"),
@@ -766,7 +767,8 @@ function apply(ctx, config) {
   };
 
   // 总控 provider：按 settings 的 provider 字段路由到任意引擎。
-  // 免费引擎失败自动回退其他免费引擎；付费引擎缺 key 时报清晰错误（不静默切换）。
+  // 任何引擎失败（缺 key / 401 / 限流 / 网络）都会自动回退到可用的免费引擎，
+  // 并在结果里附带回退提示，避免 agent 搜索直接失败。
   const provider = {
     id: "ddg",
     available() {
@@ -776,22 +778,46 @@ function apply(ctx, config) {
       const cfg = current();
       const preferred = cfg.provider ?? "bing";
 
-      // 付费引擎：直接调用，缺 key 报错（exa 无 key 时走 Exa MCP keyless）
-      if (preferred === "exa") {
-        const key = await resolveApiKey("EXA_API_KEY", "exaApiKey");
-        if (key) return searchExa(request.query, request.maxResults, key, signal);
-        return searchExaMCP(request.query, request.maxResults, signal);
-      }
-      if (preferred === "perplexity") {
-        const key = await resolveApiKey("PERPLEXITY_API_KEY", "perplexityApiKey");
-        return searchPerplexity(request.query, request.maxResults, key, signal);
-      }
-      if (preferred === "deepseek-official") {
-        const key = await resolveApiKey("DEEPSEEK_API_KEY", "deepseekApiKey");
-        return searchDeepSeekOfficial(request.query, request.maxResults, key, signal);
+      // 付费引擎：先尝试；失败（缺 key / 401 / 网络）则回退免费引擎链
+      let fallbackReason = null;
+      if (preferred === "exa" || preferred === "perplexity" || preferred === "deepseek-official") {
+        try {
+          if (preferred === "exa") {
+            const key = await resolveApiKey("EXA_API_KEY", "exaApiKey");
+            if (key) {
+              const result = await searchExa(request.query, request.maxResults, key, signal);
+              if (result.sources.length > 0) return result;
+              fallbackReason = "Exa returned no results";
+            } else {
+              // exa 无 key 时走 keyless MCP（免费）
+              try {
+                const result = await searchExaMCP(request.query, request.maxResults, signal);
+                if (result.sources.length > 0) return result;
+                fallbackReason = "Exa keyless MCP returned no results";
+              } catch (mcpError) {
+                fallbackReason = mcpError instanceof Error ? mcpError.message : String(mcpError);
+              }
+            }
+          } else if (preferred === "perplexity") {
+            const key = await resolveApiKey("PERPLEXITY_API_KEY", "perplexityApiKey");
+            if (!key) throw new Error("Perplexity search requires PERPLEXITY_API_KEY");
+            const result = await searchPerplexity(request.query, request.maxResults, key, signal);
+            if (result.sources.length > 0) return result;
+            fallbackReason = "Perplexity returned no results";
+          } else {
+            const key = await resolveApiKey("DEEPSEEK_API_KEY", "deepseekApiKey");
+            if (!key) throw new Error("DeepSeek search requires DEEPSEEK_API_KEY");
+            const result = await searchDeepSeekOfficial(request.query, request.maxResults, key, signal);
+            if (result.sources.length > 0) return result;
+            fallbackReason = "DeepSeek search returned no results";
+          }
+        } catch (error) {
+          fallbackReason = error instanceof Error ? error.message : String(error);
+          logger.warn(`free-search: paid engine "${preferred}" failed (${fallbackReason}), falling back to free engines`);
+        }
       }
 
-      // 免费引擎：首选 + 自动回退（anysearch / searxng 无 key）
+      // 免费引擎链（付费引擎失败时也走这里）
       const chain =
         preferred === "ddg-lite"
           ? ["ddg-lite", "ddg", "anysearch", "searxng", "bing"]
@@ -801,7 +827,7 @@ function apply(ctx, config) {
               ? ["searxng", "anysearch", "bing", "ddg", "ddg-lite"]
               : preferred === "anysearch"
                 ? ["anysearch", "bing", "searxng", "ddg", "ddg-lite"]
-                : ["ddg", "anysearch", "searxng", "ddg-lite", "bing"];
+                : ["bing", "anysearch", "searxng", "ddg", "ddg-lite"];
       let lastError = null;
       for (const engine of chain) {
         try {
@@ -825,7 +851,13 @@ function apply(ctx, config) {
             default:
               result = await searchDdgHtml(request.query, request.maxResults, cfg, signal);
           }
-          if (result.sources.length > 0) return result;
+          if (result.sources.length > 0) {
+            // 付费引擎失败回退时，在结果里附上提示（agent 会看到）
+            if (fallbackReason) {
+              result.content = `Note: ${preferred} search unavailable (${fallbackReason}). Results from ${engine}.`;
+            }
+            return result;
+          }
           lastError = new Error(`engine "${engine}" returned 0 results`);
           logger.warn(`free-search: ${engine} returned 0 results, trying next engine`);
         } catch (error) {
@@ -1044,6 +1076,13 @@ function apply(ctx, config) {
             if (!PLATFORMS[platform]) {
               throw new Error(`unknown platform "${platform}" - use one of: ${Object.keys(PLATFORMS).join(", ")}`);
             }
+            // 平台开关：settings 里禁用某平台时，工具明确告知
+            const enabled = current().platforms ?? ["github", "v2ex", "bilibili"];
+            if (!enabled.includes(platform)) {
+              throw new Error(
+                `platform "${platform}" is disabled in Free Search settings - enable it in Settings > Plugins > Free Search to use it`
+              );
+            }
             const limit = Math.min(args.maxResults ?? 5, 10);
             const result = await searchPlatform(platform, args.query, limit);
             return { platform, sources: result.sources };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-free-search",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Free web search for DeepSeek Harness: 8 engines (Bing/DuckDuckGo/AnySearch/SearXNG/Exa keyless) + platform search + web_fetch, with web settings UI.",
   "type": "module",
   "main": "lib/index.js",