@twinsearth/w2m-dsh-plugin 2.0.0 → 2.0.2

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.0"
+    "version": "2.0.2"
   },
   "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.0",
+      "version": "2.0.2",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "2.0.0"
+  "version": "2.0.2"
 }

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

package/CHANGELOG.md

@@ -7,6 +7,21 @@
 
 All notable changes to this project are documented here.
 
+## [2.0.2] - 2026-10-28
+
+- 滚动按钮移到右下角，与 DSH 官方浮动滚动控件对齐（同右边缘、位于其上方；官方控件出现前后都会重新对齐）。
+- 修复点击无反应：滚动容器改为“试滚探针”（scrollTop ±1 实际是否被浏览器接受）寻找，
+  不再依赖 overflow 样式；命中后直接写 scrollTop。
+- 交互改为：点一次向上滚动约 3 轮；1.2 秒内连续点击 3 次回到第一轮；不再使用长按。
+
+## [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 子插件按该文档

package/codex/mcp-servers.toml

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

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/docs/acceptance/2.0.2/RELEASE-2020.json

@@ -0,0 +1,21 @@
+{
+  "version": "2.0.2",
+  "case": "RELEASE-2020",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T10:09:24.639Z",
+  "executor": "lead",
+  "task_id": "pre-release-2020-1793182164640",
+  "requirement": "v2.0.2：滚动按钮移至右下与官方控件对齐；探针式滚动容器识别修复点击无效；改为点击 3 轮、连续 3 次到顶",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "position": "fixed bottom-right, aligned above the shell floating scroll control",
+      "resolver": "probe scrollTop ±1 acceptance; no overflow-style dependency",
+      "interaction": "click 1/2 scroll 3 turns; third click within 1.2s jumps to top",
+      "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;bottom:132px;z-index:2147483000;display:flex;align-items:center;justify-content:center}',
+  '.w2mScrollFloatBtn{width:36px;height:36px;display:flex;align-items:center;justify-content:center;border-radius:50%;border:1px solid var(--dsw-alias-border-l2, rgba(128,128,128,.4));background:var(--dsw-alias-background-secondary, transparent);color:inherit;opacity:.8;line-height:1;cursor:pointer;padding:0;box-shadow:0 1px 4px rgba(0,0,0,.12)}',
   '.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,64 +1040,143 @@ function paintSearchMarks(query) {
   }
   return total;
 }
+/**
+ * Probe-scroll: assign a tiny scrollTop and see whether the browser keeps it.
+ *
+ * This is the only reliable way to find the conversation surface: overflow styles lie (a shell can
+ * scroll an overflow:hidden element), and a virtualised list may report equal scrollHeight and
+ * clientHeight until it is scrolled. The original scrollTop is restored immediately.
+ */
+function isScrollableElement(el) {
+  if (el === null || el === undefined || el === document.body || el === document.documentElement) return false;
+  if (typeof el.scrollTop !== 'number' || typeof el.scrollHeight !== 'number' || typeof el.clientHeight !== 'number') return false;
+  if (el.scrollHeight <= el.clientHeight + 8) return false;
+  const rect = typeof el.getBoundingClientRect === 'function' ? el.getBoundingClientRect() : null;
+  if (rect !== null && (rect.width < 200 || rect.height < 120)) return false;
+  const before = el.scrollTop;
+  try {
+    el.scrollTop = before + 1;
+    if (el.scrollTop !== before) { el.scrollTop = before; return true; }
+    el.scrollTop = Math.max(0, before - 1);
+    if (el.scrollTop !== before) { el.scrollTop = before; return true; }
+    el.scrollTop = before;
+    return false;
+  } catch {
+    return false;
+  }
+}
 function findScrollSurface() {
   if (typeof document === 'undefined') return null;
-  let best = null;
+  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 && current.parentNode.host ? 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.7], [window.innerWidth * 0.7, window.innerHeight * 0.4]];
+    for (const point of points) {
+      try { addAncestors(document.elementFromPoint(point[0], point[1])); } catch { /* ignore */ }
+    }
+  }
   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;
-    }
+    for (const el of all) if (isScrollableElement(el)) found.add(el);
+  }
+  let best = null;
+  let bestArea = 0;
+  for (const el of found) {
+    const rect = typeof el.getBoundingClientRect === 'function' ? el.getBoundingClientRect() : null;
+    const area = rect === null ? 0 : rect.width * rect.height;
+    if (best === null || area > bestArea) { best = el; bestArea = area; }
   }
   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 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 = Math.max(0, surface.scrollTop - step);
+  else if (typeof window !== 'undefined') window.scrollBy({ top: -step, behavior: 'smooth' });
 }
 function scrollChatTop() {
   const surface = findScrollSurface();
-  if (surface !== null) surface.scrollTo({ top: 0, behavior: 'smooth' });
+  if (surface !== null) surface.scrollTop = 0;
   else 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 circular button, aligned with the shell's own floating scroll 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', '一键到顶');
-  let holdTimer = null;
-  let longFired = false;
-  const clearHold = () => { if (holdTimer !== null) { clearTimeout(holdTimer); holdTimer = null; } };
-  up.addEventListener('pointerdown', (event) => {
-    if (event && typeof event.preventDefault === 'function') event.preventDefault();
-    longFired = false;
-    clearHold();
-    holdTimer = setTimeout(() => { longFired = true; scrollChatTop(); }, 3000);
+  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 clicks = 0;
+  let resetTimer = null;
+  button.addEventListener('click', () => {
+    clicks += 1;
+    if (resetTimer !== null) clearTimeout(resetTimer);
+    if (clicks >= 3) { clicks = 0; scrollChatTop(); return; }
+    scrollChatTurns();
+    resetTimer = setTimeout(() => { clicks = 0; resetTimer = null; }, 1200);
   });
-  for (const type of ['pointerup', 'pointerleave', 'pointercancel']) up.addEventListener(type, clearHold);
-  up.addEventListener('click', () => { if (longFired) { longFired = false; return; } scrollChatTurns(); });
-  top.addEventListener('click', () => scrollChatTop());
+  wrap.appendChild(button);
   document.body.appendChild(wrap);
-  return () => { clearHold(); wrap.remove(); };
+  // Align with the shell's own floating scroll control when it is present: same right edge, just
+  // above it. Re-run on resize because the comparison is against a live bounding rect.
+  const align = () => {
+    let official = null;
+    try {
+      const candidates = [...document.querySelectorAll('button, [role="button"]')];
+      official = candidates.find((el) => {
+        const label = String(el.getAttribute('aria-label') ?? el.getAttribute('title') ?? '');
+        const rect = el.getBoundingClientRect();
+        return /滚动到底部|滚动到顶部|回到底部|back to bottom|scroll to bottom/i.test(label) && rect.width > 0 && rect.height > 0;
+      }) ?? null;
+    } catch { official = null; }
+    if (official === null) {
+      wrap.style.right = '16px';
+      wrap.style.bottom = '132px';
+      return;
+    }
+    const rect = official.getBoundingClientRect();
+    wrap.style.right = Math.max(8, Math.round(window.innerWidth - rect.right)) + 'px';
+    wrap.style.bottom = Math.max(8, Math.round(window.innerHeight - rect.top + 8)) + 'px';
+  };
+  align();
+  for (const delay of [120, 600, 1500]) setTimeout(align, delay);
+  const onResize = () => align();
+  if (typeof window !== 'undefined') window.addEventListener('resize', onResize);
+  return () => {
+    if (resetTimer !== null) clearTimeout(resetTimer);
+    if (typeof window !== 'undefined') window.removeEventListener('resize', onResize);
+    wrap.remove();
+  };
 }
 function ConversationSearch() {
   const [open, setOpen] = React.useState(false);
@@ -1106,8 +1184,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 +1201,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 +2469,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": "2.0.0",
+  "version": "2.0.2",
   "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": {

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.0",
+  "version": "2.0.2",
   "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/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 = '2.0.0';
+const PLUGIN_VERSION = '2.0.2';
 
 /** How long any single HTTP call may take before it is aborted, in milliseconds. */
 const DEFAULT_REQUEST_TIMEOUT_MS = 15_000;