clay-server 2.23.0 → 2.23.1-beta.2

package/lib/public/app.js

@@ -31,7 +31,7 @@ import { initMateWizard, openMateWizard, closeMateWizard, handleMateCreated } fr
 import { initCommandPalette, handlePaletteSessionSwitch, setPaletteVersion } from './modules/command-palette.js';
 import { initLongPress } from './modules/longpress.js';
 import { initMention, handleMentionStart, handleMentionStream, handleMentionDone, handleMentionError, handleMentionActivity, renderMentionUser, renderMentionResponse } from './modules/mention.js';
-import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, handleDebateEnded, handleDebateError, renderDebateStarted, renderDebateTurnDone, renderDebateEnded, renderDebateCommentInjected, renderDebateUserResume, openDebateModal, closeDebateModal, openQuickDebateModal, handleDebateBriefReady, renderDebateBriefReady, isDebateActive, resetDebateState } from './modules/debate.js';
+import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateResumed, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, handleDebateEnded, handleDebateError, renderDebateStarted, renderDebateTurnDone, renderDebateEnded, renderDebateCommentInjected, renderDebateUserResume, openDebateModal, closeDebateModal, handleDebateBriefReady, renderDebateBriefReady, isDebateActive, resetDebateState } from './modules/debate.js';
 
 // --- Base path for multi-project routing ---
   var slugMatch = location.pathname.match(/^\/p\/([a-z0-9_-]+)/);
@@ -4979,6 +4979,7 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
         // --- Debate ---
         case "debate_preparing":
           showDebateSticky("preparing", msg);
+          handleDebatePreparing(msg);
           break;
 
         case "debate_brief_ready":
@@ -5412,6 +5413,7 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
     matesList: function () { return cachedMatesList || []; },
     availableBuiltins: function () { return cachedAvailableBuiltins || []; },
     currentMateId: function () { return (dmTargetUser && dmTargetUser.isMate) ? dmTargetUser.id : null; },
+    requireSkills: requireSkills,
   });
 
   // --- STT module (voice input via Web Speech API) ---
@@ -6167,30 +6169,15 @@ import { initDebate, handleDebateStarted, handleDebateResumed, handleDebateTurn,
     }, cb);
   }
 
-  function requireClayDebateSetup(cb) {
-    requireSkills({
-      title: "Skill Installation Required",
-      reason: "The Debate Setup skill is required to start a debate.",
-      skills: [{ name: "clay-debate-setup", url: "https://github.com/chadbyte/clay-debate-setup", scope: "global" }]
-    }, cb);
-  }
 
-  // Debate button in mate sidebar
+  // Debate button in mate sidebar (only visible in DM mode)
   var debateBtn = document.getElementById("mate-debate-btn");
   if (debateBtn) {
     debateBtn.addEventListener("click", function () {
-      if (dmMode && dmTargetUser && dmTargetUser.isMate) {
-        // Quick debate: moderator is the current DM mate, uses conversation context
-        // Build messages with isMate flag for context extraction
-        var contextMessages = dmMessageCache.map(function (m) {
-          return { text: m.text, isMate: m.from !== myUserId };
-        });
-        openQuickDebateModal(contextMessages);
-      } else {
-        requireClayDebateSetup(function () {
-          openDebateModal();
-        });
-      }
+      var contextMessages = dmMessageCache.map(function (m) {
+        return { text: m.text, isMate: m.from !== myUserId };
+      });
+      openDebateModal({ dmContext: contextMessages });
     });
   }
 

package/lib/public/css/debate.css

@@ -331,6 +331,54 @@
   color: var(--text);
 }
 
+/* --- Preparing indicator (shown while brief is being generated) --- */
+.debate-preparing-indicator {
+  max-width: var(--content-width);
+  margin: 32px auto;
+  padding: 0 20px;
+}
+
+.debate-preparing-inner {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 16px 20px;
+  border-radius: 12px;
+  background: color-mix(in srgb, var(--accent2) 8%, transparent);
+  border: 1px solid color-mix(in srgb, var(--accent2) 15%, transparent);
+}
+
+.debate-preparing-spinner {
+  display: inline-flex;
+  flex-shrink: 0;
+  color: var(--accent2);
+  animation: spin 1.2s linear infinite;
+}
+
+.debate-preparing-spinner .lucide {
+  width: 20px;
+  height: 20px;
+}
+
+.debate-preparing-text {
+  font-size: 14px;
+  color: var(--text-secondary);
+  line-height: 1.5;
+}
+
+.debate-preparing-dots {
+  animation: blink-dots 1.4s steps(4, end) infinite;
+}
+
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+@keyframes blink-dots {
+  0%, 20% { opacity: 0; }
+  40% { opacity: 1; }
+}
+
 /* --- Activity bar inside turns --- */
 .debate-activity-bar {
   margin: 4px 0;
@@ -862,6 +910,31 @@
   line-height: 1.4;
 }
 
+.debate-skip-setup-row {
+  margin-top: 12px;
+  padding: 8px 0;
+}
+
+.debate-toggle-label {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 13px;
+  color: var(--text-secondary);
+  cursor: pointer;
+}
+
+.debate-toggle-label input[type="checkbox"] {
+  margin: 0;
+  cursor: pointer;
+}
+
+.debate-skip-setup-hint {
+  font-size: 11px;
+  color: var(--text-muted);
+  margin-left: 4px;
+}
+
 .debate-modal-footer {
   display: flex;
   justify-content: flex-end;

package/lib/public/index.html

@@ -1433,6 +1433,13 @@
       <textarea id="debate-topic-input" rows="2" placeholder="e.g. Should AI development be regulated?"></textarea>
       <label class="debate-field-label" for="debate-panel-list">Select panelists</label>
       <div id="debate-panel-list" class="debate-panel-list"></div>
+      <div id="debate-skip-setup-row" class="debate-skip-setup-row hidden">
+        <label class="debate-toggle-label">
+          <input type="checkbox" id="debate-skip-setup-toggle">
+          <span>Skip setup</span>
+          <span class="debate-skip-setup-hint">Moderator generates the brief automatically from conversation context</span>
+        </label>
+      </div>
     </div>
     <div class="debate-modal-footer">
       <button id="debate-modal-cancel" class="debate-btn-cancel">Cancel</button>

package/lib/public/modules/debate.js

@@ -31,6 +31,11 @@ export function resetDebateState() {
   flushTurnStream();
   currentTurnEl = null;
   currentTurnMateId = null;
+  // Remove preparing indicator if present
+  if (ctx && ctx.messagesEl) {
+    var prep = ctx.messagesEl.querySelector(".debate-preparing-indicator");
+    if (prep) prep.remove();
+  }
 }
 
 function buildAvatarUrl(meta) {
@@ -85,7 +90,43 @@ export function handleDebateResumed(msg) {
   showDebateInfoFloat(msg);
 }
 
+export function handleDebatePreparing(msg) {
+  debatePhase = "preparing";
+
+  if (!ctx.messagesEl) return;
+
+  // Remove any existing preparing indicator
+  var existing = ctx.messagesEl.querySelector(".debate-preparing-indicator");
+  if (existing) existing.remove();
+
+  var el = document.createElement("div");
+  el.className = "debate-preparing-indicator";
+
+  var moderatorName = msg.moderatorName || "Moderator";
+  var panelistNames = (msg.panelists || []).map(function (p) { return p.name; }).filter(Boolean).join(", ");
+
+  el.innerHTML =
+    '<div class="debate-preparing-inner">' +
+      '<div class="debate-preparing-spinner">' + iconHtml("loader") + '</div>' +
+      '<div class="debate-preparing-text">' +
+        '<strong>' + escapeHtml(moderatorName) + '</strong> is setting up the debate' +
+        (panelistNames ? ' with <strong>' + escapeHtml(panelistNames) + '</strong>' : '') +
+        '<span class="debate-preparing-dots">...</span>' +
+      '</div>' +
+    '</div>';
+
+  ctx.messagesEl.appendChild(el);
+  refreshIcons();
+  if (ctx.scrollToBottom) ctx.scrollToBottom();
+}
+
 export function handleDebateStarted(msg) {
+  // Remove preparing indicator when debate goes live
+  if (ctx.messagesEl) {
+    var prep = ctx.messagesEl.querySelector(".debate-preparing-indicator");
+    if (prep) prep.remove();
+  }
+
   debateActive = true;
   debateTopic = msg.topic || "";
   debateRound = 1;
@@ -494,7 +535,8 @@ export function isDebateActive() {
 var modalEl = null;
 var selectedPanelists = [];
 
-export function openDebateModal() {
+export function openDebateModal(opts) {
+  opts = opts || {};
   modalEl = document.getElementById("debate-modal");
   if (!modalEl) return;
 
@@ -506,6 +548,46 @@ export function openDebateModal() {
     topicInput.focus();
   }
 
+  // Show/hide skip-setup toggle (only when dmContext is available)
+  var skipSetupRow = document.getElementById("debate-skip-setup-row");
+  var skipSetupToggle = document.getElementById("debate-skip-setup-toggle");
+  if (skipSetupRow) {
+    if (opts.dmContext) {
+      skipSetupRow.classList.remove("hidden");
+    } else {
+      skipSetupRow.classList.add("hidden");
+    }
+  }
+  if (skipSetupToggle) {
+    skipSetupToggle.checked = false;
+    skipSetupToggle.onchange = function () {
+      var topicLabel = modalEl.querySelector('.debate-field-label[for="debate-topic-input"]');
+      var reqSpan = topicLabel ? topicLabel.querySelector(".debate-field-req") : null;
+      if (skipSetupToggle.checked) {
+        if (topicInput) topicInput.placeholder = "Leave blank to auto-detect from conversation...";
+        if (reqSpan) reqSpan.style.display = "none";
+      } else {
+        if (topicInput) topicInput.placeholder = "e.g. Should AI development be regulated?";
+        if (reqSpan) reqSpan.style.display = "";
+      }
+    };
+  }
+
+  // Build DM context string for quick start
+  var dmContextStr = "";
+  if (opts.dmContext && opts.dmContext.length) {
+    var recent = opts.dmContext.slice(-20);
+    var parts = [];
+    for (var i = 0; i < recent.length; i++) {
+      var m = recent[i];
+      var speaker = m.isMate ? "Mate" : "User";
+      var text = m.text || "";
+      if (text.length > 500) text = text.substring(0, 500) + "...";
+      parts.push(speaker + ": " + text);
+    }
+    dmContextStr = parts.join("\n");
+  }
+
   // Populate panelist list from mates (exclude current mate = moderator)
   var panelList = document.getElementById("debate-panel-list");
   if (panelList) {
@@ -543,7 +625,9 @@ export function openDebateModal() {
   if (startBtn) {
     startBtn.onclick = function () {
       var topic = topicInput ? topicInput.value.trim() : "";
-      if (!topic) {
+      var skipSetup = skipSetupToggle && skipSetupToggle.checked;
+
+      if (!skipSetup && !topic) {
         topicInput.focus();
         return;
       }
@@ -552,32 +636,54 @@ export function openDebateModal() {
       var currentMateId = ctx.currentMateId ? ctx.currentMateId() : null;
       if (!currentMateId) return;
 
-      // Create a new session first, then send debate_start after switch
-      if (ctx.ws) {
-        var debatePayload = {
-          type: "debate_start",
-          moderatorId: currentMateId,
-          topic: topic,
-          panelists: selectedPanelists.map(function (id) {
-            return { mateId: id, role: "", brief: "" };
-          }),
-        };
-
-        // Listen for session_switched once, then send debate_start
-        var onMessage = function (evt) {
-          try {
-            var data = JSON.parse(evt.data);
-            if (data.type === "session_switched") {
-              ctx.ws.removeEventListener("message", onMessage);
-              ctx.ws.send(JSON.stringify(debatePayload));
-            }
-          } catch (e) {}
-        };
-        ctx.ws.addEventListener("message", onMessage);
-        ctx.ws.send(JSON.stringify({ type: "new_session" }));
+      var debatePayload = {
+        type: "debate_start",
+        moderatorId: currentMateId,
+        topic: topic || (skipSetup ? "(auto-detect from conversation)" : ""),
+        panelists: selectedPanelists.map(function (id) {
+          return { mateId: id, role: "", brief: "" };
+        }),
+      };
+
+      // When skip setup is toggled, send as quick start with DM context
+      if (skipSetup) {
+        debatePayload.quickStart = true;
+        debatePayload.dmContext = dmContextStr;
+      }
+
+      function sendDebate() {
+        // Create a new session first, then send debate_start after switch
+        if (ctx.ws) {
+          var onMessage = function (evt) {
+            try {
+              var data = JSON.parse(evt.data);
+              if (data.type === "session_switched") {
+                ctx.ws.removeEventListener("message", onMessage);
+                ctx.ws.send(JSON.stringify(debatePayload));
+              }
+            } catch (e) {}
+          };
+          ctx.ws.addEventListener("message", onMessage);
+          ctx.ws.send(JSON.stringify({ type: "new_session" }));
+        }
+        closeDebateModal();
       }
 
-      closeDebateModal();
+      if (skipSetup) {
+        // Quick start: no skill needed
+        sendDebate();
+      } else {
+        // Standard: require clay-debate-setup skill first
+        if (ctx.requireSkills) {
+          ctx.requireSkills({
+            title: "Skill Installation Required",
+            reason: "The Debate Setup skill is required to start a debate.",
+            skills: [{ name: "clay-debate-setup", url: "https://github.com/chadbyte/clay-debate-setup", scope: "global" }]
+          }, sendDebate);
+        } else {
+          sendDebate();
+        }
+      }
     };
   }
 
@@ -655,6 +761,10 @@ export function closeDebateModal() {
     modalEl.classList.add("hidden");
   }
   selectedPanelists = [];
+  var skipSetupToggle = document.getElementById("debate-skip-setup-toggle");
+  if (skipSetupToggle) skipSetupToggle.checked = false;
+  var skipSetupRow = document.getElementById("debate-skip-setup-row");
+  if (skipSetupRow) skipSetupRow.classList.add("hidden");
 }
 
 // --- Quick Debate: start debate from DM context ---