clay-server 2.27.0-beta.1 → 2.27.0-beta.11

package/lib/daemon.js

@@ -151,7 +151,7 @@ var relay = createServer({
     }
     var slugs = config.projects.map(function (p) { return p.slug; });
     var slug = generateSlug(absPath, slugs);
-    relay.addProject(absPath, slug);
+    relay.addProject(absPath, slug, null, null, wsUser ? wsUser.id : null);
     var projectEntry = { path: absPath, slug: slug, addedAt: Date.now(), visibility: "private" };
     // The user who adds a project always becomes the owner
     if (wsUser && wsUser.id) {
@@ -233,7 +233,7 @@ var relay = createServer({
     if (wsUser && wsUser.id) {
       projectEntry.ownerId = wsUser.id;
     }
-    relay.addProject(targetDir, slug);
+    relay.addProject(targetDir, slug, null, null, wsUser ? wsUser.id : null);
     config.projects.push(projectEntry);
     saveConfig(config);
     try { syncClayrc(config.projects); } catch (e) {}

package/lib/project-debate.js

@@ -299,6 +299,10 @@ function attachDebate(ctx) {
             }),
           };
           ctx.sendToSession(session.localId, briefReadyMsg);
+          // Also send to setup session if client switched there (quickStart flow)
+          if (debate.setupSessionId && debate.setupSessionId !== session.localId) {
+            ctx.sendToSession(debate.setupSessionId, briefReadyMsg);
+          }
         } else {
           console.log("[debate] Brief picked up, transitioning to live. Topic:", debate.topic);
           // Transition to live (standard flow via modal/skill)
@@ -530,6 +534,8 @@ function attachDebate(ctx) {
     ctx.sm.switchSession(setupSession.localId, null, ctx.hydrateImageRefs);
     debate.setupSessionId = setupSession.localId;
     debate.setupStartedAt = setupSession.loop.startedAt;
+    // Share debate state with setup session so confirm_brief works from either
+    setupSession._debate = debate;
 
     // Build DM conversation context for the moderator
     var dmContext = msg.dmContext || "";
@@ -715,6 +721,13 @@ function attachDebate(ctx) {
     ctx.send({ type: "mention_processing", mateId: mateId, active: active });
   }
 
+  // Persist a debate message to session history and send to clients
+  function debateSendAndRecord(session, msg) {
+    session.history.push(msg);
+    ctx.sm.appendToSessionFile(session, msg);
+    ctx.sendToSession(session.localId, msg);
+  }
+
   // --- Live debate ---
 
   function startDebateLive(session) {
@@ -765,7 +778,7 @@ function attachDebate(ctx) {
 
     // Signal moderator's first turn
     debateMateProcessing(debate.moderatorId, true);
-    ctx.sendToSession(debateSession.localId, {
+    debateSendAndRecord(debateSession, {
       type: "debate_turn",
       mateId: debate.moderatorId,
       mateName: moderatorProfile.name,
@@ -792,7 +805,7 @@ function attachDebate(ctx) {
       },
       onDelta: function (delta) {
         if (debateSession._debate && debateSession._debate.phase !== "ended") {
-          ctx.sendToSession(debateSession.localId, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
+          debateSendAndRecord(debateSession, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
         }
       },
       onDone: function (fullText) {
@@ -900,7 +913,7 @@ function attachDebate(ctx) {
 
     // Notify clients of new turn
     debateMateProcessing(mateId, true);
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_turn",
       mateId: mateId,
       mateName: profile.name,
@@ -920,7 +933,7 @@ function attachDebate(ctx) {
       onDelta: function (delta) {
         if (session._debate && session._debate.phase !== "ended") {
           debate._currentTurnText += delta;
-          ctx.sendToSession(session.localId, { type: "debate_stream", mateId: mateId, mateName: profile.name, delta: delta });
+          debateSendAndRecord(session, { type: "debate_stream", mateId: mateId, mateName: profile.name, delta: delta });
         }
       },
       onDone: function (fullText) {
@@ -1065,7 +1078,7 @@ function attachDebate(ctx) {
 
     // Notify clients of moderator turn
     debateMateProcessing(debate.moderatorId, true);
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_turn",
       mateId: debate.moderatorId,
       mateName: moderatorProfile.name,
@@ -1095,7 +1108,7 @@ function attachDebate(ctx) {
       },
       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 });
+          debateSendAndRecord(session, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
         }
       },
       onDone: function (fullText) {
@@ -1162,7 +1175,7 @@ function attachDebate(ctx) {
     debate.turnInProgress = true;
     var moderatorProfile = ctx.getMateProfile(debate.mateCtx, debate.moderatorId);
 
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_turn",
       mateId: debate.moderatorId,
       mateName: moderatorProfile.name,
@@ -1201,7 +1214,7 @@ function attachDebate(ctx) {
     debate.turnInProgress = true;
     var moderatorProfile = ctx.getMateProfile(debate.mateCtx, debate.moderatorId);
 
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_turn",
       mateId: debate.moderatorId,
       mateName: moderatorProfile.name,
@@ -1232,7 +1245,7 @@ function attachDebate(ctx) {
       },
       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 });
+          debateSendAndRecord(session, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
         }
       },
       onDone: function (fullText) {
@@ -1281,7 +1294,7 @@ function attachDebate(ctx) {
     var moderatorProfile = ctx.getMateProfile(debate.mateCtx, debate.moderatorId);
 
     debateMateProcessing(debate.moderatorId, true);
-    ctx.sendToSession(session.localId, {
+    debateSendAndRecord(session, {
       type: "debate_turn",
       mateId: debate.moderatorId,
       mateName: moderatorProfile.name,
@@ -1471,7 +1484,7 @@ function attachDebate(ctx) {
 
       debate.turnInProgress = true;
       debateMateProcessing(debate.moderatorId, true);
-      ctx.sendToSession(session.localId, {
+      debateSendAndRecord(session, {
         type: "debate_turn",
         mateId: debate.moderatorId,
         mateName: moderatorProfile.name,
@@ -1519,7 +1532,7 @@ function attachDebate(ctx) {
           },
           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 });
+              debateSendAndRecord(session, { type: "debate_stream", mateId: debate.moderatorId, mateName: moderatorProfile.name, delta: delta });
             }
           },
           onDone: function (fullText) {

package/lib/project.js

@@ -886,6 +886,7 @@ function createProjectContext(opts) {
     matesModule: matesModule,
     getSessionForWs: getSessionForWs,
     getLinuxUserForSession: getLinuxUserForSession,
+    getOsUserInfoForWs: getOsUserInfoForWs,
     hydrateImageRefs: hydrateImageRefs,
     saveImageFile: saveImageFile,
     imagesDir: imagesDir,
@@ -893,6 +894,7 @@ function createProjectContext(opts) {
     _loop: _loop,
     browserState: { _browserTabList: _browserTabList, _extensionWs: _extensionWs, pendingExtensionRequests: pendingExtensionRequests },
     sendExtensionCommandAny: sendExtensionCommandAny,
+    requestTabContext: requestTabContext,
     scheduleMessage: scheduleMessage,
     cancelScheduledMessage: cancelScheduledMessage,
     loadContextSources: loadContextSources,

package/lib/public/app.js

@@ -5518,11 +5518,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
         case "debate_turn_done":
           if (msg.round) updateDebateRound(msg.round);
-          if (replayingHistory) {
-            renderDebateTurnDone(msg);
-          } else {
-            handleDebateTurnDone(msg);
-          }
+          handleDebateTurnDone(msg);
           break;
 
         case "debate_hand_raised":
@@ -7531,6 +7527,17 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
       document.getElementById("debate-bottom-stop").addEventListener("click", function () {
         if (ws && ws.readyState === 1) {
           ws.send(JSON.stringify({ type: "debate_stop" }));
+          var stopBtn = document.getElementById("debate-bottom-stop");
+          if (stopBtn) {
+            stopBtn.disabled = true;
+            stopBtn.innerHTML = iconHtml("loader") + " Stopping...";
+            refreshIcons();
+          }
+          var waitingEl = document.getElementById("debate-bottom-waiting");
+          if (waitingEl) {
+            waitingEl.textContent = "Stopping after current turn...";
+            waitingEl.classList.remove("hidden");
+          }
         }
       });
     }

package/lib/public/modules/debate.js

@@ -1225,16 +1225,33 @@ function renderDebateBriefCard(msg, resolved) {
     topicHtml += '<div class="debate-brief-context">' + escapeHtml(msg.context) + '</div>';
   }
 
-  topicHtml += '<div class="debate-brief-moderator">' +
-    iconHtml("mic") + ' <strong>Moderator:</strong> ' + escapeHtml(msg.moderatorName || "Unknown") +
-    '</div>';
+  // Resolve mate avatars from matesList
+  var mates = ctx.matesList ? ctx.matesList() : [];
+  var mateMap = {};
+  for (var mi = 0; mi < mates.length; mi++) {
+    mateMap[mates[mi].id] = mates[mi];
+  }
+
+  var modMate = msg.moderatorId ? mateMap[msg.moderatorId] : null;
+  var modAvatarSrc = modMate ? mateAvatarUrl(modMate, 24) : "";
+  topicHtml += '<div class="debate-brief-moderator" style="display:flex;align-items:center;gap:8px;">' +
+    iconHtml("mic") + ' <strong>Moderator:</strong> ';
+  if (modAvatarSrc) {
+    topicHtml += '<img src="' + escapeHtml(modAvatarSrc) + '" width="24" height="24" style="border-radius:50%;flex-shrink:0;">';
+  }
+  topicHtml += escapeHtml(msg.moderatorName || "Unknown") + '</div>';
 
   topicHtml += '<div class="debate-brief-panelists-label">' + iconHtml("users") + ' <strong>Panelists:</strong></div>';
   topicHtml += '<div class="debate-brief-panelists">';
   if (msg.panelists) {
     for (var i = 0; i < msg.panelists.length; i++) {
       var p = msg.panelists[i];
-      topicHtml += '<div class="debate-brief-panelist">';
+      var mate = p.mateId ? mateMap[p.mateId] : null;
+      var avatarSrc = mate ? mateAvatarUrl(mate, 24) : "";
+      topicHtml += '<div class="debate-brief-panelist" style="display:flex;align-items:center;gap:8px;">';
+      if (avatarSrc) {
+        topicHtml += '<img src="' + escapeHtml(avatarSrc) + '" width="24" height="24" style="border-radius:50%;flex-shrink:0;">';
+      }
       topicHtml += '<span class="debate-brief-panelist-name">' + escapeHtml(p.name || "Unknown") + '</span>';
       if (p.role) {
         topicHtml += '<span class="debate-brief-panelist-role">' + escapeHtml(p.role) + '</span>';

package/lib/sdk-bridge.js

@@ -2375,9 +2375,9 @@ function createSDKBridge(opts) {
           includePartialMessages: true,
           abortController: abortController,
           canUseTool: opts.canUseTool || function (toolName, input) {
-            var allowed = { Read: true, Glob: true, Grep: true, WebFetch: true, WebSearch: true };
-            if (allowed[toolName]) {
-              return Promise.resolve({ behavior: "allow", updatedInput: input });
+            var whitelisted = checkToolWhitelist(toolName, input);
+            if (whitelisted) {
+              return Promise.resolve(whitelisted);
             }
             return Promise.resolve({
               behavior: "deny",
@@ -2386,6 +2386,7 @@ function createSDKBridge(opts) {
           },
         };
       if (opts.model) mentionQueryOptions.model = opts.model;
+      if (opts.includeMcpServers && mcpServers) mentionQueryOptions.mcpServers = mcpServers;
       query = sdk.query({
         prompt: mq,
         options: mentionQueryOptions,