beecork 1.4.7 → 1.4.9

package/dist/session/manager.js

@@ -146,7 +146,7 @@ export class TabManager {
             }
         }
     }
-    async executeMessage(tab, prompt, resume, onTextChunk, onToolUse, compactionDepth) {
+    async executeMessage(tab, prompt, resume, onTextChunk, onToolUse, compactionDepth, forceFresh = false, retryDepth = 0) {
         const db = getDb();
         logActivity('task_started', 'Processing message', { tabName: tab.name, details: prompt.slice(0, 500) });
         // Budget check before spawning
@@ -177,9 +177,10 @@ export class TabManager {
         const breaker = new CircuitBreaker(tab.name);
         this.circuitBreakers.set(tab.name, breaker);
         const contextMonitor = new ContextMonitor(tab.name);
-        // Resume if: explicitly requested or DB has prior successful responses for this tab
-        const hasDbHistory = db.prepare('SELECT COUNT(*) as count FROM messages WHERE tab_id = ? AND role = ?').get(tab.id, 'assistant');
-        const shouldResume = resume || hasDbHistory.count > 0;
+        // Resume if: explicitly requested or DB has prior successful responses for this tab.
+        // forceFresh overrides both — used after a stale-session retry to guarantee --session-id, not --resume.
+        const hasDbHistory = db.prepare('SELECT COUNT(*) as count FROM messages WHERE tab_id = ? AND role = ? AND content != ?').get(tab.id, 'assistant', '');
+        const shouldResume = !forceFresh && (resume || hasDbHistory.count > 0);
         return new Promise((resolve, reject) => {
             let resultText = '';
             let resultEvent = null;
@@ -245,21 +246,35 @@ export class TabManager {
                         sessionId: subprocess.sessionId,
                         error: resultEvent?.is_error ?? (code !== 0),
                     };
-                    // Handle resume failure (session expired/not found) — retry with fresh session + context
-                    if (result.error && shouldResume && result.text.match(/session (not found|expired|invalid)/i)) {
-                        logger.info(`[${tab.name}] Session resume failed, retrying with context injection`);
-                        const recentMsgs = db.prepare('SELECT role, content FROM messages WHERE tab_id = ? ORDER BY created_at DESC LIMIT 5').all(tab.id);
+                    // Handle resume failure (Claude Code session cache rotated / never existed / expired).
+                    // Detection covers both legacy text-based errors and the modern error_during_execution
+                    // event shape ({"subtype":"error_during_execution","errors":["No conversation found..."]}).
+                    // retryDepth guards against any pathological loop.
+                    const staleSession = result.error && shouldResume && retryDepth === 0 && (result.text.match(/session (not found|expired|invalid)/i) !== null ||
+                        (resultEvent?.subtype === 'error_during_execution' &&
+                            resultEvent.errors?.some(e => /no conversation found|session.*not found|session.*expired|session.*invalid/i.test(e))));
+                    if (staleSession) {
+                        const detail = resultEvent?.errors?.[0] ?? result.text.split('\n')[0];
+                        logger.warn(`[${tab.name}] Resume session ${tab.sessionId} unavailable in Claude Code cache (${detail}). Retrying with fresh session.`);
+                        const recentMsgs = db.prepare("SELECT role, content FROM messages WHERE tab_id = ? AND content != '' ORDER BY created_at DESC LIMIT 5").all(tab.id);
                         const context = recentMsgs.reverse().map(m => `${m.role}: ${m.content.slice(0, 200)}`).join('\n');
-                        const contextPrompt = `[Previous conversation context:\n${context}\n]\n\n${enrichedPrompt}`;
-                        // Reset session ID for fresh start
+                        const contextPrompt = context
+                            ? `[Previous conversation context:\n${context}\n]\n\n${enrichedPrompt}`
+                            : enrichedPrompt;
+                        // Reset session ID for fresh start. Use --session-id (forceFresh) to bypass the
+                        // hasDbHistory shouldResume override that would otherwise --resume the new UUID
+                        // against an equally-empty Claude Code cache.
                         const newSessionId = uuidv4();
                         db.prepare('UPDATE tabs SET session_id = ?, status = ? WHERE id = ?').run(newSessionId, 'idle', tab.id);
-                        this.executeMessage({ ...tab, sessionId: newSessionId }, contextPrompt, false, onTextChunk)
+                        this.executeMessage({ ...tab, sessionId: newSessionId }, contextPrompt, false, onTextChunk, onToolUse, compactionDepth, true, retryDepth + 1)
                             .then(resolve).catch(reject);
                         return;
                     }
-                    // Store assistant response
-                    db.prepare('INSERT INTO messages (tab_id, role, content, cost_usd, tokens_in, tokens_out) VALUES (?, ?, ?, ?, ?, ?)').run(tab.id, 'assistant', result.text, result.costUsd, resultEvent?.usage?.input_tokens ?? null, resultEvent?.usage?.output_tokens ?? null);
+                    // Store assistant response. Skip empty content (typically failed/error runs) so
+                    // it doesn't trigger the hasDbHistory shouldResume override on future calls.
+                    if (result.text.trim() !== '') {
+                        db.prepare('INSERT INTO messages (tab_id, role, content, cost_usd, tokens_in, tokens_out) VALUES (?, ?, ?, ?, ?, ?)').run(tab.id, 'assistant', result.text, result.costUsd, resultEvent?.usage?.input_tokens ?? null, resultEvent?.usage?.output_tokens ?? null);
+                    }
                     // Update tab
                     db.prepare('UPDATE tabs SET status = ?, last_activity_at = ?, pid = NULL WHERE name = ?')
                         .run('idle', new Date().toISOString(), tab.name);

package/dist/tasks/scheduler.js

@@ -166,8 +166,9 @@ export class TaskScheduler {
             const result = await this.tabManager.sendMessage(job.tabName, job.message);
             this.store.update(job.id, { lastRunAt: new Date().toISOString() });
             const firstLine = result.text.split('\n')[0]?.slice(0, 200) || '(no output)';
-            // Log result
-            await fs.promises.appendFile(logFile, `[${new Date().toISOString()}] SUCCESS: ${firstLine}\n`);
+            const status = result.error ? 'ERROR' : 'SUCCESS';
+            // Log result (status reflects subprocess exit / is_error, not just completion)
+            await fs.promises.appendFile(logFile, `[${new Date().toISOString()}] ${status}: ${firstLine}\n`);
             // Notify (separate try/catch -- notification failure shouldn't be reported as job failure)
             try {
                 if (this.onNotify) {

package/dist/tasks/store.js

@@ -35,7 +35,14 @@ export class TaskStore {
         const existing = this.get(id);
         if (!existing)
             return false;
+        // If the schedule changes, the stored next_run_at is no longer valid —
+        // null it out so the scheduler recomputes from the new expression on
+        // next load. Caller can override by explicitly passing nextRunAt.
+        const scheduleChanged = (updates.schedule !== undefined && updates.schedule !== existing.schedule) ||
+            (updates.scheduleType !== undefined && updates.scheduleType !== existing.scheduleType);
         const merged = { ...existing, ...updates };
+        if (scheduleChanged && updates.nextRunAt === undefined)
+            merged.nextRunAt = null;
         db.prepare(`UPDATE tasks SET name=?, schedule_type=?, schedule=?, tab_name=?, message=?, enabled=?, last_run_at=?, next_run_at=? WHERE id=?`).run(merged.name, merged.scheduleType, merged.schedule, merged.tabName, merged.message, merged.enabled ? 1 : 0, merged.lastRunAt, merged.nextRunAt, id);
         return true;
     }

package/dist/types.d.ts

@@ -132,13 +132,14 @@ export interface StreamAssistant {
 }
 export interface StreamResult {
     type: 'result';
-    subtype: 'success' | 'error';
+    subtype: 'success' | 'error' | 'error_during_execution';
     is_error: boolean;
     duration_ms: number;
-    result: string;
+    result?: string;
+    errors?: string[];
     session_id: string;
-    total_cost_usd: number;
-    usage: StreamUsage;
+    total_cost_usd?: number;
+    usage?: StreamUsage;
 }
 export interface StreamUsage {
     input_tokens: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beecork",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "description": "Claude Code always-on infrastructure — a phone number, a memory, and an alarm clock",
   "type": "module",
   "bin": {