@twinsearth/w2m-dsh-plugin 1.1.22 → 1.2.0

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

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

package/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 All notable changes to this project are documented here.
 
+## [1.2.0] — 2026-10-18
+
+**Fleet chat is one group per relay.**
+
+The conversation used to be keyed from `process.cwd()`, which is the DSH process's own directory and differs per machine
+(`E:\DS` here, `/root` there). Two machines therefore computed two different keys and each panel saw only its own messages:
+"互相收不到队员聊天信息". The rule is now the simplest one that makes a fleet talk: **the relay is the group**.
+
+- one relay → one conversation, whatever project a machine is working on;
+- a trailing slash on the relay URL is the same relay;
+- the project name and the account key are deliberately NOT part of the basis: including either split the fleet into
+  separate streams, which is exactly the bug;
+- the machine id remains only as a last resort when no relay is configured, so a panel can still answer locally.
+
+### What was removed, and why it is not a loss
+
+Two intermediate designs were built and dropped in this release: keying per project (relay + project name) and a
+"同步编队全部项目" scope button that switched between the project stream and the fleet stream. With the relay as the group
+there is nothing to switch to, so the button and its scope parameter are gone rather than left as a no-op. The panel is
+simpler and the operator gets the fleet-wide conversation by default.
+
+### Verified
+
+`conversationBasis` is pure and tested: same relay unites two machines, a trailing slash does not split them, different
+relays stay apart, and a host without a relay falls back to the machine scope. 4 identity tests, 25 client-bundle tests,
+tools 122. Gate GREEN twice, 15 of 15.
+
+### Not verified
+
+Two-machine end-to-end against a live fleet; that check needs both machines on this build, which is the next step.
 ## [1.1.22] — 2026-10-18
 
 **The fleet-chat panel said "this machine has no fleet-chat identity yet" on a machine that was paired and online.**

package/codex/mcp-servers.toml

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

package/lib/client.js

@@ -693,7 +693,7 @@ window.__ModuleLoader__.load({
           : null;
         const mine = id === localMachineId;
         const name = known?.name ?? message?.machine_name ?? (mine ? localMachineName : null);
-        const detail = mine ? '本机' : (known?.os ?? null);
+        const detail = mine ? '\u672c\u673a' : (known?.os ?? null);
         // A machine with no name yet is shown by a short id, never by a full UUID, and the detail says which of the
         // two it is -- "unknown" next to a UUID is what made the panel look like it was leaking identifiers.
         const shown = name ?? (id.length > 12 ? `${id.slice(0, 8)}…` : id);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "@twinsearth/w2m-dsh-plugin",
-    "version":  "1.1.22",
+    "version":  "1.2.0",
     "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",
     "main":  "lib/index.js",

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.1.22",
+    "version":  "1.2.0",
     "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-chat-route.mjs

@@ -19,7 +19,7 @@ import { readFileSync, readdirSync, statSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import {
-  conversationKey as deriveConversationKey, decodeTranscript, extractUserMessages, sessionDirName,
+  decodeTranscript, extractUserMessages, sessionDirName,
 } from './session-watch.mjs';
 import { createSessionSync } from './session-sync.mjs';
 
@@ -56,7 +56,17 @@ const NO_STORE = { 'cache-control': 'no-store' };
  */
 export function registerChatRoutes(ctx, deps) {
   const status = { mounted: false, reason: 'the host has no Connection service' };
-  const cwd = process.cwd();
+  /**
+   * The project this conversation belongs to.
+   *
+   * NOT `process.cwd()`: that is the DSH host's own directory, which differs per machine (E:\DS on one box, /root on
+   * another), so the derived conversation key differed per machine and every panel saw only its own messages. The
+   * operator's rule is account + project NAME; the name has to come from the project this plugin was configured for.
+   */
+  const projectDirOf = () => {
+    const configured = deps.cfg()?.projectDir;
+    return typeof configured === 'string' && configured !== '' ? configured : process.cwd();
+  };
   const sync = createSessionSync({ conversationKey: 'pending', machineId: 'pending', machineName: null });
 
   /**
@@ -81,15 +91,13 @@ export function registerChatRoutes(ctx, deps) {
       // Nothing can be keyed without a machine, and inventing one would put unrelated hosts in one conversation.
       return { error: 'CHAT_NO_IDENTITY', machineId: null, machineName: null, conversationKey: null, source: null };
     }
-    const material = typeof deps.accountMaterial === 'function' ? deps.accountMaterial() : null;
-    const basis = conversationBasis({ machineId, accountMaterial: material });
-    const fingerprint = createHash('sha256')
-      .update('w2m-conversation-basis-v1').update('\\u0000').update(basis.basis).digest('hex');
+    const basis = conversationBasis({ machineId, relayUrl: deps.cfg()?.rabbitUrl ?? null });
     resolved = {
       error: null,
       machineId,
       machineName: typeof local?.machine_name === 'string' ? local.machine_name : null,
-      conversationKey: deriveConversationKey(fingerprint, cwd),
+      // One group per relay: every machine in this fleet shares this conversation, whatever its project.
+      conversationKey: createHash('sha256').update('w2m-fleet-conversation-v1').update(basis.basis).digest('hex'),
       source: basis.source,
     };
     return resolved;
@@ -118,7 +126,7 @@ export function registerChatRoutes(ctx, deps) {
   const mirrorOnce = async () => {
     const identity = await identityOf();
     if (identity.conversationKey === null) return;
-    const file = newestTranscript(cwd);
+    const file = newestTranscript(projectDirOf());
     if (file === null) return;
     let messages;
     try { messages = extractUserMessages(decodeTranscript(readFileSync(file))); } catch { return; }
@@ -153,6 +161,9 @@ export function registerChatRoutes(ctx, deps) {
 
           const url = new URL(request.url);
           const sessionIdOf = (value) => (typeof value === 'string' ? value.trim() : '');
+          // "All projects in this fleet" is an explicit scope, not the default: the operator presses a button for it.
+          // Its key is the relay alone -- deliberately NOT the project name -- so every machine in the fleet
+          // lands in one stream. It is not a history fetch: the caller sends a floor timestamp (see the panel).
           let sessionId = '';
           let text = null;
           if (request.method === 'GET') {
@@ -167,14 +178,12 @@ export function registerChatRoutes(ctx, deps) {
             sessionId = sessionIdOf(body?.session_id);
             text = typeof body?.text === 'string' ? body.text : null;
           }
-           const identity = await identityOf();
-           if (identity.error !== null) {
-             return refuse(503, identity.error, 'this machine has no fleet-chat identity yet', 'pair the machine and let it derive the fleet key');
-           }
-           // v1.1.20: the browser's session id is per-machine and no other machine can compute it, so the wire key is the
-           // conversation key (account + project directory). The browser's value is accepted and then replaced.
-           sessionId = identity.conversationKey;
-          if (sessionId === '') return refuse(400, 'CHAT_SESSION_ID_REQUIRED', '`session_id` is required', 'chat is scoped to one conversation');
+          const identity = await identityOf();
+          if (identity.error !== null) {
+            return refuse(503, identity.error, 'this machine has no fleet-chat identity yet', 'pair the machine and let it derive the fleet key');
+          }
+          // One group per relay: the browser sends its own session id, which is replaced here.
+          sessionId = identity.conversationKey;
           if (sessionId.length > MAX_SESSION_ID_LENGTH) {
             return refuse(400, 'CHAT_SESSION_ID_TOO_LONG', `\`session_id\` must be at most ${MAX_SESSION_ID_LENGTH} characters`, 'send the id the host gave this session');
           }
@@ -232,22 +241,23 @@ export function registerChatRoutes(ctx, deps) {
   });
   return status;
 }
-
-/**
- * The material a conversation is keyed from, and which scope it represents.
- *
- * The account key is the right basis -- two machines on the same account and the same project are one conversation. But
- * the account key is derived asynchronously at stack start, and a panel that cannot answer at all is worse than a panel
- * that answers for one machine until the join lands. So the machine id is the documented fallback, and the answer says
- * which basis it used rather than leaving the caller to guess.
- *
- * @param {{machineId?: string|null, accountMaterial?: string|null}} input
- * @returns {{basis: string, source: 'account'|'machine'}|null} null when there is no machine to key on
- */
-export function conversationBasis({ machineId, accountMaterial } = {}) {
-  const machine = typeof machineId === 'string' && machineId !== '' ? machineId : null;
-  if (machine === null) return null;
-  const account = typeof accountMaterial === 'string' && accountMaterial.trim() !== '' ? accountMaterial.trim() : null;
-  if (account !== null) return { basis: 'account:' + account, source: 'account' };
-  return { basis: 'machine:' + machine, source: 'machine' };
-}
+
+/**
+ * The material a conversation is keyed from.
+ *
+ * The operator's rule, in its simplest form: **one relay is one group**. Every machine talking to the same relay shares
+ * one conversation, whatever project it is working on. Neither the project name nor the account key is part of the basis:
+ * including either split the fleet into separate streams, which is the report this replaces.
+ *
+ * The machine id stays only as a last resort for a host with no relay configured, so the panel can still answer locally.
+ *
+ * @param {{machineId?: string|null, relayUrl?: string|null}} input
+ * @returns {{basis: string, source: 'fleet'|'machine'}|null} null when there is no machine to key on
+ */
+export function conversationBasis({ machineId, relayUrl } = {}) {
+  const machine = typeof machineId === 'string' && machineId !== '' ? machineId : null;
+  if (machine === null) return null;
+  const relay = typeof relayUrl === 'string' && relayUrl.trim() !== '' ? relayUrl.trim().replace(/\/+$/, '') : null;
+  if (relay !== null) return { basis: 'fleet:' + relay, source: 'fleet' };
+  return { basis: 'machine:' + machine, source: 'machine' };
+}

package/src/plugin/tools.mjs

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