clay-server 3.3.2-beta.2 → 3.3.2-beta.3

package/lib/debate-mcp-server.js

@@ -42,6 +42,7 @@ function getToolDefs(onPropose) {
       format: { type: "string", description: "Debate format, e.g. free_discussion (default)" },
       context: { type: "string", description: "Key context from the conversation that panelists should know" },
       specialRequests: { type: "string", description: "Special instructions for the debate, or empty" },
+      moderatorId: { type: "string", description: "Mate ID for the moderator. Required when proposing from a normal project; Mate sessions moderate their own proposals." },
       panelists: { type: "string", description: "JSON array of panelist objects: [{\"mateId\": \"<UUID>\", \"role\": \"perspective\", \"brief\": \"guidance\"}]" },
     }, ["topic", "panelists"]),
     handler: function (args) {
@@ -51,6 +52,13 @@ function getToolDefs(onPropose) {
       } catch (e) {
         return Promise.resolve({
           content: [{ type: "text", text: "Error: panelists must be a valid JSON array. Got: " + (args.panelists || "").substring(0, 100) }],
+          isError: true,
+        });
+      }
+      if (!Array.isArray(panelists)) {
+        return Promise.resolve({
+          content: [{ type: "text", text: "Error: panelists must be a JSON array." }],
+          isError: true,
         });
       }
 
@@ -59,6 +67,7 @@ function getToolDefs(onPropose) {
         format: args.format || "free_discussion",
         context: args.context || "",
         specialRequests: args.specialRequests || null,
+        moderatorId: args.moderatorId || null,
         panelists: panelists,
       };
 
@@ -66,6 +75,12 @@ function getToolDefs(onPropose) {
         if (result && result.action === "start") {
           return { content: [{ type: "text", text: "Debate approved and started. Topic: " + briefData.topic }] };
         }
+        if (result && result.action === "error") {
+          return {
+            content: [{ type: "text", text: "Error: " + (result.error || "The debate could not be started.") }],
+            isError: true,
+          };
+        }
         return { content: [{ type: "text", text: "Debate proposal was cancelled by the user." }] };
       });
     }

package/lib/project-connection.js

@@ -6,6 +6,22 @@ var emailAccounts = require("./email-accounts");
 var { getCodexConfig } = require("./codex-defaults");
 var yoke = require("./yoke");
 
+function dispatchMessageSafely(handleMessage, sendTo, slug, ws, msg) {
+  try {
+    handleMessage(ws, msg);
+    return true;
+  } catch (err) {
+    var detail = err && err.stack ? err.stack : (err && err.message ? err.message : String(err));
+    console.error("[project-connection] Message handler failed for " + slug + "/" + (msg.type || "unknown") + ":", detail);
+    try {
+      sendTo(ws, { type: "error", text: "The request could not be completed. Check the server logs for details." });
+    } catch (sendErr) {
+      console.error("[project-connection] Failed to send message error for " + slug + ":", sendErr && sendErr.message ? sendErr.message : sendErr);
+    }
+    return false;
+  }
+}
+
 /**
  * Attach connection/disconnection handlers to a project context.
  *
@@ -286,7 +302,7 @@ function attachConnection(ctx) {
     ws.on("message", function (raw) {
       var msg;
       try { msg = JSON.parse(raw.toString()); } catch (e) { return; }
-      handleMessage(ws, msg);
+      dispatchMessageSafely(handleMessage, sendTo, slug, ws, msg);
     });
 
     ws.on("close", function () {
@@ -317,4 +333,4 @@ function attachConnection(ctx) {
   };
 }
 
-module.exports = { attachConnection: attachConnection };
+module.exports = { attachConnection: attachConnection, dispatchMessageSafely: dispatchMessageSafely };

package/lib/project-debate-proposal.js

@@ -0,0 +1,138 @@
+var path = require("path");
+var debateMcp = require("./debate-mcp-server");
+
+function attachDebateProposal(ctx) {
+  var pendingProposals = {};
+
+  function createMcpServer(adapter, boundSession) {
+    var toolDefs = debateMcp.getToolDefs(function onPropose(briefData) {
+      if (!boundSession) {
+        return Promise.resolve({
+          action: "error",
+          error: "Debate proposals require an active Clay session.",
+        });
+      }
+
+      return new Promise(function (resolve) {
+        var proposalId = "dp_" + Date.now() + "_" + Math.random().toString(36).slice(2, 8);
+        briefData.proposalId = proposalId;
+        pendingProposals[proposalId] = {
+          resolve: resolve,
+          briefData: briefData,
+          session: boundSession,
+        };
+      });
+    });
+
+    return adapter.createToolServer({
+      name: "clay-debate",
+      version: "1.0.0",
+      tools: toolDefs,
+    });
+  }
+
+  function findPendingProposal(ws, msg) {
+    var keys = Object.keys(pendingProposals);
+    if (keys.length === 0) return null;
+    var key = msg.proposalId || null;
+    if (!key && ws && Number.isInteger(ws._clayActiveSession)) {
+      for (var i = keys.length - 1; i >= 0; i--) {
+        var candidate = pendingProposals[keys[i]];
+        if (candidate.session && candidate.session.localId === ws._clayActiveSession) {
+          key = keys[i];
+          break;
+        }
+      }
+    }
+    if (!key) key = keys[keys.length - 1];
+    var pending = pendingProposals[key];
+    if (!pending) return null;
+    delete pendingProposals[key];
+    return pending;
+  }
+
+  function rejectProposal(ws, pending, error) {
+    try {
+      ctx.sendTo(ws, { type: "debate_error", error: error });
+    } catch (sendErr) {
+      console.error("[debate] Failed to send proposal error:", sendErr && sendErr.message ? sendErr.message : sendErr);
+    }
+    pending.resolve({ action: "error", error: error });
+  }
+
+  function validateProposal(ws, pending) {
+    var briefData = pending.briefData;
+    var moderatorId = ctx.isMate ? path.basename(ctx.cwd) : briefData.moderatorId;
+    if (!moderatorId || typeof moderatorId !== "string") {
+      return { error: "A valid Mate moderator is required to start this debate." };
+    }
+
+    var userId = ws && ws._clayUser
+      ? ws._clayUser.id
+      : (pending.session.ownerId || ctx.getProjectOwnerId() || null);
+    var mateCtx = ctx.buildMateCtx(userId);
+    if (!ctx.getMate(mateCtx, moderatorId)) {
+      return { error: "The selected debate moderator is unavailable." };
+    }
+
+    var panelists = briefData.panelists;
+    if (!Array.isArray(panelists) || panelists.length === 0) {
+      return { error: "At least one valid panelist is required to start this debate." };
+    }
+
+    var seen = {};
+    for (var i = 0; i < panelists.length; i++) {
+      var panelistId = panelists[i] && panelists[i].mateId;
+      if (!panelistId || typeof panelistId !== "string" || !ctx.getMate(mateCtx, panelistId)) {
+        return { error: "One or more selected debate panelists are unavailable." };
+      }
+      if (panelistId === moderatorId) {
+        return { error: "The debate moderator cannot also be a panelist." };
+      }
+      if (seen[panelistId]) {
+        return { error: "The same Mate cannot be added to a debate more than once." };
+      }
+      seen[panelistId] = true;
+    }
+
+    return { moderatorId: moderatorId };
+  }
+
+  function handleMessage(ws, msg) {
+    if (msg.type !== "debate_proposal_response") return false;
+
+    var pending = findPendingProposal(ws, msg);
+    if (!pending) return true;
+    if (msg.action !== "start") {
+      pending.resolve({ action: "cancel" });
+      return true;
+    }
+
+    var validated = validateProposal(ws, pending);
+    if (validated.error) {
+      rejectProposal(ws, pending, validated.error);
+      return true;
+    }
+
+    try {
+      var result = ctx.startDebate(pending.session, pending.briefData, validated.moderatorId, ws);
+      if (result && result.error) {
+        rejectProposal(ws, pending, result.error);
+        return true;
+      }
+      pending.resolve({ action: "start" });
+    } catch (err) {
+      var detail = err && err.message ? err.message : String(err);
+      console.error("[debate] Failed to start approved proposal:", detail);
+      rejectProposal(ws, pending, "The debate could not be started. Check the server logs for details.");
+    }
+    return true;
+  }
+
+  return {
+    createMcpServer: createMcpServer,
+    handleMessage: handleMessage,
+  };
+}
+
+module.exports = { attachDebateProposal: attachDebateProposal };

package/lib/project-debate.js

@@ -1742,6 +1742,7 @@ function attachDebate(ctx) {
 
     console.log("[debate] MCP debate approved. Topic:", debate.topic, "debateId:", debateId);
     startDebateLive(session);
+    return { ok: true };
   }
 
   // --- Public API ---

package/lib/project.js

@@ -16,6 +16,7 @@ var matesModule = require("./mates");
 var sessionSearch = require("./session-search");
 var userPresence = require("./user-presence");
 var { attachDebate } = require("./project-debate");
+var { attachDebateProposal } = require("./project-debate-proposal");
 var { attachMemory } = require("./project-memory");
 var { attachMateInteraction } = require("./project-mate-interaction");
 var { attachUserMention } = require("./project-user-mention");
@@ -247,7 +248,6 @@ function createProjectContext(opts) {
   var clients = new Set();
 
   // --- Browser extension state (shared mutable object) ---
-  var _pendingDebateProposals = {}; // proposalId -> { resolve, briefData }
   var _extToken = crypto.randomUUID(); // Auth token for MCP server bridge
   var browserState = {
     _browserTabList: {},
@@ -568,6 +568,19 @@ function createProjectContext(opts) {
     getLinuxUserForSession: getLinuxUserForSession,
     getPairToolDefs: function (boundSession) { return _sessionPair.getToolDefs(boundSession); },
   });
+  var _debate = null;
+  var _debateProposal = attachDebateProposal({
+    cwd: cwd,
+    isMate: isMate,
+    sendTo: sendTo,
+    buildMateCtx: matesModule.buildMateCtx,
+    getMate: matesModule.getMate,
+    getProjectOwnerId: function () { return projectOwnerId; },
+    startDebate: function (session, briefData, moderatorId, ws) {
+      if (!_debate) return { error: "The debate engine is unavailable." };
+      return _debate.handleMcpDebateApproval(session, briefData, moderatorId, ws);
+    },
+  });
 
   // --- MCP tool servers (created via YOKE adapter) ---
   var mcpServers = (function () {
@@ -605,20 +618,7 @@ function createProjectContext(opts) {
 
     // Debate MCP server (available to both mates and main project)
     try {
-      var debateMcp = require("./debate-mcp-server");
-      var debateToolDefs = debateMcp.getToolDefs(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.
-        });
-      });
-      var debateMcpConfig = adapter.createToolServer({ name: "clay-debate", version: "1.0.0", tools: debateToolDefs });
+      var debateMcpConfig = _debateProposal.createMcpServer(adapter, null);
       if (debateMcpConfig) servers[debateMcpConfig.name || "clay-debate"] = debateMcpConfig;
     } catch (e) {
       console.error("[project] Failed to create debate MCP server:", e.message);
@@ -807,6 +807,15 @@ function createProjectContext(opts) {
         }
         continue;
       }
+      if (name === "clay-debate" && forSession) {
+        try {
+          var boundDebate = _debateProposal.createMcpServer(adapter, forSession);
+          if (boundDebate) { filtered[name] = boundDebate; hasAny = true; }
+        } catch (e) {
+          console.error("[project] Failed to bind debate MCP server:", e.message);
+        }
+        continue;
+      }
       filtered[name] = mcpServers[name];
       hasAny = true;
     }
@@ -1139,28 +1148,7 @@ 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 (_debateProposal.handleMessage(ws, msg)) return;
     if (msg.type === "debate_user_floor_response") {
       handleDebateUserFloorResponse(ws, msg);
       return;
@@ -1268,7 +1256,7 @@ function createProjectContext(opts) {
   var handleUserMention = _userMention.handleUserMention;
 
   // --- Debate engine (delegated to project-debate.js) ---
-  var _debate = attachDebate({
+  _debate = attachDebate({
     cwd: cwd,
     slug: slug,
     isMate: isMate,
@@ -1297,7 +1285,6 @@ function createProjectContext(opts) {
   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() {
@@ -1547,7 +1534,7 @@ function createProjectContext(opts) {
         // In-app MCP servers (debate, browser, email).
         // Use getLocalMcpServers() so clay-browser is hidden unless the
         // Chrome extension is currently connected (see issue #325).
-        var localMcp = getLocalMcpServers();
+        var localMcp = getLocalMcpServers(boundSession);
         if (localMcp) {
           var inAppNames = Object.keys(localMcp);
           for (var i = 0; i < inAppNames.length; i++) {
@@ -1599,7 +1586,7 @@ function createProjectContext(opts) {
         }
         if (sessionOnly) return Promise.reject(new Error("Session tool not found: " + serverName + "/" + toolName));
         // Try in-app servers first (gated by extension connectivity for clay-browser).
-        var localMcp = getLocalMcpServers();
+        var localMcp = getLocalMcpServers(boundSession);
         if (localMcp && localMcp[serverName]) {
           var server = localMcp[serverName];
           if (server.instance && server.instance._registeredTools && server.instance._registeredTools[toolName]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "3.3.2-beta.2",
+  "version": "3.3.2-beta.3",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",
@@ -49,7 +49,7 @@
   "homepage": "https://github.com/chadbyte/clay#readme",
   "author": "Chad",
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.3.233",
+    "@anthropic-ai/claude-agent-sdk": "^0.3.241",
     "@lydell/node-pty": "^1.2.0-beta.3",
     "@openai/codex": "^0.147.0",
     "imapflow": "^1.3.1",