clay-server 4.1.0-beta.15 → 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,7 +1598,7 @@ 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 === "default_vendor_get" || msg.type === "default_vendor_set" || msg.type === "cursor_sharing_get" || msg.type === "cursor_sharing_set") {
+    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;
     }

package/lib/public/app.js

@@ -287,6 +287,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     currentSlug: currentSlug,
     activeProjectSlug: null,
     sessionActivatedProjectSlug: null,
+    sessionListProjectSlug: null,
+    splitGroupsProjectSlug: null,
     socketPath: null,
     pendingHomeProjectSlug: null,
     currentProjectOwnerId: null,
@@ -445,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: {},

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

@@ -17,7 +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;
@@ -234,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);
 
@@ -280,6 +283,8 @@ export function connect() {
     requestDefaultAi();
     beginDefaultVendorConnection();
     requestDefaultVendor();
+    beginContextViewConnection();
+    requestContextView();
   };
 
   newWs.onclose = function (e) {

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

@@ -20,6 +20,7 @@ import { renderMateSessionList, handleMateSearchResults, updateMateSidebarProfil
 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';
@@ -64,6 +65,7 @@ import { setStatus } from './app-connection.js';
 import { handleWhatsNewState, handleWhatsNewSeenResult, setKnownEntries as setWhatsNewKnownEntries } from './whats-new.js';
 import { closeArticle as closeWhatsNewArticle } from './whats-new-article.js';
 import { resolvePaneSession, resolveSwitchedVendor } from './pane-session.js';
+import { 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, markContextUnavailable } from './app-panels.js';
@@ -99,6 +101,7 @@ export function processMessage(msg) {
   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;
@@ -331,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) {
@@ -691,6 +697,7 @@ export function processMessage(msg) {
         break;
 
       case "session_list":
+        markProjectSessionListHydrated();
         renderMateSessionList(msg.sessions || []);
         renderSessionList(msg.sessions || []);
         syncPaneTitles();
@@ -702,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":
@@ -889,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":

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

@@ -5,6 +5,7 @@ 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';
 
@@ -14,6 +15,7 @@ var contextData = { contextWindow: 0, currentInput: null, maxOutputTokens: 0, mo
 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 ---
@@ -889,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) {
@@ -917,28 +932,24 @@ export function markContextUnavailable() {
 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");
   }
 }
 

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 };

package/lib/public/modules/pane-bridge.js

@@ -4,11 +4,9 @@
 // Same-origin messages only, both directions.
 
 import { store } from './store.js';
-import { applyContextView, getContextView } from './app-panels.js';
+import { getEffectiveContextView } from './context-view-preference.js';
 import { forceExternalLinkToNewTab } from './pane-links.js';
 
-var panelOpen = false;
-
 export function reportPaneContext(data) {
   if (!store.get('paneMode') || window.parent === window) return;
   window.parent.postMessage({
@@ -38,11 +36,11 @@ export function forwardPaneMarkdownPresentation(message) {
   return true;
 }
 
-// Toggle without setContextView: panes share localStorage with the main app,
-// so persisting here would silently rewrite the user's main-view preference.
+// Toggle without setContextView: panes use a transient override and must not
+// rewrite the user's server-persisted main-view preference.
 function togglePaneContextPanel() {
-  panelOpen = !panelOpen;
-  applyContextView(panelOpen ? "panel" : "off");
+  var effectiveView = getEffectiveContextView();
+  store.set({ contextViewOverride: effectiveView === "panel" ? "off" : "panel" });
 }
 
 function preparePaneLink(event) {
@@ -55,7 +53,9 @@ function preparePaneLink(event) {
 
 export function initPaneBridge() {
   if (!store.get('paneMode')) return;
-  panelOpen = getContextView() === "panel";
+  // Hydration may still replace the persisted mode. Leave the override null
+  // so the first header toggle derives from the actual effective view.
+  store.set({ contextViewOverride: null });
   document.addEventListener("click", preparePaneLink, true);
   document.addEventListener("auxclick", preparePaneLink, true);
   window.addEventListener("message", function (event) {

package/lib/public/modules/project-activation.js

@@ -43,3 +43,52 @@ export function isProjectContextConnected(state, slug, socket) {
     && state.connected === true
     && state.activeProjectSlug === slug;
 }
+
+export function isProjectSessionReady(state, socket) {
+  var target = projectWsPath(state.currentSlug);
+  return !!socket
+    && socket.readyState === 1
+    && state.connected === true
+    && !!state.currentSlug
+    && state.wsPath === target
+    && state.socketPath === target
+    && state.activeProjectSlug === state.currentSlug
+    && state.sessionActivatedProjectSlug === state.currentSlug
+    && state.sessionListProjectSlug === state.currentSlug
+    && state.splitGroupsProjectSlug === state.currentSlug;
+}
+
+export function splitPanesMatchProject(split, slug) {
+  if (!split || !Array.isArray(split.panes) || split.panes.length !== 2 || !slug) return false;
+  return split.panes[0].slug === slug && split.panes[1].slug === slug;
+}
+
+export function hasCurrentSplitGroup(split, groups) {
+  if (!split || !split.groupId) return true;
+  var members = split.panes && split.panes.map(function (pane) { return pane.sessionId; });
+  if (!members || members.length !== 2) return false;
+  var available = Array.isArray(groups) ? groups : [];
+  for (var i = 0; i < available.length; i++) {
+    var group = available[i];
+    if (group.id !== split.groupId || !Array.isArray(group.members) || group.members.length !== 2) continue;
+    if (group.members.indexOf(members[0]) !== -1 && group.members.indexOf(members[1]) !== -1) return true;
+  }
+  return false;
+}
+
+export function reconcileRestoredSplit(split, groups) {
+  if (!split || !split.groupId) return { action: "none" };
+  var available = Array.isArray(groups) ? groups : [];
+  for (var i = 0; i < available.length; i++) {
+    var group = available[i];
+    if (group.id !== split.groupId) continue;
+    var oldMembers = split.panes && split.panes.map(function (pane) { return pane.sessionId; });
+    var members = Array.isArray(group.members) ? group.members : [];
+    if (oldMembers && oldMembers.length === 2 && members.length === 2
+        && members.indexOf(oldMembers[0]) !== -1 && members.indexOf(oldMembers[1]) !== -1) {
+      return { action: "keep", group: group };
+    }
+    return { action: "rebuild", group: group };
+  }
+  return { action: "clear" };
+}

package/lib/public/modules/split-session-boundary.js

@@ -0,0 +1,28 @@
+import { store } from './store.js';
+import { isProjectSessionReady } from './project-activation.js';
+
+export function isCurrentProjectSessionReady(state, socket) {
+  return isProjectSessionReady(state, socket);
+}
+
+export function clearProjectSplitState() {
+  store.set({
+    splitPanes: null,
+    splitGroups: [],
+    splitDelegations: {},
+    splitGroupsProjectSlug: null,
+    sessionListProjectSlug: null,
+    activeSessionId: null,
+    sessionActivatedProjectSlug: null,
+  });
+}
+
+export function markProjectSessionListHydrated() {
+  var slug = store.get('activeProjectSlug');
+  if (slug) store.set({ sessionListProjectSlug: slug });
+}
+
+export function applyProjectSplitGroups(groups) {
+  var slug = store.get('activeProjectSlug');
+  store.set({ splitGroups: groups || [], splitGroupsProjectSlug: slug || null });
+}

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

@@ -12,6 +12,8 @@ import { showConfirm } from './app-misc.js';
 import { syncPairChrome } from './split-pair-ui.js';
 import { presentMarkdownEdit } from './filebrowser.js';
 import { autoStartLoginIfNeeded } from './vendor-login.js';
+import { isCurrentProjectSessionReady } from './split-session-boundary.js';
+import { splitPanesMatchProject, hasCurrentSplitGroup, reconcileRestoredSplit } from './project-activation.js';
 
 var host = null;
 var nativeApp = null;
@@ -85,10 +87,11 @@ function showDropOverlay() {
   dropOverlay.classList.add("visible");
 }
 
-function switchNativeSession(sessionId) {
+function switchNativeSession(sessionId, expectedSlug) {
   store.set({ splitPanes: null });
   var ws = getWs();
-  if (ws && ws.readyState === 1) {
+  var state = store.snap();
+  if ((!expectedSlug || expectedSlug === state.currentSlug) && isCurrentProjectSessionReady(state, ws)) {
     ws.send(JSON.stringify({ type: "switch_session", id: sessionId }));
   }
 }
@@ -99,7 +102,7 @@ function closePane(index) {
   if (split.groupId && getWs() && getWs().readyState === 1) {
     getWs().send(JSON.stringify({ type: "split_group_dissolve", id: split.groupId }));
   }
-  switchNativeSession(split.panes[index === 0 ? 1 : 0].sessionId);
+  switchNativeSession(split.panes[index === 0 ? 1 : 0].sessionId, split.panes[index === 0 ? 1 : 0].slug);
 }
 
 function startPaneRename(header, titleEl, pane) {
@@ -372,7 +375,7 @@ export function openGroup(group) {
   var activeId = store.get('activeSessionId');
   if (activeId !== group.members[0] && activeId !== group.members[1]) {
     var ws = getWs();
-    if (ws && ws.readyState === 1) {
+    if (isCurrentProjectSessionReady(store.snap(), ws)) {
       ws.send(JSON.stringify({ type: "switch_session", id: group.members[0] }));
     }
   }
@@ -384,7 +387,33 @@ export function openGroup(group) {
 // group member, reopen that group. Safe to call often -- no-ops unless a
 // group member is active natively with no split open.
 export function maybeRestoreSplitGroup() {
-  if (store.get('paneMode') || store.get('splitPanes')) return;
+  var state = store.snap();
+  if (!isCurrentProjectSessionReady(state, getWs())) return;
+  var split = state.splitPanes;
+  if (split && !splitPanesMatchProject(split, state.currentSlug)) {
+    store.set({ splitPanes: null });
+    return;
+  }
+  if (state.paneMode) return;
+  if (split) {
+    var reconciliation = reconcileRestoredSplit(split, state.splitGroups);
+    if (reconciliation.action === "clear") {
+      store.set({ splitPanes: null });
+      return;
+    }
+    if (reconciliation.action === "rebuild") {
+      var rebuilt = reconciliation.group;
+      if (!sessionById(rebuilt.members[0]) || !sessionById(rebuilt.members[1])) {
+        store.set({ splitPanes: null });
+        return;
+      }
+      store.set({ splitPanes: {
+        groupId: rebuilt.id,
+        panes: [paneForSession(rebuilt.members[0]), paneForSession(rebuilt.members[1])],
+      } });
+    }
+    return;
+  }
   var activeId = store.get('activeSessionId');
   if (!activeId) return;
   var groups = store.get('splitGroups') || [];
@@ -505,12 +534,16 @@ export function initSplitView() {
       }
     }
     if (state.splitGroups !== prev.splitGroups) {
+      if (!isCurrentProjectSessionReady(state, getWs())) return;
       var split = state.splitPanes;
       if (!split || !split.panes) return;
+      if (!splitPanesMatchProject(split, state.currentSlug)) {
+        store.set({ splitPanes: null });
+        return;
+      }
       syncPairChrome(host, split);
       if (split.groupId) {
-        var stillExists = state.splitGroups.some(function (group) { return group.id === split.groupId; });
-        if (!stillExists) switchNativeSession(split.panes[0].sessionId);
+            if (!hasCurrentSplitGroup(split, state.splitGroups)) switchNativeSession(split.panes[0].sessionId, state.currentSlug);
         return;
       }
       var ids = [split.panes[0].sessionId, split.panes[1].sessionId];

package/lib/sdk-bridge.js

@@ -13,6 +13,7 @@ var { attachMessageProcessor } = require("./sdk-message-processor");
 var homeDebateToolPolicy = require("./home-debate-tool-policy");
 var yoke = require("./yoke");
 var sessionTitlePolicy = require("./session-title-policy");
+var sessionTitleGenerator = require("./session-title-generator");
 var loopInterview = require("./project-loop-interview");
 
 // Extract serializable tool descriptors from MCP server instances.
@@ -350,49 +351,13 @@ function createSDKBridge(opts) {
     return owner && owner.linuxUser ? owner.linuxUser : null;
   }
 
-  // Auto-generate a session title via YOKE adapter.generateTitle().
-  // Triggered by sdk-message-processor after AUTO_TITLE_TURN_THRESHOLD turns.
-  function autoGenerateTitle(session) {
-    var sessionAdapter = getAdapterForSession(session);
-    if (typeof sessionAdapter.generateTitle !== "function") {
-      console.log("[auto-title] adapter.generateTitle not available for vendor=" + sessionAdapter.vendor);
-      return;
-    }
-    var userMessages = [];
-    for (var i = 0; i < session.history.length; i++) {
-      var entry = session.history[i];
-      if (entry.type === "user_message" && entry.text) {
-        userMessages.push(entry.text.substring(0, 200));
-        if (userMessages.length >= 5) break;
-      }
-    }
-    if (userMessages.length === 0) {
-      console.log("[auto-title] No user messages found in session " + session.localId);
-      return;
-    }
-    console.log("[auto-title] Calling adapter.generateTitle with " + userMessages.length + " messages for session " + session.localId);
-
-    sessionAdapter.generateTitle(userMessages, {
-      cwd: cwd,
-      linuxUser: getSessionLinuxUser(session) || undefined,
-      env: getRuntimeEnv(session),
-    }).then(function(title) {
-      if (!title || title.length < 2) return;
-      title = title.substring(0, 100);
-      if (!session.titleManuallySet) {
-        session.title = title;
-        session.titleAutoGenerated = true;
-        sm.saveSessionFile(session);
-        sm.broadcastSessionList();
-        if (session.cliSessionId && typeof adapter.renameSession === "function") {
-          adapter.renameSession(session.cliSessionId, title, { dir: cwd }).catch(function () {});
-        }
-        console.log("[auto-title] Generated title for session " + session.localId + ": " + title);
-      }
-    }).catch(function(e) {
-      console.error("[auto-title] Failed:", e.message || e);
-    });
-  }
+  var titleGenerator = sessionTitleGenerator.attachSessionTitleGenerator({
+    sm: sm,
+    cwd: cwd,
+    getAdapter: getAdapterForSession,
+    getLinuxUser: getSessionLinuxUser,
+    getRuntimeEnv: getRuntimeEnv,
+  });
 
   var msgProcessor = attachMessageProcessor({
     sm: sm,
@@ -409,7 +374,7 @@ function createSDKBridge(opts) {
     getSessionLinuxUser: getSessionLinuxUser,
     onProcessingChanged: onProcessingChanged,
     onTurnDone: onTurnDone,
-    onAutoTitle: function (session) { autoGenerateTitle(session); },
+    onAutoTitle: function (session) { titleGenerator.generate(session); },
     opts: opts,
     discoverSkillDirs: discoverSkillDirs,
     mergeSkills: mergeSkills,
@@ -1876,10 +1841,12 @@ function createSDKBridge(opts) {
       // project threshold); seeded titles remain fixed.
       if (initialTitle && !session.title) {
         session.title = initialTitle;
+        session.titleProvisional = initialTitleProvisional;
         session.titleAutoGenerated = !initialTitleProvisional;
         sm.saveSessionFile(session);
         sm.broadcastSessionList();
       } else if (initialTitle && session.title === initialTitle) {
+        session.titleProvisional = initialTitleProvisional;
         session.titleAutoGenerated = !initialTitleProvisional;
         sm.saveSessionFile(session);
       }

package/lib/sdk-message-processor.js

@@ -661,11 +661,13 @@ function attachMessageProcessor(ctx) {
       session.streamedText = false;
       sm.broadcastSessionList();
 
-      // Auto-generate title after N turns (skip if loop or already auto-generated)
-      if (session.turnCount === sessionTitlePolicy.generationTurn(isMate)
+      // Auto-generate after the first completed substantive turn. The title
+      // coordinator handles retries while generation is pending or failed.
+      if (session.turnCount >= sessionTitlePolicy.generationTurn(isMate)
           && !session.titleAutoGenerated
           && !session.titleManuallySet
           && !session.loop
+          && !(session.sessionProvenance && session.sessionProvenance.kind === "worker")
           && onAutoTitle) {
         try { onAutoTitle(session); } catch (e) {
           console.error("[auto-title] onAutoTitle threw:", e.message || e);

package/lib/server-context-view.js

@@ -0,0 +1,53 @@
+// Authenticated user-wide context display preference service.
+
+function attachContextViewService(deps) {
+  var users = deps.users;
+  var forEachAppClient = deps.forEachAppClient;
+  var revisions = {};
+  var epoch = deps.serverEpoch || require("crypto").randomBytes(12).toString("hex");
+
+  function actor(ws) {
+    if (users.isMultiUser() !== true) 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 broadcast(userId, message, except) {
+    forEachAppClient(function (client) { if (client === except || !sameActor(client, userId)) return; send(client, message); });
+  }
+  function handleMessage(ws, msg) {
+    if (!msg || ["context_view_get", "context_view_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: "context_view_state", requestId: requestId, accountAvailable: false, accountId: null, mode: null, error: "Your account is no longer available." });
+      return true;
+    }
+    if (msg.type === "context_view_get") {
+      var current = users.getContextViewPreference(who.userId);
+      send(ws, { type: "context_view_state", requestId: requestId, accountAvailable: true, accountId: who.userId, mode: current.mode, preferencePresent: current.present, canonicalRevision: revision(who.userId), ready: !current.error, error: current.error || "" });
+      return true;
+    }
+    var saved = users.setContextViewPreference(who.userId, msg.mode);
+    if (!saved.ok) {
+      send(ws, { type: "context_view_state", requestId: requestId, accountAvailable: true, accountId: who.userId, canonicalRevision: revision(who.userId), ready: false, error: saved.error });
+      return true;
+    }
+    revisions[who.userId] = revision(who.userId) + 1;
+    var state = { type: "context_view_state", requestId: null, accountAvailable: true, accountId: who.userId, mode: msg.mode, preferencePresent: true, canonicalRevision: revisions[who.userId], ready: true, error: "" };
+    broadcast(who.userId, state, ws);
+    send(ws, Object.assign({}, state, { requestId: requestId }));
+    return true;
+  }
+  return { handleMessage: handleMessage };
+}
+
+module.exports = { attachContextViewService: attachContextViewService };

package/lib/server.js

@@ -18,6 +18,7 @@ var shouldSuppressHomeResponse = require("./home-response-notifications").should
 var serverHomePreferences = require("./server-home-preferences");
 var serverDefaultAi = require("./server-default-ai");
 var serverDefaultVendor = require("./server-default-vendor");
+var serverContextView = require("./server-context-view");
 var serverCursorSharing = require("./server-cursor-sharing");
 var serverTools = require("./server-tools");
 var serverAdmin = require("./server-admin");
@@ -1069,6 +1070,7 @@ function createServer(opts) {
   var homePreferencesHandler = null;
   var defaultAiService = null;
   var defaultVendorService = null;
+  var contextViewService = null;
   var cursorSharingService = null;
 
   // Slug-less /ws handler: lets a user with no projects yet load the regular
@@ -1555,6 +1557,7 @@ function createServer(opts) {
 
   defaultAiService = serverDefaultAi.attachDefaultAiService({ users: users, homeChatHandler: homeChatHandler, forEachAppClient: forEachAppClient });
   defaultVendorService = serverDefaultVendor.attachDefaultVendorService({ users: users, homeChatHandler: homeChatHandler, forEachAppClient: forEachAppClient });
+  contextViewService = serverContextView.attachContextViewService({ users: users, forEachAppClient: forEachAppClient });
   cursorSharingService = serverCursorSharing.attachCursorSharingService({ users: users, forEachAppClient: forEachAppClient });
 
   // --- User-installed home tools handler ---
@@ -1584,6 +1587,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 (contextViewService && contextViewService.handleMessage(ws, msg)) 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/session-title-generator.js

@@ -0,0 +1,89 @@
+// Coordinates bounded semantic title generation for completed conversations.
+
+var MAX_ATTEMPTS = 3;
+
+function isWorker(session) {
+  return !!(session && session.sessionProvenance && session.sessionProvenance.kind === "worker");
+}
+
+function hasUserMessage(session) {
+  var history = session && Array.isArray(session.history) ? session.history : [];
+  for (var i = 0; i < history.length; i++) {
+    if (history[i] && history[i].type === "user_message" && typeof history[i].text === "string" && history[i].text.trim()) return true;
+  }
+  return false;
+}
+
+function attachSessionTitleGenerator(ctx) {
+  var sm = ctx.sm;
+  var getAdapter = ctx.getAdapter;
+  var getLinuxUser = ctx.getLinuxUser || function () { return null; };
+  var getRuntimeEnv = ctx.getRuntimeEnv || function () { return process.env; };
+  var cwd = ctx.cwd;
+
+  function isLive(session) {
+    if (!session || session.destroying || isWorker(session)) return false;
+    if (!sm || !sm.sessions || typeof sm.sessions.get !== "function") return true;
+    return sm.sessions.get(session.localId) === session;
+  }
+
+  function messagesFor(session) {
+    var result = [];
+    var history = Array.isArray(session.history) ? session.history : [];
+    for (var i = 0; i < history.length; i++) {
+      var entry = history[i];
+      if (entry && entry.type === "user_message" && entry.text) {
+        result.push(entry.text.substring(0, 200));
+        if (result.length >= 5) break;
+      }
+    }
+    return result;
+  }
+
+  function generate(session) {
+    if (!isLive(session) || session.titleManuallySet || session.titleAutoGenerated || !hasUserMessage(session)) return false;
+    if (session._autoTitleInFlight || (session._autoTitleAttempts || 0) >= MAX_ATTEMPTS) return false;
+    var sessionAdapter = getAdapter(session);
+    if (!sessionAdapter || typeof sessionAdapter.generateTitle !== "function") return false;
+    var messages = messagesFor(session);
+    if (!messages.length) return false;
+
+    session._autoTitleAttempts = (session._autoTitleAttempts || 0) + 1;
+    session._autoTitleInFlight = true;
+    var requestTitle = session.title;
+    return Promise.resolve().then(function () {
+      return sessionAdapter.generateTitle(messages, {
+        cwd: cwd,
+        linuxUser: getLinuxUser(session) || undefined,
+        env: getRuntimeEnv(session),
+      });
+    }).then(function (title) {
+      title = typeof title === "string" ? title.trim() : "";
+      if (title.length < 2) return false;
+      title = title.substring(0, 100);
+      if (!isLive(session) || session.titleManuallySet || session.titleAutoGenerated || session.title !== requestTitle) return false;
+      session.title = title;
+      session.titleProvisional = false;
+      session.titleAutoGenerated = true;
+      sm.saveSessionFile(session);
+      sm.broadcastSessionList();
+      if (session.cliSessionId && typeof sessionAdapter.renameSession === "function") {
+        return Promise.resolve(sessionAdapter.renameSession(session.cliSessionId, title, { dir: cwd })).then(function () { return true; });
+      }
+      return true;
+    }).catch(function (e) {
+      console.error("[auto-title] Failed:", e.message || e);
+      return false;
+    }).then(function (result) {
+      session._autoTitleInFlight = false;
+      return result;
+    }, function (e) {
+      session._autoTitleInFlight = false;
+      throw e;
+    });
+  }
+
+  return { generate: generate, maxAttempts: MAX_ATTEMPTS };
+}
+
+module.exports = { attachSessionTitleGenerator: attachSessionTitleGenerator };

package/lib/session-title-policy.js

@@ -2,7 +2,7 @@
 // Initial titles are immediate, provisional UI labels. Model-generated titles
 // replace them after enough conversation exists to describe the actual topic.
 
-var DEFAULT_GENERATION_TURN = 2;
+var DEFAULT_GENERATION_TURN = 1;
 var HOME_GENERATION_TURN = 1;
 var MAX_PROVISIONAL_CHARS = 60;
 var LEGACY_SEARCH_TITLE = "This conversation began in Clay Studio's global search.";
@@ -25,6 +25,7 @@ function firstRecordedUserMessage(session) {
 
 function selectInitialTitle(session, transportText) {
   var existing = cleanText(session && session.title);
+  if (existing && session && session.titleProvisional === true) return { title: existing, provisional: true };
   if (existing) return { title: existing, provisional: false };
 
   // Prefer the visible message recorded in history. Query transports may wrap
@@ -41,9 +42,13 @@ function generationTurn(isMate) {
   return isMate === true ? HOME_GENERATION_TURN : DEFAULT_GENERATION_TURN;
 }
 
+function isLegacySearchTitle(value) {
+  return cleanText(value).indexOf(LEGACY_SEARCH_TITLE) === 0;
+}
+
 function repairLegacySearchTitle(session) {
   var title = cleanText(session && session.title);
-  if (!session || title.indexOf(LEGACY_SEARCH_TITLE) !== 0) return false;
+  if (!session || !isLegacySearchTitle(title)) return false;
   var source = firstRecordedUserMessage(session);
   if (!source) return false;
   session.title = source.length > MAX_PROVISIONAL_CHARS ? source.substring(0, MAX_PROVISIONAL_CHARS) : source;
@@ -56,5 +61,6 @@ module.exports = {
   HOME_GENERATION_TURN: HOME_GENERATION_TURN,
   selectInitialTitle: selectInitialTitle,
   generationTurn: generationTurn,
+  isLegacySearchTitle: isLegacySearchTitle,
   repairLegacySearchTitle: repairLegacySearchTitle,
 };

package/lib/sessions.js

@@ -8,6 +8,7 @@ var hygiene = require("./session-hygiene");
 var backgroundTaskTiming = require("./background-task-timing");
 var sessionProvenance = require("./session-provenance");
 var sessionVisibility = require("./session-visibility");
+var sessionTitlePolicy = require("./session-title-policy");
 var projectAutonomousRun = require("./project-autonomous-run").projectAutonomousRun;
 var restoreStoredRun = require("./project-autonomous-run").restoreStoredRun;
 
@@ -153,6 +154,9 @@ function createSessionManager(opts) {
         localId: session.localId,
         cliSessionId: session.cliSessionId,
         title: session.title,
+        titleProvisional: session.titleProvisional === true,
+        titleAutoGenerated: session.titleAutoGenerated === true,
+        titleManuallySet: session.titleManuallySet === true,
         createdAt: session.createdAt,
       };
       if (session.ownerId) metaObj.ownerId = session.ownerId;
@@ -286,6 +290,11 @@ function createSessionManager(opts) {
           messageUUIDs.push({ uuid: loaded[i].history[k].uuid, type: loaded[i].history[k].messageType, historyIndex: k });
         }
       }
+      var hasTitleProvenance = Object.prototype.hasOwnProperty.call(m, "titleProvisional")
+        || Object.prototype.hasOwnProperty.call(m, "titleAutoGenerated")
+        || Object.prototype.hasOwnProperty.call(m, "titleManuallySet");
+      var legacyTitleProtected = !hasTitleProvenance && typeof m.title === "string"
+        && m.title.trim() && !sessionTitlePolicy.isLegacySearchTitle(m.title);
       var session = {
         localId: localId,
         queryInstance: null,
@@ -297,6 +306,9 @@ function createSessionManager(opts) {
         pendingAskUser: {},
         isProcessing: false,
         title: m.title || "",
+        titleProvisional: m.titleProvisional === true,
+        titleAutoGenerated: m.titleAutoGenerated === true,
+        titleManuallySet: m.titleManuallySet === true || legacyTitleProtected,
         createdAt: m.createdAt || Date.now(),
         lastActivity: loaded[i].mtime || m.createdAt || Date.now(),
         history: loaded[i].history,
@@ -643,6 +655,7 @@ function createSessionManager(opts) {
       allowedTools: {},
       isProcessing: false,
       title: "",
+      titleProvisional: false,
       titleAutoGenerated: false,
       turnCount: 0,
       createdAt: Date.now(),
@@ -691,6 +704,7 @@ function createSessionManager(opts) {
       allowedTools: {},
       isProcessing: false,
       title: "",
+      titleProvisional: false,
       titleAutoGenerated: false,
       turnCount: 0,
       createdAt: Date.now(),

package/lib/user-presence.js

@@ -12,6 +12,11 @@ function sessionIdForPersistence(session) {
   return session.cliSessionId || session.localId || null;
 }
 
+function shouldPersistDisconnectPresence(existing, sessionId, existingSession, currentSession) {
+  return !!sessionId && (!existing || existing.sessionId === sessionId ||
+    (!!existingSession && !!currentSession && existingSession === currentSession));
+}
+
 function findSession(sessions, sessionId) {
   if (!sessions || sessionId == null) return null;
   var found = null;
@@ -100,6 +105,7 @@ load();
 
 module.exports = {
   sessionIdForPersistence: sessionIdForPersistence,
+  shouldPersistDisconnectPresence: shouldPersistDisconnectPresence,
   findSession: findSession,
   setPresence: setPresence,
   getPresence: getPresence,

package/lib/users-context-view-preferences.js

@@ -0,0 +1,65 @@
+// Durable user-scoped context display preference storage.
+
+var PREFERENCE_KEY = "contextViewPreference";
+var MODES = ["off", "mini", "panel"];
+
+function validMode(value) {
+  return MODES.indexOf(value) !== -1;
+}
+
+function attachContextViewPreferences(deps) {
+  var loadUsers = deps.loadUsers;
+  var saveUsers = deps.saveUsers;
+  var isMultiUser = deps.isMultiUser || function () { return false; };
+  var configModule = deps.configModule || require("./config");
+
+  function findRecord(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 result(value, source) {
+    if (value === undefined) return { present: false, mode: "off", source: null };
+    if (!validMode(value)) return { present: true, mode: "off", source: source, error: "Context display preference is invalid." };
+    return { present: true, mode: value, source: source };
+  }
+
+  function get(userId) {
+    var data;
+    try { data = loadUsers(); } catch (error) { return { present: false, mode: "off", source: null, error: "Unable to read context display preference: " + (error.message || error) }; }
+    var record = findRecord(data, userId);
+    if (isMultiUser() && !record) return { present: false, mode: "off", source: null, error: "User not found." };
+    if (record && Object.prototype.hasOwnProperty.call(record, PREFERENCE_KEY)) return result(record[PREFERENCE_KEY], "explicit");
+    if (record) return { present: false, mode: "off", source: null };
+    if (userId === "default") {
+      var config;
+      try { config = configModule.loadConfig() || {}; } catch (configError) { return { present: false, mode: "off", source: null, error: "Unable to read context display preference: " + (configError.message || configError) }; }
+      if (Object.prototype.hasOwnProperty.call(config, PREFERENCE_KEY)) return result(config[PREFERENCE_KEY], "explicit");
+    }
+    return { present: false, mode: "off", source: null };
+  }
+
+  function set(userId, mode) {
+    if (!validMode(mode)) return { ok: false, error: "Context display preference is invalid." };
+    var data;
+    try { data = loadUsers(); } catch (error) { return { ok: false, error: "Unable to read context display preference: " + (error.message || error) }; }
+    var record = findRecord(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) { return item === record ? Object.assign({}, item, { contextViewPreference: mode }) : item; }) });
+      try { saveUsers(nextData); } catch (saveError) { return { ok: false, error: "Unable to save context display preference: " + (saveError.message || saveError) }; }
+      return { ok: true, mode: mode };
+    }
+    if (userId !== "default") return { ok: false, error: "User not found." };
+    try {
+      var current = configModule.loadConfig() || {};
+      configModule.saveConfig(Object.assign({}, current, { contextViewPreference: mode }));
+      return { ok: true, mode: mode };
+    } catch (configSaveError) { return { ok: false, error: "Unable to save context display preference: " + (configSaveError.message || configSaveError) }; }
+  }
+
+  return { get: get, set: set, validMode: validMode, MODES: MODES };
+}
+
+module.exports = { attachContextViewPreferences: attachContextViewPreferences, validMode: validMode, MODES: MODES, PREFERENCE_KEY: PREFERENCE_KEY };

package/lib/users.js

@@ -12,6 +12,7 @@ var { attachExperimentalPreferences } = require("./users-experimental-preference
 var { attachScheduledTaskPreferences } = require("./users-scheduled-task-preferences");
 var { attachDefaultAiPreferences } = require("./users-default-ai-preferences");
 var { attachDefaultVendorPreferences } = require("./users-default-vendor-preferences");
+var { attachContextViewPreferences } = require("./users-context-view-preferences");
 
 var USERS_FILE = path.join(CONFIG_DIR, "users.json");
 
@@ -406,6 +407,7 @@ var experimentalPreferences = attachExperimentalPreferences({ loadUsers: loadUse
 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 });
+var contextViewPreferences = attachContextViewPreferences({ loadUsers: loadUsers, saveUsers: saveUsers, isMultiUser: auth.isMultiUser });
 
 // Alias auth functions
 var isMultiUser = auth.isMultiUser;
@@ -468,6 +470,8 @@ var getDefaultAiPreference = defaultAiPreferences.getDefaultAiPreference;
 var setDefaultAiPreference = defaultAiPreferences.setDefaultAiPreference;
 var getDefaultVendorPreference = defaultVendorPreferences.getDefaultVendor;
 var setDefaultVendorPreference = defaultVendorPreferences.setDefaultVendor;
+var getContextViewPreference = contextViewPreferences.get;
+var setContextViewPreference = contextViewPreferences.set;
 
 module.exports = {
   USERS_FILE: USERS_FILE,
@@ -551,6 +555,8 @@ module.exports = {
   setDefaultAiPreference: setDefaultAiPreference,
   getDefaultVendorPreference: getDefaultVendorPreference,
   setDefaultVendorPreference: setDefaultVendorPreference,
+  getContextViewPreference: getContextViewPreference,
+  setContextViewPreference: setContextViewPreference,
   getDeletedBuiltinKeys: getDeletedBuiltinKeys,
   addDeletedBuiltinKey: addDeletedBuiltinKey,
   removeDeletedBuiltinKey: removeDeletedBuiltinKey,

package/lib/ws-schema.js

@@ -726,6 +726,9 @@ var schema = {
   "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" },
+  "context_view_get":         { direction: "c2s", handler: "lib/server-context-view.js", description: "Read the authenticated user's context display preference" },
+  "context_view_set":         { direction: "c2s", handler: "lib/server-context-view.js", description: "Persist the authenticated user's context display preference" },
+  "context_view_state":       { direction: "s2c", handler: "lib/public/modules/context-view-preference.js", description: "Correlated or same-user-broadcast context display 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/package.json

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