@twinsearth/w2m-dsh-plugin 2.0.4 → 2.0.5

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": "2.0.4"
+    "version": "2.0.5"
   },
   "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": "2.0.4",
+      "version": "2.0.5",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "2.0.4"
+  "version": "2.0.5"
 }

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": "2.0.4",
+  "version": "2.0.5",
   "author": {
     "name": "TwinsEarth"
   },

package/CHANGELOG.md

@@ -7,6 +7,14 @@
 
 All notable changes to this project are documented here.
 
+## [2.0.5] - 2026-10-29
+
+- Relay 支持 AEAD v2 加密消息信封（A7 收尾）：`enc.v=2` 携带 `aad:{session_id,machine_id,message_id}`，
+  relay 校验明文 AAD 与消息的 session/machine 一致后原样存储与回放；v1 信封保持兼容。
+- 新增能力标记 `chat-enc-v2`（`/healthz.features`），主插件据此启用 encrypted mirror 发送。
+- 新增错误码：`CHAT_AAD_MISSING` / `CHAT_AAD_MISMATCH` / `CHAT_AAD_INVALID`。
+- 测试：fleet-messages AEAD v2 用例、能力协商断言（v1 兼容与未知版本拒绝保持）。
+
 ## [2.0.4] - 2026-10-28
 
 - GPW 双策略模式：小白模式（默认）只保留黑名单强制拒绝，其余工具调用放行；高级模式需手动切换，保持四色策略。

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.4", "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.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 记录决策变化。

package/lib/client.js

@@ -889,6 +889,67 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
         if (result.ok) setTokenState(result.body);
       }, []);
       React.useEffect(() => { loadToken(); }, [loadToken]);
+      const [sinkKind, setSinkKind] = React.useState('dir');
+      const [sinkRoot, setSinkRoot] = React.useState('');
+      const [sinkState, setSinkState] = React.useState(null);
+      const loadSink = React.useCallback(async () => {
+        const result = await call('/api/w2m/dataplane-sink', { method: 'GET' });
+        if (result.ok) setSinkState(result.body);
+        else if (result.routeMissing !== true) setError(result.error ?? 'sink status failed');
+      }, []);
+      React.useEffect(() => { loadSink(); }, [loadSink]);
+      const [projectRoomId, setProjectRoomId] = React.useState('');
+      const [projectEvents, setProjectEvents] = React.useState([]);
+      const [projectStreaming, setProjectStreaming] = React.useState(false);
+      const projectAbortRef = React.useRef(null);
+      const stopProjectStream = () => { projectAbortRef.current?.abort(); projectAbortRef.current = null; setProjectStreaming(false); };
+      React.useEffect(() => () => { projectAbortRef.current?.abort(); }, []);
+      const startProjectStream = async () => {
+        const projectId = projectRoomId.trim();
+        if (projectId === '') return;
+        stopProjectStream();
+        const controller = new AbortController();
+        projectAbortRef.current = controller;
+        setProjectEvents([]);
+        setProjectStreaming(true);
+        try {
+          const response = await fetch('/api/w2m/project-stream?project_id=' + encodeURIComponent(projectId) + '&since_seq=0', { credentials: 'same-origin', signal: controller.signal });
+          if (response.ok !== true || response.body === null) { setError('项目流不可用（HTTP ' + response.status + '）'); return; }
+          const reader = response.body.getReader();
+          const decoder = new TextDecoder();
+          let buffer = '';
+          for (;;) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += decoder.decode(value, { stream: true });
+            let split = buffer.indexOf('\n\n');
+            while (split >= 0) {
+              const block = buffer.slice(0, split);
+              buffer = buffer.slice(split + 2);
+              const dataLine = block.split('\n').find((line) => line.startsWith('data: '));
+              if (dataLine !== undefined) {
+                try { setProjectEvents((prev) => [...prev.slice(-99), JSON.parse(dataLine.slice(6))]); } catch { /* ignore malformed frame */ }
+              }
+              split = buffer.indexOf('\n\n');
+            }
+          }
+        } catch (error) {
+          if (error?.name !== 'AbortError') setError('项目流中断');
+        } finally {
+          if (projectAbortRef.current === controller) { projectAbortRef.current = null; setProjectStreaming(false); }
+        }
+      };
+      const saveSink = async () => {
+        if (sinkRoot.trim() === '') return;
+        setBusy(true);
+        try {
+          const payload = sinkKind === 'ssh'
+            ? { kind: 'ssh', host: sinkRoot.split(':')[0].trim(), user: (sinkRoot.split(':')[1] ?? '').trim(), dir: (sinkRoot.split(':')[2] ?? '').trim() }
+            : { kind: sinkKind, root: sinkRoot.trim() };
+          const result = await call('/api/w2m/dataplane-sink', { method: 'POST', body: JSON.stringify(payload) });
+          if (result.ok) { setSinkRoot(''); await loadSink(); } else setError(result.error ?? 'sink save failed');
+        } finally { setBusy(false); }
+      };
       const saveToken = async () => {
         if (tokenInput.trim() === '') return;
         setBusy(true);
@@ -940,6 +1001,30 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
           ]),
           h('div', { key: 'st', className: 'w2mGpw_adminSub' }, tokenState?.configured === true ? ('已配置 · ' + String(tokenState.source ?? '') + ' · ' + String(tokenState.fingerprint ?? '').slice(0, 12)) : '未配置 operator token（保存后写入 0600 文件，只显示指纹）'),
         ]),
+        h('div', { key: 'sink', className: 'w2mGpw_adminCard' }, [
+          h('div', { key: 'row', className: 'w2mGpw_adminToolbar' }, [
+            h('select', { key: 'k', className: 'w2mGpw_adminInput', value: sinkKind, onChange: (event) => setSinkKind(event.target.value) }, [
+              h('option', { key: 'd', value: 'dir' }, '本地目录'),
+              h('option', { key: 'g', value: 'lan-git' }, 'git 仓库'),
+              h('option', { key: 's', value: 'ssh' }, 'ssh'),
+            ]),
+            h('input', { key: 'p', className: 'w2mGpw_adminInput', value: sinkRoot, placeholder: sinkKind === 'ssh' ? 'host:user:绝对目录' : (sinkKind === 'lan-git' ? 'git 仓库绝对路径' : '产物目录绝对路径'), onChange: (event) => setSinkRoot(event.target.value) }),
+            h('button', { key: 'a', type: 'button', className: 'w2mGpw_adminBtn', disabled: busy, onClick: saveSink }, '授权并保存'),
+          ]),
+          h('div', { key: 'st', className: 'w2mGpw_adminSub' }, sinkState?.configured === true
+            ? ('已授权 · ' + String(sinkState.kind ?? '') + ' · ' + String(sinkState.root ?? sinkState.host ?? '') + ' · 凭据不写入配置')
+            : '未配置数据面 sink：产物只保留本地并标记 ARTIFACT_NOT_DELIVERED（工具参数不能完成授权）'),
+        ]),
+        h('div', { key: 'projectroom', className: 'w2mGpw_adminCard' }, [
+          h('div', { key: 'row', className: 'w2mGpw_adminToolbar' }, [
+            h('input', { key: 'p', className: 'w2mGpw_adminInput', value: projectRoomId, placeholder: '项目 id（只读订阅项目事件）', onChange: (event) => setProjectRoomId(event.target.value) }),
+            h('button', { key: 'start', type: 'button', className: 'w2mGpw_adminBtn', disabled: projectStreaming, onClick: startProjectStream }, '订阅'),
+            h('button', { key: 'stop', type: 'button', className: 'w2mGpw_adminBtn', disabled: !projectStreaming, onClick: stopProjectStream }, '停止'),
+          ]),
+          h('div', { key: 'ev', className: 'w2mGpw_adminSub' }, projectEvents.length === 0
+            ? (projectStreaming ? '已连接，等待事件…' : '未订阅（只读；截断时 relay 会先发 PROJECT_REPLAY_TRUNCATED notice）')
+            : projectEvents.slice(-8).map((event) => String(event.seq ?? '?') + ' · ' + String(event.type ?? event.code ?? 'event')).join('  |  ')),
+        ]),
         h('div', { key: 'toolbar', className: 'w2mGpw_adminCard' }, [
           h('div', { key: 'row', className: 'w2mGpw_adminToolbar' }, [
             h('input', { key: 'q', className: 'w2mGpw_adminInput', value: query, placeholder: '搜索路径', onChange: (event) => setQuery(event.target.value) }),
@@ -1142,23 +1227,68 @@ function clickLoadEarlier() {
   try { el.click(); return true; } catch { return false; }
 }
 const waitFor = (ms) => new Promise((resolve) => { setTimeout(resolve, ms); });
+/**
+ * The history loader shows "加载中..." while a page is in flight. Clicking "加载更早" again in that
+ * window is what made the top button look like it was being interrupted/blocked: every loop pressed
+ * the row while the previous press was still loading, so nothing advanced.
+ */
+function isLoadingEarlier() {
+  if (typeof document === 'undefined') return false;
+  for (const root of searchRoots()) {
+    let nodes = [];
+    try { nodes = root.querySelectorAll ? [...root.querySelectorAll('button, [role="button"], a, span, div')] : []; } catch { continue; }
+    for (const el of nodes) {
+      const text = String(el.textContent ?? '').trim();
+      if (text === '' || text.length > 24) continue;
+      if (/^加载中|^loading|加载中\.\.\./i.test(text)) return true;
+    }
+  }
+  return false;
+}
+/** Wait for an in-flight "load earlier" page to finish (or time out), then continue. */
+async function waitForLoadSettled(timeoutMs = 6000) {
+  let waited = 0;
+  while (waited < timeoutMs) {
+    if (!isLoadingEarlier()) return true;
+    await waitFor(100);
+    waited += 100;
+  }
+  return false;
+}
 async function scrollChatTurns() {
   const surface = findScrollSurface();
   const viewport = typeof window !== 'undefined' ? window.innerHeight : 800;
   const step = Math.round(Math.max(240, (surface !== null ? surface.clientHeight : viewport) * 1.8));
-  if (surface !== null && surface.scrollTop <= 8 && clickLoadEarlier()) await waitFor(350);
+  if (surface !== null && surface.scrollTop <= 8) {
+    if (isLoadingEarlier()) await waitForLoadSettled();
+    else if (clickLoadEarlier()) await waitForLoadSettled();
+  }
   const after = surface ?? findScrollSurface();
   if (after !== null) after.scrollTop = Math.max(0, after.scrollTop - step);
   else if (typeof window !== 'undefined') window.scrollBy({ top: -step, behavior: 'smooth' });
 }
 async function scrollChatTop() {
-  // Load history until the "load earlier" row is gone, then pin the surface to the top.
-  for (let i = 0; i < 60; i += 1) {
+  // Load history until the "load earlier" row is gone, but never press it while a page is loading:
+  // each press waits for the loader to settle and for the surface to actually grow, and two pages
+  // that add nothing end the loop instead of spinning. Only then is the surface pinned to the top.
+  let stagnant = 0;
+  let lastHeight = -1;
+  for (let i = 0; i < 40; i += 1) {
+    if (isLoadingEarlier()) {
+      await waitForLoadSettled();
+      continue;
+    }
     const surface = findScrollSurface();
     if (surface !== null) surface.scrollTop = 0;
+    const before = surface !== null ? surface.scrollHeight : -1;
     if (!clickLoadEarlier()) break;
-    await waitFor(280);
+    await waitForLoadSettled();
+    const after = findScrollSurface() !== null ? findScrollSurface().scrollHeight : -1;
+    if (after <= before || after === lastHeight) stagnant += 1; else stagnant = 0;
+    lastHeight = after;
+    if (stagnant >= 2) break;
   }
+  await waitForLoadSettled();
   for (let i = 0; i < 8; i += 1) {
     const surface = findScrollSurface();
     if (surface !== null) surface.scrollTop = 0;
@@ -1249,14 +1379,22 @@ function ConversationSearch() {
   const [cursor, setCursor] = React.useState(-1);
   const inputRef = React.useRef(null);
   React.useEffect(() => { if (open && inputRef.current && inputRef.current.focus) inputRef.current.focus(); }, [open]);
-  React.useEffect(() => {
-    if (!open) { clearSearchMarks(); setCount(0); setCursor(-1); return undefined; }
+  // v2.0.5: wait until 3s pass without new input before walking the conversation, so typing does
+  // not trigger a full-tree highlight pass on every keystroke (the reported input jank).
+  const paintNow = () => {
     const total = paintSearchMarks(query);
     setCount(total);
     setCursor(total > 0 ? 0 : -1);
     const first = document.querySelector('mark.w2mSearchMark');
     if (first && first.scrollIntoView) first.scrollIntoView({ block: 'center', behavior: 'smooth' });
-    return () => clearSearchMarks();
+  };
+  React.useEffect(() => {
+    if (!open) { clearSearchMarks(); setCount(0); setCursor(-1); }
+  }, [open]);
+  React.useEffect(() => {
+    if (!open) return undefined;
+    const timer = setTimeout(paintNow, 3000);
+    return () => clearTimeout(timer);
   }, [open, query]);
   const step = (backwards) => {
     const marks = [...document.querySelectorAll('mark.w2mSearchMark')];
@@ -1286,7 +1424,7 @@ function ConversationSearch() {
       placeholder: '搜索本对话全部内容',
       onChange: (event) => setQuery(event.target.value),
       onKeyDown: (event) => {
-        if (event.key === 'Enter') { event.preventDefault(); step(event.shiftKey); }
+        if (event.key === 'Enter') { event.preventDefault(); paintNow(); step(event.shiftKey); }
         if (event.key === 'Escape') { setOpen(false); setQuery(''); }
       },
     }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/w2m-dsh-plugin",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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": {
@@ -64,7 +64,7 @@
     "pack": "node scripts/pack.mjs",
     "reachability": "node scripts/reachability-check.mjs",
     "reachability:classify": "node scripts/reachability-classify.mjs",
-    "test": "node --test --test-force-exit test/relay.test.mjs test/broadcast.test.mjs test/blake2s.test.mjs test/agent.test.mjs test/plan-sec-cmd.test.mjs test/authority.test.mjs test/blocks.test.mjs test/approval-index.test.mjs test/fleet-sync.test.mjs test/fleet-merge.test.mjs test/fleet-memory-e2e.test.mjs test/fleet-concurrency.test.mjs test/fleet-merge-race.test.mjs test/health.test.mjs test/storage.test.mjs test/exit-channel.test.mjs test/council.test.mjs test/council-session.test.mjs test/log-bounds.test.mjs test/test-report.test.mjs test/fleet-scale.test.mjs test/fleet-state.test.mjs test/crypto-blake2s.test.mjs test/installed-version.test.mjs test/permission.test.mjs test/machine-test-packet.test.mjs test/field-authority.test.mjs test/approval-gate.test.mjs test/authority-choice.test.mjs test/reachability-check.test.mjs test/reachability-classify.test.mjs test/accepted-orphans.test.mjs test/acceptance-doc.test.mjs test/layer-model.test.mjs test/cwd-containment.test.mjs test/cwd-outside-project.test.mjs test/memory.test.mjs test/tools.test.mjs test/claims.test.mjs test/fleet-target.test.mjs test/client-bundle.test.mjs test/schedule.test.mjs test/auto-update.test.mjs test/update-source.test.mjs test/update-install.test.mjs test/update-wiring.test.mjs test/signing.test.mjs test/stress.test.mjs test/shared-config.test.mjs test/metrics.test.mjs test/metrics-route.test.mjs test/tool-cards.test.mjs test/p2p-stun.test.mjs test/p2p-transport.test.mjs test/p2p-signaling.test.mjs test/p2p-node.test.mjs test/p2p-transport-fields.test.mjs test/p2p-plugin.test.mjs test/p2p-crypto.test.mjs test/stun-server.test.mjs test/loader-entry.test.mjs test/mdns-wire.test.mjs test/mdns-discover.test.mjs test/chatops-approval.test.mjs test/chatops-policy.test.mjs test/chatops-file-safety.test.mjs test/chatops-outbound-queue.test.mjs test/chatops-commands.test.mjs test/chatops-bridge.test.mjs test/chatops-config-route.test.mjs test/chatops-apply.test.mjs test/chatops-ilink-contract.test.mjs test/chatops-fleet.test.mjs test/chatops-account.test.mjs test/chatops-auth.test.mjs test/chatops-fleet-scope.test.mjs test/chatops-handoff.test.mjs test/chatops-fleet-wiring.test.mjs test/chatops-fleet-live.test.mjs test/chatops-takeover.test.mjs test/chatops-device-signing.test.mjs test/chatops-relay-verify.test.mjs test/chatops-durability.test.mjs test/chatops-run-command.test.mjs test/secrets-guard.test.mjs test/chatops-ilink-fleet-bridge.test.mjs test/agent-plugins.test.mjs test/memory-layer.test.mjs test/mcp-server.test.mjs test/portable-plugins.test.mjs test/mcp-http.test.mjs test/mcp-http-live.test.mjs test/vision.test.mjs test/ilink-shape.test.mjs test/chatops-fleet-join.test.mjs test/admission.test.mjs test/admission-routes.test.mjs test/join-degradation.test.mjs test/account-identity.test.mjs test/join-challenge.test.mjs test/exec-env-injection.test.mjs test/account-join.test.mjs test/fleet-messages.test.mjs test/message-shards.test.mjs test/fleet-messages-http.test.mjs test/message-notify.test.mjs test/update-channels.test.mjs test/update-prerelease.test.mjs test/session-watch.test.mjs test/session-readonly.test.mjs test/session-sync.test.mjs test/fleet-chat-identity.test.mjs test/identity-reader.test.mjs test/intents.test.mjs test/dataflow.test.mjs test/council-fleet.test.mjs test/fleet-memory.test.mjs test/memory-view.test.mjs test/schema-spec.test.mjs test/fleet-weight-parity.test.mjs test/task-deps.test.mjs test/dataflow-wiring.test.mjs test/task-graph.test.mjs test/ask-store.test.mjs test/turn.test.mjs test/fleet-members.test.mjs test/redact.test.mjs test/policy-matrix.test.mjs test/envelope-signature.test.mjs test/chat-crypto.test.mjs test/reduce-suggestion.test.mjs test/merge-hint.test.mjs test/fleet-chat-route.test.mjs test/maintenance.test.mjs test/maintenance-ferry.test.mjs test/grant.test.mjs test/grant-gate.test.mjs test/worktree.test.mjs test/patch-artifact.test.mjs test/merge-queue.test.mjs test/m3-workflow.test.mjs test/project-room.test.mjs test/project-attribution.test.mjs test/project-locks.test.mjs test/project-reviews.test.mjs test/project-notifications.test.mjs test/blob-sessions.test.mjs test/outbox.test.mjs test/reliability-metrics.test.mjs test/evidence.test.mjs test/grant-issue.test.mjs test/project-refs.test.mjs test/exec-capability.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs test/agent-identity-safe.test.mjs test/re-pair-stale-token.test.mjs test/gpw-folder-policy.test.mjs test/gpw-activation.test.mjs test/gpw-hardening.test.mjs test/gpw-tamper-gate.test.mjs test/gpw-persistence.test.mjs test/gpw-colors.test.mjs test/gpw-recent-fold.test.mjs test/gpw-auto-approve.test.mjs test/data-plane.test.mjs test/sealed-object.test.mjs test/joint-dev-dispatch.test.mjs test/joint-dev-loop.test.mjs test/joint-dev-audit.test.mjs test/joint-dev-redline.test.mjs test/relay-redline-guard.test.mjs test/relay-p0-projection.test.mjs test/guarded-dispatch.test.mjs test/p0-single-matcher.test.mjs test/path-policy.test.mjs test/path-policy-fs.test.mjs test/gpw-inheritance-table.test.mjs test/gpw-policy-adapter.test.mjs test/target-policy.test.mjs test/relay-redline-audit.test.mjs test/relay-repair-ledger.test.mjs test/relay-purge-blobs.test.mjs test/relay-scrub.test.mjs test/joint-dev-plan-store.test.mjs test/relay-basepath-blobs.test.mjs test/operator-token.test.mjs test/relay-health-capabilities.test.mjs test/joint-relay-dispatch.test.mjs test/operator-token-route.test.mjs test/relay-scrub-task-projection.test.mjs test/operator-key-approval.test.mjs test/relay-offer-journal.test.mjs test/joint-r5-wiring.test.mjs test/p1-hardening.test.mjs test/joint-merge-engine.test.mjs test/artifact-ref-dir-sink.test.mjs test/chat-sticker-guard.test.mjs test/relay-task-progress.test.mjs test/gpw-modes.test.mjs",
+    "test": "node --test --test-force-exit test/relay.test.mjs test/broadcast.test.mjs test/blake2s.test.mjs test/agent.test.mjs test/plan-sec-cmd.test.mjs test/authority.test.mjs test/blocks.test.mjs test/approval-index.test.mjs test/fleet-sync.test.mjs test/fleet-merge.test.mjs test/fleet-memory-e2e.test.mjs test/fleet-concurrency.test.mjs test/fleet-merge-race.test.mjs test/health.test.mjs test/storage.test.mjs test/exit-channel.test.mjs test/council.test.mjs test/council-session.test.mjs test/log-bounds.test.mjs test/test-report.test.mjs test/fleet-scale.test.mjs test/fleet-state.test.mjs test/crypto-blake2s.test.mjs test/installed-version.test.mjs test/permission.test.mjs test/machine-test-packet.test.mjs test/field-authority.test.mjs test/approval-gate.test.mjs test/authority-choice.test.mjs test/reachability-check.test.mjs test/reachability-classify.test.mjs test/accepted-orphans.test.mjs test/acceptance-doc.test.mjs test/layer-model.test.mjs test/cwd-containment.test.mjs test/cwd-outside-project.test.mjs test/memory.test.mjs test/tools.test.mjs test/claims.test.mjs test/fleet-target.test.mjs test/client-bundle.test.mjs test/schedule.test.mjs test/auto-update.test.mjs test/update-source.test.mjs test/update-install.test.mjs test/update-wiring.test.mjs test/signing.test.mjs test/stress.test.mjs test/shared-config.test.mjs test/metrics.test.mjs test/metrics-route.test.mjs test/tool-cards.test.mjs test/p2p-stun.test.mjs test/p2p-transport.test.mjs test/p2p-signaling.test.mjs test/p2p-node.test.mjs test/p2p-transport-fields.test.mjs test/p2p-plugin.test.mjs test/p2p-crypto.test.mjs test/stun-server.test.mjs test/loader-entry.test.mjs test/mdns-wire.test.mjs test/mdns-discover.test.mjs test/chatops-approval.test.mjs test/chatops-policy.test.mjs test/chatops-file-safety.test.mjs test/chatops-outbound-queue.test.mjs test/chatops-commands.test.mjs test/chatops-bridge.test.mjs test/chatops-config-route.test.mjs test/chatops-apply.test.mjs test/chatops-ilink-contract.test.mjs test/chatops-fleet.test.mjs test/chatops-account.test.mjs test/chatops-auth.test.mjs test/chatops-fleet-scope.test.mjs test/chatops-handoff.test.mjs test/chatops-fleet-wiring.test.mjs test/chatops-fleet-live.test.mjs test/chatops-takeover.test.mjs test/chatops-device-signing.test.mjs test/chatops-relay-verify.test.mjs test/chatops-durability.test.mjs test/chatops-run-command.test.mjs test/secrets-guard.test.mjs test/chatops-ilink-fleet-bridge.test.mjs test/agent-plugins.test.mjs test/memory-layer.test.mjs test/mcp-server.test.mjs test/portable-plugins.test.mjs test/mcp-http.test.mjs test/mcp-http-live.test.mjs test/vision.test.mjs test/ilink-shape.test.mjs test/chatops-fleet-join.test.mjs test/admission.test.mjs test/admission-routes.test.mjs test/join-degradation.test.mjs test/account-identity.test.mjs test/join-challenge.test.mjs test/exec-env-injection.test.mjs test/account-join.test.mjs test/fleet-messages.test.mjs test/message-shards.test.mjs test/fleet-messages-http.test.mjs test/message-notify.test.mjs test/update-channels.test.mjs test/update-prerelease.test.mjs test/session-watch.test.mjs test/session-readonly.test.mjs test/session-sync.test.mjs test/fleet-chat-identity.test.mjs test/identity-reader.test.mjs test/intents.test.mjs test/dataflow.test.mjs test/council-fleet.test.mjs test/fleet-memory.test.mjs test/memory-view.test.mjs test/schema-spec.test.mjs test/fleet-weight-parity.test.mjs test/task-deps.test.mjs test/dataflow-wiring.test.mjs test/task-graph.test.mjs test/ask-store.test.mjs test/turn.test.mjs test/fleet-members.test.mjs test/redact.test.mjs test/policy-matrix.test.mjs test/envelope-signature.test.mjs test/chat-crypto.test.mjs test/reduce-suggestion.test.mjs test/merge-hint.test.mjs test/fleet-chat-route.test.mjs test/maintenance.test.mjs test/maintenance-ferry.test.mjs test/grant.test.mjs test/grant-gate.test.mjs test/worktree.test.mjs test/patch-artifact.test.mjs test/merge-queue.test.mjs test/m3-workflow.test.mjs test/project-room.test.mjs test/project-attribution.test.mjs test/project-locks.test.mjs test/project-reviews.test.mjs test/project-notifications.test.mjs test/blob-sessions.test.mjs test/outbox.test.mjs test/reliability-metrics.test.mjs test/evidence.test.mjs test/grant-issue.test.mjs test/project-refs.test.mjs test/exec-capability.test.mjs test/secondary-link.test.mjs test/bootstrap-cli.test.mjs test/bootstrap.test.mjs test/windows-hidden-task.test.mjs test/relay-failover.test.mjs test/npm-update.test.mjs test/agent-start-nonblocking.test.mjs test/fleet-chat-capture.test.mjs test/capture-route.test.mjs test/update-resolver.test.mjs test/agent-identity-safe.test.mjs test/re-pair-stale-token.test.mjs test/gpw-folder-policy.test.mjs test/gpw-activation.test.mjs test/gpw-hardening.test.mjs test/gpw-tamper-gate.test.mjs test/gpw-persistence.test.mjs test/gpw-colors.test.mjs test/gpw-recent-fold.test.mjs test/gpw-auto-approve.test.mjs test/joint-dev-dispatch.test.mjs test/joint-dev-loop.test.mjs test/joint-dev-audit.test.mjs test/joint-dev-redline.test.mjs test/relay-redline-guard.test.mjs test/relay-p0-projection.test.mjs test/guarded-dispatch.test.mjs test/p0-single-matcher.test.mjs test/path-policy.test.mjs test/path-policy-fs.test.mjs test/gpw-inheritance-table.test.mjs test/gpw-policy-adapter.test.mjs test/target-policy.test.mjs test/relay-redline-audit.test.mjs test/relay-repair-ledger.test.mjs test/relay-purge-blobs.test.mjs test/relay-scrub.test.mjs test/joint-dev-plan-store.test.mjs test/relay-basepath-blobs.test.mjs test/operator-token.test.mjs test/relay-health-capabilities.test.mjs test/joint-relay-dispatch.test.mjs test/operator-token-route.test.mjs test/relay-scrub-task-projection.test.mjs test/operator-key-approval.test.mjs test/relay-offer-journal.test.mjs test/joint-r5-wiring.test.mjs test/p1-hardening.test.mjs test/joint-merge-engine.test.mjs test/artifact-ref-dir-sink.test.mjs test/chat-sticker-guard.test.mjs test/relay-task-progress.test.mjs test/gpw-modes.test.mjs test/joint-cli.test.mjs test/joint-command-hash.test.mjs test/joint-dispatch-audit.test.mjs test/tools-cancel-auth.test.mjs test/fleet-mirror.test.mjs test/sink-git-ssh.test.mjs test/agent-sse-watchdog.test.mjs test/version-gate.test.mjs test/joint-merge-cli.test.mjs test/joint-progress.test.mjs test/project-room-truncation.test.mjs test/chat-crypto-aad.test.mjs test/agent-artifact-delivery.test.mjs test/dataplane-sink-route.test.mjs test/artifact-sink-e2e.test.mjs test/project-room-persistence.test.mjs test/project-room-disk-persistence.test.mjs test/project-stream-route.test.mjs",
     "test:acceptance-doc": "node --test --test-force-exit test/acceptance-doc.test.mjs",
     "test:account-identity": "node --test --test-force-exit test/account-identity.test.mjs",
     "test:account-join": "node --test --test-force-exit test/account-join.test.mjs",

package/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
   "name": "twinsearth-w2m-dsh",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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": [