instar 0.24.1 → 0.24.3

package/dist/commands/server.js

@@ -441,7 +441,7 @@ async function spawnSessionForTopic(sessionManager, telegram, sessionName, topic
     // Proactive UUID save — schedule discovery after spawn.
     // Prefer authoritative claudeSessionId from hook events (populated within seconds).
     // Falls back to mtime-based JSONL scan only when there's no ambiguity.
-    if (_topicResumeMap && !resumeSessionId) {
+    if (_topicResumeMap) {
         setTimeout(() => {
             try {
                 // Check if hook events have already populated the authoritative UUID
@@ -464,7 +464,7 @@ async function spawnSessionForTopic(sessionManager, telegram, sessionName, topic
  * Respawn a session for a topic, including thread history in the bootstrap.
  * This prevents "thread drift" where respawned sessions lose context.
  */
-async function respawnSessionForTopic(sessionManager, telegram, targetSession, topicId, latestMessage, topicMemory, userProfile, recoveryPrompt) {
+async function respawnSessionForTopic(sessionManager, telegram, targetSession, topicId, latestMessage, topicMemory, userProfile, recoveryPrompt, options) {
     console.log(`[telegram→session] Session "${targetSession}" needs respawn for topic ${topicId}`);
     // Save the old session's Claude UUID before respawning so --resume can reattach context
     if (_topicResumeMap) {
@@ -490,7 +490,9 @@ async function respawnSessionForTopic(sessionManager, telegram, targetSession, t
         : latestMessage;
     const newSessionName = await spawnSessionForTopic(sessionManager, telegram, topicName, topicId, effectiveMessage, topicMemory, userProfile);
     telegram.registerTopicSession(topicId, newSessionName, topicName);
-    await telegram.sendToTopic(topicId, `Session respawned.`);
+    if (!options?.silent) {
+        await telegram.sendToTopic(topicId, `Session respawned.`);
+    }
     console.log(`[telegram→session] Respawned "${newSessionName}" for topic ${topicId}`);
 }
 /**
@@ -2351,7 +2353,7 @@ export async function startServer(options) {
                     }));
                 },
                 sendToTopic: (topicId, text) => telegram.sendToTopic(topicId, text),
-                respawnSession: (name, topicId) => respawnSessionForTopic(sessionManager, telegram, name, topicId, undefined, topicMemory),
+                respawnSession: (name, topicId, options) => respawnSessionForTopic(sessionManager, telegram, name, topicId, undefined, topicMemory, undefined, undefined, options),
                 clearStallForTopic: (topicId) => telegram.clearStallTracking(topicId),
             }, {
                 config: config.monitoring.triage,
@@ -2382,7 +2384,7 @@ export async function startServer(options) {
                     }));
                 },
                 sendToTopic: (topicId, text) => telegram.sendToTopic(topicId, text),
-                respawnSession: (name, topicId) => respawnSessionForTopic(sessionManager, telegram, name, topicId, undefined, topicMemory),
+                respawnSession: (name, topicId, options) => respawnSessionForTopic(sessionManager, telegram, name, topicId, undefined, topicMemory, undefined, undefined, options),
                 clearStallForTopic: (topicId) => telegram.clearStallTracking(topicId),
                 spawnTriageSession: (name, options) => sessionManager.spawnTriageSession(name, options),
                 getTriageSessionUuid: (sessionName) => {
@@ -3629,6 +3631,34 @@ export async function startServer(options) {
         // Graceful shutdown
         const shutdown = async () => {
             console.log('\nShutting down...');
+            // Save resume UUIDs for ALL active topic-linked sessions before exit.
+            // Without this, server restarts lose all resume mappings because:
+            // 1. Resume entries are consumed (removed) on spawn
+            // 2. Proactive save may not have run yet
+            // 3. beforeSessionKill doesn't fire for bulk process exit
+            if (_topicResumeMap && telegram) {
+                try {
+                    const runningSessions = sessionManager.listRunningSessions();
+                    const topicSessions = telegram.getAllTopicSessions?.();
+                    if (topicSessions) {
+                        let saved = 0;
+                        for (const [topicId, sessionName] of topicSessions) {
+                            const session = runningSessions.find(s => s.tmuxSession === sessionName);
+                            const uuid = _topicResumeMap.findUuidForSession(sessionName, session?.claudeSessionId ?? undefined);
+                            if (uuid) {
+                                _topicResumeMap.save(topicId, uuid, sessionName);
+                                saved++;
+                            }
+                        }
+                        if (saved > 0) {
+                            console.log(`[shutdown] Saved ${saved} resume UUID(s) for active sessions`);
+                        }
+                    }
+                }
+                catch (err) {
+                    console.error('[shutdown] Failed to save resume UUIDs:', err);
+                }
+            }
             gitSync?.stop();
             coordinator.stop();
             coherenceMonitor.stop();