instar 0.26.6 → 0.26.7

package/dist/server/routes.js

@@ -2171,7 +2171,23 @@ export function createRoutes(ctx) {
     });
     router.post('/sessions/cleanup-stale', (_req, res) => {
         const cleaned = ctx.sessionManager.cleanupStaleSessions();
-        res.json({ cleaned: cleaned.length, sessionIds: cleaned });
+        // Also purge failed-messages files older than 24 hours
+        const failDir = path.join(ctx.config.stateDir, 'state', 'failed-messages');
+        let purgedFiles = 0;
+        if (fs.existsSync(failDir)) {
+            const cutoff = Date.now() - 24 * 60 * 60 * 1000;
+            for (const fname of fs.readdirSync(failDir)) {
+                const fpath = path.join(failDir, fname);
+                try {
+                    if (fs.statSync(fpath).mtimeMs < cutoff) {
+                        fs.unlinkSync(fpath);
+                        purgedFiles++;
+                    }
+                }
+                catch { /* ignore individual file errors */ }
+            }
+        }
+        res.json({ cleaned: cleaned.length, sessionIds: cleaned, purgedFailedMessages: purgedFiles });
     });
     router.get('/sessions/:name/output', (req, res) => {
         if (!SESSION_NAME_RE.test(req.params.name)) {
@@ -2358,9 +2374,16 @@ export function createRoutes(ctx) {
             res.json({ jobs: [], scheduler: null });
             return;
         }
+        const nextRunTimes = ctx.scheduler.getNextRunTimes();
         const jobs = ctx.scheduler.getJobs().map(job => {
             const jobState = ctx.state.getJobState(job.slug);
-            return { ...job, state: jobState, runsOnThisMachine: ctx.scheduler.isJobLocal(job.slug) };
+            // Merge live scheduler nextRun into state — fixes display bug where
+            // never-run jobs show as "unscheduled" despite having active cron tasks
+            const liveNext = nextRunTimes[job.slug];
+            const mergedState = jobState
+                ? { ...jobState, nextScheduled: jobState.nextScheduled ?? liveNext }
+                : liveNext ? { slug: job.slug, lastRun: null, lastResult: null, nextScheduled: liveNext, consecutiveFailures: 0 } : null;
+            return { ...job, state: mergedState, runsOnThisMachine: ctx.scheduler.isJobLocal(job.slug) };
         });
         res.json({ jobs, queue: ctx.scheduler.getQueue() });
     });
@@ -4427,15 +4450,16 @@ export function createRoutes(ctx) {
                     }
                     catch { /* @silent-fallback-ok — registry write non-critical */ }
                     // Proactive UUID save — always run, even after --resume (new session = new UUID)
+                    // ONLY uses authoritative claudeSessionId — never mtime fallback, which can
+                    // pick up a UUID from a different topic's concurrent session.
                     if (ctx.topicResumeMap) {
                         setTimeout(() => {
                             try {
                                 const sessions = ctx.sessionManager?.listRunningSessions() ?? [];
                                 const session = sessions.find(s => s.tmuxSession === newSessionName);
-                                const uuid = session?.claudeSessionId ?? ctx.topicResumeMap.findClaudeSessionUuid();
-                                if (uuid) {
-                                    ctx.topicResumeMap.save(topicId, uuid, newSessionName);
-                                    console.log(`[secret-drop] Proactive UUID save: ${uuid} for topic ${topicId} (source: ${session?.claudeSessionId ? 'hook' : 'mtime'})`);
+                                if (session?.claudeSessionId) {
+                                    ctx.topicResumeMap.save(topicId, session.claudeSessionId, newSessionName);
+                                    console.log(`[secret-drop] Proactive UUID save: ${session.claudeSessionId} for topic ${topicId} (source: hook)`);
                                 }
                             }
                             catch (err) {
@@ -4615,29 +4639,40 @@ export function createRoutes(ctx) {
                 }
                 catch { /* fall through without name */ }
                 console.log(`[telegram-forward] Injecting into ${targetSession}: "${text.slice(0, 80)}"`);
-                ctx.sessionManager.injectTelegramMessage(targetSession, topicId, text, injectedTopicName, fromFirstName, fromUserId);
-                // Truncation detection — check if this message looks truncated and inject a hint
-                const truncation = truncationDetector.detect(topicId, String(fromUserId || 'unknown'), text);
-                if (truncation.truncationSuspected) {
-                    // Build Drop Zone URL (tunnel if available, otherwise localhost)
-                    let dzUrl = `http://localhost:${ctx.config.port}/dashboard?tab=dropzone`;
-                    if (ctx.tunnel) {
-                        try {
-                            const tunnelUrl = ctx.tunnel.url;
-                            if (tunnelUrl) {
-                                dzUrl = `${tunnelUrl}/dashboard?tab=dropzone`;
+                const injected = ctx.sessionManager.injectTelegramMessage(targetSession, topicId, text, injectedTopicName, fromFirstName, fromUserId);
+                if (injected === false) {
+                    // Injection failed — save message under stateDir (not /tmp) to avoid world-readable exposure
+                    const failDir = path.join(ctx.config.stateDir, 'state', 'failed-messages');
+                    fs.mkdirSync(failDir, { recursive: true });
+                    const failFile = path.join(failDir, `failed-${topicId}-${Date.now()}.txt`);
+                    fs.writeFileSync(failFile, text);
+                    console.error(`[telegram→session] Injection FAILED for topic ${topicId} into ${targetSession}. Message saved to ${failFile}`);
+                    res.json({ ok: false, error: 'injection-failed', failFile, session: targetSession });
+                }
+                else {
+                    // Truncation detection — check if this message looks truncated and inject a hint
+                    const truncation = truncationDetector.detect(topicId, String(fromUserId || 'unknown'), text);
+                    if (truncation.truncationSuspected) {
+                        // Build Drop Zone URL (tunnel if available, otherwise localhost)
+                        let dzUrl = `http://localhost:${ctx.config.port}/dashboard?tab=dropzone`;
+                        if (ctx.tunnel) {
+                            try {
+                                const tunnelUrl = ctx.tunnel.url;
+                                if (tunnelUrl) {
+                                    dzUrl = `${tunnelUrl}/dashboard?tab=dropzone`;
+                                }
                             }
+                            catch { }
                         }
-                        catch { }
+                        // Inject a system hint after a short delay so it arrives after the message
+                        setTimeout(() => {
+                            const hint = `<system-reminder>The user's previous message may be truncated (${truncation.reason}). ` +
+                                `If their content appears incomplete, suggest they use the Drop Zone for longer content: ${dzUrl}</system-reminder>`;
+                            ctx.sessionManager.injectPasteNotification(targetSession, hint);
+                        }, 1000);
                     }
-                    // Inject a system hint after a short delay so it arrives after the message
-                    setTimeout(() => {
-                        const hint = `<system-reminder>The user's previous message may be truncated (${truncation.reason}). ` +
-                            `If their content appears incomplete, suggest they use the Drop Zone for longer content: ${dzUrl}</system-reminder>`;
-                        ctx.sessionManager.injectPasteNotification(targetSession, hint);
-                    }, 1000);
+                    res.json({ ok: true, forwarded: true, method: 'registry-inject', session: targetSession });
                 }
-                res.json({ ok: true, forwarded: true, method: 'registry-inject', session: targetSession });
             }
             else {
                 // No session or session dead — auto-spawn a new one
@@ -4724,15 +4759,16 @@ export function createRoutes(ctx) {
                     }
                     catch { /* @silent-fallback-ok — registry write non-critical */ }
                     // Proactive UUID save — always run, even after --resume (new session = new UUID)
+                    // ONLY uses authoritative claudeSessionId — never mtime fallback, which can
+                    // pick up a UUID from a different topic's concurrent session.
                     if (ctx.topicResumeMap) {
                         setTimeout(() => {
                             try {
                                 const sessions = ctx.sessionManager?.listRunningSessions() ?? [];
                                 const session = sessions.find(s => s.tmuxSession === newSessionName);
-                                const uuid = session?.claudeSessionId ?? ctx.topicResumeMap.findClaudeSessionUuid();
-                                if (uuid) {
-                                    ctx.topicResumeMap.save(topicId, uuid, newSessionName);
-                                    console.log(`[telegram-forward] Proactive UUID save: ${uuid} for topic ${topicId} (source: ${session?.claudeSessionId ? 'hook' : 'mtime'})`);
+                                if (session?.claudeSessionId) {
+                                    ctx.topicResumeMap.save(topicId, session.claudeSessionId, newSessionName);
+                                    console.log(`[telegram-forward] Proactive UUID save: ${session.claudeSessionId} for topic ${topicId} (source: hook)`);
                                 }
                             }
                             catch (err) {