@twinsearth/w2m-dsh-plugin 2.0.6 → 2.0.8

package/src/plugin/tools.mjs

@@ -1,4 +1,5 @@
-import { FAILOVER_DEFAULTS, createRelayFailover, relayPool } from './relay-failover.mjs';
+import { FAILOVER_DEFAULTS, createRelayFailover, relayPool } from './relay-failover.mjs';
+import { diagnoseFleetBinding, shouldRejoin } from './fleet-binding.mjs';
 import { DEFAULT_BOOTSTRAP_URL, DEFAULT_BOOTSTRAP_OPERATOR_KEY_PEM } from './bootstrap.mjs';
 /**
  * DSH: Windows2MacO - the DSH Cordis plugin.
@@ -206,7 +207,8 @@ import { buildBoard } from './task-graph.mjs';
 import { verifyEnvelopeSignature } from '../util/envelope-signature.mjs';
 import { createAskStore } from './ask-store.mjs';
 import { deriveTurns } from './turn.mjs';
-import { decryptChatMessage, deriveChatKey, encryptChatText, isEncrypted } from '../util/chat-crypto.mjs';
+import { decryptChatMessage, deriveChatKey, encryptChatText, encryptChatTextV2, isEncrypted } from '../util/chat-crypto.mjs';
+import { chatEncV2Supported } from './chat-v2-gate.mjs';
 
 /**
  * v1.2.6 reliability: two small files beside the plugin's state.
@@ -289,7 +291,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.6';
+const PLUGIN_VERSION = '2.0.8';
 
 /** How long any single HTTP call may take before it is aborted, in milliseconds. */
 const DEFAULT_REQUEST_TIMEOUT_MS = 15_000;
@@ -4996,6 +4998,13 @@ const result = await request({
       };
       })();
 
+      const fleetBinding = await diagnoseFleetBinding({
+        relayUrl: cfg.rabbitUrl,
+        token: device.device_token,
+        machineId: device.machine_id,
+        fleetKey: cfg.fleetKey,
+      });
+
       return JSON.stringify(
         {
           ok: true,
@@ -5019,7 +5028,8 @@ const result = await request({
            */
           rabbit_source: cfg.rabbitSource,
           rabbit_url: cfg.rabbitUrl,
-          p2p: p2pStatus,
+          p2p: p2pStatus,
+          fleet: fleetBinding,
           rtt,
           config: {
             rabbitUrl: cfg.rabbitUrl,
@@ -5029,7 +5039,8 @@ const result = await request({
             projectDir: cfg.projectDir,
             autoStartAgent: cfg.autoStartAgent,
             allowedCommands: cfg.allowedCommands,
-            pairingCode_configured: cfg.pairingCode !== null,
+            pairingCode_configured: cfg.pairingCode !== null,
+            fleetKey_configured: cfg.fleetKey !== null,
             p2pMode: cfg.p2pMode,
             // The resolved list, shared server first, exactly as the node will query it.
             stunServers: cfg.stunServers,
@@ -6989,7 +7000,18 @@ hint: 'the local fleet-memory.md is unchanged; action read/show still reads loca
          */
         const chatKey = deriveChatKey(cfg.fleetKey ?? resolvedFleetKey.value ?? null);
         const plainText = typeof args?.text === 'string' ? args.text : '';
-        const sealed = chatKey === null ? null : encryptChatText(chatKey, plainText);
+        const idempotencyKey = typeof args?.idempotency_key === 'string' && args.idempotency_key.trim() !== ''
+          ? args.idempotency_key.trim()
+          : 'spool-' + Date.now() + '-' + Math.random().toString(36).slice(2);
+        // A7: v2 only when the relay advertises chat-enc-v2 AND this machine has an id to bind. Otherwise
+        // send v1 (every relay accepts it) rather than an unverifiable v2 envelope.
+        const canV2 = chatKey !== null && typeof cfg.machineId === 'string' && cfg.machineId !== ''
+          && await chatEncV2Supported({ rabbitUrl: cfg.rabbitUrl ?? null });
+        const sealed = chatKey === null
+          ? null
+          : (canV2
+            ? encryptChatTextV2(chatKey, plainText, { sessionId, machineId: cfg.machineId, messageId: idempotencyKey })
+            : encryptChatText(chatKey, plainText));
         /**
          * v1.2.6 reliability: an unreachable Rabbit does not lose the message. The exact body that could not be sent is
          * spooled to disk and replayed with the SAME idempotency key next time, so a message the relay actually received
@@ -7001,7 +7023,7 @@ hint: 'the local fleet-memory.md is unchanged; action read/show still reads loca
           ...(sealed !== null && sealed.ok === true ? { enc: sealed.enc } : {}),
           ...addressing,
           ...(mentions.length === 0 ? {} : { mentions }),
-          ...(typeof args?.idempotency_key === 'string' && args.idempotency_key.trim() !== '' ? { idempotency_key: args.idempotency_key.trim() } : { idempotency_key: 'spool-' + Date.now() + '-' + Math.random().toString(36).slice(2) }),
+          ...{ idempotency_key: idempotencyKey },
             ...(typeof args?.reply_state === 'string' && (args.reply_state === 'answered' || args.reply_state === 'refused') ? { reply_state: args.reply_state } : {}),
         };
         let posted = null;
@@ -7058,7 +7080,7 @@ hint: 'the local fleet-memory.md is unchanged; action read/show still reads loca
       const listKey = deriveChatKey(cfg.fleetKey ?? resolvedFleetKey.value ?? null);
       const messages = rawMessages.map((message) => {
         if (!isEncrypted(message)) return message;
-        const opened = decryptChatMessage(listKey, message);
+        const opened = decryptChatMessage(listKey, message, { sessionId: String(query.session_id ?? message.session_id ?? ''), machineId: typeof message.machine_id === 'string' ? message.machine_id : undefined });
         if (opened.ok === true) return { ...message, text: opened.text, decrypted: true };
         return { ...message, text: '', decrypted: false, encrypted: true, decrypt_error: opened.code };
       });
@@ -8017,6 +8039,18 @@ async function startLocalStack(ctx, cfg) {
             if (identityOptions.identity !== undefined && identityOptions.identity !== null) identityOptions.identity.device_token = null;
             ctx.logger?.warn?.('w2m: stored device token was rejected by ' + relayForToken + ' (HTTP ' + probe.status + '); pairing again with the fleet key');
           }
+          if (alreadyPaired && fleetKeyFromConfig !== null) {
+            const binding = await diagnoseFleetBinding({
+              relayUrl: relayForToken,
+              token: existingToken,
+              machineId: loaded.identity.machine_id,
+              fleetKey: fleetKeyFromConfig,
+            });
+            if (shouldRejoin({ token: existingToken, fleetId: binding.fleet_id, fleetKey: fleetKeyFromConfig })) {
+              alreadyPaired = false;
+              ctx.logger?.warn?.('w2m: FLEET_UNBOUND (token valid, fleet_id=null); re-admitting with the configured fleet key');
+            }
+          }
         } catch { /* network error: keep the token, do not force a re-pair */ }
       }
     }