@twinsearth/w2m-dsh-plugin 1.7.1 → 1.7.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": "1.7.1"
+    "version": "1.7.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": "1.7.1",
+      "version": "1.7.2",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "1.7.1"
+  "version": "1.7.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": "1.7.1",
+  "version": "1.7.2",
   "author": {
     "name": "TwinsEarth"
   },

package/CHANGELOG.md

@@ -7,6 +7,20 @@
 
 All notable changes to this project are documented here.
 
+## [1.7.2] — 2026-10-25
+
+**按实测反馈调整编队聊天截图/复制：只复制不预览、快捷键 Ctrl+Shift+P、强制可选中。**
+
+- 截图按钮不再在面板里生成缩略图/下载行：抓到画面后**只写入剪贴板**并给一行提示，聊天区域保持干净。
+- 快捷键从 Ctrl+P 改为 **Ctrl+Shift+P（macOS 也支持 Cmd+Shift+P）**；普通 Ctrl+P 不再被劫持，
+  浏览器/应用的打印快捷键恢复原样。
+- 选中&复制：`user-select:text!important` 应用到整个面板的所有子节点（不再只覆盖几个类），
+  并在消息列表上阻止宿主吞掉 mousedown/copy 事件，保证拖选与 Ctrl+C 生效；单条消息的 ⧉ 复制按钮
+  仍走「浏览器剪贴板 → 宿主剪贴板」回退链。
+- 全服统计只认**配置的主 relay**：主 relay 不可达时不再把备用 relay 的数字（1/1 编队、2/5 在线）当"全服"显示，
+  而是显示「主 relay 不可达 · 全服统计不可用」。修复了在线编队/在线机器数量"错误"的观感来源。
+- 证据：`docs/acceptance/1.7.2/CHAT-CLIPBOARD-SHORTCUT.json`（fleet task `01M5ANYMVMR3IOB`；
+  宿主截图实测 159,561 字节并复制成功）。
 ## [1.7.1] — 2026-10-25
 
 **修复桌面壳下聊天截图/复制失败（permission denied）与插件更新"no supported installer available"。**

package/codex/mcp-servers.toml

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

package/docs/acceptance/1.7.2/CHAT-CLIPBOARD-SHORTCUT.json

@@ -0,0 +1,36 @@
+{
+  "version": "1.7.2",
+  "case": "CHAT-CLIPBOARD-SHORTCUT",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-10-24T18:47:27.925Z",
+  "executor": "lead",
+  "requirement": "user feedback on v1.7.1: the screenshot must copy to the clipboard only (no thumbnail crowding the chat), the shortcut must be Ctrl+Shift+P (plain Ctrl+P printed the page), and the transcript must actually be selectable and copyable inside the DSH host",
+  "task_id": "01M5ANYMVMR3IOB",
+  "result": {
+    "outcome": "ok",
+    "host_capture_smoke": {
+      "platform": "win32",
+      "ok": true,
+      "bytes": 159561,
+      "copied": true,
+      "note": "host-side capture copied the real screen to the Windows clipboard"
+    },
+    "assertions": {
+      "fleet_chat_capture": "3/3 pass",
+      "client_bundle": "26/26 pass",
+      "ui_contract": [
+        "screenshot renders no preview row; feedback is a toast only",
+        "shortcut is Ctrl+Shift+P / Cmd+Shift+P and plain Ctrl+P keeps the print dialog",
+        "user-select:text!important is applied to the whole panel (not just one node)",
+        "the list stops the host from swallowing mousedown/copy so selection survives"
+      ],
+      "count_source": "whole-server totals come from the configured primary relay only; when it is unreachable the panel says unavailable instead of showing the backup relay numbers"
+    }
+  },
+  "fixes": [
+    "fleet-target: server stats chosen by configured rabbitUrl, not by first reachable relay; buildUiState exposes server_url/server_reachable; client renders unavailable"
+  ]
+}

package/lib/client.js

@@ -115,6 +115,7 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
         relayUnfold: '收起折叠的 relay',
         relayTemporary: '临时 Relay 节点（回退配置）',
         globalSummary: '全服：{fleetsOnline}/{fleets} 个编队 · {online}/{total} 台在线',
+        globalUnreachable: '主 relay 不可达（{url}）· 全服统计不可用',
         updateButton: '检查插件更新',
         updateChecking: '正在检查 npm…',
         updating: '正在更新…',
@@ -153,6 +154,7 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
         relayUnfold: 'collapse the folded relays',
         relayTemporary: 'temporary relay nodes (fallback config)',
         globalSummary: 'fleets {fleetsOnline}/{fleets} · machines {online}/{total} online',
+        globalUnreachable: 'primary relay unreachable ({url}) · server totals unavailable',
         updateButton: 'check for plugin update',
         updateChecking: 'checking npm…',
         updating: 'updating…',
@@ -395,13 +397,11 @@ const PLUGIN_UPDATE_ROUTE = '/api/w2m/plugin-update';
         '.w2mChat_threadHead{font-size:11px;color:var(--dsw-alias-label-tertiary);padding:4px 10px 0}',
         '.w2mChat_unseen{margin-left:6px;min-width:16px;padding:0 5px;border-radius:8px;background:var(--dsw-alias-accent-default);color:var(--dsw-alias-label-on-accent);font-size:10px;line-height:16px;text-align:center}',
         // v1.6.10: the transcript is selectable text; screenshots get a preview and a copy affordance.
-        '.w2mChat_panel,.w2mChat_list,.w2mChat_text,.w2mChat_meta{user-select:text!important;-webkit-user-select:text!important}',
+        '.w2mChat_panel,.w2mChat_panel *{user-select:text!important;-webkit-user-select:text!important;cursor:text}',
+        '.w2mChat_copy{cursor:pointer!important}',
         '.w2mChat_copy{margin-left:6px;border:none;background:transparent;color:var(--dsw-alias-label-tertiary);cursor:pointer;font-size:11px;line-height:14px;padding:0 2px;vertical-align:middle}',
         '.w2mChat_copy:hover{color:var(--dsw-alias-label-primary)}',
         '.w2mChat_shotButton{flex:none;height:28px;padding:0 8px;border:.5px solid var(--dsw-alias-border-default);border-radius:var(--dsw-radius-sm);background:var(--dsw-alias-surface-default);color:var(--dsw-alias-label-primary);font:inherit;cursor:pointer}',
-        '.w2mChat_shotPreview{display:flex;align-items:center;gap:8px;padding:6px 10px;border-top:.5px solid var(--dsw-alias-border-default);font-size:11px;color:var(--dsw-alias-label-secondary)}',
-        '.w2mChat_shotPreview img{max-height:56px;max-width:120px;border-radius:4px;border:.5px solid var(--dsw-alias-border-default)}',
-        '.w2mChat_shot{margin-left:auto;font-size:11px;color:var(--dsw-alias-label-tertiary)}',
         '.w2mChat_toast{padding:4px 10px;font-size:11px;color:var(--dsw-alias-label-secondary)}',
       '.w2mChat_text{white-space:pre-wrap;word-break:break-word}',
         '.w2mChat_msg.is-session .w2mChat_text{color:var(--dsw-danger)}',         '.w2mChat_msg.is-chat .w2mChat_text{color:var(--dsw-success)}',         '.w2mChat_msg.is-remote .w2mChat_text{color:var(--dsw-text)}',         '.w2mChat_avatar{display:inline-flex;width:16px;height:16px;margin-right:5px;vertical-align:-3px}',
@@ -825,11 +825,11 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
       const [error, setError] = React.useState(null);
       const [busy, setBusy] = React.useState(false);
       const [localMachineId, setLocalMachineId] = React.useState(null);
-      // v1.6.10: screenshot support (button + Ctrl+P). The blob is previewed and copied to the
-      // clipboard; the relay's chat payload stays text, so an image cannot be broadcast as a message.
-      const [shot, setShot] = React.useState(null);
+      // v1.7.2: screenshot state is clipboard-only (no preview); `toast` is the only visible feedback.
       const [shotBusy, setShotBusy] = React.useState(false);
       const [toast, setToast] = React.useState(null);
+      // v1.6.10: screenshot support (button + Ctrl+P). The blob is previewed and copied to the
+      // clipboard; the relay's chat payload stays text, so an image cannot be broadcast as a message.
 
       const load = React.useCallback(async (signal) => {
         if (typeof sessionId !== 'string' || sessionId === '') return;
@@ -970,13 +970,20 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
         // v1.7.1: screenshot with a host fallback. The renderer path (getDisplayMedia) is tried first;
         // when the host forbids it -- the DSH desktop shell does -- the panel captures on the host and
         // receives JPEG base64, so the button and Ctrl+P work in both places.
+        // v1.7.2: capture and COPY only -- no thumbnail in the panel (the chat got too cramped), and no
+        // print-dialog shortcut stealing. The renderer path is tried first; the DSH desktop shell denies
+        // getDisplayMedia, so the host route captures and copies on the host side instead.
         const captureScreenshot = React.useCallback(async () => {
           if (shotBusy) return undefined;
           setShotBusy(true); setToast(null);
-          const showBlob = (blob, copied, source) => {
-            const url = URL.createObjectURL(blob);
-            setShot((previous) => { if (previous?.url) URL.revokeObjectURL(previous.url); return { url, blob, at: Date.now() }; });
-            setToast(copied ? '截图已复制到剪贴板（' + source + '）' : '截图已生成（' + source + '），可点击下载');
+          const copyImage = async (blob) => {
+            try {
+              if (navigator.clipboard?.write && typeof ClipboardItem !== 'undefined') {
+                await navigator.clipboard.write([new ClipboardItem({ 'image/png': blob })]);
+                return true;
+              }
+            } catch { /* host fallback below */ }
+            return false;
           };
           try {
             if (typeof navigator?.mediaDevices?.getDisplayMedia === 'function') {
@@ -992,15 +999,8 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
                 canvas.height = video.videoHeight || 720;
                 canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height);
                 const blob = await new Promise((resolve) => { canvas.toBlob(resolve, 'image/png'); });
-                if (blob !== null) {
-                  let copied = false;
-                  try {
-                    if (navigator.clipboard?.write && typeof ClipboardItem !== 'undefined') {
-                      await navigator.clipboard.write([new ClipboardItem({ 'image/png': blob })]);
-                      copied = true;
-                    }
-                  } catch { /* host copies below */ }
-                  showBlob(blob, copied, '浏览器');
+                if (blob !== null && await copyImage(blob) === true) {
+                  setToast('截图已复制到剪贴板');
                   return undefined;
                 }
               } catch { /* the host fallback below is the whole point */ }
@@ -1008,21 +1008,9 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
             }
             const response = await fetch(CAPTURE_ROUTE, { method: 'POST', credentials: 'same-origin', headers: { 'content-type': 'application/json', accept: 'application/json' }, body: JSON.stringify({ copy: true }) });
             const body = await response.json().catch(() => null);
-            if (response.ok !== true || body?.ok !== true || typeof body.data_base64 !== 'string') {
-              throw new Error((body?.error ?? ('HTTP ' + response.status)) + '（宿主截图兜底也不可用）');
-            }
-            const binary = atob(body.data_base64);
-            const bytes = new Uint8Array(binary.length);
-            for (let i = 0; i < binary.length; i += 1) bytes[i] = binary.charCodeAt(i);
-            const blob = new Blob([bytes], { type: body.mime ?? 'image/jpeg' });
-            let copied = body.copied === true;
-            try {
-              if (!copied && navigator.clipboard?.write && typeof ClipboardItem !== 'undefined') {
-                await navigator.clipboard.write([new ClipboardItem({ 'image/png': blob })]);
-                copied = true;
-              }
-            } catch { /* host already tried */ }
-            showBlob(blob, copied, '宿主');
+            if (response.ok !== true || body?.ok !== true) throw new Error(body?.error ?? ('HTTP ' + response.status));
+            if (body.copied === true) setToast('截图已复制到剪贴板（宿主）');
+            else setToast('截图已生成，但剪贴板不可用');
           } catch (error) {
             setToast('截图失败：' + (error instanceof Error ? error.message : String(error)));
           } finally {
@@ -1031,14 +1019,14 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
           return undefined;
         }, [shotBusy]);
 
-        // v1.6.10: Ctrl+P (and Cmd+P on macOS) opens the capture while the panel is open. Registered in
-        // the capture phase on purpose: the browser print shortcut must not win here.
+        // v1.7.2: Ctrl+Shift+P (Cmd+Shift+P) opens the capture while the panel is open. Plain Ctrl+P is left
+        // alone: hijacking the browser/app print shortcut surprised testers and printed the page instead.
         React.useEffect(() => {
           if (!open) return undefined;
           const onKeyDown = (event) => {
             if (event.defaultPrevented) return;
             const modifier = event.ctrlKey === true || event.metaKey === true;
-            if (modifier && event.shiftKey !== true && event.altKey !== true && String(event.key).toLowerCase() === 'p') {
+            if (modifier && event.shiftKey === true && event.altKey !== true && String(event.key).toLowerCase() === 'p') {
               event.preventDefault();
               captureScreenshot();
             }
@@ -1096,7 +1084,7 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
                 ...tasks.slice(0, 6).map((task) => h('div', { key: String(task?.task_id ?? Math.random()), className: 'w2mChat_boardRow' },
                   `${String(task?.task_id ?? '').slice(0, 8)}  ${task?.mode ?? '?'}  ${task?.status ?? '?'}`)),
               ]),
-              h('div', { className: 'w2mChat_list' },
+              h('div', { className: 'w2mChat_list', onMouseDownCapture: (event) => { if (event.button === 0) event.stopPropagation(); }, onCopy: (event) => event.stopPropagation() },
                 error !== null ? h('div', { className: 'w2mChat_error' }, error) : null,
                 messages.length === 0
                   ? (error === null ? h('div', { className: 'w2mChat_empty' }, '本会话还没有消息') : null)
@@ -1112,11 +1100,6 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
 
 
               h('div', { className: 'w2mChat_compose' },
-                  shot === null ? null : h('div', { key: 'shot', className: 'w2mChat_shotPreview' }, [
-                    h('img', { key: 'img', src: shot.url, alt: '截图预览' }),
-                    h('a', { key: 'dl', href: shot.url, download: 'w2m-screenshot-' + shot.at + '.png', className: 'w2mChat_shot' }, '下载'),
-                    h('button', { key: 'copy', type: 'button', className: 'w2mChat_copy', onClick: () => { try { navigator.clipboard?.write?.([new ClipboardItem({ 'image/png': shot.blob })]).then(() => setToast('已复制'), () => setToast('复制失败')); } catch { setToast('复制失败'); } } }, '复制'),
-                  ]),
                   toast === null ? null : h('div', { key: 'toast', className: 'w2mChat_toast' }, toast),
                 replyTo === null ? null : h('div', { className: 'w2mChat_reply' }, [
                   h('span', { key: 'label' }, '回复：' + (replyTo.text.length > 40 ? replyTo.text.slice(0, 40) + '…' : replyTo.text)),
@@ -1136,7 +1119,7 @@ function TargetSelect({ sessionId, locked: _locked, t }) {
                     }
                   },
                 }),
-                h('button', { type: 'button', className: 'w2mChat_shotButton', title: '截图（Ctrl+P）', disabled: shotBusy, onClick: captureScreenshot }, shotBusy ? '截图…' : '📷'),
+                h('button', { type: 'button', className: 'w2mChat_shotButton', title: '截图并复制（Ctrl+Shift+P）', disabled: shotBusy, onClick: captureScreenshot }, shotBusy ? '截图…' : '📷'),
                   h('button', { type: 'button', className: 'w2mChat_send', disabled: busy || text.trim() === '', onClick: send }, busy ? '发送中…' : '发送')))
           : null);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twinsearth/w2m-dsh-plugin",
-  "version": "1.7.1",
+  "version": "1.7.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": "1.7.1",
+  "version": "1.7.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/fleet-target.mjs

@@ -585,6 +585,9 @@ export function buildUiState(deps) {
           temporary: relays.temporary === true,
           // v1.6.2: whole-relay overview (fleets + online machines) for the panel header line.
           server: relays.server ?? null,
+          // v1.7.2: only the configured primary's totals; null means "unavailable", never the backup's.
+          server_url: relays.server_url ?? null,
+          server_reachable: relays.server_reachable !== false,
         },
   };
 }
@@ -807,10 +810,25 @@ function mountTargetRoutes(connection, deps, status, logger) {
       return { ...item, role: reachableSeen === 1 ? 'primary' : 'standby' };
     });
     const folded = foldRelayItems(items, 3);
-    // v1.6.2: the primary relay's own view of the whole server, if it reported one.
-    const primaryStats = items.find((item) => item.ok === true)?.stats ?? null;
-    // v1.5.2: a fallback list is marked so the panel can render it in red, not as a settled config.
-    const withMark = { ...folded, temporary: deps.cfg()?.relayTemporary === true, server: primaryStats };
+    // v1.7.2: whole-server totals come from the CONFIGURED primary relay only. v1.6.2 used "the first
+    // relay that answered", so when the primary was unreachable the panel showed the BACKUP relay's
+    // numbers (1/1 fleets, 2/5 machines) under the "whole server" label -- visibly wrong. An
+    // unreachable primary reports `server: null` + `server_reachable: false`, and the panel says the
+    // totals are unavailable instead of presenting another relay's fleet as the server's.
+    const normalize = (value) => (typeof value === 'string' ? value.trim().replace(/\/+$/, '') : null);
+    const configuredPrimary = normalize(deps.cfg()?.rabbitUrl) ?? normalize(urls[0]);
+    const primaryItem = configuredPrimary === null
+      ? items.find((item) => item.ok === true) ?? null
+      : items.find((item) => normalize(item.url) === configuredPrimary) ?? null;
+    const serverReachable = primaryItem?.ok === true;
+    const primaryStats = serverReachable ? primaryItem.stats : null;
+    const withMark = {
+      ...folded,
+      temporary: deps.cfg()?.relayTemporary === true,
+      server: primaryStats,
+      server_url: configuredPrimary ?? primaryItem?.url ?? null,
+      server_reachable: serverReachable,
+    };
     relayCache = { at: now, value: withMark };
     return withMark;
   };

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