neoagent 3.0.1-beta.26 → 3.0.1-beta.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neoagent",
-  "version": "3.0.1-beta.26",
+  "version": "3.0.1-beta.28",
   "description": "Self-hosted AI agent for long-running tasks, automation, messaging, device control, and local memory",
   "license": "AGPL-3.0-only",
   "main": "server/index.js",

package/server/db/database.js

@@ -2016,7 +2016,8 @@ function backfillTaskTriggers() {
       .all();
     const update = db.prepare(
       `UPDATE scheduled_tasks
-       SET trigger_type = ?, trigger_config = ?, execution_mode = COALESCE(NULLIF(execution_mode, ''), 'prompt')
+       SET trigger_type = ?, trigger_config = ?, cron_expression = ?, run_at = ?,
+           execution_mode = COALESCE(NULLIF(execution_mode, ''), 'prompt')
        WHERE id = ?`,
     );
     const tx = db.transaction(() => {
@@ -2028,17 +2029,39 @@ function backfillTaskTriggers() {
         } catch {
           parsedConfig = {};
         }
-        const hasConfig = parsedConfig && typeof parsedConfig === 'object' && !Array.isArray(parsedConfig) && Object.keys(parsedConfig).length > 0;
-        if (triggerType !== 'schedule' && hasConfig) {
-          update.run(triggerType, JSON.stringify(parsedConfig), row.id);
+        if (!parsedConfig || typeof parsedConfig !== 'object' || Array.isArray(parsedConfig)) {
+          parsedConfig = {};
+        }
+
+        // Non-schedule triggers keep their own config untouched.
+        if (triggerType !== 'schedule') {
+          if (Object.keys(parsedConfig).length > 0) {
+            update.run(triggerType, JSON.stringify(parsedConfig), row.cron_expression, row.run_at, row.id);
+          }
           continue;
         }
 
-        const mode = row.one_time ? 'one_time' : 'recurring';
-        const config = row.one_time
-          ? { mode, runAt: row.run_at || null }
-          : { mode, cronExpression: row.cron_expression || null };
-        update.run('schedule', JSON.stringify(config), row.id);
+        // Schedule triggers: reconcile the structured trigger_config with the
+        // legacy cron_expression/run_at columns WITHOUT discarding a value that
+        // exists in only one place. A prior version rebuilt trigger_config from
+        // the legacy columns unconditionally, which blanked cronExpression for
+        // tasks that carried it only in trigger_config and silently stopped them
+        // from ever being scheduled.
+        const cronExpression = String(parsedConfig.cronExpression || row.cron_expression || '').trim() || null;
+        const runAt = parsedConfig.runAt || row.run_at || null;
+        const isOneTime = cronExpression
+          ? false
+          : (Boolean(row.one_time) || parsedConfig.mode === 'one_time');
+        const config = isOneTime
+          ? { mode: 'one_time', runAt }
+          : { mode: 'recurring', cronExpression };
+        update.run(
+          'schedule',
+          JSON.stringify(config),
+          isOneTime ? null : cronExpression,
+          isOneTime ? runAt : null,
+          row.id,
+        );
       }
     });
     tx();

package/server/public/.last_build_id

@@ -1 +1 @@
-d0f10aa867a5cbedc987a0383d9bde57
+bc9ff412e67a5da2a54969c0335a544f

package/server/public/flutter_bootstrap.js

@@ -33,10 +33,10 @@ addEventListener("message", eventListener);
 if (!window._flutter) {
   window._flutter = {};
 }
-_flutter.buildConfig = {"engineRevision":"a4ce257c68517c1410f4b48ac9852ab5642a3f8d","builds":[{"compileTarget":"dart2js","renderer":"canvaskit","mainJsPath":"main.dart.js"},{}]};
+_flutter.buildConfig = {"engineRevision":"a10d8ac38de835021c8d2f920dbf50a920ccc030","builds":[{"compileTarget":"dart2js","renderer":"canvaskit","mainJsPath":"main.dart.js"},{}]};
 
 _flutter.loader.load({
   serviceWorkerSettings: {
-    serviceWorkerVersion: "393692328" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
+    serviceWorkerVersion: "2180136218" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
   }
 });

package/server/public/main.dart.js

@@ -41215,7 +41215,7 @@ $S:4}
 A.bhj.prototype={
 $1(a){var s=A.fd().b
 s=s==null?null:s.canvasKitBaseUrl
-return(s==null?"https://www.gstatic.com/flutter-canvaskit/a4ce257c68517c1410f4b48ac9852ab5642a3f8d/":s)+a},
+return(s==null?"https://www.gstatic.com/flutter-canvaskit/a10d8ac38de835021c8d2f920dbf50a920ccc030/":s)+a},
 $S:39}
 A.a_D.prototype={
 gH(a){var s=this.a
@@ -138719,7 +138719,7 @@ r===$&&A.b()
 p.push(A.iU(q,A.ju(!1,new A.Y(B.vr,A.cN(new A.cA(B.jU,new A.a94(r,q),q),q,q),q),!1,B.I,!0),q,q,0,0,0,q))}r=!1
 if(!s.ay)if(!s.ch){r=s.e
 r===$&&A.b()
-r=B.b.t("mqro5gaw-044e21a").length!==0&&r.b}if(r){r=s.d
+r=B.b.t("mqznd4bv-b094a16").length!==0&&r.b}if(r){r=s.d
 r===$&&A.b()
 r=r.aD&&!r.av?84:0
 s=s.e
@@ -145015,7 +145015,7 @@ $S:0}
 A.a0g.prototype={}
 A.U0.prototype={
 nm(a){var s=this
-if(B.b.t("mqro5gaw-044e21a").length===0||s.a!=null)return
+if(B.b.t("mqznd4bv-b094a16").length===0||s.a!=null)return
 s.Bg()
 s.a=A.m4(B.Td,new A.bgn(s))},
 Bg(){var s=0,r=A.l(t.H),q,p=2,o=[],n=this,m,l,k,j,i,h,g,f
@@ -145033,7 +145033,7 @@ if(!t.f.b(k)){s=1
 break}i=J.a2(k,"buildId")
 h=i==null?null:B.b.t(J.p(i))
 j=h==null?"":h
-if(J.bd(j)===0||J.f(j,"mqro5gaw-044e21a")){s=1
+if(J.bd(j)===0||J.f(j,"mqznd4bv-b094a16")){s=1
 break}n.b=!0
 n.E()
 p=2
@@ -145050,7 +145050,7 @@ case 2:return A.i(o.at(-1),r)}})
 return A.k($async$Bg,r)},
 vV(){var s=0,r=A.l(t.H),q,p=2,o=[],n=this,m,l,k,j,i,h,g,f,e,d,c,b,a,a0,a1
 var $async$vV=A.h(function(a2,a3){if(a2===1){o.push(a3)
-s=p}for(;;)switch(s){case 0:if(B.b.t("mqro5gaw-044e21a").length===0||n.c){s=1
+s=p}for(;;)switch(s){case 0:if(B.b.t("mqznd4bv-b094a16").length===0||n.c){s=1
 break}n.c=!0
 n.E()
 p=4

package/server/services/ai/rate_limits.js

@@ -9,6 +9,13 @@ const _reservations = new Map();
 const DEFAULT_RATE_LIMIT_4H = 2_500_000;
 const DEFAULT_RATE_LIMIT_WEEKLY = 10_000_000;
 
+// Generous upper bound on a single run's token cost. Used to size the in-flight
+// reservation that keeps concurrent run starts from collectively bypassing the
+// per-user budget. It must NOT be the full limit — doing so would reserve the
+// entire budget for one run and reject any second concurrent run for the same
+// user (e.g. a scheduled task firing in the same minute as another).
+const DEFAULT_RUN_RESERVATION_TOKENS = 500_000;
+
 const WINDOWS = {
   fourHour: {
     durationMs: 4 * 60 * 60 * 1000,
@@ -144,10 +151,22 @@ function enforceRateLimits(userId) {
     throw new RateLimitExceededError('weekly', snapshot);
   }
   // Reserve a placeholder so concurrent starts see this run as in-flight.
-  // The reservation is released (or reconciled) when the run completes.
+  // The reservation is released (or reconciled) when the run completes. Size it
+  // to a realistic per-run estimate — never the full limit — so concurrent runs
+  // for the same user are admitted normally and only a genuinely near-budget
+  // user gets throttled. Clamp so the reservation can never by itself exceed a
+  // (possibly small/custom) limit.
   const key = String(userId);
   const limits = snapshot.limits;
-  const reserve = Math.max(limits.fourHour || 0, limits.weekly || 0, 1);
+  const estimate = parsePositiveInteger(
+    process.env.NEOAGENT_RUN_RESERVATION_TOKENS,
+    DEFAULT_RUN_RESERVATION_TOKENS,
+  );
+  const cap = Math.min(
+    limits.fourHour == null ? Infinity : limits.fourHour,
+    limits.weekly == null ? Infinity : limits.weekly,
+  );
+  const reserve = Math.max(1, Math.min(estimate, Number.isFinite(cap) ? cap : estimate));
   _reservations.set(key, (_reservations.get(key) || 0) + reserve);
   return { snapshot, releaseReservation: () => releaseReservation(userId, reserve) };
 }

package/server/services/tasks/runtime.js

@@ -381,9 +381,18 @@ class TaskRuntime {
     if (!task.enabled) return;
     if ((task.trigger_type || 'schedule') !== 'schedule') return;
     const triggerConfig = this._normalizeJson(task.trigger_config);
-    if (triggerConfig.mode === 'one_time') return;
-    const cronExpression = String(triggerConfig.cronExpression || '').trim();
-    if (!cronExpression) return;
+    // Resolve the cron expression from the structured trigger_config, falling
+    // back to the legacy cron_expression column. An older migration could leave
+    // the expression in only one of the two places; as long as either still
+    // holds it, the task must keep being scheduled.
+    const cronExpression = String(
+      triggerConfig.cronExpression || task.cron_expression || '',
+    ).trim();
+    // One-time runs are driven by the one-time poller, not node-cron. Only skip
+    // here when there is genuinely no recurring cron expression to honor.
+    if (!cronExpression) {
+      return;
+    }
     const job = this.cron.schedule(cronExpression, async () => {
       try {
         await this._executeTask(task.id, task.user_id, {