clay-server 3.4.0-beta.5 → 3.4.0-beta.7

package/lib/project-connection.js

@@ -22,6 +22,17 @@ function dispatchMessageSafely(handleMessage, sendTo, slug, ws, msg) {
   }
 }
 
+function buildInitialModelInfo(sm, initialVendor, initialModel, initialModels) {
+  return {
+    type: "model_info",
+    model: initialModel || "",
+    models: initialModels || [],
+    vendor: initialVendor,
+    availableVendors: sm.availableVendors || [],
+    installedVendors: sm.installedVendors || [],
+  };
+}
+
 /**
  * Attach connection/disconnection handlers to a project context.
  *
@@ -167,9 +178,9 @@ function attachConnection(ctx) {
       sendTo(ws, { type: "slash_commands", commands: sm.slashCommands });
     }
     var initialModel = (restoredActive && restoredActive.model) || sm.currentModel || "";
-    if (initialModel) {
-      sendTo(ws, { type: "model_info", model: initialModel, models: initialModels, vendor: initialVendor, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
-    }
+    // 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 });
     sendTo(ws, { type: "last_vendor", vendor: sm.lastVendor || "" });
     sendTo(ws, Object.assign({ type: "codex_config" }, getCodexConfig(sm)));
@@ -333,4 +344,8 @@ function attachConnection(ctx) {
   };
 }
 
-module.exports = { attachConnection: attachConnection, dispatchMessageSafely: dispatchMessageSafely };
+module.exports = {
+  attachConnection: attachConnection,
+  buildInitialModelInfo: buildInitialModelInfo,
+  dispatchMessageSafely: dispatchMessageSafely,
+};

package/lib/public/app.js

@@ -295,6 +295,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     slashCommands: [],
     processing: false,
     activeSessionId: null,
+    sessionVendorBound: false,
     cliSessionId: null,
     isHeadlessMode: false,
     savedMainSlug: null,

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

@@ -52,6 +52,7 @@ import { setStatus } from './app-connection.js';
 import { handleWhatsNewState, handleWhatsNewSeenResult, setKnownEntries as setWhatsNewKnownEntries } from './whats-new.js';
 import { closeArticle as closeWhatsNewArticle } from './whats-new-article.js';
 import { resolvePaneSession, resolveSwitchedVendor } from './pane-session.js';
+import { selectDefaultVendorForBlankSession } from './vendor-selection.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';
@@ -414,6 +415,15 @@ export function processMessage(msg) {
         break;
 
       case "model_info": {
+        // Installation state applies across vendors. Keep it even when the
+        // model payload itself is stale for the active session.
+        var _vendorState = {};
+        if (msg.availableVendors) _vendorState.availableVendors = msg.availableVendors;
+        if (msg.installedVendors) _vendorState.installedVendors = msg.installedVendors;
+        if (Object.keys(_vendorState).length > 0) {
+          store.set(_vendorState);
+          selectDefaultVendorForBlankSession();
+        }
         // Drop stale model_info from a vendor that doesn't match the active
         // session's vendor. On high-latency connections, the server's default-
         // adapter model_info can arrive after session_switched has already
@@ -447,8 +457,6 @@ export function processMessage(msg) {
           _miUpdate.currentModel = store.get('currentModel');
         }
         if (msg.vendor && !store.get('vendorSelectionLocked')) _miUpdate.currentVendor = msg.vendor;
-        if (msg.availableVendors) _miUpdate.availableVendors = msg.availableVendors;
-        if (msg.installedVendors) _miUpdate.installedVendors = msg.installedVendors;
         if (msg.capabilities) _miUpdate.vendorCapabilities = msg.capabilities;
         store.set(_miUpdate);
         updateSettingsModels(_modelVal, msg.models || []);
@@ -661,7 +669,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, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode') });
+        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') });
         // 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.
@@ -706,7 +714,7 @@ export function processMessage(msg) {
           }
         }
         if (!msg.hasHistory && !msg.vendor) {
-          // Preserve explicit pre-message vendor choice on brand-new sessions.
+          selectDefaultVendorForBlankSession();
         }
         // Vendor toggle visibility + active-vendor indicator next to the
         // model chip.

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

@@ -474,7 +474,7 @@ export function initPanels() {
     if (vendor === (store.get('currentVendor') || "claude")) return;
     var installed = store.get('installedVendors') || [];
     if (installed.indexOf(vendor) === -1) return;
-    store.set({ currentVendor: vendor, currentModel: "", currentModels: [], vendorSelectionLocked: true });
+    store.set({ currentVendor: vendor, currentModel: "", currentModels: [], vendorSelectionLocked: true, sessionVendorBound: true });
     var ws = getWs();
     if (ws) ws.send(JSON.stringify({ type: "set_vendor", vendor: vendor }));
   }

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

@@ -13,6 +13,7 @@ import { showImageModal, showPasteModal } from './app-misc.js';
 import { sendMessage, hasSendableContent } from './input.js';
 import { getChatLayout } from './theme.js';
 import { getScheduledMsgEl } from './app-rate-limit.js';
+export { VENDOR_ORDER } from './vendor-priority.js';
 
 // Keep these client constants aligned with lib/yoke/vendor-registry.js. The
 // browser cannot import the server's CommonJS registry directly.
@@ -33,7 +34,6 @@ export var VENDOR_NAMES = {
 // Display order for every vendor Clay knows about, installed or not. Pickers
 // render the full list so a missing CLI reads as "not installed yet" rather
 // than "Clay doesn't support it".
-export var VENDOR_ORDER = ["claude", "codex", "antigravity", "opencode", "kiro"];
 // Where to send the user when they pick a vendor whose CLI isn't installed.
 export var VENDOR_HOMEPAGES = {
   claude: "https://claude.com/product/claude-code",

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

@@ -299,13 +299,10 @@ function appendSessionCloseButton(el, session) {
   el.appendChild(closeBtn);
 }
 
-// Resolve the vendor the "New session" button should launch: the project's
-// last-used vendor when its CLI is still installed, else the first installed
-// vendor, else Claude (so the button always has a sane label to render).
+// Resolve the vendor the "New session" button should launch from the stable
+// installed-vendor priority (Claude, then Codex, then the remaining vendors).
 export function resolveDefaultVendor() {
   var installed = store.get('installedVendors') || [];
-  var last = store.get('lastVendor') || "";
-  if (last && installed.indexOf(last) !== -1) return last;
   for (var i = 0; i < VENDOR_ORDER.length; i++) {
     if (installed.indexOf(VENDOR_ORDER[i]) !== -1) return VENDOR_ORDER[i];
   }
@@ -330,6 +327,7 @@ export function startNewSession(vendor, extra) {
     currentModel: "",
     currentModels: [],
     vendorSelectionLocked: true,
+    sessionVendorBound: true,
   });
 }
 

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

@@ -0,0 +1,9 @@
+export var VENDOR_ORDER = ["claude", "codex", "antigravity", "opencode", "kiro"];
+
+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/sdk-bridge.js

@@ -1859,6 +1859,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(defaultVendor, sm.currentModel || "");
+
     // Initialize default adapter first (provides skills, slash commands, etc.)
     if (adapter) {
       try {
@@ -1910,19 +1917,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(defaultVendor, sm.currentModel || "");
   }
 
   async function setModel(session, model) {

package/package.json

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