clay-server 2.26.0 → 2.26.1-beta.1

package/lib/public/app.js

@@ -4388,8 +4388,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
             if (dhBar) dhBar.remove();
             var dbBadges = document.querySelectorAll(".debate-header-badge");
             for (var dbi = 0; dbi < dbBadges.length; dbi++) dbBadges[dbi].remove();
-            // Clean up ended mode banner if debate is not active on this session
+            // Clean up all debate mode banners if debate is not active on this session
+            if (debateFloorMode) exitDebateFloorMode();
+            if (debateConcludeMode) exitDebateConcludeMode();
             if (debateEndedMode) exitDebateEndedMode();
+            var dbBanner = document.getElementById("debate-floor-banner");
+            if (dbBanner) dbBanner.remove();
           }
           scrollToBottom();
           // Scroll to tool element if navigating from file edit history
@@ -5478,7 +5482,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
         // --- Debate ---
         case "debate_preparing":
-          showDebateSticky("preparing", msg);
+          if (!replayingHistory) showDebateSticky("preparing", msg);
           handleDebatePreparing(msg);
           break;
 
@@ -5491,7 +5495,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
           break;
 
         case "debate_started":
-          showDebateSticky("live", msg);
+          if (!replayingHistory) showDebateSticky("live", msg);
           if (replayingHistory) {
             renderDebateStarted(msg);
           } else {
@@ -5538,11 +5542,11 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
           break;
 
         case "debate_conclude_confirm":
-          showDebateConcludeConfirm(msg);
+          if (!replayingHistory) showDebateConcludeConfirm(msg);
           break;
 
         case "debate_user_floor":
-          showDebateUserFloor(msg);
+          if (!replayingHistory) showDebateUserFloor(msg);
           break;
 
         case "debate_user_floor_done":
@@ -5555,11 +5559,11 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
         case "debate_resumed":
           handleDebateResumed(msg);
-          showDebateSticky("live", msg);
+          if (!replayingHistory) showDebateSticky("live", msg);
           break;
 
         case "debate_ended":
-          showDebateSticky("ended", msg);
+          if (!replayingHistory) showDebateSticky("ended", msg);
           if (replayingHistory) {
             renderDebateEnded(msg);
           } else {
@@ -5896,8 +5900,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     handleDmSend: function () { handleDmSend(); },
     isDebateEndedMode: function () { return debateEndedMode; },
     handleDebateEndedSend: function () { handleDebateEndedSend(); },
-    isDebateConcludeMode: function () { return false; },
-    handleDebateConcludeSend: null,
+    isDebateConcludeMode: function () { return debateConcludeMode; },
+    handleDebateConcludeSend: function () { handleDebateConcludeSend(); },
     isDebateFloorMode: function () { return debateFloorMode; },
     handleDebateFloorSend: function () { handleDebateFloorSend(); },
     isMateDm: function () { return dmMode && dmTargetUser && dmTargetUser.isMate; },
@@ -7222,17 +7226,77 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   var debateHandRaiseOpen = false;
 
   function showDebateConcludeConfirm(msg) {
-    showDebateBottomBar("conclude", msg);
-    scrollToBottom();
+    showDebateConcludeMode();
   }
 
   var debateFloorMode = false;
+  var debateConcludeMode = false;
+
+  function showDebateConcludeMode() {
+    removeDebateBottomBar();
+    debateConcludeMode = true;
+    var inputArea = document.getElementById("input-area");
+    if (inputArea) {
+      inputArea.classList.add("debate-floor-mode");
+      inputArea.style.display = "";
+    }
+    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();
+    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();
+      });
+    }
+    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;
 
   function showDebateEndedMode(msg) {
-    debateEndedMode = true;
     removeDebateBottomBar();
+    debateEndedMode = true;
     var inputArea = document.getElementById("input-area");
     if (inputArea) {
       inputArea.classList.add("debate-floor-mode");
@@ -7296,9 +7360,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   }
 
   function showDebateUserFloor(msg) {
-    debateFloorMode = true;
     // Remove debate bottom bar and show input area in floor mode
     removeDebateBottomBar();
+    debateFloorMode = true;
     var inputArea = document.getElementById("input-area");
     if (inputArea) {
       inputArea.classList.add("debate-floor-mode");
@@ -7469,44 +7533,6 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
           ws.send(JSON.stringify({ type: "debate_stop" }));
         }
       });
-    } else if (mode === "conclude") {
-      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();
-          }
-        });
-      }
     }
   }
 
@@ -7526,8 +7552,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     var handBar = document.getElementById("debate-hand-raise-bar");
     if (handBar) handBar.remove();
     debateHandRaiseOpen = false;
-    // Clean up floor/ended modes
+    // Clean up floor/conclude/ended modes
     if (debateFloorMode) exitDebateFloorMode();
+    if (debateConcludeMode) exitDebateConcludeMode();
     if (debateEndedMode) exitDebateEndedMode();
     // Restore input area
     var inputArea = document.getElementById("input-area");

package/package.json

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