clay-server 2.34.0-beta.2 → 2.34.0-beta.4

package/lib/public/modules/mate-datastore-ui.js

@@ -7,29 +7,85 @@ var panelEl = null;
 var tableListEl = null;
 var tableNameEl = null;
 var tableSchemaEl = null;
-var queryInputEl = null;
-var paramsInputEl = null;
 var resultEl = null;
 var statusEl = null;
 var dataBtnEl = null;
-var conversationsEl = null;
-var memoryEl = null;
-var knowledgeEl = null;
+var mainColumnEl = null;
 var currentTables = [];
 var currentTable = null;
 var panelOpen = false;
+var routingToScheduler = false;
 
 function sendWs(msg) {
   var ws = wsGetter ? wsGetter() : getWs();
   if (ws && ws.readyState === 1) ws.send(JSON.stringify(msg));
 }
 
+function quoteIdentifier(name) {
+  return '"' + String(name || "").replace(/"/g, '""') + '"';
+}
+
+function ensurePanel() {
+  if (panelEl) return;
+  mainColumnEl = document.getElementById("main-column");
+  if (!mainColumnEl) return;
+
+  panelEl = document.createElement("div");
+  panelEl.id = "mate-datastore-panel";
+  panelEl.className = "hidden";
+
+  panelEl.innerHTML =
+    '<div class="scheduler-top-bar mate-datastore-top-bar">' +
+      '<span class="scheduler-top-title mate-datastore-top-title"><i data-lucide="database"></i>Data</span>' +
+      '<div class="mate-datastore-top-actions">' +
+        '<button id="mate-db-refresh-btn" class="scheduler-close-btn" type="button" title="Refresh tables"><i data-lucide="refresh-cw"></i></button>' +
+        '<button id="mate-db-back-btn" class="scheduler-close-btn" type="button" title="Close"><i data-lucide="x"></i></button>' +
+      '</div>' +
+    '</div>' +
+    '<div class="mate-db-status" id="mate-db-status"></div>' +
+    '<div class="mate-db-layout">' +
+      '<div class="mate-db-table-column">' +
+        '<div class="mate-db-section-title">Objects</div>' +
+        '<div id="mate-db-table-list" class="mate-db-table-list"></div>' +
+      '</div>' +
+      '<div class="mate-db-detail">' +
+        '<div class="mate-db-section-title" id="mate-db-table-name">No table selected</div>' +
+        '<pre id="mate-db-table-schema" class="mate-db-table-schema"></pre>' +
+        '<div class="mate-db-section-title">Rows</div>' +
+        '<pre id="mate-db-result" class="mate-db-result"></pre>' +
+      '</div>' +
+    '</div>';
+
+  mainColumnEl.appendChild(panelEl);
+  tableListEl = document.getElementById("mate-db-table-list");
+  tableNameEl = document.getElementById("mate-db-table-name");
+  tableSchemaEl = document.getElementById("mate-db-table-schema");
+  resultEl = document.getElementById("mate-db-result");
+  statusEl = document.getElementById("mate-db-status");
+
+  var refreshBtn = document.getElementById("mate-db-refresh-btn");
+  var backBtn = document.getElementById("mate-db-back-btn");
+
+  if (refreshBtn) {
+    refreshBtn.addEventListener("click", function () {
+      requestTables();
+    });
+  }
+
+  if (backBtn) {
+    backBtn.addEventListener("click", function () {
+      setSectionVisibility(false);
+    });
+  }
+
+  refreshIcons();
+}
+
 function setSectionVisibility(open) {
+  ensurePanel();
   panelOpen = open;
   if (panelEl) panelEl.classList.toggle("hidden", !open);
-  if (conversationsEl) conversationsEl.classList.toggle("hidden", open);
-  if (memoryEl) memoryEl.classList.toggle("hidden", true);
-  if (knowledgeEl) knowledgeEl.classList.toggle("hidden", true);
+  if (mainColumnEl) mainColumnEl.classList.toggle("mate-datastore-open", open);
   if (dataBtnEl) dataBtnEl.classList.toggle("active", open);
   refreshIcons();
 }
@@ -49,6 +105,21 @@ function renderResult(payload) {
   resultEl.textContent = JSON.stringify(payload, null, 2);
 }
 
+function formatColumns(columns) {
+  var list = Array.isArray(columns) ? columns : [];
+  if (!list.length) return "No column information available.";
+  var lines = [];
+  for (var i = 0; i < list.length; i++) {
+    var col = list[i] || {};
+    var line = (col.name || "?") + " " + (col.type || "");
+    if (col.pk) line += " PRIMARY KEY";
+    if (col.notnull) line += " NOT NULL";
+    if (typeof col.dflt_value !== "undefined" && col.dflt_value !== null) line += " DEFAULT " + col.dflt_value;
+    lines.push(line.trim());
+  }
+  return lines.join("\n");
+}
+
 function renderTableList(objects) {
   currentTables = objects || [];
   if (!tableListEl) return;
@@ -101,94 +172,43 @@ function selectTable(tableName) {
   if (obj.type !== "table" && obj.type !== "view") {
     renderStatus("Selected " + (obj.type || "object") + " " + tableName + ".", "ok");
     if (tableNameEl) tableNameEl.textContent = tableName;
-    if (tableSchemaEl) tableSchemaEl.textContent = obj.sql || "";
+    if (tableSchemaEl) tableSchemaEl.textContent = (obj.type || "object") + ": " + tableName;
     renderResult(obj);
     return;
   }
   renderStatus("Loading " + tableName + "...", "info");
   sendWs({ type: "mate_db_describe", table: tableName });
-  if (queryInputEl) queryInputEl.value = 'SELECT * FROM "' + tableName.replace(/"/g, '""') + '" LIMIT 50;';
-}
-
-function parseParams() {
-  if (!paramsInputEl) return [];
-  var text = paramsInputEl.value.trim();
-  if (!text) return [];
-  try {
-    var parsed = JSON.parse(text);
-    if (Array.isArray(parsed)) return parsed;
-    renderStatus("Parameters must be a JSON array.", "error");
-  } catch (e) {
-    renderStatus("Parameters must be valid JSON.", "error");
-  }
-  return null;
-}
-
-function sendQueryMessage(type) {
-  var sql = queryInputEl ? queryInputEl.value : "";
-  var params = parseParams();
-  if (params === null) return;
-  if (!sql || !sql.trim()) {
-    renderStatus("Enter SQL before running it.", "error");
-    return;
-  }
-  sendWs({ type: type, sql: sql, params: params });
+  sendWs({ type: "mate_db_query", sql: "SELECT * FROM " + quoteIdentifier(tableName) + " LIMIT 100", params: [] });
 }
 
 export function initMateDatastoreUI(getWsFn) {
   wsGetter = getWsFn;
-  panelEl = document.getElementById("mate-sidebar-datastore");
-  tableListEl = document.getElementById("mate-db-table-list");
-  tableNameEl = document.getElementById("mate-db-table-name");
-  tableSchemaEl = document.getElementById("mate-db-table-schema");
-  queryInputEl = document.getElementById("mate-db-query");
-  paramsInputEl = document.getElementById("mate-db-params");
-  resultEl = document.getElementById("mate-db-result");
-  statusEl = document.getElementById("mate-db-status");
   dataBtnEl = document.getElementById("mate-data-btn");
-  conversationsEl = document.getElementById("mate-sidebar-conversations");
-  memoryEl = document.getElementById("mate-sidebar-memory");
-  knowledgeEl = document.getElementById("mate-sidebar-knowledge");
-
-  var refreshBtn = document.getElementById("mate-db-refresh-btn");
-  var queryBtn = document.getElementById("mate-db-query-btn");
-  var execBtn = document.getElementById("mate-db-exec-btn");
-  var backBtn = document.getElementById("mate-db-back-btn");
-
-  if (dataBtnEl) {
-    dataBtnEl.addEventListener("click", function () {
-      if (panelOpen) {
-        setSectionVisibility(false);
-      } else {
-        setSectionVisibility(true);
-        requestTables();
-      }
-    });
-  }
+  if (!dataBtnEl) return;
 
-  if (refreshBtn) {
-    refreshBtn.addEventListener("click", function () {
+  dataBtnEl.addEventListener("click", function () {
+    if (panelOpen) {
+      setSectionVisibility(false);
+    } else {
+      setSectionVisibility(true);
       requestTables();
-    });
-  }
-
-  if (queryBtn) {
-    queryBtn.addEventListener("click", function () {
-      sendQueryMessage("mate_db_query");
-    });
-  }
-
-  if (execBtn) {
-    execBtn.addEventListener("click", function () {
-      sendQueryMessage("mate_db_exec");
-    });
-  }
+    }
+  });
 
-  if (backBtn) {
-    backBtn.addEventListener("click", function () {
-      setSectionVisibility(false);
-    });
-  }
+  document.addEventListener("click", function (e) {
+    var btn = e.target && e.target.closest ? e.target.closest("#scheduler-btn, #mate-scheduler-btn") : null;
+    if (!btn || !panelOpen || routingToScheduler) return;
+    e.preventDefault();
+    e.stopPropagation();
+    if (typeof e.stopImmediatePropagation === "function") e.stopImmediatePropagation();
+    routingToScheduler = true;
+    setSectionVisibility(false);
+    setTimeout(function () {
+      var schedulerBtn = document.getElementById("scheduler-btn");
+      if (schedulerBtn) schedulerBtn.click();
+      routingToScheduler = false;
+    }, 0);
+  }, true);
 
   setSectionVisibility(false);
 }
@@ -234,8 +254,7 @@ export function handleMateDatastoreDescribeResult(msg) {
   }
   renderStatus(msg.warning || ("Described " + (msg.table || "table") + "."), msg.warning ? "warn" : "ok");
   if (tableNameEl) tableNameEl.textContent = msg.table || "Table";
-  if (tableSchemaEl) tableSchemaEl.textContent = msg.createSql || "";
-  renderResult(msg);
+  if (tableSchemaEl) tableSchemaEl.textContent = formatColumns(msg.columns);
 }
 
 export function handleMateDatastoreQueryResult(msg) {
@@ -244,19 +263,10 @@ export function handleMateDatastoreQueryResult(msg) {
     renderResult(msg);
     return;
   }
-  renderStatus(msg.warning || ("Returned " + (msg.rowCount || 0) + " row(s)."), msg.warning ? "warn" : "ok");
-  renderResult(msg);
-}
-
-export function handleMateDatastoreExecResult(msg) {
-  if (msg.ok === false) {
-    renderStatus(msg.message || "Execution failed.", "error");
-    renderResult(msg);
-    return;
-  }
-  renderStatus(msg.warning || ("Applied " + (msg.changes || 0) + " change(s)."), msg.warning ? "warn" : "ok");
-  renderResult(msg);
-  requestTables();
+  var status = "Showing " + (msg.rows ? msg.rows.length : 0) + " row(s).";
+  if (msg.truncated) status = status.replace(".", " (truncated).");
+  renderStatus(msg.warning || status, msg.warning ? "warn" : "ok");
+  renderResult(msg.rows || []);
 }
 
 export function handleMateDatastoreError(msg) {

package/lib/public/modules/mate-sidebar.js

@@ -225,15 +225,6 @@ export function showMateSidebar(mateId, mateData) {
     if (sd.communicationStyle && sd.communicationStyle.length > 0) {
       seedTooltip.appendChild(makeSeedTags("Style", sd.communicationStyle.map(function (s) { return s.replace(/_/g, " "); })));
     }
-    if (sd.autonomy) {
-      var autonomyLabels = {
-        always_ask: "Ask me everything",
-        minor_stuff_ok: "Small stuff is fine",
-        mostly_autonomous: "Mostly free",
-        fully_autonomous: "Full freedom",
-      };
-      seedTooltip.appendChild(makeSeedRow("Autonomy", autonomyLabels[sd.autonomy] || sd.autonomy.replace(/_/g, " ")));
-    }
   }
 
   // Clear session list

package/lib/public/modules/mate-wizard.js

@@ -6,7 +6,7 @@ var mateWizardData = {
   relationship: null,
   activity: [],
   communicationStyle: [],
-  autonomy: "minor_stuff_ok",
+  vendor: "claude",
 };
 
 var _sendWs = null;
@@ -85,19 +85,19 @@ export function initMateWizard(sendWs, onMateCreated) {
     })(styleCards[i]);
   }
 
-  // Step 4: Autonomy button clicks
-  var autonomyBtns = document.querySelectorAll("#mate-wizard .mate-autonomy-btn");
-  for (var i = 0; i < autonomyBtns.length; i++) {
+  // Step 4: Vendor button clicks
+  var vendorBtns = document.querySelectorAll("#mate-wizard .mate-vendor-option-btn");
+  for (var i = 0; i < vendorBtns.length; i++) {
     (function (btn) {
       btn.addEventListener("click", function () {
-        var allBtns = document.querySelectorAll("#mate-wizard .mate-autonomy-btn");
+        var allBtns = document.querySelectorAll("#mate-wizard .mate-vendor-option-btn");
         for (var j = 0; j < allBtns.length; j++) {
           allBtns[j].classList.remove("active");
         }
         btn.classList.add("active");
-        mateWizardData.autonomy = btn.dataset.value;
+        mateWizardData.vendor = btn.dataset.value;
       });
-    })(autonomyBtns[i]);
+    })(vendorBtns[i]);
   }
 }
 
@@ -107,7 +107,7 @@ export function openMateWizard() {
     relationship: null,
     activity: [],
     communicationStyle: [],
-    autonomy: "minor_stuff_ok",
+    vendor: "claude",
   };
 
   // Reset UI
@@ -136,12 +136,12 @@ export function openMateWizard() {
     styleCards[i].classList.remove("selected");
   }
 
-  // Reset autonomy
-  var autonomyBtns = el.querySelectorAll(".mate-autonomy-btn");
-  for (var i = 0; i < autonomyBtns.length; i++) {
-    autonomyBtns[i].classList.remove("active");
-    if (autonomyBtns[i].dataset.value === "minor_stuff_ok") {
-      autonomyBtns[i].classList.add("active");
+  // Reset vendor
+  var vendorBtns = el.querySelectorAll(".mate-vendor-option-btn");
+  for (var i = 0; i < vendorBtns.length; i++) {
+    vendorBtns[i].classList.remove("active");
+    if (vendorBtns[i].dataset.value === "claude") {
+      vendorBtns[i].classList.add("active");
     }
   }
 
@@ -220,7 +220,7 @@ function collectMateWizardData() {
     mateWizardData.communicationStyle.push(selectedStyles[i].dataset.value);
   }
 
-  // Autonomy (already set via button clicks)
+  // Vendor (already set via button clicks)
 }
 
 function mateWizardNext() {

package/lib/public/modules/tools.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;

package/lib/sdk-bridge.js

@@ -1183,11 +1183,13 @@ function createSDKBridge(opts) {
       else if (session.acceptEditsAfterStart) effectiveDefault = "acceptEdits";
       else effectiveDefault = globalMode;
       var modeToApply = session._loopPermissionMode || effectiveDefault;
-      if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
       if (modeToApply && modeToApply !== "default") {
         claudeOpts.permissionMode = modeToApply;
       }
     }
+    // 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 (session.cliSessionId && session.lastRewindUuid) {
       claudeOpts.resumeSessionAt = session.lastRewindUuid;
       delete session.lastRewindUuid;
@@ -1208,10 +1210,17 @@ 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];
       }
@@ -1441,22 +1450,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,
   };
 }