dsh-free-search 0.7.1 → 0.7.2

package/README.md

@@ -71,9 +71,9 @@ dsh 默认的搜索 provider 依赖 DeepSeek 官方 API key（`DEEPSEEK_API_KEY`
 | `kimi` | Kimi（Moonshot）联网搜索 | 付费 | 需 `MOONSHOT_API_KEY`（basic 约 ￥0.01/次），返回带正文 chunks 的中文结果 |
 | `aliyun` | 阿里云百炼 EnhancedSearch | 付费 | 需 `DASHSCOPE_API_KEY`（MCP search_pro，约 ￥0.03/次，新用户 200 次免费包）；中文全网带来源 hostname |
 | `doubao` | 火山引擎联网搜索（豆包搜索） | 免费额度 | 需 `DOUBAO_SEARCH_API_KEY`（联网搜索控制台开通，**每月 500 次免费**，超出按量付费）；中文时效内容强，支持时间/站点过滤，返回千字级摘要 |
-| `openai` | OpenAI 模型内置搜索 | 付费 | 需 `OPENAI_API_KEY`；走 Responses API 的 `web_search` 工具，返回带引用的回答。**按次计费，仅在显式选中时使用**（不参与自动回退/auto）；模型与端点可配（`openaiModel` / `openaiBaseUrl`） |
-| `gemini` | Gemini Grounding with Google Search | 付费 | 需 `GEMINI_API_KEY`（兼容 `GOOGLE_API_KEY`）；返回 grounding 来源。**按次计费，仅在显式选中时使用**；模型与端点可配（`geminiModel` / `geminiBaseUrl`） |
-| `claude` | Claude 服务端 web_search | 付费 | 需 `ANTHROPIC_API_KEY`；结果来自 `web_search_tool_result`。**按次计费，仅在显式选中时使用**；模型与端点可配（`claudeModel` / `claudeBaseUrl`） |
+| `openai` | OpenAI 模型内置搜索 | 付费 | 需 `OPENAI_API_KEY`；走 Responses API 的 `web_search` 工具，返回带引用的回答。**按次计费，仅在显式选中时使用**（不参与自动回退/auto）；默认 `gpt-6-luna`，模型与端点可配（`openaiModel` / `openaiBaseUrl`） |
+| `gemini` | Gemini Grounding with Google Search | 付费 | 需 `GEMINI_API_KEY`（兼容 `GOOGLE_API_KEY`）；走官方推荐的 **Interactions API**（`POST /v1beta/interactions`，`tools:[{type:"google_search"}]`），从 `steps[].content[].annotations` 取引用。**按次计费，仅在显式选中时使用**；默认 `gemini-3.8-flash`，模型与端点可配（`geminiModel` / `geminiBaseUrl`） |
+| `claude` | Claude 服务端 web_search | 付费 | 需 `ANTHROPIC_API_KEY`；结果来自 `web_search_tool_result`。**按次计费，仅在显式选中时使用**；默认 `claude-sonnet-5-5`，模型与端点可配（`claudeModel` / `claudeBaseUrl`） |
 
 - **默认引擎为 `bing`**（免费且最稳定），安装后开箱即用。
 - **自动回退**：任何引擎失败（免费限流/反爬，付费缺 key/无效/网络错误）都会自动轮流尝试下一个引擎——先试其他已配 key 的付费引擎，再试免费引擎（Bing/AnySearch 等），并在结果中附带回退提示——搜索不会因引擎问题直接失败。
@@ -419,9 +419,9 @@ If this plugin has been helpful, a ⭐ on [GitHub](https://github.com/DDDMUC/dsh
 | `kimi` | Kimi (Moonshot) Web Search | Paid | Requires `MOONSHOT_API_KEY` (basic ~¥0.01/call); returns Chinese results with body chunks |
 | `aliyun` | Aliyun Bailian EnhancedSearch | Paid | Requires `DASHSCOPE_API_KEY` (MCP search_pro, ~¥0.03/call, 200 free calls for new users); Chinese web-wide with source hostnames |
 | `doubao` | Volcano Web Search (Doubao) | Free quota | Requires `DOUBAO_SEARCH_API_KEY` (open it in the Web Search console; **500 free queries/month**, pay-as-you-go beyond); strong for fresh Chinese content, supports time/site filters, returns long summaries |
-| `openai` | OpenAI built-in web search | Paid | Requires `OPENAI_API_KEY`; uses the Responses API `web_search` tool and returns a cited answer. **Billed per search, explicit selection only** (never picked by the fallback chain or Auto); model/endpoint configurable (`openaiModel` / `openaiBaseUrl`) |
-| `gemini` | Gemini grounding with Google Search | Paid | Requires `GEMINI_API_KEY` (falls back to `GOOGLE_API_KEY`); returns grounding sources. **Billed per search, explicit selection only**; model/endpoint configurable (`geminiModel` / `geminiBaseUrl`) |
-| `claude` | Claude server-side web_search | Paid | Requires `ANTHROPIC_API_KEY`; results come from `web_search_tool_result`. **Billed per search, explicit selection only**; model/endpoint configurable (`claudeModel` / `claudeBaseUrl`) |
+| `openai` | OpenAI built-in web search | Paid | Requires `OPENAI_API_KEY`; uses the Responses API `web_search` tool and returns a cited answer. **Billed per search, explicit selection only** (never picked by the fallback chain or Auto); default `gpt-6-luna`, model/endpoint configurable (`openaiModel` / `openaiBaseUrl`) |
+| `gemini` | Gemini grounding with Google Search | Paid | Requires `GEMINI_API_KEY` (falls back to `GOOGLE_API_KEY`); uses the recommended **Interactions API** (`POST /v1beta/interactions`, `tools:[{type:"google_search"}]`) and reads citations from `steps[].content[].annotations`. **Billed per search, explicit selection only**; default `gemini-3.8-flash`, model/endpoint configurable (`geminiModel` / `geminiBaseUrl`) |
+| `claude` | Claude server-side web_search | Paid | Requires `ANTHROPIC_API_KEY`; results come from `web_search_tool_result`. **Billed per search, explicit selection only**; default `claude-sonnet-5-5`, model/endpoint configurable (`claudeModel` / `claudeBaseUrl`) |
 
 - **Default engine is `bing`** (free and most stable), ready to use out of the box after installation.
 - **Auto-failover**: any engine failure (rate-limited free engine, or missing/invalid paid key, network error) automatically tries the next engine — the configured engine first, then other engines (exa/tavily/keenable/firecrawl/parallel are tried even without a key because they have built-in keyless quota), then the remaining free engines (Bing/AnySearch etc.) — with a note attached to the results naming the engine that actually served them (e.g. `Note: perplexity unavailable or failed, using exa.`). Search never fails outright because of engine issues.

package/lib/client.js

@@ -312,7 +312,7 @@ window.__ModuleLoader__.load({
     };
     const tt = (lang) => I18N[lang === "en" ? "en" : "zh"];
     // 当前插件版本（与 lib/index.js 的 PLUGIN_VERSION 保持一致）
-    const PLUGIN_VERSION = "0.7.1";
+    const PLUGIN_VERSION = "0.7.2";
     const ENGINES = [
       { id: "auto", label: "Auto · 智能路由", badge: "AUTO", link: null },
       { id: "multi", label: "Multi Search · 多引擎", badge: "MULTI", link: null },

package/lib/index.js

@@ -191,7 +191,7 @@ function routeEngines(query, { timeRange, disabledEngines = [], fallbackOrder =
 }
 
 // 当前插件版本（发布时与 package.json 同步）
-const PLUGIN_VERSION = "0.7.1";
+const PLUGIN_VERSION = "0.7.2";
 // 检查更新的 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";
@@ -1888,7 +1888,7 @@ async function searchAliyun(query, maxResults, apiKey, timeRange, signal) {
 // 因此只在用户显式选中该引擎时运行（见 EXPLICIT_ONLY_ENGINES）。模型名与 Base URL
 // 都可配置，便于走兼容网关。
 
-const OPENAI_DEFAULT_MODEL = "gpt-4o-mini";
+const OPENAI_DEFAULT_MODEL = "gpt-6-luna";
 const OPENAI_DEFAULT_BASE_URL = "https://api.openai.com/v1";
 
 function openaiResponsesUrl(baseUrl) {
@@ -1954,18 +1954,18 @@ async function searchOpenai(query, maxResults, apiKey, options, signal) {
   return { sources: uniqueSources(sources, maxResults ?? 10), truncated: false };
 }
 
-const GEMINI_DEFAULT_MODEL = "gemini-2.0-flash";
+const GEMINI_DEFAULT_MODEL = "gemini-3.8-flash";
 const GEMINI_DEFAULT_BASE_URL = "https://generativelanguage.googleapis.com/v1beta";
 
-function geminiGenerateUrl(baseUrl, model) {
+function geminiInteractionsUrl(baseUrl) {
   const base = (typeof baseUrl === "string" && baseUrl.trim() ? baseUrl.trim() : GEMINI_DEFAULT_BASE_URL).replace(/\/+$/, "");
-  return base.endsWith(":generateContent") ? base : base + "/models/" + encodeURIComponent(model) + ":generateContent";
+  return base.endsWith("/interactions") ? base : base + "/interactions";
 }
 
 async function searchGemini(query, maxResults, apiKey, options, signal) {
   if (!apiKey) throw new Error("Gemini search requires GEMINI_API_KEY");
   const model = (typeof options?.geminiModel === "string" && options.geminiModel.trim()) || GEMINI_DEFAULT_MODEL;
-  const response = await fetch(geminiGenerateUrl(options?.geminiBaseUrl, model), {
+  const response = await fetch(geminiInteractionsUrl(options?.geminiBaseUrl), {
     method: "POST",
     redirect: "error",
     headers: {
@@ -1974,8 +1974,9 @@ async function searchGemini(query, maxResults, apiKey, options, signal) {
       "user-agent": "deepseek-harness/free-search",
     },
     body: JSON.stringify({
-      contents: [{ role: "user", parts: [{ text: String(query) }] }],
-      tools: [{ google_search: {} }],
+      model,
+      input: String(query),
+      tools: [{ type: "google_search" }],
     }),
     signal: AbortSignal.any([...(signal !== undefined ? [signal] : []), AbortSignal.timeout(45000)]),
   });
@@ -1993,26 +1994,30 @@ async function searchGemini(query, maxResults, apiKey, options, signal) {
   if (data?.error) {
     throw new Error("Gemini response failed: " + (data.error.message ?? JSON.stringify(data.error).slice(0, 200)));
   }
-  const candidate = data?.candidates?.[0];
-  const answer = (candidate?.content?.parts ?? [])
-    .map((part) => (typeof part?.text === "string" ? part.text : ""))
-    .filter(Boolean)
-    .join("\n");
-  // groundingChunks[].web = { uri, title } 就是搜索命中的来源
+  // Interactions API：结果在 steps[] 里；model_output 步骤的 text 块带 url_citation 注解
+  const steps = Array.isArray(data?.steps) ? data.steps : [];
+  let answer = typeof data?.output_text === "string" ? data.output_text : "";
   const sources = [];
-  for (const chunk of candidate?.groundingMetadata?.groundingChunks ?? []) {
-    const web = chunk?.web;
-    if (!web || typeof web.uri !== "string" || !web.uri) continue;
-    sources.push({
-      url: web.uri,
-      ...(web.title ? { title: String(web.title) } : {}),
-      ...(answer.trim() ? { snippet: stripTags(answer).slice(0, 300) } : {}),
-    });
+  for (const step of steps) {
+    if (!step || step.type !== "model_output" || !Array.isArray(step.content)) continue;
+    for (const block of step.content) {
+      if (!block || block.type !== "text") continue;
+      const text = typeof block.text === "string" ? block.text : "";
+      if (!answer && text.trim()) answer = text;
+      for (const annotation of block.annotations ?? []) {
+        if (annotation?.type !== "url_citation" || typeof annotation.url !== "string" || !annotation.url) continue;
+        sources.push({
+          url: annotation.url,
+          ...(annotation.title ? { title: String(annotation.title) } : {}),
+          ...(text.trim() ? { snippet: stripTags(text).slice(0, 300) } : {}),
+        });
+      }
+    }
   }
   return { sources: uniqueSources(sources, maxResults ?? 10), truncated: false };
 }
 
-const CLAUDE_DEFAULT_MODEL = "claude-3-5-sonnet-latest";
+const CLAUDE_DEFAULT_MODEL = "claude-sonnet-5-5";
 const CLAUDE_DEFAULT_BASE_URL = "https://api.anthropic.com/v1";
 const CLAUDE_DEFAULT_VERSION = "2023-06-01";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-free-search",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Free web search for DeepSeek Harness: 21 engines (Bing/DuckDuckGo/AnySearch/SearXNG/Exa/Tavily/Keenable/Firecrawl/Parallel keyless; Perplexity/SerpBase/DeepSeek/You.com/Baidu/Kimi/Aliyun/Doubao with key; OpenAI/Gemini/Claude model built-in search, explicit-only) + auto smart routing + global engine enable/disable & fallback priority + multi mode (parallel top-3 merge) + multi_search cross-source tool + failure-aware fallback (quota/auth cooldown, transient retry, fallbackOn) + time filtering + platform search + web_fetch, with web settings UI.",
   "type": "module",
   "main": "lib/index.js",