clay-server 2.33.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';
@@ -20,6 +20,14 @@ var todoItems = [];
 var todoWidgetEl = null;
 var todoWidgetVisible = true; // whether in-chat widget is in viewport
 var todoObserver = null;
+var todoMeta = {
+  variant: "tasks",
+  title: "Tasks",
+  icon: "list-checks",
+  showProgress: true,
+  showCompletedCount: true,
+  stickyEnabled: true,
+};
 
 // --- Tool tracking ---
 var tools = {};
@@ -791,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,
@@ -1262,6 +1270,7 @@ function todoStatusIcon(status) {
 
 export function handleTodoWrite(input) {
   if (!input || !Array.isArray(input.todos)) return;
+  todoMeta = normalizeTodoMeta(input.meta);
   todoItems = input.todos.map(function (t, i) {
     return {
       id: t.id || String(i + 1),
@@ -1275,6 +1284,7 @@ export function handleTodoWrite(input) {
 
 export function handleTaskCreate(input) {
   if (!input) return;
+  todoMeta = normalizeTodoMeta();
   var id = String(todoItems.length + 1);
   todoItems.push({
     id: id,
@@ -1287,6 +1297,7 @@ export function handleTaskCreate(input) {
 
 export function handleTaskUpdate(input) {
   if (!input || !input.taskId) return;
+  todoMeta = normalizeTodoMeta();
   for (var i = 0; i < todoItems.length; i++) {
     if (todoItems[i].id === input.taskId) {
       if (input.status === "deleted") {
@@ -1302,11 +1313,33 @@ export function handleTaskUpdate(input) {
   renderTodoWidget();
 }
 
+function normalizeTodoMeta(meta) {
+  if (meta && meta.variant === "plan") {
+    return {
+      variant: "plan",
+      title: "Plan",
+      icon: "map",
+      showProgress: false,
+      showCompletedCount: false,
+      stickyEnabled: false,
+    };
+  }
+  return {
+    variant: "tasks",
+    title: "Tasks",
+    icon: "list-checks",
+    showProgress: true,
+    showCompletedCount: true,
+    stickyEnabled: true,
+  };
+}
+
 function renderTodoWidget() {
   if (todoItems.length === 0) {
     if (todoWidgetEl) { todoWidgetEl.remove(); todoWidgetEl = null; }
     if (todoObserver) { todoObserver.disconnect(); todoObserver = null; }
     todoWidgetVisible = true;
+    todoMeta = normalizeTodoMeta();
     updateTodoSticky();
     return;
   }
@@ -1316,19 +1349,26 @@ function renderTodoWidget() {
     todoWidgetEl = document.createElement("div");
     todoWidgetEl.className = "todo-widget";
   }
+  todoWidgetEl.className = "todo-widget" + (todoMeta.variant === "plan" ? " todo-widget-plan" : "");
 
   var completed = 0;
   for (var i = 0; i < todoItems.length; i++) {
     if (todoItems[i].status === "completed") completed++;
   }
 
+  var countText = todoMeta.showCompletedCount
+    ? (completed + "/" + todoItems.length)
+    : (todoItems.length + " " + (todoItems.length === 1 ? "step" : "steps"));
+
   var html = '<div class="todo-header">' +
-    '<span class="todo-header-icon">' + iconHtml("list-checks") + '</span>' +
-    '<span class="todo-header-title">Tasks</span>' +
-    '<span class="todo-header-count">' + completed + '/' + todoItems.length + '</span>' +
+    '<span class="todo-header-icon">' + iconHtml(todoMeta.icon) + '</span>' +
+    '<span class="todo-header-title">' + todoMeta.title + '</span>' +
+    '<span class="todo-header-count">' + countText + '</span>' +
     '</div>';
-  html += '<div class="todo-progress"><div class="todo-progress-bar" style="width:' +
-    (todoItems.length > 0 ? Math.round(completed / todoItems.length * 100) : 0) + '%"></div></div>';
+  if (todoMeta.showProgress) {
+    html += '<div class="todo-progress"><div class="todo-progress-bar" style="width:' +
+      (todoItems.length > 0 ? Math.round(completed / todoItems.length * 100) : 0) + '%"></div></div>';
+  }
   html += '<div class="todo-items">';
   for (var i = 0; i < todoItems.length; i++) {
     var t = todoItems[i];
@@ -1369,6 +1409,10 @@ function setupTodoObserver() {
 function updateTodoStickyVisibility() {
   var stickyEl = document.getElementById("todo-sticky");
   if (!stickyEl) return;
+  if (!todoMeta.stickyEnabled) {
+    stickyEl.classList.add("hidden");
+    return;
+  }
 
   if (todoWidgetVisible) {
     stickyEl.classList.add("hidden");
@@ -1387,6 +1431,11 @@ function updateTodoStickyVisibility() {
 function updateTodoSticky() {
   var stickyEl = document.getElementById("todo-sticky");
   if (!stickyEl) return;
+  if (!todoMeta.stickyEnabled) {
+    stickyEl.classList.add("hidden");
+    stickyEl.innerHTML = "";
+    return;
+  }
 
   // Hide if no active tasks (all completed or empty)
   var hasActive = false;
@@ -1538,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;
@@ -1673,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";
 
@@ -1691,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);
 
@@ -1717,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) {
@@ -1727,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();
   });
@@ -1739,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();
   });
@@ -1747,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;
@@ -1854,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");
@@ -2195,6 +2289,7 @@ export function saveToolState() {
     tools: tools,
     currentThinking: currentThinking,
     todoWidgetEl: todoWidgetEl,
+    todoMeta: todoMeta,
     inPlanMode: inPlanMode,
     planContent: planContent,
     currentPlanCardEl: currentPlanCardEl,
@@ -2209,6 +2304,7 @@ export function restoreToolState(saved) {
   tools = saved.tools;
   currentThinking = saved.currentThinking;
   todoWidgetEl = saved.todoWidgetEl;
+  todoMeta = saved.todoMeta || normalizeTodoMeta();
   inPlanMode = saved.inPlanMode;
   planContent = saved.planContent;
   currentPlanCardEl = saved.currentPlanCardEl || null;
@@ -2229,6 +2325,7 @@ export function resetToolState() {
   planContent = null;
   currentPlanCardEl = null;
   todoItems = [];
+  todoMeta = normalizeTodoMeta();
   todoWidgetEl = null;
   todoWidgetVisible = true;
   if (todoObserver) { todoObserver.disconnect(); todoObserver = null; }

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

@@ -1,7 +1,8 @@
 const crypto = require("crypto");
 var fs = require("fs");
 var path = require("path");
-var { execSync } = require("child_process");
+var execSync = require("child_process").execSync;
+var execFileSync = require("child_process").execFileSync;
 var usersModule = require("./users");
 var { getCodexConfig } = require("./codex-defaults");
 var { splitShellSegments, attachSkillDiscovery } = require("./sdk-skill-discovery");
@@ -373,12 +374,12 @@ function createSDKBridge(opts) {
         // Create and chown the project directory once
         if (!fs.existsSync(dstDir)) {
           fs.mkdirSync(dstDir, { recursive: true });
-          try { require("child_process").execSync("chown -R " + uid + " " + JSON.stringify(path.join(linuxUserHome, ".claude"))); } catch (e2) {}
+          try { execFileSync("chown", ["-R", String(uid), path.join(linuxUserHome, ".claude")]); } catch (e2) {}
         } else {
           try {
             var dirStat = fs.statSync(dstDir);
             if (dirStat.uid !== uid) {
-              require("child_process").execSync("chown " + uid + " " + JSON.stringify(dstDir));
+              execFileSync("chown", [String(uid), dstDir]);
             }
           } catch (e2) {}
         }
@@ -389,7 +390,7 @@ function createSDKBridge(opts) {
           var dstFile = path.join(dstDir, sessionFileName);
           if (fs.existsSync(srcFile) && !fs.existsSync(dstFile)) {
             fs.copyFileSync(srcFile, dstFile);
-            try { require("child_process").execSync("chown " + uid + " " + JSON.stringify(dstFile)); } catch (e2) {}
+            try { execFileSync("chown", [String(uid), dstFile]); } catch (e2) {}
             console.log("[sdk-bridge] Pre-copied CLI session " + session.cliSessionId + " to " + linuxUser);
           }
         }
@@ -447,6 +448,12 @@ function createSDKBridge(opts) {
       }
     }
 
+    // Auto-approve Mate datastore tools. These are scoped to the active Mate
+    // project and already enforce SQL policy server-side.
+    if (toolName.indexOf("mcp__clay-datastore__") === 0) {
+      return { behavior: "allow", updatedInput: input };
+    }
+
     // Auto-approve remote MCP tools that the user explicitly enabled in project settings.
     // These are user-owned local MCP servers, so no additional permission prompt needed.
     if (toolName.indexOf("mcp__") === 0 && getRemoteMcpServers) {
@@ -646,7 +653,7 @@ function createSDKBridge(opts) {
    */
   function findConflictingClaude() {
     try {
-      var output = execSync("ps ax -o pid,command 2>/dev/null", { encoding: "utf8", timeout: 5000 });
+      var output = execFileSync("ps", ["ax", "-o", "pid,command"], { encoding: "utf8", timeout: 5000, stdio: ["pipe", "pipe", "pipe"] });
       var lines = output.trim().split("\n");
       var candidates = [];
       for (var i = 1; i < lines.length; i++) { // skip header
@@ -691,7 +698,7 @@ function createSDKBridge(opts) {
    */
   function isClaudeProcess(pid) {
     try {
-      var output = execSync("ps -p " + pid + " -o command= 2>/dev/null", { encoding: "utf8", timeout: 3000 }).trim();
+      var output = execFileSync("ps", ["-p", String(pid), "-o", "command="], { encoding: "utf8", timeout: 3000, stdio: ["pipe", "pipe", "pipe"] }).trim();
       return /\/claude(\s|$)/.test(output) || /^claude(\s|$)/.test(output);
     } catch (e) {
       return false;
@@ -1168,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;
@@ -1199,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) {
@@ -1222,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: {
@@ -1349,17 +1372,17 @@ function createSDKBridge(opts) {
   // Detect which vendor binaries are installed for this user.
   // In multi-user mode, runs checks as the specific Linux user.
   function detectInstalledVendors(linuxUser) {
-    var execSync = require("child_process").execSync;
+    var execFileSync = require("child_process").execFileSync;
     var fs = require("fs");
-    var path = require("path");
     var result = [];
 
-    function tryExec(cmd) {
+    function tryLookup(name) {
       try {
         if (linuxUser) {
-          execSync("su - " + linuxUser + " -c " + JSON.stringify(cmd), { timeout: 3000, stdio: ["pipe", "pipe", "pipe"] });
+          execFileSync("su", ["-", linuxUser, "-c", "which " + name], { timeout: 3000, stdio: ["pipe", "pipe", "pipe"] });
         } else {
-          execSync(cmd, { timeout: 3000, stdio: ["pipe", "pipe", "pipe"] });
+          if (process.platform === "win32") execFileSync("where", [name], { timeout: 3000, stdio: ["pipe", "pipe", "pipe"] });
+          else execFileSync("which", [name], { timeout: 3000, stdio: ["pipe", "pipe", "pipe"] });
         }
         return true;
       } catch (e) {
@@ -1368,14 +1391,14 @@ function createSDKBridge(opts) {
     }
 
     // Claude: check if binary is in PATH
-    if (tryExec("which claude")) result.push("claude");
+    if (tryLookup("claude")) result.push("claude");
 
     // Codex: check bundled binary or PATH
     var codexBin = null;
     try {
       codexBin = require("./yoke/codex-app-server").findCodexPath();
     } catch (e) {}
-    if ((codexBin && fs.existsSync(codexBin)) || tryExec("which codex")) result.push("codex");
+    if ((codexBin && fs.existsSync(codexBin)) || tryLookup("codex")) result.push("codex");
 
     return result;
   }
@@ -1432,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

@@ -234,7 +234,13 @@ function attachMessageProcessor(ctx) {
         type: "tool_executing",
         id: parsed.turnId || "codex-plan",
         name: "TodoWrite",
-        input: { todos: todos },
+        input: {
+          todos: todos,
+          meta: {
+            variant: "plan",
+            title: parsed.title || "Plan",
+          },
+        },
       });
 
     } else if (parsed.yokeType === "plan_content") {
@@ -364,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).