clay-server 2.31.0 → 2.32.0-beta.1

package/lib/browser-mcp-server.js

@@ -1,11 +1,11 @@
-// Browser MCP Server for Clay (in-process SDK version)
-// Provides browser automation tools to Claude via createSdkMcpServer.
-// Calls sendExtensionCommand directly instead of HTTP bridge.
+// Browser MCP Server for Clay
+// Provides browser automation tool definitions.
+// SDK-free: returns runtime-agnostic tool definitions for YOKE adapter.
 //
 // Usage:
 //   var browserMcp = require("./browser-mcp-server");
-//   var mcpConfig = browserMcp.create(sendExtensionCommandAny);
-//   // Pass mcpConfig to sdk-bridge opts.mcpServers
+//   var toolDefs = browserMcp.getToolDefs(sendExtensionCommandAny, getTabList, contextOps);
+//   var mcpConfig = adapter.createToolServer({ name: "clay-browser", version: "1.0.0", tools: toolDefs });
 
 var z;
 try { z = require("zod"); } catch (e) { z = null; }
@@ -30,21 +30,14 @@ function buildShape(props, required) {
   return shape;
 }
 
-function create(sendCommand, getTabList, contextOps) {
+// Helper: convert positional args (name, desc, schema, handler) to tool definition object
+function def(name, description, inputSchema, handler) {
+  return { name: name, description: description, inputSchema: inputSchema, handler: handler };
+}
+
+function getToolDefs(sendCommand, getTabList, contextOps) {
   // sendCommand(command, args, timeout) -> Promise<result>
   // getTabList() -> array of { id, url, title, favIconUrl }
-  var sdk;
-  try { sdk = require("@anthropic-ai/claude-agent-sdk"); } catch (e) {
-    console.error("[browser-mcp] Failed to load SDK:", e.message);
-    return null;
-  }
-
-  var createSdkMcpServer = sdk.createSdkMcpServer;
-  var tool = sdk.tool;
-  if (!createSdkMcpServer || !tool) {
-    console.error("[browser-mcp] SDK missing createSdkMcpServer or tool helper");
-    return null;
-  }
 
   // Helper: ensure inject.js loaded (best-effort)
   function ensureInjected(tabId) {
@@ -54,7 +47,7 @@ function create(sendCommand, getTabList, contextOps) {
   var tools = [];
 
   // --- browser_list_tabs ---
-  tools.push(tool(
+  tools.push(def(
     "browser_list_tabs",
     "List all open browser tabs with their IDs, URLs, and titles",
     buildShape({}, []),
@@ -65,7 +58,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_open ---
-  tools.push(tool(
+  tools.push(def(
     "browser_open",
     "Open a new browser tab and return its tab ID",
     buildShape({
@@ -80,7 +73,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_close ---
-  tools.push(tool(
+  tools.push(def(
     "browser_close",
     "Close a browser tab",
     buildShape({
@@ -94,7 +87,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_navigate ---
-  tools.push(tool(
+  tools.push(def(
     "browser_navigate",
     "Navigate a tab to a new URL",
     buildShape({
@@ -109,7 +102,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_screenshot ---
-  tools.push(tool(
+  tools.push(def(
     "browser_screenshot",
     "Capture a screenshot of a browser tab. Skip if the tab is already attached as a context source (data is auto-injected).",
     buildShape({
@@ -132,7 +125,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_console ---
-  tools.push(tool(
+  tools.push(def(
     "browser_console",
     "Read captured console logs from a tab. Skip if the tab is already a context source (data is auto-injected).",
     buildShape({
@@ -155,7 +148,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_network ---
-  tools.push(tool(
+  tools.push(def(
     "browser_network",
     "Read captured network requests (fetch/XHR) from a tab. Skip if the tab is already a context source.",
     buildShape({
@@ -179,7 +172,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_read_page ---
-  tools.push(tool(
+  tools.push(def(
     "browser_read_page",
     "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({
@@ -204,7 +197,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_dom ---
-  tools.push(tool(
+  tools.push(def(
     "browser_dom",
     "Get a simplified DOM tree (tag, id, class, children) for structural analysis",
     buildShape({
@@ -247,7 +240,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_styles ---
-  tools.push(tool(
+  tools.push(def(
     "browser_styles",
     "Get computed styles of an element (display, position, size, colors, etc.)",
     buildShape({
@@ -276,7 +269,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_storage ---
-  tools.push(tool(
+  tools.push(def(
     "browser_storage",
     "Read browser storage (localStorage, sessionStorage, or cookies)",
     buildShape({
@@ -300,7 +293,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_evaluate ---
-  tools.push(tool(
+  tools.push(def(
     "browser_evaluate",
     "Execute arbitrary JavaScript in the page context and return the result",
     buildShape({
@@ -317,7 +310,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_click ---
-  tools.push(tool(
+  tools.push(def(
     "browser_click",
     "Click an element on the page",
     buildShape({
@@ -339,7 +332,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_type ---
-  tools.push(tool(
+  tools.push(def(
     "browser_type",
     "Type text into an input element (sets value and dispatches input/change events)",
     buildShape({
@@ -366,7 +359,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_scroll ---
-  tools.push(tool(
+  tools.push(def(
     "browser_scroll",
     "Scroll the page or scroll a specific element into view",
     buildShape({
@@ -396,7 +389,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_wait ---
-  tools.push(tool(
+  tools.push(def(
     "browser_wait",
     "Wait for an element matching a CSS selector to appear in the DOM",
     buildShape({
@@ -432,7 +425,7 @@ function create(sendCommand, getTabList, contextOps) {
   ));
 
   // --- browser_wait_navigation ---
-  tools.push(tool(
+  tools.push(def(
     "browser_wait_navigation",
     "Wait for page navigation to complete (URL change + load event)",
     buildShape({
@@ -450,7 +443,7 @@ function create(sendCommand, getTabList, contextOps) {
 
   // --- browser_watch_tab ---
   if (contextOps && contextOps.watchTab) {
-    tools.push(tool(
+    tools.push(def(
       "browser_watch_tab",
       "Add a browser tab as a persistent context source. Its screenshot and text will be automatically included in every subsequent message.",
       buildShape({
@@ -470,7 +463,7 @@ function create(sendCommand, getTabList, contextOps) {
       }
     ));
 
-    tools.push(tool(
+    tools.push(def(
       "browser_unwatch_tab",
       "Remove a browser tab from persistent context sources. Stops auto-including its content.",
       buildShape({
@@ -485,12 +478,7 @@ function create(sendCommand, getTabList, contextOps) {
     ));
   }
 
-  // Create the in-process MCP server
-  return createSdkMcpServer({
-    name: "clay-browser",
-    version: "1.0.0",
-    tools: tools,
-  });
+  return tools;
 }
 
-module.exports = { create: create };
+module.exports = { getToolDefs: getToolDefs };

package/lib/debate-mcp-server.js

@@ -1,11 +1,11 @@
-// 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.
+// Debate MCP Server for Clay
+// Provides the propose_debate tool definition.
+// SDK-free: returns runtime-agnostic tool definitions for YOKE adapter.
 //
 // Usage:
 //   var debateMcp = require("./debate-mcp-server");
-//   var mcpConfig = debateMcp.create(onPropose);
-//   // Pass mcpConfig to sdk-bridge opts.mcpServers
+//   var toolDefs = debateMcp.getToolDefs(onPropose);
+//   var mcpConfig = adapter.createToolServer({ name: "clay-debate", version: "1.0.0", tools: toolDefs });
 
 var z;
 try { z = require("zod"); } catch (e) { z = null; }
@@ -31,33 +31,20 @@ function buildShape(props, required) {
 
 // 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;
-  }
-
+function getToolDefs(onPropose) {
   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({
+  tools.push({
+    name: "propose_debate",
+    description: "Propose a structured debate among Clay Mates. The user will see an inline approval card. The tool blocks until the user approves or cancels.",
+    inputSchema: 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) {
+    handler: function (args) {
       var panelists;
       try {
         panelists = JSON.parse(args.panelists);
@@ -82,13 +69,9 @@ function create(onPropose) {
         return { content: [{ type: "text", text: "Debate proposal was cancelled by the user." }] };
       });
     }
-  ));
-
-  return createSdkMcpServer({
-    name: "clay-debate",
-    version: "1.0.0",
-    tools: tools,
   });
+
+  return tools;
 }
 
-module.exports = { create: create };
+module.exports = { getToolDefs: getToolDefs };

package/lib/mcp-local.js

@@ -352,4 +352,34 @@ function createLocalMcp() {
   };
 }
 
-module.exports = { createLocalMcp: createLocalMcp };
+// Standalone config reader (no process spawning).
+// Returns merged server definitions from ~/.clay/mcp.json + includes.
+// Used by Codex adapter to pass server configs for native MCP management.
+function readMergedServers() {
+  var dir = path.dirname(CLAY_CONFIG_PATH);
+  if (!fs.existsSync(dir)) return {};
+  var config;
+  try {
+    config = JSON.parse(fs.readFileSync(CLAY_CONFIG_PATH, "utf8"));
+  } catch (e) {
+    return {};
+  }
+  var merged = Object.assign({}, config.mcpServers || {});
+  var includes = config.include || [];
+  for (var i = 0; i < includes.length; i++) {
+    var resolved = includes[i].replace(/^~/, os.homedir());
+    try {
+      var ext = JSON.parse(fs.readFileSync(resolved, "utf8"));
+      var extServers = ext.mcpServers || {};
+      var names = Object.keys(extServers);
+      for (var j = 0; j < names.length; j++) {
+        if (!merged[names[j]]) merged[names[j]] = extServers[names[j]];
+      }
+    } catch (e) {
+      // Skip unreadable files
+    }
+  }
+  return merged;
+}
+
+module.exports = { createLocalMcp: createLocalMcp, readMergedServers: readMergedServers };

package/lib/project-connection.js

@@ -92,7 +92,8 @@ function attachConnection(ctx) {
       sendTo(ws, { type: "slash_commands", commands: sm.slashCommands });
     }
     if (sm.currentModel) {
-      sendTo(ws, { type: "model_info", model: sm.currentModel, models: sm.availableModels || [] });
+      // Vendor is resolved per-session in session_switched; send default here
+      sendTo(ws, { type: "model_info", model: sm.currentModel, models: sm.availableModels || [], vendor: sm.defaultVendor || "claude", availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
     }
     sendTo(ws, { type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
     sendTo(ws, { type: "term_list", terminals: tm.list() });
@@ -180,7 +181,8 @@ function attachConnection(ctx) {
         sm.saveSessionFile(active);
       }
       ws._clayActiveSession = active.localId;
-      sendTo(ws, { type: "session_switched", id: active.localId, cliSessionId: active.cliSessionId || null, loop: active.loop || null });
+      var _vendorCaps = (sm.capabilitiesByVendor && sm.capabilitiesByVendor[active.vendor || sm.defaultVendor || "claude"]) || {};
+      sendTo(ws, { type: "session_switched", id: active.localId, cliSessionId: active.cliSessionId || null, loop: active.loop || null, vendor: active.vendor || null, hasHistory: (active.history && active.history.length > 0), capabilities: _vendorCaps });
       // Send per-session context sources
       var sessionSources = loadContextSources(slug, active.localId);
       sendTo(ws, { type: "context_sources_state", active: sessionSources });

package/lib/project-filesystem.js

@@ -41,7 +41,7 @@ function attachFilesystem(ctx) {
 
   function handleFilesystemMessage(ws, msg) {
     // --- File browser permission gate ---
-    if (msg.type === "fs_list" || msg.type === "fs_read" || msg.type === "fs_write" || msg.type === "fs_delete" || msg.type === "fs_rename" || msg.type === "fs_mkdir" || msg.type === "fs_upload") {
+    if (msg.type === "fs_list" || msg.type === "fs_read" || msg.type === "fs_write" || msg.type === "fs_delete" || msg.type === "fs_rename" || msg.type === "fs_mkdir" || msg.type === "fs_upload" || msg.type === "fs_search") {
       if (ws._clayUser) {
         var fbPerms = usersModule.getEffectivePermissions(ws._clayUser, osUsers);
         if (!fbPerms.fileBrowser) {
@@ -98,6 +98,52 @@ function attachFilesystem(ctx) {
       return true;
     }
 
+    // --- fs_search ---
+    if (msg.type === "fs_search") {
+      var query = (msg.query || "").trim().toLowerCase();
+      if (!query) {
+        sendTo(ws, { type: "fs_search_result", query: msg.query, entries: [] });
+        return true;
+      }
+      try {
+        var searchResults = [];
+        var MAX_RESULTS = 50;
+        var searchUserInfo = getOsUserInfoForWs(ws);
+
+        function walkDir(dir, relPrefix) {
+          if (searchResults.length >= MAX_RESULTS) return;
+          var items;
+          try {
+            if (searchUserInfo) {
+              items = fsAsUser("list", { dir: dir }, searchUserInfo);
+            } else {
+              items = fs.readdirSync(dir, { withFileTypes: true }).map(function (d) {
+                return { name: d.name, isDir: d.isDirectory() };
+              });
+            }
+          } catch (e) { return; }
+          for (var i = 0; i < items.length; i++) {
+            if (searchResults.length >= MAX_RESULTS) return;
+            var it = items[i];
+            if (it.isDir && IGNORED_DIRS.has(it.name)) continue;
+            var rel = relPrefix ? relPrefix + "/" + it.name : it.name;
+            if (it.name.toLowerCase().indexOf(query) !== -1) {
+              searchResults.push({ name: it.name, type: it.isDir ? "dir" : "file", path: rel });
+            }
+            if (it.isDir) {
+              walkDir(path.join(dir, it.name), rel);
+            }
+          }
+        }
+
+        walkDir(cwd, "");
+        sendTo(ws, { type: "fs_search_result", query: msg.query, entries: searchResults });
+      } catch (e) {
+        sendTo(ws, { type: "fs_search_result", query: msg.query, entries: [], error: e.message });
+      }
+      return true;
+    }
+
     // --- fs_read ---
     if (msg.type === "fs_read") {
       var fsFile = safePath(cwd, msg.path);

package/lib/project-http.js

@@ -504,6 +504,10 @@ function attachHTTP(ctx) {
       return true;
     }
 
+    // Skill update check cache (avoid redundant GitHub fetches)
+    if (!ctx._skillCheckCache) ctx._skillCheckCache = {};
+    var SKILL_CHECK_TTL = 5 * 60 * 1000; // 5 minutes
+
     // Check skill updates (compare installed vs remote versions)
     if (req.method === "POST" && urlPath === "/api/check-skill-updates") {
       parseJsonBody(req).then(function (body) {
@@ -572,7 +576,16 @@ function attachHTTP(ctx) {
           (function (skill) {
             var installedVer = getInstalledVersion(skill.name);
             var installed = !!installedVer;
-            console.log("[skill-check] " + skill.name + " installed=" + installed + " localVersion=" + (installedVer || "none"));
+
+            // Return cached result if fresh
+            var cacheKey = skill.name + ":" + (installedVer || "");
+            var cached = ctx._skillCheckCache[cacheKey];
+            if (cached && (Date.now() - cached.ts) < SKILL_CHECK_TTL) {
+              results.push(cached.result);
+              finishOne();
+              return;
+            }
+
             // Convert GitHub repo URL to raw SKILL.md URL
             var rawUrl = "";
             var ghMatch = skill.url.match(/github\.com\/([^/]+)\/([^/]+)/);
@@ -580,17 +593,16 @@ function attachHTTP(ctx) {
               rawUrl = "https://raw.githubusercontent.com/" + ghMatch[1] + "/" + ghMatch[2] + "/main/SKILL.md";
             }
             if (!rawUrl) {
-              console.log("[skill-check] " + skill.name + " no valid GitHub URL, skipping remote check");
-              results.push({ name: skill.name, installed: installed, installedVersion: installedVer, remoteVersion: "", status: installed ? "ok" : "missing" });
+              var r0 = { name: skill.name, installed: installed, installedVersion: installedVer, remoteVersion: "", status: installed ? "ok" : "missing" };
+              ctx._skillCheckCache[cacheKey] = { ts: Date.now(), result: r0 };
+              results.push(r0);
               finishOne();
               return;
             }
-            console.log("[skill-check] " + skill.name + " fetching remote: " + rawUrl);
             // Fetch remote SKILL.md
             var https = require("https");
             https.get(rawUrl, function (resp) {
-              console.log("[skill-check] " + skill.name + " remote response status=" + resp.statusCode);
-              var data = "";
+                var data = "";
               resp.on("data", function (chunk) { data += chunk; });
               resp.on("end", function () {
                 try {
@@ -601,8 +613,9 @@ function attachHTTP(ctx) {
                   } else if (remoteVer && compareVersions(installedVer, remoteVer) < 0) {
                     status = "outdated";
                   }
-                  console.log("[skill-check] " + skill.name + " remoteVersion=" + remoteVer + " status=" + status);
-                  results.push({ name: skill.name, installed: installed, installedVersion: installedVer, remoteVersion: remoteVer, status: status });
+                  var r1 = { name: skill.name, installed: installed, installedVersion: installedVer, remoteVersion: remoteVer, status: status };
+                  ctx._skillCheckCache[cacheKey] = { ts: Date.now(), result: r1 };
+                  results.push(r1);
                   finishOne();
                 } catch (e) {
                   console.error("[skill-check] " + skill.name + " version parse failed:", e.message || e);
@@ -666,6 +679,60 @@ function attachHTTP(ctx) {
       return true;
     }
 
+    // MCP bridge endpoint: allows Codex's mcp-bridge-server.js to list/call
+    // in-app and remote MCP tools via HTTP (localhost only).
+    if (req.method === "POST" && urlPath === "/api/mcp-bridge") {
+      parseJsonBody(req).then(function (body) {
+        var action = body.action;
+        var getMcpBridgeHandler = ctx.getMcpBridgeHandler;
+        if (!getMcpBridgeHandler) {
+          res.writeHead(500, { "Content-Type": "application/json" });
+          res.end('{"error":"MCP bridge not configured"}');
+          return;
+        }
+        var handler = getMcpBridgeHandler();
+        if (!handler) {
+          res.writeHead(500, { "Content-Type": "application/json" });
+          res.end('{"error":"MCP bridge handler unavailable"}');
+          return;
+        }
+
+        if (action === "list_tools") {
+          handler.listTools().then(function (tools) {
+            var serverCounts = {};
+            for (var ti = 0; ti < tools.length; ti++) {
+              serverCounts[tools[ti].server] = (serverCounts[tools[ti].server] || 0) + 1;
+            }
+            console.log("[mcp-bridge-http] list_tools:", tools.length, "tools -", Object.keys(serverCounts).map(function(s) { return s + "(" + serverCounts[s] + ")"; }).join(", ") || "(none)");
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({ tools: tools }));
+          }).catch(function (err) {
+            res.writeHead(500, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({ error: err.message || "Failed to list tools" }));
+          });
+        } else if (action === "call_tool") {
+          var server = body.server;
+          var tool = body.tool;
+          var args = body.args || {};
+          console.log("[mcp-bridge-http] call_tool:", server + "/" + tool);
+          handler.callTool(server, tool, args).then(function (result) {
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({ result: result }));
+          }).catch(function (err) {
+            res.writeHead(200, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({ error: err.message || "Tool call failed" }));
+          });
+        } else {
+          res.writeHead(400, { "Content-Type": "application/json" });
+          res.end('{"error":"Unknown action: ' + (action || '') + '"}');
+        }
+      }).catch(function () {
+        res.writeHead(400, { "Content-Type": "application/json" });
+        res.end('{"error":"Invalid JSON body"}');
+      });
+      return true;
+    }
+
     // Info endpoint
     if (req.method === "GET" && urlPath === "/info") {
       res.writeHead(200, {

package/lib/project-mcp.js

@@ -73,6 +73,7 @@ function attachMcp(ctx) {
 
   function handleToolResult(msg) {
     var callId = msg.callId;
+    console.log("[mcp-bridge] Tool result received: " + callId);
     var pending = _pendingCalls[callId];
     if (!pending) return;
     if (pending.timer) clearTimeout(pending.timer);
@@ -82,6 +83,7 @@ function attachMcp(ctx) {
 
   function handleToolError(msg) {
     var callId = msg.callId;
+    console.log("[mcp-bridge] Tool error received: " + callId + " error=" + (msg.error || "unknown"));
     var pending = _pendingCalls[callId];
     if (!pending) return;
     if (pending.timer) clearTimeout(pending.timer);
@@ -223,12 +225,14 @@ function attachMcp(ctx) {
         var callId = "mc_" + Date.now() + "_" + crypto.randomUUID().slice(0, 8);
 
         var timer = setTimeout(function () {
+          console.log("[mcp-bridge] Tool call TIMEOUT: " + callId + " server=" + serverName + " tool=" + toolName);
           delete _pendingCalls[callId];
           reject(new Error("MCP tool call timed out after " + (TOOL_TIMEOUT_MS / 1000) + "s"));
         }, TOOL_TIMEOUT_MS);
 
         _pendingCalls[callId] = { resolve: resolve, reject: reject, timer: timer };
 
+        console.log("[mcp-bridge] Sending tool call: " + callId + " server=" + serverName + " tool=" + toolName);
         sendTo(extWs, {
           type: "mcp_tool_call",
           callId: callId,