morpheus-cli 0.5.1 → 0.5.2

package/dist/cli/commands/start.js

@@ -162,6 +162,10 @@ export const startCommand = new Command('start')
             taskWorker.start();
             taskNotifier.start();
         }
+        // Recover webhook notifications stuck in 'pending' from previous runs
+        WebhookDispatcher.recoverStale().catch((err) => {
+            display.log(`Webhook recovery error: ${err.message}`, { source: 'Webhooks', level: 'error' });
+        });
         // Handle graceful shutdown
         const shutdown = async (signal) => {
             display.stopSpinner();

package/dist/runtime/tasks/repository.js

@@ -148,6 +148,10 @@ export class TaskRepository {
         const row = this.db.prepare('SELECT * FROM tasks WHERE id = ?').get(id);
         return row ? this.deserializeTask(row) : null;
     }
+    findTaskByOriginMessageId(originMessageId) {
+        const row = this.db.prepare('SELECT * FROM tasks WHERE origin_message_id = ? LIMIT 1').get(originMessageId);
+        return row ? this.deserializeTask(row) : null;
+    }
     listTasks(filters) {
         const params = [];
         let query = 'SELECT * FROM tasks WHERE 1=1';

package/dist/runtime/webhooks/dispatcher.js

@@ -1,5 +1,7 @@
 import { WebhookRepository } from './repository.js';
+import { TaskRepository } from '../tasks/repository.js';
 import { DisplayManager } from '../display.js';
+const STALE_NOTIFICATION_THRESHOLD_MS = 2 * 60 * 1000; // 2 minutes
 export class WebhookDispatcher {
     static telegramAdapter = null;
     static oracle = null;
@@ -35,17 +37,35 @@ export class WebhookDispatcher {
         }
         const message = this.buildPrompt(webhook.prompt, payload);
         try {
-            await oracle.chat(message, undefined, false, {
+            const response = await oracle.chat(message, undefined, false, {
                 origin_channel: 'webhook',
                 session_id: `webhook-${webhook.id}`,
                 origin_message_id: notificationId,
             });
-            this.display.log(`Webhook "${webhook.name}" accepted and queued (notification: ${notificationId})`, { source: 'Webhooks', level: 'success' });
+            // Check whether Oracle delegated a task for this notification.
+            // If a task exists with this origin_message_id, TaskNotifier will update
+            // the notification when the task completes. If not (Oracle answered
+            // directly), mark it completed now with the direct response.
+            const taskRepo = TaskRepository.getInstance();
+            const delegatedTask = taskRepo.findTaskByOriginMessageId(notificationId);
+            if (delegatedTask) {
+                this.display.log(`Webhook "${webhook.name}" accepted and queued (notification: ${notificationId})`, { source: 'Webhooks', level: 'success' });
+            }
+            else {
+                repo.updateNotificationResult(notificationId, 'completed', response);
+                this.display.log(`Webhook "${webhook.name}" completed with direct response (notification: ${notificationId})`, { source: 'Webhooks', level: 'success' });
+                if (webhook.notification_channels.includes('telegram')) {
+                    await this.sendTelegram(webhook.name, response, 'completed');
+                }
+            }
         }
         catch (err) {
             const result = `Execution error: ${err.message}`;
             this.display.log(`Webhook "${webhook.name}" failed: ${err.message}`, { source: 'Webhooks', level: 'error' });
             repo.updateNotificationResult(notificationId, 'failed', result);
+            if (webhook.notification_channels.includes('telegram')) {
+                await this.sendTelegram(webhook.name, result, 'failed');
+            }
         }
     }
     /**
@@ -63,6 +83,57 @@ ${payloadStr}
 
 Analyze the payload above and follow the instructions provided. Be concise and actionable in your response.`;
     }
+    /**
+     * Called at startup to re-dispatch webhook notifications that got stuck in
+     * 'pending' status (e.g. from a previous crash or from the direct-response
+     * bug). Skips notifications that already have an active task running.
+     */
+    static async recoverStale() {
+        const display = DisplayManager.getInstance();
+        const oracle = WebhookDispatcher.oracle;
+        if (!oracle) {
+            display.log('Webhook recovery skipped — Oracle not available.', {
+                source: 'Webhooks',
+                level: 'warning',
+            });
+            return;
+        }
+        const repo = WebhookRepository.getInstance();
+        const taskRepo = TaskRepository.getInstance();
+        const stale = repo.findStaleNotifications(STALE_NOTIFICATION_THRESHOLD_MS);
+        if (stale.length === 0)
+            return;
+        display.log(`Recovering ${stale.length} stale webhook notification(s)...`, {
+            source: 'Webhooks',
+            level: 'warning',
+        });
+        for (const notification of stale) {
+            // Skip if a task is still active for this notification
+            const activeTask = taskRepo.findTaskByOriginMessageId(notification.id);
+            if (activeTask && (activeTask.status === 'pending' || activeTask.status === 'running')) {
+                display.log(`Webhook notification ${notification.id} has active task ${activeTask.id} — skipping recovery.`, { source: 'Webhooks' });
+                continue;
+            }
+            const webhook = repo.getWebhookById(notification.webhook_id);
+            if (!webhook || !webhook.enabled) {
+                repo.updateNotificationResult(notification.id, 'failed', webhook ? 'Webhook was disabled.' : 'Webhook no longer exists.');
+                continue;
+            }
+            let payload;
+            try {
+                payload = JSON.parse(notification.payload);
+            }
+            catch {
+                payload = {};
+            }
+            display.log(`Re-dispatching stale notification ${notification.id} for webhook "${webhook.name}".`, { source: 'Webhooks' });
+            // Fire-and-forget re-dispatch (same pattern as the trigger endpoint)
+            const dispatcher = new WebhookDispatcher();
+            dispatcher.dispatch(webhook, payload, notification.id).catch((err) => {
+                display.log(`Recovery dispatch error for notification ${notification.id}: ${err.message}`, { source: 'Webhooks', level: 'error' });
+            });
+        }
+    }
     /**
      * Sends a formatted Telegram message to all allowed users.
      * Silently skips if the adapter is not connected.

package/dist/runtime/webhooks/repository.js

@@ -180,6 +180,13 @@ export class WebhookRepository {
         const row = this.db.prepare('SELECT COUNT(*) as cnt FROM webhook_notifications WHERE read = 0').get();
         return row?.cnt ?? 0;
     }
+    findStaleNotifications(olderThanMs) {
+        const cutoff = Date.now() - olderThanMs;
+        const rows = this.db.prepare(`SELECT * FROM webhook_notifications
+       WHERE status = 'pending' AND created_at < ?
+       ORDER BY created_at ASC`).all(cutoff);
+        return rows.map(this.deserializeNotification);
+    }
     deserializeNotification(row) {
         return {
             id: row.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "morpheus-cli",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Morpheus is a local AI agent for developers, running as a CLI daemon that connects to LLMs, local tools, and MCPs, enabling interaction via Terminal, Telegram, and Discord. Inspired by the character Morpheus from *The Matrix*, the project acts as an intelligent orchestrator, bridging the gap between the developer and complex systems.",
   "bin": {
     "morpheus": "./bin/morpheus.js"