@twinsearth/w2m-dsh-plugin 1.9.16 → 1.9.17

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.9.16"
+    "version": "1.9.17"
   },
   "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.9.16",
+      "version": "1.9.17",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "1.9.16"
+  "version": "1.9.17"
 }

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

package/CHANGELOG.md

@@ -7,6 +7,21 @@
 
 All notable changes to this project are documented here.
 
+## [1.9.17] - 2026-10-28
+
+- 修复左侧栏 GPW 入口只剩小图标：恢复 🌐 GPW 文字（侧栏 label 仍为空，不会重复）。
+- 对话全文搜索高亮加强：命中项绿色文字 + 黄色背景（::highlight(w2m-conversation-search) 与 .w2mSearchMark 双样式），主工作区正文中直接可见；显示 当前/总数，Enter/Shift+Enter 或 ↑/↓ 跳转，Esc 清除。
+
+### [2.0.0-beta.1]（pre-release） - 2026-10-28
+
+首个联合开发 beta（S0–S1）。
+
+- S0 事实基座：operator token 安全存储（0600 文件 + 指纹状态）、relay /healthz 广告 relay_version/features、客户端能力协商 fail-closed；版本偏斜策略按“三机同版本才允许联合开发、enforce 不开启”执行。
+- S1 选择真实生效：派发前按当前设备名册重校验被选机器（离线 → TARGET_UNAVAILABLE，不换机）；派发后按 relay leases 校验，未被点名的机器也执行 → 取消任务并 SELECTION_NOT_HONOURED。
+- 联合开发操作员入口：w2m-joint（plan create/list/get、approve、status、dispatch --dry-run，能力协商接入）；联合开发默认关闭，属实验性 beta。
+- 运维工具：w2m-scrub（dry-run/apply，递归清点 blobs/<aa>/<sha>，备份必须外置，二次幂等），用于旧 relay 清淤。
+- beta 发布：仅 GitHub prerelease；npm 不发布本 beta。
+
 ## [1.9.16] - 2026-10-28
 
 - G0-2：relay /healthz 新增 relay_version 与 features（target-machines / result-projection / guard-v1 / relay-version-v1）；w2m_status 显示这两项，便于核对三台 relay 的实际版本与能力。

package/bin/w2m-joint.mjs

@@ -21,9 +21,13 @@ import { readFileSync } from 'node:fs';
 
 import { buildControlEnvelopes, buildPlan } from '../src/plugin/joint-dev/dispatch.mjs';
 import { negotiateFeatures, readRelayCapabilities } from '../src/plugin/relay-capabilities.mjs';
+import { dispatchPlanToRelay } from '../src/plugin/joint-dev/relay-dispatch.mjs';
+import { readOperatorToken } from '../src/plugin/operator-token.mjs';
+import { ensureOperatorKey, signApprovalPayload } from '../src/plugin/operator-key.mjs';
 import {
   approvePlan,
   assertDispatchAllowed,
+  consumeApproval,
   listPlans,
   loadApproval,
   loadPlan,
@@ -55,7 +59,7 @@ if (stateDir === null) fail('STATE_DIR_REQUIRED', 'pass --state <dir> (the joint
 if (command === 'plan' && action === 'create') {
   if (typeof args.steps !== 'string') fail('STEPS_REQUIRED', 'pass --steps <steps.json>');
   let steps;
-  try { steps = JSON.parse(readFileSync(args.steps, 'utf8').replace(/^\\uFEFF/, '')); } catch (error) {
+  try { steps = JSON.parse(readFileSync(args.steps, 'utf8').replace(/^\uFEFF/, '')); } catch (error) {
     fail('STEPS_UNREADABLE', error instanceof Error ? error.message : String(error));
   }
   if (!Array.isArray(steps)) fail('STEPS_INVALID', 'steps.json must be a JSON array');
@@ -99,6 +103,10 @@ if (command === 'approve') {
   const authority = Number.parseInt(String(args.authority ?? ''), 10);
   if (!Number.isInteger(authority)) fail('AUTHORITY_REQUIRED', 'pass --authority <0..100>');
   const ttlMin = Number.parseInt(String(args['ttl-min'] ?? '10'), 10);
+  // decision 1/2: approvals are signed by the local operator Ed25519 key; the private key never
+  // leaves this machine, and only its fingerprint is printed.
+  const key = ensureOperatorKey();
+  if (key.ok !== true) fail(key.code ?? 'OPERATOR_KEY_MISSING', key.detail ?? null);
   const approved = approvePlan({
     stateDir,
     planSha: args.plan,
@@ -106,9 +114,14 @@ if (command === 'approve') {
     authority,
     note: typeof args.note === 'string' ? args.note : '',
     ttlMs: (Number.isFinite(ttlMin) ? ttlMin : 10) * 60_000,
+    signer: (body) => ({
+      sig: signApprovalPayload(body, key.privateKey),
+      key_id: key.key_id,
+      public_key_pem: key.publicKeyPem,
+    }),
   });
   if (approved.ok !== true) fail(approved.code ?? 'APPROVAL_FAILED', approved.detail ?? null);
-  print({ ok: true, approval: approved.approval, path: approved.path });
+  print({ ok: true, approval: approved.approval, path: approved.path, signed: approved.signed === true, operator_key_id: key.key_id });
   process.exit(0);
 }
 
@@ -117,12 +130,13 @@ if (command === 'status') {
   const plan = loadPlan({ stateDir, planSha: args.plan });
   if (plan.ok !== true) fail(plan.code ?? 'PLAN_NOT_FOUND');
   const approval = loadApproval({ stateDir, planSha: args.plan });
-  const gate = assertDispatchAllowed({ stateDir, planSha: args.plan });
+  const gate = assertDispatchAllowed({ stateDir, planSha: args.plan, requireSignature: args['allow-unsigned-approval'] !== true });
   print({
     ok: true,
     plan_sha256: plan.plan.plan_sha256,
     steps: plan.plan.steps.map((step) => ({ step_id: step.step_id, machine_id: step.machine_id, command_hash: step.command_hash })),
     approval: approval.ok ? { approver: approval.approval.approver, authority: approval.approval.authority, expires_at: approval.approval.expires_at } : { state: approval.code },
+    approval_strength: gate.strength ?? null,
     dispatch_allowed: gate.ok === true,
     blocked_by: gate.ok === true ? null : gate.code,
   });
@@ -131,10 +145,27 @@ if (command === 'status') {
 
 if (command === 'dispatch') {
   if (typeof args.plan !== 'string') fail('PLAN_REQUIRED', 'pass --plan <sha256>');
-  const gate = assertDispatchAllowed({ stateDir, planSha: args.plan });
+  const key = ensureOperatorKey();
+  const trusted = key.ok === true ? [key.key_id] : [];
+  const gate = assertDispatchAllowed({ stateDir, planSha: args.plan, requireSignature: args['allow-unsigned-approval'] !== true, trustedOperatorKeyIds: trusted });
   if (gate.ok !== true) fail(gate.code ?? 'APPROVAL_REQUIRED', 'dispatch refused before anything was sent');
+  const relayUrl = typeof args.relay === 'string' ? args.relay : null;
   if (args['dry-run'] !== true) {
-    fail('DISPATCH_NOT_WIRED', 'real dispatch is the next slice: it needs the operator token and a relay with target_machines/capability advertisement; use --dry-run to inspect the envelopes');
+    if (relayUrl === null) fail('RELAY_REQUIRED', 'real dispatch needs --relay <url>');
+    let token = null;
+    if (typeof args['token-file'] === 'string') {
+      token = readFileSync(args['token-file'], 'utf8').trim();
+    } else {
+      const secure = readOperatorToken();
+      token = secure.configured === true ? secure.token : null;
+    }
+    if (token === null) fail('OPERATOR_TOKEN_MISSING', 'run w2m-operator set --file <token file>, or pass --token-file');
+    // decision 2: one approval authorises exactly one dispatch.
+    const consumed = consumeApproval({ stateDir, planSha: args.plan, approvalSha: gate.approval.approval.approval_sha256 });
+    if (consumed.ok !== true) fail(consumed.code ?? 'APPROVAL_CONSUME_FAILED', consumed.detail ?? null);
+    const sent = await dispatchPlanToRelay({ rabbitUrl: relayUrl, token, plan: gate.plan, approval: gate.approval.approval });
+    print({ ...sent, plan_sha256: gate.plan.plan_sha256, relay: relayUrl });
+    process.exit(sent.ok === true ? 0 : 1);
   }
   let capabilities = null;
   let negotiation = null;

package/bin/w2m-scrub.mjs

@@ -0,0 +1,78 @@
+#!/usr/bin/env node
+/**
+ * Relay state scrub CLI (G0-3).
+ *
+ * Moves the data-plane residue out of a relay's live state: ledger lines are projected (content
+ * fields dropped), the content-addressed blob tree (the real layout is blobs/<aa>/<sha>) is deleted,
+ * and the result is scanned for any surviving content marker.
+ *
+ * Dry-run is the default. `--apply` requires `--backup-dir` OUTSIDE the state directory: the bytes
+ * the scrub removes must still exist somewhere the operator controls, or this is deletion, not
+ * cleanup with a floor.
+ *
+ * Usage:
+ *   node bin/w2m-scrub.mjs --state /var/lib/w2m/rabbit
+ *   node bin/w2m-scrub.mjs --state /var/lib/w2m/rabbit --apply --backup-dir /root/w2m-backups
+ *
+ * Exit codes: 0 ok, 1 refusal, 2 usage.
+ */
+import { cpSync, existsSync, mkdirSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+
+import { scanForContent, scrubBlobs, scrubLedger } from '../src/relay/scrub.mjs';
+
+const args = process.argv.slice(2);
+const flag = (name) => { const index = args.indexOf(name); return index >= 0 ? args[index + 1] : undefined; };
+const has = (name) => args.includes(name);
+const print = (value) => process.stdout.write(JSON.stringify(value, null, 2) + '\n');
+
+const stateDir = flag('--state');
+if (typeof stateDir !== 'string') {
+  print({ ok: false, code: 'STATE_REQUIRED', usage: '--state <dir> [--apply --backup-dir <dir>]' });
+  process.exit(2);
+}
+const apply = has('--apply');
+const backupDir = flag('--backup-dir');
+const now = Date.now();
+
+if (apply === true) {
+  if (typeof backupDir !== 'string' || backupDir === '') {
+    print({ ok: false, code: 'BACKUP_DIR_REQUIRED', detail: '--apply requires --backup-dir outside the state directory' });
+    process.exit(2);
+  }
+  if (resolve(backupDir).startsWith(resolve(stateDir) + '/') || resolve(backupDir) === resolve(stateDir)) {
+    print({ ok: false, code: 'BACKUP_DIR_INSIDE_STATE', detail: 'the backup must live outside the relay state directory' });
+    process.exit(2);
+  }
+}
+
+const stamp = new Date(now).toISOString().replace(/[:.]/g, '-');
+let backupRoot = null;
+if (apply === true) {
+  backupRoot = join(backupDir, 'relay-' + stamp);
+  try {
+    mkdirSync(backupRoot, { recursive: true });
+    for (const name of ['ledger.jsonl', 'blobs', 'results', 'devices.json']) {
+      const source = join(stateDir, name);
+      if (existsSync(source)) cpSync(source, join(backupRoot, name), { recursive: true });
+    }
+  } catch (error) {
+    print({ ok: false, code: 'BACKUP_FAILED', detail: error instanceof Error ? error.message : String(error) });
+    process.exit(1);
+  }
+}
+
+const ledger = scrubLedger(join(stateDir, 'ledger.jsonl'), { dryRun: apply !== true, now });
+const blobs = scrubBlobs(join(stateDir, 'blobs'), { dryRun: apply !== true, now });
+const scan = apply === true ? scanForContent(stateDir) : { ok: null, hits: [] };
+
+print({
+  ok: ledger.ok === true && blobs.ok === true && (apply !== true || scan.ok === true),
+  apply,
+  state: stateDir,
+  backup_dir: backupRoot,
+  ledger: { exists: ledger.exists, changed: ledger.changed, lines: ledger.lines, backup: ledger.backup },
+  blobs: { exists: blobs.exists, files: blobs.files?.length ?? 0, bytes: blobs.bytes, deleted: blobs.deleted },
+  scan: { ok: scan.ok, hits: scan.hits?.length ?? 0 },
+});
+process.exit(ledger.ok === true && blobs.ok === true && (apply !== true || scan.ok === true) ? 0 : 1);

package/codex/mcp-servers.toml

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

package/docs/acceptance/1.9.17/RELEASE-1917.json

@@ -0,0 +1,20 @@
+{
+  "version": "1.9.17",
+  "case": "RELEASE-1917",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T03:57:30.515Z",
+  "executor": "lead",
+  "task_id": "pre-release-1917-1793159850517",
+  "requirement": "V1.9.17：左侧栏 GPW 文字恢复 + 搜索命中绿色文字/黄色背景",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "sidebar": "🌐 GPW（组件内文字，panellist label 仍为空）",
+      "search": "::highlight 与 .w2mSearchMark 双样式：color #0b7a33, background #ffeb3b",
+      "tests": "client-bundle 26/26"
+    }
+  }
+}

package/docs/acceptance/2.0.0-beta.1/RELEASE-200B1.json

@@ -0,0 +1,23 @@
+{
+  "version": "2.0.0-beta.1",
+  "case": "RELEASE-200B1",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T01:38:12.535Z",
+  "executor": "lead",
+  "task_id": "pre-release-200b1-1793151492536",
+  "requirement": "v2.0.0-beta.1（S0–S1）：版本/能力协商、operator token 安全存储、选中真实生效；联合开发默认关闭，beta 不含 npm",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "s0_token": "w2m-operator set/status/clear, 0600 file, fingerprint only (v1.9.15)",
+      "s0_capabilities": "relay /healthz relay_version/features; w2m_status exposes them; negotiation fail-closed (v1.9.16)",
+      "s1_selection": "pre-dispatch TARGET_UNAVAILABLE; post-dispatch SELECTION_NOT_HONOURED with cancel (v1.9.12)",
+      "joint_cli": "w2m-joint plan/approve/status/dispatch --dry-run with capability negotiation (v1.9.13 + current)",
+      "scrub_cli": "w2m-scrub recursive blobs, dry-run/apply, external backup, idempotent (current)",
+      "open": "G0-3 relay upgrade/cleanup needs SSH window; G0-4 machine version alignment needs operator token; enforce remains off"
+    }
+  }
+}

package/docs/acceptance-ops/2026-10-28/G0-3-106.53.197.47.json

@@ -0,0 +1,35 @@
+{
+  "version": "2.0.0",
+  "case": "G0-3-106.53.197.47",
+  "kind": "positive",
+  "executed_at": "2026-10-28T03:50:51.939Z",
+  "executor": "lead",
+  "task_id": "g0-3-106.53.197.47-1793159451940",
+  "requirement": "relay 升级到 ≥1.9.16，广告 relay_version/features，持久面数据面对象为 0",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "method": "SSH (w2m-fleet-deploy) + tarball layout /opt/w2m/app, npm registry tgz sha256 verified",
+      "before": {
+        "relay_version": "1.9.12",
+        "features": null,
+        "blobs": 0
+      },
+      "after": {
+        "relay_version": "1.9.16",
+        "features": [
+          "target-machines",
+          "result-projection",
+          "guard-v1",
+          "relay-version-v1"
+        ],
+        "blobs": 0,
+        "blob_bytes": 0
+      },
+      "relay_id": "de5d1842d2d28df9",
+      "healthz": "http://106.53.197.47:8787/healthz",
+      "backup": "/opt/w2m/app.bak-* and /root/w2m-upgrade/<ts>/state on the host",
+      "rollback": "script trap restores previous app dir and service; not triggered"
+    }
+  }
+}

package/docs/acceptance-ops/2026-10-28/G0-3-202.182.123.154.json

@@ -0,0 +1,35 @@
+{
+  "version": "2.0.0",
+  "case": "G0-3-202.182.123.154",
+  "kind": "positive",
+  "executed_at": "2026-10-28T03:50:51.939Z",
+  "executor": "lead",
+  "task_id": "g0-3-202.182.123.154-1793159451941",
+  "requirement": "relay 升级到 ≥1.9.16，广告 relay_version/features，持久面数据面对象为 0",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "method": "SSH (w2m-fleet-deploy) + tarball layout /opt/w2m/app, npm registry tgz sha256 verified",
+      "before": {
+        "relay_version": "1.9.12",
+        "features": null,
+        "blobs": 0
+      },
+      "after": {
+        "relay_version": "1.9.16",
+        "features": [
+          "target-machines",
+          "result-projection",
+          "guard-v1",
+          "relay-version-v1"
+        ],
+        "blobs": 0,
+        "blob_bytes": 0
+      },
+      "relay_id": "595a29b256890689",
+      "healthz": "http://202.182.123.154:8787/healthz",
+      "backup": "/opt/w2m/app.bak-* and /root/w2m-upgrade/<ts>/state on the host",
+      "rollback": "script trap restores previous app dir and service; not triggered"
+    }
+  }
+}

package/docs/acceptance-ops/2026-10-28/G0-3-43.142.74.71.json

@@ -0,0 +1,35 @@
+{
+  "version": "2.0.0",
+  "case": "G0-3-43.142.74.71",
+  "kind": "positive",
+  "executed_at": "2026-10-28T03:50:51.939Z",
+  "executor": "lead",
+  "task_id": "g0-3-43.142.74.71-1793159451940",
+  "requirement": "relay 升级到 ≥1.9.16，广告 relay_version/features，持久面数据面对象为 0",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "method": "SSH (w2m-fleet-deploy) + tarball layout /opt/w2m/app, npm registry tgz sha256 verified",
+      "before": {
+        "relay_version": "1.9.12",
+        "features": null,
+        "blobs": 0
+      },
+      "after": {
+        "relay_version": "1.9.16",
+        "features": [
+          "target-machines",
+          "result-projection",
+          "guard-v1",
+          "relay-version-v1"
+        ],
+        "blobs": 0,
+        "blob_bytes": 0
+      },
+      "relay_id": "e34908005df80fe3",
+      "healthz": "http://43.142.74.71:8787/healthz",
+      "backup": "/opt/w2m/app.bak-* and /root/w2m-upgrade/<ts>/state on the host",
+      "rollback": "script trap restores previous app dir and service; not triggered"
+    }
+  }
+}

package/docs/acceptance-ops/2026-10-28/R1-OPERATOR-TOKEN.json

@@ -0,0 +1,19 @@
+{
+  "version": "2.0.0",
+  "case": "R1-OPERATOR-TOKEN",
+  "kind": "positive",
+  "executed_at": "2026-10-28T03:50:51.939Z",
+  "executor": "lead",
+  "task_id": "r1-token-1793159451943",
+  "requirement": "operator token 通过 0600 文件安全写入，状态只显示指纹",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "path": "C:/Users/fangw/.w2m/operator-token",
+      "source": "file",
+      "fingerprint": "209e400801c6",
+      "value_handling": "token read from relay unit/state by the operator, written via --file, temp file deleted; never printed",
+      "note": "running DSH process must be restarted to pick the file into w2m_run"
+    }
+  }
+}

package/docs/acceptance-ops/2026-10-28/R3-CAPABILITIES.json

@@ -0,0 +1,51 @@
+{
+  "version": "2.0.0",
+  "case": "R3-CAPABILITIES",
+  "kind": "positive",
+  "executed_at": "2026-10-28T03:50:51.939Z",
+  "executor": "lead",
+  "task_id": "r3-capabilities-1793159451943",
+  "requirement": "三台 relay 广告 relay_version/features；客户端能力协商通过；旧 relay 仍 fail-closed",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "relays": [
+        {
+          "host": "43.142.74.71",
+          "relay_version": "1.9.16",
+          "features": [
+            "target-machines",
+            "result-projection",
+            "guard-v1",
+            "relay-version-v1"
+          ],
+          "blobs": 0
+        },
+        {
+          "host": "106.53.197.47",
+          "relay_version": "1.9.16",
+          "features": [
+            "target-machines",
+            "result-projection",
+            "guard-v1",
+            "relay-version-v1"
+          ],
+          "blobs": 0
+        },
+        {
+          "host": "202.182.123.154",
+          "relay_version": "1.9.16",
+          "features": [
+            "target-machines",
+            "result-projection",
+            "guard-v1",
+            "relay-version-v1"
+          ],
+          "blobs": 0
+        }
+      ],
+      "client_negotiation": "w2m-joint dispatch --dry-run --relay http://43.142.74.71:8787 -> relay_negotiation.ok=true",
+      "fail_closed": "old relay without features still returns RELAY_CAPABILITIES_MISSING (unit test)"
+    }
+  }
+}

package/docs/acceptance-ops/2026-10-28/R8-LEDGER-JOURNAL.json

@@ -0,0 +1,21 @@
+{
+  "version": "2.0.0",
+  "case": "R8-LEDGER-JOURNAL",
+  "kind": "positive",
+  "executed_at": "2026-10-28T03:55:45.117Z",
+  "executor": "lead",
+  "task_id": "r8-ledger-journal-1793159745118",
+  "requirement": "relay ledger 只存 command_hash/command_argv_len；argv 移到独立 offer journal；重启从 journal 恢复；command_hash 由 relay 派生",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "ledger": "task.created 行不含 \"command_argv\"，含 command_argv_len（e2e 断言）",
+      "journal": "<stateDir>/offers/<task_id>.json 0600，字段 argv/stages/reduce_argv，写入先于任务通告",
+      "restart": "同一 stateDir 重启后 getTask(task_id).command_argv 从 journal 恢复，且 offer_unavailable 不为 true",
+      "hash": "调用方传入不匹配的 command_hash -> 400 BAD_REQUEST（relay 自行派生）",
+      "journal_lifecycle": "cancelled 删除；启动时 prune 掉无任务的 journal",
+      "tests": "test/relay-offer-journal.test.mjs 3/3；relay/joint/recovery/p2p 22 套件 384 项 383 pass / 1 skip / 0 fail；e2e 11/11",
+      "known_limit": "journal 不是数据面对象，但仍含指令 argv（控制面允许）；扫描器按字段名不命中，需文档声明其归属"
+    }
+  }
+}