clay-server 4.1.0-beta.8 → 4.1.0

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';
@@ -28,7 +30,7 @@ import { syncPaneTitles, maybeRestoreSplitGroup, openGroup } from './split-view.
 import { showPairDialog, handlePairCreated, handleSplitDelegation, showWorkerDelegationNotice, hideWorkerDelegationNotice } from './split-pair-ui.js';
 import { handleSessionActionMessage } from './session-actions.js';
 import { renderWorkerProposal, updateWorkerProposal } from './worker-proposal.js';
-import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled, sendShellResultToAgent, handleAcceptedOrdinaryMessage } from './input.js';
+import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled, sendShellResultToAgent, handleAcceptedOrdinaryMessage, handleScheduleMessageResult } from './input.js';
 import { startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, closeToolGroup, removeToolFromGroup, resetToolState, getTools, getPlanContent, setPlanContent, renderPlanBanner, renderPlanCard, getTodoTools, handleTodoWrite, handleTaskCreate, handleTaskUpdate, applyDeadSessionTodoCompaction, isPlanFilePath, enableMainInput, addTurnMeta, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, initSubagentStop, updateSubagentProgress, updateSubagentTaskStatus, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionCancelled, markPermissionResolved, renderElicitationRequest, markElicitationResolved, renderUserDialogRequest, markUserDialogResolved, updateThinkingTokens } from './tools.js';
 import { finishThinkingTurn, resumeThinkingAfterReplay } from './thinking-lifecycle.js';
 import { showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundEnabled } from './notifications.js';
@@ -44,7 +46,8 @@ import { tuiModalHandleTermOutput, tuiModalHandleTermResized, tuiModalHandleTerm
 import { updateTerminalList, handleContextSourcesState, updateEmailAccountList, updateEmailUnreadCounts, handleEmailTestResult, handleEmailAddResult, handleEmailRemoveResult } from './context-sources.js';
 import { refreshEmailSettings } from './user-settings.js';
 import { handleNotesList, handleNoteCreated, handleNoteUpdated, handleNoteDeleted, handleNoteWritten } from './sticky-notes.js';
-import { handleProjectLogsState, handleProjectLogEntry, handleProjectLogCommented, handleProjectLogCommentReviewed, handleProjectLogDeleted, handleProjectLogUpdated, handleProjectLogsError } from './project-logs.js';
+import { handleNoteDeleteResult } from './sticky-notes-browser.js';
+import { handleProjectLogsState, handleProjectLogEntry, handleProjectLogCommented, handleProjectLogCommentReviewed, handleProjectLogDeleted, handleProjectLogUpdated, handleProjectLogsError, handleScheduledTaskResultsState, handleScheduledTaskResultCreated, handleScheduledTaskResultSession } from './project-logs.js';
 import { handleSkillInstalled, handleSkillUninstalled } from './skills.js';
 import { showRewindModal, onRewindComplete, setRewindMode, onRewindError, clearPendingRewindUuid, addRewindButton } from './rewind.js';
 import { checkAdminAccess } from './admin.js';
@@ -63,9 +66,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';
@@ -73,8 +77,7 @@ import { handleToolsState, handleToolInstalled, handleToolRemoved, handleToolSto
 import { handleHomeDockState } from './home-dock.js';
 import { handleToolFrameUrlState } from './home-tool-frame.js';
 import { enterDmMode, exitDmMode, handleMateCreatedInApp, updateMateIconStatus, appendDmMessage, showDmTypingIndicator, buildMateInterviewPrompt } from './app-dm.js';
-import { handleRateLimitEvent, updateRateLimitUsage, addScheduledMessageBubble, removeScheduledMessageBubble, handleFastModeState } from './app-rate-limit.js';
-import { applyScheduledMessageQueued, applyScheduledMessageState, applyScheduledMessageTerminal } from './scheduled-message-state.js';
+import { handleRateLimitEvent, updateRateLimitUsage, handleFastModeState } from './app-rate-limit.js';
 import { handleRemoteCursorMove, handleRemoteCursorLeave, handleRemoteSelection, clearRemoteCursors } from './app-cursors.js';
 import { showLoopBanner, updateLoopBanner, updateLoopInputVisibility, showRalphApprovalBar, updateRalphApprovalStatus, openRalphPreviewModal, showExecModal, updateExecModalStatus } from './app-loop-ui.js';
 import { handleAutonomousRunMessage, syncAutonomousRunForSession } from './autonomous-run.js';
@@ -98,6 +101,12 @@ 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;
+  }
     if (msg.type === "access_revoked") {
       window.location.assign("/");
       return;
@@ -223,9 +232,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);
@@ -327,10 +335,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) {
@@ -687,6 +698,7 @@ export function processMessage(msg) {
         break;
 
       case "session_list":
+        markProjectSessionListHydrated();
         renderMateSessionList(msg.sessions || []);
         renderSessionList(msg.sessions || []);
         syncPaneTitles();
@@ -698,13 +710,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":
@@ -885,8 +898,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":
@@ -1041,6 +1054,9 @@ export function processMessage(msg) {
       case "thinking_start":
         removeMatePreThinking();
         startThinking();
+        // The live Thinking entry is the progress affordance while reasoning
+        // is streaming; avoid a second bouncing indicator at the same tail.
+        setActivity(null);
         break;
 
       case "thinking_delta":
@@ -1168,7 +1184,7 @@ export function processMessage(msg) {
 
       case "permission_request":
         setActivity(null);
-        renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId, msg.vendor);
+        renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId, msg.vendor, msg);
         startUrgentBlink();
         break;
 
@@ -1184,7 +1200,7 @@ export function processMessage(msg) {
 
       case "permission_request_pending":
         setActivity(null);
-        renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId, msg.vendor);
+        renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId, msg.vendor, msg);
         startUrgentBlink();
         break;
 
@@ -1268,8 +1284,10 @@ export function processMessage(msg) {
         break;
 
       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;
@@ -1411,28 +1429,6 @@ export function processMessage(msg) {
         updateRateLimitUsage(msg);
         break;
 
-      case "scheduled_message_queued":
-        applyScheduledMessageQueued(msg, { add: addScheduledMessageBubble, setDisabled: setScheduleBtnDisabled });
-        break;
-
-      case "scheduled_message_sent":
-        applyScheduledMessageTerminal(msg, { remove: removeScheduledMessageBubble, setDisabled: setScheduleBtnDisabled });
-        setStatus("processing");
-        break;
-
-      case "scheduled_message_cancelled":
-        applyScheduledMessageTerminal(msg, { remove: removeScheduledMessageBubble, setDisabled: setScheduleBtnDisabled });
-        break;
-
-      case "scheduled_message_state":
-        applyScheduledMessageState(msg, {
-          remove: removeScheduledMessageBubble,
-          setDisabled: setScheduleBtnDisabled,
-          add: addScheduledMessageBubble,
-          interrupted: function () { addSystemMessage("A scheduled message was interrupted during server recovery and was not sent again automatically."); },
-        });
-        break;
-
       case "auto_continue_scheduled":
         // Scheduler auto-continue, just show info
         break;
@@ -1654,6 +1650,10 @@ export function processMessage(msg) {
         handleNoteDeleted(msg);
         break;
 
+      case "note_delete_result":
+        handleNoteDeleteResult(msg);
+        break;
+
       case "project_logs_state":
         handleProjectLogsState(msg);
         break;
@@ -1682,6 +1682,18 @@ export function processMessage(msg) {
         handleProjectLogsError(msg);
         break;
 
+      case "scheduled_task_results_state":
+        handleScheduledTaskResultsState(msg);
+        break;
+
+      case "scheduled_task_result_created":
+        handleScheduledTaskResultCreated(msg);
+        break;
+
+      case "scheduled_task_result_session":
+        handleScheduledTaskResultSession(msg);
+        break;
+
       case "process_stats":
         updateStatusPanel(msg);
         updateSettingsStats(msg);

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

@@ -1,3 +1,4 @@
+import { applyPermissionHints } from './permission-hints.js';
 // app-notifications.js - Notification banners (Apple banner style)
 // New notifications appear as individual banners top-right, auto-dismiss after 3s.
 // Bell button click shows all stored notifications as banners.
@@ -190,6 +191,7 @@ function showBanner(notif, autoDismissMs) {
     (!isEmpty ? '<button class="notif-banner-close">' + iconHtml("x") + '</button>' : '');
 
   bannerContainer.appendChild(banner);
+  if (isPermission) applyPermissionHints(banner, notif.meta);
   refreshIcons();
   ensureClearAllButton();
 

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,50 +900,56 @@ 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) {
   if (contextPanel) contextPanel.classList.toggle("hidden", view !== "panel");
   if (contextMini) contextMini.classList.toggle("hidden", view !== "mini");
-  if (view === "panel") refreshIcons();
+  if (view === "panel") { refreshIcons(); requestContextDetails(); }
 }
 
 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");
   }
 }
 
@@ -922,9 +968,17 @@ export function ensureCtxPopover() {
   });
 }
 
+function requestContextDetails() {
+  var ws = getWs();
+  if (!store.get("replayingHistory") && ws && ws.readyState === 1) {
+    ws.send(JSON.stringify({ type: "context_usage_request", sessionId: store.get("activeSessionId") }));
+  }
+}
+
 export function showCtxPopover() {
   var s = store.snap();
   if (!s.headerContextEl || !s.richContextUsage) return;
+  requestContextDetails();
   if (ctxHoverTimer) { clearTimeout(ctxHoverTimer); ctxHoverTimer = null; }
   ensureCtxPopover();
   s.headerContextEl.appendChild(ctxPopoverEl);
@@ -944,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 = [];
@@ -377,6 +378,7 @@ export function resetClientState() {
   store.set({ currentFullText: "" });
   resetToolState();
   clearPendingImages();
+  store.set({ pendingScheduleAdmissions: {}, pendingScheduleAdmission: null });
   resetShellCommand();
   clearAllMentionActive();
   setActivityEl(null);
@@ -446,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();