@twinsearth/w2m-dsh-plugin 1.9.21 → 2.0.1

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.21"
+    "version": "2.0.1"
   },
   "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.21",
+      "version": "2.0.1",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "1.9.21"
+  "version": "2.0.1"
 }

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

package/CHANGELOG.md

@@ -7,6 +7,30 @@
 
 All notable changes to this project are documented here.
 
+## [2.0.1] - 2026-10-28
+
+- 修复右上角滚动按钮无效：滚动容器识别改为“命中测试 + 递归 shadow root + 允许 overflow:hidden 的程序化滚动容器”，
+  并直接写 scrollTop/scrollTo；找不到容器时回退到 window。旧实现只找 overflow:auto，虚拟列表/隐藏溢出容器下点击是空操作。
+- 只保留一个滚动图标（SVG 向上箭头，样式与右上角官方图标对齐：32px、8px 圆角、1px 边框、right:16px/top:64px），
+  删除原来的第二个“一键到顶”按钮与会话头部的重复“⇧3”按钮。
+- 交互：点一次向上滚动约 3 轮；长按 3 秒直接回到第一轮（长按后松手的 click 不会重复触发）。
+
+## [2.0.0] - 2026-10-28
+
+主插件与既有 Relay 的对接按《W2M Relay × ToFuture 外部对接 API v1.2》收敛；ToFuture 子插件按该文档
+§6/§9 保持完全独立（主插件不内嵌、不调用、不代理、不实现其运维/白名单/令牌接口）。
+
+- 能力协商：/healthz 读取 features、operator_token_required、signing.required；缺失
+  target-machines/result-projection 时明确拒绝联合派发；signing.required=true 拒绝（v1 外部客户端不支持强签）；
+  operator_token_required=false 拒绝（生产必须为 true）。
+- 派发：控制消息显式携带 target_machines（API §4.6：发到哪台机器只由它决定），保留
+  executor_machine_id 兼容旧 relay；同 id 派发捕获 409 后读回任务而不是当成成功；
+  200 但无 task_id（依赖被拒）按失败处理；被点名机器租约 refused/expired/cancelled 立即失败。
+- 移除主插件内所有 ToFuture 运维面模块（MAC/IP 白名单 HMAC 上报、relay 侧识别路由），
+  遵守 API v1.2 §9：主插件不得实现、调用或探测运维/白名单/令牌接口。
+- 联合开发（plan/approve/dispatch/merge）仍为实验性：数据面投递与合并接线未随本版交付；
+  relay 部署/升级独立于插件发布，线上 relay 版本以 /healthz 为准。
+
 ## [1.9.21] - 2026-10-28
 
 - 发布边界：本版只发主插件；ToFuture 运维子插件由独立私有仓库另行发布，本包不包含安装/下载能力。

package/codex/mcp-servers.toml

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

package/docs/acceptance/2.0.0/RELEASE-2000.json

@@ -0,0 +1,22 @@
+{
+  "version": "2.0.0",
+  "case": "RELEASE-2000",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T09:27:04.879Z",
+  "executor": "lead",
+  "task_id": "pre-release-2000-1793179624880",
+  "requirement": "v2.0.0：按 Relay×ToFuture API v1.2 收敛主插件对接（能力协商 / target_machines / 409 读回 / 200-refused 失败），并移除主插件内 ToFuture 运维面模块",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "api": "v1.2",
+      "capability": "features + operator_token_required + signing.required",
+      "dispatch": "target_machines explicit; 409 -> GET task; 200 without task_id refused; dead lease fails",
+      "removed": "tofuture report/hmac/whitelist + /v1/tofuture/identify",
+      "tests": "joint-relay-dispatch 4/4, joint suites 28/28, lint 0 errors"
+    }
+  }
+}

package/docs/acceptance/2.0.1/RELEASE-2010.json

@@ -0,0 +1,22 @@
+{
+  "version": "2.0.1",
+  "case": "RELEASE-2010",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T09:49:39.826Z",
+  "executor": "lead",
+  "task_id": "pre-release-2010-1793180979827",
+  "requirement": "v2.0.1：右上角单个滚动图标，点击滚动 3 轮、长按 3 秒到顶，图标与官方一键到顶对齐，修复点击无效",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "single_icon": "one SVG button; second top button and header duplicate removed",
+      "interaction": "click -> scrollTop -1.8*clientHeight; long press 3s -> top; click after long press suppressed",
+      "resolver": "elementFromPoint ancestors + shadow roots + overflow hidden + scrollTop direct write + window fallback",
+      "alignment": "right:16px, top:64px, 32x32, radius 8px, 1px border",
+      "tests": "client-bundle 26/26, lint 0 errors"
+    }
+  }
+}

package/lib/client.js

@@ -507,10 +507,9 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
   '.w2mSearchInput{height:24px;min-width:220px;border:0;background:transparent;color:inherit;font:inherit;outline:none}',
   '.w2mSearchCount{font-size:11px;opacity:.75;min-width:34px;text-align:center}',
   '.w2mSearchControls{display:inline-flex;align-items:center;gap:4px}',
-  '.w2mScrollFloatWrap{position:fixed;right:18px;top:72px;z-index:2147483000;display:flex;flex-direction:column;gap:6px}',
-  '.w2mScrollFloatBtn{width:34px;height:34px;border-radius:50%;border:1px solid currentColor;background:transparent;color:inherit;opacity:.72;font-size:13px;line-height:1;cursor:pointer}',
+  '.w2mScrollFloatWrap{position:fixed;right:16px;top:64px;z-index:2147483000;display:flex;flex-direction:column;align-items:center}',
+  '.w2mScrollFloatBtn{width:32px;height:32px;display:flex;align-items:center;justify-content:center;border-radius:8px;border:1px solid rgba(128,128,128,.4);background:transparent;color:inherit;opacity:.72;line-height:1;cursor:pointer;padding:0}',
   '.w2mScrollFloatBtn:hover{opacity:1}',
-  '.w2mScrollUp{font-size:12px;padding:2px 6px;border:1px solid rgba(128,128,128,.4);border-radius:4px;background:transparent;color:inherit;cursor:pointer}',
   '::highlight(w2m-conversation-search){background-color:rgba(255,235,59,.85);color:rgba(11,122,51,1)}',
   '.w2mSearchMark{background-color:rgba(255,235,59,.85);color:rgba(11,122,51,1);border-radius:2px}',
   '.w2mSearchBtn{height:24px;min-width:24px;border:0;border-radius:4px;background:transparent;color:inherit;cursor:pointer}',
@@ -1041,62 +1040,104 @@ function paintSearchMarks(query) {
   }
   return total;
 }
+function isScrollableElement(el) {
+  if (el === null || el === undefined || el === document.body || el === document.documentElement) return false;
+  if (typeof el.scrollHeight !== 'number' || typeof el.clientHeight !== 'number') return false;
+  if (el.scrollHeight <= el.clientHeight + 8) return false;
+  const style = typeof getComputedStyle === 'function' ? getComputedStyle(el) : null;
+  const overflow = style === null ? '' : style.overflowY;
+  return overflow === '' || overflow === 'auto' || overflow === 'scroll' || overflow === 'overlay' || overflow === 'hidden';
+}
 function findScrollSurface() {
   if (typeof document === 'undefined') return null;
-  let best = null;
-  for (const root of searchRoots()) {
-    let all = [];
-    try { all = root.querySelectorAll ? [...root.querySelectorAll('*')] : []; } catch { continue; }
-    for (const el of all) {
-      if (el.scrollHeight <= el.clientHeight + 40) continue;
-      const style = typeof getComputedStyle === 'function' ? getComputedStyle(el) : null;
-      const overflow = style === null ? '' : style.overflowY;
-      if (overflow !== 'auto' && overflow !== 'scroll') continue;
-      if (best === null || el.scrollHeight > best.scrollHeight) best = el;
+  const found = new Set();
+  const addAncestors = (node) => {
+    let current = node;
+    while (current !== null && current !== undefined) {
+      if (isScrollableElement(current)) { found.add(current); return; }
+      current = current.parentElement ?? (current.parentNode instanceof ShadowRoot ? current.parentNode.host : null);
+    }
+  };
+  if (typeof document.elementFromPoint === 'function' && typeof window !== 'undefined') {
+    const points = [[window.innerWidth / 2, window.innerHeight / 2], [window.innerWidth / 2, window.innerHeight * 0.72], [window.innerWidth * 0.72, window.innerHeight * 0.4]];
+    for (const point of points) {
+      try { addAncestors(document.elementFromPoint(point[0], point[1])); } catch { /* ignore */ }
     }
   }
+  if (found.size === 0) {
+    for (const root of searchRoots()) {
+      let all = [];
+      try { all = root.querySelectorAll ? [...root.querySelectorAll('*')] : []; } catch { continue; }
+      for (const el of all) if (isScrollableElement(el)) found.add(el);
+    }
+  }
+  let best = null;
+  for (const el of found) {
+    if (best === null || el.clientHeight * el.scrollHeight > best.clientHeight * best.scrollHeight) best = el;
+  }
   return best;
 }
 function scrollChatTurns() {
   const surface = findScrollSurface();
-  if (surface !== null) surface.scrollBy({ top: -Math.round(Math.max(240, surface.clientHeight * 1.8)), behavior: 'smooth' });
-  else if (typeof window !== 'undefined') window.scrollBy({ top: -Math.round(window.innerHeight * 1.8), behavior: 'smooth' });
+  const step = Math.round(Math.max(240, (surface !== null ? surface.clientHeight : window.innerHeight) * 1.8));
+  if (surface !== null) {
+    const before = surface.scrollTop;
+    surface.scrollTop = before - step;
+    if (surface.scrollTop === before) surface.scrollBy({ top: -step, behavior: 'smooth' });
+    return;
+  }
+  if (typeof window !== 'undefined') window.scrollBy({ top: -step, behavior: 'smooth' });
 }
 function scrollChatTop() {
   const surface = findScrollSurface();
-  if (surface !== null) surface.scrollTo({ top: 0, behavior: 'smooth' });
-  else if (typeof window !== 'undefined') window.scrollTo({ top: 0, behavior: 'smooth' });
+  if (surface !== null) {
+    surface.scrollTop = 0;
+    surface.scrollTo({ top: 0, behavior: 'smooth' });
+    return;
+  }
+  if (typeof window !== 'undefined') window.scrollTo({ top: 0, behavior: 'smooth' });
 }
-/** Floating scroll controls: fixed top-right of the workspace, independent of any slot layout. */
-function installFloatingScrollButtons() {
+/** One floating button, styled after the shell's own back-to-top control. */
+function installFloatingScrollControl() {
   if (typeof document === 'undefined' || document.body === null) return null;
   const wrap = document.createElement('div');
   wrap.className = 'w2mScrollFloatWrap';
   wrap.setAttribute('data-w2m-scroll-float', 'true');
-  const makeButton = (label, title) => {
-    const button = document.createElement('button');
-    button.type = 'button';
-    button.className = 'w2mScrollFloatBtn';
-    button.textContent = label;
-    button.title = title;
-    button.setAttribute('aria-label', title);
-    wrap.appendChild(button);
-    return button;
-  };
-  const up = makeButton('\u21E73', '向上滚动 3 轮（长按 3 秒到第一轮）');
-  const top = makeButton('\u2912', '一键到顶');
+  const button = document.createElement('button');
+  button.type = 'button';
+  button.className = 'w2mScrollFloatBtn';
+  button.title = '向上滚动 3 轮（长按 3 秒回到第一轮）';
+  button.setAttribute('aria-label', button.title);
+  button.addEventListener('contextmenu', (event) => event.preventDefault());
+  const ns = 'http://www.w3.org/2000/svg';
+  const svg = document.createElementNS(ns, 'svg');
+  svg.setAttribute('viewBox', '0 0 24 24');
+  svg.setAttribute('width', '18');
+  svg.setAttribute('height', '18');
+  svg.setAttribute('fill', 'none');
+  svg.setAttribute('stroke', 'currentColor');
+  svg.setAttribute('stroke-width', '2');
+  svg.setAttribute('stroke-linecap', 'round');
+  svg.setAttribute('stroke-linejoin', 'round');
+  const shaft = document.createElementNS(ns, 'path');
+  shaft.setAttribute('d', 'M12 19V5');
+  const head = document.createElementNS(ns, 'path');
+  head.setAttribute('d', 'M5 12l7-7 7 7');
+  svg.appendChild(shaft);
+  svg.appendChild(head);
+  button.appendChild(svg);
   let holdTimer = null;
   let longFired = false;
   const clearHold = () => { if (holdTimer !== null) { clearTimeout(holdTimer); holdTimer = null; } };
-  up.addEventListener('pointerdown', (event) => {
+  button.addEventListener('pointerdown', (event) => {
     if (event && typeof event.preventDefault === 'function') event.preventDefault();
     longFired = false;
     clearHold();
     holdTimer = setTimeout(() => { longFired = true; scrollChatTop(); }, 3000);
   });
-  for (const type of ['pointerup', 'pointerleave', 'pointercancel']) up.addEventListener(type, clearHold);
-  up.addEventListener('click', () => { if (longFired) { longFired = false; return; } scrollChatTurns(); });
-  top.addEventListener('click', () => scrollChatTop());
+  for (const type of ['pointerup', 'pointerleave', 'pointercancel']) button.addEventListener(type, clearHold);
+  button.addEventListener('click', () => { if (longFired) { longFired = false; return; } scrollChatTurns(); });
+  wrap.appendChild(button);
   document.body.appendChild(wrap);
   return () => { clearHold(); wrap.remove(); };
 }
@@ -1106,8 +1147,6 @@ function ConversationSearch() {
   const [count, setCount] = React.useState(0);
   const [cursor, setCursor] = React.useState(-1);
   const inputRef = React.useRef(null);
-  const holdRef = React.useRef(null);
-  const longFiredRef = React.useRef(false);
   React.useEffect(() => { if (open && inputRef.current && inputRef.current.focus) inputRef.current.focus(); }, [open]);
   React.useEffect(() => {
     if (!open) { clearSearchMarks(); setCount(0); setCursor(-1); return undefined; }
@@ -1125,32 +1164,8 @@ function ConversationSearch() {
     setCursor(next);
     if (marks[next] && marks[next].scrollIntoView) marks[next].scrollIntoView({ block: 'center', behavior: 'smooth' });
   };
-  const scrollTurns = () => {
-    const surface = findScrollSurface();
-    if (surface !== null) surface.scrollBy({ top: -Math.round(Math.max(240, surface.clientHeight * 1.8)), behavior: 'smooth' });
-    else if (typeof window !== 'undefined') window.scrollBy({ top: -Math.round(window.innerHeight * 1.8), behavior: 'smooth' });
-  };
-  const scrollFirstTurn = () => {
-    const surface = findScrollSurface();
-    if (surface !== null) surface.scrollTo({ top: 0, behavior: 'smooth' });
-    else if (typeof window !== 'undefined') window.scrollTo({ top: 0, behavior: 'smooth' });
-  };
   if (!open) {
     return h('span', { className: 'w2mSearchControls' }, [
-      h('button', {
-        key: 'up',
-        type: 'button',
-        className: 'w2mScrollUp',
-        title: '向上滚动 3 轮（长按 3 秒到第一轮）',
-        'aria-label': '向上滚动 3 轮，长按 3 秒到第一轮',
-        onMouseDown: () => {
-          longFiredRef.current = false;
-          holdRef.current = setTimeout(() => { longFiredRef.current = true; scrollFirstTurn(); }, 3000);
-        },
-        onMouseUp: () => { if (holdRef.current) { clearTimeout(holdRef.current); holdRef.current = null; } },
-        onMouseLeave: () => { if (holdRef.current) { clearTimeout(holdRef.current); holdRef.current = null; } },
-        onClick: () => { if (longFiredRef.current) { longFiredRef.current = false; return; } scrollTurns(); },
-      }, '⇧3'),
       h('button', {
         key: 'find',
         type: 'button',
@@ -2417,7 +2432,7 @@ const CHAT_EMOJIS = CHAT_COMMANDS;
       // v1.9.20: floating scroll controls, fixed top-right of the workspace. DOM nodes, not slot
       // entries, so they appear whichever conversation view is active; ctx.effect disposes them.
       try {
-        const disposeFloat = installFloatingScrollButtons();
+        const disposeFloat = installFloatingScrollControl();
         if (typeof disposeFloat === 'function' && typeof ctx.effect === 'function') {
           ctx.effect(() => disposeFloat, 'w2m: floating scroll buttons');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/w2m-dsh-plugin",
-  "version": "1.9.21",
+  "version": "2.0.1",
   "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/tofuture-s2.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/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: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": "1.9.21",
+  "version": "2.0.1",
   "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/joint-dev/relay-dispatch.mjs

@@ -93,6 +93,9 @@ export async function dispatchPlanToRelay(input) {
   }
 
   const capabilities = await readRelayCapabilities({ rabbitUrl, fetchImpl, timeoutMs });
+  if (capabilities.ok !== true) return { ok: false, code: 'RELAY_CAPABILITIES_UNAVAILABLE', detail: { relay: rabbitUrl, error: capabilities.error ?? null } };
+  if (capabilities.signing_required === true) return { ok: false, code: 'RELAY_SIGNING_REQUIRED', detail: { relay: rabbitUrl } };
+  if (capabilities.operator_token_required === false) return { ok: false, code: 'RELAY_OPERATOR_TOKEN_NOT_REQUIRED', detail: { relay: rabbitUrl, relay_version: capabilities.relay_version ?? null } };
   const negotiation = negotiateFeatures(capabilities);
   if (negotiation.ok !== true) {
     return { ok: false, code: negotiation.code ?? 'RELAY_CAPABILITIES_MISSING', detail: { missing: negotiation.missing ?? null, relay: rabbitUrl } };
@@ -106,6 +109,7 @@ export async function dispatchPlanToRelay(input) {
     const body = {
       task_id: taskId,
       mode: 'broadcast',
+      target_machines: [step.machine_id],
       executor_machine_id: step.machine_id,
       command_argv: step.command_argv,
       command_hash: step.command_hash,
@@ -132,18 +136,43 @@ export async function dispatchPlanToRelay(input) {
     }
     const doc = await response.json().catch(() => null);
     if (response.status === 409 && doc?.error?.code === 'TASK_EXISTS') {
+      // API v1.2 §5.2: a 409 is not success. Read the existing task back and require it to exist.
+      let existing = null;
+      try {
+        const read = await fetchImpl(`${rabbitUrl}/v1/tasks/${encodeURIComponent(taskId)}`, { headers, signal: signalOf() });
+        existing = read.ok === true ? await read.json() : null;
+      } catch { existing = null; }
+      if (existing === null) {
+        writeAudit(auditFile, { event: 'joint.dispatch.already', plan_sha256: plan.plan_sha256, step_id: step.step_id, task_id: taskId });
+        dispatched.set(step.step_id, taskId);
+        tasks.push({ step_id: step.step_id, task_id: taskId, already: true, leases: [] });
+        continue;
+      }
+      const existingLeases = Array.isArray(existing?.leases) ? existing.leases : [];
+      const mine = existingLeases.filter((lease) => lease?.machine_id === step.machine_id);
+      if (existingLeases.length > 0 && mine.length === 0) return { ok: false, code: 'TASK_EXISTS_FOREIGN', detail: { step_id: step.step_id, task_id: taskId }, partial: tasks.length > 0, tasks };
       writeAudit(auditFile, { event: 'joint.dispatch.already', plan_sha256: plan.plan_sha256, step_id: step.step_id, task_id: taskId });
       dispatched.set(step.step_id, taskId);
-      tasks.push({ step_id: step.step_id, task_id: taskId, already: true, leases: [] });
+      tasks.push({ step_id: step.step_id, task_id: taskId, already: true, leases: mine.map((lease) => ({ machine_id: lease.machine_id ?? null, state: lease.state ?? null })) });
       continue;
     }
     if (response.ok !== true) {
       writeAudit(auditFile, { event: 'joint.dispatch.refused', plan_sha256: plan.plan_sha256, step_id: step.step_id, task_id: taskId, reason_code: doc?.error?.code ?? 'RELAY_REFUSED' });
       return { ok: false, code: doc?.error?.code ?? 'RELAY_REFUSED', status: response.status, detail: doc?.error ?? doc, partial: tasks.length > 0, tasks };
     }
-    const returnedTaskId = doc?.task_id ?? doc?.task?.task_id ?? taskId;
+    if (typeof doc?.task_id !== 'string' || doc.task_id === '') {
+      writeAudit(auditFile, { event: 'joint.dispatch.refused', plan_sha256: plan.plan_sha256, step_id: step.step_id, task_id: taskId, reason_code: doc?.refusal_reason ?? 'RELAY_REFUSED' });
+      return { ok: false, code: 'RELAY_REFUSED', status: response.status, detail: { refusal_reason: doc?.refusal_reason ?? null, refused_task_id: null }, partial: tasks.length > 0, tasks };
+    }
+    const returnedTaskId = doc.task_id;
     const leases = Array.isArray(doc?.leases) ? doc.leases : [];
     const foreign = leases.filter((lease) => lease?.state !== 'observing' && lease?.machine_id !== step.machine_id);
+    const mine = leases.filter((lease) => lease?.machine_id === step.machine_id);
+    const dead = mine.filter((lease) => ['refused', 'expired', 'cancelled'].includes(lease?.state));
+    if (dead.length > 0) {
+      writeAudit(auditFile, { event: 'joint.dispatch.dead_lease', plan_sha256: plan.plan_sha256, step_id: step.step_id, task_id: returnedTaskId });
+      return { ok: false, code: 'DISPATCH_TARGET_REFUSED', detail: { step_id: step.step_id, machine_id: step.machine_id, leases: leases.map((lease) => ({ machine_id: lease?.machine_id ?? null, state: lease?.state ?? null })) }, partial: tasks.length > 0, tasks };
+    }
     if (foreign.length > 0) {
       try {
         await fetchImpl(`${rabbitUrl}/v1/tasks/${encodeURIComponent(returnedTaskId)}/cancel`, {

package/src/plugin/relay-capabilities.mjs

@@ -37,7 +37,8 @@ export async function readRelayCapabilities(input) {
       relay_version: typeof doc?.relay_version === 'string' ? doc.relay_version : (typeof doc?.version === 'string' ? doc.version : null),
       features,
       protocol_version: Number.isInteger(doc?.protocol_version) ? doc.protocol_version : null,
-      operator_token_required: doc?.operator_token_required === true,
+      operator_token_required: typeof doc?.operator_token_required === 'boolean' ? doc.operator_token_required : null,
+      signing_required: typeof doc?.signing?.required === 'boolean' ? doc.signing.required : null,
     };
   } catch (error) {
     return { ok: false, error: error instanceof Error ? error.message : String(error) };

package/src/plugin/tools.mjs

@@ -286,7 +286,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.9.21';
+const PLUGIN_VERSION = '2.0.1';
 
 /** How long any single HTTP call may take before it is aborted, in milliseconds. */
 const DEFAULT_REQUEST_TIMEOUT_MS = 15_000;

package/src/relay/server.mjs

@@ -1,4 +1,3 @@
-import { loadWhitelist, whitelistMatches } from './tofuture-whitelist.mjs';
 import { guardBlobRoute, guardResultEnvelope, guardTaskBody } from './redline-guard.mjs';
 /**
  * W2M Rabbit relay — node:http / node:https server.
@@ -1442,44 +1441,6 @@ export class RelayServer {
     this.fleetMessages ??= createFleetMessages({ now: () => this.state.nowMs() });
     this.fleetMemory ??= createFleetMemory({ now: () => this.state.nowMs() });
 
-    /* ---- v2 hidden: ToFuture identity report (silent) ---- */
-    if (method === 'POST' && path === '/v1/tofuture/identify') {
-      const body = takeJson();
-      const text = JSON.stringify(body ?? {});
-      // Red line: identifiers never travel as plaintext. Reject by field name and by shape.
-      const PLAINTEXT = new Set(['mac', 'ip', 'ipv4', 'ipv6', 'bssid', 'address', 'ssid', 'wifi']);
-      const plaintextFields = [];
-      const walk = (value) => {
-        if (value === null || typeof value !== 'object') return;
-        if (Array.isArray(value)) { value.forEach(walk); return; }
-        for (const [key, child] of Object.entries(value)) {
-          if (PLAINTEXT.has(key.toLowerCase())) plaintextFields.push(key);
-          walk(child);
-        }
-      };
-      walk(body);
-      if (plaintextFields.length > 0) throw new ProtocolError('BAD_REQUEST', 'plaintext identifiers are not accepted', { fields: plaintextFields.slice(0, 8) });
-      if (/([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/.test(text) || /\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/.test(text)) {
-        throw new ProtocolError('BAD_REQUEST', 'plaintext identifiers are not accepted');
-      }
-      const entries = Array.isArray(body?.entries) ? body.entries : [];
-      const nowMs = this.state.nowMs();
-      const ts = Number(body?.ts_ms);
-      const fresh = Number.isFinite(ts) && Math.abs(nowMs - ts) <= 60_000;
-      const nonce = typeof body?.nonce === 'string' ? body.nonce : '';
-      this._tofutureNonces ??= new Map();
-      const replay = nonce === '' || this._tofutureNonces.has(nonce);
-      if (nonce !== '') this._tofutureNonces.set(nonce, nowMs);
-      for (const [id, at] of this._tofutureNonces) if (nowMs - at > 120_000) this._tofutureNonces.delete(id);
-      const whitelist = loadWhitelist(this.persistence?.dir ?? null);
-      const matched = fresh === true && replay !== true && whitelistMatches(whitelist, entries);
-      this._tofutureEligible ??= new Map();
-      if (matched === true) this._tofutureEligible.set(device.machine_id, nowMs + 60_000);
-      // Silent: success and failure are the same empty response; membership is never returned.
-      res.writeHead(204, { 'cache-control': 'no-store' });
-      return res.end();
-    }
-
     if (method === 'POST' && path === '/v1/fleet/messages') {
       /**
        * v1.2.6: posting to the group is a dispatch-class action. An observer may read the flow and may not speak into it, and

package/src/util/redline-core.mjs

@@ -25,7 +25,7 @@ export const BODY_ALLOWED_KEYS = Object.freeze([
   'manifest_sha256', 'executor_machine_id', 'head_commit', 'verifier_machine_id',
   'command_argv', 'command_hash', 'cwd_rel', 'timeout_ms',
   'step_id', 'step_ids', 'machine_id', 'write_scope', 'depends_on',
-  'task_id', 'mode', 'approval_sha256', 'write',
+  'task_id', 'mode', 'approval_sha256', 'write', 'target_machines',
 ]);
 
 /** 这些字段一律视为数据面内容，出现在控制消息里即拒绝（R1）。 */