clay-server 2.31.0 → 2.32.0-beta.2

package/lib/project-sessions.js

@@ -13,7 +13,7 @@ var { execFileSync } = require("child_process");
  *   opts, usersModule, userPresence, matesModule, pushModule,
  *   getSessionForWs, getLinuxUserForSession, getOsUserInfoForWs,
  *   hydrateImageRefs, onProcessingChanged, broadcastPresence,
- *   getSDK, getProjectList, getProjectCount, getScheduleCount,
+ *   adapter, getProjectList, getProjectCount, getScheduleCount,
  *   moveScheduleToProject, moveAllSchedulesToProject, getHubSchedules,
  *   fetchVersion, isNewer, onCreateWorktree, IGNORED_DIRS,
  *   scheduleMessage, cancelScheduledMessage,
@@ -46,7 +46,7 @@ function attachSessions(ctx) {
   var hydrateImageRefs = ctx.hydrateImageRefs;
   var onProcessingChanged = ctx.onProcessingChanged;
   var broadcastPresence = ctx.broadcastPresence;
-  var getSDK = ctx.getSDK;
+  var adapter = ctx.adapter;
   var getProjectList = ctx.getProjectList;
   var getProjectCount = ctx.getProjectCount;
   var getScheduleCount = ctx.getScheduleCount;
@@ -96,6 +96,7 @@ function attachSessions(ctx) {
       var sessionOpts = {};
       if (ws._clayUser && usersModule.isMultiUser()) sessionOpts.ownerId = ws._clayUser.id;
       if (msg.sessionVisibility) sessionOpts.sessionVisibility = msg.sessionVisibility;
+      if (msg.vendor) sessionOpts.vendor = msg.vendor;
       var newSess = sm.createSession(sessionOpts, ws);
       ws._clayActiveSession = newSess.localId;
       // Apply project-level email defaults to new session
@@ -153,9 +154,7 @@ function attachSessions(ctx) {
       if (!msg.cliSessionId) return true;
       var cliSess = require("./cli-sessions");
       // Try SDK for title first, then fall back to manual parsing
-      var titlePromise = getSDK().then(function(sdkMod) {
-        return sdkMod.getSessionInfo(msg.cliSessionId, { dir: cwd });
-      }).then(function(info) {
+      var titlePromise = adapter.getSessionInfo(msg.cliSessionId, { dir: cwd }).then(function(info) {
         return (info && info.summary) ? info.summary.substring(0, 100) : null;
       }).catch(function() { return null; });
 
@@ -200,9 +199,7 @@ function attachSessions(ctx) {
         }
       } catch (e) {}
 
-      getSDK().then(function(sdkMod) {
-        return sdkMod.listSessions({ dir: cwd });
-      }).then(function(sdkSessions) {
+      adapter.listSessions({ dir: cwd }).then(function(sdkSessions) {
         var filtered = sdkSessions.filter(function(s) {
           return !relayIds[s.sessionId];
         }).map(function(s) {
@@ -287,11 +284,9 @@ function attachSessions(ctx) {
         sm.broadcastSessionList();
         // Sync title to SDK session
         if (s.cliSessionId) {
-          getSDK().then(function(sdkInst) {
-            sdkInst.renameSession(s.cliSessionId, s.title, { dir: cwd }).catch(function(e) {
-              console.error("[project] SDK renameSession failed:", e.message);
-            });
-          }).catch(function() {});
+          adapter.renameSession(s.cliSessionId, s.title, { dir: cwd }).catch(function(e) {
+            console.error("[project] SDK renameSession failed:", e.message);
+          });
         }
       }
       return true;
@@ -381,8 +376,9 @@ function attachSessions(ctx) {
 
     if (msg.type === "stop") {
       var session = getSessionForWs(ws);
-      if (session && session.abortController && session.isProcessing) {
-        session.abortController.abort();
+      if (session && session.isProcessing) {
+        session.taskStopRequested = true;
+        if (session.abortController) session.abortController.abort();
       }
       return true;
     }
@@ -521,32 +517,34 @@ function attachSessions(ctx) {
       return true;
     }
 
+    // Codex-specific settings (stored on sessionManager, passed to adapter via adapterOptions)
+    if (msg.type === "set_codex_approval") {
+      sm.codexApproval = msg.approval || "on-failure";
+      send({ type: "codex_config", approval: sm.codexApproval, sandbox: sm.codexSandbox || "workspace-write", webSearch: sm.codexWebSearch || "disabled" });
+      return true;
+    }
+    if (msg.type === "set_codex_sandbox") {
+      sm.codexSandbox = msg.sandbox || "workspace-write";
+      send({ type: "codex_config", approval: sm.codexApproval || "on-failure", sandbox: sm.codexSandbox, webSearch: sm.codexWebSearch || "disabled" });
+      return true;
+    }
+    if (msg.type === "set_codex_websearch") {
+      sm.codexWebSearch = msg.webSearch || "disabled";
+      send({ type: "codex_config", approval: sm.codexApproval || "on-failure", sandbox: sm.codexSandbox || "workspace-write", webSearch: sm.codexWebSearch });
+      return true;
+    }
+
     if (msg.type === "rewind_preview") {
       var session = getSessionForWs(ws);
       if (!session || !session.cliSessionId || !msg.uuid) return true;
-      // Reject preview requests while a rewind is executing
       if (session._rewindInProgress) return true;
 
       (async function () {
-        var result;
         try {
-          result = await sdk.getOrCreateRewindQuery(session);
-          var preview = await result.query.rewindFiles(msg.uuid, { dryRun: true });
-          var diffs = {};
-          var changedFiles = preview.filesChanged || [];
-          for (var f = 0; f < changedFiles.length; f++) {
-            try {
-              diffs[changedFiles[f]] = execFileSync(
-                "git", ["diff", "HEAD", "--", changedFiles[f]],
-                { cwd: cwd, encoding: "utf8", timeout: 5000 }
-              ) || "";
-            } catch (e) { diffs[changedFiles[f]] = ""; }
-          }
-          sendTo(ws, { type: "rewind_preview_result", preview: preview, diffs: diffs, uuid: msg.uuid });
+          var r = await sdk.rewindPreview(session, msg.uuid);
+          sendTo(ws, { type: "rewind_preview_result", preview: r.preview, diffs: r.diffs, uuid: msg.uuid, chatOnly: r.chatOnly || false });
         } catch (err) {
           sendTo(ws, { type: "rewind_error", text: "Failed to preview rewind: " + err.message });
-        } finally {
-          if (result && result.isTemp) result.cleanup();
         }
       })();
       return true;
@@ -564,12 +562,10 @@ function attachSessions(ctx) {
       var mode = msg.mode || "both";
 
       (async function () {
-        var result;
         try {
-          // File restoration (skip for chat-only mode)
+          // File restoration (delegated to adapter via sdk-bridge)
           if (mode !== "chat") {
-            result = await sdk.getOrCreateRewindQuery(session);
-            await result.query.rewindFiles(msg.uuid, { dryRun: false });
+            await sdk.rewindExecuteFiles(session, msg.uuid);
           }
 
           // Conversation rollback (skip for files-only mode)
@@ -582,6 +578,14 @@ function attachSessions(ctx) {
               }
             }
 
+            // Count turns to roll back BEFORE trimming local history
+            var turnsToRollBack = 0;
+            if (targetIdx >= 0) {
+              for (var ri = targetIdx; ri < session.messageUUIDs.length; ri++) {
+                if (session.messageUUIDs[ri].type === "user") turnsToRollBack++;
+              }
+            }
+
             if (targetIdx >= 0) {
               var trimTo = session.messageUUIDs[targetIdx].historyIndex;
               for (var k = trimTo - 1; k >= 0; k--) {
@@ -594,6 +598,15 @@ function attachSessions(ctx) {
               session.messageUUIDs = session.messageUUIDs.slice(0, targetIdx);
             }
 
+            // Notify adapter of conversation rollback (e.g. Codex thread/rollback)
+            if (turnsToRollBack > 0) {
+              try {
+                await sdk.rollbackConversation(session, turnsToRollBack);
+              } catch (rbErr) {
+                console.error("[project-sessions] conversation rollback failed:", rbErr.message || rbErr);
+              }
+            }
+
             var kept = session.messageUUIDs;
             session.lastRewindUuid = kept.length > 0 ? kept[kept.length - 1].uuid : null;
           }
@@ -622,7 +635,6 @@ function attachSessions(ctx) {
           sendTo(ws, { type: "rewind_error", text: "Rewind failed: " + err.message });
         } finally {
           session._rewindInProgress = false;
-          if (result && result.isTemp) result.cleanup();
         }
       })();
       return true;
@@ -634,22 +646,47 @@ function attachSessions(ctx) {
         sendTo(ws, { type: "error", text: "Cannot fork: no CLI session" });
         return true;
       }
-      var forkCliId = session.cliSessionId;
       var forkTitle = (session.title || "New Session") + " (fork)";
-      getSDK().then(function(sdkMod) {
-        return sdkMod.forkSession(forkCliId, {
-          upToMessageId: msg.uuid,
-          dir: cwd,
-        });
-      }).then(function(result) {
-        var cliSess = require("./cli-sessions");
-        return cliSess.readCliSessionHistory(cwd, result.sessionId).then(function(history) {
-          var forked = sm.resumeSession(result.sessionId, { history: history, title: forkTitle }, ws);
-          if (forked) {
-            ws._clayActiveSession = forked.localId;
-            sendTo(ws, { type: "fork_complete", sessionId: forked.localId });
+
+      sdk.forkSession(session, msg.uuid).then(function(result) {
+        if (result.useLocalHistory) {
+          // Copy local history up to the target UUID
+          var targetIdx = -1;
+          for (var fi = 0; fi < session.messageUUIDs.length; fi++) {
+            if (session.messageUUIDs[fi].uuid === msg.uuid) { targetIdx = fi; break; }
           }
-        });
+          var forkHistory = [];
+          if (targetIdx >= 0) {
+            var trimTo = session.messageUUIDs[targetIdx].historyIndex;
+            forkHistory = session.history.slice(0, trimTo);
+          } else {
+            forkHistory = session.history.slice();
+          }
+          var forked = sm.createSession({ vendor: session.vendor, ownerId: session.ownerId || null }, ws);
+          forked.cliSessionId = result.sessionId;
+          forked.title = forkTitle;
+          forked.history = forkHistory;
+          forked.messageUUIDs = [];
+          for (var hi = 0; hi < forkHistory.length; hi++) {
+            if (forkHistory[hi].type === "message_uuid") {
+              forked.messageUUIDs.push({ uuid: forkHistory[hi].uuid, type: forkHistory[hi].messageType, historyIndex: hi });
+            }
+          }
+          sm.saveSessionFile(forked);
+          sm.switchSession(forked.localId, ws, hydrateImageRefs);
+          sendTo(ws, { type: "fork_complete", sessionId: forked.localId });
+          sm.broadcastSessionList();
+        } else {
+          // Read history from CLI session files
+          var cliSess = require("./cli-sessions");
+          return cliSess.readCliSessionHistory(cwd, result.sessionId).then(function(history) {
+            var forked = sm.resumeSession(result.sessionId, { history: history, title: forkTitle }, ws);
+            if (forked) {
+              ws._clayActiveSession = forked.localId;
+              sendTo(ws, { type: "fork_complete", sessionId: forked.localId });
+            }
+          });
+        }
       }).catch(function(e) {
         sendTo(ws, { type: "error", text: "Fork failed: " + (e.message || e) });
       });

package/lib/project-user-message.js

@@ -23,7 +23,7 @@ var fs = require("fs");
  *   scheduleMessage, cancelScheduledMessage,
  *   loadContextSources, saveContextSources,
  *   digestDmTurn, gateMemory,
- *   getSDK             - lazy ESM loader returning Promise<sdk>
+ *   adapter            - YOKE adapter instance
  */
 function attachUserMessage(ctx) {
   var cwd = ctx.cwd;
@@ -69,7 +69,7 @@ function attachUserMessage(ctx) {
   var loadContextSources = ctx.loadContextSources;
   var saveContextSources = ctx.saveContextSources;
 
-  var getSDK = ctx.getSDK;
+  var adapter = ctx.adapter;
   var _email = ctx._email;
 
   // --------------- Sticky notes ---------------
@@ -292,6 +292,13 @@ function attachUserMessage(ctx) {
     var session = getSessionForWs(ws);
     if (!session) return true;
 
+    // Bind vendor to session on first message (if not already set)
+    if (!session.vendor && msg.vendor) {
+      session.vendor = msg.vendor;
+      sm.saveSessionFile(session);
+      sm.broadcastSessionList();
+    }
+
     // Backfill ownerId for legacy sessions restored without one (multi-user only)
     if (!session.ownerId && ws._clayUser && usersModule.isMultiUser()) {
       session.ownerId = ws._clayUser.id;
@@ -337,11 +344,9 @@ function attachUserMessage(ctx) {
       sm.broadcastSessionList();
       // Sync auto-title to SDK
       if (session.cliSessionId) {
-        getSDK().then(function(sdkMod) {
-          sdkMod.renameSession(session.cliSessionId, session.title, { dir: cwd }).catch(function(e) {
-            console.error("[project] SDK renameSession failed:", e.message);
-          });
-        }).catch(function() {});
+        adapter.renameSession(session.cliSessionId, session.title, { dir: cwd }).catch(function(e) {
+          console.error("[project] SDK renameSession failed:", e.message);
+        });
       }
     }
 

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);
@@ -718,6 +732,16 @@ function createProjectContext(opts) {
       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);
@@ -950,7 +974,7 @@ function createProjectContext(opts) {
     hydrateImageRefs: hydrateImageRefs,
     onProcessingChanged: onProcessingChanged,
     broadcastPresence: broadcastPresence,
-    getSDK: getSDK,
+    adapter: adapter,
     getProjectList: getProjectList,
     getProjectCount: getProjectCount,
     getScheduleCount: getScheduleCount,
@@ -1010,7 +1034,7 @@ function createProjectContext(opts) {
     digestDmTurn: digestDmTurn,
     gateMemory: gateMemory,
     escapeRegex: escapeRegex,
-    getSDK: getSDK,
+    adapter: adapter,
     getHubSchedules: getHubSchedules,
     getProjectOwnerId: function () { return projectOwnerId; },
     _email: _email,
@@ -1040,6 +1064,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 +1168,7 @@ function createProjectContext(opts) {
     sendExtensionCommandAny: sendExtensionCommandAny,
     _extToken: _extToken,
     _browserTabList: browserState._browserTabList,
+    getMcpBridgeHandler: getMcpBridgeHandler,
   });
   var handleHTTP = _http.handleHTTP;
 
@@ -1275,6 +1388,7 @@ function createProjectContext(opts) {
     handleMessage: handleMessage,
     handleDisconnection: handleDisconnection,
     handleHTTP: handleHTTP,
+    getMcpBridgeHandler: getMcpBridgeHandler,
     getStatus: getStatus,
     getSessionManager: function () { return sm; },
     getNotificationsModule: function () { return _notifications; },
@@ -1300,7 +1414,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();