clay-server 2.26.0-beta.14 → 2.26.0-beta.16

package/lib/project.js

@@ -1591,7 +1591,8 @@ function createProjectContext(opts) {
     if (session.scheduledMessage && session.scheduledMessage.timer) {
       clearTimeout(session.scheduledMessage.timer);
     }
-    var schedDelay = Math.max(0, resetsAt - Date.now()) + 180000; // +3min buffer after reset
+    var isPastReset = resetsAt <= Date.now();
+    var schedDelay = isPastReset ? 5000 : Math.max(0, resetsAt - Date.now()) + 60000; // +1min buffer after reset, or 5s for immediate
     var schedEntry = {
       type: "scheduled_message_queued",
       text: text,

package/lib/public/app.js

@@ -3715,7 +3715,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
       // Auto-switch input to schedule mode: any message typed will be queued for after reset
       var delayUntilReset = msg.resetsAt - Date.now();
       if (delayUntilReset > 0) {
-        setScheduleDelayMs(delayUntilReset + 180000); // +3min buffer after reset
+        setScheduleDelayMs(delayUntilReset + 60000); // +1min buffer after reset
       }
       rateLimitResetTimer = setTimeout(function () {
         rateLimitResetsAt = null;

package/lib/sdk-bridge.js

@@ -443,6 +443,7 @@ function createSDKBridge(opts) {
       if (parsed.total_cost_usd && parsed.total_cost_usd > 0) {
         session.rateLimitResetsAt = null;
       }
+      console.log("[sdk-bridge] result handler: session " + session.localId + " cost=" + parsed.total_cost_usd + " rateLimitResetsAt=" + session.rateLimitResetsAt);
 
       // Handle SDK execution errors: show the error to the user instead of
       // silently swallowing it. These have subtype "error_during_execution".
@@ -597,6 +598,7 @@ function createSDKBridge(opts) {
 
     } else if (parsed.type === "rate_limit_event" && parsed.rate_limit_info) {
       var info = parsed.rate_limit_info;
+      console.log("[sdk-bridge] rate_limit_event for session " + session.localId + ": status=" + info.status + " resetsAt=" + info.resetsAt + " isUsingOverage=" + info.isUsingOverage + " isProcessing=" + session.isProcessing);
 
       // Broadcast reset time for top-bar usage link
       if (info.rateLimitType && info.resetsAt) {
@@ -619,23 +621,32 @@ function createSDKBridge(opts) {
           isUsingOverage: info.isUsingOverage || false,
         });
         // Track rejection for auto-continue / scheduled message support
-        // Skip if using overage (extra usage) — user can continue immediately
-        if (info.status === "rejected" && info.resetsAt && !info.isUsingOverage) {
+        if (info.status === "rejected" && info.resetsAt) {
           session.rateLimitResetsAt = info.resetsAt * 1000;
 
-          // Defensive: if query already completed before this event arrived,
-          // schedule auto-continue now (handles race condition where
-          // rate_limit_event arrives after the result/done event).
-          if (!session.isProcessing && !session.scheduledMessage && !session.destroying) {
-            var lateACEnabled = session.onQueryComplete ||
+          // Schedule auto-continue immediately on rejection (don't wait for
+          // query completion which has timing issues with worker/non-worker paths).
+          if (!session.scheduledMessage && !session.destroying) {
+            var acEnabled = session.onQueryComplete ||
               (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
-            if (lateACEnabled) {
-              var lateResetsAt = session.rateLimitResetsAt;
-              session.rateLimitResetsAt = null;
+            console.log("[sdk-bridge] rate_limit rejected: acEnabled=" + acEnabled + " overage=" + !!info.isUsingOverage + " session=" + session.localId);
+            if (acEnabled) {
               session.rateLimitAutoContinuePending = true;
-              console.log("[sdk-bridge] Rate limit event arrived late, scheduling auto-continue for session " + session.localId);
-              if (typeof opts.scheduleMessage === "function") {
-                opts.scheduleMessage(session, "continue", lateResetsAt);
+              if (info.isUsingOverage) {
+                // Extra usage available: send continue immediately (5s delay for query to finish)
+                console.log("[sdk-bridge] Overage available, sending immediate continue for session " + session.localId);
+                session.rateLimitResetsAt = null;
+                if (typeof opts.scheduleMessage === "function") {
+                  opts.scheduleMessage(session, "continue", Date.now());
+                }
+              } else {
+                // No overage: schedule after rate limit resets
+                var acResetsAt = session.rateLimitResetsAt;
+                session.rateLimitResetsAt = null;
+                console.log("[sdk-bridge] Scheduling auto-continue on rate limit rejection for session " + session.localId);
+                if (typeof opts.scheduleMessage === "function") {
+                  opts.scheduleMessage(session, "continue", acResetsAt);
+                }
               }
             }
           }
@@ -1272,7 +1283,24 @@ function createSDKBridge(opts) {
             sm.broadcastSessionList();
           }
           cleanupSessionWorker(session, worker);
-          if (session.onQueryComplete) {
+          // Mark session as done so late rate_limit_event can detect race condition
+          session.isProcessing = false;
+          // Auto-continue on rate limit (scheduler sessions, or user setting)
+          var doneDidScheduleAC = false;
+          var doneACEnabled = session.onQueryComplete || (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
+          console.log("[sdk-bridge] query_done: session " + session.localId + " rateLimitResetsAt=" + session.rateLimitResetsAt + " acEnabled=" + doneACEnabled + " destroying=" + session.destroying + " scheduledMessage=" + !!session.scheduledMessage);
+          if (session.rateLimitResetsAt && session.rateLimitResetsAt > Date.now()
+              && doneACEnabled && !session.destroying) {
+            var doneResetsAt = session.rateLimitResetsAt;
+            session.rateLimitResetsAt = null;
+            session.rateLimitAutoContinuePending = true;
+            doneDidScheduleAC = true;
+            console.log("[sdk-bridge] Rate limited (worker/query_done), scheduling auto-continue for session " + session.localId);
+            if (typeof opts.scheduleMessage === "function") {
+              opts.scheduleMessage(session, "continue", doneResetsAt);
+            }
+          }
+          if (session.onQueryComplete && !doneDidScheduleAC) {
             try { session.onQueryComplete(session); } catch (err) {
               console.error("[sdk-bridge] onQueryComplete error:", err.message || err);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.26.0-beta.14",
+  "version": "2.26.0-beta.16",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",