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

package/lib/project-debate.js

@@ -1542,9 +1542,15 @@ function attachDebate(ctx) {
         avatarSeed: moderatorProfile.avatarSeed,
       });
 
+      // Build explicit panelist list so the moderator knows who to call on
+      var panelistNames = debate.panelists.map(function (p) {
+        var prof = ctx.getMateProfile(mateCtx, p.mateId);
+        return "@" + prof.name;
+      });
+      var panelistList = panelistNames.join(", ");
       var resumePrompt = instruction
-        ? "[The audience has requested the debate continue with the following direction]\nUser: " + instruction + "\n\n[As moderator, acknowledge this input and call on a panelist with @TheirName to continue the discussion.]"
-        : "[The audience has requested the debate continue. Call on the next panelist with @TheirName to explore additional perspectives.]";
+        ? "[SYSTEM: The audience has requested the debate continue with new direction. You MUST call on a panelist to continue. Available panelists: " + panelistList + "]\n\nUser direction: " + instruction + "\n\n[Acknowledge this input briefly, then call on a panelist by writing their @Name to continue the discussion on this new direction. You must @mention exactly one panelist.]"
+        : "[SYSTEM: The audience has requested the debate continue. You MUST call on the next panelist. Available panelists: " + panelistList + "]\n\n[Call on a panelist by writing their @Name to explore additional perspectives. You must @mention exactly one panelist.]";
 
       // If resuming from ended state, moderator session may be dead. Create a new one.
       if (wasEnded || !debate.moderatorSession || !debate.moderatorSession.isAlive()) {
@@ -1554,7 +1560,8 @@ function attachDebate(ctx) {
         var moderatorContext = buildModeratorContext(debate) + digests;
 
         // Include debate history so moderator has context
-        moderatorContext += "\n\nDebate history so far:\n---\n";
+        moderatorContext += "\n\nIMPORTANT: This debate was previously paused and is now being RESUMED. You must continue the debate by calling on a panelist with @TheirName. Do NOT conclude or summarize.\n";
+        moderatorContext += "\nDebate history so far:\n---\n";
         for (var hi = 0; hi < debate.history.length; hi++) {
           var h = debate.history[hi];
           moderatorContext += (h.mateName || h.speaker || "Unknown") + " (" + (h.role || "") + "): " + (h.text || "").slice(0, 500) + "\n\n";

package/lib/public/app.js

@@ -5872,8 +5872,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     handleDmSend: function () { handleDmSend(); },
     isDebateEndedMode: function () { return debateEndedMode; },
     handleDebateEndedSend: function () { handleDebateEndedSend(); },
-    isDebateConcludeMode: function () { return debateConcludeMode; },
-    handleDebateConcludeSend: function () { handleDebateConcludeSend(); },
+    isDebateConcludeMode: function () { return false; },
+    handleDebateConcludeSend: null,
     isDebateFloorMode: function () { return debateFloorMode; },
     handleDebateFloorSend: function () { handleDebateFloorSend(); },
     isMateDm: function () { return dmMode && dmTargetUser && dmTargetUser.isMate; },
@@ -7201,70 +7201,6 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   }
 
   var debateFloorMode = false;
-  var debateConcludeMode = false;
-
-  function showDebateConcludeMode() {
-    debateConcludeMode = true;
-    removeDebateBottomBar();
-    var inputArea = document.getElementById("input-area");
-    if (inputArea) {
-      inputArea.classList.add("debate-floor-mode");
-      inputArea.style.display = "";
-    }
-    // Add conclude banner above input
-    var existingBanner = document.getElementById("debate-floor-banner");
-    if (existingBanner) existingBanner.remove();
-    var banner = document.createElement("div");
-    banner.id = "debate-floor-banner";
-    banner.className = "debate-floor-banner";
-    banner.innerHTML = iconHtml("check-circle") + " <span>The moderator is ready to conclude</span>" +
-      '<button class="debate-floor-done-btn debate-floor-end-btn" id="debate-floor-end-btn">End Debate</button>';
-    if (inputArea && inputArea.parentNode) {
-      inputArea.parentNode.insertBefore(banner, inputArea);
-    }
-    refreshIcons();
-    // End Debate button
-    var endBtn = document.getElementById("debate-floor-end-btn");
-    if (endBtn) {
-      endBtn.addEventListener("click", function () {
-        if (ws && ws.readyState === 1) {
-          ws.send(JSON.stringify({ type: "debate_conclude_response", action: "end" }));
-        }
-        exitDebateConcludeMode();
-      });
-    }
-    // Update placeholder
-    var inputEl = document.getElementById("input");
-    if (inputEl) {
-      inputEl._origPlaceholder = inputEl._origPlaceholder || inputEl.placeholder;
-      inputEl.placeholder = "Add a direction to continue the debate...";
-      inputEl.focus();
-    }
-    scrollToBottom();
-  }
-
-  function exitDebateConcludeMode() {
-    debateConcludeMode = false;
-    var inputArea = document.getElementById("input-area");
-    if (inputArea) inputArea.classList.remove("debate-floor-mode");
-    var banner = document.getElementById("debate-floor-banner");
-    if (banner) banner.remove();
-    var inputEl = document.getElementById("input");
-    if (inputEl && inputEl._origPlaceholder) {
-      inputEl.placeholder = inputEl._origPlaceholder;
-      delete inputEl._origPlaceholder;
-    }
-  }
-
-  function handleDebateConcludeSend() {
-    var text = inputEl.value.trim();
-    if (ws && ws.readyState === 1) {
-      ws.send(JSON.stringify({ type: "debate_conclude_response", action: "continue", text: text }));
-    }
-    inputEl.value = "";
-    exitDebateConcludeMode();
-    showDebateBottomBar("live");
-  }
 
   var debateEndedMode = false;
 
@@ -7508,9 +7444,43 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
         }
       });
     } else if (mode === "conclude") {
-      // Use native input area with conclude banner
-      showDebateConcludeMode();
-      return; // don't create a separate bar
+      bar.innerHTML =
+        '<div class="debate-bottom-inner debate-bottom-conclude">' +
+          '<div class="debate-bottom-conclude-label">' + iconHtml("check-circle") + ' The moderator is ready to conclude. End the debate?</div>' +
+          '<textarea class="debate-bottom-conclude-input" id="debate-bottom-conclude-input" rows="3" placeholder="Or add a direction to continue..."></textarea>' +
+          '<div class="debate-bottom-conclude-actions">' +
+            '<button class="debate-bottom-continue" id="debate-bottom-continue">Continue</button>' +
+            '<button class="debate-bottom-end" id="debate-bottom-end">End Debate</button>' +
+          '</div>' +
+        '</div>';
+
+      inputArea.parentNode.insertBefore(bar, inputArea);
+      inputArea.style.display = "none";
+      refreshIcons();
+
+      var textArea = document.getElementById("debate-bottom-conclude-input");
+      document.getElementById("debate-bottom-end").addEventListener("click", function () {
+        if (ws && ws.readyState === 1) {
+          ws.send(JSON.stringify({ type: "debate_conclude_response", action: "end" }));
+        }
+        removeDebateBottomBar();
+      });
+      document.getElementById("debate-bottom-continue").addEventListener("click", function () {
+        var text = textArea ? textArea.value.trim() : "";
+        if (ws && ws.readyState === 1) {
+          ws.send(JSON.stringify({ type: "debate_conclude_response", action: "continue", text: text }));
+        }
+        removeDebateBottomBar();
+        showDebateBottomBar("live");
+      });
+      if (textArea) {
+        textArea.addEventListener("keydown", function (e) {
+          if (e.key === "Enter" && !e.shiftKey) {
+            e.preventDefault();
+            document.getElementById("debate-bottom-continue").click();
+          }
+        });
+      }
     }
   }
 
@@ -7530,9 +7500,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     var handBar = document.getElementById("debate-hand-raise-bar");
     if (handBar) handBar.remove();
     debateHandRaiseOpen = false;
-    // Clean up floor/conclude modes
+    // Clean up floor/ended modes
     if (debateFloorMode) exitDebateFloorMode();
-    if (debateConcludeMode) exitDebateConcludeMode();
     if (debateEndedMode) exitDebateEndedMode();
     // Restore input area
     var inputArea = document.getElementById("input-area");

package/lib/sdk-bridge.js

@@ -437,9 +437,37 @@ 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;
+      }
+
+      // 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 +493,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;

package/lib/sessions.js

@@ -1,6 +1,5 @@
 var fs = require("fs");
 var path = require("path");
-var crypto = require("crypto");
 var config = require("./config");
 var utils = require("./utils");
 var users = require("./users");
@@ -76,9 +75,7 @@ function createSessionManager(opts) {
   }
 
   function saveSessionFile(session) {
-    if (!session.cliSessionId) {
-      session.cliSessionId = crypto.randomUUID();
-    }
+    if (!session.cliSessionId) return;
     try {
       var metaObj = {
         type: "meta",
@@ -113,10 +110,7 @@ function createSessionManager(opts) {
   }
 
   function appendToSessionFile(session, obj) {
-    if (!session.cliSessionId) {
-      session.cliSessionId = crypto.randomUUID();
-      saveSessionFile(session);
-    }
+    if (!session.cliSessionId) return;
     session.lastActivity = Date.now();
     try {
       var afPath = sessionFilePath(session.cliSessionId);

package/package.json

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