clay-server 4.1.0-beta.14 → 4.1.0-beta.15

package/lib/project.js

@@ -1598,8 +1598,8 @@ function createProjectContext(opts) {
     }
 
     // --- DM messages (delegated to server-level handler) ---
-    if (msg.type === "home_debate_question_response" || msg.type === "home_debate_control" || msg.type === "home_mate_creation_question_response" || msg.type === "default_ai_get" || msg.type === "default_ai_catalog_get" || msg.type === "default_ai_set" || msg.type === "cursor_sharing_get" || msg.type === "cursor_sharing_set") {
-      if (typeof opts.onDmMessage === "function") opts.onDmMessage(ws, msg);
+    if (msg.type === "home_debate_question_response" || msg.type === "home_debate_control" || msg.type === "home_mate_creation_question_response" || msg.type === "default_ai_get" || msg.type === "default_ai_catalog_get" || msg.type === "default_ai_set" || msg.type === "default_vendor_get" || msg.type === "default_vendor_set" || msg.type === "cursor_sharing_get" || msg.type === "cursor_sharing_set") {
+      if (typeof opts.onDmMessage === "function") opts.onDmMessage(ws, msg, slug);
       return;
     }
     if (msg.type === "issue_reference_resolve" || msg.type === "home_clay_ask" || msg.type === "home_clay_session_resolve" || msg.type === "home_clay_log_resolve") {

package/lib/public/app.js

@@ -71,6 +71,7 @@ import { rememberHomePrimarySurface } from './modules/home-surface.js';
 import { initRateLimit, handleRateLimitEvent as _rlHandleRateLimitEvent, updateRateLimitUsage as _rlUpdateRateLimitUsage, handleFastModeState as _rlHandleFastModeState, resetRateLimitState } from './modules/app-rate-limit.js';
 import { initCursors, handleRemoteCursorMove as _curHandleRemoteCursorMove, handleRemoteCursorLeave as _curHandleRemoteCursorLeave, handleRemoteSelection as _curHandleRemoteSelection, clearRemoteCursors as _curClearRemoteCursors, initCursorToggle } from './modules/app-cursors.js';
 import { initDefaultAi } from './modules/default-ai.js';
+import { requestDefaultVendor } from './modules/default-vendor.js';
 import { initFavicon, updateFavicon as _favUpdateFavicon, setSendBtnMode as _favSetSendBtnMode, blinkIO as _favBlinkIO, blinkSessionDot as _favBlinkSessionDot, updateCrossProjectBlink as _favUpdateCrossProjectBlink, startUrgentBlink as _favStartUrgentBlink, stopUrgentBlink as _favStopUrgentBlink, setActivity as _favSetActivity } from './modules/app-favicon.js';
 import { initHeader, closeSessionInfoPopover as _hdrCloseSessionInfoPopover, updateHistorySentinel as _hdrUpdateHistorySentinel, requestMoreHistory as _hdrRequestMoreHistory, prependOlderHistory as _hdrPrependOlderHistory } from './modules/app-header.js';
 import { initSessionActions } from './modules/session-actions.js';
@@ -427,6 +428,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     defaultAiState: { loading: false, saving: false, refreshRequestId: null, saveRequestId: null, catalogRequestIds: {}, catalogs: {}, preference: null, selection: null, installedVendors: [], accountAvailable: true, accountId: null, serverEpoch: null, canonicalRevision: 0, error: "" },
     defaultAiDraft: { vendor: "", model: "", effort: "" },
     defaultAiDraftDirty: false,
+    defaultVendorState: { loading: false, saving: false, getRequestId: null, saveRequestId: null, preference: null, preferencePresent: false, installedVendors: [], accountId: null, projectSlug: null, serverEpoch: null, canonicalRevision: 0, error: "" },
 
     // dm
     dmTargetUser: null,
@@ -1024,7 +1026,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
       // the project Mate DM preference therefore hides only Mate shortcuts.
       if (document.body) document.body.classList.add('is-multi-user');
     }
-    if (d.user && d.user.id) { store.set({ myUserId: d.user.id }); }
+    if (d.user && d.user.id) { store.set({ myUserId: d.user.id }); requestDefaultVendor(); }
     if (d.permissions) store.set({ permissions: d.permissions });
     if (d.mustChangePin) showForceChangePinOverlay();
     // Single-user mode: clear user strip skeletons immediately (no presence message will arrive)

package/lib/public/css/mobile-nav.css

@@ -423,6 +423,13 @@
   .mobile-vendor-list .mobile-session-new-vendor:active {
     background: rgba(var(--overlay-rgb), 0.1);
   }
+  .mobile-vendor-row { display: flex; align-items: stretch; gap: 4px; }
+  .mobile-vendor-row .mobile-session-new-vendor { flex: 1 1 auto; min-width: 0; }
+  .mobile-vendor-set-default { border: 1px solid var(--border-subtle); border-radius: 8px; background: transparent; color: var(--text-dimmer); padding: 0 8px; font-size: 11px; white-space: nowrap; }
+  .mobile-vendor-set-default:active { background: rgba(var(--overlay-rgb), 0.1); }
+  .mobile-vendor-set-default:disabled { opacity: 0.55; }
+  .mobile-session-new-preference-status { padding: 4px 8px 8px; color: var(--error); font-size: 11px; }
+  .mobile-session-new-fallback-note { color: var(--text-muted); }
   .mobile-vendor-note {
     margin-left: auto;
     font-size: 12px;

package/lib/public/css/sidebar.css

@@ -1464,6 +1464,13 @@
 
 /* --- New-session vendor picker --- */
 .session-new-menu { min-width: 200px; }
+.session-new-vendor-row { display: flex; align-items: stretch; }
+.session-new-vendor-row .session-new-vendor { flex: 1 1 auto; min-width: 0; }
+.session-new-set-default { border: 0; background: transparent; color: var(--text-dimmer); padding: 0 8px; font-size: 10px; cursor: pointer; }
+.session-new-set-default:hover { color: var(--text); background: rgba(var(--overlay-rgb), 0.05); }
+.session-new-set-default:disabled { opacity: 0.55; cursor: wait; }
+.session-new-preference-status { padding: 6px 10px; color: var(--error); font-size: 11px; }
+.session-new-fallback-note { color: var(--text-muted); border-bottom: 1px solid var(--border); }
 
 .session-ctx-sep {
   height: 1px;

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

@@ -17,6 +17,7 @@ import { resumeHomeChat } from './home-mate-chat.js';
 import { requestHomeSurfacePreference } from './home-surface.js';
 import { isHomeDebatesSurface } from './home-sub-surface.js';
 import { beginDefaultAiConnection, requestDefaultAi } from './default-ai.js';
+import { beginDefaultVendorConnection, requestDefaultVendor } from './default-vendor.js';
 
 var reconnectTimer = null;
 var reconnectDelay = 1000;
@@ -277,6 +278,8 @@ export function connect() {
     onConnected();
     beginDefaultAiConnection();
     requestDefaultAi();
+    beginDefaultVendorConnection();
+    requestDefaultVendor();
   };
 
   newWs.onclose = function (e) {

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

@@ -19,6 +19,7 @@ import { refreshMobileChatSheet } from './sidebar-mobile.js';
 import { renderMateSessionList, handleMateSearchResults, updateMateSidebarProfile } from './mate-sidebar.js';
 import { openHomeChat, handleHomeMateHistory, handleHomeMateDelta, handleHomeMateSegment, handleHomeMateDone, handleHomeMateError, handleHomeMateSessionsState } from './home-mate-chat.js';
 import { handleHomeSurfaceState } from './home-surface.js';
+import { handleDefaultVendorMessage } from './default-vendor.js';
 import { handleHomeMateMemoryState, handleHomeMateKnowledgeState } from './home-mate-settings.js';
 import { renderKnowledgeList, handleKnowledgeContent } from './mate-knowledge.js';
 import { renderMemoryList } from './mate-memory.js';
@@ -65,7 +66,7 @@ import { closeArticle as closeWhatsNewArticle } from './whats-new-article.js';
 import { resolvePaneSession, resolveSwitchedVendor } from './pane-session.js';
 import { selectDefaultVendorForBlankSession } from './vendor-selection.js';
 import { getModelInfoUpdate, modelEntryValue, modelEntryMatches, handleModelSelectionResult, requestVendorModels } from './model-picker.js';
-import { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
+import { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel, markContextUnavailable } from './app-panels.js';
 import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress, finishProjectSessionActivation } from './app-projects.js';
 import { updateHistorySentinel, prependOlderHistory } from './app-header.js';
 import { hideHomeHub, showHomeHub } from './app-home-hub.js';
@@ -97,6 +98,7 @@ export function processMessage(msg) {
   if (handleAutonomousRunMessage(msg)) return;
   if (handleLoopInterviewMessage(msg)) return;
   if (handleScheduledTaskMessage(msg)) return;
+  if (handleDefaultVendorMessage(msg)) return;
   if (msg && msg.type === "schedule_message_result") {
     handleScheduleMessageResult(msg);
     return;
@@ -226,9 +228,8 @@ export function processMessage(msg) {
           applyDeadSessionTodoCompaction();
         }
         // Restore cached rich context usage BEFORE updateContextPanel runs
-        if (msg.contextUsage) {
-          store.set({ richContextUsage: msg.contextUsage });
-        }
+        if (msg.contextUsage && !msg.contextUsage.unavailable) store.set({ richContextUsage: msg.contextUsage });
+        else markContextUnavailable();
         // Restore accurate context data from the last result in full history
         if (msg.lastUsage || msg.lastModelUsage) {
           accumulateContext(msg.lastCost, msg.lastUsage, msg.lastModelUsage, msg.lastStreamInputTokens);
@@ -1273,7 +1274,8 @@ export function processMessage(msg) {
       case "context_usage":
         if (msg.sessionId != null && msg.sessionId !== store.get("activeSessionId")) break;
         if (msg.data && !store.get('replayingHistory')) {
-          store.set({ richContextUsage: msg.data });
+          if (msg.data.unavailable) markContextUnavailable();
+          else store.set({ richContextUsage: msg.data });
           // UI sync handled by store subscriber in app-panels.js
         }
         break;

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

@@ -10,7 +10,7 @@ import { setupModelPicker, renderModelPicker, requestVendorModels, prepareModelP
 
 // --- Module-owned state (not in store) ---
 var sessionUsage = { cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0 };
-var contextData = { contextWindow: 0, maxOutputTokens: 0, model: "-", cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0, thinking: null, costBasis: null };
+var contextData = { contextWindow: 0, currentInput: null, maxOutputTokens: 0, model: "-", cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0, thinking: null, costBasis: null };
 var ctxPopoverEl = null;
 var ctxHoverTimer = null;
 var statusRefreshTimer = null;
@@ -718,9 +718,18 @@ export function contextPctClass(pct) {
 
 export function updateContextPanel() {
   if (!contextUsedEl) return;
-  // Context window usage = input tokens only (includes cache read/write)
-  var used = contextData.input;
-  var win = contextData.contextWindow;
+  // Context occupancy is separate from generic per-turn accounting. Codex
+  // only supplies currentInput from a verified last-turn snapshot; rich
+  // context usage is more authoritative when available.
+  var rich = store.get('richContextUsage');
+  var hasRich = rich && (
+    (typeof rich.totalTokens === "number" && typeof rich.maxTokens === "number" && rich.maxTokens > 0) ||
+    (typeof rich.input_tokens === "number" && typeof rich.contextWindow === "number" && rich.contextWindow > 0)
+  );
+  var hasCurrent = typeof contextData.currentInput === "number";
+  var hasContext = !!(hasRich || hasCurrent);
+  var used = hasRich ? (typeof rich.totalTokens === "number" ? rich.totalTokens : rich.input_tokens) : (hasCurrent ? contextData.currentInput : 0);
+  var win = hasRich ? (typeof rich.maxTokens === "number" ? rich.maxTokens : rich.contextWindow) : (hasCurrent ? contextData.contextWindow : 0);
   var pct = win > 0 ? Math.min(100, (used / win) * 100) : 0;
   var cls = contextPctClass(pct);
   reportPaneContext({ pct: pct, used: used, win: win, cls: cls, model: contextData.model, cost: contextData.cost });
@@ -734,7 +743,7 @@ export function updateContextPanel() {
     contextMiniFill.className = "context-mini-fill" + cls;
   }
   if (contextMiniLabel) {
-    contextMiniLabel.textContent = (win > 0 ? formatTokens(used) + "/" + formatTokens(win) : "0%");
+    contextMiniLabel.textContent = (win > 0 ? formatTokens(used) + "/" + formatTokens(win) : "-");
   }
   // Header bar. A split group has no meaningful group-level context usage:
   // the two members have separate windows, and the parent shell's own numbers
@@ -742,9 +751,9 @@ export function updateContextPanel() {
   // chip instead, so hide the title-bar gauge while a split is open.
   var splitOpen = !!store.get('splitPanes');
   var headerCtxEl = store.get('headerContextEl');
-  if (headerCtxEl) headerCtxEl.classList.toggle("hidden", splitOpen);
-  if (contextMini) contextMini.classList.toggle("split-hidden", splitOpen);
-  if (pct > 0 && !splitOpen) {
+  if (headerCtxEl) headerCtxEl.classList.toggle("hidden", splitOpen || !hasContext);
+  if (contextMini) contextMini.classList.toggle("split-hidden", splitOpen || !hasContext);
+  if (hasContext && !splitOpen) {
     var statusArea = document.querySelector(".title-bar-content .status");
     var hCtxEl = store.get('headerContextEl');
     if (statusArea && !hCtxEl) {
@@ -808,7 +817,7 @@ export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens
     // when available -- result.usage.input_tokens sums all API calls in a turn,
     // inflating context usage when tools are involved.
     // Falls back to the summed value for setups that don't emit message_start.
-    if (lastStreamInputTokens) {
+    if (typeof lastStreamInputTokens === "number") {
       contextData.input = lastStreamInputTokens;
     } else {
       contextData.input = (usage.input_tokens || usage.inputTokens || 0)
@@ -817,6 +826,11 @@ export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens
     contextData.output = usage.output_tokens || usage.outputTokens || 0;
     contextData.cacheRead = usage.cache_read_input_tokens || usage.cacheReadInputTokens || 0;
     contextData.cacheWrite = usage.cache_creation_input_tokens || usage.cacheCreationInputTokens || 0;
+    if (store.get('currentVendor') === "codex") {
+      contextData.currentInput = typeof lastStreamInputTokens === "number" ? lastStreamInputTokens : null;
+    } else {
+      contextData.currentInput = typeof lastStreamInputTokens === "number" ? lastStreamInputTokens : contextData.input;
+    }
   }
   contextData.turns++;
   if (modelUsage) {
@@ -830,6 +844,21 @@ export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens
       contextData.model = displayModel;
       contextData.contextWindow = resolveContextWindow(displayModel, mu.contextWindow);
       if (mu.maxOutputTokens) contextData.maxOutputTokens = mu.maxOutputTokens;
+      if (store.get('currentVendor') === "codex") {
+        var snapshot = mu.contextSnapshot;
+        if (snapshot) store.set({ richContextUsage: null });
+        if (snapshot && snapshot.valid === true
+            && typeof snapshot.inputTokens === "number"
+            && typeof snapshot.contextWindow === "number"
+            && snapshot.contextWindow > 0) {
+          contextData.currentInput = snapshot.inputTokens;
+          contextData.contextWindow = snapshot.contextWindow;
+        } else {
+          // An explicit invalid marker is authoritative: do not retain an
+          // occupancy value from the previous live turn or history replay.
+          contextData.currentInput = null;
+        }
+      }
 
       // thinkingTokens and costBasis are per-model and optional: absent on
       // older CLI builds and, for a resumed session, on the turns that ran
@@ -874,11 +903,17 @@ export function applyContextView(view) {
 }
 
 export function resetContextData() {
-  contextData = { contextWindow: 0, maxOutputTokens: 0, model: "-", cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0, thinking: null, costBasis: null };
+  contextData = { contextWindow: 0, currentInput: null, maxOutputTokens: 0, model: "-", cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0, thinking: null, costBasis: null };
   store.set({ richContextUsage: null });
   // hideCtxPopover + updateContextPanel handled by store subscriber
 }
 
+export function markContextUnavailable() {
+  contextData.currentInput = null;
+  store.set({ richContextUsage: null });
+  updateContextPanel();
+}
+
 export function resetContext() {
   resetContextData();
   // Keep view state, just reset data
@@ -952,8 +987,8 @@ export function renderCtxPopover() {
   if (!ctxPopoverEl || !richContextUsage) return;
   var d = richContextUsage;
   var cats = d.categories || [];
-  var total = d.totalTokens || 0;
-  var max = d.maxTokens || 0;
+  var total = d.totalTokens != null ? d.totalTokens : (d.input_tokens || 0);
+  var max = d.maxTokens != null ? d.maxTokens : (d.contextWindow || 0);
   var pct = d.percentage != null ? d.percentage : (max > 0 ? (total / max) * 100 : 0);
 
   var html = "";

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

@@ -0,0 +1,116 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { firstInstalledVendor } from './vendor-priority.js';
+
+function send(message) {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  ws.send(JSON.stringify(message));
+  return true;
+}
+
+var sequence = 0;
+
+function nextRequestId(prefix) {
+  sequence += 1;
+  return prefix + Date.now() + "-" + sequence;
+}
+
+function emptyState(accountId, projectSlug) {
+  return { loading: false, saving: false, getRequestId: null, saveRequestId: null, preference: null, preferencePresent: false, installedVendors: [], accountId: accountId || null, projectSlug: projectSlug || null, serverEpoch: null, canonicalRevision: 0, error: "" };
+}
+
+export function requestDefaultVendor() {
+  var id = nextRequestId("default-vendor-");
+  var state = store.get("defaultVendorState") || {};
+  store.set({ defaultVendorState: Object.assign({}, state, { loading: true, getRequestId: id, error: "" }) });
+  if (!send({ type: "default_vendor_get", requestId: id })) {
+    store.set({ defaultVendorState: Object.assign({}, store.get("defaultVendorState") || {}, { loading: false, getRequestId: null, error: "Clay is offline. Reconnect and try again." }) });
+    return false;
+  }
+  return true;
+}
+
+export function beginDefaultVendorConnection() {
+  var state = store.get("defaultVendorState") || {};
+  store.set({ defaultVendorState: Object.assign({}, state, {
+    loading: false,
+    saving: false,
+    getRequestId: null,
+    saveRequestId: null,
+    preference: null,
+    preferencePresent: false,
+    installedVendors: [],
+    accountId: store.get("myUserId") || "default",
+    projectSlug: store.get("currentSlug") || null,
+    serverEpoch: null,
+    canonicalRevision: 0,
+    error: "",
+  }) });
+}
+
+export function saveDefaultVendor(vendor) {
+  var state = store.get("defaultVendorState") || {};
+  if (vendor !== "" && (state.installedVendors || []).indexOf(vendor) === -1) return false;
+  var id = nextRequestId("default-vendor-save-");
+  store.set({ defaultVendorState: Object.assign({}, state, { saving: true, saveRequestId: id, error: "" }) });
+  if (!send({ type: "default_vendor_set", requestId: id, vendor: vendor })) {
+    store.set({ defaultVendorState: Object.assign({}, store.get("defaultVendorState") || {}, { saving: false, saveRequestId: null, error: "Clay is offline. Reconnect and try again." }) });
+    return false;
+  }
+  return true;
+}
+
+export function handleDefaultVendorMessage(msg) {
+  if (!msg || msg.type !== "default_vendor_state") return false;
+  var state = store.get("defaultVendorState") || {};
+  var accountId = store.get("myUserId") || "default";
+  var projectSlug = store.get("currentSlug") || null;
+  var isGetReply = !!msg.requestId && msg.requestId === state.getRequestId;
+  var isSaveReply = !!msg.requestId && msg.requestId === state.saveRequestId;
+  var isCorrelatedAccountFailure = (isGetReply || isSaveReply) && msg.accountId === null && msg.accountAvailable === false;
+  if ((!isCorrelatedAccountFailure && msg.accountId !== accountId) || (msg.accountId === null && !isCorrelatedAccountFailure)) return true;
+  if (Object.prototype.hasOwnProperty.call(msg, "projectSlug") && msg.projectSlug !== projectSlug) return true;
+  if (msg.serverEpoch && state.serverEpoch && msg.serverEpoch !== state.serverEpoch && (!msg.requestId || (msg.requestId !== state.getRequestId && msg.requestId !== state.saveRequestId))) return true;
+  if (msg.canonicalRevision !== undefined && msg.canonicalRevision < (state.canonicalRevision || 0) && msg.serverEpoch === state.serverEpoch) return true;
+  if (msg.requestId && !isGetReply && !isSaveReply) return true;
+  if (msg.requestId && !isSaveReply && msg.ready === false && state.saving) return true;
+  var next = Object.assign({}, state, {
+    accountId: msg.accountId || accountId,
+    projectSlug: projectSlug,
+    serverEpoch: msg.serverEpoch || state.serverEpoch || null,
+    canonicalRevision: typeof msg.canonicalRevision === "number" ? msg.canonicalRevision : state.canonicalRevision || 0,
+    installedVendors: Array.isArray(msg.installedVendors) ? msg.installedVendors : state.installedVendors || [],
+    loading: isGetReply ? false : state.loading,
+    saving: isSaveReply ? false : state.saving,
+    getRequestId: isGetReply ? null : state.getRequestId,
+    saveRequestId: isSaveReply ? null : state.saveRequestId,
+    error: msg.error || ""
+  });
+  if (Object.prototype.hasOwnProperty.call(msg, "preference")) {
+    next.preference = msg.preference || null;
+    next.preferencePresent = msg.preferencePresent === true;
+  }
+  store.set({ defaultVendorState: next });
+  return true;
+}
+
+store.subscribe(function (state, previous) {
+  if (state.myUserId !== previous.myUserId || state.currentSlug !== previous.currentSlug) {
+    var accountId = state.myUserId || "default";
+    store.set({ defaultVendorState: emptyState(accountId, state.currentSlug || null) });
+    if (state.connected) requestDefaultVendor();
+  }
+});
+
+export function resolvePreferredVendor(installedVendors) {
+  var installed = Array.isArray(installedVendors) ? installedVendors : [];
+  var state = store.get("defaultVendorState") || {};
+  if (state.preference && installed.indexOf(state.preference) !== -1) return state.preference;
+  return firstInstalledVendor(installed);
+}
+
+export function defaultVendorUnavailable(installedVendors) {
+  var state = store.get("defaultVendorState") || {};
+  return !!state.preference && (installedVendors || []).indexOf(state.preference) === -1;
+}

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

@@ -15,6 +15,7 @@ import {
   startNewSession
 } from './sidebar-sessions.js';
 import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, VENDOR_HOMEPAGES, isExperimentalVendor } from './app-rendering.js';
+import { defaultVendorUnavailable, resolvePreferredVendor, saveDefaultVendor } from './default-vendor.js';
 import {
   getCachedProjectList,
   getCachedCurrentSlug,
@@ -675,14 +676,17 @@ function renderMobileSessionsInto(container) {
   // the project's last-used vendor, plus a chevron that expands the full
   // vendor list. The list expands inline rather than as a fixed-position
   // popover because it lives inside a scrolling bottom sheet.
-  var mobileDefaultVendor = resolveDefaultVendor();
+  var mobileDefaultVendor = resolvePreferredVendor(store.get('installedVendors') || []) || resolveDefaultVendor();
   var mobileInstalled = store.get('installedVendors') || [];
+  var mobileDefaultState = store.get('defaultVendorState') || {};
 
   var newRow = document.createElement("div");
   newRow.className = "mobile-session-new-row";
 
   var mainBtn = document.createElement("button");
   mainBtn.className = "mobile-session-new mobile-session-new-main";
+  mainBtn.title = "New " + (VENDOR_NAMES[mobileDefaultVendor] || mobileDefaultVendor) + " session";
+  if (defaultVendorUnavailable(mobileInstalled)) mainBtn.title += " (saved default is unavailable; using installed priority)";
   mainBtn.innerHTML = '<img src="' + (VENDOR_AVATARS[mobileDefaultVendor] || VENDOR_AVATARS.claude) +
     '" class="mobile-session-new-icon" alt=""><span>New ' + (VENDOR_NAMES[mobileDefaultVendor] || mobileDefaultVendor) + ' session</span>';
   mainBtn.addEventListener("click", function () {
@@ -704,12 +708,20 @@ function renderMobileSessionsInto(container) {
   });
   newRow.appendChild(chevronBtn);
 
+  if (defaultVendorUnavailable(mobileInstalled) && mobileDefaultState.preference) {
+    var mobileFallbackNote = document.createElement("div");
+    mobileFallbackNote.className = "mobile-session-new-preference-status mobile-session-new-fallback-note";
+    mobileFallbackNote.textContent = "Saved default " + (VENDOR_NAMES[mobileDefaultState.preference] || mobileDefaultState.preference) + " is unavailable. Using " + (VENDOR_NAMES[mobileDefaultVendor] || mobileDefaultVendor) + ".";
+  }
+
   // Every known vendor is listed. Uninstalled ones stay visible but disabled,
   // and tapping one opens the vendor's homepage.
   for (var vi = 0; vi < VENDOR_ORDER.length; vi++) {
     (function (vendor) {
       var isInstalled = mobileInstalled.indexOf(vendor) !== -1;
       var name = VENDOR_NAMES[vendor] || vendor;
+      var vendorRow = document.createElement("div");
+      vendorRow.className = "mobile-vendor-row";
       var vBtn = document.createElement("button");
       vBtn.className = "mobile-session-new mobile-session-new-vendor";
       if (!isInstalled) vBtn.classList.add("disabled");
@@ -726,11 +738,46 @@ function renderMobileSessionsInto(container) {
         startNewSession(vendor);
         closeMobileSheet();
       });
-      vendorList.appendChild(vBtn);
+      vendorRow.appendChild(vBtn);
+      if (isInstalled) {
+        var defaultBtn = document.createElement("button");
+        defaultBtn.type = "button";
+        defaultBtn.className = "mobile-vendor-set-default";
+        defaultBtn.textContent = mobileDefaultState.saving ? "Saving…" : (vendor === mobileDefaultVendor && !defaultVendorUnavailable(mobileInstalled) ? "Default" : "Set default");
+        defaultBtn.disabled = mobileDefaultState.saving === true;
+        defaultBtn.setAttribute("aria-label", "Set " + name + " as default vendor");
+        defaultBtn.addEventListener("click", function (e) {
+          e.preventDefault();
+          e.stopPropagation();
+          saveDefaultVendor(vendor);
+        });
+        vendorRow.appendChild(defaultBtn);
+      }
+      vendorList.appendChild(vendorRow);
     })(VENDOR_ORDER[vi]);
   }
 
+  var automaticBtn = document.createElement("button");
+  automaticBtn.className = "mobile-session-new mobile-session-new-vendor mobile-session-new-automatic";
+  automaticBtn.type = "button";
+  automaticBtn.textContent = "Use automatic default";
+  automaticBtn.disabled = mobileDefaultState.saving === true;
+  automaticBtn.addEventListener("click", function (e) {
+    e.preventDefault();
+    e.stopPropagation();
+    saveDefaultVendor("");
+  });
+  vendorList.appendChild(automaticBtn);
+  if (mobileDefaultState.error) {
+    var mobileStatus = document.createElement("div");
+    mobileStatus.className = "mobile-session-new-preference-status";
+    mobileStatus.setAttribute("role", "alert");
+    mobileStatus.textContent = mobileDefaultState.error;
+    vendorList.appendChild(mobileStatus);
+  }
+
   container.appendChild(newRow);
+  if (mobileFallbackNote) container.appendChild(mobileFallbackNote);
   container.appendChild(vendorList);
 
   // Partition: loop sessions vs normal sessions (same logic as desktop renderSessionList)

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

@@ -15,6 +15,7 @@ import { refreshMobileChatSheet } from './sidebar-mobile.js';
 import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, VENDOR_HOMEPAGES, isExperimentalVendor } from './app-rendering.js';
 import { openGroup, separateGroup } from './split-view.js';
 import { groupedSessionIds } from './split-group-helpers.js';
+import { defaultVendorUnavailable, resolvePreferredVendor, saveDefaultVendor } from './default-vendor.js';
 import { openPairDialog } from './split-pair-ui.js';
 import {
   hierarchyItemMatches,
@@ -41,6 +42,7 @@ var countdownContainer = null;
 
 // --- Session context menu ---
 var sessionCtxMenu = null;
+var sessionCtxMenuAnchor = null;
 var sessionCtxSessionId = null;
 var draggedSessionId = null;
 var draggedSessionBookmarked = false;
@@ -48,6 +50,18 @@ var headerSearchOpen = false;
 var armedDeleteSessionId = null;
 var armedDeleteTimer = null;
 
+store.subscribe(function (state, previous) {
+  if (state.defaultVendorState !== previous.defaultVendorState || state.installedVendors !== previous.installedVendors) {
+    var reopenNewMenu = !!(sessionCtxMenu && sessionCtxMenuAnchor);
+    if (reopenNewMenu) closeSessionCtxMenu();
+    if (getSessionListEl()) renderSessionList();
+    if (reopenNewMenu) {
+      var freshAnchor = getSessionListEl().querySelector(".session-top-action.split-chevron");
+      if (freshAnchor) showNewSessionMenu(freshAnchor, resolveDefaultVendor());
+    }
+  }
+});
+
 function sendSessionBookmark(sessionId, bookmarked) {
   if (getWs() && store.get('connected')) {
     getWs().send(JSON.stringify({ type: "set_session_bookmark", sessionId: sessionId, bookmarked: !!bookmarked }));
@@ -317,10 +331,7 @@ function appendSessionCloseButton(el, session) {
 // installed-vendor priority (Claude, then Codex, then the remaining vendors).
 export function resolveDefaultVendor() {
   var installed = store.get('installedVendors') || [];
-  for (var i = 0; i < VENDOR_ORDER.length; i++) {
-    if (installed.indexOf(VENDOR_ORDER[i]) !== -1) return VENDOR_ORDER[i];
-  }
-  return "claude";
+  return resolvePreferredVendor(installed) || "claude";
 }
 
 // Single entry point for session creation from the sidebar. Optimistically
@@ -361,6 +372,7 @@ function renderSessionTopActions() {
   mainBtn.className = "session-top-action split-main";
   mainBtn.type = "button";
   mainBtn.title = "New " + (VENDOR_NAMES[defaultVendor] || defaultVendor) + " session";
+  if (defaultVendorUnavailable(store.get('installedVendors') || [])) mainBtn.title += " (saved default is unavailable; using installed priority)";
   mainBtn.innerHTML = '<img src="' + (VENDOR_AVATARS[defaultVendor] || VENDOR_AVATARS.claude) +
     '" class="session-top-action-icon" alt=""><span>New session</span>';
   mainBtn.addEventListener("click", function () {
@@ -394,6 +406,15 @@ function showNewSessionMenu(anchorBtn, defaultVendor) {
   var menu = document.createElement("div");
   menu.className = "session-ctx-menu session-new-menu";
   var installed = store.get('installedVendors') || [];
+  var defaultVendorState = store.get('defaultVendorState') || {};
+  sessionCtxMenuAnchor = anchorBtn;
+
+  if (defaultVendorUnavailable(installed) && defaultVendorState.preference) {
+    var fallbackNote = document.createElement("div");
+    fallbackNote.className = "session-new-preference-status session-new-fallback-note";
+    fallbackNote.textContent = "Saved default " + (VENDOR_NAMES[defaultVendorState.preference] || defaultVendorState.preference) + " is unavailable. Using " + (VENDOR_NAMES[defaultVendor] || defaultVendor) + ".";
+    menu.appendChild(fallbackNote);
+  }
 
   // Every known vendor is listed. Uninstalled ones stay visible but disabled,
   // and clicking one opens the vendor's homepage so the user can install it.
@@ -401,6 +422,8 @@ function showNewSessionMenu(anchorBtn, defaultVendor) {
     (function (vendor) {
       var isInstalled = installed.indexOf(vendor) !== -1;
       var name = VENDOR_NAMES[vendor] || vendor;
+      var row = document.createElement("div");
+      row.className = "session-new-vendor-row";
       var item = document.createElement("button");
       item.className = "session-ctx-item session-new-vendor";
       if (!isInstalled) item.classList.add("disabled");
@@ -423,10 +446,46 @@ function showNewSessionMenu(anchorBtn, defaultVendor) {
         }
         startNewSession(vendor);
       });
-      menu.appendChild(item);
+      row.appendChild(item);
+      if (isInstalled) {
+        var defaultBtn = document.createElement("button");
+        defaultBtn.type = "button";
+        defaultBtn.className = "session-new-set-default";
+        defaultBtn.textContent = defaultVendorState.saving ? "Saving…" : (vendor === defaultVendor && !defaultVendorUnavailable(installed) ? "Default" : "Set default");
+        defaultBtn.disabled = defaultVendorState.saving === true;
+        defaultBtn.setAttribute("aria-label", "Set " + name + " as default vendor");
+        defaultBtn.title = "Use " + name + " for New session by default";
+        defaultBtn.addEventListener("click", function (e) {
+          e.preventDefault();
+          e.stopPropagation();
+          saveDefaultVendor(vendor);
+        });
+        row.appendChild(defaultBtn);
+      }
+      menu.appendChild(row);
     })(VENDOR_ORDER[i]);
   }
 
+  var automatic = document.createElement("button");
+  automatic.className = "session-ctx-item session-new-automatic";
+  automatic.type = "button";
+  automatic.textContent = "Use automatic default";
+  automatic.disabled = defaultVendorState.saving === true;
+  automatic.title = "Use Clay's installed-vendor priority";
+  automatic.addEventListener("click", function (e) {
+    e.stopPropagation();
+    closeSessionCtxMenu();
+    saveDefaultVendor("");
+  });
+  menu.appendChild(automatic);
+  if (defaultVendorState.error) {
+    var status = document.createElement("div");
+    status.className = "session-new-preference-status";
+    status.setAttribute("role", "alert");
+    status.textContent = defaultVendorState.error;
+    menu.appendChild(status);
+  }
+
   if (installed.length > 0) {
     var pairSep = document.createElement("div");
     pairSep.className = "session-ctx-sep";
@@ -660,6 +719,7 @@ export function getExpandedLoopRuns() {
 // --- Context menu ---
 
 function closeSessionCtxMenu() {
+  sessionCtxMenuAnchor = null;
   if (sessionCtxMenu) {
     sessionCtxMenu.remove();
     sessionCtxMenu = null;

package/lib/sdk-message-processor.js

@@ -583,7 +583,12 @@ function attachMessageProcessor(ctx) {
         && /not logged in/i.test(previewTrimmed) && /\/login/i.test(previewTrimmed);
       // Fetch rich context usage breakdown (fire-and-forget, non-blocking)
       if (session.queryInstance && typeof session.queryInstance.getContextUsage === "function") {
+        var contextQuery = session.queryInstance;
+        var contextTurn = session.turnCount;
         contextUsage.readUsage(session, "summary").then(function(ctxUsage) {
+          if (session.queryInstance !== contextQuery || session.turnCount !== contextTurn) return;
+          // null means the shared reader suppressed a superseded response;
+          // only an adapter's explicit unavailable object may clear the UI.
           if (!ctxUsage) return;
           session.lastContextUsage = ctxUsage;
           sendToSession(session, { type: "context_usage", data: ctxUsage });

package/lib/server-default-vendor.js

@@ -0,0 +1,60 @@
+// Authenticated user-wide New session vendor preference service.
+
+function attachDefaultVendorService(deps) {
+  var users = deps.users;
+  var homeChatHandler = deps.homeChatHandler;
+  var forEachAppClient = deps.forEachAppClient;
+  var revisions = {};
+  var epoch = deps.serverEpoch || require("crypto").randomBytes(12).toString("hex");
+
+  function multiUser() { return users.isMultiUser() === true; }
+  function actor(ws) {
+    if (!multiUser()) return { userId: "default", user: true };
+    var claimed = ws && ws._clayUser && ws._clayUser.id;
+    var user = claimed ? users.findUserById(claimed) : null;
+    return user ? { userId: user.id, user: user } : { userId: null, user: null };
+  }
+  function sameActor(ws, userId) { var current = actor(ws); return current.user && current.userId === userId; }
+  function send(ws, message) { if (ws && ws.readyState === 1) ws.send(JSON.stringify(Object.assign({ serverEpoch: epoch }, message))); }
+  function revision(userId) { return revisions[userId] || 0; }
+  function installedVendors(ws, who) {
+    var found;
+    try { found = homeChatHandler.findMateProject(multiUser() ? who.userId : null, null, true); } catch (e) { return []; }
+    if (!found || !found.ctx || typeof found.ctx.getVendorModelAvailability !== "function") return [];
+    var socket = Object.create(ws || null);
+    socket._clayUser = who.user === true ? null : who.user;
+    var choices = found.ctx.getVendorModelAvailability(socket) || [];
+    return choices.filter(function (choice) { return choice && choice.installed === true; }).map(function (choice) { return choice.id; });
+  }
+  function broadcast(userId, message, except) {
+    forEachAppClient(function (client) { if (client === except || !sameActor(client, userId)) return; send(client, message); });
+  }
+  function handle(ws, msg, projectSlug) {
+    if (!msg || ["default_vendor_get", "default_vendor_set"].indexOf(msg.type) === -1) return false;
+    var requestId = typeof msg.requestId === "string" ? msg.requestId.slice(0, 200) : null;
+    var who = actor(ws);
+    if (!who.user) { send(ws, { type: "default_vendor_state", requestId: requestId, accountAvailable: false, accountId: null, projectSlug: projectSlug || null, installedVendors: [], preference: null, error: "Your account is no longer available." }); return true; }
+    var installed = installedVendors(ws, who);
+    if (msg.type === "default_vendor_get") {
+      var saved = users.getDefaultVendorPreference(who.userId);
+      send(ws, { type: "default_vendor_state", requestId: requestId, projectSlug: projectSlug || null, accountAvailable: true, accountId: who.userId, installedVendors: installed, preference: saved.vendor, preferencePresent: saved.present, ready: !saved.error, canonicalRevision: revision(who.userId), error: saved.error || "" });
+      return true;
+    }
+    if (msg.vendor !== "" && (typeof msg.vendor !== "string" || installed.indexOf(msg.vendor) === -1)) {
+      send(ws, { type: "default_vendor_state", requestId: requestId, projectSlug: projectSlug || null, accountAvailable: true, accountId: who.userId, installedVendors: installed, preference: users.getDefaultVendorPreference(who.userId).vendor, ready: false, canonicalRevision: revision(who.userId), error: "That vendor is not installed or authorized." });
+      return true;
+    }
+    var savedResult = users.setDefaultVendorPreference(who.userId, msg.vendor);
+    if (!savedResult.ok) { send(ws, { type: "default_vendor_state", requestId: requestId, projectSlug: projectSlug || null, accountAvailable: true, accountId: who.userId, installedVendors: installed, ready: false, error: savedResult.error }); return true; }
+    revisions[who.userId] = revision(who.userId) + 1;
+    var state = { type: "default_vendor_state", requestId: null, projectSlug: projectSlug || null, accountAvailable: true, accountId: who.userId, installedVendors: installed, preference: msg.vendor || null, preferencePresent: !!msg.vendor, ready: true, canonicalRevision: revisions[who.userId], error: "" };
+    var broadcastState = Object.assign({}, state);
+    delete broadcastState.projectSlug;
+    broadcast(who.userId, broadcastState, ws);
+    send(ws, Object.assign({}, state, { requestId: requestId }));
+    return true;
+  }
+  return { handleMessage: handle };
+}
+
+module.exports = { attachDefaultVendorService: attachDefaultVendorService };

package/lib/server.js

@@ -17,6 +17,7 @@ var serverHomeChat = require("./server-home-chat");
 var shouldSuppressHomeResponse = require("./home-response-notifications").shouldSuppressHomeResponse;
 var serverHomePreferences = require("./server-home-preferences");
 var serverDefaultAi = require("./server-default-ai");
+var serverDefaultVendor = require("./server-default-vendor");
 var serverCursorSharing = require("./server-cursor-sharing");
 var serverTools = require("./server-tools");
 var serverAdmin = require("./server-admin");
@@ -1067,6 +1068,7 @@ function createServer(opts) {
   var wss = new WebSocketServer({ noServer: true });
   var homePreferencesHandler = null;
   var defaultAiService = null;
+  var defaultVendorService = null;
   var cursorSharingService = null;
 
   // Slug-less /ws handler: lets a user with no projects yet load the regular
@@ -1552,6 +1554,7 @@ function createServer(opts) {
   });
 
   defaultAiService = serverDefaultAi.attachDefaultAiService({ users: users, homeChatHandler: homeChatHandler, forEachAppClient: forEachAppClient });
+  defaultVendorService = serverDefaultVendor.attachDefaultVendorService({ users: users, homeChatHandler: homeChatHandler, forEachAppClient: forEachAppClient });
   cursorSharingService = serverCursorSharing.attachCursorSharingService({ users: users, forEachAppClient: forEachAppClient });
 
   // --- User-installed home tools handler ---
@@ -1580,6 +1583,7 @@ function createServer(opts) {
 
   function handleDmMessage(ws, msg, routedProjectSlug) {
     if (cursorSharingService && cursorSharingService.handleMessage(ws, msg)) return true;
+    if (defaultVendorService && defaultVendorService.handleMessage(ws, msg, routedProjectSlug)) return true;
     if (defaultAiService && defaultAiService.handleMessage(ws, msg)) return true;
     if (assignmentService.handleMessage(ws, msg, routedProjectSlug)) return true;
     if (dmHandler.handleMessage(ws, msg)) return true;

package/lib/users-default-vendor-preferences.js

@@ -0,0 +1,80 @@
+// Durable user-scoped New session vendor preference storage.
+
+var PREFERENCE_KEY = "defaultVendorPreference";
+
+function validVendor(value) {
+  return typeof value === "string" && /^[a-z0-9][a-z0-9_-]{0,39}$/.test(value);
+}
+
+function attachDefaultVendorPreferences(deps) {
+  var loadUsers = deps.loadUsers;
+  var saveUsers = deps.saveUsers;
+  var isMultiUser = deps.isMultiUser || function () { return false; };
+  var configModule = deps.configModule || require("./config");
+
+  function getRecord(data, userId) {
+    var records = Array.isArray(data.users) ? data.users : [];
+    for (var i = 0; i < records.length; i++) if (records[i] && records[i].id === userId) return records[i];
+    return null;
+  }
+
+  function readValue(value, source) {
+    if (value === undefined || value === null || value === "") return { present: false, vendor: null, source: null };
+    if (!validVendor(value)) return { present: true, vendor: null, source: source, error: "Default coding vendor is invalid." };
+    return { present: true, vendor: value, source: source };
+  }
+
+  function getDefaultVendor(userId) {
+    var data;
+    try { data = loadUsers(); } catch (error) { return { present: false, vendor: null, source: null, error: "Unable to read default coding vendor: " + (error.message || error) }; }
+    var record = getRecord(data, userId);
+    if (isMultiUser() && !record) return { present: false, vendor: null, source: null, error: "User not found." };
+    if (record && Object.prototype.hasOwnProperty.call(record, PREFERENCE_KEY)) return readValue(record[PREFERENCE_KEY], "explicit");
+    if (record) return { present: false, vendor: null, source: null };
+    if (userId === "default") {
+      var config;
+      try { config = configModule.loadConfig() || {}; } catch (configError) { return { present: false, vendor: null, source: null, error: "Unable to read default coding vendor: " + (configError.message || configError) }; }
+      if (Object.prototype.hasOwnProperty.call(config, PREFERENCE_KEY)) return readValue(config[PREFERENCE_KEY], "explicit");
+    }
+    return { present: false, vendor: null, source: null };
+  }
+
+  function setDefaultVendor(userId, vendor) {
+    if (vendor !== "" && !validVendor(vendor)) return { ok: false, error: "Default coding vendor is invalid." };
+    var data;
+    try { data = loadUsers(); } catch (error) { return { ok: false, error: "Unable to read default coding vendor: " + (error.message || error) }; }
+    var record = getRecord(data, userId);
+    if (isMultiUser() && !record) return { ok: false, error: "User not found." };
+    if (record) {
+      var nextData = Object.assign({}, data, { users: (data.users || []).map(function (item) {
+        if (item !== record) return item;
+        var next = Object.assign({}, item);
+        if (vendor) next.defaultVendorPreference = vendor;
+        else delete next.defaultVendorPreference;
+        return next;
+      }) });
+      try { saveUsers(nextData); } catch (saveError) { return { ok: false, error: "Unable to save default coding vendor: " + (saveError.message || saveError) }; }
+      if (!vendor && userId === "default") {
+        try {
+          var recordConfig = configModule.loadConfig() || {};
+          delete recordConfig[PREFERENCE_KEY];
+          configModule.saveConfig(Object.assign({}, recordConfig));
+        } catch (recordConfigError) { return { ok: false, error: "Unable to clear default coding vendor: " + (recordConfigError.message || recordConfigError) }; }
+      }
+      return { ok: true, vendor: vendor };
+    }
+    if (userId !== "default") return { ok: false, error: "User not found." };
+    try {
+      var current = configModule.loadConfig() || {};
+      var nextConfig = Object.assign({}, current);
+      if (vendor) nextConfig.defaultVendorPreference = vendor;
+      else delete nextConfig.defaultVendorPreference;
+      configModule.saveConfig(nextConfig);
+      return { ok: true, vendor: vendor };
+    } catch (configSaveError) { return { ok: false, error: "Unable to save default coding vendor: " + (configSaveError.message || configSaveError) }; }
+  }
+
+  return { getDefaultVendor: getDefaultVendor, setDefaultVendor: setDefaultVendor, validVendor: validVendor };
+}
+
+module.exports = { attachDefaultVendorPreferences: attachDefaultVendorPreferences, validVendor: validVendor, PREFERENCE_KEY: PREFERENCE_KEY };

package/lib/users.js

@@ -11,6 +11,7 @@ var { attachHomeSurfacePreferences } = require("./users-home-surface-preferences
 var { attachExperimentalPreferences } = require("./users-experimental-preferences");
 var { attachScheduledTaskPreferences } = require("./users-scheduled-task-preferences");
 var { attachDefaultAiPreferences } = require("./users-default-ai-preferences");
+var { attachDefaultVendorPreferences } = require("./users-default-vendor-preferences");
 
 var USERS_FILE = path.join(CONFIG_DIR, "users.json");
 
@@ -404,6 +405,7 @@ var homeSurfacePreferences = attachHomeSurfacePreferences({ loadUsers: loadUsers
 var experimentalPreferences = attachExperimentalPreferences({ loadUsers: loadUsers, saveUsers: saveUsers });
 var scheduledTaskPreferences = attachScheduledTaskPreferences({ loadUsers: loadUsers, saveUsers: saveUsers });
 var defaultAiPreferences = attachDefaultAiPreferences({ loadUsers: loadUsers, saveUsers: saveUsers, isMultiUser: auth.isMultiUser });
+var defaultVendorPreferences = attachDefaultVendorPreferences({ loadUsers: loadUsers, saveUsers: saveUsers, isMultiUser: auth.isMultiUser });
 
 // Alias auth functions
 var isMultiUser = auth.isMultiUser;
@@ -464,6 +466,8 @@ var getScheduledTaskInterviewEngine = scheduledTaskPreferences.get;
 var setScheduledTaskInterviewEngine = scheduledTaskPreferences.set;
 var getDefaultAiPreference = defaultAiPreferences.getDefaultAiPreference;
 var setDefaultAiPreference = defaultAiPreferences.setDefaultAiPreference;
+var getDefaultVendorPreference = defaultVendorPreferences.getDefaultVendor;
+var setDefaultVendorPreference = defaultVendorPreferences.setDefaultVendor;
 
 module.exports = {
   USERS_FILE: USERS_FILE,
@@ -545,6 +549,8 @@ module.exports = {
   setScheduledTaskInterviewEngine: setScheduledTaskInterviewEngine,
   getDefaultAiPreference: getDefaultAiPreference,
   setDefaultAiPreference: setDefaultAiPreference,
+  getDefaultVendorPreference: getDefaultVendorPreference,
+  setDefaultVendorPreference: setDefaultVendorPreference,
   getDeletedBuiltinKeys: getDeletedBuiltinKeys,
   addDeletedBuiltinKey: addDeletedBuiltinKey,
   removeDeletedBuiltinKey: removeDeletedBuiltinKey,

package/lib/ws-schema.js

@@ -723,6 +723,9 @@ var schema = {
   "default_ai_get":           { direction: "c2s", handler: "lib/server-default-ai.js", description: "Read the authenticated user's shared Default AI and available providers" },
   "default_ai_catalog_get":   { direction: "c2s", handler: "lib/server-default-ai.js", description: "Read one installed provider catalog for the Default AI picker" },
   "default_ai_set":           { direction: "c2s", handler: "lib/server-default-ai.js", description: "Validate and persist the authenticated user's shared Default AI" },
+  "default_vendor_get":       { direction: "c2s", handler: "lib/server-default-vendor.js", description: "Read the authenticated user's New session vendor preference" },
+  "default_vendor_set":       { direction: "c2s", handler: "lib/server-default-vendor.js", description: "Validate and persist the authenticated user's New session vendor preference" },
+  "default_vendor_state":     { direction: "s2c", handler: "lib/public/modules/default-vendor.js", description: "Correlated or same-user-broadcast New session vendor preference" },
   "default_ai_state":         { direction: "s2c", handler: "lib/public/modules/default-ai.js", description: "Correlated or same-user-broadcast canonical Default AI state" },
   "default_ai_catalog":       { direction: "s2c", handler: "lib/public/modules/default-ai.js", description: "Correlated Default AI provider catalog" },
   "home_mate_history":        { direction: "s2c", handler: "lib/public/modules/home-mate-chat.js", description: "Selected mate's initial or refreshed chat history" },

package/lib/yoke/acp-agent-profiles.js

@@ -82,13 +82,26 @@ function isSafeOpenCodePermission(value) {
 }
 
 function validateOpenCodeConfig(config) {
-  if (!config || config.permission !== "ask") {
+  if (!config || typeof config !== "object" || Array.isArray(config)) {
+    throw new Error("OpenCode resolved configuration is malformed");
+  }
+  var globalPermission = config.permission;
+  var globalAsk = globalPermission === "ask" || (
+    isSafeOpenCodePermission(globalPermission) && globalPermission["*"] === "ask"
+  );
+  if (!globalAsk) {
     throw new Error("OpenCode resolved configuration does not preserve global ask permissions");
   }
+  if (config.agent !== undefined && (!config.agent || typeof config.agent !== "object" || Array.isArray(config.agent))) {
+    throw new Error("OpenCode resolved configuration has malformed agents");
+  }
   var agents = config.agent || {};
   var names = Object.keys(agents);
   for (var i = 0; i < names.length; i++) {
-    var agent = agents[names[i]] || {};
+    var agent = agents[names[i]];
+    if (!agent || typeof agent !== "object" || Array.isArray(agent)) {
+      throw new Error("OpenCode agent has malformed resolved configuration: " + names[i]);
+    }
     if (agent.permission === undefined) continue;
     if (!isSafeOpenCodePermission(agent.permission)) {
       throw new Error("OpenCode agent has unsafe resolved permissions: " + names[i]);

package/lib/yoke/adapters/codex.js

@@ -181,6 +181,11 @@ function flattenEvent(notification, state) {
 
   if (method === "turn/started") {
     state.turnStarted = true;
+    state.currentTurnId = params.turnId || params.turn_id || (params.turn && params.turn.id) || null;
+    state.lastInputTokens = null;
+    state.lastCachedTokens = null;
+    state.lastOutputTokens = null;
+    state.currentContextUsage = null;
     var userUuid = generateUuid();
     events.push({ yokeType: "turn_start", uuid: userUuid, messageType: "user" });
     return events;
@@ -194,16 +199,38 @@ function flattenEvent(notification, state) {
     if (turnStatus === "interrupted" || state.aborted) {
       events.push({ yokeType: "interrupted" });
     }
-    var inputTokens = state.lastInputTokens !== null && state.lastInputTokens !== undefined
-      ? state.lastInputTokens : (usage ? (usage.input_tokens || 0) : 0);
-    var outputTokens = (usage ? (usage.output_tokens || 0) : 0) || state.lastOutputTokens || 0;
-    var cachedTokens = (usage ? (usage.cached_input_tokens || 0) : 0) || state.lastCachedTokens || 0;
+    // Generic usage reporting is independent from current context occupancy.
+    // The latter is supplied only by a valid thread/tokenUsage snapshot.
+    // Some normal protocol completions omit usage even though the preceding
+    // token snapshot carried useful per-turn accounting. Keep that fallback
+    // for the generic usage panel, but never use it as context occupancy.
+    var inputTokens = usage && typeof usage.input_tokens === "number"
+      ? usage.input_tokens : (typeof state.lastInputTokens === "number" ? state.lastInputTokens : 0);
+    var outputTokens = usage && typeof usage.output_tokens === "number"
+      ? usage.output_tokens : (typeof state.lastOutputTokens === "number" ? state.lastOutputTokens : 0);
+    var cachedTokens = usage && typeof usage.cached_input_tokens === "number"
+      ? usage.cached_input_tokens : (typeof state.lastCachedTokens === "number" ? state.lastCachedTokens : 0);
     var hasTokenData = inputTokens > 0 || outputTokens > 0;
     var resultModelUsage = {};
     // Codex reports the real window in thread/tokenUsage/updated. Dropping it
     // made the client fall back to its model-name table, which has no entry
     // for codex model ids and defaulted to Claude's 200k denominator.
-    resultModelUsage[state.model] = { contextWindow: state.modelContextWindow || null };
+    var contextSnapshot = { valid: false };
+    if (state.currentContextUsage
+        && typeof state.currentContextUsage.input_tokens === "number"
+        && typeof state.currentContextUsage.contextWindow === "number"
+        && state.currentContextUsage.contextWindow > 0) {
+      contextSnapshot = {
+        valid: true,
+        inputTokens: state.currentContextUsage.input_tokens,
+        contextWindow: state.currentContextUsage.contextWindow,
+      };
+      if (state.currentContextUsage.turnId) contextSnapshot.turnId = state.currentContextUsage.turnId;
+    }
+    resultModelUsage[state.model] = {
+      contextWindow: state.modelContextWindow || null,
+      contextSnapshot: contextSnapshot,
+    };
     var assistantUuid = generateUuid();
     events.push({
       yokeType: "result",
@@ -683,24 +710,36 @@ function flattenEvent(notification, state) {
   if (method === "thread/tokenUsage/updated") {
     var tu = params.tokenUsage;
     if (tu) {
+      var tokenTurnId = params.turnId || params.turn_id || tu.turnId || null;
+      if (tokenTurnId && state.currentTurnId && tokenTurnId !== state.currentTurnId) {
+        state.lastInputTokens = null;
+        state.lastCachedTokens = null;
+        state.lastOutputTokens = null;
+        state.currentContextUsage = null;
+        return events;
+      }
+      var currentWindow = null;
       var turnUsage = tu.lastTurn;
       if (turnUsage) {
         var candidateInput = typeof turnUsage.inputTokens === "number" ? turnUsage.inputTokens : null;
-        var currentWindow = typeof tu.modelContextWindow === "number" ? tu.modelContextWindow : null;
-        state.lastInputTokens = candidateInput !== null && (currentWindow === null || candidateInput <= currentWindow) ? candidateInput : null;
+        currentWindow = typeof tu.modelContextWindow === "number" && isFinite(tu.modelContextWindow) && tu.modelContextWindow > 0
+          ? tu.modelContextWindow : null;
+        state.lastInputTokens = candidateInput !== null && isFinite(candidateInput) && candidateInput >= 0 && currentWindow !== null && candidateInput <= currentWindow ? candidateInput : null;
         state.lastCachedTokens = turnUsage.cachedInputTokens || 0;
         state.lastOutputTokens = turnUsage.outputTokens || 0;
-        state.currentContextUsage = state.lastInputTokens !== null &&
-          (currentWindow === null || state.lastInputTokens <= currentWindow)
-          ? { input_tokens: state.lastInputTokens, contextWindow: currentWindow }
-          : { input_tokens: null, contextWindow: currentWindow };
+        if (state.lastInputTokens !== null && currentWindow !== null) {
+          state.currentContextUsage = { input_tokens: state.lastInputTokens, contextWindow: currentWindow };
+          if (tokenTurnId || state.currentTurnId) state.currentContextUsage.turnId = tokenTurnId || state.currentTurnId;
+        } else {
+          state.currentContextUsage = null;
+        }
       } else {
         state.lastInputTokens = null;
         state.lastCachedTokens = null;
         state.lastOutputTokens = null;
         state.currentContextUsage = null;
       }
-      if (tu.modelContextWindow) state.modelContextWindow = tu.modelContextWindow;
+      if (currentWindow !== null) state.modelContextWindow = currentWindow;
     }
     return events;
   }
@@ -750,6 +789,7 @@ function createEventState(model) {
     lastCachedTokens: null,
     lastOutputTokens: null,
     currentContextUsage: null,
+    currentTurnId: null,
     modelContextWindow: null,
     done: false,
     aborted: false,
@@ -1288,7 +1328,10 @@ function createCodexQueryHandle(appServer, queryOpts) {
     },
 
     getContextUsage: function() {
-      return Promise.resolve(state.currentContextUsage);
+      return Promise.resolve(state.currentContextUsage || {
+        unavailable: true,
+        reason: "current_context_unavailable",
+      });
     },
 
     abort: function() {

package/package.json

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