dsh-free-search 0.6.5 → 0.6.7

package/README.md

@@ -108,28 +108,33 @@ dsh web
 
 #### 接管行为与验证
 
-插件加载后**自动接管搜索**：
+插件加载后**自动接管搜索**（运行时接管，不改配置层）：
 
-- `web.searchProvider` 未设置，或仍是 DSH 出厂默认的官方搜索 `deepseek-official` 时，自动切换为本插件；
+- `web.searchProvider` 未设置，或仍是 DSH 出厂默认的官方搜索 `deepseek-official` 时，自动切换为本插件的 provider（id 固定为 `ddg`）；
 - 如果（你或别的插件）已显式选择其他 provider，本插件不抢占，只在启动日志输出 WARN 与切换用的 YAML。
 
-正常安装（`dsh plugin add` / 插件管理器）时，插件自带的 **bundle patch**（`cordis.patch.yml`）还会在配置层显式写入 `searchProvider: ddg`；即使这层没生效（例如把插件作为普通依赖手工安装、或 profile patch 整体覆盖了 `web` 条目），上面的运行时兜底也会接管官方默认，不会再静默退回官方搜索。
+**不再往配置里写 `searchProvider: ddg`**：静态覆盖曾导致"悬空引用"——patch 是整段覆盖 config，一旦插件那一行被**停用或跳过**（比如在插件管理器里关掉），配置仍指向 `ddg` 而没有任何东西注册它，于是每次搜索都失败：
 
-需要显式声明、或从其他 provider 切过来时（`profiles/<profile>/cordis.patch.yml`）：
+```
+Error: configured web provider "ddg" is not registered
+```
+
+现在没有这层覆盖：插件被停用时 `web.searchProvider` 保持官方默认（`deepseek-official`），搜索至少还能走官方通道；插件启用时由上面的运行时接管切到 `ddg`。
+
+> 如果你曾按旧文档手动在 `profiles/<profile>/cordis.patch.yml` 里加过下面这段，而插件没有启用，就会看到上面那条错误——**删掉这段即可**（或重新启用插件）：
 
 ```yaml
-# 让 harness 的 web_search 使用本插件。
-# DSH 0.1.2+ 的 patch 是"整段覆盖 config"而不是深度合并：
-# 已有 web 条目里的字段（如 fetchProvider）必须在这里一并重述，否则会被抹掉。
+# 可选，通常不需要：只有你想强制指定时才加。
+# DSH 0.1.2+ 的 patch 是"整段覆盖 config"，必须保留 fetchProvider。
 - id: web
   config:
     searchProvider: ddg
     fetchProvider: http
 ```
 
-- `searchProvider: ddg` —— `ddg` 是**本插件注册的 provider id（固定值）**，不是"使用 DuckDuckGo 引擎"的意思；具体用哪个引擎由设置页的 `provider` 字段决定（可填 `bing`/`baidu`/`auto` 等）。
-- `fetchProvider: http` —— 官方网页抓取（web-fetch-http），请保留；漏掉会导致网页抓取失效或重复注册。
-- 想改回官方搜索：在插件管理器里停用本插件条目即可。
+- `searchProvider: ddg` —— 本插件的 **provider id（固定值）**，不是"使用 DuckDuckGo 引擎"；用哪个引擎由设置页的 `provider` 字段决定（`bing`/`baidu`/`auto`/…）。
+- `fetchProvider: http` —— 官方网页抓取（web-fetch-http），手动声明时必须保留。
+- 想改用官方搜索：在插件管理器里停用本插件条目即可，不需要改配置。
 
 #### 姊妹插件：dsh-preset-workbench（预设工作台）
 
@@ -431,28 +436,33 @@ dsh web
 
 #### Takeover behavior and verification
 
-The plugin **takes over search automatically** once loaded:
+The plugin **takes over search at runtime** once loaded (it does not touch the config layer):
 
-- When `web.searchProvider` is unset, or still the shipped default `deepseek-official`, it switches to this plugin;
+- When `web.searchProvider` is unset, or still the shipped default `deepseek-official`, it switches to this plugin's provider (id: `ddg`);
 - If you (or another plugin) explicitly selected a different provider, it does not steal it — it only logs a WARN with a copy-pasteable YAML snippet.
 
-With a normal install (`dsh plugin add` / plugin manager) the bundled **bundle patch** (`cordis.patch.yml`) additionally writes `searchProvider: ddg` into the config layer. Even if that layer does not apply (e.g. the plugin was added as a plain dependency, or a profile patch replaced the whole `web` entry), the runtime fallback above still takes over from the official default — search no longer silently falls back to the official provider.
+**It no longer writes `searchProvider: ddg` into the config layer.** A static override used to create a dangling reference: a patch replaces the whole row config, so when the plugin's row was **disabled or skipped** (e.g. switched off in the plugin manager) the config still said `ddg` while nothing registered it, and every search failed with:
+
+```
+Error: configured web provider "ddg" is not registered
+```
+
+Without that override, a disabled plugin leaves `web.searchProvider` at the shipped default (`deepseek-official`) so search still works through the official provider; when the plugin is enabled the runtime takeover above points it at `ddg`.
 
-To declare it explicitly, or to switch over from another provider (`profiles/<profile>/cordis.patch.yml`):
+> If you previously added the snippet below by hand to `profiles/<profile>/cordis.patch.yml` *and* the plugin is not enabled, you will see that error — **just remove the snippet** (or re-enable the plugin):
 
 ```yaml
-# Route the harness web_search through this plugin.
-# Since DSH 0.1.2 a patch REPLACES the whole entry config (no deep merge):
-# restate any existing web.* fields (e.g. fetchProvider) or they are dropped.
+# Optional; normally unnecessary — only to force a specific provider.
+# Since DSH 0.1.2 a patch REPLACES the whole entry config: keep fetchProvider.
 - id: web
   config:
     searchProvider: ddg
     fetchProvider: http
 ```
 
-- `searchProvider: ddg` — `ddg` is this plugin's **fixed provider id**, not "use the DuckDuckGo engine". The engine is chosen by the `provider` field in the settings page (`bing` / `baidu` / `auto` / …).
-- `fetchProvider: http` — the official web-fetch provider; keep it, or page fetching breaks or double-registers.
-- To go back to official search: disable this plugin's entry in the plugin manager.
+- `searchProvider: ddg` — this plugin's **fixed provider id**, not "use the DuckDuckGo engine"; the engine is chosen by the `provider` field in settings (`bing` / `baidu` / `auto` / …).
+- `fetchProvider: http` — the official web-fetch provider; keep it when declaring the row by hand.
+- To go back to official search: disable this plugin's entry in the plugin manager — no config edit needed.
 
 #### Sister Plugin: dsh-preset-workbench
 

package/cordis.patch.yml

@@ -10,10 +10,20 @@
 # A legacy ~/.dsh/settings.yaml "free-search:" section is migrated into this
 # entry's config once at startup (see README).
 # Failed/empty engines automatically fall back to the next free engine.
-# web.searchProvider must point at this plugin's provider id (ddg); the runtime
-# also takes over when it is unset or still the shipped default
-# (deepseek-official), and only warns when another provider was chosen
-# explicitly.
+#
+# NOTE (2026-10, issue #51): this bundle does NOT touch `web.searchProvider`.
+# The plugin takes the search provider over at runtime instead — when the field
+# is unset or still the shipped default (`deepseek-official`) it points it at its
+# own provider id (`ddg`); when another provider was chosen explicitly it leaves
+# it alone and only warns.
+#
+# A static `- id: web  config: searchProvider: ddg` used to live here. It was
+# removed because it created a dangling reference: a patch replaces the whole
+# row config, so rows that came from a *disabled* or skipped plugin left
+# `searchProvider: ddg` behind while nothing registered `ddg` — every web search
+# then failed with `configured web provider "ddg" is not registered`. Leaving the
+# base default (`deepseek-official`) in place means a disabled plugin degrades to
+# the official provider instead of breaking search outright.
 - insert:
     - id: web-search-free
       name: dsh-free-search
@@ -21,10 +31,3 @@
         provider: bing
         disabledEngines: []
         bingMarket: zh-CN
-# 自动接管默认搜索：让 harness 的 web_search 直接用本插件的 provider（内部含全部引擎）
-# 注意 patch 语义是"整行替换 config"（DSH 0.1.2+）：必须保留 fetchProvider，否则
-# web-fetch-http 会被另一层重新注册，与 base bundle 的注册造成 duplicate loader entry。
-- id: web
-  config:
-    searchProvider: ddg
-    fetchProvider: http

package/lib/client.js

@@ -290,7 +290,7 @@ window.__ModuleLoader__.load({
     };
     const tt = (lang) => I18N[lang === "en" ? "en" : "zh"];
     // 当前插件版本（与 lib/index.js 的 PLUGIN_VERSION 保持一致）
-    const PLUGIN_VERSION = "0.6.5";
+    const PLUGIN_VERSION = "0.6.7";
     const ENGINES = [
       { id: "auto", label: "Auto · 智能路由", badge: "AUTO", link: null },
       { id: "multi", label: "Multi Search · 多引擎", badge: "MULTI", link: null },
@@ -647,7 +647,7 @@ window.__ModuleLoader__.load({
             setTestResult({
               ok: true,
               count: sources.length,
-              engine: result.value.provider ?? provider,
+              engine: result.value.provider === "multi_search" ? "multi" : (result.value.provider ?? provider),
               content: result.value.content ?? "",
               sample: sources[0]?.title ?? "",
             });

package/lib/index.js

@@ -61,6 +61,9 @@ const ALL_ENGINES = ["ddg", "ddg-lite", "bing", "searxng", "anysearch", "exa", "
 // 支持 time_range 过滤的引擎
 const TIME_ENGINES = ["tavily", "exa", "keenable", "firecrawl", "parallel", "searxng", "ddg", "ddg-lite", "baidu", "doubao"];
 
+// 虚拟搜索模式：不是单个引擎，而是 provider.search 内部的路由/并发策略
+const SEARCH_MODES = ["auto", "multi"];
+
 const DEFAULT_FALLBACK_ORDER = ["exa", "tavily", "keenable", "firecrawl", "parallel", "perplexity", "serpbase", "deepseek-official", "you", "baidu", "kimi", "aliyun", "doubao", "bing", "anysearch", "ddg", "ddg-lite", "searxng"];
 
 function normalizeDisabledEngines(value) {
@@ -118,7 +121,7 @@ function routeEngines(query, { timeRange, disabledEngines = [], fallbackOrder =
 }
 
 // 当前插件版本（发布时与 package.json 同步）
-const PLUGIN_VERSION = "0.6.5";
+const PLUGIN_VERSION = "0.6.7";
 // 检查更新的 npm registry 元数据地址（dsh-free-search 是 npmjs 上的公开包）
 const NPM_REGISTRY_URL = "https://registry.npmjs.org/dsh-free-search/latest";
 const PLUGIN_NPM_URL = "https://www.npmjs.com/package/dsh-free-search";
@@ -2036,8 +2039,11 @@ function makeBridgeRoutes(settings, search, testEngine, getCredentials) {
       }
       const maxResults = Math.min(Math.max(Number(request.maxResults) || 5, 1), 10);
       const timeRange = parseTimeRange(request.timeRange);
-      // 指定 engine：直测该引擎本身（不走回退链），报告它自己的可用性
-      if (typeof request.engine === "string" && request.engine.length > 0) {
+      // 指定 engine：直测该引擎本身（不走回退链），报告它自己的可用性。
+      // auto / multi 是虚拟模式，没有"单引擎本身"可测 → 交给下面的 provider.search，
+      // 真实跑一遍路由/并发链路（否则设置页「测试引擎」会对它们报 unknown engine）。
+      const engineIsMode = typeof request.engine === "string" && SEARCH_MODES.includes(request.engine);
+      if (typeof request.engine === "string" && request.engine.length > 0 && !engineIsMode) {
         if (typeof testEngine !== "function") {
           return { ok: false, code: "search-unavailable", message: "engine test is not wired" };
         }
@@ -3056,7 +3062,7 @@ function apply(ctx, config) {
           parameters: {
             engines: {
               type: "array",
-              description: "Which engines to test (default: all). Options: ddg, ddg-lite, bing, searxng, anysearch, exa, tavily, keenable, firecrawl, parallel, perplexity, serpbase, deepseek-official, you, baidu, kimi, aliyun, doubao.",
+              description: "Which engines to test (default: all enabled engines). Options: ddg, ddg-lite, bing, searxng, anysearch, exa, tavily, keenable, firecrawl, parallel, perplexity, serpbase, deepseek-official, you, baidu, kimi, aliyun, doubao; the virtual modes auto and multi are also accepted and run the real routing/concurrent path.",
               items: { type: "string" },
             },
             query: {
@@ -3089,7 +3095,8 @@ function apply(ctx, config) {
             render(args, value) {
               const lines = value.results.map((r) => {
                 if (r.status === "ok") {
-                  return `- ${r.engine}: OK (${r.results} results${r.sampleTitle ? `, e.g. "${r.sampleTitle.slice(0, 40)}"` : ""})`;
+                  const via = r.engineUsed && r.engineUsed !== r.engine ? ` via ${r.engineUsed}` : "";
+                  return `- ${r.engine}: OK (${r.results} results${via}${r.sampleTitle ? `, e.g. "${r.sampleTitle.slice(0, 40)}"` : ""})`;
                 }
                 if (r.status === "disabled") return `- ${r.engine}: DISABLED`;
                 return `- ${r.engine}: FAIL - ${r.error}`;
@@ -3103,7 +3110,7 @@ function apply(ctx, config) {
             const disabled = new Set(normalizeDisabledEngines(current().disabledEngines));
             const explicit = Array.isArray(args.engines) && args.engines.length > 0;
             const engines = explicit
-              ? args.engines.filter((engine) => ALL_ENGINES.includes(engine))
+              ? args.engines.filter((engine) => ALL_ENGINES.includes(engine) || SEARCH_MODES.includes(engine))
               : enabledEngines(current().disabledEngines, current().fallbackOrder);
             const results = [];
             for (const engine of engines) {
@@ -3111,6 +3118,25 @@ function apply(ctx, config) {
                 results.push({ engine, status: "disabled" });
                 continue;
               }
+              // 虚拟模式（auto/multi）：走 provider.search 真实路由/并发，报告实际生效的引擎
+              if (SEARCH_MODES.includes(engine)) {
+                try {
+                  const r = await provider.search({ query: args.query, maxResults: 2, engine });
+                  const sources = r.sources ?? [];
+                  if (sources.length === 0) {
+                    results.push({ engine, status: "fail", error: "0 results" });
+                  } else {
+                    const item = { engine, status: "ok", results: sources.length, engineUsed: r.provider ?? r.engine ?? engine };
+                    if (sources[0]?.title) item.sampleTitle = String(sources[0].title);
+                    if (sources[0]?.url) item.sampleUrl = String(sources[0].url);
+                    if (r.content) item.note = String(r.content);
+                    results.push(item);
+                  }
+                } catch (error) {
+                  results.push({ engine, status: "fail", error: error instanceof Error ? error.message : String(error) });
+                }
+                continue;
+              }
               const r = await runEngineTest(engine, args.query);
               if (r.ok) {
                 const item = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-free-search",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "Free web search for DeepSeek Harness: 18 engines (Bing/DuckDuckGo/AnySearch/SearXNG/Exa/Tavily/Keenable/Firecrawl/Parallel keyless; Perplexity/SerpBase/DeepSeek/You.com/Baidu/Kimi/Aliyun/Doubao with key) + auto smart routing + global engine enable/disable & fallback priority + multi mode (parallel top-3 merge) + multi_search cross-source tool + time filtering + platform search + web_fetch, with web settings UI.",
   "type": "module",
   "main": "lib/index.js",