clay-server 2.31.0 → 2.32.0-beta.10

package/lib/project.js

@@ -84,12 +84,8 @@ function validateEnvString(str) {
   return null;
 }
 
-// SDK loaded dynamically (ESM module)
-var sdkModule = null;
-function getSDK() {
-  if (!sdkModule) sdkModule = import("@anthropic-ai/claude-agent-sdk");
-  return sdkModule;
-}
+// YOKE adapter (replaces direct SDK access)
+var yoke = require("./yoke");
 
 // --- Shared constants ---
 var IGNORED_DIRS = new Set(["node_modules", ".git", ".next", "__pycache__", ".cache", "dist", "build", ".clay", ".claude-relay"]);
@@ -161,8 +157,15 @@ function createProjectContext(opts) {
   var onCreateWorktree = opts.onCreateWorktree || null;
   var serverPort = opts.port || 2633;
   var serverTls = opts.tls || false;
+  var serverAuthToken = opts.authToken || null;
   var latestVersion = null;
 
+  // --- YOKE adapters (multi-vendor, lazy init) ---
+  var _yokeState = yoke.createAdapters({ cwd: cwd });
+  var adapters = _yokeState.adapters;
+  var defaultVendor = adapters.claude ? "claude" : Object.keys(adapters)[0] || "claude";
+  var adapter = adapters[defaultVendor] || null;
+
   // Browser MCP server runs in-process via createSdkMcpServer (no child process spawn).
   // Do NOT write to .claude-local/settings.json -- the SDK reads that too, causing duplicate spawns.
 
@@ -398,6 +401,9 @@ function createProjectContext(opts) {
     },
     onSessionDone: onSessionDone,
   });
+  sm.availableVendors = Object.keys(adapters);
+  sm.defaultVendor = defaultVendor;
+
   var _projMode = typeof opts.onGetProjectDefaultMode === "function" ? opts.onGetProjectDefaultMode(slug) : null;
   var _srvMode = typeof opts.onGetServerDefaultMode === "function" ? opts.onGetServerDefaultMode() : null;
   sm._savedDefaultMode = (_projMode && _projMode.mode) || (_srvMode && _srvMode.mode) || "default";
@@ -451,6 +457,89 @@ function createProjectContext(opts) {
     },
   });
 
+  // --- MCP tool servers (created via YOKE adapter) ---
+  var mcpServers = (function () {
+    var servers = {};
+
+    // 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 });
+      if (debateMcpConfig) servers[debateMcpConfig.name || "clay-debate"] = debateMcpConfig;
+    } catch (e) {
+      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 browserToolDefs = browserMcp.getToolDefs(sendExtensionCommandAny, function () {
+          return Object.values(browserState._browserTabList || {});
+        }, {
+          watchTab: function (tabId) {
+            var key = "tab:" + tabId;
+            // Apply to all connected clients' active sessions
+            for (var c of clients) {
+              if (c.readyState !== 1) continue;
+              var sid = c._clayActiveSession || null;
+              var active = loadContextSources(slug, sid);
+              if (active.indexOf(key) === -1) {
+                active.push(key);
+                saveContextSources(slug, sid, active);
+                c.send(JSON.stringify({ type: "context_sources_state", active: active }));
+              }
+            }
+            return [];
+          },
+          unwatchTab: function (tabId) {
+            var key = "tab:" + tabId;
+            for (var c of clients) {
+              if (c.readyState !== 1) continue;
+              var sid = c._clayActiveSession || null;
+              var active = loadContextSources(slug, sid);
+              var idx = active.indexOf(key);
+              if (idx !== -1) {
+                active.splice(idx, 1);
+                saveContextSources(slug, sid, active);
+                c.send(JSON.stringify({ type: "context_sources_state", active: active }));
+              }
+            }
+            return active;
+          },
+        });
+        var mcpConfig = adapter.createToolServer({ name: "clay-browser", version: "1.0.0", tools: browserToolDefs });
+        if (mcpConfig) servers[mcpConfig.name || "clay-browser"] = mcpConfig;
+      } catch (e) {
+        console.error("[project] Failed to create browser MCP server:", e.message);
+      }
+    }
+
+    // Email MCP server (available to both mates and main project)
+    // Note: email-mcp-server still uses the legacy create() pattern (not yet converted to getToolDefs).
+    try {
+      var emailMcp = require("./email-mcp-server");
+      var emailMcpConfig = emailMcp.create(_email.createMcpDeps());
+      if (emailMcpConfig) servers[emailMcpConfig.name || "clay-email"] = emailMcpConfig;
+    } catch (e) {
+      console.error("[project] Failed to create email MCP server:", e.message);
+    }
+
+    return Object.keys(servers).length > 0 ? servers : undefined;
+  })();
+
   // --- SDK bridge ---
   var sdk = createSDKBridge({
     cwd: cwd,
@@ -458,92 +547,17 @@ function createProjectContext(opts) {
     sessionManager: sm,
     send: send,
     pushModule: pushModule,
+    adapter: adapter,
+    adapters: adapters,
     getNotificationsModule: function () { return _notifications; },
-    getSDK: getSDK,
     mateDisplayName: opts.mateDisplayName || "",
     isMate: isMate,
     dangerouslySkipPermissions: dangerouslySkipPermissions,
-    mcpServers: (function () {
-      var servers = {};
-
-      // Debate MCP server (available to both mates and main project)
-      try {
-        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 (debateMcpConfig) servers[debateMcpConfig.name || "clay-debate"] = debateMcpConfig;
-      } catch (e) {
-        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(browserState._browserTabList || {});
-          }, {
-            watchTab: function (tabId) {
-              var key = "tab:" + tabId;
-              // Apply to all connected clients' active sessions
-              for (var c of clients) {
-                if (c.readyState !== 1) continue;
-                var sid = c._clayActiveSession || null;
-                var active = loadContextSources(slug, sid);
-                if (active.indexOf(key) === -1) {
-                  active.push(key);
-                  saveContextSources(slug, sid, active);
-                  c.send(JSON.stringify({ type: "context_sources_state", active: active }));
-                }
-              }
-              return [];
-            },
-            unwatchTab: function (tabId) {
-              var key = "tab:" + tabId;
-              for (var c of clients) {
-                if (c.readyState !== 1) continue;
-                var sid = c._clayActiveSession || null;
-                var active = loadContextSources(slug, sid);
-                var idx = active.indexOf(key);
-                if (idx !== -1) {
-                  active.splice(idx, 1);
-                  saveContextSources(slug, sid, active);
-                  c.send(JSON.stringify({ type: "context_sources_state", active: active }));
-                }
-              }
-              return active;
-            },
-          });
-          if (mcpConfig) servers[mcpConfig.name || "clay-browser"] = mcpConfig;
-        } catch (e) {
-          console.error("[project] Failed to create browser MCP server:", e.message);
-        }
-      }
-
-      // Email MCP server (available to both mates and main project)
-      try {
-        var emailMcp = require("./email-mcp-server");
-        // Use "default" userId initially; the actual userId is resolved per-tool-call
-        // via the deps closures which read from the active WS connection.
-        var emailMcpConfig = emailMcp.create(_email.createMcpDeps());
-        if (emailMcpConfig) servers[emailMcpConfig.name || "clay-email"] = emailMcpConfig;
-      } catch (e) {
-        console.error("[project] Failed to create email MCP server:", e.message);
-      }
-
-      return Object.keys(servers).length > 0 ? servers : undefined;
-    })(),
+    mcpServers: mcpServers,
     getRemoteMcpServers: function () { return _mcp.getMcpServers(); },
+    clayPort: serverPort,
+    clayTls: serverTls,
+    clayAuthToken: serverAuthToken,
     onProcessingChanged: onProcessingChanged,
     onTurnDone: isMate ? function (session, preview) {
       digestDmTurn(session, preview);
@@ -601,15 +615,33 @@ function createProjectContext(opts) {
   var tm = createTerminalManager({ cwd: cwd, send: send, sendTo: sendTo });
   var nm = createNotesManager({ cwd: cwd, send: send, sendTo: sendTo });
 
-  // Check for updates in background (admin only)
-  fetchVersion(updateChannel).then(function (v) {
-    if (v && isNewer(v, currentVersion)) {
-      latestVersion = v;
-      sendToAdmins({ type: "update_available", version: v });
-    }
-  }).catch(function (e) {
-    console.error("[project] Background version check failed:", e.message || e);
-  });
+  // Check for updates in background (admin only). The result is stored in
+  // latestVersion; broadcast is handled by the hourly scheduler below, so
+  // page refreshes don't re-trigger the banner.
+  function runVersionCheck(broadcast) {
+    fetchVersion(updateChannel).then(function (v) {
+      if (v && isNewer(v, currentVersion)) {
+        latestVersion = v;
+        if (broadcast) sendToAdmins({ type: "update_available", version: v });
+      }
+    }).catch(function (e) {
+      console.error("[project] Background version check failed:", e.message || e);
+    });
+  }
+  runVersionCheck(false);
+
+  // Push update_available on every hour boundary. Clients can dismiss the
+  // banner; the next hourly push acts as a fresh ping. This avoids needing
+  // any dismissed-state persistence.
+  function scheduleNextHourlyBroadcast() {
+    var now = Date.now();
+    var msUntilNextHour = 60 * 60 * 1000 - (now % (60 * 60 * 1000));
+    setTimeout(function tick() {
+      runVersionCheck(true);
+      setTimeout(tick, 60 * 60 * 1000);
+    }, msUntilNextHour);
+  }
+  scheduleNextHourlyBroadcast();
 
   // --- WS connection handler (delegated to project-connection.js) ---
   function handleConnection(ws, wsUser) {
@@ -712,12 +744,23 @@ function createProjectContext(opts) {
           delete session._mentionSessions[mateId];
         }
         session._mentionInProgress = false;
+        session._mentionActiveMateId = null;
         sendToSession(session.localId, { type: "mention_done", mateId: mateId, stopped: true });
         send({ type: "mention_processing", mateId: mateId, active: false });
       }
       return;
     }
 
+    // --- Vendor model switching ---
+    if (msg.type === "get_vendor_models") {
+      var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[msg.vendor]) || [];
+      var firstModel = vendorModels[0] || "";
+      // model value can be string or {value, displayName} object
+      var defaultModel = typeof firstModel === "string" ? firstModel : (firstModel.value || "");
+      sendTo(ws, { type: "model_info", model: defaultModel, models: vendorModels, vendor: msg.vendor, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
+      return;
+    }
+
     // --- Debate ---
     if (msg.type === "debate_start") {
       handleDebateStart(ws, msg);
@@ -825,6 +868,7 @@ function createProjectContext(opts) {
   // so we use a lazy getter that resolves at call time.
   var _mateInteraction = attachMateInteraction({
     cwd: cwd,
+    slug: slug,
     sm: sm,
     sdk: sdk,
     send: send,
@@ -842,6 +886,7 @@ function createProjectContext(opts) {
     loadMateDigests: loadMateDigests,
     updateMemorySummary: updateMemorySummary,
     initMemorySummary: initMemorySummary,
+    getNotificationsModule: function () { return _notifications; },
     get checkForDmDebateBrief() { return checkForDmDebateBrief; },
   });
   var handleMention = _mateInteraction.handleMention;
@@ -950,7 +995,7 @@ function createProjectContext(opts) {
     hydrateImageRefs: hydrateImageRefs,
     onProcessingChanged: onProcessingChanged,
     broadcastPresence: broadcastPresence,
-    getSDK: getSDK,
+    adapter: adapter,
     getProjectList: getProjectList,
     getProjectCount: getProjectCount,
     getScheduleCount: getScheduleCount,
@@ -1010,7 +1055,7 @@ function createProjectContext(opts) {
     digestDmTurn: digestDmTurn,
     gateMemory: gateMemory,
     escapeRegex: escapeRegex,
-    getSDK: getSDK,
+    adapter: adapter,
     getHubSchedules: getHubSchedules,
     getProjectOwnerId: function () { return projectOwnerId; },
     _email: _email,
@@ -1040,6 +1085,94 @@ function createProjectContext(opts) {
     FS_MAX_SIZE: FS_MAX_SIZE,
   });
 
+  // --- MCP bridge handler for Codex (Track 2) ---
+  // Provides list_tools and call_tool operations over HTTP for mcp-bridge-server.js.
+  // Excludes local MCP servers since Codex manages those natively via Track 1.
+  function getMcpBridgeHandler() {
+    // Build set of local MCP server names to exclude (Codex handles these natively)
+    var localMcpNames = {};
+    try {
+      var mcpLocalModule = require("./mcp-local");
+      var localConfig = mcpLocalModule.readMergedServers();
+      var lcNames = Object.keys(localConfig);
+      for (var li = 0; li < lcNames.length; li++) {
+        localMcpNames[lcNames[li]] = true;
+      }
+    } catch (e) { /* no local MCP config */ }
+
+    return {
+      listTools: function () {
+        var tools = [];
+        var toJSONSchema;
+        try { toJSONSchema = require("zod").toJSONSchema; } catch (e) { /* fallback */ }
+
+        // Helper to extract tools from an SDK MCP server object
+        function extractServerTools(serverName, server) {
+          if (!server || !server.instance || !server.instance._registeredTools) return;
+          var toolNames = Object.keys(server.instance._registeredTools);
+          for (var j = 0; j < toolNames.length; j++) {
+            var toolDef = server.instance._registeredTools[toolNames[j]];
+            var inputSchema = { type: "object", properties: {} };
+            try {
+              if (toJSONSchema && toolDef.inputSchema) inputSchema = toJSONSchema(toolDef.inputSchema);
+            } catch (e) { /* fallback */ }
+            tools.push({
+              server: serverName,
+              name: toolNames[j],
+              description: toolDef.description || toolNames[j],
+              inputSchema: inputSchema,
+            });
+          }
+        }
+
+        // In-app MCP servers (debate, browser, email)
+        if (mcpServers) {
+          var inAppNames = Object.keys(mcpServers);
+          for (var i = 0; i < inAppNames.length; i++) {
+            extractServerTools(inAppNames[i], mcpServers[inAppNames[i]]);
+          }
+        }
+
+        // Remote MCP servers (extension-proxied only, skip local proxy servers)
+        var remoteServers = _mcp.getMcpServers();
+        if (remoteServers) {
+          var remoteNames = Object.keys(remoteServers);
+          for (var ri = 0; ri < remoteNames.length; ri++) {
+            // Skip servers that Codex manages natively via Track 1
+            if (localMcpNames[remoteNames[ri]]) continue;
+            extractServerTools(remoteNames[ri], remoteServers[remoteNames[ri]]);
+          }
+        }
+
+        return Promise.resolve(tools);
+      },
+      callTool: function (serverName, toolName, args) {
+        // Try in-app servers first
+        if (mcpServers && mcpServers[serverName]) {
+          var server = mcpServers[serverName];
+          if (server.instance && server.instance._registeredTools && server.instance._registeredTools[toolName]) {
+            var handler = server.instance._registeredTools[toolName].handler;
+            if (typeof handler === "function") {
+              return Promise.resolve(handler(args));
+            }
+          }
+        }
+        // Try remote/local proxy servers
+        var remoteServers = _mcp.getMcpServers();
+        if (remoteServers && remoteServers[serverName]) {
+          var rServer = remoteServers[serverName];
+          if (rServer.instance && rServer.instance._registeredTools && rServer.instance._registeredTools[toolName]) {
+            var rHandler = rServer.instance._registeredTools[toolName].handler;
+            if (typeof rHandler === "function") {
+              return Promise.resolve(rHandler(args));
+            }
+          }
+        }
+        return Promise.reject(new Error("Tool not found: " + serverName + "/" + toolName));
+      },
+    };
+  }
+
   // --- HTTP handler (delegated to project-http.js) ---
   var _http = attachHTTP({
     cwd: cwd,
@@ -1056,6 +1189,7 @@ function createProjectContext(opts) {
     sendExtensionCommandAny: sendExtensionCommandAny,
     _extToken: _extToken,
     _browserTabList: browserState._browserTabList,
+    getMcpBridgeHandler: getMcpBridgeHandler,
   });
   var handleHTTP = _http.handleHTTP;
 
@@ -1275,6 +1409,7 @@ function createProjectContext(opts) {
     handleMessage: handleMessage,
     handleDisconnection: handleDisconnection,
     handleHTTP: handleHTTP,
+    getMcpBridgeHandler: getMcpBridgeHandler,
     getStatus: getStatus,
     getSessionManager: function () { return sm; },
     getNotificationsModule: function () { return _notifications; },
@@ -1300,7 +1435,7 @@ function createProjectContext(opts) {
       sdk.warmup();
       sdk.startIdleReaper();
       // Migrate existing relay session titles to SDK format (one-time, async)
-      sm.migrateSessionTitles(getSDK, cwd);
+      sm.migrateSessionTitles(adapter, cwd);
     },
     destroy: function () {
       sdk.stopIdleReaper();