agent-hub-runner 0.3.2 → 0.4.0

package/README.md

@@ -57,7 +57,7 @@ npx -y agent-hub-runner@latest browser install # 给 bot 装它自己的浏览
 npx -y agent-hub-runner@latest browser status  # 看浏览器装没装
 ```
 
-开机自启时，程序复制到 `~/.agent-runner/bin/<版本>/`，日志在 `~/.agent-runner/logs/runner.log`（超过 5MB 自动清空）。网页上提示「有新版本」时，按提示运行那一条升级命令。
+开机自启时，程序复制到 `~/.agent-runner/bin/<版本>/`，日志在 `~/.agent-runner/logs/runner.log`（超过 5MB 自动清空）。网页上提示「有新版本」时，0.3.2 起可以直接点「升级」；更早的版本按提示运行那一条升级命令。
 
 仓库开发者（R699）：要让仓库里的源码 `runner/runner.mjs` 直接连测试服、开机自启，用 `agent-hub/scripts/runner-test.sh autostart on|off | start | stop | status | log`（launchd 服务 `com.agenthub.runner.src`，日志 `~/.agent-runner/logs/runner-src.log`，不复制程序，改了代码 `start` 一下就生效）。普通用户不用管这个。
 
@@ -83,6 +83,7 @@ npx -y agent-hub-runner@latest browser status  # 看浏览器装没装
 - 开机自启报「Bootstrap failed: 5: Input/output error」：这个后台任务以前被 macOS 记成了「已禁用」。0.2.1 起 `autostart on` 会自己解除并重试，直接再运行一次 `npx -y agent-hub-runner@latest autostart on` 就行；还不行就按它给的那条 `launchctl enable …` 命令运行后再试，或重启电脑再试。
 - 升级后网页还说「运行器版本太旧」：旧版本的运行器还在后台跑着（升级前开的终端，或者旧的开机自启），新版一看有人连着就退出了。0.2.2 起新版会自己把旧版本停掉、接上服务器；从 0.2.1 或更早升上来的，运行一次 `npx -y agent-hub-runner@latest autostart on` 就行，它会先停掉正在跑的那个，等新版本真连上了才说「已设开机自启」。
 - 网页上点「升级」（0.3.2 起）：抽屉里有新版本时点一下，运行器自己去 npm 拉最新版、校验后换上并重启，不用开终端。0.3.1 及更早不认这个按钮，仍用上面那条命令升一次。
+- 联网搜索（0.4.0 起）：bot 设置里打开「允许联网搜索」后，bot 可以上网查资料。默认用 DuckDuckGo，不用注册、不用 key。想更稳可以在「我的电脑」抽屉里换成 Tavily 或 Brave（去官网注册，把 key 粘进来），或者填一个 SearXNG 地址。key 只存在你电脑上，服务器不留。0.3.x 及更早没有这项，抽屉里会给升级命令。
 
 ## 断开、卸载
 

package/autostart.mjs

@@ -20,7 +20,7 @@ export const THROTTLE_S = 10;
 /** 复制到 ~/.agent-runner/bin/<版本>/ 的文件（package.json 用来读版本号） */
 // @意图#R729(2026-11-04): 多复制 browser.mjs（runner.mjs 要 import 它）
 // @意图#R690(2026-11-01): 多复制 changes.mjs（runner.mjs 要 import 它，少了开机自启的副本起不来）
-export const COPY_FILES = ["runner.mjs", "ops.mjs", "project-context.mjs", "edit.mjs", "changes.mjs", "browser.mjs", "autostart.mjs", "package.json"];
+export const COPY_FILES = ["runner.mjs", "ops.mjs", "project-context.mjs", "edit.mjs", "changes.mjs", "browser.mjs", "autostart.mjs", "search.mjs", "package.json"]; // search.mjs：R751 联网搜索（零依赖，拷文件即可）
 /** 优先用的稳定 node 路径（Homebrew 升级 node 后这两个软链还在；nvm 的带版本号路径卸了就没了） */
 export const STABLE_NODES = ["/opt/homebrew/bin/node", "/usr/local/bin/node"];
 export const ONLY_MAC = "开机自启目前只支持 Mac 和 Windows";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-hub-runner",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "agent-hub 的电脑运行器：配对后让你的 bot 在这台电脑上读写授权目录里的文件、跑命令（跑命令要你在网页上批准），还能用它自己的独立浏览器",
   "type": "module",
   "bin": {
@@ -14,6 +14,7 @@
     "changes.mjs",
     "browser.mjs",
     "autostart.mjs",
+    "search.mjs",
     "bin/agent-hub-runner.mjs",
     "README.md"
   ],

package/runner.mjs

@@ -28,6 +28,7 @@ import { fileURLToPath } from "node:url";
 import { runOp } from "./ops.mjs";
 import { buildChangeRecord, changesDirFor, CHANGE_ID_RE, createChangeStore } from "./changes.mjs";
 import { browserStatus, createBrowserManager, installBrowser } from "./browser.mjs";
+import { searchWeb, cleanSearchConfig, searchConfigStatus } from "./search.mjs"; // R751
 import { autostartOff, autostartOffWindows, autostartOn, autostartOnWindows, autostartStatus, autostartStatusWindows, COPY_FILES, installCopy, integrityOk, logFileFor, ONLY_MAC, otherAutostarts, runnerHome, truncateLogIfBig } from "./autostart.mjs";
 
 export const PROTOCOL_VERSION = 1;
@@ -306,7 +307,8 @@ const wsUrlOf = (server) => `${server.replace(/^http/, "ws")}/devices/ws`;
 // 新消息 change_get {id, change_id} → change_result {id, ok:true, found, record}，不看这个 bot 有没有目录（换了目录也能看旧记录）
 // @意图#R729(2026-11-04): 新消息 browser {id, bot_id, action, args} → result（截图或元素清单）、browser_open {id, bot_id} → result（网页点「打开 bot 的浏览器」）；
 // 浏览器不看这个 bot 有没有选目录（资料目录在 ~/.agent-runner/browser-profiles/<bot_id>/，和授权目录无关）；断线不关浏览器（重连后接着用）
-export function createSession(cfg, { log = say, platform = process.platform, pickDir = platform === "win32" ? pickDirWindows : pickDirMac, file = configPath(), changes, browser } = {}) {
+export function createSession(cfg, { log = say, platform = process.platform, pickDir = platform === "win32" ? pickDirWindows : pickDirMac, file = configPath(), changes, browser, search } = {}) {
+  const searchImpl = search ?? searchWeb; // R751：测试注入，默认真搜
   let dirs = botDirsOf(cfg); // bot_id → 授权目录
   let browsers = browser; // R729：每个 bot 一只浏览器，用到时才建
   const browserMgr = () => (browsers ??= createBrowserManager({ log }));
@@ -362,6 +364,32 @@ export function createSession(cfg, { log = say, platform = process.platform, pic
       send({ type: "result", id, ok: false, error: e?.message ?? String(e) });
     }
   }
+  // @意图#R751(2026-11-07): 联网搜索：不看 bot 有没有选目录（搜索不碰文件）；按本机配置选 provider，key 只在这台电脑上
+  async function handleSearch(send, msg) {
+    const { id } = msg;
+    const bot = typeof msg.bot_id === "string" ? msg.bot_id : "";
+    const query = typeof msg.args?.query === "string" ? msg.args.query : "";
+    log(`[${bot}] 搜索：${query}`);
+    try {
+      const r = await searchImpl(query, { count: msg.args?.count, search: cfg.search });
+      send({ type: "result", id, ok: true, provider: r.provider, results: r.results, cached: r.cached === true });
+    } catch (e) {
+      send({ type: "result", id, ok: false, error: e?.message ?? String(e) });
+    }
+  }
+  // 网页保存搜索配置：key 只写本机配置文件，不回显；服务器只拿 provider/hasKey 状态
+  async function handleSearchConfig(send, msg) {
+    const { id } = msg;
+    try {
+      cfg.search = cleanSearchConfig(msg.config);
+      saveConfig(cfg, file);
+      log(`搜索配置已保存：${cfg.search.provider}${cfg.search.apiKey ? "（有 key）" : ""}`);
+      send({ type: "result", id, ok: true, ...searchConfigStatus(cfg.search) });
+    } catch (e) {
+      send({ type: "result", id, ok: false, error: e?.message ?? String(e) });
+    }
+  }
+
   // @意图#R729(2026-11-04): 网页点「打开 bot 的浏览器」：在这台电脑上弹出有窗口的浏览器（后台的换成有窗口的，恢复打开的网址）
   async function handleBrowserOpen(send, msg) {
     const { id } = msg;
@@ -412,6 +440,8 @@ export function createSession(cfg, { log = say, platform = process.platform, pic
       if (msg.type === "change_get") return handleChangeGet(send, msg);
       if (msg.type === "browser") return handleBrowser(send, msg); // R729
       if (msg.type === "browser_open") return handleBrowserOpen(send, msg); // R729
+      if (msg.type === "search") return handleSearch(send, msg); // R751
+      if (msg.type === "search_config") return handleSearchConfig(send, msg); // R751
       if (msg.type === "abort") { jobs.get(msg.id)?.abort(); picks.get(msg.id)?.abort(); }
       return undefined;
     },
@@ -462,7 +492,7 @@ export function startRunner(cfg, { log = say, retryMs = 2000, platform = process
     ws = sock;
     sock.addEventListener("open", () => {
       send(sock, { type: "hello", version: PROTOCOL_VERSION, device_id: cfg.device_id, token: cfg.token, bot_dirs: session.botDirs,
-        name: cfg.name ?? os.hostname(), os: `${process.platform} ${os.release()}`, runner_version: RUNNER_VERSION, autostart: background, browser: browserInfo() });
+        name: cfg.name ?? os.hostname(), os: `${process.platform} ${os.release()}`, runner_version: RUNNER_VERSION, autostart: background, browser: browserInfo(), search: searchConfigStatus(cfg.search) });
       beat = setInterval(() => send(sock, { type: "ping", browser: browserInfo() }), HEARTBEAT_MS);
     });
     sock.addEventListener("message", (ev) => {

package/search.mjs

@@ -0,0 +1,174 @@
+// @意图#R751(2026-11-07): king 确认 R751：运行器内置联网搜索，网页开关可选。
+// 默认 DuckDuckGo 抓公开结果页（免注册免 key），可选 Tavily / Brave key、SearXNG 实例地址。
+// key 只存本机 config.json（600），由网页下发（runner.mjs 的 search_config），服务器不存。
+// 零依赖：DDG 的 HTML 解析自己写——开机自启安装只拷文件不装依赖（autostart.mjs 的 COPY_FILES），引第三方库会让自启那份跑不起来。
+// 参考 pi-web-access 的 duckduckgo.ts 的做法（抓 html.duckduckgo.com/html/ 再解析）；DDG 是非官方接口，改版/限流会失败，报错要说人话。
+
+export const SEARCH_PROVIDERS = ["duckduckgo", "tavily", "brave", "searxng"];
+export const SEARCH_CACHE_MS = 5 * 60_000; // 同一个查询 5 分钟内不重查，防模型刷搜索
+export const SEARCH_TIMEOUT_MS = 20_000;
+const DDG_URL = "https://html.duckduckgo.com/html/";
+const UA = "Mozilla/5.0 (compatible; agent-hub-runner/1.0; +https://github.com/cs1145994973/agent-hub-runner)";
+const CACHE_MAX = 50;
+const cache = new Map(); // key → { at, results }
+
+export function normalizeCount(n) {
+  if (typeof n !== "number" || !Number.isFinite(n)) return 5;
+  return Math.max(1, Math.min(Math.floor(n), 10));
+}
+
+/** 去标签 + 解码常见 HTML 实体（DDG 的标题/摘要里有 <b> 和实体） */
+export function decodeHtml(s) {
+  return String(s ?? "")
+    .replace(/<[^>]*>/g, "")
+    .replace(/&(#x?[0-9a-f]+|[a-z]+);/gi, (m, ent) => {
+      const lower = ent.toLowerCase();
+      if (lower.startsWith("#x")) return String.fromCodePoint(parseInt(lower.slice(2), 16));
+      if (lower.startsWith("#")) return String.fromCodePoint(parseInt(lower.slice(1), 10));
+      const named = { amp: "&", lt: "<", gt: ">", quot: '"', apos: "'", nbsp: " " };
+      return named[lower] ?? m;
+    })
+    .replace(/\s+/g, " ")
+    .trim();
+}
+
+function resultUrl(href) {
+  try {
+    const link = new URL(href, DDG_URL);
+    const dest = link.searchParams.get("uddg") ?? link.href;
+    const url = new URL(dest);
+    return url.protocol === "http:" || url.protocol === "https:" ? url.href : null;
+  } catch {
+    return null;
+  }
+}
+
+/** 解析 DDG 结果页：按 class 含独立单词 result 的 div 分块，跳过广告块，提 result__a / result__snippet */
+export function parseDuckDuckGo(html, count = 5) {
+  const starts = [...String(html).matchAll(/<div[^>]*class="[^"]*\bresult\b[^"]*"[^>]*>/g)];
+  const results = [];
+  let parseable = 0;
+  for (let i = 0; i < starts.length && results.length < count; i++) {
+    const begin = starts[i].index;
+    const end = i + 1 < starts.length ? starts[i + 1].index : html.length;
+    const block = html.slice(begin, end);
+    if (/result--ad/.test(starts[i][0])) continue;
+    const a = block.match(/<a\b[^>]*result__a[^>]*>([\s\S]*?)<\/a>/);
+    if (!a) continue;
+    const href = a[0].match(/href="([^"]+)"/)?.[1] ?? "";
+    const title = decodeHtml(a[1]);
+    const url = href ? resultUrl(href) : null;
+    if (!title || !url) continue;
+    parseable++;
+    const snip = block.match(/<(?:a|div)\b[^>]*result__snippet[^>]*>([\s\S]*?)<\/(?:a|div)>/);
+    results.push({ title, url, snippet: snip ? decodeHtml(snip[1]) : "" });
+  }
+  if (parseable === 0) throw new Error("DuckDuckGo 这次没解析到结果：可能被限流或页面结构变了。可以换个说法再试、稍后再试，或在「我的电脑」里改配 Tavily / Brave key。");
+  return results;
+}
+
+async function request(fetchImpl, url, init, signal) {
+  const res = await fetchImpl(url, {
+    ...init,
+    signal: signal ? AbortSignal.any([AbortSignal.timeout(SEARCH_TIMEOUT_MS), signal]) : AbortSignal.timeout(SEARCH_TIMEOUT_MS),
+  });
+  if (!res.ok) {
+    const body = (await res.text().catch(() => "")).slice(0, 200);
+    throw new Error(`搜索请求失败（HTTP ${res.status}）${res.status === 403 || res.status === 429 ? "：可能被限流，稍后再试" : ""}${body ? `：${body}` : ""}`);
+  }
+  return res;
+}
+
+async function searchDuckDuckGo(query, { count, fetchImpl, signal }) {
+  const url = new URL(DDG_URL);
+  url.searchParams.set("q", query);
+  const res = await request(fetchImpl, url, { headers: { Accept: "text/html", "User-Agent": UA } }, signal);
+  return parseDuckDuckGo(await res.text(), count);
+}
+
+async function searchTavily(query, { count, apiKey, fetchImpl, signal }) {
+  const res = await request(fetchImpl, "https://api.tavily.com/search", {
+    method: "POST",
+    headers: { "Content-Type": "application/json", Authorization: `Bearer ${apiKey}` },
+    body: JSON.stringify({ query, max_results: count }),
+  }, signal);
+  const data = await res.json();
+  return (data.results ?? []).slice(0, count).map((r) => ({ title: String(r.title ?? ""), url: String(r.url ?? ""), snippet: String(r.content ?? "") }));
+}
+
+async function searchBrave(query, { count, apiKey, fetchImpl, signal }) {
+  const url = new URL("https://api.search.brave.com/res/v1/web/search");
+  url.searchParams.set("q", query);
+  url.searchParams.set("count", String(count));
+  const res = await request(fetchImpl, url, { headers: { Accept: "application/json", "X-Subscription-Token": apiKey } }, signal);
+  const data = await res.json();
+  return (data.web?.results ?? []).slice(0, count).map((r) => ({ title: String(r.title ?? ""), url: String(r.url ?? ""), snippet: String(r.description ?? "") }));
+}
+
+async function searchSearxng(query, { count, searxngUrl, fetchImpl, signal }) {
+  const base = String(searxngUrl).replace(/\/+$/, "");
+  const url = new URL(`${base}/search`);
+  url.searchParams.set("q", query);
+  url.searchParams.set("format", "json");
+  const res = await request(fetchImpl, url, { headers: { Accept: "application/json", "User-Agent": UA } }, signal);
+  const data = await res.json();
+  return (data.results ?? []).slice(0, count).map((r) => ({ title: String(r.title ?? ""), url: String(r.url ?? ""), snippet: String(r.content ?? "") }));
+}
+
+/** 网页下发的配置写本地前的校验（runner.mjs 的 search_config 也用） */
+export function cleanSearchConfig(raw) {
+  const provider = SEARCH_PROVIDERS.includes(raw?.provider) ? raw.provider : "duckduckgo";
+  const out = { provider };
+  if (provider === "tavily" || provider === "brave") {
+    const key = typeof raw?.apiKey === "string" ? raw.apiKey.trim() : "";
+    if (!key) throw new Error(`${provider} 要填 API key`);
+    if (key.length > 200) throw new Error("API key 太长了，检查一下是不是复制错了");
+    out.apiKey = key;
+  }
+  if (provider === "searxng") {
+    const url = String(raw?.searxngUrl ?? "").trim();
+    const u = new URL(url); // 不合法直接抛
+    if (u.protocol !== "http:" && u.protocol !== "https:") throw new Error("SearXNG 地址要以 http(s):// 开头");
+    out.searxngUrl = url;
+  }
+  return out;
+}
+
+export function searchConfigStatus(search) {
+  const provider = SEARCH_PROVIDERS.includes(search?.provider) ? search.provider : "duckduckgo";
+  return { provider, hasKey: typeof search?.apiKey === "string" && search.apiKey.length > 0 };
+}
+
+/**
+ * 搜一次。opts: { count, search（config.json 的 search 节）, fetchImpl（测试注入）, signal }
+ * 返回 { provider, results: [{ title, url, snippet }] }；失败抛中文错误。
+ */
+export async function searchWeb(query, opts = {}) {
+  const q = String(query ?? "").trim();
+  if (!q) throw new Error("搜索词不能为空");
+  const search = opts.search ?? {};
+  const provider = SEARCH_PROVIDERS.includes(search.provider) ? search.provider : "duckduckgo";
+  const count = normalizeCount(opts.count);
+  const fetchImpl = opts.fetchImpl ?? fetch;
+  const cacheKey = `${provider}|${provider === "searxng" ? search.searxngUrl ?? "" : ""}|${count}|${q}`;
+  const hit = cache.get(cacheKey);
+  if (hit && Date.now() - hit.at < SEARCH_CACHE_MS) return { provider, results: hit.results, cached: true };
+
+  const args = { count, apiKey: search.apiKey, searxngUrl: search.searxngUrl, fetchImpl, signal: opts.signal };
+  let results;
+  if (provider === "tavily") {
+    if (!args.apiKey) throw new Error("选了 Tavily 但没配 key：在「我的电脑」里填上，或切回 DuckDuckGo。");
+    results = await searchTavily(q, args);
+  } else if (provider === "brave") {
+    if (!args.apiKey) throw new Error("选了 Brave 但没配 key：在「我的电脑」里填上，或切回 DuckDuckGo。");
+    results = await searchBrave(q, args);
+  } else if (provider === "searxng") {
+    if (!args.searxngUrl) throw new Error("选了 SearXNG 但没填实例地址：在「我的电脑」里填上，或切回 DuckDuckGo。");
+    results = await searchSearxng(q, args);
+  } else {
+    results = await searchDuckDuckGo(q, args);
+  }
+  cache.set(cacheKey, { at: Date.now(), results });
+  if (cache.size > CACHE_MAX) cache.delete(cache.keys().next().value);
+  return { provider, results };
+}