clay-server 2.34.0-beta.1 → 2.34.0-beta.10

package/lib/public/modules/sidebar.js

@@ -94,12 +94,14 @@ export function initSidebar(_ctx) {
     }
   } catch (e) {}
 
-  ctx.newSessionBtn.addEventListener("click", function () {
-    if (ctx.ws && ctx.connected) {
-      ctx.ws.send(JSON.stringify({ type: "new_session" }));
-      closeSidebar();
-    }
-  });
+  if (ctx.newSessionBtn) {
+    ctx.newSessionBtn.addEventListener("click", function () {
+      if (ctx.ws && ctx.connected) {
+        ctx.ws.send(JSON.stringify({ type: "new_session" }));
+        closeSidebar();
+      }
+    });
+  }
 
   // --- Loop (Ralph wizard) tool-palette tile ---
   // The tile is rendered by tool-palette.js at the stable id

package/lib/public/modules/tools.js

@@ -1,7 +1,7 @@
 import { escapeHtml, copyToClipboard } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks } from './markdown.js';
-import { renderUnifiedDiff, renderSplitDiff, renderPatchDiff } from './diff.js';
+import { renderUnifiedDiff, renderSplitDiff, renderPatchDiff, reconstructPatchSources } from './diff.js';
 import { openFile } from './filebrowser.js';
 import { mateAvatarUrl } from './avatar.js';
 import { getChatLayout } from './theme.js';
@@ -799,7 +799,7 @@ function resolvePermissionIdentity(mateId, vendor) {
     }
   }
   // Project chat: use vendor name and avatar
-  var vendorAvatars = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png", gemini: "/gemini-avatar.png" };
+  var vendorAvatars = { claude: "/claude-code-avatar.png", codex: "/codex-avatar.png" };
   var vendorName = (vendor && VENDOR_NAMES[vendor]) || VENDOR_NAMES.claude;
   return {
     name: vendorName,
@@ -1587,14 +1587,32 @@ export function stopThinking(duration) {
   } else {
     currentThinking.el.querySelector(".thinking-duration").textContent = " " + secs.toFixed(1) + "s";
   }
-  // In mate mode: hide sparkle activity, show compact expandable thinking header
+  // If no thinking text was streamed (e.g. Codex reasoning items arrive
+  // with encrypted/hidden content, or Claude without extended-thinking),
+  // the expand affordance is misleading because there's nothing inside.
+  // Strip the chevron and the click handler so the header reads as a
+  // plain label.
+  var hasContent = !!(currentThinking.fullText && currentThinking.fullText.length > 0);
+  if (!hasContent) {
+    currentThinking.el.classList.add("empty");
+    var chev = currentThinking.el.querySelector(".thinking-chevron");
+    if (chev) chev.style.display = "none";
+    var hdr = currentThinking.el.querySelector(".thinking-header");
+    if (hdr) {
+      hdr.style.cursor = "default";
+      // Replace click listener by cloning the node (cheapest way to strip listeners).
+      var clone = hdr.cloneNode(true);
+      hdr.parentNode.replaceChild(clone, hdr);
+    }
+  }
+  // In mate mode: hide sparkle activity, show compact thinking header.
   if (currentThinking.el.classList.contains("mate-thinking")) {
     var actRow = currentThinking.el.querySelector(".mate-thinking-activity");
     if (actRow) actRow.style.display = "none";
     var header = currentThinking.el.querySelector(".thinking-header");
     if (header) {
       header.style.display = "";
-      header.style.cursor = "pointer";
+      header.style.cursor = hasContent ? "pointer" : "default";
     }
   }
   currentThinking = null;
@@ -1722,12 +1740,12 @@ export function updateToolExecuting(id, name, input) {
   ctx.scrollToBottom();
 }
 
-function renderEditDiff(oldStr, newStr, filePath) {
+// Shared chrome (filename header + unified/split toggle) for diff renderings.
+// makeUnified and makeSplit are factories that return a fresh body element.
+function buildDiffChrome(filePath, linkOldStr, linkNewStr, makeUnified, makeSplit) {
   var wrapper = document.createElement("div");
   wrapper.className = "edit-diff";
-  var lang = getLanguageFromPath(filePath);
 
-  // Header with file path and split toggle (desktop only)
   var header = document.createElement("div");
   header.className = "edit-diff-header";
 
@@ -1740,7 +1758,7 @@ function renderEditDiff(oldStr, newStr, filePath) {
         e.stopPropagation();
         openFile(fp, { diff: { oldStr: os || "", newStr: ns || "" } });
       });
-    })(filePath, oldStr, newStr);
+    })(filePath, linkOldStr, linkNewStr);
   }
   header.appendChild(pathSpan);
 
@@ -1766,7 +1784,7 @@ function renderEditDiff(oldStr, newStr, filePath) {
 
   wrapper.appendChild(header);
 
-  var currentBody = renderUnifiedDiff(oldStr, newStr, lang);
+  var currentBody = makeUnified();
   wrapper.appendChild(currentBody);
 
   unifiedBtn.addEventListener("click", function (e) {
@@ -1776,7 +1794,7 @@ function renderEditDiff(oldStr, newStr, filePath) {
     unifiedBtn.classList.add("active");
     splitBtn.classList.remove("active");
     wrapper.removeChild(currentBody);
-    currentBody = renderUnifiedDiff(oldStr, newStr, lang);
+    currentBody = makeUnified();
     wrapper.appendChild(currentBody);
     refreshIcons();
   });
@@ -1788,7 +1806,7 @@ function renderEditDiff(oldStr, newStr, filePath) {
     splitBtn.classList.add("active");
     unifiedBtn.classList.remove("active");
     wrapper.removeChild(currentBody);
-    currentBody = renderSplitDiff(oldStr, newStr, lang);
+    currentBody = makeSplit();
     wrapper.appendChild(currentBody);
     refreshIcons();
   });
@@ -1796,6 +1814,29 @@ function renderEditDiff(oldStr, newStr, filePath) {
   return wrapper;
 }
 
+function renderEditDiff(oldStr, newStr, filePath) {
+  var lang = getLanguageFromPath(filePath);
+  return buildDiffChrome(
+    filePath,
+    oldStr,
+    newStr,
+    function () { return renderUnifiedDiff(oldStr, newStr, lang); },
+    function () { return renderSplitDiff(oldStr, newStr, lang); }
+  );
+}
+
+function renderPatchDiffBlock(patchText, filePath) {
+  var lang = getLanguageFromPath(filePath);
+  var sources = reconstructPatchSources(patchText);
+  return buildDiffChrome(
+    filePath,
+    sources.oldStr,
+    sources.newStr,
+    function () { return renderPatchDiff(patchText, lang); },
+    function () { return renderSplitDiff(sources.oldStr, sources.newStr, lang); }
+  );
+}
+
 function isDiffContent(text) {
   var lines = text.split("\n");
   var hasHunkHeader = false;
@@ -1903,8 +1944,12 @@ export function updateToolResult(id, content, isError, images) {
   if (hasEditDiff) {
     resultBlock.appendChild(renderEditDiff(tool.input.old_string, tool.input.new_string, tool.input.file_path));
   } else if (!isError && isDiffContent(displayContent)) {
-    var patchLang = tool.input && tool.input.file_path ? getLanguageFromPath(tool.input.file_path) : null;
-    resultBlock.appendChild(renderPatchDiff(displayContent, patchLang));
+    var patchFilePath = tool.input && tool.input.file_path ? tool.input.file_path : null;
+    if (patchFilePath) {
+      resultBlock.appendChild(renderPatchDiffBlock(displayContent, patchFilePath));
+    } else {
+      resultBlock.appendChild(renderPatchDiff(displayContent, null));
+    }
   } else if (!isError && tool.name === "Read" && tool.input && tool.input.file_path && isImagePath(tool.input.file_path)) {
     // Image file: show inline preview
     var imgWrap = document.createElement("div");

package/lib/public/sw.js

@@ -1,4 +1,4 @@
-var CACHE_NAME = "clay-offline-v2";
+var CACHE_NAME = "clay-offline-v3";
 
 self.addEventListener("install", function (event) {
   event.waitUntil(self.skipWaiting());

package/lib/sdk-bridge.js

@@ -1175,17 +1175,21 @@ function createSDKBridge(opts) {
 
     if (dangerouslySkipPermissions) {
       claudeOpts.allowDangerouslySkipPermissions = true;
+      claudeOpts.permissionMode = "bypassPermissions";
+    } else {
+      var globalMode = sm.currentPermissionMode || "default";
+      var effectiveDefault;
+      if (globalMode === "bypassPermissions") effectiveDefault = "bypassPermissions";
+      else if (session.acceptEditsAfterStart) effectiveDefault = "acceptEdits";
+      else effectiveDefault = globalMode;
+      var modeToApply = session._loopPermissionMode || effectiveDefault;
+      if (modeToApply && modeToApply !== "default") {
+        claudeOpts.permissionMode = modeToApply;
+      }
     }
-    var globalMode = sm.currentPermissionMode || "default";
-    var effectiveDefault;
-    if (globalMode === "bypassPermissions") effectiveDefault = "bypassPermissions";
-    else if (session.acceptEditsAfterStart) effectiveDefault = "acceptEdits";
-    else effectiveDefault = globalMode;
-    var modeToApply = session._loopPermissionMode || effectiveDefault;
+    // Clear one-shot acceptEditsAfterStart regardless of which branch ran above,
+    // so the flag does not linger into subsequent turns.
     if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
-    if (modeToApply && modeToApply !== "default") {
-      claudeOpts.permissionMode = modeToApply;
-    }
     if (session.cliSessionId && session.lastRewindUuid) {
       claudeOpts.resumeSessionAt = session.lastRewindUuid;
       delete session.lastRewindUuid;
@@ -1206,21 +1210,30 @@ function createSDKBridge(opts) {
       }
     }
 
-    // Use vendor-specific model: if session vendor differs from default, use that vendor's default model
+    // Pick a model that belongs to the session's vendor. sm.currentModel is
+    // shared project-wide, so a Codex session that last set it to
+    // "gpt-5.4-mini" would otherwise leak into a Claude session in the same
+    // project (or in another session that switches vendor to claude) and
+    // Claude would reject the unknown model. We validate against the
+    // session vendor's model list regardless of which vendor happens to be
+    // the project's default adapter.
     var queryModel = ls.model || sm.currentModel || undefined;
-    if (session.vendor && session.vendor !== (adapter && adapter.vendor)) {
-      var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[session.vendor]) || [];
+    var sessionVendor = session.vendor || (adapter && adapter.vendor) || null;
+    if (sessionVendor) {
+      var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[sessionVendor]) || [];
       if (vendorModels.length > 0 && queryModel && vendorModels.indexOf(queryModel) === -1) {
         queryModel = vendorModels[0];
       }
     }
 
     var codexConfig = getCodexConfig(sm);
+    var mergedMcpServers = mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined;
     var queryOpts = {
       cwd: cwd,
       model: queryModel,
       effort: ls.effort || sm.currentEffort || undefined,
-      toolServers: mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined,
+      toolServers: mergedMcpServers,
+      toolServerDescriptors: extractMcpDescriptors(mergedMcpServers) || undefined,
       resumeSessionId: session.cliSessionId || undefined,
       abortController: linuxUser ? undefined : session.abortController,
       canUseTool: function(toolName, input, toolOpts) {
@@ -1229,6 +1242,9 @@ function createSDKBridge(opts) {
       onElicitation: function(request, elicitOpts) {
         return handleElicitation(session, request, elicitOpts);
       },
+      callMcpTool: function(serverName, toolName, args) {
+        return callMcpToolHandler(mergedMcpServers, serverName, toolName, args);
+      },
       adapterOptions: {
         CLAUDE: claudeOpts,
         CODEX: {
@@ -1439,22 +1455,14 @@ function createSDKBridge(opts) {
       }
     }
 
-    // Initialize other adapters in parallel (skip if already have models cached)
+    // Non-default adapters are NOT eagerly initialized here. Doing so used
+    // to spawn a CodexAppServer and an mcp-bridge child per project even
+    // when the user never touched that vendor. Lazy paths cover the gap:
+    //   - get_vendor_models (project.js) inits a vendor when the user
+    //     opens its model picker.
+    //   - ensureVendorReady (this file) inits a vendor when a session
+    //     actually issues a query with it.
     sm.modelsByVendor = sm.modelsByVendor || {};
-    var otherVendors = Object.keys(adapters).filter(function(v) {
-      return v !== defaultVendor && !sm.modelsByVendor[v];
-    });
-    for (var i = 0; i < otherVendors.length; i++) {
-      (function(v) {
-        adapters[v].init({ cwd: cwd, clayPort: clayPort, clayTls: clayTls, clayAuthToken: clayAuthToken, slug: slug }).then(function(r) {
-          sm.modelsByVendor[v] = r.models || [];
-          sm.capabilitiesByVendor[v] = r.capabilities || {};
-          if (r.slashCommands) sm.setSlashCommandsForVendor(v, r.slashCommands);
-        }).catch(function(e) {
-          console.error("[sdk-bridge] warmup: " + v + " init failed:", e.message || e);
-        });
-      })(otherVendors[i]);
-    }
 
     // Detect installed vendors per-user (binary existence check)
     sm.installedVendors = detectInstalledVendors(linuxUser);

package/lib/sdk-message-processor.js

@@ -370,12 +370,23 @@ function attachMessageProcessor(ctx) {
       session.sentToolResults = {};
       session.pendingPermissions = {};
       session.pendingElicitations = {};
-      // Record ask_user_answered for any leftover pending questions so replay pairs correctly
+      // Record ask_user_answered for any leftover pending questions so replay pairs correctly.
+      // EXCEPTION: "mcp" mode entries are stateless — the tool returned immediately and the
+      // turn is expected to end while the card is still awaiting the user's answer. Those
+      // entries must survive across turns so the eventual ask_user_response can inject the
+      // answer as the next user message. Only blocking modes (Claude canUseTool) get closed.
       var leftoverAskIds = Object.keys(session.pendingAskUser);
+      var keptAskUser = {};
       for (var lai = 0; lai < leftoverAskIds.length; lai++) {
-        sendAndRecord(session, { type: "ask_user_answered", toolId: leftoverAskIds[lai] });
+        var lid = leftoverAskIds[lai];
+        var lentry = session.pendingAskUser[lid];
+        if (lentry && lentry.mode === "mcp") {
+          keptAskUser[lid] = lentry;
+          continue;
+        }
+        sendAndRecord(session, { type: "ask_user_answered", toolId: lid });
       }
-      session.pendingAskUser = {};
+      session.pendingAskUser = keptAskUser;
       session.activeTaskToolIds = {};
       session.taskIdMap = {};
       // Only clear rateLimitResetsAt on genuine success (non-zero cost).

package/lib/server.js

@@ -459,75 +459,6 @@ function createServer(opts) {
       return;
     }
 
-    // --- Global MCP bridge endpoint (localhost only) ---
-    // Used by Codex mcp-bridge-server.js which can't know the active project slug.
-    // Aggregates MCP tools from all project contexts.
-    if (req.method === "POST" && fullUrl === "/api/mcp-bridge") {
-      var mcpRemoteAddr = req.socket.remoteAddress || "";
-      var mcpIsLocal = mcpRemoteAddr === "127.0.0.1" || mcpRemoteAddr === "::1" || mcpRemoteAddr === "::ffff:127.0.0.1";
-      if (!mcpIsLocal) {
-        res.writeHead(403, { "Content-Type": "application/json" });
-        res.end('{"error":"Forbidden"}');
-        return;
-      }
-      var parseJsonBody = function(r) {
-        return new Promise(function(resolve, reject) {
-          var chunks = [];
-          r.on("data", function(c) { chunks.push(c); });
-          r.on("end", function() {
-            try { resolve(JSON.parse(Buffer.concat(chunks).toString("utf8"))); }
-            catch(e) { reject(e); }
-          });
-        });
-      };
-      parseJsonBody(req).then(function(body) {
-        // Find the first project context that has a MCP bridge handler
-        var handler = null;
-        projects.forEach(function(ctx) {
-          if (handler) return;
-          if (ctx.getMcpBridgeHandler) {
-            var h = ctx.getMcpBridgeHandler();
-            if (h) handler = h;
-          }
-        });
-        if (!handler) {
-          res.writeHead(500, { "Content-Type": "application/json" });
-          res.end('{"error":"No MCP bridge handler available"}');
-          return;
-        }
-        if (body.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] global 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 }));
-          });
-        } else if (body.action === "call_tool") {
-          console.log("[mcp-bridge-http] global call_tool:", body.server + "/" + body.tool);
-          handler.callTool(body.server, body.tool, body.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 }));
-          });
-        } else {
-          res.writeHead(400, { "Content-Type": "application/json" });
-          res.end('{"error":"Unknown action"}');
-        }
-      }).catch(function() {
-        res.writeHead(400, { "Content-Type": "application/json" });
-        res.end('{"error":"Invalid JSON"}');
-      });
-      return;
-    }
-
     // --- Skills routes (delegated to server-skills) ---
     if (skills.handleRequest(req, res, fullUrl)) return;
 
@@ -1090,7 +1021,11 @@ function createServer(opts) {
       getProject: function (s) { return projects.get(s) || null; },
     });
     projects.set(slug, ctx);
-    ctx.warmup();
+    // ctx.warmup() is now deferred to the first websocket connection into
+    // this project (see project-connection.js handleConnection). Warming
+    // every project at startup spawned a CodexAppServer and an mcp-bridge
+    // child for each one, which cost 30+ processes on daemons with many
+    // projects/mates even though the user typically only opens one.
     // Schedule project registry refresh for all mates when a non-mate project is added
     if (!extra.isMate) scheduleRegistryRefresh();
     return true;
@@ -1126,8 +1061,13 @@ function createServer(opts) {
     var ctx = projects.get(slug);
     if (!ctx) return false;
     var wasMate = ctx.getStatus().isMate;
-    ctx.destroy();
+    var shutdownResult = ctx.destroy();
     projects.delete(slug);
+    if (shutdownResult && typeof shutdownResult.catch === "function") {
+      shutdownResult.catch(function(err) {
+        console.error("[server] Project destroy failed for " + slug + ":", err && err.message ? err.message : err);
+      });
+    }
     if (!wasMate) scheduleRegistryRefresh();
     return true;
   }
@@ -1289,12 +1229,26 @@ function createServer(opts) {
     });
   }
 
+  function forEachProject(fn) {
+    projects.forEach(function (ctx, slug) {
+      fn(ctx, slug);
+    });
+  }
+
   function destroyAll() {
+    var shutdowns = [];
     projects.forEach(function (ctx, slug) {
       console.log("[server] Destroying project:", slug);
-      ctx.destroy();
+      var result = ctx.destroy();
+      if (result && typeof result.then === "function") {
+        shutdowns.push(result.catch(function(err) {
+          console.error("[server] Project destroy failed for " + slug + ":", err && err.message ? err.message : err);
+          return false;
+        }));
+      }
     });
     projects.clear();
+    return Promise.all(shutdowns);
   }
 
   // --- Periodic cleanup of old chat images ---
@@ -1358,6 +1312,8 @@ function createServer(opts) {
     setRecovery: auth.setRecovery,
     clearRecovery: auth.clearRecovery,
     broadcastAll: broadcastAll,
+    forEachProject: forEachProject,
+    destroyProject: removeProject,
     destroyAll: destroyAll,
   };
 }