clay-server 2.47.0-beta.5 → 3.0.0-beta.1

package/lib/public/css/title-bar.css

@@ -272,6 +272,175 @@
   transform: rotate(180deg);
 }
 
+.branch-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  min-width: 0;
+  max-width: 132px;
+  /* Optical alignment: the pill reads slightly high next to the 17px/800
+     project name, so nudge it down within the centered flex row. */
+  margin-top: 2px;
+  padding: 4px 7px;
+  border: 1px solid var(--border);
+  border-radius: 999px;
+  background: var(--bg-alt);
+  color: var(--text-secondary);
+  font: 600 11px/1.2 "Pretendard", system-ui, sans-serif;
+  cursor: pointer;
+  flex-shrink: 1;
+}
+
+.branch-chip.hidden,
+.branch-chip-menu.hidden {
+  display: none;
+}
+
+.branch-chip:hover,
+.branch-chip.open {
+  border-color: var(--text-dimmer);
+  color: var(--text);
+}
+
+.branch-chip > svg {
+  width: 12px;
+  height: 12px;
+  flex-shrink: 0;
+}
+
+#branch-chip-label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.branch-chip-chevron {
+  transition: transform 0.15s;
+}
+
+.branch-chip.open .branch-chip-chevron {
+  transform: rotate(180deg);
+}
+
+.branch-chip-menu {
+  position: fixed;
+  z-index: 10020;
+  width: 250px;
+  padding: 6px;
+  border: 1px solid var(--border);
+  border-radius: 10px;
+  background: var(--bg);
+  box-shadow: 0 12px 32px rgba(0, 0, 0, 0.28);
+}
+
+.branch-chip-row {
+  display: flex;
+  align-items: center;
+  border-radius: 7px;
+}
+
+.branch-chip-row:hover {
+  background: var(--bg-alt);
+}
+
+.branch-chip-row-main,
+.branch-chip-row-action,
+.branch-chip-new {
+  border: 0;
+  background: transparent;
+  color: var(--text-secondary);
+  font-family: inherit;
+  cursor: pointer;
+}
+
+.branch-chip-row-main {
+  min-width: 0;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  padding: 8px;
+  text-align: left;
+}
+
+.branch-chip-row-main:disabled {
+  opacity: 0.38;
+  cursor: not-allowed;
+}
+
+.branch-chip-row-main svg,
+.branch-chip-row-action svg,
+.branch-chip-new svg {
+  width: 14px;
+  height: 14px;
+  flex-shrink: 0;
+}
+
+.branch-chip-row-label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.branch-chip-row.current .branch-chip-row-label {
+  color: var(--text);
+  font-weight: 700;
+}
+
+.branch-chip-row-main > .lucide-check {
+  margin-left: auto;
+  color: var(--accent);
+}
+
+.branch-chip-processing {
+  width: 7px;
+  height: 7px;
+  border-radius: 50%;
+  background: var(--success, #23a55a);
+  flex-shrink: 0;
+}
+
+.branch-chip-pending {
+  min-width: 17px;
+  padding: 1px 4px;
+  border-radius: 8px;
+  background: var(--danger, #e74c3c);
+  color: #fff;
+  font-size: 9px;
+  text-align: center;
+}
+
+.branch-chip-row-action {
+  display: flex;
+  padding: 7px;
+  opacity: 0;
+}
+
+.branch-chip-row:hover .branch-chip-row-action,
+.branch-chip-row-action:focus-visible {
+  opacity: 0.7;
+}
+
+.branch-chip-row-action:hover {
+  color: var(--danger, #e74c3c);
+  opacity: 1;
+}
+
+.branch-chip-new {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  margin-top: 5px;
+  padding: 9px 8px 7px;
+  border-top: 1px solid var(--border-subtle);
+  text-align: left;
+}
+
+.branch-chip-new:hover {
+  color: var(--text);
+}
+
 .project-rename-input {
   width: 100%;
   font-family: "Pretendard", system-ui, -apple-system, BlinkMacSystemFont, sans-serif;

package/lib/public/index.html

@@ -210,6 +210,12 @@
           <span class="title-bar-project-name" id="title-bar-project-name"></span>
           <i data-lucide="chevron-down" class="title-bar-chevron"></i>
         </button>
+        <button id="branch-chip" class="branch-chip hidden" type="button" aria-label="Switch branch" aria-expanded="false" aria-haspopup="menu">
+          <i data-lucide="git-branch"></i>
+          <span id="branch-chip-label"></span>
+          <i data-lucide="chevron-down" class="branch-chip-chevron"></i>
+        </button>
+        <div id="branch-chip-menu" class="branch-chip-menu hidden"></div>
         <span id="sidebar-presence" class="sidebar-presence"></span>
         <button id="sidebar-toggle-btn" class="sidebar-collapse-btn" title="Collapse sidebar"><i data-lucide="panel-left-close"></i></button>
       </div>
@@ -364,7 +370,11 @@
           <button id="hamburger-btn" aria-label="Toggle sidebar" title="Toggle sidebar"><i data-lucide="menu"></i></button>
           <span class="header-title" id="header-title">Connecting...</span>
           <button id="header-info-btn" type="button" title="Session info"><i data-lucide="info"></i></button>
+          <button id="header-full-access-btn" type="button" class="session-full-access hidden" role="switch" aria-checked="false" title="Skip Permissions is off — permission prompts are on">
+            <span class="session-full-access-label">Skip Permissions</span><span class="session-full-access-track" aria-hidden="true"><span></span></span>
+          </button>
           <button id="header-rename-btn" type="button" title="Rename session"><i data-lucide="pencil"></i></button>
+          <button id="header-add-worker-btn" type="button" title="Add Worker — this session becomes the Driver of a pair"><i data-lucide="user-plus"></i></button>
           <button type="button" id="header-tui-close-btn" class="header-tui-close-btn hidden" title="Close terminal (keeps history, resume anytime)" aria-label="Close terminal"><i data-lucide="power"></i></button>
           <div id="mate-mobile-title" class="mate-mobile-title hidden">
             <img id="mate-mobile-avatar" class="mate-mobile-avatar" alt="">

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

@@ -144,6 +144,12 @@ export function connect() {
     reconnectDelay = 1000;
     if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
 
+    // A pane pin is one-shot per WebSocket, not per page lifetime. The server
+    // intentionally does not restore pane presence after a daemon restart.
+    if (store.get('paneMode') && store.get('paneSessionId')) {
+      store.set({ panePinPending: true });
+    }
+
     // Wrap ws.send to blink LED on outgoing traffic
     var currentWs = getWs();
     var _origSend = currentWs.send.bind(currentWs);

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

@@ -18,6 +18,7 @@ var sessionIoTimers = {};
 var crossProjectBlinkTimer = null;
 
 export function initFavicon() {
+  if (store.get('paneMode')) return;
   faviconLink = document.querySelector('link[rel="icon"]');
   faviconCanvas = document.createElement("canvas");
   faviconCanvas.width = 32;
@@ -38,6 +39,7 @@ export function initFavicon() {
 }
 
 export function updateFavicon(bgColor) {
+  if (store.get('paneMode')) return;
   if (!faviconLink) return;
   if (!bgColor) {
     if (faviconOrigHref) { faviconLink.href = faviconOrigHref; faviconOrigHref = null; }
@@ -59,6 +61,7 @@ export function updateFavicon(bgColor) {
 }
 
 export function drawFaviconAnimFrame() {
+  if (store.get('paneMode')) return;
   if (!faviconImgReady) return;
   var S = 32;
   var bands = BAND_COLORS.length;
@@ -106,14 +109,6 @@ export function blinkIO() {
   var sessionDot = document.querySelector(".session-item.active .session-processing") ||
                    document.querySelector(".mate-session-item.active .session-processing");
   if (sessionDot) sessionDot.classList.add("io");
-  // If active project is a worktree, also blink the parent project dot
-  var activeWt = document.querySelector("#icon-strip-projects .icon-strip-wt-item.active");
-  var parentDot = null;
-  if (activeWt) {
-    var group = activeWt.closest(".icon-strip-group");
-    if (group) parentDot = group.querySelector(".folder-header .icon-strip-status");
-    if (parentDot) parentDot.classList.add("io");
-  }
   // Mobile chat chip dot + mobile session dot
   var mobileChipDot = null;
   var _s = store.snap();
@@ -132,7 +127,6 @@ export function blinkIO() {
     var sd = document.querySelector(".session-item.active .session-processing.io") ||
              document.querySelector(".mate-session-item.active .session-processing.io");
     if (sd) sd.classList.remove("io");
-    if (parentDot) parentDot.classList.remove("io");
     if (mobileChipDot) mobileChipDot.classList.remove("io");
     if (mobileSessionDot) mobileSessionDot.classList.remove("io");
   }, 80);
@@ -152,7 +146,7 @@ export function blinkSessionDot(sessionId) {
 export function updateCrossProjectBlink() {
   if (crossProjectBlinkTimer) { clearTimeout(crossProjectBlinkTimer); crossProjectBlinkTimer = null; }
   function doBlink() {
-    var dots = document.querySelectorAll("#icon-strip-projects .icon-strip-item:not(.active) .icon-strip-status.processing, #icon-strip-projects .icon-strip-wt-item:not(.active) .icon-strip-status.processing, #icon-strip-users .icon-strip-mate:not(.active) .icon-strip-status.processing");
+    var dots = document.querySelectorAll("#icon-strip-projects .icon-strip-item:not(.active) .icon-strip-status.processing, #icon-strip-users .icon-strip-mate:not(.active) .icon-strip-status.processing");
     // Also blink mobile chat chip dots (same icon-strip-status class inside chips)
     var mobileDots = document.querySelectorAll(".mobile-chat-chip .icon-strip-status.processing");
     var allDots = [];
@@ -169,6 +163,7 @@ export function updateCrossProjectBlink() {
 }
 
 export function startUrgentBlink() {
+  if (store.get('paneMode')) return;
   if (urgentBlinkTimer) return;
   savedTitle = document.title;
   if (!faviconOrigHref && faviconLink) faviconOrigHref = faviconLink.href;
@@ -184,6 +179,7 @@ export function startUrgentBlink() {
 }
 
 export function stopUrgentBlink() {
+  if (store.get('paneMode')) return;
   if (!urgentBlinkTimer) return;
   clearInterval(urgentBlinkTimer);
   clearInterval(urgentTitleTimer);

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

@@ -11,6 +11,9 @@ import { processMessage } from './app-messages.js';
 import { saveToolState, resetToolState, restoreToolState } from './tools.js';
 import { getSessionUsage, setSessionUsage, getContextData, setContextData, updateContextPanel, updateUsagePanel } from './app-panels.js';
 import { onHistoryPrepended as onSessionSearchHistoryPrepended } from './session-search.js';
+import { getCachedSessions } from './sidebar-sessions.js';
+import { openPairDialog } from './split-pair-ui.js';
+import { showConfirm } from './app-misc.js';
 
 // --- Module-owned state ---
 var sessionInfoPopover = null;
@@ -20,6 +23,66 @@ export function initHeader() {
   var headerRenameBtn = document.getElementById("header-rename-btn");
   var headerTitleEl = document.getElementById("header-title");
   var headerInfoBtn = document.getElementById("header-info-btn");
+  var headerAddWorkerBtn = document.getElementById("header-add-worker-btn");
+
+  // --- Add Worker: the current session becomes the Driver of a new pair ---
+  if (headerAddWorkerBtn) {
+    headerAddWorkerBtn.addEventListener("click", function () {
+      var sessionId = store.get('activeSessionId');
+      if (!sessionId || store.get('splitPanes') || store.get('dmMode')) return;
+      openPairDialog({
+        sessionId: sessionId,
+        title: headerTitleEl ? headerTitleEl.textContent : "",
+        vendor: store.get('currentVendor') || "claude",
+      });
+    });
+    // A split shows the GROUP in the title bar; adding a worker there makes
+    // no sense (the group already has two members), so hide the button.
+    store.subscribe(function (state, prev) {
+      if (state.splitPanes !== prev.splitPanes) {
+        headerAddWorkerBtn.classList.toggle("hidden", !!state.splitPanes);
+      }
+    });
+  }
+  var headerFullAccessBtn = document.getElementById("header-full-access-btn");
+
+  function updateFullAccessButton() {
+    if (!headerFullAccessBtn) return;
+    var s = store.snap();
+    var visible = !s.dmMode && !s.splitPanes && !s.skipPermsEnabled && s.activeSessionMode === "gui" && !!s.activeSessionId;
+    var enabled = !!s.sessionFullAccess;
+    headerFullAccessBtn.classList.toggle("hidden", !visible);
+    headerFullAccessBtn.classList.toggle("active", enabled);
+    headerFullAccessBtn.setAttribute("aria-checked", enabled ? "true" : "false");
+    headerFullAccessBtn.title = enabled ? "Skip Permissions is on — click to restore permission prompts" : "Skip Permissions is off — permission prompts are on";
+  }
+
+  function sendFullAccess(enabled) {
+    var ws = getWs();
+    var id = store.get('activeSessionId');
+    if (ws && ws.readyState === 1 && id) {
+      ws.send(JSON.stringify({ type: "set_session_full_access", id: id, enabled: enabled }));
+    }
+  }
+
+  if (headerFullAccessBtn) {
+    headerFullAccessBtn.addEventListener("click", function () {
+      if (store.get('sessionFullAccess')) {
+        sendFullAccess(false);
+        return;
+      }
+      showConfirm("Skip permission prompts for this session? Tool requests will be approved automatically.", function () {
+        sendFullAccess(true);
+      }, "Skip Permissions", true);
+    });
+    store.subscribe(function (state, prev) {
+      if (state.sessionFullAccess !== prev.sessionFullAccess || state.activeSessionId !== prev.activeSessionId ||
+          state.activeSessionMode !== prev.activeSessionMode ||
+          state.dmMode !== prev.dmMode || state.splitPanes !== prev.splitPanes ||
+          state.skipPermsEnabled !== prev.skipPermsEnabled) updateFullAccessButton();
+    });
+    updateFullAccessButton();
+  }
 
   // --- Header session rename ---
   if (headerRenameBtn) {
@@ -40,8 +103,18 @@ export function initHeader() {
         var newTitle = input.value.trim();
         var ws = getWs();
         if (newTitle && newTitle !== currentText && ws && ws.readyState === 1) {
-          ws.send(JSON.stringify({ type: "rename_session", id: store.get('activeSessionId'), title: newTitle }));
-          headerTitleEl.textContent = newTitle;
+          // With a split group open the header shows the GROUP name, so the
+          // pencil must rename the group, not the parent's last active session.
+          var split = store.get('splitPanes');
+          if (split) {
+            if (split.groupId) {
+              ws.send(JSON.stringify({ type: "split_group_rename", id: split.groupId, name: newTitle }));
+              headerTitleEl.textContent = newTitle;
+            }
+          } else {
+            ws.send(JSON.stringify({ type: "rename_session", id: store.get('activeSessionId'), title: newTitle }));
+            headerTitleEl.textContent = newTitle;
+          }
         }
         input.remove();
         headerTitleEl.style.display = "";
@@ -89,10 +162,32 @@ export function initHeader() {
         pop.appendChild(row);
       }
 
-      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 split = store.get('splitPanes');
+      if (split && split.panes) {
+        // A split group is open: single-session info makes no sense here.
+        // Show one section per member instead.
+        var cached = getCachedSessions() || [];
+        for (var pi = 0; pi < split.panes.length; pi++) {
+          var member = null;
+          for (var ci = 0; ci < cached.length; ci++) {
+            if (cached[ci].id === split.panes[pi].sessionId) { member = cached[ci]; break; }
+          }
+          var heading = document.createElement("div");
+          heading.className = "info-section-title";
+          heading.textContent = (member && member.title) || split.panes[pi].title || ("Session " + split.panes[pi].sessionId);
+          pop.appendChild(heading);
+          addRow("Local ID", split.panes[pi].sessionId);
+          if (member && member.cliSessionId) {
+            addRow("Session ID", member.cliSessionId);
+            addRow("Resume", "claude --resume " + 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);
+      }
 
       document.body.appendChild(pop);
       sessionInfoPopover = pop;

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

@@ -619,6 +619,7 @@ export function showHomeHub() {
   // anywhere via the persistent FAB (#clay-fab), not embedded here.
   if (store.get('dmMode')) exitDmMode();
   homeHubVisible = true;
+  store.set({ homeHubVisible: true });
   homeHub.classList.remove("hidden");
   // Show close button only if there's a project to return to
   if (hubCloseBtn) {
@@ -652,6 +653,7 @@ export function showHomeHub() {
 export function hideHomeHub() {
   if (!homeHubVisible) return;
   homeHubVisible = false;
+  store.set({ homeHubVisible: false });
   homeHub.classList.add("hidden");
   stopTipRotation();
   var mobileHome = document.getElementById("mobile-home-btn");

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

@@ -19,6 +19,8 @@ import { renderKnowledgeList, handleKnowledgeContent } from './mate-knowledge.js
 import { renderMemoryList } from './mate-memory.js';
 import { handlePaletteSessionSwitch, setPaletteVersion } from './command-palette.js';
 import { handleFindInSessionResults } from './session-search.js';
+import { syncPaneTitles, maybeRestoreSplitGroup, openGroup } from './split-view.js';
+import { showPairDialog, handlePairCreated, handleSplitDelegation } from './split-pair-ui.js';
 import { handleInputSync, autoResize, builtinCommands, setScheduleBtnDisabled } 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 { showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundEnabled } from './notifications.js';
@@ -46,8 +48,9 @@ import { setActivity, startUrgentBlink, stopUrgentBlink, blinkSessionDot, update
 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 { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
-import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './app-projects.js';
+import { updateProjectList, updateTitleBarProjectIdentity, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './app-projects.js';
 import { updateHistorySentinel, prependOlderHistory } from './app-header.js';
 import { hideHomeHub, handleHubSchedules } from './app-home-hub.js';
 import { openDm, enterDmMode, exitDmMode, handleMateCreatedInApp, updateMateIconStatus, appendDmMessage, showDmTypingIndicator, buildMateInterviewPrompt } from './app-dm.js';
@@ -82,8 +85,7 @@ export function processMessage(msg) {
         // Override title bar with mate name and re-apply color
         var _mdn = (store.get('dmTargetUser').displayName || "New Mate");
         if (headerTitleEl) headerTitleEl.textContent = _mdn;
-        var _tbpn = document.getElementById("title-bar-project-name");
-        if (_tbpn) _tbpn.textContent = _mdn;
+        updateTitleBarProjectIdentity(_mdn, null);
         var _mc2 = (store.get('dmTargetUser').profile && store.get('dmTargetUser').profile.avatarColor) || store.get('dmTargetUser').avatarColor || "#7c3aed";
         var _tbc2 = document.querySelector(".title-bar-content");
         if (_tbc2) { _tbc2.style.background = _mc2; _tbc2.classList.add("mate-dm-active"); }
@@ -296,8 +298,7 @@ export function processMessage(msg) {
         if (store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) {
           var _mateDN = store.get('dmTargetUser').displayName || "New Mate";
           headerTitleEl.textContent = _mateDN;
-          var tbProjectName = document.getElementById("title-bar-project-name");
-          if (tbProjectName) tbProjectName.textContent = _mateDN;
+          updateTitleBarProjectIdentity(_mateDN, null);
           // Re-apply mate title bar styling (may be lost during project switch)
           var _mc = (store.get('dmTargetUser').profile && store.get('dmTargetUser').profile.avatarColor) || store.get('dmTargetUser').avatarColor || "#7c3aed";
           var _tbc = document.querySelector(".title-bar-content");
@@ -305,8 +306,7 @@ export function processMessage(msg) {
           document.body.classList.add("mate-dm-active");
         } else {
           headerTitleEl.textContent = store.get('projectName');
-          var tbProjectName = document.getElementById("title-bar-project-name");
-          if (tbProjectName) tbProjectName.textContent = msg.title || store.get('projectName');
+          updateTitleBarProjectIdentity(msg.title || store.get('projectName'), null);
         }
         updatePageTitle();
         if (msg.version) {
@@ -552,9 +552,42 @@ export function processMessage(msg) {
       case "session_list":
         renderMateSessionList(msg.sessions || []);
         renderSessionList(msg.sessions || []);
+        syncPaneTitles();
+        var panePin = resolvePaneSession(store.get('paneMode'), store.get('panePinPending'), store.get('paneSessionId'), msg.sessions);
+        if (panePin.consumed) {
+          store.set({ panePinPending: false });
+          if (panePin.sessionId && getWs() && getWs().readyState === 1) {
+            getWs().send(JSON.stringify({ type: "switch_session", id: panePin.sessionId }));
+          }
+        }
         handlePaletteSessionSwitch();
         break;
 
+      case "split_groups":
+        store.set({ splitGroups: msg.groups || [] });
+        renderSessionList(null);
+        maybeRestoreSplitGroup();
+        syncPaneTitles();
+        break;
+
+      case "split_group_result":
+        if (!msg.ok && msg.error) showToast(msg.error, "error");
+        break;
+
+      case "pair_session_options":
+        showPairDialog(msg);
+        break;
+
+      case "pair_session_created":
+        var createdPairGroup = handlePairCreated(msg);
+        if (createdPairGroup) openGroup(createdPairGroup);
+        break;
+
+      case "split_delegation":
+        handleSplitDelegation(msg);
+        syncPaneTitles();
+        break;
+
       case "session_presence":
         updateSessionPresence(msg.presence || {});
         break;
@@ -614,11 +647,14 @@ export function processMessage(msg) {
         var _effectiveTerminalId = (typeof msg.runtimeTerminalId === "number")
           ? msg.runtimeTerminalId
           : (typeof msg.terminalId === "number" ? msg.terminalId : null);
-        store.set({ activeSessionId: msg.id, cliSessionId: msg.cliSessionId || null, vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory });
+        store.set({ activeSessionId: msg.id, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || store.get('currentModel'), currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode') });
         // TUI sessions swap the chat UI for an embedded xterm running
         // `claude` inside a real PTY. Mount or tear down before the rest of
         // the chat-side bookkeeping runs so we don't waste work on hidden DOM.
-        if (_effectiveMode === "tui" && typeof _effectiveTerminalId === "number") {
+        // With a split open the native app is hidden behind the pane iframes,
+        // but the TUI host is position:fixed on body -- attaching it here
+        // would overlay the split. Members render inside their own panes.
+        if (_effectiveMode === "tui" && typeof _effectiveTerminalId === "number" && !store.get('splitPanes')) {
           attachTuiView(_effectiveTerminalId, msg.id, msg.vendor || null);
         } else {
           detachTuiView();
@@ -627,9 +663,10 @@ export function processMessage(msg) {
         // (the composer is hidden; clicking Resume spawns claude --resume).
         setTuiSuspendedView(!!msg.tuiSuspended, msg.id);
         if (msg.vendor) {
-          if (!store.get('vendorSelectionLocked') || msg.hasHistory) {
-            store.set({ currentVendor: msg.vendor });
-          }
+          // session_switched is authoritative. The lock rejects stale
+          // model_info responses; it must not block an intentional switch to
+          // a blank session owned by another vendor.
+          store.set({ currentVendor: resolveSwitchedVendor(store.get('currentVendor'), msg.vendor) });
           // Sessions with history have their vendor structurally bound to
           // the session: lock so a late-arriving default-adapter model_info
           // can't flip the UI back. Previously this branch unlocked, which
@@ -706,6 +743,19 @@ export function processMessage(msg) {
         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).
+        maybeRestoreSplitGroup();
+        break;
+
+      case "session_full_access_changed":
+        if (msg.id === store.get('activeSessionId')) {
+          store.set({ sessionFullAccess: !!msg.enabled, currentMode: msg.permissionMode || "default" });
+        }
+        break;
+
+      case "session_full_access_result":
+        if (!msg.ok && msg.error) showToast(msg.error, "error");
         break;
 
       case "session_id":
@@ -736,7 +786,7 @@ export function processMessage(msg) {
           renderPlanCard(msg.planContent);
           addUserMessage("Execute the following plan. Do NOT re-enter plan mode — just implement it step by step.", msg.images || null, msg.pastes || null, msg.from, msg.fromName);
         } else {
-          addUserMessage(msg.text, msg.images || null, msg.pastes || null, msg.from, msg.fromName);
+          addUserMessage(msg.text, msg.images || null, msg.pastes || null, msg.from, msg.fromName, msg.delegated ? msg : null);
         }
         break;