@twinsearth/w2m-dsh-plugin 2.2.5 → 2.2.6

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.2.5"
+    "version": "2.2.6"
   },
   "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.2.5",
+      "version": "2.2.6",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "2.2.5"
+  "version": "2.2.6"
 }

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

package/CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project are documented here.
 
 ## [Unreleased]
 
+## [2.2.6] - 2026-11-14
+
+- Fixes 搜索本对话: the walk covered only the viewport and stopped counting at six matches, so a
+  word that was merely scrolled out of sight reported `0/0` and the feature looked broken. It now
+  searches the whole rendered conversation, counts every match, and wraps up to 120 of them (the cap
+  bounds paint cost, not the count). The count shows `…` while a query is still being applied.
+- The search settles 1s after the last keystroke instead of 3s (the 3s delay was the second half of
+  the same complaint: typing appeared to do nothing). Enter searches immediately.
+- Marks persist after the query settles, so the scroll-triggered repaint is gone; it was re-walking
+  the tree on every scroll for a result that no longer needed refreshing.
+- Tests: the client-bundle suite now asserts the 1s settle, the whole-conversation walk (no
+  viewport rect filter) and the count-every-match cap, instead of the old 3s/six-mark contract.
+
 ## [2.2.5] - 2026-11-12
 
 - DSH 0.2.2-rc.2 compatibility, measured rather than assumed: the packed artifact mounts and boots in

package/README.md

@@ -93,7 +93,7 @@ w2m-mcp --help
 # 复制进你自己的 codex/mcp-servers.toml
 [mcp_servers.w2m]
 command = "npx"
-args = ["-y", "@twinsearth/w2m-dsh-plugin@2.2.5", "w2m-mcp"]
+args = ["-y", "@twinsearth/w2m-dsh-plugin@2.2.6", "w2m-mcp"]
 ```
 
 ### 5. 验证过的 release tarball（离线）

package/codex/mcp-servers.toml

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

package/docs/acceptance/2.2.6/RELEASE-2260.json

@@ -0,0 +1,30 @@
+{
+  "version": "2.2.6",
+  "case": "RELEASE-2260",
+  "kind": "positive",
+  "machines": ["b53a37f4-1464-4512-9259-33a7df091e3e"],
+  "executed_at": "2026-11-13T19:13:00Z",
+  "executor": "lead",
+  "task_id": "pre-release-2260",
+  "requirement": "v2.2.6: the in-conversation search (search conversation, the header magnifier) counts matches across the whole rendered conversation instead of only the viewport, and starts searching 1s after the last keystroke instead of 3s",
+  "commands": [
+    ["node", "--check", "lib/client.js"],
+    ["node", "--test", "--test-force-exit", "test/client-bundle.test.mjs"],
+    ["node", "--test", "--test-force-exit", "test/loader-entry.test.mjs"],
+    ["node", "scripts/pack.mjs"]
+  ],
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "defect": "the walk was restricted to the current viewport and stopped counting at six matches, so a word that existed only above the fold reported 0/0 and the feature looked broken; the 3s settle made every query look ignored for its first three seconds",
+      "scope": "paintSearchMarks walks every text node under the conversation region (falling back to document.body), counts every occurrence, and wraps at most 120 of them -- the cap bounds paint cost, not the count; counting stops at 2000 matches so a one-letter query cannot stall the UI",
+      "settle": "the query settles 1000ms after the last keystroke (was 3000ms); Enter searches immediately; the count shows an ellipsis while the query is still being applied",
+      "no_viewport_filter": "the viewport rectangle filter and its six-match ceiling are gone, and the scroll-triggered repaint is removed because marks persist once painted",
+      "syntax": "node --check lib/client.js: exit 0",
+      "client_bundle": "test/client-bundle.test.mjs 36/36, including the rewritten contract assertions: 1s settle string, no viewportRect, count is ranges.length, no scroll repaint",
+      "loader": "test/loader-entry.test.mjs 10/10 against the packed 2.2.6 artifact in the real DSH 0.2.2-rc.3 desktop runtime (entry active, tools registered, client half composed and activated, page booted in a browser)",
+      "installed": "the packed 2.2.6 tarball is installed in this machine's desktop profile from ~/.dsh/w2m/w2m-dsh-plugin-2.2.6.tgz, so the running app serves the fixed client bundle on its next page load",
+      "artifact": "scripts/pack.mjs packs dist/twinsearth-w2m-dsh-plugin-2.2.6.tgz deterministically from this tree; the published sha256 is the one release.yml writes into dist/SHA256SUMS beside the tarball, so the record does not restate the hash of the archive that contains it"
+    }
+  }
+}

package/lib/client.js

@@ -1109,12 +1109,22 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
      * v1.9.11: in-conversation full-text search with visible yellow highlights.
      *
      * The previous version only called window.find, which the desktop shell does not reliably
-     * surface. This walks the rendered conversation text and registers the matches through the CSS
-     * Custom Highlight API (no DOM mutation, so React's tree stays intact), then scrolls to the
-     * focused match. Matches stay yellow until the query changes or the box closes.
+     * surface. This walks the rendered conversation text and registers the matches through local
+     * `mark` elements (no CSS Custom Highlight dependency, so a match is always visible), then
+     * scrolls to the focused match. Matches stay yellow until the query changes or the box closes.
+     *
+     * v2.2.6: the walk covers the whole rendered conversation, not just the viewport. The old
+     * viewport-only rule reported `0` for text that was merely scrolled out of sight, and capped the
+     * count at six, which made a matching conversation look unsearchable. The cap now only bounds how
+     * many nodes are wrapped (paint cost), never how many matches are counted.
      */
 function searchRoots() {
   const roots = [];
+  if (typeof document === 'undefined' || !document.body) return roots;
+  const region = typeof document.querySelector === 'function'
+    ? (document.querySelector('[data-conversation-region]') ?? document.querySelector('[data-conversation-session]'))
+    : null;
+  const start = region ?? document.body;
   const seen = new Set();
   const visit = (node) => {
     if (!node || seen.has(node)) return;
@@ -1125,7 +1135,8 @@ function searchRoots() {
       for (let i = 0; i < kids.length; i += 1) visit(kids[i]);
     }
   };
-  if (typeof document !== 'undefined' && document.body) { roots.push(document.body); visit(document.body); }
+  roots.push(start);
+  visit(start);
   return roots;
 }
 function clearSearchMarks() {
@@ -1139,28 +1150,25 @@ function clearSearchMarks() {
   }
 }
 /**
- * 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.
+ * Search rules (v2.0.5 UI, revised in v2.2.6): 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). Every rendered match is counted; only the first {@link SEARCH_MAX_MARKS} are wrapped, so a
+ * long conversation stays responsive without making a match outside the viewport invisible.
  */
-const SEARCH_MAX_MARKS = 6;
+const SEARCH_MAX_MARKS = 120;
+/** Hard ceiling on counted matches, so a one-letter query in a huge conversation cannot stall the UI. */
+const SEARCH_MAX_COUNT = 2000;
 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 === '' || !searchQueryAllowed(query)) return 0;
   const needle = query.toLowerCase();
-  const view = viewportRect();
-  let total = 0;
+  const ranges = [];
   outer: for (const root of searchRoots()) {
     let walker;
     try {
@@ -1176,37 +1184,37 @@ function paintSearchMarks(query) {
         },
       });
     } catch { continue; }
-    const nodes = [];
     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 ?? '';
+    while (node !== null) {
+      const text = node.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 (const hit of hits) {
+      while (index >= 0) {
         try {
           const range = document.createRange();
-          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 */ }
+          range.setStart(node, index);
+          range.setEnd(node, index + query.length);
+          ranges.push(range);
+        } catch { /* an unselectable node cannot carry a match */ }
+        if (ranges.length >= SEARCH_MAX_COUNT) break outer;
+        index = lower.indexOf(needle, index + query.length);
       }
+      node = walker.nextNode();
     }
   }
-  return total;
+  // Wrap from the end so the offsets of the matches still ahead of us stay valid: wrapping one range
+  // splits its text node, and a split above an earlier range cannot move that range.
+  const wrapCount = Math.min(ranges.length, SEARCH_MAX_MARKS);
+  for (let i = wrapCount - 1; i >= 0; i -= 1) {
+    const range = ranges[i];
+    try {
+      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);
+    } catch { /* a range that crosses elements cannot be wrapped; it stays counted */ }
+  }
+  return ranges.length;
 }
 /**
  * Probe-scroll: assign a tiny scrollTop and see whether the browser keeps it.
@@ -1440,25 +1448,27 @@ function ConversationSearch() {
   const [query, setQuery] = React.useState('');
   const [count, setCount] = React.useState(0);
   const [cursor, setCursor] = React.useState(-1);
+  const [pending, setPending] = React.useState(false);
   const inputRef = React.useRef(null);
   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).
-  // 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.
+  // v2.2.6: wait 1s after the last keystroke before walking the conversation (the v2.0.5 delay was
+  // 3s, which read as "search does nothing" and was the reported complaint). One pass per settled
+  // query is still what keeps typing cheap; the walk now covers the whole conversation and counts
+  // every match, so a hit outside the current viewport is no longer reported as zero.
   const appliedRef = React.useRef('');
   const paintRef = React.useRef(() => {});
   paintRef.current = (focus = false) => {
     const total = paintSearchMarks(appliedRef.current);
     setCount(total);
     setCursor(total > 0 ? 0 : -1);
+    setPending(false);
     if (focus === true) {
       const first = document.querySelector('mark.w2mSearchMark');
       if (first && first.scrollIntoView) first.scrollIntoView({ block: 'center', behavior: 'smooth' });
     }
   };
   React.useEffect(() => {
-    if (!open) { appliedRef.current = ''; clearSearchMarks(); setCount(0); setCursor(-1); }
+    if (!open) { appliedRef.current = ''; clearSearchMarks(); setCount(0); setCursor(-1); setPending(false); }
   }, [open]);
   React.useEffect(() => {
     if (!open) return undefined;
@@ -1468,25 +1478,13 @@ function ConversationSearch() {
       clearSearchMarks();
       setCount(0);
       setCursor(-1);
+      setPending(false);
       return undefined;
     }
-    const timer = setTimeout(() => { appliedRef.current = query; paintRef.current(true); }, 3000);
+    setPending(true);
+    const timer = setTimeout(() => { appliedRef.current = query; paintRef.current(true); }, 1000);
     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) => {
     if (appliedRef.current === '') return;
     let marks = [...document.querySelectorAll('mark.w2mSearchMark')];
@@ -1519,12 +1517,14 @@ function ConversationSearch() {
       onKeyDown: (event) => {
         if (event.key === 'Enter') {
           event.preventDefault();
-          if (searchQueryAllowed(query)) { appliedRef.current = query; paintRef.current(true); step(event.shiftKey); }
+          if (searchQueryAllowed(query)) { appliedRef.current = query; paintRef.current(true); }
         }
         if (event.key === 'Escape') { setOpen(false); setQuery(''); }
       },
     }),
-    h('span', { key: 'count', className: 'w2mSearchCount' }, count === 0 ? (searchQueryAllowed(query) ? '0' : '') : whenCount(count, cursor)),
+    h('span', { key: 'count', className: 'w2mSearchCount' }, pending
+      ? '…'
+      : (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.2.5",
+  "version": "2.2.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.2.5",
+  "version": "2.2.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/tools.mjs

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