dsh-free-search 0.8.4 → 0.8.6

package/lib/client.js

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

package/lib/fetch_provider.js

@@ -6,12 +6,110 @@
 // ponytail: 无服务级令牌桶——web_fetch 为单发用户/agent 驱动调用，非扇出；若未来批量调用再引入共享调度。
 
 import https from "node:https";
+import zlib from "node:zlib";
+import { spawn } from "node:child_process";
+import { existsSync, mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { callExa, callFirecrawl, callCrawl4ai } from "./fetch_upstream.js";
 
 const T1_MIN_CHARS = 300;
 const TEXTUAL = /text\/|json|xml|javascript|application\/json/i;
 
-/** GET 跟随重定向（≤5 跳），返回最终 URL / 状态 / 正文 / 内容类型。 */
+// ---------- T1.5：系统浏览器无头渲染（执行 JS 过挑战；无浏览器/失败/超时则静默跳过） ----------
+const BROWSER_CANDIDATES = [
+  "C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe",
+  "C:\\Program Files\\Microsoft\\Edge\\Application\\msedge.exe",
+  "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe",
+  "C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe",
+  "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+  "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
+];
+let cachedBrowserPath; // undefined = 未检测；null = 无浏览器
+function findSystemBrowser() {
+  if (cachedBrowserPath !== undefined) return cachedBrowserPath;
+  cachedBrowserPath = null;
+  for (const p of BROWSER_CANDIDATES) {
+    try {
+      if (existsSync(p)) {
+        cachedBrowserPath = p;
+        break;
+      }
+    } catch {
+      // 忽略检测错误
+    }
+  }
+  return cachedBrowserPath;
+}
+
+function browserDumpDom(browserPath, url, { timeoutMs = 25000, signal } = {}) {
+  return new Promise((resolve) => {
+    // 独立 user-data-dir：避免与用户正在运行的浏览器实例抢同一 profile（共享 profile 时无输出/立即退出）
+    let tmpDir;
+    let child;
+    try {
+      tmpDir = mkdtempSync(join(tmpdir(), "dshfs-browser-"));
+      child = spawn(browserPath, [
+        "--headless=new",
+        "--disable-gpu",
+        "--no-first-run",
+        "--no-sandbox",
+        // 抑制崩溃上报/组件更新/账号同步：Windows 实测这些会在 tmp profile 下反复报错
+        // （Crashpad settings.dat 写入失败、get_updates failed）并偶发导致退出码异常/无输出
+        "--disable-breakpad",
+        "--disable-crashpad",
+        "--disable-component-update",
+        "--disable-sync",
+        `--user-data-dir=${tmpDir}`,
+        "--dump-dom",
+        "--virtual-time-budget=10000",
+        url,
+      ], { stdio: ["ignore", "pipe", "pipe"], windowsHide: true });
+    } catch {
+      if (tmpDir) try { rmSync(tmpDir, { recursive: true, force: true }); } catch { /* 忽略 */ }
+      resolve(null);
+      return;
+    }
+    let out = "";
+    let done = false;
+    // 杀整棵进程树：Edge/Chrome 是多进程架构，child.kill() 只杀主进程会残留渲染子进程
+    const killTree = () => {
+      try {
+        spawn("taskkill", ["/pid", String(child.pid), "/T", "/F"], { windowsHide: true, stdio: "ignore" });
+      } catch {
+        try { child.kill(); } catch { /* 忽略 */ }
+      }
+    };
+    const finish = (ok) => {
+      if (done) return;
+      done = true;
+      killTree();
+      if (tmpDir) {
+        // 浏览器进程退出后才能删 profile 目录；延迟清理，失败无所谓
+        setTimeout(() => { try { rmSync(tmpDir, { recursive: true, force: true }); } catch { /* 忽略 */ } }, 500);
+      }
+      resolve(ok && out.length > 0 ? out : null);
+    };
+    child.stdout.on("data", (c) => {
+      if (out.length < 5 * 1024 * 1024) out += c.toString("utf8");
+    });
+    // stderr 必须 pipe 且读取丢弃：Windows 上 Edge 无头模式 stderr 指向 NUL 会卡死（实测 exit=1/0 输出）
+    child.stderr.on("data", () => {});
+    child.on("error", () => finish(false));
+    // 以 exit 为准：Edge/Chrome 的渲染子进程会继承 stdout pipe，"close" 可能迟迟不触发；
+    // 稍等 200ms 让残余数据 flush 到齐（exit 与 stdout 到达之间有窗口）。
+    child.on("exit", (code) => {
+      setTimeout(() => finish(code === 0 || out.length > 0), 200);
+    });
+    setTimeout(() => finish(false), timeoutMs);
+    if (signal) {
+      if (signal.aborted) finish(false);
+      else signal.addEventListener("abort", () => finish(false), { once: true });
+    }
+  });
+}
+
+/** GET 跟随重定向（≤5 跳），返回最终 URL / 状态 / 正文 / 内容类型；支持 gzip/br/deflate 解压。 */
 function httpsGetFollow(url, { headers = {}, timeoutMs = 20000, signal } = {}) {
   return new Promise((resolve, reject) => {
     const hop = (current, left) => {
@@ -24,9 +122,19 @@ function httpsGetFollow(url, { headers = {}, timeoutMs = 20000, signal } = {}) {
             const next = new URL(res.headers.location, current).toString();
             return hop(next, left - 1);
           }
+          const enc = String(res.headers["content-encoding"] || "").toLowerCase();
+          let stream = res;
+          try {
+            if (enc.includes("br")) stream = res.pipe(zlib.createBrotliDecompress());
+            else if (enc.includes("gzip")) stream = res.pipe(zlib.createGunzip());
+            else if (enc.includes("deflate")) stream = res.pipe(zlib.createInflate());
+          } catch {
+            stream = res;
+          }
           const chunks = [];
-          res.on("data", (c) => chunks.push(c));
-          res.on("end", () => resolve({ url: current, status: res.statusCode, text: Buffer.concat(chunks).toString("utf8"), contentType: res.headers["content-type"] || "" }));
+          stream.on("data", (c) => chunks.push(c));
+          stream.on("end", () => resolve({ url: current, status: res.statusCode, text: Buffer.concat(chunks).toString("utf8"), contentType: res.headers["content-type"] || "" }));
+          stream.on("error", reject);
         }
       );
       req.on("timeout", () => req.destroy(new Error(`timeout after ${timeoutMs}ms`)));
@@ -37,7 +145,22 @@ function httpsGetFollow(url, { headers = {}, timeoutMs = 20000, signal } = {}) {
   });
 }
 
-const BROWSERISH = { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36", Accept: "text/html,application/xhtml+xml,*/*", "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8" };
+// 完整浏览器请求头（Chrome 128 形态）：部分反爬站（如百度系）对精简头直接 403，完整头可通过。
+// 注意：声明了 Accept-Encoding 就必须解压（httpsGetFollow 已支持 gzip/br/deflate）。
+const BROWSERISH = {
+  "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
+  Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
+  "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
+  "Accept-Encoding": "gzip, deflate, br",
+  "sec-ch-ua": '"Chromium";v="128", "Not;A=Brand";v="24", "Google Chrome";v="128"',
+  "sec-ch-ua-mobile": "?0",
+  "sec-ch-ua-platform": '"Windows"',
+  "Sec-Fetch-Dest": "document",
+  "Sec-Fetch-Mode": "navigate",
+  "Sec-Fetch-Site": "none",
+  "Sec-Fetch-User": "?1",
+  "Upgrade-Insecure-Requests": "1",
+};
 
 export function createFetchProvider({ resolveApiKey, logger }) {
   return {
@@ -59,6 +182,20 @@ export function createFetchProvider({ resolveApiKey, logger }) {
         else errors.push(`direct: ${r.contentType || "unknown type"} ${r.text.length}B`);
       } catch (e) { errors.push(`direct: ${e.message}`); }
 
+      // T1.5：系统浏览器无头渲染（执行 JS 过挑战，抓直连拿不到的页面；无浏览器自动跳过）
+      const browserPath = findSystemBrowser();
+      if (browserPath) {
+        try {
+          const html = await browserDumpDom(browserPath, url, { signal });
+          if (html && html.length >= T1_MIN_CHARS && !/403 Forbidden|\bcaptcha\b/i.test(html.slice(0, 3000))) {
+            return { url, statusCode: 200, body: { kind: "html", content: html }, truncated: false };
+          }
+          errors.push(html ? `browser: short or challenge page (${html.length}B)` : "browser: no output (timeout or launch failure)");
+        } catch (e) {
+          errors.push(`browser: ${e.message}`);
+        }
+      }
+
       // T2：exa contents（$1/1000 页）——直连失败（反爬/JS/过短）时承接；firecrawl 额度保护：仅在本层失败后才走 T3
       const exaKey = await resolveApiKey("EXA_API_KEY", "exaApiKey").catch(() => undefined);
       if (exaKey) {

package/lib/index.js

@@ -9,6 +9,7 @@ import { mcpCall, mcpContentText } from "./mcp_adapter.js";
 import { registerResearchTool } from "./research.js";
 import { registerDomainSearchTool } from "./vertical.js";
 import { createFetchProvider } from "./fetch_provider.js";
+import { fetchWeather, sanitizeWeatherResult, WEATHER_OUTPUT_SCHEMA } from "./weather.js";
 
 // 兼容 guard（#55）：Node 会优先解析插件目录下的嵌套依赖，若那里残留旧的
 // @deepseek-ai/schemastery（如 node_modules/dsh-free-search/node_modules/... -> 3.18.1），
@@ -240,7 +241,7 @@ function routeEngines(query, { timeRange, disabledEngines = [], fallbackOrder =
 }
 
 // 当前插件版本（发布时与 package.json 同步；跟随上游 v0.7.5，不在 PR 里 bump）
-const PLUGIN_VERSION = "0.8.4";
+const PLUGIN_VERSION = "0.8.6";
 // 检查更新的 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";
@@ -569,14 +570,31 @@ function looksRelevant(query, sources) {
   });
 }
 
+// Bing 会把结果 URL 包成 bing.com/ck/a 跳转链接：真实地址在 u 参数（base64url，a1 前缀）
+function extractBingUrl(href) {
+  if (!href) return href;
+  const url = decodeEntities(href); // & -> &
+  if (!/^https?:\/\/(www\.)?bing\.com\/ck\/a/i.test(url)) return href;
+  try {
+    const u = new URL(url).searchParams.get("u");
+    if (!u) return href;
+    const b64 = u.startsWith("a1") ? u.slice(2) : u;
+    const decoded = Buffer.from(b64.replace(/-/g, "+").replace(/_/g, "/"), "base64").toString("utf8");
+    return /^https?:\/\//i.test(decoded) ? decoded : href;
+  } catch {
+    return href;
+  }
+}
+
 async function searchBing(query, maxResults, options, signal) {
-  // mkt：显式 bingMarket 优先；否则按 lang 映射（zh→zh-CN, ru→ru-RU ...）
+  // mkt：仅显式 bingMarket 才发。默认不发——mkt=zh-CN 在部分地区/线路会返回空 SERP 容器
+  // （#71：海外 IP + mkt=zh-CN → b_algo=0），Bing 会按 Accept-Language 自行本地化。
   const profile = LANG_PROFILES[options?.lang] ?? LANG_PROFILES.zh;
-  const market = options?.bingMarket ?? profile.market;
-  const params = new URLSearchParams({ q: query, mkt: market });
+  const params = new URLSearchParams({ q: query });
+  if (options?.bingMarket) params.set("mkt", options.bingMarket);
   // Accept-Language：显式 bingMarket 时按 market 反推（避免中文 header 污染），否则用 lang 档案
   const acceptLang = options?.bingMarket
-    ? (MARKET_TO_LANG[market] ?? ACCEPT_LANG)
+    ? (MARKET_TO_LANG[options.bingMarket] ?? ACCEPT_LANG)
     : (profile.acceptLang ?? ACCEPT_LANG);
   const adlt = options?.safeSearch ?? "off";
   if (adlt === "off") params.set("adlt", "off");
@@ -591,7 +609,7 @@ async function searchBing(query, maxResults, options, signal) {
     const snippetMatch = block.match(/<p[^>]*>([\s\S]*?)<\/p>/);
     if (!hrefMatch) continue;
     sources.push({
-      url: hrefMatch[1],
+      url: extractBingUrl(hrefMatch[1]),
       ...(titleMatch ? { title: stripTags(titleMatch[1]) } : {}),
       ...(snippetMatch ? { snippet: stripTags(snippetMatch[1]) } : {}),
     });
@@ -1203,112 +1221,9 @@ async function searchYoutube(query, maxResults, signal) {
   return { sources: uniqueSources(sources, maxResults ?? 10), truncated: false };
 }
 
-// ---------- Weather（Open-Meteo：geocoding + forecast，全部免 key） ----------
-const OPEN_METEO_GEOCODING_URL = "https://geocoding-api.open-meteo.com/v1/search";
-const OPEN_METEO_FORECAST_URL = "https://api.open-meteo.com/v1/forecast";
-// WMO weather code → 描述（中文/英文）
-const WMO_CODES = {
-  0: ["晴", "Clear sky"],
-  1: ["大部晴朗", "Mainly clear"],
-  2: ["多云", "Partly cloudy"],
-  3: ["阴", "Overcast"],
-  45: ["雾", "Fog"],
-  48: ["雾凇", "Depositing rime fog"],
-  51: ["毛毛雨（弱）", "Light drizzle"],
-  53: ["毛毛雨", "Moderate drizzle"],
-  55: ["毛毛雨（强）", "Dense drizzle"],
-  56: ["冻毛毛雨（弱）", "Light freezing drizzle"],
-  57: ["冻毛毛雨（强）", "Dense freezing drizzle"],
-  61: ["小雨", "Slight rain"],
-  63: ["中雨", "Moderate rain"],
-  65: ["大雨", "Heavy rain"],
-  66: ["冻雨（弱）", "Light freezing rain"],
-  67: ["冻雨（强）", "Heavy freezing rain"],
-  71: ["小雪", "Slight snow"],
-  73: ["中雪", "Moderate snow"],
-  75: ["大雪", "Heavy snow"],
-  77: ["雪粒", "Snow grains"],
-  80: ["阵雨（弱）", "Slight rain showers"],
-  81: ["阵雨", "Moderate rain showers"],
-  82: ["阵雨（强）", "Violent rain showers"],
-  85: ["阵雪（弱）", "Slight snow showers"],
-  86: ["阵雪（强）", "Heavy snow showers"],
-  95: ["雷暴", "Thunderstorm"],
-  96: ["雷暴伴小冰雹", "Thunderstorm with slight hail"],
-  99: ["雷暴伴大冰雹", "Thunderstorm with heavy hail"],
-};
-function wmoText(code, lang) {
-  const hit = WMO_CODES[code];
-  if (!hit) return lang === "en" ? "Unknown" : "未知";
-  return (lang === "en" ? hit[1] : hit[0]) + ` (WMO ${code})`;
-}
-
-async function geocodeLocation(name, signal) {
-  const params = new URLSearchParams({ name, count: "1", language: "zh", format: "json" });
-  const response = await fetch(`${OPEN_METEO_GEOCODING_URL}?${params}`, {
-    method: "GET",
-    redirect: "error",
-    headers: { accept: "application/json", "user-agent": "deepseek-harness/free-search" },
-    signal: AbortSignal.any([...(signal !== undefined ? [signal] : []), AbortSignal.timeout(15000)]),
-  });
-  if (!response.ok) throw new Error(`geocoding API error (HTTP ${response.status})`);
-  const data = await response.json();
-  const hit = data.results?.[0];
-  if (!hit) return null;
-  return {
-    name: hit.name,
-    admin: hit.admin1 ?? "",
-    country: hit.country ?? "",
-    latitude: hit.latitude,
-    longitude: hit.longitude,
-  };
-}
-
-async function fetchWeather(location, days, lang, signal) {
-  const geo = await geocodeLocation(location, signal);
-  if (!geo) throw new Error(`could not geocode location "${location}" — try a nearby larger city`);
-  const params = new URLSearchParams({
-    latitude: String(geo.latitude),
-    longitude: String(geo.longitude),
-    current: "temperature_2m,relative_humidity_2m,apparent_temperature,weather_code,wind_speed_10m",
-    daily: "weather_code,temperature_2m_max,temperature_2m_min,precipitation_probability_max",
-    timezone: "auto",
-    forecast_days: String(Math.min(Math.max(Number(days) || 3, 1), 7)),
-  });
-  const response = await fetch(`${OPEN_METEO_FORECAST_URL}?${params}`, {
-    method: "GET",
-    redirect: "error",
-    headers: { accept: "application/json", "user-agent": "deepseek-harness/free-search" },
-    signal: AbortSignal.any([...(signal !== undefined ? [signal] : []), AbortSignal.timeout(15000)]),
-  });
-  if (!response.ok) throw new Error(`forecast API error (HTTP ${response.status})`);
-  const data = await response.json();
-  const cur = data.current ?? {};
-  const daily = data.daily ?? {};
-  return {
-    location: [geo.name, geo.admin, geo.country].filter(Boolean).join(", "),
-    latitude: geo.latitude,
-    longitude: geo.longitude,
-    current: {
-      temperature: cur.temperature_2m,
-      apparent: cur.apparent_temperature,
-      humidity: cur.relative_humidity_2m,
-      wind: cur.wind_speed_10m,
-      code: cur.weather_code,
-      text: wmoText(cur.weather_code, lang),
-    },
-    daily: (daily.time ?? []).map((date, i) => ({
-      date,
-      min: daily.temperature_2m_min?.[i],
-      max: daily.temperature_2m_max?.[i],
-      code: daily.weather_code?.[i],
-      text: wmoText(daily.weather_code?.[i], lang),
-      precipitationProbability: daily.precipitation_probability_max?.[i],
-    })),
-    timezone: data.timezone ?? "",
-  };
-}
-
+// Weather（Open-Meteo）实现已抽至 lib/weather.js（fetchWeather / WEATHER_OUTPUT_SCHEMA /
+// sanitizeWeatherResult）；契约由 tools/assert-weather-contract.mjs 离线校验（#73）。
+
 // Vimeo：无官方免 key 搜索 API。尽力抓搜索页里内嵌的 /videos/<id> 数据；
 // 抓不到时由调用方退回网页搜索（site:vimeo.com）。
 async function searchVimeo(query, maxResults, signal) {
@@ -4477,38 +4392,7 @@ function apply(ctx, config) {
             days: { type: "number", description: "Forecast days (1-7, default 3)." },
           },
           output: {
-            schema: {
-              type: "object",
-              additionalProperties: false,
-              properties: {
-                location: { type: "string" },
-                current: {
-                  type: "object",
-                  additionalProperties: false,
-                  properties: {
-                    temperature: { type: "number" },
-                    apparent: { type: "number" },
-                    humidity: { type: "number" },
-                    wind: { type: "number" },
-                    text: { type: "string" },
-                  },
-                },
-                daily: {
-                  type: "array",
-                  items: {
-                    type: "object",
-                    additionalProperties: false,
-                    properties: {
-                      date: { type: "string" },
-                      min: { type: "number" },
-                      max: { type: "number" },
-                      text: { type: "string" },
-                      precipitationProbability: { type: "number" },
-                    },
-                  },
-                },
-              },
-            },
+            schema: WEATHER_OUTPUT_SCHEMA,
             render(args, value) {
               const lang = current().lang === "en" ? "en" : "zh";
               const c = value.current ?? {};
@@ -4533,7 +4417,7 @@ function apply(ctx, config) {
             const lang = current().lang === "en" ? "en" : "zh";
             const location = String(args.location ?? "").trim();
             if (!location) throw new Error("weather: location is required");
-            return await fetchWeather(location, args.days, lang, undefined);
+            return sanitizeWeatherResult(await fetchWeather(location, args.days, lang, undefined));
           },
           finalizeContent(exec, result) {
             const text = result.content;

package/lib/research.js

@@ -649,16 +649,29 @@ export function canUseCache(fetchedAtMs, freshness, nowMs = Date.now()) {
   return [true, ""];
 }
 
-/** T1 平台 fetch（宿主第二参数支持 signal；deadline abort 在途请求）。 */
+/** T1 平台 fetch（宿主签名 fetch(request, signal?)，第二参必须是 AbortSignal 本体——
+ *  传 { signal } 包装对象会一路传到 https.request 抛 TypeError，浏览器层也会缺 addEventListener）。 */
 async function platformFetch(ctx, url, signal) {
-  try {
-    return await ctx.web.fetch({ url }, signal ? { signal } : undefined);
-  } catch (e) {
-    if (signal && !signal.aborted && e instanceof TypeError && /argument|parameters/i.test(String(e?.message))) {
-      return await ctx.web.fetch({ url }); // 老宿主不认第二参数：退回单参调用
-    }
-    throw e;
+  return await ctx.web.fetch({ url }, signal);
+}
+
+// 从 HTML 提取页面更新时间：article:modified_time / og:updated_time / JSON-LD dateModified / <time datetime>，
+// 取不到返回空串。
+function parseUpdatedFromHtml(html) {
+  const s = String(html ?? "");
+  const patterns = [
+    /<meta[^>]+property=["']article:modified_time["'][^>]+content=["']([^"']+)["']/i,
+    /<meta[^>]+content=["']([^"']+)["'][^>]+property=["']article:modified_time["']/i,
+    /<meta[^>]+property=["']og:updated_time["'][^>]+content=["']([^"']+)["']/i,
+    /<meta[^>]+content=["']([^"']+)["'][^>]+property=["']og:updated_time["']/i,
+    /"dateModified"\s*:\s*"([^"]+)"/i,
+    /<time[^>]+datetime=["']([^"']+)["']/i,
+  ];
+  for (const re of patterns) {
+    const m = s.match(re);
+    if (m && m[1]) return m[1];
   }
+  return "";
 }
 
 /** 单 URL 抓取（含缓存两分与四层回退；每次网络尝试都过预算 gate）。成功返回：

package/lib/weather.js

@@ -0,0 +1,177 @@
+// Weather（Open-Meteo：geocoding + forecast，全部免 key）
+// 与 lib/index.js 的 weather 工具配套。这里同时导出 output schema 与 sanitizeWeatherResult()，
+// 使 tools/assert-weather-contract.mjs 能离线校验「返回值 ↔ schema」逐字段对齐——
+// 0.8.4/0.8.5 曾因 schema 漏声明 latitude/longitude/timezone/current.code/daily[].code
+// 导致 additionalProperties:false 校验失败、工具 100% 不可用（issue #73）。
+
+const OPEN_METEO_GEOCODING_URL = "https://geocoding-api.open-meteo.com/v1/search";
+const OPEN_METEO_FORECAST_URL = "https://api.open-meteo.com/v1/forecast";
+
+// WMO weather code → 描述（中文/英文）
+const WMO_CODES = {
+  0: ["晴", "Clear sky"],
+  1: ["大部晴朗", "Mainly clear"],
+  2: ["多云", "Partly cloudy"],
+  3: ["阴", "Overcast"],
+  45: ["雾", "Fog"],
+  48: ["雾凇", "Depositing rime fog"],
+  51: ["毛毛雨（弱）", "Light drizzle"],
+  53: ["毛毛雨", "Moderate drizzle"],
+  55: ["毛毛雨（强）", "Dense drizzle"],
+  56: ["冻毛毛雨（弱）", "Light freezing drizzle"],
+  57: ["冻毛毛雨（强）", "Dense freezing drizzle"],
+  61: ["小雨", "Slight rain"],
+  63: ["中雨", "Moderate rain"],
+  65: ["大雨", "Heavy rain"],
+  66: ["冻雨（弱）", "Light freezing rain"],
+  67: ["冻雨（强）", "Heavy freezing rain"],
+  71: ["小雪", "Slight snow"],
+  73: ["中雪", "Moderate snow"],
+  75: ["大雪", "Heavy snow"],
+  77: ["雪粒", "Snow grains"],
+  80: ["阵雨（弱）", "Slight rain showers"],
+  81: ["阵雨", "Moderate rain showers"],
+  82: ["阵雨（强）", "Violent rain showers"],
+  85: ["阵雪（弱）", "Slight snow showers"],
+  86: ["阵雪（强）", "Heavy snow showers"],
+  95: ["雷暴", "Thunderstorm"],
+  96: ["雷暴伴小冰雹", "Thunderstorm with slight hail"],
+  99: ["雷暴伴大冰雹", "Thunderstorm with heavy hail"],
+};
+function wmoText(code, lang) {
+  const hit = WMO_CODES[code];
+  if (!hit) return lang === "en" ? "Unknown" : "未知";
+  return (lang === "en" ? hit[1] : hit[0]) + ` (WMO ${code})`;
+}
+
+export async function geocodeLocation(name, signal) {
+  const params = new URLSearchParams({ name, count: "1", language: "zh", format: "json" });
+  const response = await fetch(`${OPEN_METEO_GEOCODING_URL}?${params}`, {
+    method: "GET",
+    redirect: "error",
+    headers: { accept: "application/json", "user-agent": "deepseek-harness/free-search" },
+    signal: AbortSignal.any([...(signal !== undefined ? [signal] : []), AbortSignal.timeout(15000)]),
+  });
+  if (!response.ok) throw new Error(`geocoding API error (HTTP ${response.status})`);
+  const data = await response.json();
+  const hit = data.results?.[0];
+  if (!hit) return null;
+  return {
+    name: hit.name,
+    admin: hit.admin1 ?? "",
+    country: hit.country ?? "",
+    latitude: hit.latitude,
+    longitude: hit.longitude,
+  };
+}
+
+export async function fetchWeather(location, days, lang, signal) {
+  const geo = await geocodeLocation(location, signal);
+  if (!geo) throw new Error(`could not geocode location "${location}" — try a nearby larger city`);
+  const params = new URLSearchParams({
+    latitude: String(geo.latitude),
+    longitude: String(geo.longitude),
+    current: "temperature_2m,relative_humidity_2m,apparent_temperature,weather_code,wind_speed_10m",
+    daily: "weather_code,temperature_2m_max,temperature_2m_min,precipitation_probability_max",
+    timezone: "auto",
+    forecast_days: String(Math.min(Math.max(Number(days) || 3, 1), 7)),
+  });
+  const response = await fetch(`${OPEN_METEO_FORECAST_URL}?${params}`, {
+    method: "GET",
+    redirect: "error",
+    headers: { accept: "application/json", "user-agent": "deepseek-harness/free-search" },
+    signal: AbortSignal.any([...(signal !== undefined ? [signal] : []), AbortSignal.timeout(15000)]),
+  });
+  if (!response.ok) throw new Error(`forecast API error (HTTP ${response.status})`);
+  const data = await response.json();
+  const cur = data.current ?? {};
+  const daily = data.daily ?? {};
+  return {
+    location: [geo.name, geo.admin, geo.country].filter(Boolean).join(", "),
+    latitude: geo.latitude,
+    longitude: geo.longitude,
+    current: {
+      temperature: cur.temperature_2m,
+      apparent: cur.apparent_temperature,
+      humidity: cur.relative_humidity_2m,
+      wind: cur.wind_speed_10m,
+      code: cur.weather_code,
+      text: wmoText(cur.weather_code, lang),
+    },
+    daily: (daily.time ?? []).map((date, i) => ({
+      date,
+      min: daily.temperature_2m_min?.[i],
+      max: daily.temperature_2m_max?.[i],
+      code: daily.weather_code?.[i],
+      text: wmoText(daily.weather_code?.[i], lang),
+      precipitationProbability: daily.precipitation_probability_max?.[i],
+    })),
+    timezone: data.timezone ?? "",
+  };
+}
+
+// weather 工具的 output schema。与 fetchWeather 返回值逐字段对齐：
+// 任何一边增删字段都必须同步，否则 additionalProperties:false 会让工具调用失败（#73）。
+export const WEATHER_OUTPUT_SCHEMA = {
+  type: "object",
+  additionalProperties: false,
+  properties: {
+    location: { type: "string" },
+    latitude: { type: "number" },
+    longitude: { type: "number" },
+    timezone: { type: "string" },
+    current: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        temperature: { type: "number" },
+        apparent: { type: "number" },
+        humidity: { type: "number" },
+        wind: { type: "number" },
+        code: { type: "number" },
+        text: { type: "string" },
+      },
+    },
+    daily: {
+      type: "array",
+      items: {
+        type: "object",
+        additionalProperties: false,
+        properties: {
+          date: { type: "string" },
+          min: { type: "number" },
+          max: { type: "number" },
+          code: { type: "number" },
+          text: { type: "string" },
+          precipitationProbability: { type: "number" },
+        },
+      },
+    },
+  },
+};
+
+// lossless JSON 不允许 undefined 字段：按"存在且有值"构造对象（与其它工具的做法一致）。
+export function sanitizeWeatherResult(r) {
+  return {
+    location: r.location,
+    ...(r.latitude !== undefined ? { latitude: r.latitude } : {}),
+    ...(r.longitude !== undefined ? { longitude: r.longitude } : {}),
+    ...(r.timezone ? { timezone: r.timezone } : {}),
+    current: {
+      ...(r.current?.temperature !== undefined ? { temperature: r.current.temperature } : {}),
+      ...(r.current?.apparent !== undefined ? { apparent: r.current.apparent } : {}),
+      ...(r.current?.humidity !== undefined ? { humidity: r.current.humidity } : {}),
+      ...(r.current?.wind !== undefined ? { wind: r.current.wind } : {}),
+      ...(r.current?.code !== undefined ? { code: r.current.code } : {}),
+      ...(r.current?.text ? { text: r.current.text } : {}),
+    },
+    daily: (r.daily ?? []).map((d) => ({
+      date: d.date,
+      ...(d.min !== undefined ? { min: d.min } : {}),
+      ...(d.max !== undefined ? { max: d.max } : {}),
+      ...(d.code !== undefined ? { code: d.code } : {}),
+      ...(d.text ? { text: d.text } : {}),
+      ...(d.precipitationProbability !== undefined ? { precipitationProbability: d.precipitationProbability } : {}),
+    })),
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-free-search",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "Free web search for DeepSeek Harness: 24 engines (Bing/DuckDuckGo/AnySearch/SearXNG/Exa/Tavily/Keenable/Firecrawl/Parallel keyless; Zhihu global/site via MCP and 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 + editable zh/en language pools + multi mode (parallel full language-pool 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",
@@ -19,6 +19,7 @@
     "lib/vertical.js",
     "lib/fetch_provider.js",
     "lib/fetch_upstream.js",
+    "lib/weather.js",
     "cordis.patch.yml"
   ],
   "keywords": [