instar 1.3.167 → 1.3.169

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;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"}
+{"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,CA00PtE;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

@@ -8696,7 +8696,28 @@ export async function startServer(options) {
                             : (cmd.payload && typeof cmd.payload === 'object' && 'text' in cmd.payload)
                                 ? String(cmd.payload.text)
                                 : undefined;
-                        const sessionName = tg.getSessionForTopic(topicId) ?? `topic-${topicId}`;
+                        // bug #13: a moved session ALREADY running on this machine must receive
+                        // follow-ups via INJECTION (mirroring the normal inbound dispatch), NOT a
+                        // re-spawn. getSessionForTopic returns the already-prefixed tmux name; routing
+                        // it back through spawnSessionForTopic re-prefixes it (projectBase-projectBase-
+                        // topic-N) so tmuxSessionExists misses and a DUPLICATE session is spawned on
+                        // every follow-up — the moved conversation never advances. So: if a live
+                        // session exists, inject the text into it (with the [telegram:N …] prefix the
+                        // session expects) and return; only spawn when there is none.
+                        const existing = tg.getSessionForTopic(topicId);
+                        if (existing && sessionManager.isSessionAlive(existing)) {
+                            if (text) {
+                                console.log(pc.green(`  [session-pool] owner-side inject for forwarded topic ${topicId} → ${existing}`));
+                                sessionManager.injectTelegramMessage(existing, topicId, text, tg.getTopicName?.(topicId) ?? undefined);
+                                tg.trackMessageInjection(topicId, existing, text);
+                            }
+                            return;
+                        }
+                        // No live session yet (the FIRST forwarded message for this topic, or the
+                        // prior one died) — spawn the moved session with the relayed context, under a
+                        // clean topic-derived name. NEVER reuse the prefixed getSessionForTopic value
+                        // as the spawn name (that is the double-prefix defect above).
+                        const spawnName = `topic-${topicId}`;
                         // 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.
@@ -8717,10 +8738,10 @@ export async function startServer(options) {
                             catch {
                                 // @silent-fallback-ok — cross-machine context relay is best-effort
                             }
-                            return spawnSessionForTopic(sessionManager, tg, sessionName, topicId, text, undefined, undefined, movedContext);
+                            return spawnSessionForTopic(sessionManager, tg, spawnName, topicId, text, undefined, undefined, movedContext);
                         })()
                             .then((name) => {
-                            tg.registerTopicSession(topicId, name, sessionName);
+                            tg.registerTopicSession(topicId, name, spawnName);
                             console.log(pc.green(`  [session-pool] owner-side resume for forwarded topic ${topicId} → ${name}`));
                         })
                             .catch((err) => console.warn(`  [session-pool] owner-side resume failed for topic ${topicId}: ${err instanceof Error ? err.message : String(err)}`));