clay-server 2.26.0-beta.1 → 2.26.0-beta.10

package/lib/project-debate.js

@@ -156,6 +156,7 @@ function attachDebate(ctx) {
       setupStartedAt: d.setupStartedAt || null,
       round: d.round || 1,
       awaitingConcludeConfirm: !!d.awaitingConcludeConfirm,
+      awaitingUserFloor: !!d.awaitingUserFloor,
     };
     ctx.sm.saveSessionFile(session);
   }
@@ -186,6 +187,7 @@ function attachDebate(ctx) {
       setupStartedAt: ds.setupStartedAt || null,
       briefPath: ds.briefPath || null,
       awaitingConcludeConfirm: !!ds.awaitingConcludeConfirm,
+      awaitingUserFloor: !!ds.awaitingUserFloor,
     };
 
     // Fallback: if awaitingConcludeConfirm was not persisted, detect from history
@@ -255,17 +257,11 @@ function attachDebate(ctx) {
         debate.context = brief.context || "";
         debate.specialRequests = brief.specialRequests || null;
 
-        // Update panelists with roles from the brief
+        // Replace panelists with those selected in the brief
         if (brief.panelists && brief.panelists.length) {
-          for (var i = 0; i < brief.panelists.length; i++) {
-            var bp = brief.panelists[i];
-            for (var j = 0; j < debate.panelists.length; j++) {
-              if (debate.panelists[j].mateId === bp.mateId) {
-                debate.panelists[j].role = bp.role || "";
-                debate.panelists[j].brief = bp.brief || "";
-              }
-            }
-          }
+          debate.panelists = brief.panelists.map(function (bp) {
+            return { mateId: bp.mateId, role: bp.role || "", brief: bp.brief || "" };
+          });
         }
 
         // Rebuild name map with updated roles
@@ -358,20 +354,17 @@ function attachDebate(ctx) {
         console.log("[debate] Restoring debate (preparing). topic:", debate.topic, "briefPath:", briefPath);
         startDebateBriefWatcher(session, debate, briefPath);
 
-        // Only show preparing indicator for quick start (standard setup shows skill in real-time)
-        if (debate.quickStart) {
-          ctx.sendTo(ws, {
-            type: "debate_preparing",
-            topic: debate.topic,
-            moderatorId: debate.moderatorId,
-            moderatorName: moderatorProfile.name,
-            setupSessionId: debate.setupSessionId,
-            panelists: debate.panelists.map(function (p) {
-              var prof = ctx.getMateProfile(mateCtx, p.mateId);
-              return { mateId: p.mateId, name: prof.name };
-            }),
-          });
-        }
+        ctx.sendTo(ws, {
+          type: "debate_preparing",
+          topic: debate.topic,
+          moderatorId: debate.moderatorId,
+          moderatorName: moderatorProfile.name,
+          setupSessionId: debate.setupSessionId,
+          panelists: debate.panelists.map(function (p) {
+            var prof = ctx.getMateProfile(mateCtx, p.mateId);
+            return { mateId: p.mateId, name: prof.name };
+          }),
+        });
       } else if (phase === "reviewing") {
         console.log("[debate] Restoring debate (reviewing). topic:", debate.topic);
         ctx.sendTo(ws, {
@@ -500,8 +493,27 @@ function attachDebate(ctx) {
     var session = ctx.getSessionForWs(ws);
     if (!session) return;
 
-    if (!msg.moderatorId || !msg.topic || !msg.panelists || !msg.panelists.length) {
-      ctx.sendTo(ws, { type: "debate_error", error: "Missing required fields: moderatorId, topic, panelists." });
+    if (!msg.moderatorId || !msg.topic) {
+      ctx.sendTo(ws, { type: "debate_error", error: "Missing required fields: moderatorId, topic." });
+      return;
+    }
+
+    // delegatePanelists: moderator picks panelists, populate all available mates
+    if (msg.delegatePanelists) {
+      var userId = ws._clayUser ? ws._clayUser.id : null;
+      var tmpCtx = matesModule.buildMateCtx(userId);
+      var matesData = matesModule.loadMates(tmpCtx);
+      var allMates = matesData.mates || [];
+      msg.panelists = [];
+      for (var mi = 0; mi < allMates.length; mi++) {
+        if (allMates[mi].id !== msg.moderatorId && allMates[mi].status !== "interviewing") {
+          msg.panelists.push({ mateId: allMates[mi].id, role: "", brief: "" });
+        }
+      }
+    }
+
+    if (!msg.panelists || !msg.panelists.length) {
+      ctx.sendTo(ws, { type: "debate_error", error: "No panelists available." });
       return;
     }
 
@@ -597,7 +609,9 @@ function attachDebate(ctx) {
       "",
       "## Your Task",
       "Based on the conversation context, create a debate brief. You know the topic well because you were just discussing it.",
-      "Assign each panelist a role and perspective that will create the most productive debate.",
+      msg.delegatePanelists
+        ? "IMPORTANT: Select only 2-4 panelists who are most relevant to this specific topic. Do NOT include all of them. Be selective. Only pick mates whose expertise or personality directly contributes to this debate."
+        : "The user already selected these panelists. Assign each one a role and perspective that will create the most productive debate.",
       "",
       "Output ONLY a valid JSON object (no markdown fences, no extra text):",
       "{",
@@ -723,13 +737,24 @@ function attachDebate(ctx) {
     // Watch for brief.json in the debate-specific directory
     startDebateBriefWatcher(session, debate, briefPath);
 
-    // Standard setup: no preparing indicator needed because the user
-    // sees the skill working in real-time in the setup session.
+    // Notify clients that setup is in progress
+    var preparingMsg = {
+      type: "debate_preparing",
+      topic: debate.topic || "(Setting up...)",
+      moderatorId: debate.moderatorId,
+      moderatorName: moderatorProfile.name,
+      setupSessionId: setupSession.localId,
+      panelists: debate.panelists.map(function (p) {
+        var prof = ctx.getMateProfile(mateCtx, p.mateId);
+        return { mateId: p.mateId, name: prof.name };
+      }),
+    };
+    ctx.sendTo(ws, preparingMsg);
+    ctx.sendToSession(session.localId, preparingMsg);
 
-    // Start the setup skill session
-    setupSession.history.push({ type: "user_message", text: craftingPrompt });
-    ctx.sm.appendToSessionFile(setupSession, { type: "user_message", text: craftingPrompt });
-    ctx.sendToSession(setupSession.localId, { type: "user_message", text: craftingPrompt });
+    // Start the setup skill session (don't send user_message to client — it's an internal prompt)
+    setupSession.history.push({ type: "user_message", text: craftingPrompt, _internal: true });
+    ctx.sm.appendToSessionFile(setupSession, { type: "user_message", text: craftingPrompt, _internal: true });
     setupSession.isProcessing = true;
     ctx.onProcessingChanged();
     setupSession.sentToolResults = {};
@@ -754,10 +779,6 @@ function attachDebate(ctx) {
     var debateSession = ctx.sm.createSession();
     debateSession.title = debate.topic.slice(0, 50);
     debateSession.loop = { active: true, iteration: 1, role: "debate", loopId: debate.debateId, name: debate.topic.slice(0, 40), source: "debate", startedAt: debate.setupStartedAt || Date.now() };
-    // Assign cliSessionId manually so saveSessionFile works (no SDK query for debate sessions)
-    if (!debateSession.cliSessionId) {
-      debateSession.cliSessionId = crypto.randomUUID();
-    }
     ctx.sm.saveSessionFile(debateSession);
     ctx.sm.switchSession(debateSession.localId, null, ctx.hydrateImageRefs);
     debate.liveSessionId = debateSession.localId;
@@ -886,6 +907,12 @@ function attachDebate(ctx) {
       return;
     }
 
+    // Check if user raised hand
+    if (debate.handRaised) {
+      yieldFloorToUser(session);
+      return;
+    }
+
     // Trigger the first mentioned panelist
     triggerPanelist(session, mentionedIds[0], fullText);
   }
@@ -1041,12 +1068,18 @@ function attachDebate(ctx) {
       return;
     }
 
-    // Check for pending user comment
+    // Check for pending user comment (legacy)
     if (debate.pendingComment) {
       injectUserComment(session);
       return;
     }
 
+    // Check if user raised hand (no comment, just wants the floor)
+    if (debate.handRaised) {
+      yieldFloorToUser(session);
+      return;
+    }
+
     // Feed panelist response back to moderator
     feedBackToModerator(session, mateId, fullText);
   }
@@ -1115,73 +1148,75 @@ function attachDebate(ctx) {
 
   // --- User interaction during debate ---
 
-  function handleDebateComment(ws, msg) {
+  function handleDebateHandRaise(ws) {
     var session = ctx.getSessionForWs(ws);
     if (!session) return;
 
     var debate = session._debate;
-    if (!debate || debate.phase !== "live") {
-      ctx.sendTo(ws, { type: "debate_error", error: "No active debate." });
-      return;
-    }
-
-    // If awaiting conclude confirmation, re-send the confirm prompt instead
+    if (!debate || debate.phase !== "live") return;
+    if (debate.awaitingUserFloor || debate.handRaised) return;
     if (debate.awaitingConcludeConfirm) {
       ctx.sendTo(ws, { type: "debate_conclude_confirm", topic: debate.topic, round: debate.round });
       return;
     }
 
+    debate.handRaised = true;
+    ctx.sendToSession(session.localId, { type: "debate_hand_raised" });
+
+    // If no one is speaking, yield floor immediately
+    if (!debate.turnInProgress) {
+      yieldFloorToUser(session);
+    }
+    // Otherwise: current speaker finishes -> handRaised detected -> yieldFloorToUser
+  }
+
+  function handleDebateComment(ws, msg) {
+    // Legacy: kept for compatibility but now hand raise is separate
+    var session = ctx.getSessionForWs(ws);
+    if (!session) return;
+
+    var debate = session._debate;
+    if (!debate || debate.phase !== "live") {
+      ctx.sendTo(ws, { type: "debate_error", error: "No active debate." });
+      return;
+    }
+    if (debate.awaitingUserFloor) return;
     if (!msg.text) return;
 
     debate.pendingComment = { text: msg.text };
+    debate.handRaised = true;
     ctx.sendToSession(session.localId, { type: "debate_comment_queued", text: msg.text });
 
-    // If a panelist turn is in progress, abort it and go straight to moderator
-    if (debate.turnInProgress && debate._currentTurnMateId && debate._currentTurnMateId !== debate.moderatorId) {
-      var abortMateId = debate._currentTurnMateId;
-      console.log("[debate] User raised hand during panelist turn, aborting " + abortMateId);
-
-      // Close the panelist's mention session to stop generation
-      if (debate.panelistSessions[abortMateId]) {
-        try { debate.panelistSessions[abortMateId].close(); } catch (e) {}
-        delete debate.panelistSessions[abortMateId];
-      }
+    if (!debate.turnInProgress) {
+      injectUserComment(session);
+    }
+  }
 
-      // Save partial text as interrupted turn
-      var partialText = debate._currentTurnText || "(interrupted by audience)";
-      var profile = ctx.getMateProfile(debate.mateCtx, abortMateId);
-      var panelistInfo = null;
-      for (var pi = 0; pi < debate.panelists.length; pi++) {
-        if (debate.panelists[pi].mateId === abortMateId) { panelistInfo = debate.panelists[pi]; break; }
-      }
+  function yieldFloorToUser(session) {
+    var debate = session._debate;
+    if (!debate || !debate.moderatorSession || debate.phase === "ended") return;
 
-      ctx.sendToSession(session.localId, {
-        type: "debate_turn_done",
-        mateId: abortMateId,
-        mateName: profile.name,
-        role: panelistInfo ? panelistInfo.role : "",
-        text: partialText,
-        interrupted: true,
-        avatarStyle: profile.avatarStyle,
-        avatarSeed: profile.avatarSeed,
-        avatarColor: profile.avatarColor,
-      });
+    debate.handRaised = false;
+    debate.turnInProgress = true;
+    var moderatorProfile = ctx.getMateProfile(debate.mateCtx, debate.moderatorId);
 
-      var turnEntry = { type: "debate_turn_done", mateId: abortMateId, mateName: profile.name, role: panelistInfo ? panelistInfo.role : "", round: debate.round, text: partialText, avatarStyle: profile.avatarStyle, avatarSeed: profile.avatarSeed, avatarColor: profile.avatarColor, interrupted: true };
-      session.history.push(turnEntry);
-      ctx.sm.appendToSessionFile(session, turnEntry);
-      debate.history.push({ speaker: "panelist", mateId: abortMateId, mateName: profile.name, role: panelistInfo ? panelistInfo.role : "", text: partialText });
+    ctx.sendToSession(session.localId, {
+      type: "debate_turn",
+      mateId: debate.moderatorId,
+      mateName: moderatorProfile.name,
+      role: "moderator",
+      round: debate.round,
+      avatarColor: moderatorProfile.avatarColor,
+      avatarStyle: moderatorProfile.avatarStyle,
+      avatarSeed: moderatorProfile.avatarSeed,
+    });
 
-      debate.turnInProgress = false;
-      debate._currentTurnMateId = null;
-      debate._currentTurnText = "";
-    }
+    var feedText = "[The user raised their hand to speak.]\n" +
+      "[Acknowledge this briefly and yield the floor to the user. Say something like " +
+      "\"Go ahead\" or \"The floor is yours\". Do NOT call on any panelist (no @mentions). " +
+      "The debate will pause for the user to speak.]";
 
-    // Inject to moderator immediately if no turn in progress (or just aborted)
-    if (!debate.turnInProgress) {
-      injectUserComment(session);
-    }
-    // If moderator is currently speaking, pendingComment will be picked up after moderator's onDone
+    debate.moderatorSession.pushMessage(feedText, buildModeratorYieldCallbacks(session));
   }
 
   function injectUserComment(session) {
@@ -1190,6 +1225,7 @@ function attachDebate(ctx) {
 
     var comment = debate.pendingComment;
     debate.pendingComment = null;
+    debate.handRaised = false;
 
     // Record in debate history
     debate.history.push({ speaker: "user", mateId: null, mateName: "User", text: comment.text });
@@ -1199,7 +1235,7 @@ function attachDebate(ctx) {
     ctx.sm.appendToSessionFile(session, commentEntry);
     ctx.sendToSession(session.localId, commentEntry);
 
-    // Feed to moderator
+    // Feed to moderator: yield the floor to the user
     debate.turnInProgress = true;
     var moderatorProfile = ctx.getMateProfile(debate.mateCtx, debate.moderatorId);
 
@@ -1216,9 +1252,89 @@ function attachDebate(ctx) {
 
     var feedText = "[The user raised their hand and said:]\n" +
       comment.text + "\n" +
-      "[Please acknowledge this and weave it into the discussion. Then continue the debate.]";
+      "[Acknowledge the user's input. Briefly respond, then YIELD THE FLOOR to the user by saying something like " +
+      "\"The floor is yours\" or \"Go ahead\". Do NOT call on any panelist (no @mentions). " +
+      "The debate will pause for the user to speak.]";
+
+    debate.moderatorSession.pushMessage(feedText, buildModeratorYieldCallbacks(session));
+  }
+
+  function buildModeratorYieldCallbacks(session) {
+    var debate = session._debate;
+    var moderatorProfile = ctx.getMateProfile(debate.mateCtx, debate.moderatorId);
+    return {
+      onActivity: function (activity) {
+        if (session._debate && session._debate.phase !== "ended") {
+          ctx.sendToSession(session.localId, { type: "debate_activity", mateId: debate.moderatorId, activity: activity });
+        }
+      },
+      onDelta: function (delta) {
+        if (session._debate && session._debate.phase !== "ended") {
+          ctx.sendToSession(session.localId, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
+        }
+      },
+      onDone: function (fullText) {
+        if (!debate || debate.phase === "ended") return;
+        debate.turnInProgress = false;
+
+        // Record moderator yield turn
+        debate.history.push({ speaker: "moderator", mateId: debate.moderatorId, mateName: moderatorProfile.name, text: fullText });
+        var turnEntry = { type: "debate_turn_done", mateId: debate.moderatorId, mateName: moderatorProfile.name, role: "moderator", round: debate.round, text: fullText, avatarStyle: moderatorProfile.avatarStyle, avatarSeed: moderatorProfile.avatarSeed, avatarColor: moderatorProfile.avatarColor };
+        session.history.push(turnEntry);
+        ctx.sm.appendToSessionFile(session, turnEntry);
+        ctx.sendToSession(session.localId, turnEntry);
+
+        // Enter user floor mode: pause debate and show input
+        debate.awaitingUserFloor = true;
+        persistDebateState(session);
+        ctx.sendToSession(session.localId, { type: "debate_user_floor", topic: debate.topic, round: debate.round });
+      },
+      onError: function (errMsg) {
+        console.error("[debate] Moderator yield error:", errMsg);
+        endDebate(session, "error");
+      },
+    };
+  }
+
+  function handleDebateUserFloorResponse(ws, msg) {
+    var session = ctx.getSessionForWs(ws);
+    if (!session) return;
+
+    var debate = session._debate;
+    if (!debate || !debate.awaitingUserFloor || debate.phase !== "live") return;
+
+    debate.awaitingUserFloor = false;
+    var userText = (msg && msg.text) ? msg.text.trim() : "";
+    if (!userText) return;
+
+    // Record user's floor contribution
+    debate.history.push({ speaker: "user", mateId: null, mateName: "User", text: userText });
+    var floorEntry = { type: "debate_user_floor_done", text: userText };
+    session.history.push(floorEntry);
+    ctx.sm.appendToSessionFile(session, floorEntry);
+    ctx.sendToSession(session.localId, floorEntry);
+
+    // Feed to moderator to resume debate
+    debate.turnInProgress = true;
+    var moderatorProfile = ctx.getMateProfile(debate.mateCtx, debate.moderatorId);
+
+    ctx.sendToSession(session.localId, {
+      type: "debate_turn",
+      mateId: debate.moderatorId,
+      mateName: moderatorProfile.name,
+      role: "moderator",
+      round: debate.round,
+      avatarColor: moderatorProfile.avatarColor,
+      avatarStyle: moderatorProfile.avatarStyle,
+      avatarSeed: moderatorProfile.avatarSeed,
+    });
+
+    var feedText = "[The user took the floor and said:]\n" +
+      userText + "\n" +
+      "[Acknowledge the user's contribution and resume the debate. Call on the next panelist with @TheirName.]";
 
     debate.moderatorSession.pushMessage(feedText, buildModeratorCallbacks(session));
+    persistDebateState(session);
   }
 
   function handleDebateConfirmBrief(ws) {
@@ -1592,10 +1708,12 @@ function attachDebate(ctx) {
 
   return {
     handleDebateStart: handleDebateStart,
+    handleDebateHandRaise: handleDebateHandRaise,
     handleDebateComment: handleDebateComment,
     handleDebateStop: handleDebateStop,
     handleDebateConcludeResponse: handleDebateConcludeResponse,
     handleDebateConfirmBrief: handleDebateConfirmBrief,
+    handleDebateUserFloorResponse: handleDebateUserFloorResponse,
     restoreDebateState: restoreDebateState,
     checkForDmDebateBrief: checkForDmDebateBrief,
   };