@twinsearth/w2m-dsh-plugin 1.9.8 → 1.9.10

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.8"
+    "version": "1.9.10"
   },
   "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.8",
+      "version": "1.9.10",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "1.9.8"
+  "version": "1.9.10"
 }

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

package/CHANGELOG.md

@@ -7,6 +7,19 @@
 
 All notable changes to this project are documented here.
 
+## [1.9.10] - 2026-10-28
+
+- 新增 `bin/w2m-self-update.mjs`：可被编队任务直接下发的自更新入口，读取 GitHub Release、校验 SHA256SUMS、调用已验证安装器，输出一行 JSON，不重启 DSH。
+- 固化升级策略：优先下发自更新指令；失败才使用 Node 远程执行回退（macOS 用 mac-self-update，Windows 用 node 替换+备份）。
+- 参数：--profile、--dry-run、--allow-prerelease；环境变量 W2M_PROFILE_DIR / W2M_UPDATE_REPO。
+
+## [1.9.9] - 2026-10-28
+
+- 对话主工作区新增全文搜索：会话头部（置顶按钮同排）🔍 图标，点击展开搜索框，Enter/Shift+Enter 或 ↑/↓ 在已渲染对话中查找并高亮（Electron/Chromium find）。
+
+- 修复 Windows「立即更新」失败：dsh 以 dsh.cmd 安装时，child_process.spawn(shell:false) 会报 EINVAL。现在 Windows 下不再把 .cmd/.bat 当作可直接执行计划，自动改用运行时 pnpm；若 dsh 计划出现 EINVAL，也会回退 pnpm 重试一次。
+- 新增回归测试：.cmd 计划被拒绝并走 pnpm；spawn 失败仍回滚。
+
 ## [1.9.8] - 2026-10-28
 
 - 左栏 GPW 入口改为纯图标（🌐），去掉重复的文字条目。

package/bin/w2m-self-update.mjs

@@ -0,0 +1,107 @@
+#!/usr/bin/env node
+/**
+ * Remote-triggerable, verified self-update for the W2M plugin.
+ *
+ * Fleet policy (operator): a machine is upgraded by dispatching this script as a task
+ * (`node <profile>/node_modules/@twinsearth/w2m-dsh-plugin/bin/w2m-self-update.mjs`), and only
+ * when that fails is a Node remote-execution fallback used. This file is therefore headless:
+ * it checks the configured GitHub release, verifies the published sha256, installs through the
+ * same updater the plugin UI uses, and prints one JSON line. It never restarts DSH.
+ *
+ * Usage:
+ *   node bin/w2m-self-update.mjs [--profile <dir|name>] [--dry-run] [--allow-prerelease] [--json]
+ *
+ * Exit codes: 0 installed or already current; 1 check/install failed; 2 usage error.
+ */
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+import { createAutoUpdater, findProfileDir } from '../src/plugin/auto-update.mjs';
+
+const DEFAULT_REPO = 'TwinsEarth/dsh-windows2macos';
+const PACKAGE_NAME = '@twinsearth/w2m-dsh-plugin';
+
+function parseArgs(argv) {
+  const args = { profile: null, dryRun: false, allowPrerelease: false };
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i];
+    if (arg === '--profile') { args.profile = argv[i + 1] ?? null; i += 1; continue; }
+    if (arg === '--dry-run') { args.dryRun = true; continue; }
+    if (arg === '--allow-prerelease') { args.allowPrerelease = true; continue; }
+    if (arg === '--help' || arg === '-h') { args.help = true; continue; }
+    if (arg === '--json') { args.json = true; continue; }
+    args.unknown = arg;
+  }
+  return args;
+}
+
+function readInstalledVersion(profileDir) {
+  try {
+    const manifest = JSON.parse(readFileSync(join(profileDir, 'node_modules', ...PACKAGE_NAME.split('/'), 'package.json'), 'utf8'));
+    return typeof manifest.version === 'string' ? manifest.version : null;
+  } catch {
+    return null;
+  }
+}
+
+function resolveProfile(input) {
+  if (input !== null) {
+    if (existsSync(input)) return input;
+    // A bare profile name resolves under the DSH home directory.
+    const named = join(process.env.DSH_HOME ?? join(process.env.USERPROFILE ?? process.env.HOME ?? '', '.dsh'), 'profiles', input);
+    if (existsSync(named)) return named;
+    return null;
+  }
+  if (typeof process.env.W2M_PROFILE_DIR === 'string' && existsSync(process.env.W2M_PROFILE_DIR)) return process.env.W2M_PROFILE_DIR;
+  return findProfileDir() ?? null;
+}
+
+const args = parseArgs(process.argv.slice(2));
+if (args.help === true) {
+  process.stdout.write(
+    'Usage: w2m-self-update [--profile <dir|name>] [--dry-run] [--allow-prerelease]\n' +
+    'Checks GitHub releases, verifies sha256, installs the newer plugin build for the next start.\n',
+  );
+  process.exit(0);
+}
+if (args.unknown !== undefined) {
+  process.stderr.write(`unknown argument: ${args.unknown}\n`);
+  process.exit(2);
+}
+
+const profileDir = resolveProfile(args.profile);
+if (profileDir === null) {
+  process.stdout.write(JSON.stringify({ ok: false, outcome: 'error', error: 'no DSH profile directory found; pass --profile <dir>' }) + '\n');
+  process.exit(2);
+}
+
+const currentVersion = readInstalledVersion(profileDir);
+const updater = createAutoUpdater({
+  profileDir,
+  currentVersion,
+  repo: process.env.W2M_UPDATE_REPO ?? DEFAULT_REPO,
+  dryRun: args.dryRun,
+  allowPrerelease: args.allowPrerelease,
+  enabled: false,
+});
+
+let result;
+try {
+  result = await updater.check('manual');
+} catch (error) {
+  process.stdout.write(JSON.stringify({ ok: false, outcome: 'error', error: error instanceof Error ? error.message : String(error) }) + '\n');
+  process.exit(1);
+}
+
+const outcome = result?.outcome ?? 'unknown';
+const ok = result?.ok === true && (outcome === 'installed' || outcome === 'up-to-date' || outcome === 'current' || outcome === 'skipped');
+process.stdout.write(JSON.stringify({
+  ok,
+  outcome,
+  current: currentVersion,
+  latest: result?.tag ?? result?.to ?? null,
+  reason: result?.reason ?? null,
+  error: result?.error ?? null,
+  restart_required: outcome === 'installed',
+}) + '\n');
+process.exit(ok ? 0 : 1);

package/codex/mcp-servers.toml

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

package/docs/acceptance/1.9.10/RELEASE-1910.json

@@ -0,0 +1,21 @@
+{
+  "version": "1.9.10",
+  "case": "RELEASE-1910",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-27T23:24:12.342Z",
+  "executor": "lead",
+  "task_id": "pre-release-1910-1793143452343",
+  "requirement": "V1.9.10：可下发的自更新 CLI 与编队升级策略",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "cli": "bin/w2m-self-update.mjs --help exit 0",
+      "dry_run": "current 1.9.9, latest v1.9.9, skipped, exit 0",
+      "policy": "prefer dispatch; Node remote-execution fallback; operator token required",
+      "gates": "full suite + preflight expected GREEN before tag"
+    }
+  }
+}

package/docs/acceptance/1.9.9/RELEASE-199.json

@@ -0,0 +1,21 @@
+{
+  "version": "1.9.9",
+  "case": "RELEASE-199",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-27T22:54:14.249Z",
+  "executor": "lead",
+  "task_id": "pre-release-199-1793141654250",
+  "requirement": "V1.9.9：修复 Windows 立即更新 spawn EINVAL（dsh.cmd），回退运行时 pnpm",
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "plan": "win32 .cmd/.bat shim never selected",
+      "fallback": "EINVAL on dsh plan retries once with runtime pnpm",
+      "tests": "update-install 28/28 green",
+      "gates": "full suite + preflight expected GREEN before tag"
+    }
+  }
+}

package/lib/client.js

@@ -499,6 +499,12 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
   '.w2mChat_emoji{padding:2px 4px;border:0;background:transparent;font-size:16px;line-height:1;cursor:pointer}',
   '.w2mFleetStatus{display:flex;gap:16px;align-items:center;padding:2px 12px;font-size:11px;opacity:.8;white-space:nowrap}',
   '.w2mFleetStatusItem{white-space:nowrap}',
+    '.w2mSearchToggle{height:26px;width:26px;border:0;border-radius:6px;background:transparent;color:inherit;font-size:14px;cursor:pointer}',
+  '.w2mSearchToggle:hover{background:rgba(127,127,127,.14)}',
+  '.w2mSearchBox{display:flex;align-items:center;gap:4px;padding:2px 4px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-background-secondary)}',
+  '.w2mSearchInput{height:24px;min-width:220px;border:0;background:transparent;color:inherit;font:inherit;outline:none}',
+  '.w2mSearchBtn{height:24px;min-width:24px;border:0;border-radius:4px;background:transparent;color:inherit;cursor:pointer}',
+  '.w2mSearchBtn:hover{background:rgba(127,127,127,.14)}',
     '.w2mGpw_admin{padding:24px 32px 48px;box-sizing:border-box;max-width:1400px;margin:0 auto;color:var(--dsw-alias-label-primary);font-size:13px}',
   '.w2mGpw_adminHead{margin-bottom:16px}',
   '.w2mGpw_adminTitle{margin:0 0 6px;font-size:22px;line-height:30px;font-weight:600}',
@@ -794,7 +800,6 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
         },
       }, [
         h('span', { key: 'i', className: 'w2mGpw_sideIcon', 'aria-hidden': 'true' }, '🌐'),
-        h('span', { key: 'l', className: 'w2mGpw_sideLabel' }, 'GPW'),
       ]);
     }
 
@@ -925,6 +930,52 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
       ]);
     }
 
+    /**
+     * v1.9.9: in-conversation full-text search. The icon sits in the session header next to Pin; the
+     * search itself uses the browser's own find (Electron/Chromium), which highlights and scrolls the
+     * rendered conversation without reading private session data through a plugin API.
+     */
+    function ConversationSearch() {
+      const [open, setOpen] = React.useState(false);
+      const [query, setQuery] = React.useState('');
+      const inputRef = React.useRef(null);
+      React.useEffect(() => { if (open && inputRef.current && inputRef.current.focus) inputRef.current.focus(); }, [open]);
+      const find = (backwards) => {
+        if (query === '') return;
+        try {
+          if (typeof window !== 'undefined' && typeof window.find === 'function') {
+            window.find(query, false, backwards === true, true);
+          }
+        } catch { /* find is best effort, never a crash */ }
+      };
+      if (!open) {
+        return h('button', {
+          type: 'button',
+          className: 'w2mSearchToggle',
+          title: '搜索本对话',
+          'aria-label': '搜索本对话',
+          onClick: () => setOpen(true),
+        }, '🔍');
+      }
+      return h('div', { className: 'w2mSearchBox' }, [
+        h('input', {
+          key: 'q',
+          ref: inputRef,
+          className: 'w2mSearchInput',
+          value: query,
+          placeholder: '搜索本对话全部内容',
+          onChange: (event) => setQuery(event.target.value),
+          onKeyDown: (event) => {
+            if (event.key === 'Enter') { event.preventDefault(); find(event.shiftKey); }
+            if (event.key === 'Escape') { setOpen(false); setQuery(''); }
+          },
+        }),
+        h('button', { key: 'prev', type: 'button', className: 'w2mSearchBtn', title: '上一个', onClick: () => find(true) }, '↑'),
+        h('button', { key: 'next', type: 'button', className: 'w2mSearchBtn', title: '下一个', onClick: () => find(false) }, '↓'),
+        h('button', { key: 'close', type: 'button', className: 'w2mSearchBtn', title: '关闭搜索', onClick: () => { setOpen(false); setQuery(''); } }, '×'),
+      ]);
+    }
+
     /** v1.9.4: the GPW tab in Settings, between Models and Plugins. */
     function GpwSettingsPage({ t }) {
       return h('div', { className: 'w2mGpw_settingsBody' }, h(GpwPanel, { t, sessionId: undefined, inline: true, onClose: () => {} }));
@@ -2060,7 +2111,7 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
             name: 'sidebar.panellist',
             id: 'w2m-gpw',
             order: 4,
-            label: () => 'GPW',
+            label: () => '',
             inject: () => ({}),
           }, GpwSidebarIcon));
         } catch (error) {
@@ -2128,6 +2179,18 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
 
 
 
+      // v1.9.9: in-conversation search, in the session header next to Pin.
+      try {
+        slots.inject('conversation.session.header.actions', () => slots.register({
+          name: 'conversation.session.header.actions',
+          id: 'w2m-conversation-search',
+          order: 90,
+          label: () => '搜索本对话',
+          inject: () => ({}),
+        }, ConversationSearch));
+      } catch (error) {
+        console.error('@twinsearth/w2m-dsh-plugin: the conversation search control was not mounted', error);
+      }
       // v1.9.6: fleet chat as a real conversation View tab (after Chat and Rules), rendering the
       // full chat page in the main workspace.
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/w2m-dsh-plugin",
-  "version": "1.9.8",
+  "version": "1.9.10",
   "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": {
@@ -205,7 +205,8 @@
     "w2m-secondary-link": "bin/w2m-secondary-link.mjs",
     "w2m-bootstrap": "bin/w2m-bootstrap.mjs",
     "w2m-bootstrap-sign": "bin/w2m-bootstrap-sign.mjs",
-    "w2m-hidden-task": "bin/w2m-hidden-task.mjs"
+    "w2m-hidden-task": "bin/w2m-hidden-task.mjs",
+    "w2m-self-update": "bin/w2m-self-update.mjs"
   },
   "disclosure": {
     "cloud": true,

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.8",
+  "version": "1.9.10",
   "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

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

package/src/plugin/update-install.mjs

@@ -316,8 +316,12 @@ export function planInstall(input) {
   const dshPath = input.dshPath ?? null;
   const pnpmPath = input.pnpmPath ?? null;
   const nodePath = input.nodePath ?? process.execPath;
+  // v1.9.9: a .cmd/.bat shim is a Windows shell script; spawn(shell:false) refuses it with EINVAL
+  // ("could not run dsh (EINVAL: spawn EINVAL)"), and no other platform can execute it either.
+  // Only a directly executable path may take the dsh plan; anything else uses the runtime pnpm.
+  const dshSpawnable = dshPath !== null && !/\.(cmd|bat)$/i.test(dshPath);
 
-  if (dshPath) {
+  if (dshSpawnable) {
     return {
       via: 'dsh',
       // `dsh plugin --profile <name> add <tarball>` is the supported surface;
@@ -531,7 +535,7 @@ export async function installUpdate(options = {}) {
   const packageName = manifest?.name ?? options.packageName ?? DEFAULT_PACKAGE_NAME;
   const from = readInstalledVersion(absoluteProfile, packageName);
 
-  const plan = planInstall({
+  let plan = planInstall({
     profileDir: absoluteProfile,
     profileName,
     stagedTarball,
@@ -639,6 +643,21 @@ export async function installUpdate(options = {}) {
     };
   }
 
+  // v1.9.9: a spawn-level failure on the dsh plan (EINVAL/ENOENT) is retried once with the runtime
+  // pnpm, because that is the installer the same machine already uses successfully.
+  if (result?.spawnError?.code === 'EINVAL' && plan.via === 'dsh' && pnpmPath) {
+    const fallback = planInstall({ profileDir: absoluteProfile, profileName, stagedTarball, dshPath: null, pnpmPath, nodePath });
+    if (fallback !== null) {
+      step('dsh could not be spawned; retrying with the runtime pnpm');
+      plan = fallback;
+      try {
+        result = await runner({ argv: plan.argv, cwd: plan.cwd, via: plan.via });
+      } catch (error) {
+        result = { code: null, stdout: '', stderr: '', spawnError: { code: 'RUNNER_THREW', message: String(error?.message ?? error) }, timedOut: false };
+      }
+    }
+  }
+
   const stderrTail = tailBytes(result?.stderr ?? '', stderrTailBytes);
   const stdoutTail = tailBytes(result?.stdout ?? '', stderrTailBytes);
   const spawnFailed = result?.spawnError ?? null;