clay-server 2.26.0-beta.17 → 2.26.0-beta.19

package/lib/browser-mcp-server.js

@@ -111,7 +111,7 @@ function create(sendCommand, getTabList, contextOps) {
   // --- browser_screenshot ---
   tools.push(tool(
     "browser_screenshot",
-    "Capture a screenshot of a browser tab (full viewport or a specific element)",
+    "Capture a screenshot of a browser tab. Skip if the tab is already attached as a context source (data is auto-injected).",
     buildShape({
       tabId: { type: "number", description: "Tab ID" },
       selector: { type: "string", description: "CSS selector to capture a specific element (optional)" },
@@ -134,7 +134,7 @@ function create(sendCommand, getTabList, contextOps) {
   // --- browser_console ---
   tools.push(tool(
     "browser_console",
-    "Read captured console logs from a tab (log, warn, error, info)",
+    "Read captured console logs from a tab. Skip if the tab is already a context source (data is auto-injected).",
     buildShape({
       tabId: { type: "number", description: "Tab ID" },
     }, ["tabId"]),
@@ -157,7 +157,7 @@ function create(sendCommand, getTabList, contextOps) {
   // --- browser_network ---
   tools.push(tool(
     "browser_network",
-    "Read captured network requests (fetch/XHR) from a tab",
+    "Read captured network requests (fetch/XHR) from a tab. Skip if the tab is already a context source.",
     buildShape({
       tabId: { type: "number", description: "Tab ID" },
     }, ["tabId"]),
@@ -181,7 +181,7 @@ function create(sendCommand, getTabList, contextOps) {
   // --- browser_read_page ---
   tools.push(tool(
     "browser_read_page",
-    "Read page text content (innerText). Optionally read only a specific element.",
+    "Read page text content (innerText). Skip if the tab is already a context source (text is auto-injected). Use for tabs NOT in context sources, or to read a specific element via selector.",
     buildShape({
       tabId: { type: "number", description: "Tab ID" },
       selector: { type: "string", description: "CSS selector to read specific element (optional)" },

package/lib/debate-mcp-server.js

@@ -0,0 +1,94 @@
+// Debate MCP Server for Clay (in-process SDK version)
+// Provides the propose_debate tool so mates can propose debates
+// via the SDK tool system instead of writing files to disk.
+//
+// Usage:
+//   var debateMcp = require("./debate-mcp-server");
+//   var mcpConfig = debateMcp.create(onPropose);
+//   // Pass mcpConfig to sdk-bridge opts.mcpServers
+
+var z;
+try { z = require("zod"); } catch (e) { z = null; }
+
+function buildShape(props, required) {
+  if (!z) return {};
+  var shape = {};
+  var keys = Object.keys(props);
+  for (var i = 0; i < keys.length; i++) {
+    var k = keys[i];
+    var p = props[k];
+    var field;
+    if (p.type === "number") field = z.number();
+    else if (p.type === "boolean") field = z.boolean();
+    else if (p.enum) field = z.enum(p.enum);
+    else field = z.string();
+    if (p.description) field = field.describe(p.description);
+    if (!required || required.indexOf(k) === -1) field = field.optional();
+    shape[k] = field;
+  }
+  return shape;
+}
+
+// onPropose(briefData) -> Promise<{action: "start"|"cancel"}>
+// The returned Promise blocks the tool until the user approves or cancels.
+function create(onPropose) {
+  var sdk;
+  try { sdk = require("@anthropic-ai/claude-agent-sdk"); } catch (e) {
+    console.error("[debate-mcp] Failed to load SDK:", e.message);
+    return null;
+  }
+
+  var createSdkMcpServer = sdk.createSdkMcpServer;
+  var tool = sdk.tool;
+  if (!createSdkMcpServer || !tool) {
+    console.error("[debate-mcp] SDK missing createSdkMcpServer or tool helper");
+    return null;
+  }
+
+  var tools = [];
+
+  tools.push(tool(
+    "propose_debate",
+    "Propose a structured debate among Clay Mates. The user will see an inline approval card. The tool blocks until the user approves or cancels.",
+    buildShape({
+      topic: { type: "string", description: "The debate topic" },
+      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" },
+      panelists: { type: "string", description: "JSON array of panelist objects: [{\"mateId\": \"<UUID>\", \"role\": \"perspective\", \"brief\": \"guidance\"}]" },
+    }, ["topic", "panelists"]),
+    function (args) {
+      var panelists;
+      try {
+        panelists = JSON.parse(args.panelists);
+      } catch (e) {
+        return Promise.resolve({
+          content: [{ type: "text", text: "Error: panelists must be a valid JSON array. Got: " + (args.panelists || "").substring(0, 100) }],
+        });
+      }
+
+      var briefData = {
+        topic: args.topic || "Untitled debate",
+        format: args.format || "free_discussion",
+        context: args.context || "",
+        specialRequests: args.specialRequests || null,
+        panelists: panelists,
+      };
+
+      return onPropose(briefData).then(function (result) {
+        if (result && result.action === "start") {
+          return { content: [{ type: "text", text: "Debate approved and started. Topic: " + briefData.topic }] };
+        }
+        return { content: [{ type: "text", text: "Debate proposal was cancelled by the user." }] };
+      });
+    }
+  ));
+
+  return createSdkMcpServer({
+    name: "clay-debate",
+    version: "1.0.0",
+    tools: tools,
+  });
+}
+
+module.exports = { create: create };

package/lib/mates.js

@@ -633,35 +633,23 @@ var DEBATE_AWARENESS_SECTION =
   "\n\n" + DEBATE_AWARENESS_MARKER + "\n" +
   "## Proposing Debates\n\n" +
   "**This section is managed by the system and cannot be removed.**\n\n" +
-  "When the user suggests that a topic would benefit from a multi-perspective debate " +
-  "(e.g., \"let's debate this\", \"I want to hear different viewpoints\"), you can propose " +
-  "a structured debate by writing a brief file.\n\n" +
+  "When the user suggests a debate, you MUST use the `propose_debate` tool. " +
+  "NEVER write debate files to disk. NEVER mkdir for debates. NEVER use Write/Bash for debate setup. " +
+  "The ONLY way to propose a debate is the `propose_debate` tool.\n\n" +
   "**How to propose a debate:**\n" +
-  "1. Generate a unique ID: `debate_` followed by the current timestamp in milliseconds\n" +
-  "2. Write the brief as JSON to: `.clay/debates/<debate_id>/brief.json` (relative to the project root)\n" +
-  "3. The system will detect the file and show the user an inline card with your proposal\n" +
-  "4. The user can then approve or cancel the debate\n\n" +
-  "**Brief JSON schema:**\n" +
-  "```json\n" +
-  "{\n" +
-  "  \"topic\": \"The refined debate topic\",\n" +
-  "  \"format\": \"free_discussion\",\n" +
-  "  \"context\": \"Key context from the conversation that panelists should know\",\n" +
-  "  \"specialRequests\": \"Any special instructions, or null\",\n" +
-  "  \"panelists\": [\n" +
-  "    {\n" +
-  "      \"mateId\": \"<mate UUID from the team roster above>\",\n" +
-  "      \"role\": \"The perspective or stance this panelist should take\",\n" +
-  "      \"brief\": \"Specific guidance for this panelist\"\n" +
-  "    }\n" +
-  "  ]\n" +
-  "}\n" +
-  "```\n\n" +
+  "Call the `propose_debate` tool with these parameters:\n" +
+  "- `topic` (required): The refined debate topic\n" +
+  "- `format`: Debate format, default \"free_discussion\"\n" +
+  "- `context`: Key context from the conversation that panelists should know\n" +
+  "- `specialRequests`: Any special instructions\n" +
+  "- `panelists` (required): A JSON string array of panelist objects:\n" +
+  "  `[{\"mateId\": \"<mate UUID from team roster>\", \"role\": \"perspective\", \"brief\": \"guidance\"}]`\n\n" +
+  "The user will see an inline approval card. The tool blocks until they approve or cancel.\n\n" +
   "**Rules:**\n" +
   "- Choose 2-4 panelists from the team roster. Pick mates whose expertise fits the topic.\n" +
   "- Do NOT include yourself as a panelist. You will moderate the debate.\n" +
   "- Only propose a debate when the user explicitly asks for one.\n" +
-  "- Make sure the directory exists before writing (use mkdir -p or equivalent).\n";
+  "- Do NOT write files to disk for debate proposals. Always use the propose_debate tool.\n";
 
 function enforceDebateAwareness(filePath) {
   if (!fs.existsSync(filePath)) return false;

package/lib/project-debate.js

@@ -14,6 +14,13 @@ var matesModule = require("./mates");
  */
 function attachDebate(ctx) {
 
+  // For mate projects, enforce latest debate awareness prompt in CLAUDE.md
+  // so mates use the propose_debate MCP tool instead of writing files.
+  if (ctx.isMate) {
+    var _debateClaudeMdPath = path.join(ctx.cwd, "CLAUDE.md");
+    try { matesModule.enforceDebateAwareness(_debateClaudeMdPath); } catch (e) {}
+  }
+
   // --- Helpers shared with other modules ---
 
   function escapeRegex(str) {
@@ -270,9 +277,9 @@ function attachDebate(ctx) {
         var mateCtx = debate.mateCtx || matesModule.buildMateCtx(null);
         debate.nameMap = buildDebateNameMap(debate.panelists, mateCtx);
 
-        // If debate was started from DM (no setupSessionId), go to reviewing phase
-        if (!debate.setupSessionId) {
-          console.log("[debate] Brief picked up from DM, entering review phase. Topic:", debate.topic);
+        // quickStart from DM or no setupSessionId: show brief card for user approval
+        if (!debate.setupSessionId || debate.quickStart) {
+          console.log("[debate] Brief picked up, entering review phase. Topic:", debate.topic);
           debate.phase = "reviewing";
           persistDebateState(session);
 
@@ -323,85 +330,18 @@ function attachDebate(ctx) {
   // --- Restore debate on reconnect ---
 
   function restoreDebateState(ws) {
-    var userId = ws._clayUser ? ws._clayUser.id : null;
-    var mateCtx = matesModule.buildMateCtx(userId);
-
+    // On server restart, SDK sessions are lost so debates cannot continue.
+    // Clear stale debate state instead of restoring dead UI.
     ctx.sm.sessions.forEach(function (session) {
-      // Already restored
-      if (session._debate) return;
-
-      // Has persisted debate state?
-      if (!session.debateState) return;
-
-      var phase = session.debateState.phase;
-      if (phase !== "preparing" && phase !== "reviewing" && phase !== "live") return;
-
-      // Restore _debate from persisted state (pass userId for correct mateCtx)
-      var debate = restoreDebateFromState(session, userId);
-      if (!debate) return;
-
-      // Update mateCtx with the connected user's context
-      debate.mateCtx = mateCtx;
-      debate.nameMap = buildDebateNameMap(debate.panelists, mateCtx);
-
-      var moderatorProfile = ctx.getMateProfile(mateCtx, debate.moderatorId);
-
-      if (phase === "preparing") {
-        var briefPath = debate.briefPath;
-        if (!briefPath && debate.debateId) {
-          briefPath = path.join(ctx.cwd, ".clay", "debates", debate.debateId, "brief.json");
-        }
-        if (!briefPath) return;
-
-        console.log("[debate] Restoring debate (preparing). topic:", debate.topic, "briefPath:", briefPath);
-        startDebateBriefWatcher(session, debate, briefPath);
-
-        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, {
-          type: "debate_brief_ready",
-          debateId: debate.debateId,
-          topic: debate.topic,
-          format: debate.format || "free_discussion",
-          context: debate.context || "",
-          specialRequests: debate.specialRequests || null,
-          moderatorId: debate.moderatorId,
-          moderatorName: moderatorProfile.name,
-          panelists: debate.panelists.map(function (p) {
-            var prof = ctx.getMateProfile(mateCtx, p.mateId);
-            return { mateId: p.mateId, name: prof.name, role: p.role || "", brief: p.brief || "" };
-          }),
-        });
-      } else if (phase === "live") {
-        console.log("[debate] Restoring debate (live). topic:", debate.topic, "awaitingConclude:", debate.awaitingConcludeConfirm);
-        // Debate was live when server restarted. It can't resume AI turns,
-        // but we can show the sticky and let user see history.
-        ctx.sendTo(ws, {
-          type: "debate_started",
-          topic: debate.topic,
-          format: debate.format,
-          round: debate.round,
-          moderatorId: debate.moderatorId,
-          moderatorName: moderatorProfile.name,
-          panelists: debate.panelists.map(function (p) {
-            var prof = ctx.getMateProfile(mateCtx, p.mateId);
-            return { mateId: p.mateId, name: prof.name, role: p.role, avatarColor: prof.avatarColor, avatarStyle: prof.avatarStyle, avatarSeed: prof.avatarSeed };
-          }),
-        });
-        // If moderator had concluded, re-send conclude confirm so client shows End/Continue UI
-        if (debate.awaitingConcludeConfirm) {
-          ctx.sendTo(ws, { type: "debate_conclude_confirm", topic: debate.topic, round: debate.round });
+      if (session._debate) {
+        delete session._debate;
+      }
+      if (session.debateState) {
+        var phase = session.debateState.phase;
+        if (phase === "preparing" || phase === "reviewing" || phase === "live") {
+          console.log("[debate] Clearing stale debate state:", session.debateState.topic);
+          session.debateState = null;
+          ctx.sm.saveSessionFile(session);
         }
       }
     });
@@ -1741,6 +1681,48 @@ function attachDebate(ctx) {
     })();
   }
 
+  // --- MCP-based debate proposal approval ---
+
+  function handleMcpDebateApproval(session, briefData, mateId, ws) {
+    if (session._debate && (session._debate.phase === "preparing" || session._debate.phase === "reviewing" || session._debate.phase === "live")) {
+      console.warn("[debate] Cannot start MCP debate: another debate is active on this session");
+      return;
+    }
+
+    var userId = ws && ws._clayUser ? ws._clayUser.id : (session.ownerId || ctx.projectOwnerId || null);
+    var mateCtx = matesModule.buildMateCtx(userId);
+    var debateId = "debate_" + Date.now();
+
+    var debate = {
+      phase: "reviewing",
+      topic: briefData.topic || "Untitled debate",
+      format: briefData.format || "free_discussion",
+      context: briefData.context || "",
+      specialRequests: briefData.specialRequests || null,
+      moderatorId: mateId,
+      panelists: (briefData.panelists || []).map(function (p) {
+        return { mateId: p.mateId, role: p.role || "", brief: p.brief || "" };
+      }),
+      mateCtx: mateCtx,
+      moderatorSession: null,
+      panelistSessions: {},
+      nameMap: null,
+      turnInProgress: false,
+      pendingComment: null,
+      round: 1,
+      history: [],
+      setupSessionId: null,
+      debateId: debateId,
+      briefPath: null,
+      ownerId: userId,
+    };
+    debate.nameMap = buildDebateNameMap(debate.panelists, mateCtx);
+    session._debate = debate;
+
+    console.log("[debate] MCP debate approved. Topic:", debate.topic, "debateId:", debateId);
+    startDebateLive(session);
+  }
+
   // --- Public API ---
 
   return {
@@ -1753,6 +1735,7 @@ function attachDebate(ctx) {
     handleDebateUserFloorResponse: handleDebateUserFloorResponse,
     restoreDebateState: restoreDebateState,
     checkForDmDebateBrief: checkForDmDebateBrief,
+    handleMcpDebateApproval: handleMcpDebateApproval,
   };
 }
 

package/lib/project-mate-interaction.js

@@ -569,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);
     },
@@ -1689,6 +1715,28 @@ 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;
@@ -4188,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 + "]");
               }
@@ -4210,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
@@ -4224,6 +4274,7 @@ function createProjectContext(opts) {
               tab: {
                 title: ss.tabTitle || "",
                 url: ss.tabUrl || "",
+                favIconUrl: ss.tabFavIconUrl || "",
                 screenshotFile: ss.file
               }
             };
@@ -4234,6 +4285,7 @@ function createProjectContext(opts) {
               tab: {
                 title: ss.tabTitle || "",
                 url: ss.tabUrl || "",
+                favIconUrl: ss.tabFavIconUrl || "",
                 screenshotUrl: "/p/" + slug + "/images/" + ss.file
               }
             });
@@ -4307,6 +4359,8 @@ function createProjectContext(opts) {
   var _debate = attachDebate({
     cwd: cwd,
     slug: slug,
+    isMate: isMate,
+    projectOwnerId: projectOwnerId,
     send: send,
     sendTo: sendTo,
     sendToSession: sendToSession,
@@ -4331,6 +4385,7 @@ 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() {

package/lib/public/app.js

@@ -32,7 +32,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, handleDebatePreparing, handleDebateStarted, handleDebateResumed, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, handleDebateEnded, handleDebateError, renderDebateStarted, renderDebateTurnDone, renderDebateEnded, renderDebateCommentInjected, renderDebateUserResume, openDebateModal, closeDebateModal, handleDebateBriefReady, renderDebateBriefReady, isDebateActive, resetDebateState, exportDebateAsPdf } 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, exportDebateAsPdf, renderMcpDebateProposal } from './modules/debate.js';
 
 // --- Base path for multi-project routing ---
   var slugMatch = location.pathname.match(/^\/p\/([a-z0-9_-]+)/);
@@ -4388,6 +4388,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
             if (dhBar) dhBar.remove();
             var dbBadges = document.querySelectorAll(".debate-header-badge");
             for (var dbi = 0; dbi < dbBadges.length; dbi++) dbBadges[dbi].remove();
+            // Clean up ended mode banner if debate is not active on this session
+            if (debateEndedMode) exitDebateEndedMode();
           }
           scrollToBottom();
           // Scroll to tool element if navigating from file edit history
@@ -4741,7 +4743,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
             header.className = "context-card-header";
             var icon = document.createElement("span");
             icon.className = "context-card-icon";
-            icon.textContent = "\uD83D\uDC41";
+            icon.innerHTML = iconHtml("globe");
             header.appendChild(icon);
             var label = document.createElement("span");
             label.textContent = "Viewing tab";
@@ -4765,6 +4767,15 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
             if (tabTitle || tabDomain) {
               var meta = document.createElement("div");
               meta.className = "context-card-meta";
+              if (msg.tab.favIconUrl) {
+                var fav = document.createElement("img");
+                fav.className = "context-card-favicon";
+                fav.src = msg.tab.favIconUrl;
+                fav.width = 14;
+                fav.height = 14;
+                fav.onerror = function () { this.style.display = "none"; };
+                meta.appendChild(fav);
+              }
               var titleEl = document.createElement("span");
               titleEl.className = "context-card-title";
               titleEl.textContent = tabTitle;
@@ -4838,6 +4849,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
             }
             renderPlanBanner("exit");
             getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
+          } else if (msg.name === "propose_debate" || (msg.name && msg.name.indexOf("propose_debate") !== -1)) {
+            getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
           } else if (getTodoTools()[msg.name]) {
             getTools()[msg.id] = { el: null, name: msg.name, input: null, done: true, hidden: true };
           } else {
@@ -4846,7 +4859,18 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
           break;
 
         case "tool_executing":
-          if (msg.name === "AskUserQuestion" && msg.input && msg.input.questions) {
+          if ((msg.name === "propose_debate" || (msg.name && msg.name.indexOf("propose_debate") !== -1)) && msg.input) {
+            var _dpTool = getTools()[msg.id];
+            if (_dpTool) {
+              if (_dpTool.el) _dpTool.el.style.display = "none";
+              _dpTool.done = true;
+              _dpTool.hidden = true;
+              removeToolFromGroup(msg.id);
+            }
+            finalizeAssistantBlock();
+            renderMcpDebateProposal(msg.id, msg.input);
+            startUrgentBlink();
+          } else if (msg.name === "AskUserQuestion" && msg.input && msg.input.questions) {
             var askTool = getTools()[msg.id];
             if (askTool) {
               if (askTool.el) askTool.el.style.display = "none";
@@ -5902,7 +5926,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   // --- Debate module ---
   initDebate({
     get ws() { return ws; },
+    sendWs: function (obj) { if (ws && ws.readyState === 1) ws.send(JSON.stringify(obj)); },
     messagesEl: messagesEl,
+    addToMessages: function (el) { addToMessages(el); },
     scrollToBottom: scrollToBottom,
     addCopyHandler: addCopyHandler,
     matesList: function () { return cachedMatesList || []; },

package/lib/public/css/filebrowser.css

@@ -873,7 +873,8 @@
 .terminal-tab.active { color: var(--text); border-color: var(--accent); }
 .terminal-tab.exited { opacity: 0.5; }
 
-.terminal-tab-close {
+
+.terminal-tab-more {
   display: none;
   align-items: center;
   justify-content: center;
@@ -888,9 +889,44 @@
   line-height: 1;
 }
 
-.terminal-tab:hover .terminal-tab-close,
-.terminal-tab.active .terminal-tab-close { display: flex; }
-.terminal-tab-close:hover { background: rgba(var(--overlay-rgb),0.1); color: var(--text); }
+.terminal-tab:hover .terminal-tab-more,
+.terminal-tab.active .terminal-tab-more { display: flex; }
+.terminal-tab-more:hover { background: rgba(var(--overlay-rgb),0.1); color: var(--text); }
+
+.terminal-tab-ctx {
+  position: fixed;
+  z-index: 9999;
+  min-width: 120px;
+  background: var(--bg-elevated, var(--bg));
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  padding: 4px;
+  box-shadow: 0 4px 12px rgba(0,0,0,0.15);
+}
+
+.terminal-tab-ctx-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  padding: 6px 10px;
+  border: none;
+  border-radius: 4px;
+  background: transparent;
+  color: var(--text-secondary);
+  font-size: 12px;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.terminal-tab-ctx-item:hover {
+  background: rgba(var(--overlay-rgb),0.08);
+  color: var(--text);
+}
+
+.terminal-tab-ctx-danger:hover {
+  color: #e74c3c;
+}
 
 .terminal-tab-label { cursor: default; }
 
@@ -971,6 +1007,7 @@
 
 .terminal-tab-body .xterm {
   height: 100%;
+  overflow: hidden;
 }
 
 /* --- Terminal key toolbar (mobile) --- */

package/lib/public/css/rewind.css

@@ -197,8 +197,13 @@
 }
 
 .context-card-header .context-card-icon {
-  font-size: 13px;
   opacity: 0.7;
+  display: inline-flex;
+  align-items: center;
+}
+.context-card-header .context-card-icon .lucide {
+  width: 14px;
+  height: 14px;
 }
 
 .context-card-screenshot {
@@ -226,10 +231,16 @@
 
 .context-card-meta {
   display: flex;
-  justify-content: space-between;
-  align-items: baseline;
+  align-items: center;
   margin-top: 8px;
-  gap: 12px;
+  gap: 6px;
+}
+.context-card-favicon {
+  width: 14px;
+  height: 14px;
+  border-radius: 2px;
+  flex-shrink: 0;
+  object-fit: contain;
 }
 
 .context-card-title {
@@ -240,6 +251,8 @@
   text-overflow: ellipsis;
   flex: 1;
   min-width: 0;
+  flex: 1;
+  min-width: 0;
 }
 
 .context-card-domain {

package/lib/public/index.html

@@ -2040,6 +2040,7 @@
 <script src="https://cdn.jsdelivr.net/npm/@xterm/xterm@5/lib/xterm.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-fit@0/lib/addon-fit.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@xterm/addon-web-links@0/lib/addon-web-links.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@xterm/addon-webgl@0/lib/addon-webgl.min.js"></script>
 <script type="module" src="app.js"></script>
 <div id="pwa-install-modal" class="pwa-modal hidden">
   <div class="pwa-modal-backdrop"></div>

package/lib/public/modules/debate.js

@@ -690,8 +690,8 @@ export function renderDebateEnded(entry) {
   ctx.messagesEl.appendChild(statusLine);
   refreshIcons();
 
-  // Show ended mode with native input area
-  if (ctx.showDebateEndedMode) ctx.showDebateEndedMode(entry);
+  // During history replay, don't activate ended mode banner.
+  // The debate is already over; status line in messages is sufficient.
 }
 
 export function renderDebateCommentInjected(entry) {
@@ -1301,3 +1301,117 @@ function renderDebateBriefCard(msg, resolved) {
   refreshIcons();
   ctx.scrollToBottom();
 }
+
+// --- MCP-based debate proposal card ---
+// Renders an inline card from the propose_debate MCP tool input.
+// The card reuses the same visual structure as renderDebateBriefCard
+// but sends debate_proposal_response instead of debate_confirm_brief.
+
+export function renderMcpDebateProposal(toolId, input) {
+  var panelists = [];
+  try {
+    panelists = typeof input.panelists === "string" ? JSON.parse(input.panelists) : (input.panelists || []);
+  } catch (e) {
+    panelists = [];
+  }
+
+  var el = document.createElement("div");
+  el.className = "debate-brief-card";
+
+  // Header
+  var header = document.createElement("div");
+  header.className = "debate-brief-card-header";
+  header.innerHTML =
+    '<span class="debate-brief-card-icon">' + iconHtml("message-circle") + '</span>' +
+    '<span class="debate-brief-card-title">Debate Proposal</span>' +
+    '<span class="debate-brief-card-chevron">' + iconHtml("chevron-down") + '</span>';
+
+  // Body
+  var body = document.createElement("div");
+  body.className = "debate-brief-card-body";
+
+  var topicHtml = '<div class="debate-brief-topic">' + escapeHtml(input.topic || "Untitled") + '</div>';
+
+  if (input.context) {
+    topicHtml += '<div class="debate-brief-context">' + escapeHtml(input.context) + '</div>';
+  }
+
+  // Resolve mate names from matesList
+  var mates = ctx.matesList ? ctx.matesList() : [];
+  var mateMap = {};
+  for (var mi = 0; mi < mates.length; mi++) {
+    mateMap[mates[mi].id] = mates[mi];
+  }
+
+  topicHtml += '<div class="debate-brief-panelists-label">' + iconHtml("users") + ' <strong>Panelists:</strong></div>';
+  topicHtml += '<div class="debate-brief-panelists">';
+  for (var i = 0; i < panelists.length; i++) {
+    var p = panelists[i];
+    var mate = mateMap[p.mateId];
+    var mateName = mate ? (mate.displayName || mate.name || p.mateId) : p.mateId;
+    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(mateName) + '</span>';
+    if (p.role) {
+      topicHtml += '<span class="debate-brief-panelist-role">' + escapeHtml(p.role) + '</span>';
+    }
+    topicHtml += '</div>';
+  }
+  topicHtml += '</div>';
+
+  if (input.specialRequests) {
+    topicHtml += '<div class="debate-brief-special">' +
+      iconHtml("info") + ' ' + escapeHtml(input.specialRequests) +
+      '</div>';
+  }
+
+  body.innerHTML = topicHtml;
+
+  // Actions
+  var actions = document.createElement("div");
+  actions.className = "debate-brief-actions";
+
+  var startBtn = document.createElement("button");
+  startBtn.className = "debate-brief-start-btn";
+  startBtn.innerHTML = iconHtml("play") + " Start Debate";
+
+  var cancelBtn = document.createElement("button");
+  cancelBtn.className = "debate-brief-cancel-btn";
+  cancelBtn.textContent = "Cancel";
+
+  startBtn.addEventListener("click", function () {
+    if (ctx.sendWs) {
+      ctx.sendWs({ type: "debate_proposal_response", proposalId: input.proposalId, action: "start" });
+    }
+    el.classList.add("resolved");
+    actions.innerHTML = '<span class="debate-brief-resolved-label">' + iconHtml("check") + ' Starting debate...</span>';
+    refreshIcons();
+  });
+
+  cancelBtn.addEventListener("click", function () {
+    if (ctx.sendWs) {
+      ctx.sendWs({ type: "debate_proposal_response", proposalId: input.proposalId, action: "cancel" });
+    }
+    el.classList.add("resolved");
+    actions.innerHTML = '<span class="debate-brief-resolved-label debate-brief-cancelled">' + iconHtml("x") + ' Cancelled</span>';
+    refreshIcons();
+  });
+
+  actions.appendChild(startBtn);
+  actions.appendChild(cancelBtn);
+
+  // Collapse toggle
+  header.addEventListener("click", function () {
+    el.classList.toggle("collapsed");
+  });
+
+  el.appendChild(header);
+  el.appendChild(body);
+  el.appendChild(actions);
+  ctx.addToMessages(el);
+  refreshIcons();
+  ctx.scrollToBottom();
+}

package/lib/public/modules/terminal.js

@@ -352,6 +352,16 @@ function createXtermForTab(tab) {
 
   xterm.open(bodyEl);
 
+  // WebGL addon: pixel-perfect rendering (eliminates gaps in block characters)
+  // Must be loaded after xterm.open() so the rendering context is available.
+  if (typeof WebglAddon !== "undefined") {
+    try {
+      xterm.loadAddon(new WebglAddon.WebglAddon());
+    } catch (e) {
+      // WebGL not available, fall back to DOM renderer
+    }
+  }
+
   // Route input to server
   xterm.onData(function (data) {
     if (ctx.ws && ctx.connected) {
@@ -481,14 +491,14 @@ function renderTabBar() {
         startRenameTab(t, label);
       });
 
-      var closeBtn = document.createElement("button");
-      closeBtn.className = "terminal-tab-close";
-      closeBtn.innerHTML = '<i data-lucide="trash-2" style="width:12px;height:12px"></i>';
-      closeBtn.addEventListener("click", function (e) {
+      var moreBtn = document.createElement("button");
+      moreBtn.className = "terminal-tab-more";
+      moreBtn.innerHTML = '<i data-lucide="ellipsis" style="width:12px;height:12px"></i>';
+      moreBtn.addEventListener("click", function (e) {
         e.stopPropagation();
-        closeTab(t.id);
+        showTabContextMenu(e, t, label);
       });
-      el.appendChild(closeBtn);
+      el.appendChild(moreBtn);
 
       el.addEventListener("click", function () {
         if (t.id !== activeTabId) {
@@ -504,6 +514,52 @@ function renderTabBar() {
   refreshIcons();
 }
 
+// --- Tab context menu (three-dot) ---
+function showTabContextMenu(e, tab, labelEl) {
+  var existing = document.querySelector(".terminal-tab-ctx");
+  if (existing) existing.remove();
+
+  var menu = document.createElement("div");
+  menu.className = "terminal-tab-ctx";
+
+  var renameItem = document.createElement("button");
+  renameItem.className = "terminal-tab-ctx-item";
+  renameItem.innerHTML = '<i data-lucide="pencil" style="width:13px;height:13px"></i> Rename';
+  renameItem.addEventListener("click", function () {
+    menu.remove();
+    startRenameTab(tab, labelEl);
+  });
+  menu.appendChild(renameItem);
+
+  var closeItem = document.createElement("button");
+  closeItem.className = "terminal-tab-ctx-item terminal-tab-ctx-danger";
+  closeItem.innerHTML = '<i data-lucide="trash-2" style="width:13px;height:13px"></i> Close';
+  closeItem.addEventListener("click", function () {
+    menu.remove();
+    closeTab(tab.id);
+  });
+  menu.appendChild(closeItem);
+
+  document.body.appendChild(menu);
+  refreshIcons();
+
+  // Position near the button
+  var rect = e.currentTarget.getBoundingClientRect();
+  menu.style.top = (rect.bottom + 4) + "px";
+  menu.style.left = rect.left + "px";
+
+  // Dismiss on outside click
+  function dismiss(ev) {
+    if (!menu.contains(ev.target)) {
+      menu.remove();
+      document.removeEventListener("mousedown", dismiss, true);
+    }
+  }
+  setTimeout(function () {
+    document.addEventListener("mousedown", dismiss, true);
+  }, 0);
+}
+
 // --- Rename tab inline ---
 function startRenameTab(tab, labelEl) {
   var input = document.createElement("input");

package/lib/sdk-bridge.js

@@ -1567,24 +1567,15 @@ function createSDKBridge(opts) {
 
   // --- SDK query lifecycle ---
 
-  function handleCanUseTool(session, toolName, input, opts) {
-    // Ralph Loop execution: auto-approve all tools, deny interactive ones.
-    // Crafting sessions are interactive — user and Claude collaborate to build PROMPT.md / JUDGE.md.
-    if (session.loop && session.loop.active && session.loop.role !== "crafting") {
-      if (toolName === "AskUserQuestion") {
-        return Promise.resolve({ behavior: "deny", message: "Autonomous mode. Make your own decision." });
-      }
-      if (toolName === "EnterPlanMode") {
-        return Promise.resolve({ behavior: "deny", message: "Do not enter plan mode. Execute directly." });
-      }
-      return Promise.resolve({ behavior: "allow", updatedInput: input });
-    }
-
+  // Check if a tool should be auto-approved based on whitelist rules.
+  // Returns { behavior: "allow", updatedInput } if whitelisted, or null if not.
+  // Shared by handleCanUseTool and mate mention canUseTool handlers.
+  function checkToolWhitelist(toolName, input) {
     // Auto-approve read-only tools for ALL sessions.
     // These tools only inspect files and fetch data — no side effects.
     var readOnlyTools = { Read: true, Glob: true, Grep: true, WebFetch: true, WebSearch: true };
     if (readOnlyTools[toolName]) {
-      return Promise.resolve({ behavior: "allow", updatedInput: input });
+      return { behavior: "allow", updatedInput: input };
     }
 
     // Auto-approve safe browser MCP tools.
@@ -1595,10 +1586,17 @@ function createSDKBridge(opts) {
     if (toolName.indexOf("mcp__") === 0 && toolName.indexOf("__browser_") !== -1) {
       var mcpToolName = toolName.substring(toolName.lastIndexOf("__") + 2);
       if (safeBrowserTools[mcpToolName]) {
-        return Promise.resolve({ behavior: "allow", updatedInput: input });
+        return { behavior: "allow", updatedInput: input };
       }
     }
 
+    // Auto-approve debate MCP tools (propose_debate).
+    // These are user-facing tools that show inline approval cards,
+    // so the permission prompt is redundant.
+    if (toolName.indexOf("mcp__clay-debate__") === 0) {
+      return { behavior: "allow", updatedInput: input };
+    }
+
     // Auto-approve safe Bash commands (read-only, non-destructive)
     // Applies to ALL sessions (mates and regular projects alike).
     // These are purely read-only commands that cannot modify files, install
@@ -1663,10 +1661,32 @@ function createSDKBridge(opts) {
         if (!safeBashCommands[firstWord]) { allSafe = false; break; }
       }
       if (allSafe) {
-        return Promise.resolve({ behavior: "allow", updatedInput: input });
+        return { behavior: "allow", updatedInput: input };
       }
     }
 
+    return null; // Not whitelisted
+  }
+
+  function handleCanUseTool(session, toolName, input, opts) {
+    // Ralph Loop execution: auto-approve all tools, deny interactive ones.
+    // Crafting sessions are interactive — user and Claude collaborate to build PROMPT.md / JUDGE.md.
+    if (session.loop && session.loop.active && session.loop.role !== "crafting") {
+      if (toolName === "AskUserQuestion") {
+        return Promise.resolve({ behavior: "deny", message: "Autonomous mode. Make your own decision." });
+      }
+      if (toolName === "EnterPlanMode") {
+        return Promise.resolve({ behavior: "deny", message: "Do not enter plan mode. Execute directly." });
+      }
+      return Promise.resolve({ behavior: "allow", updatedInput: input });
+    }
+
+    // Check shared whitelist (read-only tools, safe browser tools, safe bash commands)
+    var whitelisted = checkToolWhitelist(toolName, input);
+    if (whitelisted) {
+      return Promise.resolve(whitelisted);
+    }
+
     // AskUserQuestion: wait for user answers via WebSocket
     if (toolName === "AskUserQuestion") {
       return new Promise(function(resolve) {
@@ -2529,6 +2549,7 @@ function createSDKBridge(opts) {
   return {
     createMessageQueue: createMessageQueue,
     processSDKMessage: processSDKMessage,
+    checkToolWhitelist: checkToolWhitelist,
     handleCanUseTool: handleCanUseTool,
     handleElicitation: handleElicitation,
     processQueryStream: processQueryStream,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.26.0-beta.17",
+  "version": "2.26.0-beta.19",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",