clay-server 3.4.0-beta.2 → 3.4.0-beta.20

package/lib/public/modules/split-pair-ui.js

@@ -1,7 +1,7 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
-import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER } from './app-rendering.js';
-import { effortLevelsFor, effortDisplayName } from './app-panels.js';
+import { VENDOR_AVATARS } from './app-rendering.js';
+import { buildAgentVendorSelect, fillAgentModels, buildAgentEffortSelect, fillAgentEffort } from './agent-config-selects.js';
 import { showToast } from './utils.js';
 
 var pairDialog = null;
@@ -9,77 +9,14 @@ var pairDialog = null;
 // that session becomes the Driver and the dialog only configures the Worker.
 var pendingDriver = null;
 
-function optionValue(entry) {
-  if (typeof entry === "string") return entry;
-  return entry && (entry.value || entry.id) || "";
-}
-
-function optionLabel(entry) {
-  if (typeof entry === "string") return entry;
-  return entry && (entry.displayName || entry.name || entry.value || entry.id) || "";
-}
-
-function fillModels(select, vendor, options) {
-  var models = (options.modelsByVendor && options.modelsByVendor[vendor]) || [];
-  select.innerHTML = "";
-  var automatic = document.createElement("option");
-  automatic.value = "";
-  automatic.textContent = "Automatic";
-  select.appendChild(automatic);
-  for (var i = 0; i < models.length; i++) {
-    var option = document.createElement("option");
-    option.value = optionValue(models[i]);
-    option.textContent = optionLabel(models[i]);
-    select.appendChild(option);
-  }
-}
-
 function closePairDialog() {
   if (pairDialog) pairDialog.remove();
   pairDialog = null;
 }
 
-function buildVendorSelect(installed, preferred) {
-  var select = document.createElement("select");
-  select.className = "wt-modal-input";
-  for (var i = 0; i < VENDOR_ORDER.length; i++) {
-    if (installed.indexOf(VENDOR_ORDER[i]) === -1) continue;
-    var option = document.createElement("option");
-    option.value = VENDOR_ORDER[i];
-    option.textContent = VENDOR_NAMES[VENDOR_ORDER[i]] || VENDOR_ORDER[i];
-    select.appendChild(option);
-  }
-  if (preferred && installed.indexOf(preferred) !== -1) select.value = preferred;
-  return select;
-}
-
 // Effort levels are vendor- and model-specific (codex: minimal..xhigh,
 // claude/kiro: low..max, plus per-model supportedEffortLevels overrides), so
 // options are rebuilt whenever the role's vendor or model changes.
-function fillEffortOptions(select, vendor, options, modelValue) {
-  var previous = select.value;
-  var models = (options.modelsByVendor && options.modelsByVendor[vendor]) || [];
-  var levels = effortLevelsFor(vendor, models, modelValue);
-  select.innerHTML = "";
-  var automatic = document.createElement("option");
-  automatic.value = "";
-  automatic.textContent = "Default";
-  select.appendChild(automatic);
-  for (var i = 0; i < levels.length; i++) {
-    var option = document.createElement("option");
-    option.value = levels[i];
-    option.textContent = effortDisplayName(levels[i]);
-    select.appendChild(option);
-  }
-  select.value = levels.indexOf(previous) !== -1 ? previous : "";
-}
-
-function buildEffortSelect() {
-  var select = document.createElement("select");
-  select.className = "wt-modal-input";
-  return select;
-}
-
 function fieldLabel(text, control) {
   var label = document.createElement("label");
   label.className = "wt-modal-label";
@@ -154,25 +91,25 @@ export function showPairDialog(options) {
     : "One Driver plans and directs a visible Worker session.";
   modal.appendChild(desc);
 
-  var driverVendor = buildVendorSelect(installed, installed.indexOf("claude") !== -1 ? "claude" : installed[0]);
+  var driverVendor = buildAgentVendorSelect(installed, installed.indexOf("claude") !== -1 ? "claude" : installed[0]);
   var workerDefault = options.lastVendor && options.lastVendor !== driverVendor.value ? options.lastVendor : (installed.indexOf("codex") !== -1 ? "codex" : installed[0]);
-  var workerVendor = buildVendorSelect(installed, workerDefault);
+  var workerVendor = buildAgentVendorSelect(installed, workerDefault);
   var driverModel = document.createElement("select");
   driverModel.className = "wt-modal-input";
   var workerModel = document.createElement("select");
   workerModel.className = "wt-modal-input";
-  var driverEffort = buildEffortSelect();
-  var workerEffort = buildEffortSelect();
-  function refreshDriverEffort() { fillEffortOptions(driverEffort, driverVendor.value, options, driverModel.value); }
-  function refreshWorkerEffort() { fillEffortOptions(workerEffort, workerVendor.value, options, workerModel.value); }
-  fillModels(driverModel, driverVendor.value, options);
-  fillModels(workerModel, workerVendor.value, options);
+  var driverEffort = buildAgentEffortSelect();
+  var workerEffort = buildAgentEffortSelect();
+  function refreshDriverEffort() { fillAgentEffort(driverEffort, driverVendor.value, options, driverModel.value); }
+  function refreshWorkerEffort() { fillAgentEffort(workerEffort, workerVendor.value, options, workerModel.value); }
+  fillAgentModels(driverModel, driverVendor.value, options);
+  fillAgentModels(workerModel, workerVendor.value, options);
   refreshDriverEffort();
   refreshWorkerEffort();
   workerEffort.value = "medium";
   if (workerEffort.value !== "medium") workerEffort.value = "";
-  driverVendor.addEventListener("change", function () { fillModels(driverModel, driverVendor.value, options); refreshDriverEffort(); });
-  workerVendor.addEventListener("change", function () { fillModels(workerModel, workerVendor.value, options); refreshWorkerEffort(); });
+  driverVendor.addEventListener("change", function () { fillAgentModels(driverModel, driverVendor.value, options); refreshDriverEffort(); });
+  workerVendor.addEventListener("change", function () { fillAgentModels(workerModel, workerVendor.value, options); refreshWorkerEffort(); });
   driverModel.addEventListener("change", refreshDriverEffort);
   workerModel.addEventListener("change", refreshWorkerEffort);
 
@@ -318,7 +255,8 @@ export function syncPairChrome(host, split) {
         setBtn.title = "Make this session the Driver; the other pane becomes its Worker";
         setBtn.addEventListener("click", function () { sendSetPair(group.id, paneSessionId); });
         var titleEl = header.querySelector(".split-pane-title");
-        header.insertBefore(setBtn, titleEl ? titleEl.nextSibling : null);
+        var accessEl = header.querySelector(".split-pane-full-access");
+        header.insertBefore(setBtn, accessEl ? accessEl.nextSibling : (titleEl ? titleEl.nextSibling : null));
       })(split.panes[ai].sessionId, headers[ai]);
     }
     return;
@@ -338,7 +276,8 @@ export function syncPairChrome(host, split) {
         sendSetPair(group.id, isDriver ? null : sessionId);
       });
       var title = header.querySelector(".split-pane-title");
-      header.insertBefore(badge, title ? title.nextSibling : null);
+      var access = header.querySelector(".split-pane-full-access");
+      header.insertBefore(badge, access ? access.nextSibling : (title ? title.nextSibling : null));
     })(split.panes[pi].sessionId, headers[pi]);
   }
   var active = (store.get('splitDelegations') || {})[group.id];

package/lib/public/modules/split-view.js

@@ -231,6 +231,9 @@ function createPane(pane, index) {
     }, "Skip Permissions", true);
   });
   header.appendChild(fullAccess);
+  // Permission state belongs to the session identity on the left. Keep it
+  // immediately after the title instead of grouping it with usage and close.
+  header.insertBefore(fullAccess, ctxChip);
 
   var close = document.createElement("button");
   close.type = "button";

package/lib/public/modules/tools.js

@@ -817,8 +817,13 @@ function resolvePermissionIdentity(mateId, vendor) {
   var vendorAvatars = {
     claude: "/claude-code-avatar.png",
     codex: "/codex-avatar.png",
-    gemini: "/gemini-avatar.svg",
+    antigravity: "/antigravity-avatar.png",
     opencode: "/opencode-avatar.svg",
+    kimi: "/kimi-avatar.svg",
+    grok: "/grok-avatar.svg",
+    copilot: "/copilot-avatar.svg",
+    qwen: "/qwen-avatar.svg",
+    junie: "/junie-avatar.svg",
     kiro: "/kiro-avatar.svg",
   };
   var vendorName = (vendor && VENDOR_NAMES[vendor]) || VENDOR_NAMES.claude;

package/lib/public/modules/vendor-priority.js

@@ -0,0 +1,14 @@
+export var VENDOR_ORDER = ["claude", "codex", "grok", "kimi", "copilot", "qwen", "junie", "antigravity", "opencode", "kiro"];
+export var EXPERIMENTAL_VENDORS = ["grok", "kimi", "copilot", "qwen", "junie", "antigravity", "opencode"];
+
+export function isExperimentalVendor(vendor) {
+  return EXPERIMENTAL_VENDORS.indexOf(vendor) !== -1;
+}
+
+export function firstInstalledVendor(installedVendors) {
+  var installed = Array.isArray(installedVendors) ? installedVendors : [];
+  for (var i = 0; i < VENDOR_ORDER.length; i++) {
+    if (installed.indexOf(VENDOR_ORDER[i]) !== -1) return VENDOR_ORDER[i];
+  }
+  return "";
+}

package/lib/public/modules/vendor-selection.js

@@ -0,0 +1,20 @@
+import { store } from './store.js';
+import { firstInstalledVendor } from './vendor-priority.js';
+
+export function selectDefaultVendorForBlankSession() {
+  var state = store.snap();
+  if (!state.activeSessionId || state.sessionHasHistory || state.sessionVendorBound || state.dmMode) return "";
+  var vendor = firstInstalledVendor(state.installedVendors);
+  if (!vendor) return "";
+  if (vendor === state.currentVendor) {
+    if (state.vendorSelectionLocked) store.set({ vendorSelectionLocked: false });
+    return vendor;
+  }
+  store.set({
+    currentVendor: vendor,
+    currentModel: "",
+    currentModels: [],
+    vendorSelectionLocked: false,
+  });
+  return vendor;
+}

package/lib/public/modules/worker-proposal.js

@@ -103,8 +103,10 @@ function statusLabel(status) {
 function applyState(card, msg) {
   var status = msg.status || "pending";
   card.dataset.status = status;
+  if (msg.autoApproved) card.dataset.autoApproved = "true";
+  var autoApproved = card.dataset.autoApproved === "true";
   var badge = card.querySelector(".worker-proposal-status");
-  if (badge) badge.textContent = statusLabel(status);
+  if (badge) badge.textContent = statusLabel(status) + (autoApproved ? " · auto-approved" : "");
   var error = card.querySelector(".worker-proposal-error");
   if (error) {
     error.textContent = msg.error || "";
@@ -116,6 +118,8 @@ function applyState(card, msg) {
     preview.classList.remove("hidden");
   }
   setControlsDisabled(card, status !== "pending");
+  var actions = card.querySelector(".worker-proposal-actions");
+  if (actions) actions.classList.toggle("hidden", autoApproved);
 }
 
 function sendDecision(card, accepted) {

package/lib/public/modules/worktree-location.js

@@ -0,0 +1,17 @@
+export function isExternalWorktree(project) {
+  return !!(project && project.isWorktree && project.worktreeExternal === true);
+}
+
+export function externalWorktreeTooltip(name) {
+  return name + " — outside the main project folder";
+}
+
+export function appendExternalWorktreeBadge(container, className) {
+  var badge = document.createElement("span");
+  badge.className = className;
+  badge.setAttribute("role", "img");
+  badge.setAttribute("aria-label", "Outside the main project folder");
+  badge.innerHTML = '<i data-lucide="external-link"></i>';
+  container.appendChild(badge);
+  return badge;
+}

package/lib/public/qwen-avatar.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" role="img" aria-label="Qwen Code">
+  <rect width="64" height="64" rx="14" fill="#6b4eff"/>
+  <path d="M32 12a20 20 0 1 0 12 36l7 5-3-11a20 20 0 0 0-16-30zm0 9a11 11 0 1 1-7.8 18.8A11 11 0 0 1 32 21z" fill="#fff"/>
+</svg>

package/lib/public/style.css

@@ -1,12 +1,13 @@
 @import url("css/base.css");
 @import url("css/icon-strip.css");
-@import url("css/title-bar.css");
+@import url("css/title-bar.css?v=20260824");
 @import url("css/pane.css");
 @import url("css/worker-proposal.css");
+@import url("css/session-actions.css");
 @import url("css/sidebar.css");
 @import url("css/overlays.css");
 @import url("css/menus.css");
-@import url("css/messages.css?v=20260407");
+@import url("css/messages.css?v=20260824");
 @import url("css/rewind.css");
 @import url("css/input.css");
 @import url("css/filebrowser.css");
@@ -35,3 +36,4 @@
 @import url("css/debate.css");
 @import url("css/notifications-center.css");
 @import url("css/tui-attention.css");
+@import url("css/pwa-mobile.css?v=20260824f");

package/lib/sdk-bridge.js

@@ -110,6 +110,7 @@ function createSDKBridge(opts) {
   var adapters = opts.adapters || {};
   var mateDisplayName = opts.mateDisplayName || "";
   var isMate = opts.isMate || (slug.indexOf("mate-") === 0);
+  var osUsers = !!opts.osUsers;
   var dangerouslySkipPermissions = opts.dangerouslySkipPermissions || false;
   // mcpServers may be either a static object or a getter function. The
   // getter form lets callers gate individual servers at call time (e.g.
@@ -244,17 +245,24 @@ function createSDKBridge(opts) {
     return null;
   }
 
-  function sendModelInfoForVendor(vendor, model) {
+  function defaultModelForVendor(vendor) {
+    return (sm.defaultModelByVendor && sm.defaultModelByVendor[vendor]) || "";
+  }
+
+  function sendModelInfoForVendor(session, vendor, model) {
     var resolvedVendor = vendor || (adapter && adapter.vendor) || "claude";
-    send({
+    var message = {
       type: "model_info",
       model: model || "",
       models: getModelsForVendor(resolvedVendor),
       vendor: resolvedVendor,
+      sessionId: session ? session.localId : null,
       capabilities: (sm.capabilitiesByVendor && sm.capabilitiesByVendor[resolvedVendor]) || {},
       availableVendors: sm.availableVendors || [],
       installedVendors: sm.installedVendors || [],
-    });
+    };
+    if (session) sendToSession(session, message);
+    else send(message);
   }
 
   function rememberAdapterReady(vendor, result) {
@@ -323,6 +331,14 @@ function createSDKBridge(opts) {
   var mergeSkills = skills.mergeSkills;
 
   // --- Message processing (extracted to sdk-message-processor.js) ---
+  function getSessionLinuxUser(session) {
+    if (!osUsers || !session) return null;
+    if (session.lastLinuxUser) return session.lastLinuxUser;
+    if (!session.ownerId) return null;
+    var owner = usersModule.findUserById(session.ownerId);
+    return owner && owner.linuxUser ? owner.linuxUser : null;
+  }
+
   // Auto-generate a session title via YOKE adapter.generateTitle().
   // Triggered by sdk-message-processor after AUTO_TITLE_TURN_THRESHOLD turns.
   function autoGenerateTitle(session) {
@@ -345,7 +361,10 @@ function createSDKBridge(opts) {
     }
     console.log("[auto-title] Calling adapter.generateTitle with " + userMessages.length + " messages for session " + session.localId);
 
-    sessionAdapter.generateTitle(userMessages, { cwd: cwd }).then(function(title) {
+    sessionAdapter.generateTitle(userMessages, {
+      cwd: cwd,
+      linuxUser: getSessionLinuxUser(session) || undefined,
+    }).then(function(title) {
       if (!title || title.length < 2) return;
       title = title.substring(0, 100);
       if (!session.titleManuallySet) {
@@ -837,19 +856,20 @@ function createSDKBridge(opts) {
             case "model_changed":
               session.model = metaData.model;
               sm.saveSessionFile(session);
-              sm.currentModel = metaData.model;
-              sendModelInfoForVendor(session.vendor || (adapter && adapter.vendor) || "claude", metaData.model);
-              sendToSession(session, { type: "config_state", model: session.model || sm.currentModel, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+              sm.defaultModelByVendor = sm.defaultModelByVendor || {};
+              sm.defaultModelByVendor[session.vendor || "claude"] = metaData.model;
+              sendModelInfoForVendor(session, session.vendor || (adapter && adapter.vendor) || "claude", metaData.model);
+              sendToSession(session, { type: "config_state", model: session.model || defaultModelForVendor(session.vendor || "claude"), vendor: session.vendor || "claude", sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
               break;
             case "effort_changed":
               session.effort = metaData.effort;
               sm.saveSessionFile(session);
               sm.currentEffort = metaData.effort;
-              sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort, betas: sm.currentBetas || [] });
+              sendToSession(session, { type: "config_state", model: session.model || defaultModelForVendor(session.vendor || "claude"), vendor: session.vendor || "claude", sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort, betas: sm.currentBetas || [] });
               break;
             case "permission_mode_changed":
               sm.currentPermissionMode = metaData.mode;
-              sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: session.permissionMode || sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+              sendToSession(session, { type: "config_state", model: session.model || defaultModelForVendor(session.vendor || "claude"), vendor: session.vendor || "claude", sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
               break;
             case "worker_error":
               send({ type: "error", text: metaData.error });
@@ -866,6 +886,8 @@ function createSDKBridge(opts) {
       var stillOwnsRuntime = session.queryInstance === myQueryInstance;
       if (session.isProcessing && session.taskStopRequested && stillOwnsRuntime) {
         session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
         onProcessingChanged();
         send({ type: "status", processing: false });
         sendAndRecord(session, { type: "thinking_stop" });
@@ -880,6 +902,8 @@ function createSDKBridge(opts) {
         // iterator without a result event. Treat any result-less stream end as
         // a failed turn so the UI cannot remain on processing forever.
         session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
         onProcessingChanged();
         if (!session._lastAdapterError) {
           sendAndRecord(session, {
@@ -894,6 +918,8 @@ function createSDKBridge(opts) {
     } catch (err) {
       if (session.isProcessing && session.queryInstance === myQueryInstance) {
         session.isProcessing = false;
+        session._awaitingTurnResult = false;
+        session._queuedTurnCount = 0;
         onProcessingChanged();
         if (err.name === "AbortError" || (myAbortController && myAbortController.signal.aborted) || session.taskStopRequested) {
           if (!session.destroying) {
@@ -1131,7 +1157,9 @@ function createSDKBridge(opts) {
   async function rollbackConversation(session, numTurns) {
     var sessionAdapter = getAdapterForSession(session);
     if (sessionAdapter && typeof sessionAdapter.rollbackThread === "function") {
-      await sessionAdapter.rollbackThread(session.cliSessionId, numTurns);
+      await sessionAdapter.rollbackThread(session.cliSessionId, numTurns, {
+        linuxUser: getSessionLinuxUser(session) || undefined,
+      });
     }
     // Claude: conversation rollback is handled by rewindFiles + local history trim
   }
@@ -1143,7 +1171,11 @@ function createSDKBridge(opts) {
 
   async function forkSessionUnified(session, uuid) {
     var sessionAdapter = getAdapterForSession(session);
-    var result = await sessionAdapter.forkSession(session.cliSessionId, { upToMessageId: uuid, dir: cwd });
+    var result = await sessionAdapter.forkSession(session.cliSessionId, {
+      upToMessageId: uuid,
+      dir: cwd,
+      linuxUser: getSessionLinuxUser(session) || undefined,
+    });
     if (!result || !result.sessionId) throw new Error("Fork returned no session id");
 
     // Adapters with rollbackThread (e.g. Codex) use local history copy
@@ -1208,10 +1240,10 @@ function createSDKBridge(opts) {
           sm.modelsByVendor[vendor] = await vendorAdapter.supportedModels();
         }
         var vendorModels = getModelsForVendor(vendor);
-        var modelForVendor = resolveModelInList(vendorModels, sm.currentModel)
+        var modelForVendor = resolveModelInList(vendorModels, defaultModelForVendor(vendor))
           || modelEntryValue(vendorModels[0])
           || "";
-        sendModelInfoForVendor(vendor, modelForVendor);
+        sendModelInfoForVendor(session, vendor, modelForVendor);
       }
       return vendorAdapter;
     }
@@ -1414,14 +1446,9 @@ function createSDKBridge(opts) {
       }
     }
 
-    // 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 && ls.model !== "default" ? ls.model : null) || session.model || sm.currentModel || undefined;
+    // Pick a model from the session or its vendor-specific default, then
+    // validate it against the session vendor's known model list.
+    var queryModel = (ls.model && ls.model !== "default" ? ls.model : null) || session.model || defaultModelForVendor(session.vendor || "claude") || undefined;
     var sessionVendor = session.vendor || (adapter && adapter.vendor) || null;
     if (sessionVendor) {
       var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[sessionVendor]) || [];
@@ -1437,8 +1464,7 @@ function createSDKBridge(opts) {
     }
 
     // Bind the resolved model to the session so it survives a daemon
-    // restart. Without this, a session started under sm.currentModel (an
-    // in-memory value) came back after restart on the adapter default.
+    // restart. This preserves a session-specific selection across restarts.
     if (queryModel && session.model !== queryModel) {
       session.model = queryModel;
       sm.saveSessionFile(session);
@@ -1471,6 +1497,7 @@ function createSDKBridge(opts) {
 
     var queryOpts = {
       cwd: cwd,
+      linuxUser: linuxUser || undefined,
       // appendSystemPrompt, NOT systemPrompt: a plain-string systemPrompt
       // REPLACES the entire Claude Code system prompt (sdk.d.ts:2096), which
       // would strip the driver session down to the two-sentence pair preset.
@@ -1528,6 +1555,10 @@ function createSDKBridge(opts) {
         ACP: {
           mcpServers: getAcpMcpServers(session),
         },
+        ANTIGRAVITY: {
+          dangerouslySkipPermissions: dangerouslySkipPermissions
+            || session.permissionMode === "bypassPermissions",
+        },
         KIRO: {
           engine: kiroConfig.engine,
           mode: kiroConfig.mode,
@@ -1561,6 +1592,8 @@ function createSDKBridge(opts) {
       console.error("[sdk-bridge] cliSessionId:", session.cliSessionId, "resume:", !!session.cliSessionId);
       console.error("[sdk-bridge] Stack:", e.stack || "(no stack)");
       session.isProcessing = false;
+      session._awaitingTurnResult = false;
+      session._queuedTurnCount = 0;
       onProcessingChanged();
       session.queryInstance = null;
       session.messageQueue = null;
@@ -1602,6 +1635,8 @@ function createSDKBridge(opts) {
       session.messageQueue = null;
       session.abortController = null;
       session.isProcessing = false;
+      session._awaitingTurnResult = false;
+      session._queuedTurnCount = 0;
       onProcessingChanged();
       sendAndRecord(session, { type: "error", text: "The agent connection closed before it received your message. Please send it again." });
       sendAndRecord(session, { type: "done", code: 1 });
@@ -1790,16 +1825,20 @@ function createSDKBridge(opts) {
     } catch (e) {}
     if ((codexBin && fs.existsSync(codexBin)) || tryLookup(yoke.getVendorInfo("codex").binaryName)) result.push("codex");
 
-    var acpVendorKeys = ["gemini", "opencode"];
+    var subprocessVendorKeys = ["antigravity", "opencode", "kimi", "grok", "copilot", "qwen", "junie"];
     var acpProfiles = require("./yoke/acp-agent-profiles");
-    for (var acpVendorIndex = 0; acpVendorIndex < acpVendorKeys.length; acpVendorIndex++) {
-      var acpVendor = acpVendorKeys[acpVendorIndex];
-      var acpInfo = yoke.getVendorInfo(acpVendor);
-      if (!linuxUser || acpInfo.osUserIsolation) {
-        var acpProfile = acpProfiles.getAcpAgentProfile(acpVendor);
-        if (acpProfiles.findAcpAgentPath(acpProfile)) result.push(acpVendor);
+    for (var subprocessVendorIndex = 0; subprocessVendorIndex < subprocessVendorKeys.length; subprocessVendorIndex++) {
+      var subprocessVendor = subprocessVendorKeys[subprocessVendorIndex];
+      var subprocessInfo = yoke.getVendorInfo(subprocessVendor);
+      if (!linuxUser || subprocessInfo.osUserIsolation) {
+        if (subprocessVendor === "antigravity") {
+          if (tryLookup(subprocessInfo.binaryName)) result.push(subprocessVendor);
+        } else {
+          var acpProfile = acpProfiles.getAcpAgentProfile(subprocessVendor);
+          if (acpProfiles.findAcpAgentPath(acpProfile)) result.push(subprocessVendor);
+        }
       } else {
-        console.log("[sdk-bridge] " + acpInfo.displayName + " hidden for OS-isolated user " + linuxUser + ": per-user spawning is not implemented");
+        console.log("[sdk-bridge] " + subprocessInfo.displayName + " hidden for OS-isolated user " + linuxUser + ": per-user spawning is not implemented");
       }
     }
 
@@ -1832,6 +1871,13 @@ function createSDKBridge(opts) {
     var defaultVendor = adapter ? adapter.vendor : "claude";
     sm.defaultVendor = defaultVendor;
 
+    // Installation detection is independent of adapter initialization. Publish
+    // it before warmup so a new project does not render the initial empty state
+    // as if every CLI were missing while the default adapter starts up.
+    sm.installedVendors = detectInstalledVendors(linuxUser);
+    sm.availableVendors = getAvailableVendors(linuxUser);
+    sendModelInfoForVendor(null, defaultVendor, defaultModelForVendor(defaultVendor));
+
     // Initialize default adapter first (provides skills, slash commands, etc.)
     if (adapter) {
       try {
@@ -1862,7 +1908,8 @@ function createSDKBridge(opts) {
           send({ type: "slash_commands", commands: combined, vendor: defaultVendor });
         }
         if (result.defaultModel) {
-          sm.currentModel = sm.currentModel || sm._savedDefaultModel || result.defaultModel;
+          sm.defaultModelByVendor = sm.defaultModelByVendor || {};
+          sm.defaultModelByVendor[defaultVendor] = sm.defaultModelByVendor[defaultVendor] || result.defaultModel;
         }
         sm.availableModels = result.models || [];
         // Store per-vendor models and capabilities
@@ -1883,19 +1930,8 @@ function createSDKBridge(opts) {
     //     actually issues a query with it.
     sm.modelsByVendor = sm.modelsByVendor || {};
 
-    // Detect installed vendors per-user (binary existence check)
-    sm.installedVendors = detectInstalledVendors(linuxUser);
-    sm.availableVendors = getAvailableVendors(linuxUser);
-
-    // Send initial state to client
-    send({
-      type: "model_info",
-      model: sm.currentModel || "",
-      models: getModelsForVendor(defaultVendor),
-      vendor: defaultVendor,
-      availableVendors: sm.availableVendors,
-      installedVendors: sm.installedVendors,
-    });
+    // Send the fully initialized state to the client.
+    sendModelInfoForVendor(null, defaultVendor, defaultModelForVendor(defaultVendor));
   }
 
   async function setModel(session, model) {
@@ -1907,22 +1943,28 @@ function createSDKBridge(opts) {
       // No active query — just store the model for next startQuery
       session.model = model;
       sm.saveSessionFile(session);
-      sm.currentModel = model;
-      // Don't send vendor here: session vendor not yet bound, let client keep its selection
-      sendModelInfoForVendor(null, model);
-      sendToSession(session, { type: "config_state", model: sm.currentModel, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
-      return;
+      sm.defaultModelByVendor = sm.defaultModelByVendor || {};
+      // Confirm against the session vendor so a non-default vendor does not
+      // receive model metadata labeled as the project's default adapter.
+      var pendingVendor = session.vendor || (adapter && adapter.vendor) || "claude";
+      sm.defaultModelByVendor[pendingVendor] = model;
+      sendModelInfoForVendor(session, pendingVendor, model);
+      sendToSession(session, { type: "config_state", model: model, vendor: pendingVendor, sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+      return { ok: true, model: model };
     }
     try {
       await session.queryInstance.setModel(model);
       session.model = model;
       sm.saveSessionFile(session);
-      sm.currentModel = model;
+      sm.defaultModelByVendor = sm.defaultModelByVendor || {};
       var sessionVendor = session.vendor || (adapter && adapter.vendor) || "claude";
-      sendModelInfoForVendor(sessionVendor, model);
-      sendToSession(session, { type: "config_state", model: sm.currentModel, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+      sm.defaultModelByVendor[sessionVendor] = model;
+      sendModelInfoForVendor(session, sessionVendor, model);
+      sendToSession(session, { type: "config_state", model: model, vendor: sessionVendor, sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+      return { ok: true, model: model };
     } catch (e) {
       send({ type: "error", text: "Failed to switch model: " + (e.message || e) });
+      return { ok: false, model: session.model || "", error: e.message || String(e) };
     }
   }
 
@@ -1951,14 +1993,14 @@ function createSDKBridge(opts) {
     if (!session.queryInstance) {
       // No active query — just store the mode for next startQuery
       sm.currentPermissionMode = mode;
-      sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+      sendToSession(session, { type: "config_state", model: session.model || defaultModelForVendor(session.vendor || "claude"), vendor: session.vendor || "claude", sessionId: session.localId, mode: sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
       return;
     }
     try {
       // Route through QueryHandle (works for both in-process and worker paths)
       await session.queryInstance.setPermissionMode(mode);
       sm.currentPermissionMode = mode;
-      sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
+      sendToSession(session, { type: "config_state", model: session.model || defaultModelForVendor(session.vendor || "claude"), vendor: session.vendor || "claude", sessionId: session.localId, mode: sm.currentPermissionMode, effort: session.effort || sm.currentEffort || "medium", betas: sm.currentBetas || [] });
     } catch (e) {
       sendToSession(session, { type: "error", text: "Failed to set permission mode: " + (e.message || e) });
     }
@@ -2009,7 +2051,7 @@ function createSDKBridge(opts) {
   // Creates a mention session that can be reused across multiple mentions
   // within a conversation flow (session continuity).
   async function createMentionSession(opts) {
-    // opts: { vendor, claudeMd, initialContext, initialMessage, onDelta, onDone, onError, onActivity }
+    // opts: { vendor, linuxUser, claudeMd, initialContext, initialMessage, onDelta, onDone, onError, onActivity }
     var abortController = new AbortController();
 
     // Current response callbacks (swapped on each pushMessage)
@@ -2029,6 +2071,7 @@ function createSDKBridge(opts) {
     try {
       handle = await mentionAdapter.createQuery({
         cwd: cwd,
+        linuxUser: opts.linuxUser || undefined,
         systemPrompt: opts.claudeMd,
         model: opts.model || undefined,
         toolServers: opts.includeMcpServers ? (mergeMcpServers(getMcpServers(), getRemoteMcpServers) || undefined) : undefined,