clay-server 2.26.0-beta.8 → 2.26.0

package/lib/project-mate-interaction.js

@@ -6,6 +6,7 @@ function attachMateInteraction(ctx) {
   var cwd = ctx.cwd;
   var sm = ctx.sm;
   var sdk = ctx.sdk;
+  var send = ctx.send;
   var sendTo = ctx.sendTo;
   var sendToSession = ctx.sendToSession;
   var sendToSessionOthers = ctx.sendToSessionOthers;
@@ -455,6 +456,9 @@ function attachMateInteraction(ctx) {
       avatarSeed: avatarSeed,
     });
 
+    // Broadcast to all tabs so mate avatar shows activity indicator
+    send({ type: "mention_processing", mateId: msg.mateId, active: true });
+
     // Shared callbacks for both new and continued sessions
     var mentionCallbacks = {
       onActivity: function (activity) {
@@ -498,6 +502,7 @@ function attachMateInteraction(ctx) {
         );
 
         sendToSession(session.localId, { type: "mention_done", mateId: msg.mateId });
+        send({ type: "mention_processing", mateId: msg.mateId, active: false });
 
         // Check if the mate wrote a debate brief during this turn
         ctx.checkForDmDebateBrief(session, msg.mateId, mateCtx);
@@ -513,6 +518,7 @@ function attachMateInteraction(ctx) {
         }
         console.error("[mention] Error for mate " + msg.mateId + ":", errMsg);
         sendToSession(session.localId, { type: "mention_error", mateId: msg.mateId, error: errMsg });
+        send({ type: "mention_processing", mateId: msg.mateId, active: false });
       },
     };
 
@@ -563,11 +569,10 @@ function attachMateInteraction(ctx) {
         onDone: mentionCallbacks.onDone,
         onError: mentionCallbacks.onError,
         canUseTool: function (toolName, input, toolOpts) {
-          var autoAllow = { Read: true, Glob: true, Grep: true, WebFetch: true, WebSearch: true };
-          if (autoAllow[toolName]) {
-            return Promise.resolve({ behavior: "allow", updatedInput: input });
-          }
-          // Route through the project session's permission system
+          // Use the shared whitelist from sdk-bridge (read-only tools + safe bash commands)
+          var whitelisted = sdk.checkToolWhitelist(toolName, input);
+          if (whitelisted) return Promise.resolve(whitelisted);
+          // Not whitelisted: route through the project session's permission system
           return new Promise(function (resolve) {
             var requestId = crypto.randomUUID();
             session.pendingPermissions[requestId] = {

package/lib/project.js

@@ -293,6 +293,7 @@ function createProjectContext(opts) {
 
   // --- Browser extension state ---
   var _browserTabList = {}; // tabId -> { id, url, title, favIconUrl }
+  var _pendingDebateProposals = {}; // proposalId -> { resolve, briefData }
   var _extensionWs = null; // WebSocket of the client with the Chrome extension
   var _extToken = crypto.randomUUID(); // Auth token for MCP server bridge
   var pendingExtensionRequests = {}; // requestId -> { resolve, timer }
@@ -557,47 +558,72 @@ function createProjectContext(opts) {
     mateDisplayName: opts.mateDisplayName || "",
     isMate: isMate,
     dangerouslySkipPermissions: dangerouslySkipPermissions,
-    mcpServers: isMate ? undefined : (function () {
+    mcpServers: (function () {
+      var servers = {};
+
+      // Debate MCP server (available to both mates and main project)
       try {
-        var browserMcp = require("./browser-mcp-server");
-        var mcpConfig = browserMcp.create(sendExtensionCommandAny, function () {
-          return Object.values(_browserTabList || {});
-        }, {
-          watchTab: function (tabId) {
-            var key = "tab:" + tabId;
-            var active = loadContextSources(slug);
-            if (active.indexOf(key) === -1) {
-              active.push(key);
-              saveContextSources(slug, active);
-              var msg = JSON.stringify({ type: "context_sources_state", active: active });
-              for (var c of clients) { if (c.readyState === 1) c.send(msg); }
-            }
-            return active;
-          },
-          unwatchTab: function (tabId) {
-            var key = "tab:" + tabId;
-            var active = loadContextSources(slug);
-            var idx = active.indexOf(key);
-            if (idx !== -1) {
-              active.splice(idx, 1);
-              saveContextSources(slug, active);
-              var msg = JSON.stringify({ type: "context_sources_state", active: active });
-              for (var c of clients) { if (c.readyState === 1) c.send(msg); }
-            }
-            return active;
-          },
+        var debateMcp = require("./debate-mcp-server");
+        var debateMcpConfig = debateMcp.create(function onPropose(briefData) {
+          return new Promise(function (resolve) {
+            var proposalId = "dp_" + Date.now() + "_" + Math.random().toString(36).slice(2, 8);
+            briefData.proposalId = proposalId;
+            _pendingDebateProposals[proposalId] = {
+              resolve: resolve,
+              briefData: briefData,
+            };
+            // The SDK sends tool_executing with briefData as input.
+            // Client renders the debate brief card when it sees propose_debate.
+          });
         });
-        if (!mcpConfig) return undefined;
-        var servers = {};
-        servers[mcpConfig.name || "clay-browser"] = mcpConfig;
-        return servers;
+        if (debateMcpConfig) servers[debateMcpConfig.name || "clay-debate"] = debateMcpConfig;
       } catch (e) {
-        console.error("[project] Failed to create browser MCP server:", e.message);
-        return undefined;
+        console.error("[project] Failed to create debate MCP server:", e.message);
       }
+
+      // Browser MCP server (main project only, not mates)
+      if (!isMate) {
+        try {
+          var browserMcp = require("./browser-mcp-server");
+          var mcpConfig = browserMcp.create(sendExtensionCommandAny, function () {
+            return Object.values(_browserTabList || {});
+          }, {
+            watchTab: function (tabId) {
+              var key = "tab:" + tabId;
+              var active = loadContextSources(slug);
+              if (active.indexOf(key) === -1) {
+                active.push(key);
+                saveContextSources(slug, active);
+                var _msg = JSON.stringify({ type: "context_sources_state", active: active });
+                for (var c of clients) { if (c.readyState === 1) c.send(_msg); }
+              }
+              return active;
+            },
+            unwatchTab: function (tabId) {
+              var key = "tab:" + tabId;
+              var active = loadContextSources(slug);
+              var idx = active.indexOf(key);
+              if (idx !== -1) {
+                active.splice(idx, 1);
+                saveContextSources(slug, active);
+                var _msg = JSON.stringify({ type: "context_sources_state", active: active });
+                for (var c of clients) { if (c.readyState === 1) c.send(_msg); }
+              }
+              return active;
+            },
+          });
+          if (mcpConfig) servers[mcpConfig.name || "clay-browser"] = mcpConfig;
+        } catch (e) {
+          console.error("[project] Failed to create browser MCP server:", e.message);
+        }
+      }
+
+      return Object.keys(servers).length > 0 ? servers : undefined;
     })(),
     onProcessingChanged: onProcessingChanged,
-    onTurnDone: isMate ? function (session, preview) { digestDmTurn(session, preview); } : null,
+    onTurnDone: isMate ? function (session, preview) {
+      digestDmTurn(session, preview);
+    } : null,
     scheduleMessage: function (session, text, resetsAt) {
       scheduleMessage(session, text, resetsAt);
     },
@@ -1591,11 +1617,13 @@ function createProjectContext(opts) {
     if (session.scheduledMessage && session.scheduledMessage.timer) {
       clearTimeout(session.scheduledMessage.timer);
     }
-    var schedDelay = Math.max(0, resetsAt - Date.now()) + 180000; // +3min buffer after reset
+    var isPastReset = resetsAt <= Date.now();
+    var schedDelay = isPastReset ? 5000 : Math.max(0, resetsAt - Date.now()) + 60000; // +1min buffer after reset, or 5s for immediate
+    var sendsAt = Date.now() + schedDelay;
     var schedEntry = {
       type: "scheduled_message_queued",
       text: text,
-      resetsAt: resetsAt,
+      resetsAt: sendsAt,
       scheduledAt: Date.now(),
     };
     sm.sendAndRecord(session, schedEntry);
@@ -1657,6 +1685,7 @@ function createProjectContext(opts) {
         }
         session._mentionInProgress = false;
         sendToSession(session.localId, { type: "mention_done", mateId: mateId, stopped: true });
+        send({ type: "mention_processing", mateId: mateId, active: false });
       }
       return;
     }
@@ -1666,6 +1695,10 @@ function createProjectContext(opts) {
       handleDebateStart(ws, msg);
       return;
     }
+    if (msg.type === "debate_hand_raise") {
+      handleDebateHandRaise(ws);
+      return;
+    }
     if (msg.type === "debate_comment") {
       handleDebateComment(ws, msg);
       return;
@@ -1682,6 +1715,32 @@ function createProjectContext(opts) {
       handleDebateConfirmBrief(ws);
       return;
     }
+    if (msg.type === "debate_proposal_response") {
+      // Match the most recent pending proposal (proposalId may not be
+      // available on the client since it's not part of the tool input)
+      var _dpKeys = Object.keys(_pendingDebateProposals);
+      if (_dpKeys.length === 0) return;
+      var _dpKey = msg.proposalId || _dpKeys[_dpKeys.length - 1];
+      var pending = _pendingDebateProposals[_dpKey];
+      if (!pending) return;
+      delete _pendingDebateProposals[_dpKey];
+      if (msg.action === "start") {
+        // Set up debate state on the session, then transition to live
+        var _dpSession = getSessionForWs(ws);
+        if (_dpSession) {
+          var _dpMateId = isMate ? path.basename(cwd) : null;
+          handleMcpDebateApproval(_dpSession, pending.briefData, _dpMateId, ws);
+        }
+        pending.resolve({ action: "start" });
+      } else {
+        pending.resolve({ action: "cancel" });
+      }
+      return;
+    }
+    if (msg.type === "debate_user_floor_response") {
+      handleDebateUserFloorResponse(ws, msg);
+      return;
+    }
 
     // --- Knowledge file management ---
     if (msg.type === "knowledge_list") {
@@ -3884,6 +3943,26 @@ function createProjectContext(opts) {
       return;
     }
 
+    if (msg.type === "send_scheduled_now") {
+      var nowSession = getSessionForWs(ws);
+      if (!nowSession || !nowSession.scheduledMessage) return;
+      var schedText = nowSession.scheduledMessage.text;
+      clearTimeout(nowSession.scheduledMessage.timer);
+      nowSession.scheduledMessage = null;
+      console.log("[project] Scheduled message sent immediately for session " + nowSession.localId);
+      sm.sendAndRecord(nowSession, { type: "scheduled_message_sent" });
+      var userMsg = { type: "user_message", text: schedText };
+      nowSession.history.push(userMsg);
+      sm.appendToSessionFile(nowSession, userMsg);
+      sendToSession(nowSession.localId, userMsg);
+      nowSession.isProcessing = true;
+      onProcessingChanged();
+      sendToSession(nowSession.localId, { type: "status", status: "processing" });
+      sdk.startQuery(nowSession, schedText, null, getLinuxUserForSession(nowSession));
+      sm.broadcastSessionList();
+      return;
+    }
+
     if (msg.type !== "message") return;
     if (!msg.text && (!msg.images || msg.images.length === 0) && (!msg.pastes || msg.pastes.length === 0)) return;
 
@@ -4157,7 +4236,8 @@ function createProjectContext(opts) {
                   data: screenshotData,
                   file: screenshotName,
                   tabTitle: tabLabel,
-                  tabUrl: tabInfo ? tabInfo.url : ""
+                  tabUrl: tabInfo ? tabInfo.url : "",
+                  tabFavIconUrl: tabInfo ? tabInfo.favIconUrl : ""
                 });
                 parts.push("[Screenshot saved: " + screenshotPath + "]");
               }
@@ -4179,7 +4259,8 @@ function createProjectContext(opts) {
         }
 
         if (tabContextParts.length > 0) {
-          fullText = tabContextParts.join("\n\n---\n\n") + "\n\n" + fullText;
+          fullText = "[The following browser tab data is automatically attached as context sources. Do NOT call browser_read_page, browser_console, browser_network, or browser_screenshot for these tabs — the data is already here.]\n\n" +
+            tabContextParts.join("\n\n---\n\n") + "\n\n" + fullText;
         }
 
         // If screenshots were captured, send context preview cards and add to SDK images
@@ -4193,6 +4274,7 @@ function createProjectContext(opts) {
               tab: {
                 title: ss.tabTitle || "",
                 url: ss.tabUrl || "",
+                favIconUrl: ss.tabFavIconUrl || "",
                 screenshotFile: ss.file
               }
             };
@@ -4203,6 +4285,7 @@ function createProjectContext(opts) {
               tab: {
                 title: ss.tabTitle || "",
                 url: ss.tabUrl || "",
+                favIconUrl: ss.tabFavIconUrl || "",
                 screenshotUrl: "/p/" + slug + "/images/" + ss.file
               }
             });
@@ -4249,6 +4332,7 @@ function createProjectContext(opts) {
     cwd: cwd,
     sm: sm,
     sdk: sdk,
+    send: send,
     sendTo: sendTo,
     sendToSession: sendToSession,
     sendToSessionOthers: sendToSessionOthers,
@@ -4275,6 +4359,8 @@ function createProjectContext(opts) {
   var _debate = attachDebate({
     cwd: cwd,
     slug: slug,
+    isMate: isMate,
+    projectOwnerId: projectOwnerId,
     send: send,
     sendTo: sendTo,
     sendToSession: sendToSession,
@@ -4291,12 +4377,15 @@ function createProjectContext(opts) {
     initMemorySummary: initMemorySummary,
   });
   var handleDebateStart = _debate.handleDebateStart;
+  var handleDebateHandRaise = _debate.handleDebateHandRaise;
   var handleDebateComment = _debate.handleDebateComment;
   var handleDebateStop = _debate.handleDebateStop;
   var handleDebateConcludeResponse = _debate.handleDebateConcludeResponse;
   var handleDebateConfirmBrief = _debate.handleDebateConfirmBrief;
+  var handleDebateUserFloorResponse = _debate.handleDebateUserFloorResponse;
   var restoreDebateState = _debate.restoreDebateState;
   var checkForDmDebateBrief = _debate.checkForDmDebateBrief;
+  var handleMcpDebateApproval = _debate.handleMcpDebateApproval;
 
   // --- Session presence (who is viewing which session) ---
   function broadcastPresence() {