@twinsearth/w2m-dsh-plugin 1.6.1 → 1.6.2

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.6.1"
+    "version": "1.6.2"
   },
   "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.6.1",
+      "version": "1.6.2",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "1.6.1"
+  "version": "1.6.2"
 }

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.6.1",
+  "version": "1.6.2",
   "author": {
     "name": "TwinsEarth"
   },

package/CHANGELOG.md

@@ -7,6 +7,18 @@
 
 All notable changes to this project are documented here.
 
+## [1.6.2] — 2026-10-24
+
+**relay 全服概览：多少个编队、多少台机器在线（healthz + operator /v1/fleets + 面板一行显示）。**
+
+- `state.fleetSummary()`：按 fleet 聚合设备数/在线数，返回 `fleets_total`、`devices_online`、
+  `devices_total`、`unfleeted_devices` 与 per-fleet 明细。
+- `GET /healthz`（公开）新增上述**聚合计数**（不暴露 per-fleet 明细）；
+- `GET /v1/fleets`（operator token）：返回 per-fleet 明细（其他账号的编队名不向普通设备暴露）。
+- 面板 relay 折叠区新增一行：`全服：N 个编队 · M/T 台在线`（fleet-target probe 读取 healthz 计数）。
+- relay 主机将升级到 1.6.2（包含 1.6.1 的 Node 执行仅人工/内存态与 allow-list 解释器身份修复）。
+- 测试：relay 200/200、fleet-target 49/49、client-bundle 26/26；证据
+  `docs/acceptance/1.6.2/RELAY-FLEET-OVERVIEW.json`（fleet task `01M5ANYMVLRYXSN`）。
 ## [1.6.1] — 2026-10-24
 
 **Node 执行开关改为「仅人工 UI 手动、进程内存态」：文件/远程/自动化一律无法授权。**

package/codex/mcp-servers.toml

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

package/docs/acceptance/1.6.2/RELAY-FLEET-OVERVIEW.json

@@ -0,0 +1,22 @@
+{
+  "version": "1.6.2",
+  "case": "RELAY-FLEET-OVERVIEW",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-24T02:23:58.829Z",
+  "executor": "lead",
+  "requirement": "the relay reports how many fleets it serves and how many machines are online: aggregate counts on the public health probe, per-fleet rows only for the operator",
+  "task_id": "01M5ANYMVLRYXSN",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "relay_suite": "200/200 pass",
+      "fleet_summary": "fleets_total/devices_online/devices_total",
+      "operator_route": "GET /v1/fleets",
+      "panel_line": "globalSummary rendered"
+    }
+  },
+  "note": "relay and fleet-target suites ran as a real fleet task"
+}

package/lib/client.js

@@ -112,6 +112,7 @@ window.__ModuleLoader__.load({
         relayFold: '另有 {count} 个已折叠，点击展开',
         relayUnfold: '收起折叠的 relay',
         relayTemporary: '临时 Relay 节点（回退配置）',
+        globalSummary: '全服：{fleets} 个编队 · {online}/{total} 台在线',
         capLabel: 'Node 执行：{state}',
         capDenied: '拒绝',
         capTemporary: '临时 24 小时',
@@ -143,6 +144,7 @@ window.__ModuleLoader__.load({
         relayFold: '{count} more folded — expand',
         relayUnfold: 'collapse the folded relays',
         relayTemporary: 'temporary relay nodes (fallback config)',
+        globalSummary: '{fleets} fleets · {online}/{total} machines online',
         capLabel: 'Node exec: {state}',
         capDenied: 'denied',
         capTemporary: 'temporary 24 h',
@@ -631,6 +633,11 @@ window.__ModuleLoader__.load({
                 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', {
+                fleets: relayFold.server.fleets_total ?? '—',
+                online: relayFold.server.devices_online ?? '—',
+                total: relayFold.server.devices_total ?? '—',
+              })),
               relayFold.hidden_count > 0 && relayOpen === false
                 ? h('div', { key: 'hint', className: cls('relayHint') }, t('relayFold', { count: relayFold.hidden_count }))
                 : null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/w2m-dsh-plugin",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "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": {

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.6.1",
+  "version": "1.6.2",
   "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

@@ -503,7 +503,16 @@ export async function probeRelays(urls, options = {}) {
       if (!response.ok || body?.ok !== true) {
         return { url, ok: false, rtt_ms: null, error: `HTTP ${response.status}` };
       }
-      return { url, ok: true, rtt_ms: Date.now() - started, relay_id: body.relay_id ?? null };
+      return {
+        url, ok: true, rtt_ms: Date.now() - started, relay_id: body.relay_id ?? null,
+        // v1.6.2: Whole-relay totals, shown in the panel as "N fleets · M machines online".
+        // Counts only: per-fleet membership stays behind the fleet-scoped endpoints.
+        stats: {
+          fleets_total: Number.isInteger(body.fleets_total) ? body.fleets_total : null,
+          devices_online: Number.isInteger(body.devices_online) ? body.devices_online : null,
+          devices_total: Number.isInteger(body.devices_total) ? body.devices_total : null,
+        },
+      };
     } catch (error) {
       return { url, ok: false, rtt_ms: null, error: error instanceof Error ? error.message : String(error) };
     }
@@ -573,6 +582,8 @@ export function buildUiState(deps) {
           primary_url: relays.shown.find((item) => item.ok === true)?.url ?? null,
           // v1.5.2: a fallback relay list is never presented as settled; the panel renders it red.
           temporary: relays.temporary === true,
+          // v1.6.2: whole-relay overview (fleets + online machines) for the panel header line.
+          server: relays.server ?? null,
         },
   };
 }
@@ -795,8 +806,10 @@ function mountTargetRoutes(connection, deps, status, logger) {
       return { ...item, role: reachableSeen === 1 ? 'primary' : 'standby' };
     });
     const folded = foldRelayItems(items, 3);
+    // v1.6.2: the primary relay's own view of the whole server, if it reported one.
+    const primaryStats = items.find((item) => item.ok === true)?.stats ?? null;
     // v1.5.2: a fallback list is marked so the panel can render it in red, not as a settled config.
-    const withMark = { ...folded, temporary: deps.cfg()?.relayTemporary === true };
+    const withMark = { ...folded, temporary: deps.cfg()?.relayTemporary === true, server: primaryStats };
     relayCache = { at: now, value: withMark };
     return withMark;
   };

package/src/plugin/tools.mjs

@@ -277,7 +277,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.6.1';
+const PLUGIN_VERSION = '1.6.2';
 
 /** How long any single HTTP call may take before it is aborted, in milliseconds. */
 const DEFAULT_REQUEST_TIMEOUT_MS = 15_000;

package/src/relay/server.mjs

@@ -853,6 +853,17 @@ export class RelayServer {
      * every task that carried a grant, with the argv hash and key id it was authorised under -- and deliberately returns
      * only operator-readable data, never result bodies.
      */
+      /**
+       * v1.6.2: whole-relay fleet overview for an operator. Aggregate counts are public on /healthz;
+       * the per-fleet rows are not, because they name other accounts fleets.
+       */
+      if (method === 'GET' && path === '/v1/fleets') {
+        const auth = this.authorizeTaskDispatch(req);
+        if (auth.role !== 'operator') throw new ProtocolError('OPERATOR_REQUIRED', 'listing fleets is an operator view');
+        const summary = this.state.fleetSummary();
+        return sendJson(res, 200, { protocol_version: PROTOCOL_VERSION, rabbit_time: this.state.nowIso(), ok: true, ...summary });
+      }
+
     if (path === '/v1/grants/revoke' || path === '/v1/grants') {
       const auth = this.authorizeTaskDispatch(req);
       if (auth.role !== 'operator') throw new ProtocolError('OPERATOR_REQUIRED', 'only the operator may administer grants');

package/src/relay/state.mjs

@@ -3245,12 +3245,40 @@ export class RabbitState {
 
   /* ---------------- serialization ---------------- */
 
+  /**
+   * v1.6.2: the whole-relay view: how many fleets this relay serves and how many machines are
+   * online. Counts only — the per-fleet member lists stay behind the fleet-scoped endpoints, so
+   * this is safe to expose on the public health probe.
+   */
+  fleetSummary(nowMs = this.nowMs()) {
+    const byFleet = new Map();
+    let online = 0;
+    for (const device of this.devices.values()) {
+      const key = typeof device.fleet_id === 'string' && device.fleet_id !== '' ? device.fleet_id : null;
+      const entry = byFleet.get(key) ?? { fleet_id: key, devices: 0, online: 0 };
+      entry.devices += 1;
+      if (this.isOnlineDevice(device, nowMs)) { entry.online += 1; online += 1; }
+      byFleet.set(key, entry);
+    }
+    const fleets = [...byFleet.values()].sort((a, b) => b.devices - a.devices);
+    return {
+      fleets_total: fleets.filter((f) => f.fleet_id !== null).length,
+      unfleeted_devices: byFleet.get(null)?.devices ?? 0,
+      devices_total: this.devices.size,
+      devices_online: online,
+      fleets,
+    };
+  }
   stats() {
     return {
       protocol_version: PROTOCOL_VERSION,
       seq: this.seq,
       buffered_events: this.buffer.length,
       devices: this.devices.size,
+      // v1.6.2: whole-relay totals on the public health probe.
+      fleets_total: this.fleetSummary().fleets_total,
+      devices_online: this.fleetSummary().devices_online,
+      devices_total: this.devices.size,
       tasks: this.tasks.size,
       results: this.results.size,
       pairing_codes: [...this.pairingCodes.values()].filter((c) => !c.used && this.nowMs() < c.expires_at_ms).length,