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

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

@@ -1,3 +1,7 @@
+import { handleStudioDocumentMessage } from './clay-studio-document.js';
+import { handleClayControlActivity } from './clay-control-activity.js';
+import { handleContextualWorkspaceMessage } from './contextual-clay-workspace.js';
+import { handleContextualSessionMessage } from './contextual-clay-session.js';
 import { handleOwnerNavigation } from './clay-owner-navigation.js';
 import { leaveRevokedProject } from './project-access-recovery.js';
 import { handlePersonalSettingsMessage } from './user-settings-preferences.js';
@@ -62,7 +66,7 @@ import { handleProjectOwnerChanged } from './project-settings.js';
 import { handleProjectEnv, handleProjectEnvSaved } from './project-settings-environment.js';
 import { handleProjectSessionVisibilityDefault, refreshProjectSessionVisibilitySettings } from './project-session-visibility-settings.js';
 import { updateSettingsStats, updateDaemonConfig, handleSetPinResult, handleKeepAwakeChanged, handleAutoContinueChanged, handleRestartResult, handleShutdownResult, handleSharedEnv, handleSharedEnvSaved, handleServerSettingResult } from './server-settings.js';
-import { handleTermList, handleTermCreated, sendTerminalCommand, handleTermOutput, handleTermResized, handleTermExited, handleTermClosed } from './terminal.js';
+import { handleTerminalProjection, handleTermList, handleTermCreated, sendTerminalCommand, handleTermOutput, handleTermResized, handleTermExited, handleTermClosed } from './terminal.js';
 import { attachTuiView, detachTuiView, setTuiSuspendedView, tuiHandleTermOutput, tuiHandleTermResized, tuiHandleTermExited, tuiHandleTermClosed } from './session-tui-view.js';
 import { handleTuiTranscriptState } from './tui-grab.js';
 import { tuiModalHandleTermOutput, tuiModalHandleTermResized, tuiModalHandleTermExited, tuiModalHandleTermClosed } from './tui-attention.js';
@@ -121,6 +125,8 @@ var connectOverlay = document.getElementById("connect-overlay");
 initMessageDeliveryUi();
 
 export function processMessage(msg) {
+  if (handleStudioDocumentMessage(msg)) return;
+  if (handleClayControlActivity(msg)) return;
   if (handleOwnerNavigation(msg)) return;
   if (["update_available", "up_to_date", "update_started", "update_check_failed"].indexOf(msg.type) !== -1) handleServerUpdate(msg);
   if (/^(set_pin|set_keep_awake|set_inherit_groups|set_image_retention|set_update_channel|restart_server|shutdown_server)_result$/.test(msg.type)) handleServerSettingResult(msg);
@@ -230,6 +236,8 @@ export function processMessage(msg) {
 
     store.set({ currentHistoryIndex: Number.isSafeInteger(msg._historyIndex) && msg._historyIndex >= 0 ? msg._historyIndex : null,
       currentHistoryIndexes: Array.isArray(msg._historyIndexes) ? msg._historyIndexes : null });
+    if (handleContextualSessionMessage(msg)) return;
+    handleContextualWorkspaceMessage(msg);
     switch (msg.type) {
       case "message_ack":
         var acknowledgedEntry = acknowledgeMessage(msg.clientMessageId);
@@ -260,6 +268,7 @@ export function processMessage(msg) {
         break;
 
       case "history_done":
+        if (messagesEl && msg.sessionId === store.get("activeSessionId") && msg.sessionOriginId === store.get("sessionOriginId")) { messagesEl.dataset.controlSessionId = String(msg.sessionId); messagesEl.dataset.controlSessionOrigin = msg.sessionOriginId; messagesEl.dataset.controlHistoryRevision = msg.controlHistoryRevision || ""; }
         store.set({ replayingHistory: false });
         resumeThinkingAfterReplay(store.get('sessionIsProcessing'));
         // Batched syntax highlight + mermaid pass for the entire replayed
@@ -282,7 +291,7 @@ export function processMessage(msg) {
 
         // 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);
+          accumulateContext(msg.lastCost, msg.lastUsage, msg.lastModelUsage, msg.lastStreamInputTokens, msg.context);
         }
         updateContextPanel();
         updateUsagePanel();
@@ -290,6 +299,7 @@ export function processMessage(msg) {
         // the restored turn instead of starting a second answer bubble.
         if (store.get('sessionIsProcessing')) {
           flushStreamBuffer();
+          if (store.get('turnActivity')) setActivity(store.get('turnActivity').phase);
         } else {
           markAllToolsDone();
           finalizeAssistantBlock();
@@ -376,6 +386,7 @@ export function processMessage(msg) {
         break;
 
       case "info":
+        store.set({ controlRuntimeId: msg.controlRuntimeId || null });
         if (msg.text && !msg.project && !msg.cwd) {
           addSystemMessage(msg.text, false);
           break;
@@ -912,7 +923,7 @@ export function processMessage(msg) {
           ? msg.runtimeTerminalId
           : (typeof msg.terminalId === "number" ? msg.terminalId : null);
         var _sessionRole = msg.sessionRole === "worker" ? "worker" : "driver";
-        store.set({ activeSessionId: msg.id, sessionOriginId: msg.sessionOriginId || null, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || "", currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode'), effectivePermissionMode: msg.effectivePermissionMode || null, permissionCapabilities: msg.permissionCapabilities || { auto: false, mcpOverride: false }, mcpPermissionModeOverrides: msg.mcpPermissionModeOverrides || {}, activeSessionMateId: _sessionRole === "worker" ? null : (store.get('activeProjectMateId') || null), activeSessionMateName: _sessionRole === "worker" ? "" : (store.get('activeProjectMateName') || "") });
+        store.set({ activeSessionId: msg.id, sessionOriginId: msg.sessionOriginId || null, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || "", currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, turnActivity: null, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode'), effectivePermissionMode: msg.effectivePermissionMode || null, permissionCapabilities: msg.permissionCapabilities || { auto: false, mcpOverride: false }, mcpPermissionModeOverrides: msg.mcpPermissionModeOverrides || {}, activeSessionMateId: _sessionRole === "worker" ? null : (store.get('activeProjectMateId') || null), activeSessionMateName: _sessionRole === "worker" ? "" : (store.get('activeProjectMateName') || "") });
         handleScheduledTaskSessionSwitched(msg);
         requestLoopInterviewState();
         activateDeliverySession(msg.id, msg.cliSessionId || null, msg.sessionOriginId || null);
@@ -1039,7 +1050,11 @@ export function processMessage(msg) {
         // running session, where history_done keeps current tools active.
         // Question answers, plan feedback and Driver delegations are injected
         // mid-turn, so tools before them may still be running.
-        else if (!msg.askUserAnswer && !msg.planFeedback && !msg.delegated) markAllToolsDone();
+        else if (!msg.askUserAnswer && !msg.planFeedback && !msg.delegated) {
+          markAllToolsDone();
+          // Older histories predate explicit foreground presentation boundaries.
+          finalizeAssistantBlock();
+        }
         resetThinkingGroup();
         if (msg.planContent) {
           setPlanContent(msg.planContent);
@@ -1136,7 +1151,7 @@ export function processMessage(msg) {
           // events make it through.
           removeMatePreThinking();
           if (!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) && !store.get('matePreThinkingEl')) {
-            setActivity("thinking");
+            setActivity((store.get("turnActivity") || {}).phase || "thinking");
           }
         }
         break;
@@ -1172,8 +1187,24 @@ export function processMessage(msg) {
         }
         break;
 
+      case "turn_activity":
+        if (["waiting", "running", "background"].indexOf(msg.phase) === -1) break;
+        store.set({ turnActivity: { phase: msg.phase, turnId: msg.turnId || null, disposition: msg.disposition || null } });
+        if (!store.get('replayingHistory') && store.get('sessionIsProcessing')) {
+          removeMatePreThinking();
+          setActivity(msg.phase);
+        }
+        break;
+
+      case "assistant_boundary":
+        // Foreground presentation ended; background work still owns its real
+        // terminal. Flush pending animation text without finishing tools/Stop.
+        finalizeAssistantBlock();
+        break;
+
       case "delta":
         if (typeof msg.text !== "string") break;
+        store.set({ turnActivity: null });
         removeMatePreThinking();
         stopThinking();
         setActivity(null);
@@ -1221,6 +1252,8 @@ export function processMessage(msg) {
           renderMcpDebateProposal(msg.id, msg.input);
           startUrgentBlink();
         } else if (msg.name === "AskUserQuestion" && msg.input && msg.input.questions) {
+          store.set({ turnActivity: null });
+          setActivity(null);
           var askTool = getTools()[msg.id];
           if (askTool) {
             if (askTool.el) askTool.el.style.display = "none";
@@ -1301,6 +1334,7 @@ export function processMessage(msg) {
         break;
 
       case "permission_request":
+        store.set({ turnActivity: null });
         setActivity(null);
         renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId, msg.vendor, msg);
         startUrgentBlink();
@@ -1317,12 +1351,15 @@ export function processMessage(msg) {
         break;
 
       case "permission_request_pending":
+        store.set({ turnActivity: null });
         setActivity(null);
         renderPermissionRequest(msg.requestId, msg.toolName, msg.toolInput, msg.decisionReason, msg.mateId, msg.vendor, msg);
         startUrgentBlink();
         break;
 
       case "elicitation_request":
+        store.set({ turnActivity: null });
+        setActivity(null);
         renderElicitationRequest(msg);
         startUrgentBlink();
         break;
@@ -1337,6 +1374,8 @@ export function processMessage(msg) {
         break;
 
       case "user_dialog_request":
+        store.set({ turnActivity: null });
+        setActivity(null);
         renderUserDialogRequest(msg);
         startUrgentBlink();
         break;
@@ -1402,7 +1441,7 @@ export function processMessage(msg) {
         finalizeAssistantBlock();
         addTurnMeta(msg.cost, msg.duration);
         accumulateUsage(msg.cost, msg.usage);
-        accumulateContext(msg.cost, msg.usage, msg.modelUsage, msg.lastStreamInputTokens);
+        accumulateContext(msg.cost, msg.usage, msg.modelUsage, msg.lastStreamInputTokens, msg.context);
         break;
 
       case "context_usage":
@@ -1415,6 +1454,7 @@ export function processMessage(msg) {
         break;
 
       case "done":
+        store.set({ turnActivity: null });
         removeMatePreThinking();
         setActivity(null);
         finishThinkingTurn();
@@ -1438,6 +1478,7 @@ export function processMessage(msg) {
         break;
 
       case "error":
+        store.set({ turnActivity: null });
         removeMatePreThinking();
         setActivity(null);
         finishThinkingTurn();
@@ -1662,6 +1703,9 @@ export function processMessage(msg) {
         handleFileAt(msg);
         break;
 
+      case "term_control_projection":
+        handleTerminalProjection(msg);
+        break;
       case "term_list":
         handleTermList(msg);
         updateTerminalList(msg.terminals);

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

@@ -26,8 +26,7 @@ function getVendorLoginCommand(vendor) {
   var vendors = store.get('vendorInfo') || {};
   var info = vendors[vendor];
   if (info && info.loginCommand) return info.loginCommand;
-  var fallbacks = { codex: "codex login --device-auth", claude: "claude login" };
-  return fallbacks[vendor] || fallbacks.claude;
+  return "";
 }
 
 // --- Pending TUI attention tracking ---
@@ -135,7 +134,7 @@ function showBanner(notif, autoDismissMs) {
 
   var banner = document.createElement("div");
   banner.className = "notif-banner" + (isAuthRequired ? " notif-banner-update notif-banner-auth" : isPermission ? " notif-banner-permission" : isUserMention ? " notif-banner-user-mention" : "");
-  if (!isEmpty) banner.setAttribute("data-notif-id", notif.id);
+  if (!isEmpty) { banner.setAttribute("data-notif-id", notif.id); banner.dataset.controlRevision = notif.controlRevision || ""; }
   if (isAuthRequired) banner.setAttribute("data-auth-banner", "true");
 
   var iconHtmlStr = userMentionAvatarSrc
@@ -470,7 +469,12 @@ export function getPendingTuiAttention(slug) {
 }
 
 export function handleNotificationsState(msg) {
-  notifications = msg.notifications || [];
+  notifications = msg.notifications || []; store.set({ clayControlNotifications: notifications });
+  // Authoritative snapshots also withdraw banners removed by reviewed canonical actions.
+  if (bannerContainer) Array.from(bannerContainer.querySelectorAll('[data-notif-id]')).forEach(function (banner) {
+    var id = banner.dataset.notifId;
+    if (id.charAt(0) !== '_' && !notifications.some(function (item) { return item.id === id; })) removeBanner(banner);
+  });
   unreadCount = msg.unreadCount || 0;
   updateBadge();
 
@@ -501,6 +505,7 @@ export function handleNotificationsState(msg) {
 
 export function handleNotificationCreated(msg) {
   var notif = msg.notification;
+  store.set({ clayControlNotifications: [notif].concat((store.get("clayControlNotifications") || []).filter(function (item) { return item.id !== notif.id; })) });
 
   // Auto-dismiss if it's for the session the user is currently viewing
   var activeSession = store.get('activeSessionId') || null;
@@ -511,6 +516,7 @@ export function handleNotificationCreated(msg) {
   }
 
   notifications.unshift(notif);
+  store.set({ clayControlNotifications: notifications });
   unreadCount = msg.unreadCount;
   updateBadge();
 
@@ -568,7 +574,7 @@ export function handleNotificationDismissed(msg) {
 }
 
 export function handleNotificationDismissedAll() {
-  notifications = [];
+  notifications = []; store.set({ clayControlNotifications: [] });
   unreadCount = 0;
   updateBadge();
   if (bannerContainer) bannerContainer.innerHTML = "";

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

@@ -93,42 +93,6 @@ var MODE_OPTIONS = [
 var MODE_FULL_AUTO = { value: "auto", label: "Auto" };
 var MODE_SKIP = { value: "bypassPermissions", label: "Skip permissions" };
 var EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
-var EFFORT_LEVELS_BY_VENDOR = {
-  claude: ["low", "medium", "high", "xhigh", "max"],
-  codex: ["low", "medium", "high", "xhigh", "max"],
-  antigravity: [],
-  opencode: [],
-  kiro: ["low", "medium", "high", "xhigh", "max"],
-};
-var THINKING_OPTIONS = ["disabled", "adaptive", "budget"];
-var CODEX_APPROVAL_OPTIONS = [
-  { value: "never", label: "Auto" },
-  { value: "untrusted", label: "Untrusted" },
-  { value: "on-request", label: "Ask" },
-];
-var CODEX_SANDBOX_OPTIONS = [
-  { value: "read-only", label: "Read Only" },
-  { value: "workspace-write", label: "Workspace" },
-  { value: "danger-full-access", label: "Full Access" },
-];
-var CODEX_WEBSEARCH_OPTIONS = [
-  { value: "disabled", label: "Off" },
-  { value: "cached", label: "Cached" },
-  { value: "live", label: "Live" },
-];
-var KNOWN_CONTEXT_WINDOWS = {
-  "opus-4-6": 1000000,
-  "claude-sonnet-4": 1000000,
-  "gpt-6-astra": 1050000,
-  "gpt-5.6": 1050000,
-  "gpt-5.5": 1048576,
-  "gpt-5.4": 1048576,
-  "gpt-5.3": 1048576,
-  "gpt-5.2": 1048576,
-  "gpt-4.1": 1047576,
-  "o3": 200000,
-  "o4-mini": 200000,
-};
 // Categories to hide from the legend (noise, not actionable)
 var CTX_HIDDEN_CATS = { "Free space": 1, "Autocompact buffer": 1 };
 
@@ -160,12 +124,12 @@ export function effortDisplayName(value) {
 // uses this for sessions other than the active one). Falls back from the
 // model's own supportedEffortLevels to the vendor table.
 export function effortLevelsFor(vendor, models, modelValue) {
-  var defaults = EFFORT_LEVELS_BY_VENDOR[vendor] || EFFORT_LEVELS;
+  var defaults = ((store.get("vendorInfo") || {})[vendor] || {}).effortLevels || [];
   var list = models || [];
   for (var i = 0; i < list.length; i++) {
     var value = typeof list[i] === "string" ? list[i] : (list[i] && (list[i].value || list[i].id)) || "";
     if (value === modelValue) {
-      if (list[i].supportedEffortLevels && list[i].supportedEffortLevels.length > 0) {
+      if (Array.isArray(list[i].supportedEffortLevels)) {
         return list[i].supportedEffortLevels;
       }
       return defaults;
@@ -182,9 +146,8 @@ function thinkingDisplayName(value) {
 }
 
 function isSonnetModel(model) {
-  if (!model) return false;
-  var lower = model.toLowerCase();
-  return lower.indexOf("sonnet") !== -1;
+  var models = store.get("currentModels") || [];
+  return models.some(function(entry) { return entry && entry.value === model && entry.supportsBetaContext === true; });
 }
 
 function hasBeta(name) {
@@ -198,7 +161,7 @@ function hasBeta(name) {
 function rebuildModeList() {
   if (!configModeList) return;
   configModeList.innerHTML = "";
-  var options = MODE_OPTIONS.slice();
+  var options = (providerConfiguration().permissionModes || []).slice();
   options.push(MODE_FULL_AUTO);
   options.push(MODE_SKIP);
   var autoSupported = store.get('permissionCapabilities').auto === true;
@@ -212,8 +175,8 @@ function rebuildModeList() {
     btn.textContent = opt.label;
     if (opt.value === "auto" && !autoSupported) {
       btn.disabled = true;
-      btn.title = "Auto permissions require a Claude session.";
-      btn.setAttribute("aria-description", "Unavailable because this is not a Claude session.");
+      btn.title = "Auto permissions are unavailable for this session.";
+      btn.setAttribute("aria-description", "The current runtime does not support Auto permissions.");
     }
     if (globallyForced) {
       btn.disabled = true;
@@ -232,13 +195,13 @@ function rebuildModeList() {
 function rebuildEffortBar() {
   if (!configEffortBar || !configEffortSection) return;
   var supportsEffort = getModelSupportsEffort();
-  if (!supportsEffort) {
+  var levels = getModelEffortLevels();
+  if (!supportsEffort || !levels.length) {
     configEffortSection.style.display = "none";
     return;
   }
   configEffortSection.style.display = "";
   configEffortBar.innerHTML = "";
-  var levels = getModelEffortLevels();
   for (var i = 0; i < levels.length; i++) {
     var level = levels[i];
     var btn = document.createElement("button");
@@ -277,8 +240,9 @@ function rebuildThinkingSection() {
   configThinkingSection.style.display = "";
   configThinkingBar.innerHTML = "";
   var s = store.snap();
-  for (var i = 0; i < THINKING_OPTIONS.length; i++) {
-    var opt = THINKING_OPTIONS[i];
+  var thinkingOptions = (providerConfiguration().thinking || {}).options || [];
+  for (var i = 0; i < thinkingOptions.length; i++) {
+    var opt = thinkingOptions[i];
     var btn = document.createElement("button");
     btn.className = "config-segment-btn";
     if (opt === s.currentThinking) btn.classList.add("active");
@@ -329,22 +293,21 @@ function buildSegmentedBar(barEl, options, currentValue, msgType, msgKey) {
   }
 }
 
-function rebuildCodexSections() {
-  var s = store.snap();
-  var isCodex = (s.currentVendor || "claude") === "codex";
+function providerConfiguration() {
+  var state = store.snap();
+  return ((state.vendorInfo || {})[state.currentVendor] || {}).configuration || {};
+}
 
-  if (configApprovalSection) {
-    configApprovalSection.style.display = isCodex ? "" : "none";
-    if (isCodex) buildSegmentedBar(configApprovalBar, CODEX_APPROVAL_OPTIONS, s.codexApproval, "set_codex_approval", "approval");
-  }
-  if (configSandboxSection) {
-    configSandboxSection.style.display = isCodex ? "" : "none";
-    if (isCodex) buildSegmentedBar(configSandboxBar, CODEX_SANDBOX_OPTIONS, s.codexSandbox, "set_codex_sandbox", "sandbox");
-  }
-  if (configWebsearchSection) {
-    configWebsearchSection.style.display = isCodex ? "" : "none";
-    if (isCodex) buildSegmentedBar(configWebsearchBar, CODEX_WEBSEARCH_OPTIONS, s.codexWebSearch, "set_codex_websearch", "webSearch");
+function rebuildProviderSections() {
+  var state = store.snap(), config = providerConfiguration();
+  function section(element, bar, description) {
+    if (!element) return;
+    element.style.display = description ? "" : "none";
+    if (description) buildSegmentedBar(bar, description.options || [], state[description.state], description.message, description.key);
   }
+  section(configApprovalSection, configApprovalBar, config.approval);
+  section(configSandboxSection, configSandboxBar, config.sandbox);
+  section(configWebsearchSection, configWebsearchBar, config.webSearch);
 }
 
 function escHtml(s) {
@@ -584,25 +547,17 @@ export function updateConfigChip() {
   if (!configChipWrap || !configChip) return;
   configChipWrap.classList.remove("hidden");
   var s = store.snap();
-  var vendor = s.currentVendor || "claude";
   configChipLabel.textContent = modelDisplayName(s.currentModel, s.currentModels);
   renderModelPicker();
   rebuildModeList();
   rebuildEffortBar();
 
-  // MODE remains Claude-specific until adapter modes become capabilities.
-  var isClaude = vendor === "claude";
-  if (configModeList && configModeList.parentElement) configModeList.parentElement.style.display = isClaude ? "" : "none";
+  var configuration = providerConfiguration();
+  if (configModeList && configModeList.parentElement) configModeList.parentElement.style.display = configuration.permissionModes ? "" : "none";
   rebuildThinkingSection();
-  // capabilities.thinking means "emits a thinking stream" (true for every
-  // vendor), NOT "accepts thinking config". The adaptive/extended toggle and
-  // budget only feed Claude queries (sm.currentThinking), so the section
-  // stays Claude-only until a dedicated thinkingConfig capability exists.
-  if (configThinkingSection) configThinkingSection.style.display = isClaude ? "" : "none";
-  // BETA section deprecated (1M context is now standard)
+  if (configThinkingSection) configThinkingSection.style.display = configuration.thinking ? "" : "none";
   if (configBetaSection) configBetaSection.style.display = "none";
-  // APPROVAL, SANDBOX, WEB SEARCH are Codex-only
-  rebuildCodexSections();
+  rebuildProviderSections();
 }
 
 export function getModelSupportsEffort() {
@@ -645,10 +600,10 @@ export function accumulateUsage(cost, usage) {
   // Assign directly instead of summing to avoid overcounting.
   if (cost != null) sessionUsage.cost = cost;
   if (usage) {
-    sessionUsage.input += usage.input_tokens || usage.inputTokens || 0;
-    sessionUsage.output += usage.output_tokens || usage.outputTokens || 0;
-    sessionUsage.cacheRead += usage.cache_read_input_tokens || usage.cacheReadInputTokens || 0;
-    sessionUsage.cacheWrite += usage.cache_creation_input_tokens || usage.cacheCreationInputTokens || 0;
+    sessionUsage.input += usage.inputTokens || 0;
+    sessionUsage.output += usage.outputTokens || 0;
+    sessionUsage.cacheRead += usage.cacheReadInputTokens || 0;
+    sessionUsage.cacheWrite += usage.cacheCreationInputTokens || 0;
   }
   sessionUsage.turns++;
   if (!store.get('replayingHistory')) updateUsagePanel();
@@ -724,14 +679,8 @@ export function toggleStatusPanel() {
 
 // --- Context panel ---
 
-export function resolveContextWindow(model, sdkValue) {
-  var lc = (model || "").toLowerCase();
-  if (lc.includes("[1m]")) return 1000000;
-  if (sdkValue) return sdkValue;
-  for (var key in KNOWN_CONTEXT_WINDOWS) {
-    if (lc.includes(key)) return KNOWN_CONTEXT_WINDOWS[key];
-  }
-  return 200000;
+export function resolveContextWindow(model, reported) {
+  return typeof reported === "number" && reported > 0 ? reported : 0;
 }
 
 export function contextPctClass(pct) {
@@ -744,21 +693,21 @@ export function updateContextPanel() {
   // 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 richContext = rich && rich.context;
+  var hasRich = richContext && typeof richContext.usedTokens === "number" && typeof richContext.windowTokens === "number" && richContext.windowTokens > 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 used = hasRich ? richContext.usedTokens : (hasCurrent ? contextData.currentInput : 0);
+  var win = hasRich ? richContext.windowTokens : (hasCurrent ? contextData.contextWindow : 0);
+  hasContext = hasContext && win > 0;
+  var measurement = hasRich ? richContext.measurement : store.get("contextMeasurement");
   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 });
   // Panel bar
   contextBarFill.style.width = pct.toFixed(1) + "%";
   contextBarFill.className = "context-bar-fill" + cls;
-  contextBarPct.textContent = pct.toFixed(0) + "%";
+  contextBarPct.textContent = hasContext ? pct.toFixed(0) + "%" : "-";
   // Mini bar
   if (contextMiniFill) {
     contextMiniFill.style.width = pct.toFixed(1) + "%";
@@ -807,7 +756,8 @@ export function updateContextPanel() {
       }
     }
   }
-  contextUsedEl.textContent = formatTokens(used);
+  contextUsedEl.textContent = hasRich || hasCurrent ? (measurement === "estimated" ? "~" : "") + formatTokens(used) : "-";
+  contextUsedEl.title = hasRich || hasCurrent ? (measurement === "estimated" ? "Estimated current context" : "Observed current context") : "Current context unavailable";
   contextWindowEl.textContent = win > 0 ? formatTokens(win) : "-";
   contextMaxOutputEl.textContent = contextData.maxOutputTokens > 0 ? formatTokens(contextData.maxOutputTokens) : "-";
   contextInputEl.textContent = formatTokens(contextData.input);
@@ -829,7 +779,13 @@ export function updateContextPanel() {
   contextTurnsEl.textContent = String(contextData.turns);
 }
 
-export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens) {
+export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens, context) {
+  if (context) {
+    if (context.source === "last_turn") store.set({ richContextUsage: null });
+    store.set({ contextMeasurement: context.measurement || "unavailable" });
+    contextData.currentInput = typeof context.usedTokens === "number" ? context.usedTokens : null;
+    if (typeof context.windowTokens === "number") contextData.contextWindow = context.windowTokens;
+  }
   // cost is the SDK's total_cost_usd -- a cumulative running total, not a delta.
   if (cost != null) contextData.cost = cost;
   // Use latest turn values (not cumulative) since each turn's input_tokens
@@ -842,17 +798,14 @@ export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens
     if (typeof lastStreamInputTokens === "number") {
       contextData.input = lastStreamInputTokens;
     } else {
-      contextData.input = (usage.input_tokens || usage.inputTokens || 0)
-          + (usage.cache_read_input_tokens || usage.cacheReadInputTokens || 0);
-    }
-    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.input = (usage.inputTokens || 0)
+          + (usage.cacheReadInputTokens || 0);
     }
+    contextData.output = usage.outputTokens || 0;
+    contextData.cacheRead = usage.cacheReadInputTokens || 0;
+    contextData.cacheWrite = usage.cacheCreationInputTokens || 0;
+    contextData.currentInput = context && typeof context.usedTokens === "number" ? context.usedTokens : null;
+    if (context && typeof context.windowTokens === "number") contextData.contextWindow = context.windowTokens;
   }
   contextData.turns++;
   if (modelUsage) {
@@ -864,23 +817,8 @@ export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens
       // (e.g. CLI reports "claude-sonnet-4-6" even when running as opus[1m])
       var displayModel = store.get('currentModel') || m;
       contextData.model = displayModel;
-      contextData.contextWindow = resolveContextWindow(displayModel, mu.contextWindow);
+      contextData.contextWindow = context && typeof context.windowTokens === "number" ? context.windowTokens : 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
@@ -1009,8 +947,8 @@ export function renderCtxPopover() {
   if (!ctxPopoverEl || !richContextUsage) return;
   var d = richContextUsage;
   var cats = d.categories || [];
-  var total = d.totalTokens != null ? d.totalTokens : (d.input_tokens || 0);
-  var max = d.maxTokens != null ? d.maxTokens : (d.contextWindow || 0);
+  var total = d.context && d.context.usedTokens || 0;
+  var max = d.context && d.context.windowTokens || 0;
   var pct = d.percentage != null ? d.percentage : (max > 0 ? (total / max) * 100 : 0);
 
   var html = "";

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

@@ -1,3 +1,4 @@
+import { prepareContextualWorkspaceDeparture } from './contextual-clay-workspace.js';
 // app-projects.js - Project list, switching, add/remove project modals
 // Extracted from app.js (PR-29)
 
@@ -311,6 +312,7 @@ export function renderProjectList() {
   }).map(function (p) {
     return {
       slug: p.slug,
+      controlRuntimeId: p.controlRuntimeId || null,
       name: p.title || p.project,
       icon: p.icon || null,
       isProcessing: p.isProcessing,
@@ -389,6 +391,7 @@ export function resetClientState() {
 
 export function switchProject(slug) {
   if (!slug) return;
+  if (prepareContextualWorkspaceDeparture(slug) === false) return;
   var target = cachedProjects.find(function (project) { return project.slug === slug; });
   if (target && target.contentAccess === false && target.administrativeAccess === true) {
     window.location.assign("/p/" + encodeURIComponent(slug) + "/");