instar 1.3.155 → 1.3.157

package/dist/commands/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAoSH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAwvDD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAyvPtE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAqSH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAqwDD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA0vPtE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}

package/dist/commands/server.js

@@ -59,6 +59,7 @@ import { TriageOrchestrator } from '../monitoring/TriageOrchestrator.js';
 import { SessionMonitor } from '../monitoring/SessionMonitor.js';
 import { SessionRecovery } from '../monitoring/SessionRecovery.js';
 import { MultiMachineCoordinator } from '../core/MultiMachineCoordinator.js';
+import { isRemotelyHandled } from '../core/SessionRouter.js';
 import { resolveAdvertisedMeshUrl, advertiseSelfMeshUrl } from '../core/MeshUrlAdvertiser.js';
 import { GitSyncManager } from '../core/GitSync.js';
 import { RegistrySyncDebouncer } from '../core/RegistrySyncDebouncer.js';
@@ -309,6 +310,10 @@ let _topicResumeMap = null;
 // is byte-identical to today's always-local dispatch. Set once in startServer().
 let _sessionRouter = null;
 let _sessionPoolStage = () => 'dark';
+/** This machine's mesh id — lets the inbound dispatch tell a REMOTE placement
+ *  (forward/spawn on another machine → must NOT also dispatch locally) from a
+ *  self placement. Set once in startServer()'s mesh block. */
+let _meshSelfId = null;
 /** Multi-Machine Session Pool §L4: per-topic placement pin store ("move this to <nickname>"). */
 let _topicPinStore = null;
 /** Recognize + apply a "move/run this on <nickname>" relocation on inbound; returns handled=true when the message WAS a relocation command (so it must not also be dispatched). */
@@ -1202,11 +1207,20 @@ getHubDeps) {
                     payload: text,
                     topicMetadata: _topicPinStore?.asTopicMetadata(String(topicId)),
                 });
-                if (outcome.action === 'forwarded' || outcome.action === 'duplicate') {
+                // Routing-decision observability — the live transfer path is otherwise a black
+                // box (the recognizer logs its pin, but route()'s actual placement/forward
+                // decision was invisible; that hid the bug below from the first live test).
+                console.log(`[session-pool] route topic ${topicId} → action=${outcome.action} owner=${outcome.owner ?? '?'} self=${_meshSelfId ?? '?'}`);
+                // Short-circuit local dispatch whenever the session ended up on ANOTHER machine
+                // (forward/duplicate, OR a fresh remote 'spawned'/'owner-dead-replaced'). Before
+                // this, only 'forwarded'/'duplicate' were caught, so a just-moved topic was
+                // spawned on the target AND injected into the stale local session
+                // (double-dispatch — the bug the first live transfer test surfaced, 2026-05-31).
+                if (isRemotelyHandled(outcome, _meshSelfId)) {
                     console.log(`[session-pool] topic ${topicId} handled by owner ${outcome.owner ?? '?'} (${outcome.action}) — not dispatching locally`);
                     return;
                 }
-                // 'handled-locally' / 'spawned'(self) / 'owner-dead-replaced' / 'queued' /
+                // 'handled-locally' / 'spawned'(self) / 'owner-dead-replaced'(self) / 'queued' /
                 // 'placement-blocked' → fall through to the existing local dispatch below.
             }
             catch (err) {
@@ -8741,6 +8755,7 @@ export async function startServer(options) {
                         now: () => Date.now(),
                     });
                     const peerUrl = (machineId) => meshIdMgr.getActiveMachines().find((m) => m.machineId === machineId)?.entry.lastKnownUrl ?? null;
+                    _meshSelfId = meshSelfId;
                     _sessionRouter = new routerMod.SessionRouter({
                         selfMachineId: meshSelfId,
                         placement: new placeMod.PlacementExecutor(),