instar 1.3.166 → 1.3.168

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;AAsSH,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,CA6xPtE;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;AAuSH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA+wDD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAqzPtE;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

@@ -61,6 +61,7 @@ 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 { formatForwardedTopicContext } from '../core/ForwardedTopicContext.js';
 import { resolveAdvertisedMeshUrl, advertiseSelfMeshUrl } from '../core/MeshUrlAdvertiser.js';
 import { GitSyncManager } from '../core/GitSync.js';
 import { RegistrySyncDebouncer } from '../core/RegistrySyncDebouncer.js';
@@ -315,6 +316,11 @@ let _sessionPoolStage = () => 'dark';
  *  (forward/spawn on another machine → must NOT also dispatch locally) from a
  *  self placement. Set once in startServer()'s mesh block. */
 let _meshSelfId = null;
+/** Resolve the current router (Telegram-owning lease holder)'s base URL, or null if
+ *  this machine IS the router / none is known. Used by the owner-side resume to fetch
+ *  a moved topic's prior history from the router (bug #2). Set in the mesh block where
+ *  the peer-URL resolver + coordinator are in scope. */
+let _resolveRouterUrl = 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). */
@@ -350,7 +356,7 @@ let _slackAdapter = null;
 // Null until startServer constructs it; the Telegram /restart handler falls
 // back to the inline kill+respawn path when null (e.g. early in boot).
 let _sessionRefresh = null;
-async function spawnSessionForTopic(sessionManager, telegram, sessionName, topicId, latestMessage, topicMemory, userProfile) {
+async function spawnSessionForTopic(sessionManager, telegram, sessionName, topicId, latestMessage, topicMemory, userProfile, precomputedContext) {
     const msg = latestMessage || 'Session started — send a message to continue.';
     // If memory is elevated/critical and we have the reaper, try to free memory
     // by cleaning orphans before spawning. Interactive sessions are NEVER blocked
@@ -367,10 +373,14 @@ async function spawnSessionForTopic(sessionManager, telegram, sessionName, topic
             }
         }
     }
-    let contextContent = '';
+    // bug #2: a session MOVED here by the session pool has no local history (this
+    // machine never polled the topic; its TopicMemory has no rows). The router relays
+    // the prior conversation as precomputedContext — use it verbatim and skip the
+    // (empty) local sources, so a moved session continues instead of starting blank.
+    let contextContent = precomputedContext ?? '';
     // Prefer TopicMemory (SQLite-backed, with summaries) over raw JSONL scan
     let usedFallback = false;
-    if (topicMemory?.isReady()) {
+    if (!contextContent && topicMemory?.isReady()) {
         try {
             contextContent = topicMemory.formatContextForSession(topicId, 50);
         }
@@ -8687,7 +8697,28 @@ export async function startServer(options) {
                                 ? String(cmd.payload.text)
                                 : undefined;
                         const sessionName = tg.getSessionForTopic(topicId) ?? `topic-${topicId}`;
-                        void spawnSessionForTopic(sessionManager, tg, sessionName, topicId, text, undefined, undefined)
+                        // bug #2: fetch the prior conversation from the router (this machine's local
+                        // history for the topic is empty) so the moved session continues with context
+                        // instead of starting blank. Best-effort — on any failure we spawn without it.
+                        void (async () => {
+                            let movedContext;
+                            try {
+                                const url = _resolveRouterUrl?.() ?? null;
+                                if (url) {
+                                    const resp = await fetch(`${url}/telegram/topics/${topicId}/messages?limit=50`, {
+                                        headers: { 'Authorization': `Bearer ${config.authToken}` },
+                                    });
+                                    if (resp.ok) {
+                                        const j = (await resp.json());
+                                        movedContext = formatForwardedTopicContext(j.messages, tg.getTopicName?.(topicId) ?? undefined) || undefined;
+                                    }
+                                }
+                            }
+                            catch {
+                                // @silent-fallback-ok — cross-machine context relay is best-effort
+                            }
+                            return spawnSessionForTopic(sessionManager, tg, sessionName, topicId, text, undefined, undefined, movedContext);
+                        })()
                             .then((name) => {
                             tg.registerTopicSession(topicId, name, sessionName);
                             console.log(pc.green(`  [session-pool] owner-side resume for forwarded topic ${topicId} → ${name}`));
@@ -8757,6 +8788,10 @@ export async function startServer(options) {
                     });
                     const peerUrl = (machineId) => meshIdMgr.getActiveMachines().find((m) => m.machineId === machineId)?.entry.lastKnownUrl ?? null;
                     _meshSelfId = meshSelfId;
+                    _resolveRouterUrl = () => {
+                        const h = coordinator.getSyncStatus().leaseHolder;
+                        return h && h !== meshSelfId ? peerUrl(h) : null;
+                    };
                     // This machine participates in the session pool, so a read-only standby may
                     // persist the PER-SESSION state of sessions it's handed (the pool's owner-side
                     // resume only fires for CAS-confirmed owned sessions, and only past 'dark').