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

package/lib/project-connection.js

@@ -346,7 +346,11 @@ function attachConnection(ctx) {
       var dcPresKey = ws._clayUser ? ws._clayUser.id : "_default";
       var dcExisting = userPresence.getPresence(slug, dcPresKey);
       var dcSession = sm.sessions.get(ws._clayActiveSession);
-      userPresence.setPresence(slug, dcPresKey, userPresence.sessionIdForPersistence(dcSession), dcExisting ? dcExisting.mateDm : null);
+      var dcSessionId = userPresence.sessionIdForPersistence(dcSession);
+      var dcExistingSession = dcExisting && userPresence.findSession(sm.sessions, dcExisting.sessionId);
+      if (userPresence.shouldPersistDisconnectPresence(dcExisting, dcSessionId, dcExistingSession, dcSession)) {
+        userPresence.setPresence(slug, dcPresKey, dcSessionId, dcExisting ? dcExisting.mateDm : null);
+      }
     }
     tm.detachAll(ws);
     clients.delete(ws);

package/lib/project-sessions.js

@@ -984,6 +984,8 @@ function attachSessions(ctx) {
       if (msg.id && sm.sessions.has(msg.id) && msg.title) {
         var s = sm.sessions.get(msg.id);
         s.title = String(msg.title).substring(0, 100);
+        s.titleProvisional = false;
+        s.titleAutoGenerated = false;
         s.titleManuallySet = true;
         sm.saveSessionFile(s);
         sm.notifySessionRenamed(s.localId);

package/lib/project-user-message.js

@@ -479,6 +479,10 @@ function attachUserMessage(ctx) {
     function recordSessionTitle() {
       if (!session.title) {
         session.title = (msg.text || "Image").substring(0, 50);
+        // This title is an optimistic first-message label, not a semantic or
+        // explicit title. Persist its provenance so startQuery can preserve
+        // eligibility for model generation after this function returns.
+        session.titleProvisional = true;
         sm.saveSessionFile(session);
         sm.broadcastSessionList();
         // Sync auto-title to SDK

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 === "context_view_get" || msg.type === "context_view_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';
@@ -286,6 +287,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     currentSlug: currentSlug,
     activeProjectSlug: null,
     sessionActivatedProjectSlug: null,
+    sessionListProjectSlug: null,
+    splitGroupsProjectSlug: null,
     socketPath: null,
     pendingHomeProjectSlug: null,
     currentProjectOwnerId: null,
@@ -427,6 +430,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,
@@ -443,6 +447,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     pendingShellCommandId: null,
     mateProjectSlug: null,
     myUserId: null,
+    contextViewPreferenceState: { mode: "off", canonicalMode: "off", preferencePresent: false, loading: false, saving: false, requestId: null, saveRequestId: null, pendingSaves: [], accountId: null, serverEpoch: null, rejectedEpoch: null, canonicalRevision: 0, error: "" },
+    contextViewOverride: null,
     isMultiUserMode: false,
     dmUnread: {},
     dmRemovedUsers: {},
@@ -1024,7 +1030,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,9 @@ 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 { beginContextViewConnection, requestContextView } from './context-view-preference.js';
+import { beginDefaultVendorConnection, requestDefaultVendor } from './default-vendor.js';
+import { clearProjectSplitState } from './split-session-boundary.js';
 
 var reconnectTimer = null;
 var reconnectDelay = 1000;
@@ -233,7 +236,8 @@ export function connect() {
 
   var protocol = location.protocol === "https:" ? "wss:" : "ws:";
   var socketPath = store.get('wsPath');
-  store.set({ socketPath: socketPath, activeProjectSlug: null, sessionActivatedProjectSlug: null });
+  if (store.get('socketPath') && store.get('socketPath') !== socketPath) clearProjectSplitState();
+  store.set({ socketPath: socketPath, activeProjectSlug: null, sessionActivatedProjectSlug: null, sessionListProjectSlug: null, splitGroupsProjectSlug: null });
   var newWs = new WebSocket(protocol + "//" + location.host + socketPath);
   setWs(newWs);
 
@@ -277,6 +281,10 @@ export function connect() {
     onConnected();
     beginDefaultAiConnection();
     requestDefaultAi();
+    beginDefaultVendorConnection();
+    requestDefaultVendor();
+    beginContextViewConnection();
+    requestContextView();
   };
 
   newWs.onclose = function (e) {

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

@@ -19,6 +19,8 @@ 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 { handleContextViewMessage } from './context-view-preference.js';
 import { handleHomeMateMemoryState, handleHomeMateKnowledgeState } from './home-mate-settings.js';
 import { renderKnowledgeList, handleKnowledgeContent } from './mate-knowledge.js';
 import { renderMemoryList } from './mate-memory.js';
@@ -63,9 +65,10 @@ 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 { markProjectSessionListHydrated, applyProjectSplitGroups, clearProjectSplitState } from './split-session-boundary.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 +100,8 @@ export function processMessage(msg) {
   if (handleAutonomousRunMessage(msg)) return;
   if (handleLoopInterviewMessage(msg)) return;
   if (handleScheduledTaskMessage(msg)) return;
+  if (handleDefaultVendorMessage(msg)) return;
+  if (handleContextViewMessage(msg)) return;
   if (msg && msg.type === "schedule_message_result") {
     handleScheduleMessageResult(msg);
     return;
@@ -226,9 +231,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);
@@ -330,10 +334,13 @@ export function processMessage(msg) {
         // start receiving the new project's session_switched. The TUI
         // host lives on document.body (it's position: fixed), so it
         // survives project navigation unless we detach explicitly here.
+        if (msg.slug && store.get('activeProjectSlug') && store.get('activeProjectSlug') !== msg.slug) {
+          clearProjectSplitState();
+        }
         detachTuiView();
         store.set({ projectName: msg.project || msg.cwd, vendorInfo: msg.vendors || {} });
         if (msg.cwd) store.set({ cwd: msg.cwd });
-        if (msg.slug) store.set({ currentSlug: msg.slug, activeProjectSlug: msg.slug });
+        if (msg.slug) store.set({ currentSlug: msg.slug, activeProjectSlug: msg.slug, sessionListProjectSlug: null, splitGroupsProjectSlug: null });
         try { var _is = store.snap(); localStorage.setItem("clay-project-name-" + (_is.currentSlug || "default"), _is.projectName); } catch (e) {}
         // In mate DM, keep title as mate name and re-apply mate color
         if (store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) {
@@ -690,6 +697,7 @@ export function processMessage(msg) {
         break;
 
       case "session_list":
+        markProjectSessionListHydrated();
         renderMateSessionList(msg.sessions || []);
         renderSessionList(msg.sessions || []);
         syncPaneTitles();
@@ -701,13 +709,14 @@ export function processMessage(msg) {
           }
         }
         handlePaletteSessionSwitch();
+        maybeRestoreSplitGroup();
         break;
 
       case "split_groups":
-        store.set({ splitGroups: msg.groups || [] });
+        applyProjectSplitGroups(msg.groups || []);
         renderSessionList(null);
-        maybeRestoreSplitGroup();
         syncPaneTitles();
+        maybeRestoreSplitGroup();
         break;
 
       case "split_group_result":
@@ -888,8 +897,8 @@ export function processMessage(msg) {
         }
         // Reload survival: a restored active session that is a split-group
         // member reopens its group (no-op when a split is already open).
-        maybeRestoreSplitGroup();
         if (finishProjectSessionActivation()) hideHomeHub();
+        maybeRestoreSplitGroup();
         break;
 
       case "session_full_access_changed":
@@ -1273,7 +1282,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

@@ -5,15 +5,17 @@ import { refreshIcons } from "./icons.js";
 import { escapeHtml, showToast } from "./utils.js";
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
+import { getContextView as getStoredContextView, getEffectiveContextView, setContextView as setStoredContextView } from './context-view-preference.js';
 import { reportPaneContext } from './pane-bridge.js';
 import { setupModelPicker, renderModelPicker, requestVendorModels, prepareModelPickerOpen, modelDisplayName } from './model-picker.js';
 
 // --- 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;
+var lastAppliedContextView = null;
 
 // --- DOM refs ---
 var configChipWrap = null;
@@ -374,6 +376,15 @@ export function initPanels() {
 
   // --- Reactive UI sync ---
   store.subscribe(function (state, prev) {
+    var effectiveContextView = getEffectiveContextView();
+    if (effectiveContextView !== lastAppliedContextView) {
+      lastAppliedContextView = effectiveContextView;
+      applyContextView(effectiveContextView);
+    }
+    if (state.contextViewPreferenceState && state.contextViewPreferenceState.error &&
+        state.contextViewPreferenceState.error !== (prev.contextViewPreferenceState && prev.contextViewPreferenceState.error)) {
+      showToast(state.contextViewPreferenceState.error, "error");
+    }
     // richContextUsage changed -> update popover + panel
     if (state.richContextUsage !== prev.richContextUsage) {
       if (state.richContextUsage) {
@@ -540,7 +551,6 @@ export function initPanels() {
   if (contextPanelClose) {
     contextPanelClose.addEventListener("click", function () {
       setContextView("off");
-      applyContextView("off");
     });
   }
 
@@ -553,7 +563,8 @@ export function initPanels() {
   }
 
   // Restore context view on load
-  applyContextView(getContextView());
+  lastAppliedContextView = getEffectiveContextView();
+  applyContextView(lastAppliedContextView);
 }
 
 // --- Config chip ---
@@ -718,9 +729,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 +754,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 +762,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 +828,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 +837,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 +855,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
@@ -860,11 +900,15 @@ export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens
 
 // contextView: "off" | "mini" | "panel"
 export function getContextView() {
-  try { return localStorage.getItem("clay-context-view") || "off"; } catch (e) { return "off"; }
+  return getStoredContextView();
 }
 
 export function setContextView(v) {
-  try { localStorage.setItem("clay-context-view", v); } catch (e) {}
+  if (store.get("paneMode") === true) {
+    store.set({ contextViewOverride: v });
+    return true;
+  }
+  return setStoredContextView(v);
 }
 
 export function applyContextView(view) {
@@ -874,36 +918,38 @@ 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
-  applyContextView(getContextView());
+  applyContextView(getEffectiveContextView());
 }
 
 export function minimizeContext() {
   setContextView("mini");
-  applyContextView("mini");
 }
 
 export function expandContext() {
   setContextView("panel");
-  applyContextView("panel");
 }
 
 export function toggleContextPanel() {
   if (!contextPanel) return;
-  var view = getContextView();
+  var view = getEffectiveContextView();
   if (view === "panel") {
     setContextView("mini");
-    applyContextView("mini");
   } else {
     setContextView("panel");
-    applyContextView("panel");
   }
 }
 
@@ -952,8 +998,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/app-projects.js

@@ -39,6 +39,7 @@ import { closeProjectSettings } from './project-settings.js';
 import { chooseProjectAfterRemoval } from './project-removal-target.js';
 import { isProjectActivated, isProjectActivationPending, isProjectContextConnected, projectWsPath } from './project-activation.js';
 import { rememberHomePrimarySurface } from './home-surface.js';
+import { clearProjectSplitState } from './split-session-boundary.js';
 
 // --- Module-owned state ---
 var cachedProjects = [];
@@ -447,6 +448,7 @@ export function switchProject(slug) {
   }
   if (homeVisible) store.set({ pendingHomeProjectSlug: slug });
   if (isProjectActivationPending(store.snap(), slug, ws)) return;
+  if (store.get('currentSlug') !== slug) clearProjectSplitState();
   resetFileBrowser();
   if (typeof closeScheduledTasks === "function") closeScheduledTasks();
   closeNotesBrowser();

package/lib/public/modules/context-view-preference.js

@@ -0,0 +1,143 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+
+var MODES = ["off", "mini", "panel"];
+var sequence = 0;
+
+function validMode(mode) { return MODES.indexOf(mode) !== -1; }
+function nextRequestId(prefix) { sequence += 1; return prefix + Date.now() + "-" + sequence; }
+function accountId() { return store.get("myUserId") || "default"; }
+function initialState() {
+  return { mode: "off", canonicalMode: "off", preferencePresent: false, loading: false, saving: false, requestId: null, saveRequestId: null, pendingSaves: [], accountId: null, serverEpoch: null, rejectedEpoch: null, canonicalRevision: 0, error: "" };
+}
+
+function send(message) {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  ws.send(JSON.stringify(message));
+  return true;
+}
+
+export function getContextView() {
+  var state = store.get("contextViewPreferenceState") || initialState();
+  return validMode(state.mode) ? state.mode : "off";
+}
+
+export function getEffectiveContextView() {
+  if (store.get("paneMode") !== true) return getContextView();
+  var override = store.get("contextViewOverride");
+  return override === null || override === undefined ? getContextView() : (validMode(override) ? override : getContextView());
+}
+
+export function beginContextViewConnection() {
+  var state = store.get("contextViewPreferenceState") || initialState();
+  store.set({ contextViewPreferenceState: Object.assign({}, state, {
+    mode: validMode(state.canonicalMode) ? state.canonicalMode : "off",
+    loading: false,
+    saving: false,
+    requestId: null,
+    saveRequestId: null,
+    pendingSaves: [],
+    rejectedEpoch: state.serverEpoch || null,
+    serverEpoch: null,
+    canonicalRevision: 0,
+    error: "",
+  }) });
+}
+
+export function requestContextView() {
+  var id = nextRequestId("context-view-");
+  var state = store.get("contextViewPreferenceState") || initialState();
+  store.set({ contextViewPreferenceState: Object.assign({}, state, { loading: true, requestId: id, error: "" }) });
+  if (!send({ type: "context_view_get", requestId: id })) {
+    store.set({ contextViewPreferenceState: Object.assign({}, store.get("contextViewPreferenceState") || initialState(), { loading: false, requestId: null, error: "Clay is offline. Reconnect and try again." }) });
+    return false;
+  }
+  return true;
+}
+
+export function setContextView(mode) {
+  if (!validMode(mode)) return false;
+  var id = nextRequestId("context-view-save-");
+  var state = store.get("contextViewPreferenceState") || initialState();
+  var pendingSaves = (state.pendingSaves || []).concat([{ requestId: id, mode: mode }]);
+  store.set({ contextViewPreferenceState: Object.assign({}, state, { mode: mode, saving: true, saveRequestId: id, pendingSaves: pendingSaves, error: "" }) });
+  if (!send({ type: "context_view_set", requestId: id, mode: mode })) {
+    var reverted = store.get("contextViewPreferenceState") || initialState();
+    pendingSaves = (reverted.pendingSaves || []).filter(function (item) { return item.requestId !== id; });
+    var pendingMode = pendingSaves.length ? pendingSaves[pendingSaves.length - 1].mode : (reverted.canonicalMode || "off");
+    store.set({ contextViewPreferenceState: Object.assign({}, reverted, { mode: pendingMode, saving: pendingSaves.length > 0, saveRequestId: pendingSaves.length ? pendingSaves[pendingSaves.length - 1].requestId : null, pendingSaves: pendingSaves, error: "Clay is offline. Reconnect and try again." }) });
+    return false;
+  }
+  return true;
+}
+
+export function handleContextViewMessage(msg) {
+  if (!msg || msg.type !== "context_view_state") return false;
+  var state = store.get("contextViewPreferenceState") || initialState();
+  var currentAccount = accountId();
+  var isGetReply = !!msg.requestId && msg.requestId === state.requestId;
+  var pendingSaves = state.pendingSaves || [];
+  var saveIndex = -1;
+  for (var i = 0; i < pendingSaves.length; i++) if (pendingSaves[i].requestId === msg.requestId) saveIndex = i;
+  var isSaveReply = !!msg.requestId && saveIndex !== -1;
+  var isOlderSaveRevision = isSaveReply && typeof msg.canonicalRevision === "number" && msg.canonicalRevision < (state.canonicalRevision || 0);
+  var isCorrelatedAccountFailure = (isGetReply || isSaveReply) && msg.accountId === null && msg.accountAvailable === false;
+  if ((!isCorrelatedAccountFailure && msg.accountId !== currentAccount) || (msg.accountId === null && !isCorrelatedAccountFailure)) return true;
+  if (msg.serverEpoch && state.serverEpoch && msg.serverEpoch !== state.serverEpoch && (!msg.requestId || (!isGetReply && !isSaveReply))) return true;
+  if (msg.serverEpoch && state.rejectedEpoch && msg.serverEpoch === state.rejectedEpoch && (!isGetReply && !isSaveReply)) return true;
+  if (msg.canonicalRevision !== undefined && msg.canonicalRevision < (state.canonicalRevision || 0) && msg.serverEpoch === state.serverEpoch && !isSaveReply) 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 || currentAccount,
+    serverEpoch: msg.serverEpoch || state.serverEpoch || null,
+    rejectedEpoch: isGetReply || isSaveReply ? null : state.rejectedEpoch || null,
+    canonicalRevision: isOlderSaveRevision ? (state.canonicalRevision || 0) : (typeof msg.canonicalRevision === "number" ? msg.canonicalRevision : state.canonicalRevision || 0),
+    loading: isGetReply ? false : state.loading,
+    saving: state.saving,
+    requestId: isGetReply ? null : state.requestId,
+    saveRequestId: state.saveRequestId,
+    error: msg.error || "",
+  });
+  if (Object.prototype.hasOwnProperty.call(msg, "mode") && validMode(msg.mode) && msg.ready !== false && !isCorrelatedAccountFailure) {
+    if (isSaveReply) {
+      if (!isOlderSaveRevision && msg.ready !== false) {
+        pendingSaves = pendingSaves.slice(saveIndex + 1);
+      } else {
+        pendingSaves = pendingSaves.filter(function (item) { return item.requestId !== msg.requestId; });
+      }
+    }
+    if (!isOlderSaveRevision) {
+      next.canonicalMode = msg.mode;
+      next.preferencePresent = msg.preferencePresent === true;
+    }
+    if (pendingSaves.length) {
+      next.mode = pendingSaves[pendingSaves.length - 1].mode;
+      next.saving = true;
+      next.saveRequestId = pendingSaves[pendingSaves.length - 1].requestId;
+    } else {
+      next.mode = next.canonicalMode;
+      next.saving = false;
+      next.saveRequestId = null;
+    }
+    next.pendingSaves = pendingSaves;
+  } else if (isSaveReply && (msg.ready === false || isCorrelatedAccountFailure)) {
+    pendingSaves = pendingSaves.filter(function (item) { return item.requestId !== msg.requestId; });
+    next.pendingSaves = pendingSaves;
+    next.mode = pendingSaves.length ? pendingSaves[pendingSaves.length - 1].mode : (state.canonicalMode || "off");
+    next.saving = pendingSaves.length > 0;
+    next.saveRequestId = pendingSaves.length ? pendingSaves[pendingSaves.length - 1].requestId : null;
+  }
+  store.set({ contextViewPreferenceState: next });
+  return true;
+}
+
+store.subscribe(function (state, previous) {
+  if (state.myUserId !== previous.myUserId || state.currentSlug !== previous.currentSlug) {
+    store.set({ contextViewPreferenceState: Object.assign({}, initialState(), { accountId: accountId() }), contextViewOverride: null });
+    if (state.connected) requestContextView();
+  }
+});
+
+export { validMode };