@chenacc/agentbridge 0.2.1 → 0.2.3

package/.env.example

@@ -63,3 +63,8 @@ AGENTBRIDGE_PROJECTS=agentbridge=D:\codex_project\手机远程操控agent
 # AGENTBRIDGE_NOTIFY_TOKEN=your-provider-token
 # AGENTBRIDGE_NOTIFY_CHANNEL=clawbot
 # AGENTBRIDGE_NOTIFY_LINK=1
+
+# The bridge reads notify.json from its data directory. If that directory moved
+# (the DSH plugin gives the bridge its own state folder), an older folder can be
+# adopted once instead of re-entering the token by hand:
+# AGENTBRIDGE_NOTIFY_IMPORT=D:\codex_project\agentbridge\.agentbridge

package/README.md

@@ -8,23 +8,29 @@
 
 **一条命令，把手机变成这台电脑上 Agent 的遥控器。** 微信扫码即用，不用装 App，也不用和电脑连同一个 Wi-Fi。
 
-| 桌面端在干活 | 手机扫一扫就接管 | 手机端同一份对话 |
-|---|---|---|
-| <img src="./docs/assets/screen-desktop-console.jpg" alt="桌面端控制台" width="330" /> | <img src="./docs/assets/screen-mobile-1.png" alt="手机端控制台 1" width="180" /> | <img src="./docs/assets/screen-mobile-2.png" alt="手机端控制台 2" width="180" /> |
+<img src="./docs/assets/hero-phone.jpg" alt="手机端控制台：语音/文字发指令，Agent 流式回复，与桌面同一份对话" width="240" align="right" />
+
+在电脑上跑着的 Claude Code / Codex / DeepSeek Harness / DSH Desktop 会话，执行 `/phone` 会出现一次性二维码：
+
+- 手机扫码后**接管的就是屏幕上那一条对话**，不是新建一个"类似的"会话；
+- 消息、工具调用、审批卡片、模型切换、停止任务，两端看到的是同一份事件流；
+- 电脑始终是唯一执行端，凭据和文件访问不出本机。
 
 ```powershell
 npx @chenacc/agentbridge        # 起桥并直接打印二维码
 ```
 
-然后在 Claude Code / Codex / DSH Desktop 里输入 `/phone`，扫二维码即可。凭据和文件访问始终留在本机，手机只下发命令。
+然后在 Claude Code / Codex / DSH Desktop 里输入 `/phone`，扫二维码即可。
 
 > 觉得有用就给个 star：[github.com/chenacc1/agentbridge](https://github.com/chenacc1/agentbridge) —— 不点也不影响任何功能，只影响我有没有动力继续写。
 
+![桌面端控制台：左侧是 Agent / 项目 / 会话三级导航，右侧是同一段对话与工具活动](./docs/assets/hero-desktop.jpg)
+
 手机与桌面共享同一份可追加事件流，因此消息、工具活动、审批和任务状态始终同步。电脑是唯一的执行端：手机只运行界面，不运行 Agent，也拿不到任何供应商凭据。
 
 默认走 Cloudflare 隧道：手机用流量、在外地都能打开；隧道对外开放，因此自动带一道访问密钥门禁。
 
-**当前版本：** 桥 `@chenacc/agentbridge` **0.2.0** · DSH 插件 `@chenacc/dsh-agentbridge` **0.4.0**（两个包各自发布，见文末「版本与发布」）。
+**当前版本：** 桥 `@chenacc/agentbridge` **0.2.1** · DSH 插件 `@chenacc/dsh-agentbridge` **0.4.1**（两个包各自发布，见文末「版本与发布」）。
 
 ## 它是怎么工作的
 
@@ -380,6 +386,9 @@ agentbridge phone --agent deepseek-harness
 | `AGENTBRIDGE_SESSION_TTL_MS` | `259200000` | 设备会话有效期（72 小时） |
 | `AGENTBRIDGE_CLAUDE_MODEL` | 供应商默认 | 可选的 Claude / Kimi 模型 ID |
 | `AGENTBRIDGE_NOTIFY_WEBHOOK` | 未设置 | 通知 Webhook；未设置时该功能静默 |
+| `AGENTBRIDGE_NOTIFY_IMPORT` | 未设置 | 通知设置存在旧数据目录时，指向它一次即可自动迁过来 |
+
+> 通知设置（webhook / token / 静默开关）保存在**桥的数据目录**下的 `notify.json`，默认是 `%USERPROFILE%\.agentbridge`。DSH 插件接管网关后数据目录换过位置，老配置如果留在原来的 `.agentbridge` 里，用 `AGENTBRIDGE_NOTIFY_IMPORT=<旧目录>` 启动一次就会自动迁过去；也可以直接在桌面控制台的「通知」面板重填一次。桥启动日志里有一行 `Notifications: pushplus/clawbot` 或 `Notifications: off — no webhook configured in …`，能直接看出它到底读到了哪个文件。
 
 **跨网络（CLI 与插件都认）：**
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chenacc/agentbridge",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Control local coding agents from a phone through a secure WeChat QR web console.",
   "license": "MIT",
   "type": "module",
@@ -65,8 +65,9 @@
     "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/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 src/tunnel.js && node --check src/remote.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"
+    "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 src/tunnel.js && node --check src/remote.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 && node --check scripts/capture-screenshots.mjs",
+    "verify:remote": "node scripts/verify-remote-tunnel.mjs",
+    "capture:shots": "node scripts/capture-screenshots.mjs"
   },
   "dependencies": {
     "katex": "0.19.1",

package/src/cli.js

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
-import { mkdir, writeFile } from "node:fs/promises";
+import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -52,23 +52,37 @@ Tell the user to scan the QR with WeChat. While the phone controls this session,
 `;
 }
 
+/**
+ * The Codex skill is named `phone-codex`, not `phone`.
+ *
+ * `~/.agents/skills` is shared: Codex reads it, and so does DSH Desktop. A skill
+ * called `phone` therefore shadows the DSH plugin's `/phone` command, and typing
+ * `/phone` in DSH Desktop runs `phone --agent codex` — pairing a Codex
+ * conversation instead of the one on screen. One name per client: the plugin owns
+ * `/phone`, this skill answers `/phone-codex`.
+ */
+export const CODEX_SKILL_NAME = "phone-codex";
+const CODEX_SKILL_MARKER = "# Send a Codex project to AgentBridge";
+
 export function renderCodexPhoneSkill(entryPath = cliEntry) {
   const portableEntry = entryPath.replaceAll("\\", "/").replaceAll('"', '\\"');
   return `---
-name: phone
-description: Generate a one-time WeChat QR code for a Codex project conversation. Use only when the user explicitly invokes /phone.
+name: ${CODEX_SKILL_NAME}
+description: Generate a one-time WeChat QR code for a Codex project conversation. Use only when the user explicitly invokes /${CODEX_SKILL_NAME}.
 disable-model-invocation: true
 ---
 
-# Send a Codex project to AgentBridge
+${CODEX_SKILL_MARKER}
 
-When the user invokes \`/phone\`, you must immediately execute the following command in the terminal from the current project directory. Do not merely describe the command or ask the user to run it:
+When the user invokes \`/${CODEX_SKILL_NAME}\`, you must immediately execute the following command in the terminal from the current project directory. Do not merely describe the command or ask the user to run it:
 
 \`node "${portableEntry}" phone --agent codex --cwd .\`
 
 After a successful command, reply with the exact QR image Markdown emitted by the command (for example, \`![微信扫码二维码](<temporary QR image URL>)\`) so Codex Desktop renders a scannable image. The temporary QR image URL and pairing URL must be shown as clickable links; then tell the user to scan the 微信扫码二维码 with WeChat. Do not invent or alter either URL. If the command fails, show its exact safe error and do not claim that a QR code was generated.
 
 If the user supplies a known persisted Codex thread ID, append \`--session <thread-id>\` to resume that exact thread. Do not claim that the command attached the current desktop conversation when no thread ID was supplied: Codex does not expose a documented current-thread substitution to this local skill.
+
+> Named \`${CODEX_SKILL_NAME}\` on purpose: DSH Desktop reads the same skills folder and owns \`/phone\` for the conversation on screen. Running \`/phone\` here would pair the wrong Agent.
 `;
 }
 
@@ -271,17 +285,51 @@ async function installClaudeSkill(options) {
   return target;
 }
 
+/**
+ * Remove a `phone` skill this installer used to create.
+ *
+ * Earlier releases wrote the Codex skill as `phone`, which shadowed the DSH
+ * plugin's `/phone` in DSH Desktop because both clients read `~/.agents/skills`.
+ * Re-running the installer has to clean that up, or the wrong pairing keeps
+ * happening after an upgrade. Only a file carrying our own marker is touched —
+ * a hand-written `phone` skill belongs to whoever wrote it.
+ */
+async function removeLegacyCodexSkill(root) {
+  const legacy = path.join(root, "phone", "SKILL.md");
+  let content;
+  try {
+    content = await readFile(legacy, "utf8");
+  } catch {
+    return null;
+  }
+  if (!content.includes(CODEX_SKILL_MARKER)) return null;
+  try {
+    await rm(path.join(root, "phone"), { recursive: true, force: true });
+    return legacy;
+  } catch {
+    return null;
+  }
+}
+
 async function installCodexSkill(options) {
   if (options.user && options.project) throw new Error("Choose only one of --user or --project");
   const projectCwd = path.resolve(options.cwd ?? process.cwd());
   const root = options.project
     ? path.join(projectCwd, ".agents", "skills")
     : path.join(os.homedir(), ".agents", "skills");
-  const target = path.join(root, "phone", "SKILL.md");
+
+  const removed = await removeLegacyCodexSkill(root);
+  if (removed) {
+    console.log(`已移除会抢占 /phone 的旧技能: ${removed}`);
+    console.log("（DSH Desktop 也读这个目录，旧的 phone 技能会让 /phone 绑到 Codex 会话。）");
+  }
+
+  const target = path.join(root, CODEX_SKILL_NAME, "SKILL.md");
   await mkdir(path.dirname(target), { recursive: true });
   await writeFile(target, renderCodexPhoneSkill(), { encoding: "utf8", flag: "w" });
-  console.log(`Codex /phone 已安装到: ${target}`);
-  console.log("重新打开 Codex 桌面项目后，在斜杠命令列表选择 /phone。未提供 thread ID 时，它会创建新的项目会话并清楚标注。");
+  console.log(`Codex /${CODEX_SKILL_NAME} 已安装到: ${target}`);
+  console.log(`重新打开 Codex 桌面项目后，在斜杠命令列表选择 /${CODEX_SKILL_NAME}。未提供 thread ID 时，它会创建新的项目会话并清楚标注。`);
+  console.log("DSH Desktop 里的 /phone 保持归插件所有，绑定的就是屏幕上那条会话。");
   return target;
 }
 

package/src/config.js

@@ -105,16 +105,52 @@ function parseProjects(raw, workspace) {
  * end up in a tracked file. The bridge's own data directory is git-ignored, so a
  * small JSON file there is the honest place for it; environment variables still win
  * when both are present, which keeps `setx` and one-off experiments working.
+ *
+ * `legacyFiles` exists because the data directory can move under the user's feet:
+ * the DSH plugin started hosting the bridge and gave it its own state directory,
+ * which silently left notifications configured in the old one. When the current
+ * directory has no settings but an old one does, adopt them once and say so — the
+ * alternative is a feature that stops working with no explanation.
  */
-function readNotifyFile(dataDir) {
+function readNotifyFile(dataDir, legacyFiles = []) {
+  const own = path.join(dataDir, "notify.json");
+  const parsed = readJsonObject(own);
+  if (parsed) return parsed;
+
+  for (const candidate of legacyFiles) {
+    const adopted = readJsonObject(candidate);
+    if (!adopted) continue;
+    try {
+      mkdirSync(dataDir, { recursive: true });
+      writeFileSync(own, JSON.stringify(adopted, null, 2), "utf8");
+      console.error(`Notifications: adopted settings from ${candidate} into ${own}`);
+    } catch {
+      // A read-only data directory still gets to use the settings for this run.
+    }
+    return adopted;
+  }
+  return {};
+}
+
+function readJsonObject(file) {
   try {
-    const parsed = JSON.parse(readFileSync(path.join(dataDir, "notify.json"), "utf8"));
-    return parsed && typeof parsed === "object" ? parsed : {};
+    const parsed = JSON.parse(readFileSync(file, "utf8"));
+    return parsed && typeof parsed === "object" ? parsed : null;
   } catch {
-    return {};
+    return null;
   }
 }
 
+/** Candidate files a moved data directory may have left behind. */
+export function legacyNotifyPaths(env = process.env, workspace = process.cwd()) {
+  const fromEnv = String(env.AGENTBRIDGE_NOTIFY_IMPORT ?? "")
+    .split(";")
+    .map((entry) => entry.trim())
+    .filter(Boolean)
+    .map((entry) => (/notify\.json$/i.test(entry) ? path.resolve(entry) : path.join(path.resolve(entry), "notify.json")));
+  return [...fromEnv, path.join(path.resolve(workspace), ".agentbridge", "notify.json")];
+}
+
 function pick(env, key, fallback) {
   const value = String(env[key] ?? "").trim();
   return value || fallback || null;
@@ -153,7 +189,7 @@ export function loadConfig(env = process.env, workspace = process.cwd()) {
   const advertisedOrigin = publicOrigin || `http://${firstLanAddress()}:${port}`;
   const accessKey = (env.AGENTBRIDGE_ACCESS_KEY ?? "").trim() || null;
   const dataDir = path.resolve(env.AGENTBRIDGE_DATA_DIR ?? path.join(workspace, ".agentbridge"));
-  const notifyFile = readNotifyFile(dataDir);
+  const notifyFile = readNotifyFile(dataDir, legacyNotifyPaths(env, workspace));
 
   return {
     host,

package/src/server.js

@@ -994,6 +994,17 @@ export async function startBridge() {
     console.log(`Remote path: ${bridge.config.remoteProvider} → ${bridge.config.advertisedOrigin}`);
   }
   console.log(`WeChat scan target: ${bridge.getCurrentPairing().url}`);
+  // Notifications are silent by design, which once hid the fact that the config
+  // was being read from a directory that did not have it (the data directory moved
+  // when the DSH plugin started hosting the bridge). Say where it looked.
+  if (bridge.notifier.enabled) {
+    console.log(`Notifications: ${bridge.notifier.format}${bridge.notifier.channel ? `/${bridge.notifier.channel}` : ""}${bridge.notifier.muted ? " (muted)" : ""}`);
+  } else {
+    console.log(
+      `Notifications: off — no webhook configured in ${path.join(bridge.config.dataDir, "notify.json")} `
+      + "(set it in the desktop console, or point AGENTBRIDGE_NOTIFY_IMPORT at an older .agentbridge folder)",
+    );
+  }
   // Silence here used to mean a QR encoding an address the phone could never reach.
   if (new URL(bridge.config.advertisedOrigin).hostname === "127.0.0.1") {
     console.warn(