@chenacc/agentbridge 0.1.1 → 0.1.3

package/README.md

@@ -99,6 +99,7 @@ Echo 适配器不接触任何 AI 工具，只验证「CLI → 本机 Bridge →
 
 | 场景 | 模式 | 手机要求 |
 |---|---|---|
+| 什么都不装、也不连同一个 Wi-Fi（DSH 插件默认） | Cloudflare Tunnel（自动） | 只需浏览器 |
 | 同一可信 Wi-Fi | 局域网 | 浏览器 / 微信 |
 | 跨网络，但属同一私有网络 | Tailscale | 同一 tailnet |
 | Tailscale 不稳定 | ZeroTier | 同一私有网络 |
@@ -177,6 +178,14 @@ node .\bin\agentbridge.js phone --agent codex --session <thread-id>
 
 **第 0 步：桥。** 插件是遥控器，桥是基站。从 0.2.0 起桥随插件一起安装，**DSH Desktop 启动时插件会自己在后台把它拉起来**，正常情况你什么都不用敲。
 
+从 0.3.0 起，插件默认再开一条 **Cloudflare 隧道**，把桥映射成公网 https 域名，于是手机不必和电脑在同一个 Wi-Fi——扫描、出差、用流量都能开。这一步需要一个 Cloudflare 官方小工具：
+
+```powershell
+winget install --id Cloudflare.cloudflared
+```
+
+没装也不影响使用，只是退回"手机与电脑同一 Wi-Fi"。想一直走局域网，设 `AGENTBRIDGE_NO_TUNNEL=1`；想用固定域名，去 Cloudflare 建命名隧道并把 `AGENTBRIDGE_PUBLIC_ORIGIN` 指向它。
+
 只有自动启动失败（沙箱限制、端口被占）才需要手动来一条：
 
 ```powershell
@@ -283,6 +292,8 @@ node .\bin\agentbridge.js phone --agent deepseek-harness
 
 若自动选择的局域网地址手机访问不到，显式指定 `AGENTBRIDGE_PUBLIC_ORIGIN`；Windows 防火墙提示时只放行「专用网络」。
 
+自动选地址时会跳过 `169.254.x.x`（网卡没拿到租约时的临时地址，手机根本路由不到）和 Hyper-V / WSL / 蓝牙这类虚拟网卡，优先真实的 Wi-Fi 或以太网地址。扫码后如果微信弹出「该地址为 IP 地址，请使用域名访问网站」，点「继续访问」即可；手机上不了网、或者只有手机流量没连同一个 Wi-Fi 时，二维码里的地址是打不开的。
+
 ## 安全边界
 
 ![访问边界：本地配对与管理接口只允许 loopback；远程访问使用私有网络或受访问密钥保护的隧道。](./docs/assets/security-boundaries.svg)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chenacc/agentbridge",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Control local coding agents from a phone through a secure WeChat QR web console.",
   "license": "MIT",
   "type": "module",
@@ -58,7 +58,8 @@
     "verify:responsive": "node scripts/verify-responsive.mjs",
     "verify:guide": "node scripts/verify-product-guide.mjs",
     "verify:release": "node scripts/verify-plugin-release.mjs",
-    "check": "node --check src/server.js && node --check src/cli.js && node --check src/cc-switch-models.js && node --check src/workspaces/workspace-catalog.js && node --check src/conversations/conversation-catalog.js && node --check src/adapters/capabilities.js && node --check src/adapters/claude.js && node --check src/adapters/codex.js && node --check src/adapters/deepseek-harness.js && node --check src/adapters/dsh-desktop.js && node --check src/dsh-desktop-channels.js && node --check src/event-store.js && node --check src/notifier.js && node --check src/attachments.js && node --check src/session-manager.js && node --check integrations/dsh-phone/lib/index.js && node --check src/adapters/zcode-native.js && node --check public/adapter-capabilities.js && node --check public/workspace-navigation.js && node --check public/markdown.js && node --check public/highlight.js && node --check public/transcript.js && node --check public/app.js && node --check scripts/verify-workspace-ui.mjs && node --check scripts/verify-message-blocks.mjs && node --check scripts/verify-background-scrim.mjs && node --check scripts/verify-model-control.mjs && node --check scripts/verify-notifications.mjs && node --check scripts/verify-attachments.mjs && node --check scripts/verify-features.mjs && node --check scripts/verify-quick-nav.mjs && node --check scripts/verify-questions.mjs && node --check scripts/verify-responsive.mjs && node --check scripts/verify-product-guide.mjs && node --check scripts/verify-plugin-release.mjs"
+    "check": "node --check src/server.js && node --check src/cli.js && node --check src/config.js && node --check src/cc-switch-models.js && node --check src/workspaces/workspace-catalog.js && node --check src/conversations/conversation-catalog.js && node --check src/adapters/capabilities.js && node --check src/adapters/claude.js && node --check src/adapters/codex.js && node --check src/adapters/deepseek-harness.js && node --check src/adapters/dsh-desktop.js && node --check src/dsh-desktop-channels.js && node --check src/event-store.js && node --check src/notifier.js && node --check src/attachments.js && node --check src/session-manager.js && node --check integrations/dsh-phone/lib/index.js && node --check integrations/dsh-phone/lib/tunnel.js && node --check src/adapters/zcode-native.js && node --check public/adapter-capabilities.js && node --check public/workspace-navigation.js && node --check public/markdown.js && node --check public/highlight.js && node --check public/transcript.js && node --check public/app.js && node --check scripts/verify-workspace-ui.mjs && node --check scripts/verify-message-blocks.mjs && node --check scripts/verify-background-scrim.mjs && node --check scripts/verify-model-control.mjs && node --check scripts/verify-notifications.mjs && node --check scripts/verify-attachments.mjs && node --check scripts/verify-features.mjs && node --check scripts/verify-quick-nav.mjs && node --check scripts/verify-questions.mjs && node --check scripts/verify-responsive.mjs && node --check scripts/verify-product-guide.mjs && node --check scripts/verify-plugin-release.mjs",
+    "verify:remote": "node scripts/verify-remote-tunnel.mjs"
   },
   "dependencies": {
     "katex": "0.19.1",

package/src/config.js

@@ -166,6 +166,14 @@ export function loadConfig(env = process.env, workspace = process.cwd()) {
     pairingTtlMs: Number.parseInt(env.AGENTBRIDGE_PAIRING_TTL_MS ?? "300000", 10),
     sessionTtlMs: Number.parseInt(env.AGENTBRIDGE_SESSION_TTL_MS ?? "259200000", 10),
     machineName: env.AGENTBRIDGE_MACHINE_NAME ?? os.hostname(),
+    // Set by the DSH plugin when it spawns the bridge itself. It lets the plugin
+    // recognise its own child in /api/health and restart it to change the public
+    // address, without ever touching a bridge the user started by hand.
+    autostart: env.AGENTBRIDGE_AUTOSTART === "1",
+    // Shared secret between the plugin that spawned this bridge and the bridge
+    // itself, so the plugin may ask for a restart to change the advertised address
+    // without handing that power to anything else that can reach loopback.
+    autostartToken: (env.AGENTBRIDGE_AUTOSTART_TOKEN ?? "").trim() || null,
     // Outbound notifications: unset webhook means the feature is simply off.
     notifyWebhook: pick(env, "AGENTBRIDGE_NOTIFY_WEBHOOK", notifyFile.webhook),
     notifyFormat: pick(env, "AGENTBRIDGE_NOTIFY_FORMAT", notifyFile.format ?? "json").toLowerCase(),

package/src/server.js

@@ -386,11 +386,40 @@ export async function createBridge(options = {}) {
     return shutdownPromise;
   };
 
+  /**
+   * A restart requested by the plugin must not cut a running Agent turn in half.
+   *
+   * The plugin retries on the next desktop launch in that case; refusing is the
+   * safer answer than silently killing work the user is waiting on.
+   */
+  const refuseWhenBusy = () => {
+    const active = sessions.list().filter((session) => ["starting", "running", "stopping"].includes(session.status));
+    if (!active.length) return;
+    throw Object.assign(new Error("仍有 Agent 任务正在运行，请先停止任务再关闭 Bridge"), {
+      statusCode: 409,
+      code: "ACTIVE_SESSIONS",
+      diagnostics: {
+        count: active.length,
+        sessions: active.map(({ id, title, status, adapterId }) => ({ id, title, status, adapterId })),
+      },
+    });
+  };
+
   const server = http.createServer(async (req, res) => {
     const url = new URL(req.url, `http://${req.headers.host ?? "localhost"}`);
     try {
       if (req.method === "GET" && url.pathname === "/api/health") {
-        return json(res, shuttingDown ? 503 : 200, { ok: !shuttingDown, shuttingDown, lastSeq: eventStore.lastSeq });
+        // The advertised origin is public information (it is printed inside every
+        // QR code), and exposing it here is what lets the DSH plugin notice that a
+        // running bridge still advertises a stale address.
+        return json(res, shuttingDown ? 503 : 200, {
+          ok: !shuttingDown,
+          shuttingDown,
+          lastSeq: eventStore.lastSeq,
+          advertisedOrigin: config.advertisedOrigin,
+          accessKeyRequired: Boolean(config.accessKey),
+          autostart: config.autostart === true,
+        });
       }
 
       if (shuttingDown) throw Object.assign(new Error("AgentBridge is shutting down"), { statusCode: 503, code: "BRIDGE_SHUTTING_DOWN" });
@@ -644,6 +673,31 @@ export async function createBridge(options = {}) {
       // point remain authenticated (and gated by the access key when enabled).
       if (req.method === "GET" && await serveStatic(res, url.pathname, url.search)) return;
 
+      // The DSH plugin starts this bridge itself and sometimes has to restart it,
+      // because the address it advertises (cloudflared hostname) only exists after
+      // the tunnel is up. Restarting needs a stop, and a stop needs an
+      // authorisation: loopback alone would let any local page POST here, so the
+      // caller must also present the token the plugin generated when it spawned
+      // this process. The token lives in the bridge's data directory, which keeps
+      // it out of the command line and out of the logs.
+      if (req.method === "POST" && url.pathname === "/api/local/autostart/shutdown") {
+        if (!isLoopback(req.socket.remoteAddress)) throw Object.assign(new Error("Local access only"), { statusCode: 403 });
+        if (!config.autostartToken || !keyMatches(req.headers["x-agentbridge-autostart"], config.autostartToken)) {
+          throw Object.assign(new Error("Autostart token required"), { statusCode: 401 });
+        }
+        refuseWhenBusy();
+        shuttingDown = true;
+        json(res, 202, { accepted: true, message: "AgentBridge is restarting to change its public address" });
+        setImmediate(() => {
+          void shutdown().catch((error) => {
+            console.error("AgentBridge safe shutdown failed", error);
+            shuttingDown = false;
+            shutdownPromise = null;
+          });
+        });
+        return;
+      }
+
       requireAccessKey(req, url, config);
       const device = pairing.authenticate(requestToken(req));
       if (!device) throw Object.assign(new Error("Authentication required"), { statusCode: 401 });
@@ -784,17 +838,7 @@ export async function createBridge(options = {}) {
       let match;
       if (req.method === "POST" && url.pathname === "/api/local/shutdown") {
         if (!isLoopback(req.socket.remoteAddress)) throw Object.assign(new Error("Local access only"), { statusCode: 403 });
-        const active = sessions.list().filter((session) => ["starting", "running", "stopping"].includes(session.status));
-        if (active.length) {
-          throw Object.assign(new Error("仍有 Agent 任务正在运行，请先停止任务再关闭 Bridge"), {
-            statusCode: 409,
-            code: "ACTIVE_SESSIONS",
-            diagnostics: {
-              count: active.length,
-              sessions: active.map(({ id, title, status, adapterId }) => ({ id, title, status, adapterId })),
-            },
-          });
-        }
+        refuseWhenBusy();
         shuttingDown = true;
         json(res, 202, { accepted: true, message: "AgentBridge 正在安全停止" });
         setImmediate(() => {