amalgm 0.1.48 → 0.1.50

package/runtime/scripts/amalgm-mcp/tasks/scheduler.js

@@ -1,18 +1,27 @@
 /**
- * Task scheduler — 30s poll loop.
+ * Task scheduler — 60s poll loop.
  *
- * Checks every enabled task each tick; if it's due and not already running,
- * kicks off an execution via tasks/executor.js. Scheduler is stateless;
- * currently-running tasks live in executor.js's `runningTasks` map.
+ * Claims due rows from SQLite, then kicks off execution via tasks/executor.js.
+ * The SQLite task_runs table is the durable receipt/claim log; executor.js
+ * keeps only abort controllers for live in-process cancellation.
  */
 
 const { SCHEDULER_INTERVAL_MS } = require('../config');
-const { loadTasks } = require('./store');
+const { claimDueTaskRuns, expireStaleTaskRuns } = require('./store');
 const { executeTask, isRunning } = require('./executor');
 const { loadCronParser } = require('../deps');
 
 let schedulerTimer = null;
 let _cronParser = null;
+let isPolling = false;
+
+const schedulerStatus = {
+  startedAt: null,
+  lastTickAt: null,
+  lastError: null,
+  lastClaimed: 0,
+  lastExpired: 0,
+};
 
 function cron() {
   if (!_cronParser) _cronParser = loadCronParser();
@@ -79,23 +88,45 @@ function isTaskDue(task, now) {
 
 function startScheduler() {
   console.log(`[AmalgmMCP:Scheduler] Starting (interval: ${SCHEDULER_INTERVAL_MS}ms)`);
-  schedulerTimer = setInterval(() => {
-    try {
-      const data = loadTasks();
-      const now = new Date();
-      for (const task of data.tasks) {
-        if (!task.enabled) continue;
-        if (isRunning(task.id)) continue;
-        if (isTaskDue(task, now)) {
-          executeTask(task).catch((err) => {
-            console.error(`[AmalgmMCP:Scheduler] Task ${task.id} error:`, err.message);
-          });
-        }
-      }
-    } catch (err) {
-      console.error('[AmalgmMCP:Scheduler] Poll error:', err.message);
+  if (schedulerTimer) clearInterval(schedulerTimer);
+  schedulerStatus.startedAt = new Date().toISOString();
+  pollScheduler();
+  schedulerTimer = setInterval(pollScheduler, SCHEDULER_INTERVAL_MS);
+}
+
+function pollScheduler() {
+  if (isPolling) return;
+  isPolling = true;
+  try {
+    const now = new Date();
+    schedulerStatus.lastTickAt = now.toISOString();
+    schedulerStatus.lastExpired = expireStaleTaskRuns(now, { source: 'scheduler:expire' });
+    const claims = claimDueTaskRuns(now, { source: 'scheduler' });
+    schedulerStatus.lastClaimed = claims.length;
+    schedulerStatus.lastError = null;
+
+    for (const claim of claims) {
+      if (!claim?.task || !claim?.run) continue;
+      if (isRunning(claim.task.id)) continue;
+      executeTask(claim.task, claim.run).catch((err) => {
+        console.error(`[AmalgmMCP:Scheduler] Task ${claim.task.id} error:`, err.message);
+      });
     }
-  }, SCHEDULER_INTERVAL_MS);
+  } catch (err) {
+    schedulerStatus.lastError = err.message;
+    console.error('[AmalgmMCP:Scheduler] Poll error:', err.message);
+  } finally {
+    isPolling = false;
+  }
+}
+
+function getSchedulerStatus() {
+  return {
+    intervalMs: SCHEDULER_INTERVAL_MS,
+    running: Boolean(schedulerTimer),
+    polling: isPolling,
+    ...schedulerStatus,
+  };
 }
 
 function stopScheduler() {
@@ -105,4 +136,11 @@ function stopScheduler() {
   }
 }
 
-module.exports = { validateCronExpr, isTaskDue, startScheduler, stopScheduler };
+module.exports = {
+  getSchedulerStatus,
+  isTaskDue,
+  pollScheduler,
+  startScheduler,
+  stopScheduler,
+  validateCronExpr,
+};