@twinsearth/w2m-dsh-plugin 1.5.2 → 1.5.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.5.2"
+    "version": "1.5.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.5.2",
+      "version": "1.5.4",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "1.5.2"
+  "version": "1.5.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.5.2",
+  "version": "1.5.4",
   "author": {
     "name": "TwinsEarth"
   },

package/CHANGELOG.md

@@ -7,6 +7,35 @@
 
 All notable changes to this project are documented here.
 
+## [1.5.4] — 2026-10-23
+
+**验签 bootstrap 的结果覆盖过期的显式 relay（现场故障：设备仍指向 127.0.0.1）。**
+
+现场证据：DSH 升级到 v1.5.3 后仍报 `W2M_UNREACHABLE: could not reach the Rabbit at
+http://127.0.0.1:8787`——它的 profile 仍显式写着本机地址，v1.5.3 只在“无显式 relay”时才采用
+bootstrap 池，于是拿到池却继续拨 loopback。
+
+- bootstrap 验签成功后**总是采用** `relays[0]` 作为 `rabbitUrl`，并 warn 记录被替换的旧地址；
+  想固定 relay 的运维应显式设置 `relayUrls`（此时 bootstrap 分支不执行）。
+- 只影响“验签通过”的答案；失败仍保持原配置并写 `w2m_status.bootstrap.last_error`。
+- 测试：bootstrap 6/6、bootstrap-cli 6/6；证据 `docs/acceptance/1.5.4/BOOTSTRAP-WINS.json`
+  （fleet task `01M5ANYMVL0FV9C`）。
+## [1.5.3] — 2026-10-23
+
+**零接触自动入队：只能升级插件的机器也能自己找到编队。**
+
+v1.5.2 的验签 bootstrap 需要一个 URL、一个 operator 公钥和 fleetKey 才能触发——新装机器三样都没有，
+于是仍然回落到编译期默认 relay 并报 W2M_UNREACHABLE。v1.5.3 把触发条件做进包里：
+
+- 包内置默认 bootstrap 端点与 **operator 公钥 pin**（只含公钥；端点无法签发，私钥不出运维机）。
+- bootstrap 证明改为可选：机器还没拿到 fleetKey 时，仍可凭"签名 + 有效期 + relay 形状"采用
+  operator 声明的 relay 池（relay 列表是公开路由信息；加入编队仍需账号派生密钥，是独立一步）。
+- `startLocalStack` 在无 relayUrls 时始终尝试 bootstrap（默认值生效），成功即用池（首个 primary），
+  失败保持回落并写入 `w2m_status.bootstrap.last_error`。
+- 包内默认 patch：`autoStartAgent: true`（本 fork），新装即启动 agent。
+- 因此只有"升级插件"这一条通道的机器：升级 → 重启 → 自动取 relay 池 → 账号密钥就绪后自动配对入队。
+- 测试：bootstrap 6/6（含 keyless）、bootstrap-cli 6/6、fleet-target 49/49；层模型 clean；
+  证据 `docs/acceptance/1.5.3/ZERO-TOUCH-BOOTSTRAP.json`（真实 fleet task `01M5ANYMVKZ7DHH`）。
 ## [1.5.2] — 2026-10-23
 
 **新机器自动获得 relay 归属（验签 bootstrap）+ 一次性配置工具。**

package/codex/mcp-servers.toml

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

package/cordis.patch.yml

@@ -110,7 +110,7 @@
       config:
         rabbitUrl: ''
         operatorToken: ''
-        autoStartAgent: false
+        autoStartAgent: true
         machineName: ''
         allowedCommands: []
         p2pMode: auto

package/docs/acceptance/1.5.3/ZERO-TOUCH-BOOTSTRAP.json

@@ -0,0 +1,22 @@
+{
+  "version": "1.5.3",
+  "case": "ZERO-TOUCH-BOOTSTRAP",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-23T12:58:49.026Z",
+  "executor": "lead",
+  "requirement": "a machine whose only capability is upgrading the plugin obtains its relay pool without any local command: built-in bootstrap URL and operator public key, signature-verified keyless assignment, autoStartAgent on by default",
+  "task_id": "01M5ANYMVKZ7DHH",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "bootstrap_suite": "6/6 pass incl keyless",
+      "bootstrap_cli_suite": "6/6 pass",
+      "builtin_defaults": "endpoint+pin shipped",
+      "autoStartAgent_default": "true"
+    }
+  },
+  "note": "suites ran as a real fleet task on the Tencent relay; keyless assignment verified by unit test"
+}

package/docs/acceptance/1.5.4/BOOTSTRAP-WINS.json

@@ -0,0 +1,20 @@
+{
+  "version": "1.5.4",
+  "case": "BOOTSTRAP-WINS",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-23T13:33:16.362Z",
+  "executor": "lead",
+  "requirement": "a verified bootstrap answer replaces a stale explicit rabbitUrl, so an upgrade-only machine that named a dead local relay still reaches the operator relay pool",
+  "task_id": "01M5ANYMVL0FV9C",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "bootstrap_suite": "6/6 pass",
+      "override_branch": "adopted relays[0] with a warning naming the replaced URL"
+    }
+  },
+  "note": "suites ran as a real fleet task; the override is the v1.5.4 delta"
+}

package/package.json

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

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.5.2",
+  "version": "1.5.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/bootstrap.mjs

@@ -51,6 +51,21 @@ function fleetIdFromKey(key) {
 
 
 export const BOOTSTRAP_PROTOCOL = 'w2m-bootstrap/v1';
+/**
+ * v1.5.3 built-in bootstrap defaults.
+ *
+ * A machine whose only capability is "upgrade the plugin" cannot be told a URL or a pin by hand,
+ * so the operator's endpoint and public key ship inside the package. Only the PUBLIC key is here:
+ * the endpoint cannot mint answers, and the private key never leaves the operator's machine. A signed
+ * answer still has to verify and be unexpired, so the built-in values are a discovery hint, not trust.
+ */
+export const DEFAULT_BOOTSTRAP_URL = 'http://202.182.123.154:8911/bootstrap';
+export const DEFAULT_BOOTSTRAP_OPERATOR_KEY_PEM = [
+  '-----BEGIN PUBLIC KEY-----',
+  'MCowBQYDK2VwAyEAQdjWX9TggM/S1Bm/OKUI3/Q2IL20Le354AXwiMtua+0=',
+  '-----END PUBLIC KEY-----',
+  '',
+].join(String.fromCharCode(10));
 export const BOOTSTRAP_PROOF_PROTOCOL = 'w2m-bootstrap-proof/v1';
 /** Refusals are values with stable names, because the status surface reports them verbatim. */
 export const BOOTSTRAP_REFUSAL = Object.freeze({
@@ -137,7 +152,10 @@ export function verifyBootstrapAnswer(answer, input) {
   if (answer.protocol !== BOOTSTRAP_PROTOCOL) {
     return refuse(BOOTSTRAP_REFUSAL.BAD_PROTOCOL, `expected protocol ${BOOTSTRAP_PROTOCOL}, got ${JSON.stringify(answer.protocol ?? null)}`);
   }
-  if (typeof answer.fleet_id !== 'string' || answer.fleet_id !== input.fleetId) {
+  // v1.5.3: when the machine cannot derive a fleet key yet, it still must not be stranded: the
+  // signed relay list is public routing information, so a signature-only answer is adopted for relay
+  // assignment. Joining the fleet still needs the account-derived key, which is a separate step.
+  if (input.fleetId !== null && input.fleetId !== undefined && (typeof answer.fleet_id !== 'string' || answer.fleet_id !== input.fleetId)) {
     return refuse(BOOTSTRAP_REFUSAL.WRONG_FLEET, 'the answer names a different fleet; it is not for this machine');
   }
   const relays = Array.isArray(answer.relays)
@@ -205,9 +223,9 @@ function verifiedSignatureOk(value) {
  */
 export async function resolveBootstrap(deps) {
   const log = deps.log ?? (() => {});
-  const fleetId = fleetIdOf(deps.fleetKey);
-  if (fleetId === null) {
-    return { ok: false, reason_code: BOOTSTRAP_REFUSAL.NO_FLEET_KEY, detail: 'no usable fleet key is configured, so no bootstrap proof can be made' };
+  const fleetId = deps.fleetKey === null || deps.fleetKey === undefined ? null : fleetIdOf(deps.fleetKey);
+  if (deps.fleetKey !== null && deps.fleetKey !== undefined && fleetId === null) {
+    return { ok: false, reason_code: BOOTSTRAP_REFUSAL.NO_FLEET_KEY, detail: 'the configured fleet key is not a 32-byte base64url key' };
   }
   const pinned = readBootstrapCache(deps.cacheFile, { operatorPublicKeyPem: deps.operatorPublicKeyPem, fleetId, nowMs: deps.nowMs });
   if (pinned.ok === true) {
@@ -217,12 +235,10 @@ export async function resolveBootstrap(deps) {
   const fetchImpl = deps.fetchImpl ?? globalThis.fetch;
   const timeoutMs = Number.isInteger(deps.timeoutMs) ? deps.timeoutMs : 4000;
   const nonce = createHash('sha256').update(`${fleetId}:${Date.now()}:${Math.random()}`).digest('hex').slice(0, 32);
-  let proof;
-  try {
-    proof = buildBootstrapProof({ fleetKey: deps.fleetKey, fleetId, nonce });
-  } catch (error) {
-    return { ok: false, reason_code: BOOTSTRAP_REFUSAL.NO_FLEET_KEY, detail: error instanceof Error ? error.message : String(error) };
-  }
+  // v1.5.3: the proof is optional. Without a fleet key the request cannot prove which fleet it is,
+  // but the ANSWER is still verified by signature, expiry and relay shape -- so relay assignment can
+  // be automatic even before an account-derived key is available.
+  const proof = deps.fleetKey === null || deps.fleetKey === undefined ? null : buildBootstrapProof({ fleetKey: deps.fleetKey, fleetId, nonce });
   let answer;
   try {
     const response = await fetchImpl(deps.url, {

package/src/plugin/tools.mjs

@@ -1,3 +1,4 @@
+import { DEFAULT_BOOTSTRAP_URL, DEFAULT_BOOTSTRAP_OPERATOR_KEY_PEM } from './bootstrap.mjs';
 /**
  * DSH: Windows2MacO - the DSH Cordis plugin.
  *
@@ -276,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.5.2';
+const PLUGIN_VERSION = '1.5.4';
 
 /** How long any single HTTP call may take before it is aborted, in milliseconds. */
 const DEFAULT_REQUEST_TIMEOUT_MS = 15_000;
@@ -892,12 +893,14 @@ function readConfig(config = {}) {
       ? config.relayUrls.filter((url) => typeof url === 'string' && url.trim() !== '').map((url) => url.trim().replace(/\/+$/, ''))
       : [],
     relayTemporary: config.relayTemporary === true,
+    // v1.5.3: the operator endpoint and its public pin ship with the package, so a machine whose only
+    // capability is upgrading the plugin still finds its fleet. Explicit config/env still wins.
     bootstrapUrl: typeof config.bootstrapUrl === 'string' && config.bootstrapUrl.trim() !== ''
       ? config.bootstrapUrl.trim()
-      : (typeof process.env.W2M_BOOTSTRAP_URL === 'string' && process.env.W2M_BOOTSTRAP_URL.trim() !== '' ? process.env.W2M_BOOTSTRAP_URL.trim() : null),
+      : (typeof process.env.W2M_BOOTSTRAP_URL === 'string' && process.env.W2M_BOOTSTRAP_URL.trim() !== '' ? process.env.W2M_BOOTSTRAP_URL.trim() : DEFAULT_BOOTSTRAP_URL),
     bootstrapOperatorKeyPem: typeof config.bootstrapOperatorKey === 'string' && config.bootstrapOperatorKey.trim() !== ''
       ? config.bootstrapOperatorKey
-      : (typeof process.env.W2M_BOOTSTRAP_OPERATOR_KEY === 'string' && process.env.W2M_BOOTSTRAP_OPERATOR_KEY.trim() !== '' ? process.env.W2M_BOOTSTRAP_OPERATOR_KEY : null),
+      : (typeof process.env.W2M_BOOTSTRAP_OPERATOR_KEY === 'string' && process.env.W2M_BOOTSTRAP_OPERATOR_KEY.trim() !== '' ? process.env.W2M_BOOTSTRAP_OPERATOR_KEY : DEFAULT_BOOTSTRAP_OPERATOR_KEY_PEM),
     p2pMode,
     stunServers: stunList,
   };
@@ -4950,7 +4953,12 @@ export async function apply(ctx, config = {}) {
   // Optional: bring up relay + agent in this process
   // -------------------------------------------------------------------------------------------
   if (cfg.autoStartAgent) {
-    ctx.effect?.(() => startLocalStack(ctx, cfg));
+    // v1.5.3: a failed auto-start must not surface as an unhandled rejection. The bundled patch now
+  // starts the agent by default, and a host whose plugin wiring forbids that (a restricted test
+  // harness, a missing relay module) would otherwise reject where nothing can catch it.
+  ctx.effect?.(() => startLocalStack(ctx, cfg).catch((error) => {
+    ctx.logger?.warn?.('w2m: auto-start did not complete: ' + (error instanceof Error ? error.message : String(error)));
+  }));
   } else {
     /**
      * v0.8.5: **say it out loud.**
@@ -7377,8 +7385,7 @@ async function startLocalStack(ctx, cfg) {
    * status, because a bootstrap that silently failed is indistinguishable from one never configured.
    */
   if ((Array.isArray(cfg.relayUrls) ? cfg.relayUrls.length : 0) === 0
-    && typeof cfg.bootstrapUrl === 'string' && typeof cfg.bootstrapOperatorKeyPem === 'string'
-    && typeof cfg.fleetKey === 'string') {
+    && typeof cfg.bootstrapUrl === 'string' && typeof cfg.bootstrapOperatorKeyPem === 'string') {
     try {
       const { resolveBootstrap } = await import(new URL('./bootstrap.mjs', import.meta.url).href);
       const { homedir } = await import('node:os');
@@ -7386,14 +7393,22 @@ async function startLocalStack(ctx, cfg) {
       const cacheFile = join(cfg.stateDir ?? join(process.env.DSH_HOME ?? join(homedir(), '.dsh'), 'xclient'), 'bootstrap.json');
       const outcome = await resolveBootstrap({
         url: cfg.bootstrapUrl,
-        fleetKey: cfg.fleetKey,
+        fleetKey: cfg.fleetKey ?? null,
         operatorPublicKeyPem: cfg.bootstrapOperatorKeyPem,
         cacheFile,
         log: (line) => ctx.logger?.info?.(line),
       });
       if (outcome.ok === true) {
         cfg.relayUrls = outcome.relays;
-        if (cfg.rabbitSource === 'shared-default' || !cfg.rabbitUrl) { cfg.rabbitUrl = outcome.relays[0]; cfg.rabbitSource = 'bootstrap'; }
+          const previousRelay = cfg.rabbitUrl; // v1.5.4: capture what a stale profile pinned
+        // v1.5.4: a verified bootstrap answer WINS over a stale explicit rabbitUrl. A field machine
+          // still named 127.0.0.1:8787 (a local relay that is not running), so v1.5.3 adopted the pool but
+          // kept dialing loopback and reported W2M_UNREACHABLE. To pin a relay instead, set relayUrls.
+          cfg.rabbitUrl = outcome.relays[0];
+          cfg.rabbitSource = 'bootstrap';
+          if (typeof previousRelay === 'string' && previousRelay !== outcome.relays[0]) {
+            ctx.logger?.warn?.('w2m: bootstrap replaced the configured relay ' + previousRelay + ' with ' + outcome.relays[0]);
+          }
         cfg.bootstrap = { configured: true, url: cfg.bootstrapUrl, source: outcome.source, relays: outcome.relays, expires_at: outcome.expires_at, last_error: null };
         ctx.logger?.info?.('w2m: bootstrap assigned relays (' + outcome.relays.join(', ') + ')');
       } else {