clay-server 2.26.0-beta.9 → 2.26.0

package/lib/sdk-bridge.js

@@ -437,9 +437,38 @@ function createSDKBridge(opts) {
       session.pendingAskUser = {};
       session.activeTaskToolIds = {};
       session.taskIdMap = {};
+      // Only clear rateLimitResetsAt on genuine success (non-zero cost).
+      // When rate-limited, the SDK sends result with zero cost right after
+      // rate_limit_event; clearing here would prevent auto-continue scheduling.
+      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".
+      if (parsed.subtype === "error_during_execution") {
+        var execErrors = parsed.errors || [];
+        var execError = execErrors.length > 0
+          ? execErrors.join("; ")
+          : "Unknown SDK error";
+        if (parsed.terminal_reason) execError += " (reason: " + parsed.terminal_reason + ")";
+        console.error("[sdk-bridge] Execution error for session " + session.localId + ": " + execError);
+        session.isProcessing = false;
+        onProcessingChanged();
+        sendAndRecord(session, { type: "error", text: "Claude error: " + execError });
+        sendAndRecord(session, { type: "done", code: 1 });
+        sm.broadcastSessionList();
+        return;
+      }
+
       session.isProcessing = false;
-      session.rateLimitResetsAt = null; // clear on success
       onProcessingChanged();
+      // Detect "Not logged in" scenario early for the check below
+      var previewTrimmed = (session.responsePreview || "").trim();
+      var isZeroCost = !parsed.total_cost_usd || parsed.total_cost_usd === 0;
+      var isLoginPrompt = isZeroCost && previewTrimmed.length < 100
+        && /not logged in/i.test(previewTrimmed) && /\/login/i.test(previewTrimmed);
       // Fetch rich context usage breakdown (fire-and-forget, non-blocking)
       if (session.queryInstance && typeof session.queryInstance.getContextUsage === "function") {
         session.queryInstance.getContextUsage().then(function(ctxUsage) {
@@ -465,10 +494,6 @@ function createSDKBridge(opts) {
       }
       // Detect "Not logged in · Please run /login" from SDK.
       // This is a short canned response with zero cost, not actual AI output.
-      var previewTrimmed = (session.responsePreview || "").trim();
-      var isZeroCost = !parsed.total_cost_usd || parsed.total_cost_usd === 0;
-      var isLoginPrompt = isZeroCost && previewTrimmed.length < 100
-        && /not logged in/i.test(previewTrimmed) && /\/login/i.test(previewTrimmed);
       if (isLoginPrompt) {
         var authUser = session.ownerId ? usersModule.findUserById(session.ownerId) : null;
         var authLinuxUser = authUser && authUser.linuxUser ? authUser.linuxUser : null;
@@ -573,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) {
@@ -597,6 +623,33 @@ function createSDKBridge(opts) {
         // Track rejection for auto-continue / scheduled message support
         if (info.status === "rejected" && info.resetsAt) {
           session.rateLimitResetsAt = info.resetsAt * 1000;
+
+          // 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));
+            console.log("[sdk-bridge] rate_limit rejected: acEnabled=" + acEnabled + " overage=" + !!info.isUsingOverage + " session=" + session.localId);
+            if (acEnabled) {
+              session.rateLimitAutoContinuePending = true;
+              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);
+                }
+              }
+            }
+          }
         }
       }
 
@@ -1230,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);
             }
@@ -1321,6 +1391,8 @@ function createSDKBridge(opts) {
             sm.broadcastSessionList();
           }
           cleanupSessionWorker(session, worker);
+          // 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 workerDidScheduleAC = false;
           var workerACEnabled = session.onQueryComplete || (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
@@ -1495,24 +1567,15 @@ function createSDKBridge(opts) {
 
   // --- SDK query lifecycle ---
 
-  function handleCanUseTool(session, toolName, input, opts) {
-    // Ralph Loop execution: auto-approve all tools, deny interactive ones.
-    // Crafting sessions are interactive — user and Claude collaborate to build PROMPT.md / JUDGE.md.
-    if (session.loop && session.loop.active && session.loop.role !== "crafting") {
-      if (toolName === "AskUserQuestion") {
-        return Promise.resolve({ behavior: "deny", message: "Autonomous mode. Make your own decision." });
-      }
-      if (toolName === "EnterPlanMode") {
-        return Promise.resolve({ behavior: "deny", message: "Do not enter plan mode. Execute directly." });
-      }
-      return Promise.resolve({ behavior: "allow", updatedInput: input });
-    }
-
+  // Check if a tool should be auto-approved based on whitelist rules.
+  // Returns { behavior: "allow", updatedInput } if whitelisted, or null if not.
+  // Shared by handleCanUseTool and mate mention canUseTool handlers.
+  function checkToolWhitelist(toolName, input) {
     // Auto-approve read-only tools for ALL sessions.
     // These tools only inspect files and fetch data — no side effects.
     var readOnlyTools = { Read: true, Glob: true, Grep: true, WebFetch: true, WebSearch: true };
     if (readOnlyTools[toolName]) {
-      return Promise.resolve({ behavior: "allow", updatedInput: input });
+      return { behavior: "allow", updatedInput: input };
     }
 
     // Auto-approve safe browser MCP tools.
@@ -1523,10 +1586,17 @@ function createSDKBridge(opts) {
     if (toolName.indexOf("mcp__") === 0 && toolName.indexOf("__browser_") !== -1) {
       var mcpToolName = toolName.substring(toolName.lastIndexOf("__") + 2);
       if (safeBrowserTools[mcpToolName]) {
-        return Promise.resolve({ behavior: "allow", updatedInput: input });
+        return { behavior: "allow", updatedInput: input };
       }
     }
 
+    // Auto-approve debate MCP tools (propose_debate).
+    // These are user-facing tools that show inline approval cards,
+    // so the permission prompt is redundant.
+    if (toolName.indexOf("mcp__clay-debate__") === 0) {
+      return { behavior: "allow", updatedInput: input };
+    }
+
     // Auto-approve safe Bash commands (read-only, non-destructive)
     // Applies to ALL sessions (mates and regular projects alike).
     // These are purely read-only commands that cannot modify files, install
@@ -1591,10 +1661,32 @@ function createSDKBridge(opts) {
         if (!safeBashCommands[firstWord]) { allSafe = false; break; }
       }
       if (allSafe) {
-        return Promise.resolve({ behavior: "allow", updatedInput: input });
+        return { behavior: "allow", updatedInput: input };
       }
     }
 
+    return null; // Not whitelisted
+  }
+
+  function handleCanUseTool(session, toolName, input, opts) {
+    // Ralph Loop execution: auto-approve all tools, deny interactive ones.
+    // Crafting sessions are interactive — user and Claude collaborate to build PROMPT.md / JUDGE.md.
+    if (session.loop && session.loop.active && session.loop.role !== "crafting") {
+      if (toolName === "AskUserQuestion") {
+        return Promise.resolve({ behavior: "deny", message: "Autonomous mode. Make your own decision." });
+      }
+      if (toolName === "EnterPlanMode") {
+        return Promise.resolve({ behavior: "deny", message: "Do not enter plan mode. Execute directly." });
+      }
+      return Promise.resolve({ behavior: "allow", updatedInput: input });
+    }
+
+    // Check shared whitelist (read-only tools, safe browser tools, safe bash commands)
+    var whitelisted = checkToolWhitelist(toolName, input);
+    if (whitelisted) {
+      return Promise.resolve(whitelisted);
+    }
+
     // AskUserQuestion: wait for user answers via WebSocket
     if (toolName === "AskUserQuestion") {
       return new Promise(function(resolve) {
@@ -1836,6 +1928,10 @@ function createSDKBridge(opts) {
       session.pendingElicitations = {};
 
       // Auto-continue on rate limit (scheduler sessions, or user setting)
+      // Mark session as done processing so the late rate_limit_event handler
+      // can detect the race condition and schedule auto-continue itself.
+      session.isProcessing = false;
+
       var didScheduleAutoContinue = false;
       var acEnabled = session.onQueryComplete || (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
       if (session.rateLimitResetsAt && session.rateLimitResetsAt > Date.now()
@@ -1848,6 +1944,10 @@ function createSDKBridge(opts) {
         if (typeof opts.scheduleMessage === "function") {
           opts.scheduleMessage(session, "continue", acResetsAt);
         }
+      } else if (acEnabled && !session.destroying) {
+        // Log why auto-continue was not scheduled (for debugging)
+        console.log("[sdk-bridge] Query done, auto-continue enabled but not scheduled: rateLimitResetsAt=" +
+          session.rateLimitResetsAt + " (will rely on late rate_limit_event handler)");
       }
 
       // Ralph Loop: notify completion so loop orchestrator can proceed
@@ -2449,6 +2549,7 @@ function createSDKBridge(opts) {
   return {
     createMessageQueue: createMessageQueue,
     processSDKMessage: processSDKMessage,
+    checkToolWhitelist: checkToolWhitelist,
     handleCanUseTool: handleCanUseTool,
     handleElicitation: handleElicitation,
     processQueryStream: processQueryStream,

package/lib/sessions.js

@@ -237,10 +237,8 @@ function createSessionManager(opts) {
     return [...sessions.values()].filter(function (s) {
       if (s.hidden) return false;
       if (!multiUser) {
-        // Single-user mode: only show sessions without ownerId
         return !s.ownerId;
       }
-      // Multi-user mode: include all sessions (per-user filtering done by canAccessSession)
       return true;
     });
   }
@@ -507,6 +505,8 @@ function createSessionManager(opts) {
   }
 
   function doSendAndRecord(session, obj) {
+    // Stamp every recorded message so history replay preserves original times
+    if (!obj._ts) obj._ts = Date.now();
     session.history.push(obj);
     appendToSessionFile(session, obj);
     if (sendEach) {

package/package.json

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