@twinsearth/w2m-dsh-plugin 1.9.12 → 1.9.15

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.12"
+    "version": "1.9.15"
   },
   "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.12",
+      "version": "1.9.15",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "1.9.12"
+  "version": "1.9.15"
 }

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

package/CHANGELOG.md

@@ -7,6 +7,24 @@
 
 All notable changes to this project are documented here.
 
+## [1.9.15] - 2026-10-28
+
+- G0-1：operator token 安全存储。新增 `~/.w2m/operator-token`（0600，可用 W2M_OPERATOR_TOKEN_FILE 覆盖）与 `w2m-operator` CLI（set 从 stdin/文件读取、status 只显示指纹、clear）；w2m_status 新增 operatorToken_fingerprint/operatorToken_source，token 值不进日志/状态。
+- 解析顺序：profile config（兼容）→ 安全文件（推荐）→ 环境变量（兼容）。
+- 新增 test/operator-token.test.mjs（6 项）。
+
+## [1.9.14] - 2026-10-28
+
+- 修复「立即更新」失败（fetch failed）：GitHub Release 下载被网络阻断时，自动回退到 npm registry 的同一版本 tarball；下载前校验 registry 的 sha512 integrity（缺失时 sha1 shasum），再由现有安装器做 sha256 校验、备份与回滚。
+- 安装器仍走运行时 pnpm（Windows 不再尝试 dsh.cmd）。
+- 更新相关测试 66/66 通过。
+
+## [1.9.13] - 2026-10-28
+
+- 新增操作员联合开发 CLI `w2m-joint`：plan create/list/get、approve（人签、authority≥70、TTL 默认 10 分钟）、status、dispatch --dry-run（打印控制信封，真实发送未接线并返回 DISPATCH_NOT_WIRED）。
+- 该 CLI 是 SOP 的操作员入口：计划先落盘、人工审批、再允许派发；dispatch 真发仍要求 operator token 与 relay 能力广告（下一片）。
+- 端到端本机冒烟：create → approve → status(dispatch_allowed=true) → dispatch --dry-run(2 envelopes)。
+
 ## [1.9.12] - 2026-10-28
 
 - 联合开发安全门（S1/S2 预置）：plan-store 保存与读取都重算 plan_sha256（篡改即 PLAN_TAMPERED）、planSha 强制 64 位十六进制（拒绝路径穿越）、审批绑定 plan_sha/approver/authority/TTL 并重算 approval_sha256（篡改/过期/低权限拒绝）、原子写。

package/bin/w2m-joint.mjs

@@ -0,0 +1,151 @@
+#!/usr/bin/env node
+/**
+ * Operator CLI for joint-dev plans (v2 S2 slice).
+ *
+ * This is the operator side of the SOP, not an agent tool: a plan is created here, approved here by
+ * a human, and only then may a dispatch run. It never talks to a relay in this slice; `dispatch
+ * --dry-run` prints the control envelopes that would be sent. Real dispatch needs the operator token
+ * and the relay capability check, which land in the next slice.
+ *
+ * Usage:
+ *   node bin/w2m-joint.mjs plan create --state <dir> --steps <steps.json> [--base-commit <sha>] [--title <text>]
+ *   node bin/w2m-joint.mjs plan list  --state <dir>
+ *   node bin/w2m-joint.mjs plan get   --state <dir> --plan <sha>
+ *   node bin/w2m-joint.mjs approve    --state <dir> --plan <sha> --approver <name> --authority <n> [--ttl-min <n>] [--note <text>]
+ *   node bin/w2m-joint.mjs status     --state <dir> --plan <sha>
+ *   node bin/w2m-joint.mjs dispatch   --state <dir> --plan <sha> --dry-run
+ *
+ * Exit codes: 0 ok, 1 refusal (named code), 2 usage error.
+ */
+import { readFileSync } from 'node:fs';
+
+import { buildControlEnvelopes, buildPlan } from '../src/plugin/joint-dev/dispatch.mjs';
+import {
+  approvePlan,
+  assertDispatchAllowed,
+  listPlans,
+  loadApproval,
+  loadPlan,
+  savePlan,
+} from '../src/plugin/joint-dev/plan-store.mjs';
+
+function parseArgs(argv) {
+  const out = { _: [] };
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i];
+    if (arg.startsWith('--')) {
+      const key = arg.slice(2);
+      const next = argv[i + 1];
+      if (next !== undefined && !next.startsWith('--')) { out[key] = next; i += 1; }
+      else out[key] = true;
+    } else out._.push(arg);
+  }
+  return out;
+}
+
+const print = (value) => process.stdout.write(JSON.stringify(value, null, 2) + '\n');
+const fail = (code, detail) => { print({ ok: false, code, detail: detail ?? null }); process.exit(1); };
+
+const args = parseArgs(process.argv.slice(2));
+const [command, action] = args._;
+const stateDir = typeof args.state === 'string' ? args.state : (process.env.W2M_JOINT_STATE ?? null);
+if (stateDir === null) fail('STATE_DIR_REQUIRED', 'pass --state <dir> (the joint-dev state directory)');
+
+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) {
+    fail('STEPS_UNREADABLE', error instanceof Error ? error.message : String(error));
+  }
+  if (!Array.isArray(steps)) fail('STEPS_INVALID', 'steps.json must be a JSON array');
+  const built = buildPlan({
+    base_commit: typeof args['base-commit'] === 'string' ? args['base-commit'] : undefined,
+    title: typeof args.title === 'string' ? args.title : undefined,
+    steps,
+  });
+  if (built.ok !== true) fail(built.code ?? 'PLAN_INVALID', built.detail ?? null);
+  const saved = savePlan({ stateDir, plan: built.plan });
+  if (saved.ok !== true) fail(saved.code ?? 'PLAN_SAVE_FAILED', saved.detail ?? null);
+  print({
+    ok: true,
+    plan_sha256: built.plan.plan_sha256,
+    steps: built.plan.steps.length,
+    machines: [...new Set(built.plan.steps.map((step) => step.machine_id))],
+    path: saved.path,
+    reused: saved.reused,
+  });
+  process.exit(0);
+}
+
+if (command === 'plan' && action === 'list') {
+  const listed = listPlans({ stateDir, limit: Number(args.limit) || 50 });
+  if (listed.ok !== true) fail(listed.code ?? 'PLAN_LIST_FAILED');
+  print({ ok: true, total: listed.total, plans: listed.plans });
+  process.exit(0);
+}
+
+if (command === 'plan' && action === 'get') {
+  if (typeof args.plan !== 'string') fail('PLAN_REQUIRED', 'pass --plan <sha256>');
+  const loaded = loadPlan({ stateDir, planSha: args.plan });
+  if (loaded.ok !== true) fail(loaded.code ?? 'PLAN_NOT_FOUND', loaded.detail ?? null);
+  print({ ok: true, plan: loaded.plan, saved_at: loaded.saved_at });
+  process.exit(0);
+}
+
+if (command === 'approve') {
+  if (typeof args.plan !== 'string') fail('PLAN_REQUIRED', 'pass --plan <sha256>');
+  if (typeof args.approver !== 'string') fail('APPROVER_REQUIRED', 'pass --approver <name>');
+  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);
+  const approved = approvePlan({
+    stateDir,
+    planSha: args.plan,
+    approver: args.approver,
+    authority,
+    note: typeof args.note === 'string' ? args.note : '',
+    ttlMs: (Number.isFinite(ttlMin) ? ttlMin : 10) * 60_000,
+  });
+  if (approved.ok !== true) fail(approved.code ?? 'APPROVAL_FAILED', approved.detail ?? null);
+  print({ ok: true, approval: approved.approval, path: approved.path });
+  process.exit(0);
+}
+
+if (command === 'status') {
+  if (typeof args.plan !== 'string') fail('PLAN_REQUIRED', 'pass --plan <sha256>');
+  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 });
+  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 },
+    dispatch_allowed: gate.ok === true,
+    blocked_by: gate.ok === true ? null : gate.code,
+  });
+  process.exit(0);
+}
+
+if (command === 'dispatch') {
+  if (typeof args.plan !== 'string') fail('PLAN_REQUIRED', 'pass --plan <sha256>');
+  const gate = assertDispatchAllowed({ stateDir, planSha: args.plan });
+  if (gate.ok !== true) fail(gate.code ?? 'APPROVAL_REQUIRED', 'dispatch refused before anything was sent');
+  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');
+  }
+  const envelopes = buildControlEnvelopes(gate.plan);
+  print({
+    ok: true,
+    dry_run: true,
+    plan_sha256: gate.plan.plan_sha256,
+    approval_sha256: gate.approval.approval_sha256,
+    envelopes: envelopes.length,
+    control: envelopes.map((envelope) => ({ type: envelope.type, body: envelope.body })),
+  });
+  process.exit(0);
+}
+
+process.stderr.write('usage: node bin/w2m-joint.mjs <plan create|list|get|approve|status|dispatch> [options]\n');
+process.exit(2);

package/bin/w2m-operator.mjs

@@ -0,0 +1,73 @@
+#!/usr/bin/env node
+/**
+ * Operator token CLI (v2 G0-1).
+ *
+ * The token is read from stdin, never from argv, and stored in a 0600 file. Output is JSON with a
+ * fingerprint and the file path only — the value is never printed back.
+ *
+ * Usage:
+ *   echo <token> | node bin/w2m-operator.mjs set
+ *   node bin/w2m-operator.mjs set --file <path>     (reads the file, still never echoes it)
+ *   node bin/w2m-operator.mjs status
+ *   node bin/w2m-operator.mjs clear
+ *
+ * Exit codes: 0 ok, 1 refusal, 2 usage.
+ */
+import { readFileSync } from 'node:fs';
+
+import {
+  clearOperatorToken,
+  fingerprintOf,
+  operatorTokenPath,
+  readOperatorToken,
+  writeOperatorToken,
+} from '../src/plugin/operator-token.mjs';
+
+const args = process.argv.slice(2);
+const command = args[0];
+const flag = (name) => {
+  const index = args.indexOf(name);
+  return index >= 0 ? args[index + 1] : undefined;
+};
+const print = (value) => process.stdout.write(JSON.stringify(value, null, 2) + '\n');
+
+async function readStdin() {
+  const chunks = [];
+  for await (const chunk of process.stdin) chunks.push(chunk);
+  return Buffer.concat(chunks).toString('utf8');
+}
+
+if (command === 'set') {
+  const file = flag('--file');
+  let token;
+  try { token = file !== undefined ? readFileSync(file, 'utf8') : await readStdin(); } catch (error) {
+    print({ ok: false, code: 'TOKEN_READ_FAILED', error: error instanceof Error ? error.message : String(error) });
+    process.exit(1);
+  }
+  const written = writeOperatorToken(token);
+  if (written.ok !== true) {
+    print({ ok: false, code: written.code, detail: written.detail ?? null });
+    process.exit(1);
+  }
+  print({ ok: true, path: written.path, fingerprint: written.fingerprint, source: 'file' });
+  process.exit(0);
+}
+
+if (command === 'status') {
+  const read = readOperatorToken();
+  if (read.configured !== true) {
+    print({ ok: true, configured: false, path: read.path, error: read.error ?? null });
+    process.exit(0);
+  }
+  print({ ok: true, configured: true, path: read.path, fingerprint: fingerprintOf(read.token) });
+  process.exit(0);
+}
+
+if (command === 'clear') {
+  const cleared = clearOperatorToken();
+  print({ ok: cleared.ok === true, path: cleared.path, code: cleared.code ?? null });
+  process.exit(cleared.ok === true ? 0 : 1);
+}
+
+print({ ok: false, code: 'USAGE', path: operatorTokenPath(), usage: 'set [--file <path>] | status | clear' });
+process.exit(2);

package/codex/mcp-servers.toml

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

package/docs/acceptance/1.9.13/RELEASE-1913.json

@@ -0,0 +1,20 @@
+{
+  "version": "1.9.13",
+  "case": "RELEASE-1913",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T00:31:27.437Z",
+  "executor": "lead",
+  "task_id": "pre-release-1913-1793147487438",
+  "requirement": "V1.9.13：操作员联合开发 CLI（计划/审批/状态/派发 dry-run）",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "cli": "w2m-joint plan create/list/get, approve, status, dispatch --dry-run",
+      "smoke": "create -> approve(authority 80, TTL 10m) -> status dispatch_allowed=true -> dry-run 2 envelopes",
+      "limits": "real dispatch returns DISPATCH_NOT_WIRED until operator token + relay capability slice"
+    }
+  }
+}

package/docs/acceptance/1.9.14/RELEASE-1914.json

@@ -0,0 +1,20 @@
+{
+  "version": "1.9.14",
+  "case": "RELEASE-1914",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T00:46:07.739Z",
+  "executor": "lead",
+  "task_id": "pre-release-1914-1793148367740",
+  "requirement": "V1.9.14：立即更新 fetch failed 的 npm 回退",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "npm_fallback": "fetchNpmTarball verifies registry integrity then installs",
+      "route": "update-route falls back when GitHub install is not installed",
+      "tests": "npm-update/update-wiring/update-install 66/66"
+    }
+  }
+}

package/docs/acceptance/1.9.15/RELEASE-1915.json

@@ -0,0 +1,22 @@
+{
+  "version": "1.9.15",
+  "case": "RELEASE-1915",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T01:02:47.935Z",
+  "executor": "lead",
+  "task_id": "pre-release-1915-1793149367936",
+  "requirement": "V1.9.15：G0-1 operator token 安全存储与指纹状态",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "storage": "~/.w2m/operator-token 0600 or W2M_OPERATOR_TOKEN_FILE",
+      "cli": "set/status/clear, stdin only, fingerprint only",
+      "order": "config -> file -> env",
+      "status": "operatorToken_fingerprint/operatorToken_source, never value",
+      "tests": "operator-token 6/6"
+    }
+  }
+}