@twinsearth/w2m-dsh-plugin 2.0.5 → 2.0.6

package/codex/mcp-servers.toml

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

package/docs/acceptance/2.0.6/RELEASE-2060.json

@@ -0,0 +1,22 @@
+{
+  "version": "2.0.6",
+  "case": "RELEASE-2060",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-28T17:02:50.164Z",
+  "executor": "lead",
+  "task_id": "pre-release-2060-1793206970165",
+  "requirement": "v2.0.6:CI 跨平台修复(realpath 归一) + 搜索规则(纯数字≤100拒绝/视口最多6条/滚动刷新) + 一键到顶等待加载",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "preflight": "16 pass / 0 fail / 1 unverifiable (GREEN)",
+      "tests": "declared suite all pass; client-bundle 27/27",
+      "lint": "0 errors",
+      "pack": "byte-identical; manifest equals tree",
+      "scope": "local code + tests only; release follows via tag v2.0.6"
+    }
+  }
+}

package/lib/client.js

@@ -1100,12 +1100,30 @@ function clearSearchMarks() {
     if (parent.normalize) parent.normalize();
   }
 }
+/**
+ * Search rules (v2.0.5 UI): a pure number up to 100 is not a useful query in a conversation full of
+ * ids/ports/timestamps, so it is refused outright (no marks, no scroll, no count). Only the viewport
+ * is highlighted, at most six matches per screen; scrolling re-runs the pass for the new viewport.
+ */
+const SEARCH_MAX_MARKS = 6;
+function searchQueryAllowed(query) {
+  const text = String(query ?? '').trim();
+  if (text === '') return false;
+  if (/^\d+$/.test(text)) return Number(text) > 100;
+  return true;
+}
+function viewportRect() {
+  const width = typeof window !== 'undefined' ? window.innerWidth : 1024;
+  const height = typeof window !== 'undefined' ? window.innerHeight : 768;
+  return { left: 0, top: 0, right: width, bottom: height };
+}
 function paintSearchMarks(query) {
   clearSearchMarks();
-  if (typeof document === 'undefined' || query === '') return 0;
+  if (typeof document === 'undefined' || query === '' || !searchQueryAllowed(query)) return 0;
   const needle = query.toLowerCase();
+  const view = viewportRect();
   let total = 0;
-  for (const root of searchRoots()) {
+  outer: for (const root of searchRoots()) {
     let walker;
     try {
       walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT, {
@@ -1124,21 +1142,28 @@ function paintSearchMarks(query) {
     let node = walker.nextNode();
     while (node !== null) { nodes.push(node); node = walker.nextNode(); }
     for (const textNode of nodes) {
+      // Cheap pre-filter: a text node whose element is entirely outside the viewport cannot paint.
+      const host = textNode.parentElement;
+      const hostRect = host !== null && typeof host.getBoundingClientRect === 'function' ? host.getBoundingClientRect() : null;
+      if (hostRect !== null && (hostRect.bottom < view.top || hostRect.top > view.bottom)) continue;
       const text = textNode.nodeValue ?? '';
       const lower = text.toLowerCase();
       const hits = [];
       let index = lower.indexOf(needle);
       while (index >= 0) { hits.push(index); index = lower.indexOf(needle, index + query.length); }
-      for (let k = hits.length - 1; k >= 0; k -= 1) {
+      for (const hit of hits) {
         try {
           const range = document.createRange();
-          range.setStart(textNode, hits[k]);
-          range.setEnd(textNode, hits[k] + query.length);
+          range.setStart(textNode, hit);
+          range.setEnd(textNode, hit + query.length);
+          const rect = typeof range.getBoundingClientRect === 'function' ? range.getBoundingClientRect() : null;
+          if (rect !== null && (rect.bottom < view.top || rect.top > view.bottom || rect.right < view.left || rect.left > view.right)) continue;
           const mark = document.createElement('mark');
           mark.className = 'w2mSearchMark';
           mark.setAttribute('style', 'background-color:rgba(255,235,59,.85);color:rgba(11,122,51,1)');
           range.surroundContents(mark);
           total += 1;
+          if (total >= SEARCH_MAX_MARKS) break outer;
         } catch { /* a range that crosses elements cannot be wrapped; skip it */ }
       }
     }
@@ -1381,24 +1406,54 @@ function ConversationSearch() {
   React.useEffect(() => { if (open && inputRef.current && inputRef.current.focus) inputRef.current.focus(); }, [open]);
   // 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);
+  // Rules: a pure number <= 100 is refused; only the viewport is highlighted (max 6) and scrolling
+  // repaints the current viewport without yanking the scroll position.
+  const appliedRef = React.useRef('');
+  const paintRef = React.useRef(() => {});
+  paintRef.current = (focus = false) => {
+    const total = paintSearchMarks(appliedRef.current);
     setCount(total);
     setCursor(total > 0 ? 0 : -1);
-    const first = document.querySelector('mark.w2mSearchMark');
-    if (first && first.scrollIntoView) first.scrollIntoView({ block: 'center', behavior: 'smooth' });
+    if (focus === true) {
+      const first = document.querySelector('mark.w2mSearchMark');
+      if (first && first.scrollIntoView) first.scrollIntoView({ block: 'center', behavior: 'smooth' });
+    }
   };
   React.useEffect(() => {
-    if (!open) { clearSearchMarks(); setCount(0); setCursor(-1); }
+    if (!open) { appliedRef.current = ''; clearSearchMarks(); setCount(0); setCursor(-1); }
   }, [open]);
   React.useEffect(() => {
     if (!open) return undefined;
-    const timer = setTimeout(paintNow, 3000);
+    if (!searchQueryAllowed(query)) {
+      // Refused query: no marks, no count, no scroll — the input itself stays usable.
+      appliedRef.current = '';
+      clearSearchMarks();
+      setCount(0);
+      setCursor(-1);
+      return undefined;
+    }
+    const timer = setTimeout(() => { appliedRef.current = query; paintRef.current(true); }, 3000);
     return () => clearTimeout(timer);
   }, [open, query]);
+  React.useEffect(() => {
+    if (!open) return undefined;
+    let timer = null;
+    const onScroll = () => {
+      if (appliedRef.current === '') return;
+      if (timer !== null) clearTimeout(timer);
+      timer = setTimeout(() => { paintRef.current(false); }, 150);
+    };
+    window.addEventListener('scroll', onScroll, true);
+    return () => {
+      if (timer !== null) clearTimeout(timer);
+      window.removeEventListener('scroll', onScroll, true);
+    };
+  }, [open]);
   const step = (backwards) => {
-    const marks = [...document.querySelectorAll('mark.w2mSearchMark')];
-    if (marks.length === 0) { paintSearchMarks(query); return; }
+    if (appliedRef.current === '') return;
+    let marks = [...document.querySelectorAll('mark.w2mSearchMark')];
+    if (marks.length === 0) { paintRef.current(false); marks = [...document.querySelectorAll('mark.w2mSearchMark')]; }
+    if (marks.length === 0) return;
     const next = (cursor + (backwards ? -1 : 1) + marks.length) % marks.length;
     setCursor(next);
     if (marks[next] && marks[next].scrollIntoView) marks[next].scrollIntoView({ block: 'center', behavior: 'smooth' });
@@ -1424,11 +1479,14 @@ function ConversationSearch() {
       placeholder: '搜索本对话全部内容',
       onChange: (event) => setQuery(event.target.value),
       onKeyDown: (event) => {
-        if (event.key === 'Enter') { event.preventDefault(); paintNow(); step(event.shiftKey); }
+        if (event.key === 'Enter') {
+          event.preventDefault();
+          if (searchQueryAllowed(query)) { appliedRef.current = query; paintRef.current(true); step(event.shiftKey); }
+        }
         if (event.key === 'Escape') { setOpen(false); setQuery(''); }
       },
     }),
-    h('span', { key: 'count', className: 'w2mSearchCount' }, count === 0 ? (query === '' ? '' : '0') : whenCount(count, cursor)),
+    h('span', { key: 'count', className: 'w2mSearchCount' }, count === 0 ? (searchQueryAllowed(query) ? '0' : '') : whenCount(count, cursor)),
     h('button', { key: 'prev', type: 'button', className: 'w2mSearchBtn', title: '上一个', onClick: () => step(true) }, '↑'),
     h('button', { key: 'next', type: 'button', className: 'w2mSearchBtn', title: '下一个', onClick: () => step(false) }, '↓'),
     h('button', { key: 'close', type: 'button', className: 'w2mSearchBtn', title: '关闭搜索', onClick: () => { setOpen(false); setQuery(''); clearSearchMarks(); } }, '×'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/w2m-dsh-plugin",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "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.5",
+  "version": "2.0.6",
   "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/dataplane-sink-route.mjs

@@ -28,7 +28,12 @@ function readConfig(stateDir) {
 }
 
 function insideStateDir(stateDir, target) {
-  const rel = relative(stateDir, target);
+  // Compare canonical paths: Windows temp dirs come back as RUNNER~1 here and runneradmin in the
+  // realpath, and macOS /var is a symlink to /private/var, so a raw prefix test lets an inside path
+  // through on CI even though it is inside the state dir.
+  let base = stateDir;
+  try { base = realpathSync.native ? realpathSync.native(stateDir) : realpathSync(stateDir); } catch { /* keep raw */ }
+  const rel = relative(base, target);
   return rel === '' || (!rel.startsWith('..') && !isAbsolute(rel));
 }
 

package/src/plugin/tools.mjs

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