clay-server 5.2.0-beta.1 → 5.2.0-beta.11

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

@@ -5,8 +5,9 @@ import { refreshIcons } from './icons.js';
 import { store } from './store.js';
 import { getSendBtn, getStatusDot } from './dom-refs.js';
 import { onThemeChange } from './theme.js';
-import { getActivityEl, setActivityEl, addToMessages, scrollToBottom, VENDOR_AVATARS } from './app-rendering.js';
+import { getActivityEl, setActivityEl, addToMessages, scrollToBottom } from './app-rendering.js';
 import { escapeHtml } from './utils.js';
+import { resolveProjectAssistantIdentity, applyProjectAssistantIdentity } from './project-chat-identity.js';
 
 // --- Module-owned state ---
 var faviconLink, faviconOrigHref, faviconCanvas, faviconCtx, faviconImg, faviconImgReady;
@@ -197,7 +198,7 @@ export function stopUrgentBlink() {
 
 export function setActivity(text) {
   var thinkingState = store.get('thinkingState');
-  if (text === "thinking" && thinkingState && thinkingState.active) {
+  if ((text === "thinking" || text === "running") && thinkingState && thinkingState.active) {
     // Live Thinking already owns the tail progress UI. Compaction and tool
     // activity intentionally continue through so their distinct states show.
     if (getActivityEl()) {
@@ -210,14 +211,12 @@ export function setActivity(text) {
     if (!getActivityEl()) {
       var _actEl = document.createElement("div");
       _actEl.className = "activity-inline";
-      // In channel mode (Claude Code / Codex sessions), include the vendor
-      // avatar so the user can see who is responding while the dots are
-      // animating. DM mode handles its own avatar via mate-thinking
-      // elements and shouldn't pick up a vendor avatar here.
+      // The same session-bound identity owns waiting, thoughts and replies.
+      // DM mode retains its own Mate-thinking row.
       var _isDm = !!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate);
       if (!_isDm) {
-        var _vendor = store.get('currentVendor') || 'claude';
-        var _avatarUrl = VENDOR_AVATARS[_vendor] || VENDOR_AVATARS.claude;
+        var _identity = resolveProjectAssistantIdentity(store.snap(), store.get('currentVendor'));
+        var _avatarUrl = _identity.avatarUrl;
         _actEl.innerHTML =
           '<img class="activity-inline-avatar" src="' + escapeHtml(_avatarUrl) + '" alt="">' +
           '<div class="mate-thinking-dots"><span></span><span></span><span></span></div>';
@@ -225,9 +224,19 @@ export function setActivity(text) {
         _actEl.innerHTML =
           '<div class="mate-thinking-dots"><span></span><span></span><span></span></div>';
       }
+      _actEl.setAttribute("role", "status");
+      _actEl.setAttribute("aria-live", "polite");
       setActivityEl(_actEl);
-      addToMessages(_actEl);
     }
+    var activity = getActivityEl();
+    var labels = { waiting: "Waiting for provider", running: "Working", background: "Background work pending" };
+    var label = activity.querySelector(".activity-state-label");
+    if (labels[text]) {
+      if (!label) { label = document.createElement("span"); label.className = "activity-state-label activity-text"; activity.appendChild(label); }
+      label.textContent = labels[text];
+    } else if (label) label.remove();
+    applyProjectAssistantIdentity(activity, resolveProjectAssistantIdentity(store.snap(), store.get('currentVendor')));
+    addToMessages(activity);
     scrollToBottom();
   } else {
     if (getActivityEl()) {

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

@@ -267,14 +267,16 @@ export function initHeader() {
           addRow("Local ID", split.panes[pi].sessionId);
           if (member && member.cliSessionId) {
             addRow("Session ID", member.cliSessionId);
-            addRow("Resume", "claude --resume " + member.cliSessionId);
+            var memberResume = ((store.get("vendorInfo") || {})[member.vendor || "claude"] || {}).terminalResumeCommand;
+            if (memberResume) addRow("Resume", memberResume + " " + member.cliSessionId);
           }
         }
       } else {
         var s = store.snap();
         if (s.cliSessionId) addRow("Session ID", s.cliSessionId);
         if (s.activeSessionId) addRow("Local ID", s.activeSessionId);
-        if (s.cliSessionId) addRow("Resume", "claude --resume " + s.cliSessionId);
+        var resume = ((s.vendorInfo || {})[s.currentVendor] || {}).terminalResumeCommand;
+        if (s.cliSessionId && resume) addRow("Resume", resume + " " + s.cliSessionId);
       }
 
       document.body.appendChild(pop);
@@ -350,6 +352,7 @@ export function prependOlderHistory(items, meta) {
 
   // Save current rendering state
   var savedMsgEl = store.get('currentMsgEl');
+  var savedReplayingHistory = store.get('replayingHistory');
   var savedActivity = getActivityEl();
   var savedFullText = store.get('currentFullText');
   var savedTurnCounter = getTurnCounter();
@@ -359,7 +362,7 @@ export function prependOlderHistory(items, meta) {
   var savedUsage = JSON.parse(JSON.stringify(getSessionUsage()));
 
   // Reset to initial values for clean rendering
-  store.set({ currentMsgEl: null, currentFullText: "" });
+  store.set({ currentMsgEl: null, currentFullText: "", replayingHistory: true });
   setActivityEl(null);
   setTurnCounter(0);
   resetToolState();
@@ -387,7 +390,7 @@ export function prependOlderHistory(items, meta) {
   setPrependAnchor(null);
 
   // Restore saved state
-  store.set({ currentMsgEl: savedMsgEl, currentFullText: savedFullText });
+  store.set({ currentMsgEl: savedMsgEl, currentFullText: savedFullText, replayingHistory: savedReplayingHistory });
   setActivityEl(savedActivity);
   setTurnCounter(savedTurnCounter);
   restoreToolState(savedToolsState);

package/lib/public/modules/app-home-hub.js

@@ -3,7 +3,8 @@
 import { showProjectsHub, hideProjectsHub } from './projects-hub.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
-import { getCachedProjects, openAddProjectModal, switchProject } from './app-projects.js';
+import { getCachedProjects, switchProject } from './app-projects.js';
+import { openAddProjectModal } from './project-start-dialog.js';
 import { chooseProjectActivationTarget, homeProjectCreationState } from './project-activation.js';
 import { mateAvatarUrl } from './avatar.js';
 import { exitDmMode } from './app-dm.js';

package/lib/public/modules/app-loop-ui.js

@@ -657,6 +657,8 @@ function renderPreviewModelTab(bodyEl) {
   }
 
   var opts = {
+    effortLevels: ((store.get("vendorInfo") || {})[store.get("currentVendor")] || {}).effortLevels || [],
+    configuration: ((store.get("vendorInfo") || {})[store.get("currentVendor")] || {}).configuration || {},
     models: s.currentModels || [],
     currentModel: _previewLoopSettings.model || "",
     currentMode: _previewLoopSettings.permissionMode || "default",

package/lib/public/modules/app-message-router.js

@@ -1,3 +1,5 @@
+import { handleContextualConversations } from './contextual-mate-sessions.js';
+import { handleMateContextMessage } from './contextual-mate-context.js';
 import { handleIssueReference } from './clay-issue-links.js';
 // Narrow pre-router for Home and Capsule protocol responses kept out of the legacy router.
 
@@ -15,10 +17,14 @@ import { handleDefaultAiMessage } from './default-ai.js';
 import { handleCursorSharingMessage } from './cursor-sharing-preference.js';
 import { handlePendingMessageQueueMessage } from './pending-message-queue.js';
 import { receiveHistoryReplay } from './history-replay-batch.js';
+import { filterPaneActivation } from './pane-activation.js';
+import { deferSessionSwitch } from './session-switch-defer.js';
 import { handleProjectMateCreationMessage } from './project-mate-creation-workspace.js';
 import { handleProjectDebatePlanningMessage } from './project-debate-planning-workspace.js';
 
 export function handleHomeProtocolMessage(msg) {
+  if (handleContextualConversations(msg)) return true;
+  if (handleMateContextMessage(msg)) return true;
   if (handleIssueReference(msg)) return true;
   if (handleClaySessionTarget(msg)) return true;
   if (isHomeWorkspaceAssignmentMessage(msg)) {
@@ -58,6 +64,10 @@ export function handleHomeProtocolMessage(msg) {
     handleHomeDebateTranscript(msg);
     return true;
   }
+  if (msg.type === "home_mcp_import_question" || msg.type === "home_mcp_import_question_resolved" || msg.type === "home_mate_question" || msg.type === "home_mate_question_resolved") {
+    if (!handleSearchClayMessage(msg)) handleHomeDebateTranscript(msg);
+    return true;
+  }
   if (msg.type === "home_debate_question" || msg.type === "home_debate_question_resolved" || msg.type === "home_debate_event") {
     handleHomeDebateTranscript(msg);
     return true;
@@ -86,6 +96,17 @@ export function handleHomeProtocolMessage(msg) {
 }
 
 export function processMessage(msg) {
+  if (filterPaneActivation(msg)) return;
+  if (deferSessionSwitch(msg)) return;
+  if (msg.type === 'pane_history_batch') {
+    if (!msg.paneActivation || !Array.isArray(msg.items) || msg.items.length > 100) return;
+    msg.items.forEach(function (item) {
+      // Every original event keeps its order/index and goes through the same
+      // stale-binding filter and replay handler as an individual socket event.
+      if (item && item.type !== 'pane_history_batch') processMessage(Object.assign({}, item, { paneActivation: msg.paneActivation }));
+    });
+    return;
+  }
   receiveHistoryReplay(msg, dispatchMessage);
 }
 
@@ -100,7 +121,7 @@ function dispatchMessage(msg) {
   if (handleDefaultAiMessage(msg)) return;
   if (handleCursorSharingMessage(msg)) return;
   var searchHandled = handleSearchClayMessage(msg);
-  if (searchHandled && (msg.type === "home_clay_activity" || msg.type === "home_mate_stopping" || msg.type.indexOf("home_mate_permission_") === 0)) return;
+  if (searchHandled) return;
   if (handleHomeProtocolMessage(msg)) return;
   processAppMessage(msg);
 }

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

@@ -1,3 +1,12 @@
+import { handleStudioDocumentMessage } from './clay-studio-document.js';
+import { saveSessionRichDraft, restoreSessionRichDraft } from './session-rich-drafts.js';
+import { refreshPaneActivation, primePaneSession } from './pane-activation.js';
+import { paneCallbackCurrent } from './pane-binding.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';
 import { handleServerUpdate } from './server-settings-controls.js';
 import { handleYouMessage } from './you.js';
@@ -8,7 +17,8 @@ import { refreshProjectAssistantIdentities } from './project-chat-identity.js';
 import { handleLinearResult } from './linear-panel.js';
 import { handleSharedBrowserMessage } from './shared-browser.js';
 import { openWireframe } from './wireframe-workbench.js';
-import { syncGithubSessions } from './session-github.js';
+import { handlePrimaryWorkResult } from './session-work-primary.js';
+import { syncGithubSessions, applyGithubPersonalReviewStatus } from './session-github.js';
 import { handleIssuesMessageInContext as handleIssuesMessage } from './issues-context.js';
 // app-messages.js - WebSocket message router
 // Extracted from app.js (PR-23)
@@ -40,7 +50,7 @@ import { handleHomeMateMemoryState, handleHomeMateKnowledgeState, syncHomeMateSe
 import { renderKnowledgeList, handleKnowledgeContent, handleKnowledgeMutation } from './mate-knowledge.js';
 import { handleKnowledgeWorkbenchMessage } from './mate-knowledge-workbench.js';
 import { renderMemoryList } from './mate-memory.js';
-import { handlePaletteSessionSwitch, setPaletteVersion } from './command-palette.js';
+import { handlePaletteSessionSwitch, handlePaletteHistoryDone, handlePaletteHistoryPrepended, setPaletteVersion } from './command-palette.js';
 import { handleFindInSessionResults } from './session-search.js';
 import { syncPaneTitles, maybeRestoreSplitGroup, openGroup } from './split-view.js';
 import { showPairDialog, handlePairCreated, handleSplitDelegation, showWorkerDelegationNotice, hideWorkerDelegationNotice } from './split-pair-ui.js';
@@ -55,17 +65,17 @@ import { showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundE
 import { handleFsList, handleFsRead, handleFileChanged, handleDirChanged, handleFileHistory, handleGitDiff, handleFileAt, refreshIfOpen, getPendingNavigate, handleFsSearch, presentMarkdownEdit } from './filebrowser.js';
 import { beginMarkdownTurn, finishMarkdownTurn, markdownPathFromToolInput } from './markdown-live-edit.js';
 import { forwardPaneMarkdownPresentation } from './pane-bridge.js';
-import { handleProjectOwnerChanged } from './project-settings.js';
+import { handleProjectOwnerChanged, handleProjectSettingsEditResult } 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';
 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 { handleNotesList, handleNoteCreated, handleNoteUpdated, handleNoteUpdateResult, handleNoteDeleted, handleNoteWritten } from './sticky-notes.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';
@@ -90,13 +100,15 @@ import { markProjectSessionListHydrated, applyProjectSplitGroups, clearProjectSp
 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';
-import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress, finishProjectSessionActivation } from './app-projects.js';
+import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, finishProjectSessionActivation } from './app-projects.js';
+import { handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './project-start-dialog.js';
 import { updateHistorySentinel, prependOlderHistory } from './app-header.js';
 import { handleToolsState, handleToolInstalled, handleToolRemoved, handleToolStorageResult, handleToolLlmResult, handleToolsError, handleToolControlRequest, handleToolServerState, handleToolServerEvent, handleCapsuleGameSession } from './home-tools.js';
 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, handleFastModeState } from './app-rate-limit.js';
+import { handleVendorUsageOverview } from './vendor-usage-overview.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';
@@ -118,6 +130,9 @@ 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);
   if (handleProjectDebateMessage(msg)) return;
@@ -145,7 +160,7 @@ export function processMessage(msg) {
     return;
   }
     if (msg.type === "access_revoked") {
-      window.location.assign("/");
+      leaveRevokedProject("/");
       return;
     }
     // Preserve original timestamp from history replay
@@ -204,7 +219,7 @@ export function processMessage(msg) {
           if (readyMatch) {
             var newName = readyMatch[1].trim();
             store.get('dmTargetUser').displayName = newName;
-            updateMateSidebarProfile({ profile: { displayName: newName, avatarColor: store.get('dmTargetUser').avatarColor, avatarStyle: store.get('dmTargetUser').avatarStyle, avatarSeed: store.get('dmTargetUser').avatarSeed } });
+            updateMateSidebarProfile({ profile: { displayName: newName, avatarCatalogId: store.get('dmTargetUser').avatarCatalogId, avatarColor: store.get('dmTargetUser').avatarColor, avatarStyle: store.get('dmTargetUser').avatarStyle, avatarSeed: store.get('dmTargetUser').avatarSeed } });
             if (getWs() && getWs().readyState === 1) {
               getWs().send(JSON.stringify({
                 type: "mate_update",
@@ -224,6 +239,10 @@ 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);
@@ -250,9 +269,12 @@ export function processMessage(msg) {
 
       case "history_prepend":
         prependOlderHistory(msg.items, msg.meta);
+        handlePaletteHistoryPrepended();
         break;
 
       case "history_done":
+        var historyPaintEpoch = store.get('sessionActionEpoch') || 0;
+        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
@@ -275,7 +297,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();
@@ -283,6 +305,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();
@@ -311,11 +334,16 @@ export function processMessage(msg) {
         // re-pins on every height change while armed. Disarms early on
         // any real user scroll input.
         // Skip arming when we have a pending in-conversation navigate
-        // target (file-edit deeplink) — the navigate block below scrolls
-        // that element into view, and sticky-bottom would fight it.
+        // target (file-edit or Session-entry deeplink) — the navigate block
+        // below scrolls that element into view, and sticky-bottom would
+        // fight it.
         var nav = getPendingNavigate();
         var hasNavTarget = nav && (nav.toolId || nav.assistantUuid);
-        if (hasNavTarget) {
+        var sessionEntryNav = store.get('pendingSessionEntryNavigation');
+        var hasSessionEntryNav = sessionEntryNav
+          && String(sessionEntryNav.projectSlug) === String(store.get('currentSlug'))
+          && String(sessionEntryNav.sessionId) === String(store.get('activeSessionId'));
+        if (hasNavTarget || hasSessionEntryNav) {
           // Navigate block below will scrollIntoView on the target — don't
           // arm sticky-bottom or it would fight that scroll.
           scrollToBottom();
@@ -328,6 +356,7 @@ export function processMessage(msg) {
         // Scroll to tool element if navigating from file edit history
         if (hasNavTarget) {
           requestAnimationFrame(function() {
+            if (historyPaintEpoch !== (store.get('sessionActionEpoch') || 0) || !paneCallbackCurrent(msg.paneActivation)) return;
             // Prefer scrolling to the exact tool element
             var target = nav.toolId ? messagesEl.querySelector('[data-tool-id="' + nav.toolId + '"]') : null;
             if (!target && nav.assistantUuid) {
@@ -343,6 +372,7 @@ export function processMessage(msg) {
             }
           });
         }
+        requestAnimationFrame(function () { if (historyPaintEpoch === (store.get('sessionActionEpoch') || 0) && paneCallbackCurrent(msg.paneActivation)) handlePaletteHistoryDone(); });
         break;
 
       case "restore_mate_dm":
@@ -363,6 +393,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;
@@ -753,9 +784,11 @@ export function processMessage(msg) {
         markProjectSessionListHydrated();
         renderMateSessionList(msg.sessions || []);
         renderSessionList(msg.sessions || []);
+        store.set({ paneBindingSessions: msg.sessions || [] });
+        refreshPaneActivation();
         syncGithubSessions(msg.sessions || []);
         syncPaneTitles();
-        var panePin = resolvePaneSession(store.get('paneMode'), store.get('panePinPending'), store.get('paneSessionId'), msg.sessions);
+        var panePin = resolvePaneSession(store.get('paneMode') && !primePaneSession(), store.get('panePinPending'), store.get('paneSessionId'), msg.sessions);
         if (panePin.consumed) {
           store.set({ panePinPending: false });
           if (panePin.sessionId && getWs() && getWs().readyState === 1) {
@@ -765,6 +798,9 @@ export function processMessage(msg) {
         handlePaletteSessionSwitch();
         maybeRestoreSplitGroup();
         break;
+      case "session_github_status":
+        applyGithubPersonalReviewStatus(msg);
+        break;
 
       case "split_groups":
         applyProjectSplitGroups(msg.groups || []);
@@ -850,6 +886,9 @@ export function processMessage(msg) {
         handleRemoteSelection(msg);
         break;
 
+      case "session_work_primary_result":
+        handlePrimaryWorkResult(msg);
+        break;
       case "linear_result":
         handleLinearResult(msg);
         break;
@@ -876,6 +915,8 @@ export function processMessage(msg) {
         break;
 
       case "session_switched":
+        saveSessionRichDraft();
+        store.set({ sessionActionEpoch: (store.get('sessionActionEpoch') || 0) + 1 });
         clearPairResultStatus();
         resetStreamBuffer();
         syncAutonomousRunForSession(msg.autonomousRun || null);
@@ -893,7 +934,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 || '', 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 || 'default', 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);
@@ -968,14 +1009,19 @@ export function processMessage(msg) {
         // Restore draft for incoming session
         var draft = store.get('sessionDrafts')[store.get('activeSessionId')] || "";
         inputEl.value = draft;
+        restoreSessionRichDraft();
         autoResize();
         if (!("ontouchstart" in window)) {
           inputEl.focus();
         }
         // Reload survival: a restored active session that is a split-group
         // member reopens its group (no-op when a split is already open).
-        finishProjectSessionActivation();
-        maybeRestoreSplitGroup();
+        var deferredSwitch = store.get('deferredSessionSwitch');
+        if (!deferredSwitch || !deferredSwitch.draining || deferredSwitch.finalSwitch === msg) {
+          finishProjectSessionActivation();
+          maybeRestoreSplitGroup();
+          handlePaletteSessionSwitch(true);
+        }
         break;
 
       case "session_full_access_changed":
@@ -1020,7 +1066,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);
@@ -1117,7 +1167,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;
@@ -1153,8 +1203,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);
@@ -1202,6 +1268,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";
@@ -1266,12 +1334,23 @@ export function processMessage(msg) {
         renderGeneratedImage(msg);
         break;
 
+      case 'mate_schedule_question_expired':
+        markAskUserAnswered(msg.toolId, { 0: msg.error || 'This schedule review expired.' });
+        stopUrgentBlink();
+        break;
+
+      case 'mcp_import_consent_expired':
+        markAskUserAnswered(msg.toolId, { 0: msg.error || 'No import was approved.' });
+        stopUrgentBlink();
+        break;
+
       case "ask_user_answered":
         markAskUserAnswered(msg.toolId, msg.answers);
         stopUrgentBlink();
         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();
@@ -1287,13 +1366,21 @@ export function processMessage(msg) {
         stopUrgentBlink();
         break;
 
+      case "ask_user_pending":
+        renderAskUserQuestion(msg.toolId, msg.input);
+        startUrgentBlink();
+        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;
@@ -1308,6 +1395,8 @@ export function processMessage(msg) {
         break;
 
       case "user_dialog_request":
+        store.set({ turnActivity: null });
+        setActivity(null);
         renderUserDialogRequest(msg);
         startUrgentBlink();
         break;
@@ -1373,7 +1462,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":
@@ -1386,6 +1475,7 @@ export function processMessage(msg) {
         break;
 
       case "done":
+        store.set({ turnActivity: null });
         removeMatePreThinking();
         setActivity(null);
         finishThinkingTurn();
@@ -1409,6 +1499,7 @@ export function processMessage(msg) {
         break;
 
       case "error":
+        store.set({ turnActivity: null });
         removeMatePreThinking();
         setActivity(null);
         finishThinkingTurn();
@@ -1526,6 +1617,10 @@ export function processMessage(msg) {
         updateRateLimitUsage(msg);
         break;
 
+      case "vendor_usage_overview":
+        handleVendorUsageOverview(msg);
+        break;
+
       case "auto_continue_scheduled":
         // Scheduler auto-continue, just show info
         break;
@@ -1633,6 +1728,9 @@ export function processMessage(msg) {
         handleFileAt(msg);
         break;
 
+      case "term_control_projection":
+        handleTerminalProjection(msg);
+        break;
       case "term_list":
         handleTermList(msg);
         updateTerminalList(msg.terminals);
@@ -1697,6 +1795,7 @@ export function processMessage(msg) {
           store.set({ pendingTermCommand: null });
           // Small delay to let terminal initialize
           setTimeout(function() {
+            if (!paneCallbackCurrent(msg.paneActivation)) return;
             sendTerminalCommand(cmd);
           }, 300);
         }
@@ -1737,6 +1836,10 @@ export function processMessage(msg) {
         handleNoteUpdated(msg);
         break;
 
+      case "note_update_result":
+        handleNoteUpdateResult(msg);
+        break;
+
       case "note_written":
         showToast((msg.byTitle || "Agent") + ' left a note: "' + (msg.preview || "") + '"');
         handleNoteWritten(msg);
@@ -1825,12 +1928,14 @@ export function processMessage(msg) {
         break;
 
       case "set_project_title_result":
+        handleProjectSettingsEditResult(msg);
         if (!msg.ok) {
           showToast(msg.error || "Failed to rename project", "error");
         }
         break;
 
       case "set_project_icon_result":
+        handleProjectSettingsEditResult(msg);
         if (!msg.ok) {
           showToast(msg.error || "Failed to set icon", "error");
         }
@@ -1951,6 +2056,7 @@ export function processMessage(msg) {
             // Sync dmTargetUser so subsequent renders use fresh data
             var mp2 = msg.mate.profile || {};
             store.get('dmTargetUser').displayName = mp2.displayName || msg.mate.name || store.get('dmTargetUser').displayName;
+            store.get('dmTargetUser').avatarCatalogId = mp2.avatarCatalogId || '';
             store.get('dmTargetUser').avatarStyle = mp2.avatarStyle || store.get('dmTargetUser').avatarStyle;
             store.get('dmTargetUser').avatarSeed = mp2.avatarSeed || store.get('dmTargetUser').avatarSeed;
             store.get('dmTargetUser').avatarColor = mp2.avatarColor || store.get('dmTargetUser').avatarColor;

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

@@ -3,6 +3,8 @@
 
 import { refreshIcons, iconHtml } from './icons.js';
 import { getWs } from './ws-ref.js';
+import { store } from './store.js';
+import { sessionCallback } from './pane-binding.js';
 import { updateBrowserTabList } from './context-sources.js';
 import { setExtensionConnected } from './mcp-ui.js';
 import { initPasteModal } from './paste-modal.js';
@@ -270,7 +272,7 @@ export function showConfirm(text, onConfirm, okLabel, destructive, onCancel) {
   confirmCancelCallback = null;
   if (replaced) replaced();
   confirmText.textContent = text;
-  confirmCallback = onConfirm;
+  confirmCallback = store.get('paneCommittedBinding') ? sessionCallback(onConfirm) : onConfirm;
   confirmCancelCallback = onCancel || null;
   confirmOk.textContent = okLabel || "Delete";
   confirmOk.className = "confirm-btn " + (destructive === false ? "confirm-ok" : "confirm-delete");