@twinsearth/w2m-dsh-plugin 1.7.2 → 1.7.4

package/.claude-plugin/marketplace.json

@@ -5,14 +5,14 @@
   },
   "metadata": {
     "description": "The w2m fleet plugins: one account, many machines, any of Windows, macOS or Linux.",
-    "version": "1.7.2"
+    "version": "1.7.4"
   },
   "plugins": [
     {
       "name": "w2m-fleet",
       "source": "./",
       "description": "Read fleet state and dispatch commands across the machines registered to one account. Read-only MCP surface: the five exposed tools cannot change anything.",
-      "version": "1.7.2",
+      "version": "1.7.4",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "1.7.2"
+  "version": "1.7.4"
 }

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "w2m-fleet",
   "description": "Drive the same project on online Windows, macOS and Linux machines from one account: read fleet state, dispatch commands and read results. The MCP surface is deliberately read-only.",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "author": {
     "name": "TwinsEarth"
   },

package/CHANGELOG.md

@@ -7,6 +7,29 @@
 
 All notable changes to this project are documented here.
 
+## [1.7.4] — 2026-10-25
+
+**修复两处桌面宿主兼容性问题：`agent.identity` 崩溃、切换 relay 后旧 device token 导致 401 无法入队。**
+
+- 崩溃修复：`agent.identity?.()` 在桌面宿主上抛 `TypeError: agent.identity is not a function`，
+  且发生在 `agent.start().then(...)` 回调里变成未处理 rejection，把整个 DSH 宿主带崩。
+  新增 `agentIdentityOf()` 做类型判断，`agent.start()` 仍为非阻塞并记录失败。
+- 迁移修复：relay 切换到新主 relay 后，`device.json` 里的 token 属于旧 relay，新 relay 回
+  `401 UNAUTHORIZED: missing or invalid device_token`；启动逻辑看到已有 token 就跳过配对，
+  导致机器停在"无列表"。现在会先用 token 探测配置的 relay：**明确 401/403 才丢弃并重新配对**，
+  网络错误保留 token（不会因短暂故障误触发配对）。
+- 新增回归测试：`test/agent-identity-safe.test.mjs`、`test/re-pair-stale-token.test.mjs`。
+- 证据：`docs/acceptance/1.7.4/DESKTOP-HOST-COMPAT.json`（含真实崩溃信息与迁移症状）。
+## [1.7.3] — 2026-10-25
+
+**截图提示改为顶部浮层（5 秒自动消失、可关闭、不挤压输入框）；全服计数标注来源 relay 并单列本编队。**
+
+- 截图成功/失败提示不再插在输入区里：改为聊天面板顶部浮层（绝对定位，不占布局；连续截图只替换同一行，
+  不会越堆越多），**5 秒自动消失**，右侧 × 可立即关闭。
+- 全服统计行改为「主 relay（地址）全服：X/Y 个编队 · A/B 台在线」，并新增一行「本编队：n/m 台在线」；
+  两者语义不同，不再混在一起看。
+- relay 角色判定改为按**配置的主 relay**（不再按响应最快，备用 relay 偶然更快时会被误标成 primary）。
+- 证据：`docs/acceptance/1.7.3/TOAST-AND-TOTALS.json`（fleet task `01M5ANYMVMSGGQV`；宿主截图 141,768 字节）。
 ## [1.7.2] — 2026-10-25
 
 **按实测反馈调整编队聊天截图/复制：只复制不预览、快捷键 Ctrl+Shift+P、强制可选中。**

package/codex/mcp-servers.toml

@@ -12,6 +12,6 @@
 
 [mcp_servers.w2m-fleet]
 command = "npx"
-args = ["-y", "-p", "@twinsearth/w2m-dsh-plugin@1.7.2", "w2m-mcp"]
+args = ["-y", "-p", "@twinsearth/w2m-dsh-plugin@1.7.4", "w2m-mcp"]
 startup_timeout_sec = 20
 tool_timeout_sec = 60

package/docs/acceptance/1.7.3/TOAST-AND-TOTALS.json

@@ -0,0 +1,29 @@
+{
+  "version": "1.7.3",
+  "case": "TOAST-AND-TOTALS",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-24T19:25:35.677Z",
+  "executor": "lead",
+  "requirement": "screenshot feedback must not squeeze the compose box or stay forever: a top overlay that dismisses after 5s and can be closed; whole-server totals must name the relay they came from and not impersonate our fleet",
+  "task_id": "01M5ANYMVMSGGQV",
+  "result": {
+    "outcome": "ok",
+    "host_capture_smoke": {
+      "platform": "win32",
+      "ok": true,
+      "bytes": 141768,
+      "copied": true
+    },
+    "assertions": {
+      "fleet_chat_capture": "3/3 pass",
+      "client_bundle": "26/26 pass",
+      "fleet_target": "76/76 pass",
+      "toast": "absolute overlay inside the panel (no layout shift), 5s timer, close button",
+      "totals": "labelled \"primary relay (<url>)\"; separate \"this fleet: n/m online\" line",
+      "roles": "primary role follows the configured rabbitUrl, not the fastest response"
+    }
+  }
+}

package/docs/acceptance/1.7.4/DESKTOP-HOST-COMPAT.json

@@ -0,0 +1,32 @@
+{
+  "version": "1.7.4",
+  "case": "DESKTOP-HOST-COMPAT",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-25T13:13:25.302Z",
+  "executor": "lead",
+  "requirement": "the plugin must not crash the DSH desktop host, and a device token issued by one relay must trigger a re-pair when the configured relay no longer accepts it",
+  "evidence": {
+    "host_crash": {
+      "symptom": "dsh: fatal load failure: TypeError: agent.identity is not a function",
+      "cause": "agent.identity?.() — the desktop host exposes identity as a property, so the optional CALL threw inside agent.start().then(...) and became an unhandled rejection",
+      "fix": "agentIdentityOf() type-checks before calling; agent.start runs with its failure recorded, never awaited as a mount prerequisite"
+    },
+    "relay_switch": {
+      "symptom": "the Rabbit refused GET /v1/devices with HTTP 401 (UNAUTHORIZED: missing or invalid device_token), 无列表",
+      "cause": "startup saw a stored token and skipped pairing; the token belonged to the OLD relay after the fleet moved to a new primary",
+      "fix": "probe the configured relay with the stored token; an explicit 401/403 drops it and re-pairs via the fleet key, while network errors keep it"
+    }
+  },
+  "assertions": {
+    "identity_regression": "test/agent-identity-safe.test.mjs pass",
+    "re_pair_regression": "test/re-pair-stale-token.test.mjs pass",
+    "syntax": "node --check src/plugin/tools.mjs pass"
+  },
+  "task_id": "local-1.7.4-20261025131554",
+  "result": {
+    "outcome": "ok"
+  }
+}

package/lib/client.js

@@ -115,6 +115,8 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
         relayUnfold: '收起折叠的 relay',
         relayTemporary: '临时 Relay 节点（回退配置）',
         globalSummary: '全服：{fleetsOnline}/{fleets} 个编队 · {online}/{total} 台在线',
+        globalSummaryWithSource: '主 relay（{source}）全服：{fleetsOnline}/{fleets} 个编队 · {online}/{total} 台在线',
+        fleetSummary: '本编队：{online}/{total} 台在线',
         globalUnreachable: '主 relay 不可达（{url}）· 全服统计不可用',
         updateButton: '检查插件更新',
         updateChecking: '正在检查 npm…',
@@ -154,6 +156,8 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
         relayUnfold: 'collapse the folded relays',
         relayTemporary: 'temporary relay nodes (fallback config)',
         globalSummary: 'fleets {fleetsOnline}/{fleets} · machines {online}/{total} online',
+        globalSummaryWithSource: 'primary relay ({source}) · fleets {fleetsOnline}/{fleets} · machines {online}/{total}',
+        fleetSummary: 'this fleet: {online}/{total} online',
         globalUnreachable: 'primary relay unreachable ({url}) · server totals unavailable',
         updateButton: 'check for plugin update',
         updateChecking: 'checking npm…',
@@ -402,7 +406,8 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
         '.w2mChat_copy{margin-left:6px;border:none;background:transparent;color:var(--dsw-alias-label-tertiary);cursor:pointer;font-size:11px;line-height:14px;padding:0 2px;vertical-align:middle}',
         '.w2mChat_copy:hover{color:var(--dsw-alias-label-primary)}',
         '.w2mChat_shotButton{flex:none;height:28px;padding:0 8px;border:.5px solid var(--dsw-alias-border-default);border-radius:var(--dsw-radius-sm);background:var(--dsw-alias-surface-default);color:var(--dsw-alias-label-primary);font:inherit;cursor:pointer}',
-        '.w2mChat_toast{padding:4px 10px;font-size:11px;color:var(--dsw-alias-label-secondary)}',
+        '.w2mChat_toast{position:absolute;left:10px;right:10px;top:46px;z-index:6;display:flex;align-items:center;gap:8px;padding:6px 10px;border-radius:8px;border:.5px solid var(--dsw-alias-border-default);background:var(--dsw-alias-bg-layer-2);box-shadow:var(--dsw-elevation-soft);font-size:11px;color:var(--dsw-alias-label-secondary)}',
+        '.w2mChat_toastClose{margin-left:auto;border:none;background:transparent;color:var(--dsw-alias-label-tertiary);cursor:pointer;font-size:12px;line-height:12px;padding:0 2px}',
       '.w2mChat_text{white-space:pre-wrap;word-break:break-word}',
         '.w2mChat_msg.is-session .w2mChat_text{color:var(--dsw-danger)}',         '.w2mChat_msg.is-chat .w2mChat_text{color:var(--dsw-success)}',         '.w2mChat_msg.is-remote .w2mChat_text{color:var(--dsw-text)}',         '.w2mChat_avatar{display:inline-flex;width:16px;height:16px;margin-right:5px;vertical-align:-3px}',
       '.w2mChat_compose{display:flex;gap:8px;padding:8px 10px;border-top:.5px solid var(--dsw-alias-border-l2);align-items:flex-end}',
@@ -697,12 +702,20 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
                 h('span', { key: 'url', className: cls('relayUrl') }, String(item.url ?? '').replace(/^https?:\/\//, '').replace(/\/$/, '')),
                 h('span', { key: 'rtt', className: cls('relayRtt') }, item.rtt_ms === null || item.rtt_ms === undefined ? '—' : `${item.rtt_ms} ms`),
               ])),
-              relayFold.server === null || relayFold.server === undefined ? null : h('div', { key: 'global', className: cls('relayHint') }, t('globalSummary', {
-                fleetsOnline: relayFold.server.fleets_online ?? '—',
-                fleets: relayFold.server.fleets_total ?? '—',
-                online: relayFold.server.devices_online ?? '—',
-                total: relayFold.server.devices_total ?? '—',
-              })),
+                // v1.7.3: name the relay the totals came from; "whole server" and "this fleet" are different
+                // numbers, and the panel used to leave the reader to guess which one it was showing.
+                relayFold.server === null || relayFold.server === undefined
+                  ? (relayFold.server_reachable === false
+                    ? h('div', { key: 'globalUnreachable', className: cls('relayHint') }, t('globalUnreachable', { url: String(relayFold.server_url ?? '').replace(/^https?:\/\//, '').replace(/\/$/, '') || '?' }))
+                    : null)
+                  : h('div', { key: 'global', className: cls('relayHint') }, t('globalSummaryWithSource', {
+                      source: String(relayFold.server_url ?? '').replace(/^https?:\/\//, '').replace(/\/$/, '') || '?',
+                      fleetsOnline: relayFold.server.fleets_online ?? '—',
+                      fleets: relayFold.server.fleets_total ?? '—',
+                      online: relayFold.server.devices_online ?? '—',
+                      total: relayFold.server.devices_total ?? '—',
+                    })),
+                h('div', { key: 'fleet', className: cls('relayHint') }, t('fleetSummary', { online: state?.fleet?.online ?? '—', total: state?.fleet?.total ?? '—' })),
               h(PluginUpdate, { key: 'update', t }),
               relayFold.hidden_count > 0 && relayOpen === false
                 ? h('div', { key: 'hint', className: cls('relayHint') }, t('relayFold', { count: relayFold.hidden_count }))
@@ -1035,6 +1048,14 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
           return () => document.removeEventListener('keydown', onKeyDown, true);
         }, [open, captureScreenshot]);
 
+        // v1.7.3: screenshot feedback is ephemeral: it fades after 5s and can be closed. It must not
+        // sit in the compose row (that squeezed the input) and must not accumulate with more captures.
+        React.useEffect(() => {
+          if (toast === null) return undefined;
+          const timer = setTimeout(() => setToast(null), 5000);
+          return () => clearTimeout(timer);
+        }, [toast]);
+
       const unseenCount = messages.reduce((count, message) => (Number.isFinite(message?.at_ms) && message.at_ms > lastSeenMs ? count + 1 : count), 0);
       const disabled = typeof sessionId !== 'string' || sessionId === '';
       const usageText = usage === null ? null : `${Math.round((usage.used_24h_bytes ?? 0) / 1024)} KiB/24h · ${usage.messages ?? 0} 条`;
@@ -1100,7 +1121,6 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
 
 
               h('div', { className: 'w2mChat_compose' },
-                  toast === null ? null : h('div', { key: 'toast', className: 'w2mChat_toast' }, toast),
                 replyTo === null ? null : h('div', { className: 'w2mChat_reply' }, [
                   h('span', { key: 'label' }, '回复：' + (replyTo.text.length > 40 ? replyTo.text.slice(0, 40) + '…' : replyTo.text)),
                   h('button', { key: 'cancel', type: 'button', className: 'w2mChat_replyCancel', title: '取消回复', onClick: () => setReplyTo(null) }, '×'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/w2m-dsh-plugin",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "Run one project across your own Windows and macOS machines from a single DeepSeek account, through 11 w2m_* tools. Four coordination modes (replicate, split, broadcast, pipeline) and six aggregate verdicts (consistent, divergent, divergent-platform, failed, partial, unverifiable). P2P hole punching by default, with a bundled relay, STUN responder and ledger fallback, so the fleet needs no third-party service. Joining needs a pairing code plus autoStartAgent: true; installing alone does not join.",
   "type": "module",
   "exports": {
@@ -64,7 +64,7 @@
     "pack": "node scripts/pack.mjs",
     "reachability": "node scripts/reachability-check.mjs",
     "reachability:classify": "node scripts/reachability-classify.mjs",
-    "test": "node --test --test-force-exit test/relay.test.mjs test/broadcast.test.mjs test/blake2s.test.mjs test/agent.test.mjs test/plan-sec-cmd.test.mjs test/authority.test.mjs test/blocks.test.mjs test/approval-index.test.mjs test/fleet-sync.test.mjs test/fleet-merge.test.mjs test/fleet-memory-e2e.test.mjs test/fleet-concurrency.test.mjs test/fleet-merge-race.test.mjs test/health.test.mjs test/storage.test.mjs test/exit-channel.test.mjs test/council.test.mjs test/council-session.test.mjs test/log-bounds.test.mjs test/test-report.test.mjs test/fleet-scale.test.mjs test/fleet-state.test.mjs test/crypto-blake2s.test.mjs test/installed-version.test.mjs test/permission.test.mjs test/machine-test-packet.test.mjs test/field-authority.test.mjs test/approval-gate.test.mjs test/authority-choice.test.mjs test/reachability-check.test.mjs test/reachability-classify.test.mjs test/accepted-orphans.test.mjs test/acceptance-doc.test.mjs test/layer-model.test.mjs test/cwd-containment.test.mjs test/cwd-outside-project.test.mjs test/memory.test.mjs test/tools.test.mjs  test/claims.test.mjs test/fleet-target.test.mjs test/client-bundle.test.mjs test/schedule.test.mjs test/auto-update.test.mjs test/update-source.test.mjs test/update-install.test.mjs test/update-wiring.test.mjs test/signing.test.mjs test/stress.test.mjs test/shared-config.test.mjs test/metrics.test.mjs test/metrics-route.test.mjs test/tool-cards.test.mjs test/p2p-stun.test.mjs test/p2p-transport.test.mjs test/p2p-signaling.test.mjs test/p2p-node.test.mjs test/p2p-transport-fields.test.mjs test/p2p-plugin.test.mjs test/p2p-crypto.test.mjs test/stun-server.test.mjs test/loader-entry.test.mjs test/mdns-wire.test.mjs test/mdns-discover.test.mjs test/chatops-approval.test.mjs test/chatops-policy.test.mjs test/chatops-file-safety.test.mjs test/chatops-outbound-queue.test.mjs test/chatops-commands.test.mjs test/chatops-bridge.test.mjs test/chatops-config-route.test.mjs test/chatops-apply.test.mjs test/chatops-ilink-contract.test.mjs test/chatops-fleet.test.mjs test/chatops-account.test.mjs test/chatops-auth.test.mjs test/chatops-fleet-scope.test.mjs test/chatops-handoff.test.mjs test/chatops-fleet-wiring.test.mjs test/chatops-fleet-live.test.mjs test/chatops-takeover.test.mjs test/chatops-device-signing.test.mjs test/chatops-relay-verify.test.mjs test/chatops-durability.test.mjs test/chatops-run-command.test.mjs test/secrets-guard.test.mjs test/chatops-ilink-fleet-bridge.test.mjs test/agent-plugins.test.mjs test/memory-layer.test.mjs test/mcp-server.test.mjs test/portable-plugins.test.mjs test/mcp-http.test.mjs test/mcp-http-live.test.mjs test/vision.test.mjs test/ilink-shape.test.mjs test/chatops-fleet-join.test.mjs test/admission.test.mjs test/admission-routes.test.mjs test/join-degradation.test.mjs test/account-identity.test.mjs test/join-challenge.test.mjs test/exec-env-injection.test.mjs test/account-join.test.mjs test/fleet-messages.test.mjs test/message-shards.test.mjs test/fleet-messages-http.test.mjs test/message-notify.test.mjs test/update-channels.test.mjs test/update-prerelease.test.mjs test/session-watch.test.mjs test/session-readonly.test.mjs test/session-sync.test.mjs test/fleet-chat-identity.test.mjs test/identity-reader.test.mjs test/intents.test.mjs test/dataflow.test.mjs test/council-fleet.test.mjs test/fleet-memory.test.mjs test/memory-view.test.mjs test/schema-spec.test.mjs test/fleet-weight-parity.test.mjs test/task-deps.test.mjs test/dataflow-wiring.test.mjs test/task-graph.test.mjs test/ask-store.test.mjs test/turn.test.mjs test/fleet-members.test.mjs test/redact.test.mjs test/policy-matrix.test.mjs test/envelope-signature.test.mjs test/chat-crypto.test.mjs test/reduce-suggestion.test.mjs test/merge-hint.test.mjs test/fleet-chat-route.test.mjs test/maintenance.test.mjs test/maintenance-ferry.test.mjs test/grant.test.mjs test/grant-gate.test.mjs test/worktree.test.mjs test/patch-artifact.test.mjs test/merge-queue.test.mjs test/m3-workflow.test.mjs test/project-room.test.mjs test/project-attribution.test.mjs test/project-locks.test.mjs test/project-reviews.test.mjs test/project-notifications.test.mjs test/blob-sessions.test.mjs test/outbox.test.mjs test/reliability-metrics.test.mjs test/evidence.test.mjs test/grant-issue.test.mjs test/project-refs.test.mjs test/exec-capability.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs",
+    "test": "node --test --test-force-exit test/relay.test.mjs test/broadcast.test.mjs test/blake2s.test.mjs test/agent.test.mjs test/plan-sec-cmd.test.mjs test/authority.test.mjs test/blocks.test.mjs test/approval-index.test.mjs test/fleet-sync.test.mjs test/fleet-merge.test.mjs test/fleet-memory-e2e.test.mjs test/fleet-concurrency.test.mjs test/fleet-merge-race.test.mjs test/health.test.mjs test/storage.test.mjs test/exit-channel.test.mjs test/council.test.mjs test/council-session.test.mjs test/log-bounds.test.mjs test/test-report.test.mjs test/fleet-scale.test.mjs test/fleet-state.test.mjs test/crypto-blake2s.test.mjs test/installed-version.test.mjs test/permission.test.mjs test/machine-test-packet.test.mjs test/field-authority.test.mjs test/approval-gate.test.mjs test/authority-choice.test.mjs test/reachability-check.test.mjs test/reachability-classify.test.mjs test/accepted-orphans.test.mjs test/acceptance-doc.test.mjs test/layer-model.test.mjs test/cwd-containment.test.mjs test/cwd-outside-project.test.mjs test/memory.test.mjs test/tools.test.mjs  test/claims.test.mjs test/fleet-target.test.mjs test/client-bundle.test.mjs test/schedule.test.mjs test/auto-update.test.mjs test/update-source.test.mjs test/update-install.test.mjs test/update-wiring.test.mjs test/signing.test.mjs test/stress.test.mjs test/shared-config.test.mjs test/metrics.test.mjs test/metrics-route.test.mjs test/tool-cards.test.mjs test/p2p-stun.test.mjs test/p2p-transport.test.mjs test/p2p-signaling.test.mjs test/p2p-node.test.mjs test/p2p-transport-fields.test.mjs test/p2p-plugin.test.mjs test/p2p-crypto.test.mjs test/stun-server.test.mjs test/loader-entry.test.mjs test/mdns-wire.test.mjs test/mdns-discover.test.mjs test/chatops-approval.test.mjs test/chatops-policy.test.mjs test/chatops-file-safety.test.mjs test/chatops-outbound-queue.test.mjs test/chatops-commands.test.mjs test/chatops-bridge.test.mjs test/chatops-config-route.test.mjs test/chatops-apply.test.mjs test/chatops-ilink-contract.test.mjs test/chatops-fleet.test.mjs test/chatops-account.test.mjs test/chatops-auth.test.mjs test/chatops-fleet-scope.test.mjs test/chatops-handoff.test.mjs test/chatops-fleet-wiring.test.mjs test/chatops-fleet-live.test.mjs test/chatops-takeover.test.mjs test/chatops-device-signing.test.mjs test/chatops-relay-verify.test.mjs test/chatops-durability.test.mjs test/chatops-run-command.test.mjs test/secrets-guard.test.mjs test/chatops-ilink-fleet-bridge.test.mjs test/agent-plugins.test.mjs test/memory-layer.test.mjs test/mcp-server.test.mjs test/portable-plugins.test.mjs test/mcp-http.test.mjs test/mcp-http-live.test.mjs test/vision.test.mjs test/ilink-shape.test.mjs test/chatops-fleet-join.test.mjs test/admission.test.mjs test/admission-routes.test.mjs test/join-degradation.test.mjs test/account-identity.test.mjs test/join-challenge.test.mjs test/exec-env-injection.test.mjs test/account-join.test.mjs test/fleet-messages.test.mjs test/message-shards.test.mjs test/fleet-messages-http.test.mjs test/message-notify.test.mjs test/update-channels.test.mjs test/update-prerelease.test.mjs test/session-watch.test.mjs test/session-readonly.test.mjs test/session-sync.test.mjs test/fleet-chat-identity.test.mjs test/identity-reader.test.mjs test/intents.test.mjs test/dataflow.test.mjs test/council-fleet.test.mjs test/fleet-memory.test.mjs test/memory-view.test.mjs test/schema-spec.test.mjs test/fleet-weight-parity.test.mjs test/task-deps.test.mjs test/dataflow-wiring.test.mjs test/task-graph.test.mjs test/ask-store.test.mjs test/turn.test.mjs test/fleet-members.test.mjs test/redact.test.mjs test/policy-matrix.test.mjs test/envelope-signature.test.mjs test/chat-crypto.test.mjs test/reduce-suggestion.test.mjs test/merge-hint.test.mjs test/fleet-chat-route.test.mjs test/maintenance.test.mjs test/maintenance-ferry.test.mjs test/grant.test.mjs test/grant-gate.test.mjs test/worktree.test.mjs test/patch-artifact.test.mjs test/merge-queue.test.mjs test/m3-workflow.test.mjs test/project-room.test.mjs test/project-attribution.test.mjs test/project-locks.test.mjs test/project-reviews.test.mjs test/project-notifications.test.mjs test/blob-sessions.test.mjs test/outbox.test.mjs test/reliability-metrics.test.mjs test/evidence.test.mjs test/grant-issue.test.mjs test/project-refs.test.mjs test/exec-capability.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs test/agent-identity-safe.test.mjs test/re-pair-stale-token.test.mjs",
     "test:acceptance-doc": "node --test --test-force-exit test/acceptance-doc.test.mjs",
     "test:account-identity": "node --test --test-force-exit test/account-identity.test.mjs",
     "test:account-join": "node --test --test-force-exit test/account-join.test.mjs",
@@ -82,7 +82,7 @@
     "test:council-session": "node --test --test-force-exit test/council-session.test.mjs",
     "test:crossnetwork": "node --test --test-force-exit test/crossnetwork.test.mjs",
     "test:crypto-blake2s": "node --test --test-force-exit test/crypto-blake2s.test.mjs",
-    "test:e2e": "node --test --test-force-exit test/e2e.test.mjs test/crossnetwork.test.mjs test/signing-e2e.test.mjs test/outbound-only.test.mjs test/recovery.test.mjs test/pipeline-e2e.test.mjs test/p2p-agent.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs",
+    "test:e2e": "node --test --test-force-exit test/e2e.test.mjs test/crossnetwork.test.mjs test/signing-e2e.test.mjs test/outbound-only.test.mjs test/recovery.test.mjs test/pipeline-e2e.test.mjs test/p2p-agent.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs test/agent-identity-safe.test.mjs test/re-pair-stale-token.test.mjs",
     "test:exec-env": "node --test --test-force-exit test/exec-env-injection.test.mjs",
     "test:exit-channel": "node --test --test-force-exit test/exit-channel.test.mjs",
     "test:field-authority": "node --test --test-force-exit test/field-authority.test.mjs",

package/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
   "name": "twinsearth-w2m-dsh",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "Run one project across your own Windows and macOS machines from a single DeepSeek account, through 12 w2m_* tools. Four coordination modes (replicate, split, broadcast, pipeline) and six aggregate verdicts (consistent, divergent, divergent-platform, failed, partial, unverifiable). P2P hole punching by default, with a bundled relay, STUN responder and ledger fallback, so the fleet needs no third-party service. Joining needs a pairing code plus autoStartAgent: true; installing alone does not join.",
   "license": "MIT",
   "keywords": [

package/src/plugin/fleet-target.mjs

@@ -801,22 +801,24 @@ function mountTargetRoutes(connection, deps, status, logger) {
       return null;
     }
     const probed = await probeRelays(urls);
-    // The fold's primary is the fastest reachable node; every other reachable node is standby, and
-    // an unreachable one keeps its place at the end as `offline` rather than disappearing.
-    let reachableSeen = 0;
-    const items = probed.map((item) => {
-      if (item.ok !== true) return { ...item, role: 'offline' };
-      reachableSeen += 1;
-      return { ...item, role: reachableSeen === 1 ? 'primary' : 'standby' };
-    });
+    // v1.7.3: the role follows the CONFIGURED primary relay, not whichever relay answered fastest.
+    // Ranking by latency let the backup masquerade as primary whenever it was quicker -- the panel then
+    // explained one relay while showing another relay's whole-server numbers.
+    const normalize = (value) => (typeof value === 'string' ? value.trim().replace(/\/+$/, '') : null);
+    const configuredPrimary = normalize(deps.cfg()?.rabbitUrl) ?? normalize(urls[0]);
+    const ordered = [...probed];
+    const primaryIndex = ordered.findIndex((item) => normalize(item.url) === configuredPrimary);
+    if (primaryIndex > 0) ordered.unshift(...ordered.splice(primaryIndex, 1));
+    const items = ordered.map((item) => ({
+      ...item,
+      role: item.ok !== true ? 'offline' : (normalize(item.url) === configuredPrimary ? 'primary' : 'standby'),
+    }));
     const folded = foldRelayItems(items, 3);
     // v1.7.2: whole-server totals come from the CONFIGURED primary relay only. v1.6.2 used "the first
     // relay that answered", so when the primary was unreachable the panel showed the BACKUP relay's
     // numbers (1/1 fleets, 2/5 machines) under the "whole server" label -- visibly wrong. An
     // unreachable primary reports `server: null` + `server_reachable: false`, and the panel says the
     // totals are unavailable instead of presenting another relay's fleet as the server's.
-    const normalize = (value) => (typeof value === 'string' ? value.trim().replace(/\/+$/, '') : null);
-    const configuredPrimary = normalize(deps.cfg()?.rabbitUrl) ?? normalize(urls[0]);
     const primaryItem = configuredPrimary === null
       ? items.find((item) => item.ok === true) ?? null
       : items.find((item) => normalize(item.url) === configuredPrimary) ?? null;

package/src/plugin/tools.mjs

@@ -283,7 +283,7 @@ const MAX_STAGES = 16;
  * `package.json` during `scripts/pack.mjs` rather than hand-maintained, and `W2M_PLUGIN_VERSION`
  * overrides it at runtime for tests and packagers.
  */
-const PLUGIN_VERSION = '1.7.2';
+const PLUGIN_VERSION = '1.7.4';
 
 /** How long any single HTTP call may take before it is aborted, in milliseconds. */
 const DEFAULT_REQUEST_TIMEOUT_MS = 15_000;
@@ -7469,6 +7469,25 @@ async function startFailoverStack(ctx, cfg) {
     await stop();
   };
 }
+
+/**
+ * Read an agent's identity without assuming `identity` is a method.
+ *
+ * v1.7.4: calling the optional method form on agent.identity crashed the DESKTOP host with
+ *   dsh: fatal load failure: TypeError: agent.identity is not a function
+ * because the desktop host's agent exposes `identity` as a property while the in-process agent
+ * exposes it as a function. Optional CALL only guards null/undefined; a present non-function still
+ * throws, and inside a promise callback that became an unhandled rejection that took the host down.
+ * Reading the value with a type check covers both shapes.
+ */
+function agentIdentityOf(agent) {
+  try {
+    if (agent === null || agent === undefined) return null;
+    return typeof agent.identity === 'function' ? agent.identity() : (agent.identity ?? null);
+  } catch {
+    return null;
+  }
+}
 async function startLocalStack(ctx, cfg) {
 
   /**
@@ -7822,7 +7841,37 @@ async function startLocalStack(ctx, cfg) {
      * the unconditional pairing here were the same defect seen from two sides.
      */
     const existingToken = loaded.identity.device_token;
-    const alreadyPaired = typeof existingToken === 'string' && existingToken !== '';
+    let alreadyPaired = typeof existingToken === 'string' && existingToken !== '';
+
+    /**
+     * v1.7.4: a stored token is only "paired" for the relay that issued it.
+     *
+     * Moving the fleet to a new primary relay reuses device.json. The stored token belongs to the OLD
+     * relay, the new one answers `401 UNAUTHORIZED: missing or invalid device_token`, and because the
+     * startup path saw a token it skipped pairing entirely: every machine showed "the Rabbit refused
+     * GET /v1/devices with HTTP 401 ... 无列表" and joined no fleet.
+     *
+     * Probe the configured relay with the stored token. An explicit 401/403 means the token is stale
+     * FOR THIS RELAY, so drop it and pair again through the fleet key. Any other outcome (200, network
+     * error, unexpected status) keeps the token -- a transient outage must not trigger a re-pair.
+     */
+    if (alreadyPaired) {
+      const relayForToken = relay?.url ?? cfg.rabbitUrl;
+      if (typeof relayForToken === 'string' && relayForToken !== '') {
+        try {
+          const probe = await fetch(relayForToken.replace(/\/+$/, '') + '/v1/devices', {
+            headers: { authorization: 'Bearer ' + existingToken, accept: 'application/json' },
+            signal: typeof AbortSignal !== 'undefined' && typeof AbortSignal.timeout === 'function' ? AbortSignal.timeout(4000) : undefined,
+          });
+          if (probe.status === 401 || probe.status === 403) {
+            alreadyPaired = false;
+            loaded.identity.device_token = null;
+            if (identityOptions.identity !== undefined && identityOptions.identity !== null) identityOptions.identity.device_token = null;
+            ctx.logger?.warn?.('w2m: stored device token was rejected by ' + relayForToken + ' (HTTP ' + probe.status + '); pairing again with the fleet key');
+          }
+        } catch { /* network error: keep the token, do not force a re-pair */ }
+      }
+    }
 
     /**
      * Pair with the key that is in hand, and **persist the token**.
@@ -8026,7 +8075,7 @@ async function startLocalStack(ctx, cfg) {
     // the relay, and the value startFailoverStack needs from this function is the cleanup handle. So
     // start it in the background and record a failure instead of hanging the whole stack.
     agent.start().then(
-      () => ctx.logger?.info?.('w2m: agent started as ' + JSON.stringify(agent.identity?.() ?? null)),
+      () => ctx.logger?.info?.('w2m: agent started as ' + JSON.stringify(agentIdentityOf(agent))),
       (error) => ctx.logger?.warn?.('w2m: agent start failed: ' + (error instanceof Error ? error.message : String(error))),
     );