clay-server 3.4.0-beta.18 → 3.4.0-beta.19

package/lib/project-connection.js

@@ -22,12 +22,23 @@ function dispatchMessageSafely(handleMessage, sendTo, slug, ws, msg) {
   }
 }
 
-function buildInitialModelInfo(sm, initialVendor, initialModel, initialModels) {
+function buildInitialModelInfo(sm, initialVendor, initialModel, initialModels, sessionId) {
+  var model = initialModel || "";
+  var models = initialModels || [];
+  if (model && models.length > 0) {
+    var found = false;
+    for (var i = 0; i < models.length; i++) {
+      var entry = models[i];
+      if (typeof entry === "string" ? entry === model : (entry.value === model || entry.id === model || entry.resolvedModel === model)) found = true;
+    }
+    if (!found) model = typeof models[0] === "string" ? models[0] : (models[0].value || models[0].id || "");
+  }
   return {
     type: "model_info",
-    model: initialModel || "",
-    models: initialModels || [],
+    model: model,
+    models: models,
     vendor: initialVendor,
+    sessionId: sessionId || null,
     availableVendors: sm.availableVendors || [],
     installedVendors: sm.installedVendors || [],
   };
@@ -177,11 +188,12 @@ function attachConnection(ctx) {
     if (sm.slashCommands) {
       sendTo(ws, { type: "slash_commands", commands: sm.slashCommands });
     }
-    var initialModel = (restoredActive && restoredActive.model) || sm.currentModel || "";
+    var initialModel = (restoredActive && restoredActive.model) || ((sm.defaultModelByVendor || {})[initialVendor]) || "";
     // Vendor installation state is needed even before a new project has a
     // model. Always send it so reconnects cannot fall back to "Not installed."
-    sendTo(ws, buildInitialModelInfo(sm, initialVendor, initialModel, initialModels));
-    sendTo(ws, { type: "config_state", model: initialModel, mode: sm.currentPermissionMode || "default", effort: initialEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+    var initialModelInfo = buildInitialModelInfo(sm, initialVendor, initialModel, initialModels, restoredActive ? restoredActive.localId : null);
+    sendTo(ws, initialModelInfo);
+    sendTo(ws, { type: "config_state", model: initialModelInfo.model, vendor: initialVendor, sessionId: restoredActive ? restoredActive.localId : null, mode: sm.currentPermissionMode || "default", effort: initialEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
     sendTo(ws, { type: "last_vendor", vendor: sm.lastVendor || "" });
     sendTo(ws, Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
     sendTo(ws, { type: "term_list", terminals: tm.list() });

package/lib/project-models.js

@@ -30,6 +30,7 @@ function attachModels(ctx) {
     var requestId = msg.requestId || null;
     var loadError = null;
     var vendorAdapter = null;
+    var session = getSessionForWs(ws);
 
     if (!vendor) {
       sendTo(ws, {
@@ -40,6 +41,7 @@ function attachModels(ctx) {
         error: "No vendor was selected.",
         model: "",
         models: [],
+        sessionId: session ? session.localId : null,
       });
       return;
     }
@@ -109,9 +111,10 @@ function attachModels(ctx) {
 
     var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[vendor]) || [];
     var modelToSend = modelEntryValue(vendorModels[0]);
-    if (sm.currentModel) {
+    var preferredModel = (session && session.vendor === vendor && session.model) || (sm.defaultModelByVendor && sm.defaultModelByVendor[vendor]) || "";
+    if (preferredModel) {
       for (var i = 0; i < vendorModels.length; i++) {
-        if (modelEntryMatches(vendorModels[i], sm.currentModel)) {
+        if (modelEntryMatches(vendorModels[i], preferredModel)) {
           modelToSend = modelEntryValue(vendorModels[i]);
           break;
         }
@@ -131,6 +134,7 @@ function attachModels(ctx) {
       model: modelToSend,
       models: vendorModels,
       vendor: vendor,
+      sessionId: session ? session.localId : null,
       capabilities: (sm.capabilitiesByVendor && sm.capabilitiesByVendor[vendor]) || {},
       availableVendors: sm.availableVendors || [],
       installedVendors: sm.installedVendors || [],

package/lib/project-sessions.js

@@ -658,10 +658,6 @@ function attachSessions(ctx) {
           // (resume_tui_session), and born-GUI never auto-converts to a terminal.
           resolveSessionForView(xmTarget, ws);
         }
-        // If the target session's vendor doesn't own the currently cached
-        // model, clear sm.currentModel so the UI and next query don't leak
-        // the previous session's vendor-specific model into this one. A
-        // session-specific model always wins and survives daemon restarts.
         var switchTargetSess = sm.sessions.get(msg.id);
         var switchTargetVendor = switchTargetSess && (switchTargetSess.vendor || sm.defaultVendor || "claude");
         if (switchTargetSess && !switchTargetSess.effort) {
@@ -671,22 +667,6 @@ function attachSessions(ctx) {
           ) || null;
           sm.saveSessionFile(switchTargetSess);
         }
-        if (switchTargetSess && switchTargetSess.model) {
-          sm.currentModel = switchTargetSess.model;
-        } else if (switchTargetSess && sm.currentModel) {
-          var targetVendor = switchTargetSess.vendor || sm.defaultVendor || null;
-          var tvModels = (targetVendor && sm.modelsByVendor && sm.modelsByVendor[targetVendor]) || [];
-          var found = false;
-          var _curLc = sm.currentModel.toLowerCase();
-          for (var tvi = 0; tvi < tvModels.length; tvi++) {
-            var tvEntry = tvModels[tvi];
-            var tvVal = typeof tvEntry === "string" ? tvEntry : (tvEntry && (tvEntry.value || tvEntry.id)) || "";
-            if (tvVal === sm.currentModel || (tvVal && (tvVal.toLowerCase().indexOf(_curLc) !== -1 || _curLc.indexOf(tvVal.toLowerCase()) !== -1))) { found = true; break; }
-          }
-          if (tvModels.length > 0 && !found) {
-            sm.currentModel = "";
-          }
-        }
         // Check access in multi-user mode
         if (usersModule.isMultiUser() && ws._clayUser) {
           var switchTarget = sm.sessions.get(msg.id);
@@ -989,11 +969,7 @@ function attachSessions(ctx) {
             " is bound to '" + vendorSession.vendor + "', refused rebind to '" + msg.vendor + "'");
         } else {
           vendorSession.vendor = msg.vendor;
-          // Clear the shared model so the next query uses the vendor's default
-          // instead of leaking the previous vendor's model into a fresh session.
-          if (sm.currentModel) {
-            sm.currentModel = "";
-          }
+          if (vendorSession.vendor !== msg.vendor) vendorSession.model = "";
           sm.saveSessionFile(vendorSession);
           sm.broadcastSessionList();
         }
@@ -1004,11 +980,11 @@ function attachSessions(ctx) {
           type: "model_info",
           model: "",
           models: vendorModels,
-          vendor: msg.vendor,
+          vendor: msg.vendor, sessionId: vendorSession ? vendorSession.localId : null,
           availableVendors: sm.availableVendors || [],
           installedVendors: sm.installedVendors || [],
         });
-        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+        send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       }
       return true;
     }
@@ -1044,7 +1020,7 @@ function attachSessions(ctx) {
         sm.broadcastSessionList();
         sdk.setPermissionMode(session, msg.mode);
       }
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
@@ -1105,7 +1081,7 @@ function attachSessions(ctx) {
       if (session) {
         sdk.setPermissionMode(session, msg.mode);
       }
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
@@ -1118,7 +1094,7 @@ function attachSessions(ctx) {
       if (session) {
         sdk.setPermissionMode(session, msg.mode);
       }
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
@@ -1134,7 +1110,7 @@ function attachSessions(ctx) {
         sdk.setEffort(session, sessionEffort).catch(function (e) {
           sendTo(ws, { type: "error", text: "Failed to change reasoning effort: " + (e.message || e) });
         });
-        sm.sendToSession(session, { type: "config_state", model: session.model || sm.currentModel || "", mode: session.permissionMode || sm.currentPermissionMode || "default", effort: sessionEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+        sm.sendToSession(session, { type: "config_state", model: session.model || ((sm.defaultModelByVendor || {})[effortVendor]) || "", vendor: effortVendor, sessionId: session.localId, mode: session.permissionMode || sm.currentPermissionMode || "default", effort: sessionEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       }
       return true;
     }
@@ -1144,7 +1120,7 @@ function attachSessions(ctx) {
         opts.onSetServerDefaultEffort(msg.effort);
       }
       sm.currentEffort = msg.effort;
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
@@ -1153,20 +1129,20 @@ function attachSessions(ctx) {
         opts.onSetProjectDefaultEffort(slug, msg.effort);
       }
       sm.currentEffort = msg.effort;
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode || "default", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
     if (msg.type === "set_betas") {
       sm.currentBetas = msg.betas || [];
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas, thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas, thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
     if (msg.type === "set_thinking") {
       sm.currentThinking = msg.thinking || "adaptive";
       if (msg.budgetTokens) sm.currentThinkingBudget = msg.budgetTokens;
-      send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+      send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
       return true;
     }
 
@@ -1448,7 +1424,7 @@ function attachSessions(ctx) {
       if (decision === "allow_accept_edits") {
         sdk.setPermissionMode(session, "acceptEdits");
         sm.currentPermissionMode = "acceptEdits";
-        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+        send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
         pending.resolve({ behavior: "allow", updatedInput: pending.toolInput });
         sm.sendAndRecord(session, { type: "permission_resolved", requestId: requestId, decision: decision });
         return true;
@@ -1477,7 +1453,7 @@ function attachSessions(ctx) {
 
         // Update permission mode for the new session
         sm.currentPermissionMode = "acceptEdits";
-        send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
+        send({ type: "config_state", vendor: null, sessionId: null, mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
 
         // Build prompt from plan content (sent from client) or plan file path
         var clientPlanContent = msg.planContent || "";

package/lib/project-worker-proposal.js

@@ -40,7 +40,7 @@ function attachWorkerProposal(ctx) {
   function isEligible(session) {
     if (ctx.isMate || !session || session.mode === "tui") return false;
     if (store.groupForMember(session.localId)) return false;
-    return isFableSession(session, sm.modelsByVendor, sm.currentModel);
+    return isFableSession(session, sm.modelsByVendor, (sm.defaultModelByVendor || {})[session.vendor || "claude"]);
   }
 
   function safeModelsByVendor(installed) {
@@ -112,7 +112,7 @@ function attachWorkerProposal(ctx) {
     }
     var models = options.modelsByVendor[vendor] || [];
     var model = modelIsAvailable(options, vendor, args.recommendedModel) ? (args.recommendedModel || "") : "";
-    var currentModel = session.model || sm.currentModel || "";
+    var currentModel = session.model || (sm.defaultModelByVendor || {})[session.vendor || "claude"] || "";
     if (vendor === session.vendor && model === currentModel) model = "";
     if (!model && models.length > 0) {
       for (var j = 0; j < models.length; j++) {

package/lib/project.js

@@ -472,10 +472,9 @@ function createProjectContext(opts) {
 
   var _projModel = typeof opts.onGetProjectDefaultModel === "function" ? opts.onGetProjectDefaultModel(slug) : null;
   var _srvModel = typeof opts.onGetServerDefaultModel === "function" ? opts.onGetServerDefaultModel() : null;
-  sm._savedDefaultModel = (_projModel && _projModel.model) || (_srvModel && _srvModel.model) || null;
-  // Immediately apply the saved default so config_state on connect reflects it
-  // before the SDK has warmed up and fired system/init.
-  if (sm._savedDefaultModel) sm.currentModel = sm._savedDefaultModel;
+  var savedDefaultModel = (_projModel && _projModel.model) || (_srvModel && _srvModel.model) || null;
+  sm.defaultModelByVendor = sm.defaultModelByVendor || {};
+  if (savedDefaultModel) sm.defaultModelByVendor[sm.defaultVendor || "claude"] = savedDefaultModel;
 
   // --- Local MCP (direct process management for localhost clients) ---
   var _localMcp = createLocalMcp();

package/lib/public/modules/app-messages.js

@@ -54,7 +54,7 @@ import { handleWhatsNewState, handleWhatsNewSeenResult, setKnownEntries as setWh
 import { closeArticle as closeWhatsNewArticle } from './whats-new-article.js';
 import { resolvePaneSession, resolveSwitchedVendor } from './pane-session.js';
 import { selectDefaultVendorForBlankSession } from './vendor-selection.js';
-import { getModelInfoUpdate, modelEntryMatches, handleModelSelectionResult } from './model-picker.js';
+import { getModelInfoUpdate, modelEntryValue, modelEntryMatches, handleModelSelectionResult, requestVendorModels } from './model-picker.js';
 import { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
 import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './app-projects.js';
 import { updateHistorySentinel, prependOlderHistory } from './app-header.js';
@@ -449,7 +449,13 @@ export function processMessage(msg) {
           var _curInList = !!_curModel && (msg.models || []).some(function (m) {
             return modelEntryMatches(m, _curModel);
           });
-          if (store.get('vendorSelectionLocked') && _curInList) {
+          var _incomingInList = !_modelVal || (msg.models || []).length === 0 || (msg.models || []).some(function (m) {
+            return modelEntryMatches(m, _modelVal);
+          });
+          if (!_incomingInList) {
+            console.warn("[model-state] Ignoring model not listed for vendor " + (msg.vendor || store.get('currentVendor')) + ": " + _modelVal);
+            _miUpdate.currentModel = _curInList ? _curModel : modelEntryValue((msg.models || [])[0]);
+          } else if (store.get('vendorSelectionLocked') && _curInList) {
             // Keep the user's existing (valid) selection; only update models list
           } else {
             _miUpdate.currentModel = _modelVal || "";
@@ -469,8 +475,20 @@ export function processMessage(msg) {
         break;
 
       case "config_state": {
+        if ((msg.sessionId != null && msg.sessionId !== store.get('activeSessionId')) || (msg.vendor && msg.vendor !== store.get('currentVendor'))) break;
         var _cs = {};
-        if (msg.model) _cs.currentModel = msg.model;
+        if (msg.model) {
+          var _knownModels = store.get('currentModels') || [];
+          var _modelKnown = _knownModels.length === 0 || _knownModels.some(function(model) { return modelEntryMatches(model, msg.model); });
+          if (_modelKnown) {
+            _cs.currentModel = msg.model;
+          } else {
+            console.warn("[model-state] Ignoring model not listed for current vendor: " + msg.model);
+            var _existingModel = store.get('currentModel');
+            var _existingKnown = _knownModels.some(function(model) { return modelEntryMatches(model, _existingModel); });
+            _cs.currentModel = _existingKnown ? _existingModel : modelEntryValue(_knownModels[0]);
+          }
+        }
         if (msg.mode) _cs.currentMode = msg.mode;
         if (msg.effort) _cs.currentEffort = msg.effort;
         if (msg.betas) _cs.currentBetas = msg.betas;
@@ -681,7 +699,7 @@ export function processMessage(msg) {
         var _effectiveTerminalId = (typeof msg.runtimeTerminalId === "number")
           ? msg.runtimeTerminalId
           : (typeof msg.terminalId === "number" ? msg.terminalId : null);
-        store.set({ activeSessionId: msg.id, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || store.get('currentModel'), currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode') });
+        store.set({ activeSessionId: msg.id, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || "", currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode') });
         // TUI sessions swap the chat UI for an embedded xterm running
         // `claude` inside a real PTY. Mount or tear down before the rest of
         // the chat-side bookkeeping runs so we don't waste work on hidden DOM.
@@ -728,6 +746,7 @@ export function processMessage(msg) {
         if (!msg.hasHistory && !msg.vendor) {
           selectDefaultVendorForBlankSession();
         }
+        if (!msg.model) requestVendorModels(store.get('currentVendor') || "claude", true);
         // Vendor toggle visibility + active-vendor indicator next to the
         // model chip.
         //   - Session has an explicit vendor: hide the toggle (it's

package/lib/public/modules/model-picker.js

@@ -112,6 +112,7 @@ export function getModelInfoUpdate(msg) {
   var vendor = msg.vendor || store.get('currentVendor') || "claude";
   var currentVendor = store.get('currentVendor');
   if (currentVendor && vendor !== currentVendor) return null;
+  if (msg.sessionId != null && msg.sessionId !== store.get('activeSessionId')) return null;
 
   var s = store.snap();
   if (msg.requestId && s.modelRequestId && msg.requestId !== s.modelRequestId) return null;

package/lib/sdk-bridge.js

@@ -245,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) {
@@ -849,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 });
@@ -1232,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;
     }
@@ -1438,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]) || [];
@@ -1461,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);
@@ -1874,7 +1876,7 @@ function createSDKBridge(opts) {
     // as if every CLI were missing while the default adapter starts up.
     sm.installedVendors = detectInstalledVendors(linuxUser);
     sm.availableVendors = getAvailableVendors(linuxUser);
-    sendModelInfoForVendor(defaultVendor, sm.currentModel || "");
+    sendModelInfoForVendor(null, defaultVendor, defaultModelForVendor(defaultVendor));
 
     // Initialize default adapter first (provides skills, slash commands, etc.)
     if (adapter) {
@@ -1906,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
@@ -1928,7 +1931,7 @@ function createSDKBridge(opts) {
     sm.modelsByVendor = sm.modelsByVendor || {};
 
     // Send the fully initialized state to the client.
-    sendModelInfoForVendor(defaultVendor, sm.currentModel || "");
+    sendModelInfoForVendor(null, defaultVendor, defaultModelForVendor(defaultVendor));
   }
 
   async function setModel(session, model) {
@@ -1940,22 +1943,24 @@ function createSDKBridge(opts) {
       // No active query — just store the model for next startQuery
       session.model = model;
       sm.saveSessionFile(session);
-      sm.currentModel = model;
+      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";
-      sendModelInfoForVendor(pendingVendor, 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[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) });
@@ -1988,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) });
     }

package/lib/sdk-message-processor.js

@@ -196,13 +196,20 @@ function attachMessageProcessor(ctx) {
         send({ type: "slash_commands", commands: sm.slashCommands });
       }
       if (parsed.model) {
-        sm.currentModel = sm.currentModel || sm._savedDefaultModel || parsed.model;
         var initVendor = session.vendor || (adapter && adapter.vendor) || "claude";
-        send({
+        sm.defaultModelByVendor = sm.defaultModelByVendor || {};
+        sm.defaultModelByVendor[initVendor] = sm.defaultModelByVendor[initVendor] || parsed.model;
+        var initModels = getModelsForVendor(initVendor);
+        var initModel = session.model || sm.defaultModelByVendor[initVendor] || "";
+        if (initModels.length > 0 && !initModels.some(function(entry) {
+          return entry === initModel || (entry && (entry.value === initModel || entry.id === initModel || entry.resolvedModel === initModel));
+        })) initModel = typeof initModels[0] === "string" ? initModels[0] : (initModels[0].value || initModels[0].id || "");
+        sendToSession(session, {
           type: "model_info",
-          model: sm.currentModel,
-          models: getModelsForVendor(initVendor),
+          model: initModel,
+          models: initModels,
           vendor: initVendor,
+          sessionId: session.localId,
           availableVendors: sm.availableVendors || [],
           installedVendors: sm.installedVendors || [],
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "3.4.0-beta.18",
+  "version": "3.4.0-beta.19",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",