@twinsearth/w2m-dsh-plugin 2.0.3 → 2.0.5

package/bin/w2m-joint.mjs

@@ -17,9 +17,15 @@
  *
  * Exit codes: 0 ok, 1 refusal (named code), 2 usage error.
  */
-import { readFileSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
+
+import { deviceFilePath } from '../src/agent/identity.mjs';
+import { resolveStateDir } from '../src/util/cli.mjs';
 
 import { buildControlEnvelopes, buildPlan } from '../src/plugin/joint-dev/dispatch.mjs';
+import { abortMerge, advanceTarget, mergePatches } from '../src/plugin/joint-dev/merge-engine.mjs';
+import { consumeMergeApproval, createMergeApproval, loadMergeApproval } from '../src/plugin/joint-dev/merge-approval.mjs';
+import { resolve as resolvePath } from 'node:path';
 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';
@@ -53,8 +59,8 @@ const fail = (code, detail) => { print({ ok: false, code, detail: detail ?? null
 
 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 (args['allow-unsigned-approval'] === true) fail('UNKNOWN_FLAG', '--allow-unsigned-approval was removed: joint approvals must be signed');
+const stateDir = resolveStateDir(typeof args.state === 'string' ? args.state : (process.env.W2M_JOINT_STATE ?? null), 'joint-dev');
 
 if (command === 'plan' && action === 'create') {
   if (typeof args.steps !== 'string') fail('STEPS_REQUIRED', 'pass --steps <steps.json>');
@@ -130,7 +136,7 @@ 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, requireSignature: args['allow-unsigned-approval'] !== true });
+  const gate = assertDispatchAllowed({ stateDir, planSha: args.plan, requireSignature: true });
   print({
     ok: true,
     plan_sha256: plan.plan.plan_sha256,
@@ -147,7 +153,7 @@ if (command === 'dispatch') {
   if (typeof args.plan !== 'string') fail('PLAN_REQUIRED', 'pass --plan <sha256>');
   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 });
+  const gate = assertDispatchAllowed({ stateDir, planSha: args.plan, requireSignature: 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) {
@@ -161,9 +167,23 @@ if (command === 'dispatch') {
     }
     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 });
+    const consumed = consumeApproval({ stateDir, planSha: args.plan, approvalSha: gate.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, auditFile: stateDir + '/joint-dev/audit.jsonl' });
+      // D2/B5: the gate is on by default in warn mode; enforce is explicit.
+      let deviceToken = '';
+      if (typeof args['device-token-file'] === 'string') {
+        deviceToken = readFileSync(args['device-token-file'], 'utf8').trim();
+      } else {
+        try {
+          const file = deviceFilePath({});
+          if (existsSync(file)) deviceToken = String(JSON.parse(readFileSync(file, 'utf8')).device_token ?? '');
+        } catch { deviceToken = ''; }
+      }
+      const expectedVersion = typeof args['expect-version'] === 'string' && args['expect-version'] !== ''
+        ? args['expect-version']
+        : JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
+      const versionGate = args['version-gate'] === 'off' || args['version-gate'] === 'enforce' ? args['version-gate'] : 'warn';
+      const sent = await dispatchPlanToRelay({ rabbitUrl: relayUrl, token, plan: gate.plan, approval: gate.approval, auditFile: stateDir + '/joint-dev/audit.jsonl', dispatchDir: stateDir + '/joint-dev/dispatches', deviceToken, expectedVersion, versionGate });
     print({ ...sent, plan_sha256: gate.plan.plan_sha256, relay: relayUrl });
     process.exit(sent.ok === true ? 0 : 1);
   }
@@ -183,6 +203,7 @@ if (command === 'dispatch') {
     relay: typeof args.relay === 'string' ? args.relay : null,
     relay_capabilities: capabilities === null ? null : { relay_version: capabilities.relay_version, features: capabilities.features },
     relay_negotiation: negotiation,
+    version_gate: args['version-gate'] === 'off' || args['version-gate'] === 'enforce' ? args['version-gate'] : 'warn',
     plan_sha256: gate.plan.plan_sha256,
     approval_sha256: gate.approval.approval_sha256,
     envelopes: envelopes.length,
@@ -191,5 +212,46 @@ if (command === 'dispatch') {
   process.exit(0);
 }
 
+if (command === 'merge') {
+  const repo = typeof args.repo === 'string' ? resolvePath(args.repo) : null;
+  const baseCommit = typeof args.base === 'string' ? args.base : null;
+  const targetRef = typeof args['target-ref'] === 'string' ? args['target-ref'] : null;
+  const expectedOld = typeof args['expected-old'] === 'string' ? args['expected-old'] : null;
+  if (repo === null || baseCommit === null || targetRef === null || expectedOld === null) {
+    fail('MERGE_ARGS_REQUIRED', 'merge needs --repo --base --target-ref --expected-old');
+  }
+  if (action === 'approve') {
+    if (typeof args.head !== 'string' || typeof args.approver !== 'string') fail('MERGE_APPROVER_REQUIRED', 'merge approve needs --head <sha> --approver <name> --authority <70..100>');
+    const authority = Number.parseInt(String(args.authority ?? ''), 10);
+    if (!Number.isInteger(authority)) fail('AUTHORITY_REQUIRED', 'pass --authority <70..100>');
+    const ttlMin = Number.parseInt(String(args['ttl-min'] ?? '10'), 10);
+    const created = createMergeApproval({ stateDir, planSha: typeof args.plan === 'string' ? args.plan : null, repo, baseCommit, targetRef, expectedOld, integrationHead: args.head, approver: args.approver, authority, ttlMs: (Number.isFinite(ttlMin) ? ttlMin : 10) * 60_000 });
+    if (created.ok !== true) fail(created.code ?? 'MERGE_APPROVAL_FAILED', created.detail ?? null);
+    print({ ok: true, approval_sha256: created.approval_sha256, approval: created.approval });
+    process.exit(0);
+  }
+  if (typeof args.patches !== 'string') fail('MERGE_PATCHES_REQUIRED', 'pass --patches <manifest.json>');
+  let patches = null;
+  try { patches = JSON.parse(readFileSync(args.patches, 'utf8').replace(/^\uFEFF/, '')); } catch (error) { fail('MERGE_PATCHES_UNREADABLE', error instanceof Error ? error.message : String(error)); }
+  if (!Array.isArray(patches) || patches.length === 0) fail('MERGE_PATCHES_INVALID', 'manifest must be a non-empty JSON array of {step_id, patch}');
+  const merged = mergePatches({ repoDir: repo, baseCommit, patches });
+  if (merged.ok !== true) fail(merged.code ?? 'MERGE_FAILED', merged.detail ?? null);
+  const dryRun = args.apply !== true;
+  print({ ok: true, dry_run: dryRun, integration_head: merged.integration_head, applied: merged.applied, target_ref: targetRef, expected_old: expectedOld });
+  if (dryRun) { abortMerge({ repoDir: repo, worktree: merged.worktree }); process.exit(0); }
+  if (typeof args.approval !== 'string') { abortMerge({ repoDir: repo, worktree: merged.worktree }); fail('MERGE_APPROVAL_REQUIRED', '--apply needs --approval <merge_approval_sha256>'); }
+  const gate = loadMergeApproval({ stateDir, approvalSha: args.approval, repo, baseCommit, targetRef, expectedOld, integrationHead: merged.integration_head, planSha: typeof args.plan === 'string' ? args.plan : null });
+  if (gate.ok !== true) { abortMerge({ repoDir: repo, worktree: merged.worktree }); fail(gate.code ?? 'MERGE_APPROVAL_INVALID', gate.detail ?? null); }
+  const consumed = consumeMergeApproval({ stateDir, approvalSha: args.approval });
+  if (consumed.ok !== true) { abortMerge({ repoDir: repo, worktree: merged.worktree }); fail(consumed.code ?? 'MERGE_APPROVAL_CONSUME_FAILED', consumed.detail ?? null); }
+  const stamp = new Date().toISOString().replace(/[^0-9]/g, '').slice(0, 14);
+  const rollbackRef = 'refs/w2m/rollback/' + (typeof args.plan === 'string' ? args.plan.slice(0, 12) : 'plan') + '-' + stamp;
+  const advanced = advanceTarget({ repoDir: repo, targetRef, expectedOld, newCommit: merged.integration_head, rollbackRef });
+  abortMerge({ repoDir: repo, worktree: merged.worktree });
+  if (advanced.ok !== true) fail(advanced.code ?? 'MERGE_CAS_FAILED', advanced.detail ?? null);
+  print({ ok: true, dry_run: false, integration_head: merged.integration_head, target_ref: targetRef, rollback_ref: rollbackRef });
+  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/codex/mcp-servers.toml

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

package/docs/acceptance/2.0.4/RELEASE-2040.json

@@ -0,0 +1,22 @@
+{
+  "version": "2.0.4",
+  "case": "RELEASE-2040",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T12:54:03.976Z",
+  "executor": "lead",
+  "task_id": "pre-release-2040-1793192043977",
+  "requirement": "v2.0.4：GPW 双模式（小白默认/高级手动）、默认保护文件夹、3 秒放行节流、高级模式 10 秒自动放行；README 主页重写",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "mode": "novice default; advanced manual via /api/w2m/gpw/folders set-mode",
+      "protected": "C:\\\\Windows, Program Files (x86) on C: and D: always denied in novice",
+      "throttle": "one path auto-pass per 3000ms",
+      "timeout": "advanced pending auto-approve 10s (was 100s)",
+      "tests": "gpw suites 74 pass / 0 fail incl gpw-modes 5/5; client-bundle 26/26; lint 0 errors"
+    }
+  }
+}

package/docs/acceptance/2.0.5/RELEASE-205.json

@@ -0,0 +1,21 @@
+{
+  "version": "2.0.5",
+  "case": "RELEASE-205",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T16:37:29.497Z",
+  "executor": "lead",
+  "task_id": "pre-release-205-1793205449498",
+  "requirement": "v2.0.5：Relay 支持 AEAD v2 加密消息信封（enc.v=2 + aad{session_id,machine_id,message_id}），新增能力标记 chat-enc-v2，供主插件启用 encrypted mirror 发送；v1 兼容不变。",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "envelope": "v2 shape accepted and echoed verbatim (iv/tag + nested aad); v1 still accepted; unknown versions refused BAD_ENCRYPTION",
+      "aadBinding": "clear AAD must name the same session_id and machine_id as the message (CHAT_AAD_MISMATCH otherwise); missing aad CHAT_AAD_MISSING; bad message id CHAT_AAD_INVALID",
+      "feature": "healthz features includes chat-enc-v2; dispatcher can gate encrypted mirror on it",
+      "tests": "fleet-messages + relay-health-capabilities + relay.test 217 pass / 0 fail; targeted v2 suite 28 pass / 0 fail; eslint 0 errors"
+    }
+  }
+}

package/docs/acceptance/2.0.5/RELEASE-2050.json

@@ -0,0 +1,22 @@
+{
+  "version": "2.0.5",
+  "case": "RELEASE-2050",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T16:36:54.281Z",
+  "executor": "lead",
+  "task_id": "pre-release-2050-1793205414282",
+  "requirement": "v2.0.5:A7 AEAD v2 AAD(chat v2 + relay enc.v2 + capability chat-enc-v2)；联合开发 P0/S1/S4/A1/A2/A3/A4/A5/A6/A8 全部切片在本工作树验证",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "preflight": "16 pass / 0 fail / 1 unverifiable (GREEN)",
+      "tests": "declared suite all pass (node --test via scripts.test)",
+      "lint": "0 errors",
+      "pack": "dist tarball byte-identical on a second pack; manifest equals tree",
+      "scope": "local code + tests only; no push, no tag, no npm publish, no relay deployment"
+    }
+  }
+}

package/docs/adr/0001-collaboration-crdt.md

@@ -0,0 +1,59 @@
+# ADR 0001 — 多机协作：本周期不引入 CRDT（D5）
+
+- 状态：已接受（2026-10-28）
+- 决策者：项目负责人（D5）
+- 相关：D1=c、A6 项目房间、A7 聊天 AEAD、S4 数据面红线
+
+## 背景
+
+“多机跨机实时协作”的讨论中出现了共享编辑/多光标/实时文档（CRDT）诉求。当前系统的协作对象是：
+
+- 追加式的编队聊天消息（`w2m_chat`）；
+- 追加式的项目房间事件（board/locks/reviews/notifications）；
+- 以 git 为权威的代码产物（patch/commit/merge）。
+
+以上都是**追加式或 git 语义**，不是“多写者并发编辑同一份可变文档”。仓库同时保持 **零运行时依赖**、单文件手写 client bundle（无 bundler），以及“数据面不经 relay”的红线。
+
+## 决策
+
+**本周期（v2.x）不引入任何 CRDT 实现，不新增 CRDT 依赖，不写共享编辑代码。** 共享编辑若未来立项，必须先有新的 ADR 批准，并通过独立评审。
+
+## 评估过的选项
+
+| 选项 | 许可（本轮核实口径） | 体积/运行时 | 结论 |
+|---|---|---|---|
+| Yjs | MIT（npm 13.6.33） | 纯 JS，约 1MB+ 生态；需要 provider/transport | **未来首选**（若共享编辑立项，风险最低） |
+| Automerge | MIT（npm latest 2.0.0-alpha.3） | Rust/WASM，数 MB，alpha 版本 | **备选**（需要 Git-like change DAG 证据时再评估） |
+| json-joy | **AGPL-3.0-only**（多数包） | 2.2MB + 20+ 运行时依赖 | **明确排除**：与 MIT 公开插件分发不兼容，不依赖、不复制代码 |
+
+## 不引入的理由
+
+1. **问题形态不匹配**：当前协作是追加事件 + git 合并，CRDT 解决的是并发可变文档；引入它不会自动闭合 A3/A6 的任何缺口。
+2. **零依赖是发布资产**：任何 CRDT 库都会进入持有 device token / operator key / fleet key 的进程信任域，扩大 CVE 面并破坏可复现的单文件打包。
+3. **数据面红线**：共享编辑内容属于数据面，必须经用户 sink/git，不能经 relay；现有 relay 冻结，无法承载新的同步协议。
+4. **权限与审计模型未定义**：多人同时编辑需要用户级身份、逐操作授权与审计，当前只有机器级身份。
+5. **许可风险**：json-joy 为 AGPL，直接排除；Yjs/Automerge 需在立项时做人工法务复核。
+
+## 触发条件（满足才可重新评估）
+
+- 出现真实的“多人同时编辑同一份文档/文件”需求，而非代码补丁协作；
+- 新的 ADR 获批，且明确数据面走 sink/git 或加密 P2P，不经 relay；
+- 完成用户级身份、逐操作授权、审计与回滚设计；
+- 选定单一实现（Yjs 优先），完成构建管线与许可复核，并接受依赖体积/供应链评审。
+
+## 本周期替代方案
+
+- 代码协作：git worktree + `git apply --3way` + CAS 更新目标分支（merge-engine，A4 CLI 已落地）。
+- 产物同步：用户授权的 dir/git/ssh sink（A3）。
+- 状态同步：项目房间事件 + 分页/截断信号（A6 截断已落地；持久化与客户端面板在后续切片）。
+- 消息加密：聊天 AEAD v2 + AAD 会话/发送者绑定（A7）。
+
+## 后果
+
+- 不新增依赖，`package.json#dependencies` 保持为空；
+- 不新增 `src/util/crdt.mjs` 之类的占位模块，避免制造“已有 CRDT”的读感；
+- 未来若立项，按触发条件重新走 ADR，而不是在既有事件/合并路径上静默引入。
+
+## 回滚/复审
+
+纯文档决策，无运行时代码；复审时新增一份 ADR 取代本文件，并在 CHANGELOG 记录决策变化。