clay-server 5.2.1-beta.2 → 5.3.0-beta.1

package/lib/public/modules/session-folder-layout.js

@@ -1,9 +1,8 @@
 // Pure projection of sidebar units into folder sections. No DOM, no store.
 //
 // A unit is one organizable root: a standalone session or a Driver with all of
-// its Workers. { key, title, createdAt, lastActivity, item }. Units whose key
-// is null (loop runs, split groups, orphan Workers) cannot be filed, so they
-// always live with the ordinary, unfiled sessions.
+// its Workers, or a saved presentation view. Saved views own their folder and
+// Favorite metadata. Unkeyed legacy groups and loop runs remain Unfiled.
 
 export var FAVORITES_ID = "favorites";
 export var UNFILED_ID = "unfiled";
@@ -48,7 +47,8 @@ export function isFavorite(state, key) {
 
 export function containerOf(state, unit) {
   if (unit.key === null) return UNFILED_ID;
-  var id = state.assignments[unit.key];
+  var group = unit.item && unit.item.type === "split-group" && unit.item.group && unit.item.group.presentation ? unit.item.group : null;
+  var id = group ? group.folderId : state.assignments[unit.key];
   for (var i = 0; i < state.folders.length; i++) if (state.folders[i].id === id) return id;
   return UNFILED_ID;
 }
@@ -66,7 +66,8 @@ export function buildLayout(units, state, options) {
   var ordinary = [];
   for (var i = 0; i < units.length; i++) {
     // The same unit may appear twice: once as a favorite, once in its folder.
-    if (isFavorite(state, units[i].key)) favorites.push(units[i]);
+    var group = units[i].item && units[i].item.type === "split-group" && units[i].item.group && units[i].item.group.presentation ? units[i].item.group : null;
+    if (group ? group.favorite === true : isFavorite(state, units[i].key)) favorites.push(units[i]);
     ordinary.push(units[i]);
   }
   var result = {
@@ -117,7 +118,7 @@ export function containerKeys(layout, containerId) {
       if (layout.sections[i].id === containerId) list = layout.sections[i].units;
     }
   }
-  return list.filter(function (u) { return u.key !== null; }).map(function (u) { return u.key; });
+  return list.filter(function (u) { return u.key !== null && !(u.item && u.item.type === "split-group" && u.item.group && u.item.group.presentation); }).map(function (u) { return u.key; });
 }
 
 export var SORT_OPTIONS = [

package/lib/public/modules/session-search-pane-state.js

@@ -0,0 +1,30 @@
+import { store } from './store.js';
+import { paneMessageBinding } from './pane-binding.js';
+import { acceptsPaneSearchResults } from './pane-search-receipt.js';
+
+function publishPaneSearchStatus(query, status) {
+  if (!store.get('paneMode') || window.parent === window) return;
+  window.parent.postMessage({ type: "clay-pane-search-status", paneBinding: paneMessageBinding(), query: query,
+    status: status, open: store.get('paneSearchOpen') === true }, window.location.origin);
+}
+
+function updatePaneSearchStatus(countElement, query, status) {
+  if (countElement) countElement.textContent = status;
+  publishPaneSearchStatus(query, status);
+}
+
+function beginPaneSearch(query) {
+  var binding = paneMessageBinding(), epoch = (Number(store.get('paneSearchEpoch')) || 0) + 1;
+  store.set({ paneSearchEpoch: epoch, paneSearchReceipt: binding ? { binding: binding, epoch: epoch, query: query } : null });
+}
+
+function endPaneSearch() {
+  store.set({ paneSearchOpen: false, paneSearchReceipt: null, paneSearchEpoch: (Number(store.get('paneSearchEpoch')) || 0) + 1 });
+}
+
+function acceptsSessionSearchResults(state, msg, query) {
+  if (state.paneMode && (!state.paneSearchOpen || !acceptsPaneSearchResults(state, msg))) return false;
+  return msg.query === query;
+}
+
+export { updatePaneSearchStatus, beginPaneSearch, endPaneSearch, acceptsSessionSearchResults };

package/lib/public/modules/session-search.js

@@ -1,6 +1,9 @@
 // --- In-session search (Cmd+F / Ctrl+F) ---
 import { escapeHtml } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
+import { store } from './store.js';
+import { paneMessageBinding } from './pane-binding.js';
+import { updatePaneSearchStatus, beginPaneSearch, endPaneSearch, acceptsSessionSearchResults } from './session-search-pane-state.js';
 
 var ctx = null;
 var searchBarEl = null;
@@ -19,9 +22,20 @@ var serverHits = [];    // full history hits from server
 var serverTotal = 0;
 var pendingScrollTarget = null;
 
+function setSearchStatus(text) {
+  updatePaneSearchStatus(matchCountEl, currentQuery, text);
+}
+
 function initSessionSearch(context) {
   ctx = context;
   createSearchBar();
+  var searchBinding = paneMessageBinding();
+  store.subscribe(function () {
+    var nextBinding = paneMessageBinding();
+    if (searchBinding === nextBinding) return;
+    searchBinding = nextBinding;
+    if (store.get('paneSearchOpen') || currentQuery || matches.length || serverHits.length) closeSearch();
+  });
   document.addEventListener("keydown", function (e) {
     var isMod = e.metaKey || e.ctrlKey;
     if (isMod && e.key === "f") {
@@ -90,11 +104,16 @@ function createSearchBar() {
 }
 
 function isSearchOpen() {
+  if (store.get('paneMode')) return store.get('paneSearchOpen') === true;
   return searchBarEl && !searchBarEl.classList.contains("hidden");
 }
 
 function openSearch(prefill) {
   if (!searchBarEl) return;
+  if (store.get('paneMode') && window.parent !== window) {
+    window.parent.postMessage({ type: "clay-pane-search-open", paneBinding: paneMessageBinding() }, window.location.origin);
+    return;
+  }
   searchBarEl.classList.remove("hidden");
   var btn = document.getElementById("find-in-session-btn");
   if (btn) btn.classList.add("active");
@@ -111,6 +130,7 @@ function openSearch(prefill) {
 
 function closeSearch() {
   if (!searchBarEl) return;
+  endPaneSearch();
   searchBarEl.classList.add("hidden");
   var btn = document.getElementById("find-in-session-btn");
   if (btn) btn.classList.remove("active");
@@ -121,7 +141,27 @@ function closeSearch() {
   currentMatchIndex = -1;
   serverHits = [];
   serverTotal = 0;
-  matchCountEl.textContent = "";
+  setSearchStatus("");
+}
+
+export function controlPaneSearch(action, query) {
+  if (!store.get('paneMode')) return false;
+  if (action === "close") { closeSearch(); return true; }
+  if (action === "open") {
+    store.set({ paneSearchOpen: true });
+    searchInputEl.value = String(query || "");
+    performSearch(searchInputEl.value);
+    return true;
+  }
+  if (!store.get('paneSearchOpen')) return false;
+  if (action === "query") {
+    searchInputEl.value = String(query || "");
+    performSearch(searchInputEl.value);
+    return true;
+  }
+  if (action === "next") { goToNextMatch(); return true; }
+  if (action === "previous") { goToPrevMatch(); return true; }
+  return false;
 }
 
 function toggleSearch() {
@@ -140,9 +180,10 @@ function performSearch(query) {
   serverHits = [];
   serverTotal = 0;
   currentQuery = query.trim();
+  if (store.get('paneMode')) beginPaneSearch(currentQuery);
 
   if (!currentQuery) {
-    matchCountEl.textContent = "";
+    setSearchStatus("");
     return;
   }
 
@@ -171,16 +212,15 @@ function highlightLoadedMessages() {
   if (matches.length > 0) {
     currentMatchIndex = 0;
     setActiveMatch(0);
-    matchCountEl.textContent = "1 / " + matches.length;
+    setSearchStatus("1 / " + matches.length);
   } else {
-    matchCountEl.textContent = "Searching...";
+    setSearchStatus("Searching...");
   }
 }
 
 // Handle server response with full-history search results
 function handleFindInSessionResults(msg) {
-  if (!isSearchOpen()) return;
-  if (msg.query !== currentQuery) return; // stale
+  if (!isSearchOpen() || !acceptsSessionSearchResults(store.snap(), msg, currentQuery)) return;
 
   serverHits = msg.hits || [];
   serverTotal = msg.total || 0;
@@ -191,13 +231,13 @@ function handleFindInSessionResults(msg) {
     clearHighlights();
     highlightLoadedMessages();
     if (matches.length > 0) {
-      matchCountEl.textContent = "1 / " + matches.length + " (" + serverHits.length + " total)";
+      setSearchStatus("1 / " + matches.length + " (" + serverHits.length + " total)");
     } else {
-      matchCountEl.textContent = serverHits.length + " matches";
+      setSearchStatus(serverHits.length + " matches");
     }
     buildTimeline();
   } else {
-    matchCountEl.textContent = "No results";
+    setSearchStatus("No results");
   }
 }
 
@@ -441,16 +481,16 @@ function goToNextMatch() {
   if (matches.length === 0) return;
   currentMatchIndex = (currentMatchIndex + 1) % matches.length;
   setActiveMatch(currentMatchIndex);
-  matchCountEl.textContent = (currentMatchIndex + 1) + " / " + matches.length +
-    (serverHits.length > matches.length ? " (" + serverHits.length + " total)" : "");
+  setSearchStatus((currentMatchIndex + 1) + " / " + matches.length +
+    (serverHits.length > matches.length ? " (" + serverHits.length + " total)" : ""));
 }
 
 function goToPrevMatch() {
   if (matches.length === 0) return;
   currentMatchIndex = (currentMatchIndex - 1 + matches.length) % matches.length;
   setActiveMatch(currentMatchIndex);
-  matchCountEl.textContent = (currentMatchIndex + 1) + " / " + matches.length +
-    (serverHits.length > matches.length ? " (" + serverHits.length + " total)" : "");
+  setSearchStatus((currentMatchIndex + 1) + " / " + matches.length +
+    (serverHits.length > matches.length ? " (" + serverHits.length + " total)" : ""));
 }
 
 export { initSessionSearch, openSearch, closeSearch, toggleSearch, isSearchOpen, handleFindInSessionResults, onHistoryPrepended };

package/lib/public/modules/sidebar-mobile.js

@@ -47,7 +47,7 @@ import { ordinarySessionListSessions } from './session-list-visibility.js';
 import { formatSessionActivity } from './session-activity-tooltip.js';
 import { bindSessionTitleMarquee } from './session-title-marquee.js';
 import { summarizeSidebarItems } from './sidebar-session-counts.js';
-import { cancelSessionInlineRename, closeSessionContextMenu } from './session-context-menu.js';
+import { cancelSessionInlineRename, reconcileSessionContextMenu } from './session-context-menu.js';
 
 // --- Mobile state ---
 var mobileChatSheetOpen = false;
@@ -447,7 +447,7 @@ function createMobileSessionItem(s, options) {
   el.addEventListener("contextmenu", function (event) {
     event.preventDefault();
     event.stopPropagation();
-    openSessionContextMenu(el, s);
+    openSessionContextMenu(el, s, event.clientX || event.clientY ? { x: event.clientX, y: event.clientY } : null);
   });
 
   (function (session, worker) {
@@ -775,7 +775,6 @@ export function refreshMobileChatSheet() {
   var sessionListEl = sheet.querySelector(".mobile-chat-session-list");
   if (!sessionListEl) return;
 
-  closeSessionContextMenu(false);
   cancelSessionInlineRename(false);
 
   // Update chips: active state and processing dots
@@ -815,6 +814,7 @@ export function refreshMobileChatSheet() {
   renderMobileSessionsInto(sessionListEl);
 
   refreshIcons();
+  reconcileSessionContextMenu();
 }
 
 function renderSheetMateProfile(listEl) {

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

@@ -1020,6 +1020,7 @@ function showWorktreeModal(parentSlug, parentName) {
 export function renderIconStrip(projects, currentSlug) {
   cachedProjectList = projects;
   cachedCurrentSlug = currentSlug;
+  if (store.get('paneMode')) return;
 
   var container = document.getElementById("icon-strip-projects");
   if (!container) return;

package/lib/public/modules/sidebar-session-folders-ui.js

@@ -65,7 +65,7 @@ export function unitsFromItems(items) {
     var item = items[i];
     var data = item.type === "session" || item.type === "driver-hierarchy" ? item.data : null;
     units.push({
-      key: data && typeof data.id === "number" ? data.id : null,
+      key: item.type === "split-group" && item.group && item.group.presentation ? "split-view:" + item.group.id : data && typeof data.id === "number" ? data.id : null,
       title: data ? data.title : (item.type === "split-group" ? (item.group && item.group.name) : (item.type === "loop" ? item.loopId : "")),
       createdAt: data ? data.createdAt || 0 : 0,
       lastActivity: data ? (data.lastActivity || 0) : (item.lastActivity || 0),
@@ -275,9 +275,9 @@ function renderUnit(unit, containerId, ctx) {
   wrapper.className = "session-folder-unit";
   if (unit.key) {
     wrapper.dataset.unitKey = String(unit.key);
-    if (ctx.surface === "desktop") wireUnitDrop(wrapper, containerId, unit.key);
+    if (ctx.surface === "desktop" && typeof unit.key === "number") wireUnitDrop(wrapper, containerId, unit.key);
   }
-  wrapper.appendChild(ctx.renderItem(unit.item));
+  wrapper.appendChild(ctx.renderItem(unit.item, containerId, ctx.surface));
   return wrapper;
 }
 

package/lib/public/modules/sidebar-sessions.js

@@ -13,6 +13,8 @@ import { showConfirm } from './app-misc.js';
 import { getUpcomingSchedules } from './scheduler.js';
 import { refreshMobileChatSheet } from './sidebar-mobile.js';
 import { openGroup, openWorkerWithDriver, separateGroup } from './split-view.js';
+import { presentationViewForSidebar } from './split-view-presentations.js';
+import { renderPresentationSplitViewItem } from './split-view-sidebar-renderer.js';
 import { groupedSessionIds } from './split-group-helpers.js';
 import { resolvePreferredVendor } from './default-vendor.js';
 import {
@@ -21,6 +23,7 @@ import {
 } from './sidebar-session-folders-ui.js';
 import { renderFolderToolbar, captureFolderInputs, folderToolbarNeedsRender } from './session-folder-toolbar.js';
 import { captureFolderCollapseAnimations } from './session-folder-collapse.js';
+import { closeFolderMenu, reconcileFolderMenu } from './session-folder-context.js';
 import { getListSearchQuery, getListSearchMatchIds, applyListSearchResults, filterItemsBySearch } from './session-list-search.js';
 import { expectCreatedSession } from './session-create.js';
 import { isMateWorkspace } from './project-mate-navigation.js';
@@ -39,6 +42,8 @@ import {
   cancelSessionInlineRename,
   closeSessionContextMenu,
   mountSessionContextMenu,
+  positionSessionContextMenu,
+  reconcileSessionContextMenu,
   startSessionInlineRename
 } from './session-context-menu.js';
 
@@ -203,6 +208,8 @@ export function initSidebarSessions() {
     var b = prev.sessionCreate;
     if ((!a !== !b || (a && b && a.folderId !== b.folderId)) && getSessionListEl()) renderSessionList(null);
     if (state.splitPanes !== prev.splitPanes) renderSessionList(null);
+    if (state.projectSplitViews !== prev.projectSplitViews || state.projectSplitViewActiveId !== prev.projectSplitViewActiveId ||
+        state.projectSplitViewError !== prev.projectSplitViewError || state.projectSplitViewPending !== prev.projectSplitViewPending) renderSessionList(null);
   });
 
   // --- Resume session picker ---
@@ -234,8 +241,17 @@ export function getExpandedLoopRuns() {
 
 // --- Context menu ---
 
-function showSessionCtxMenu(anchorBtn, sessionId, title, cliSid, sessionData) {
+function showSessionCtxMenu(anchorBtn, sessionId, title, cliSid, sessionData, point) {
   closeSessionContextMenu(false);
+  closeFolderMenu(false);
+  var origin = sessionData && sessionData.sessionOriginId, owner = sessionData && sessionData.ownerId;
+  var rowSelector = anchorBtn.classList.contains('mobile-session-item') ? '.mobile-session-item' : '.session-item';
+  var wasFavorite = isFavoriteSession(sessionData);
+  function currentAnchor() {
+    var live = cachedSessions.find(function (item) { return item.id === sessionId && item.sessionOriginId === origin && item.ownerId === owner && item.title === title; });
+    if (!live || isFavoriteSession(live) !== wasFavorite) return null;
+    return anchorBtn.isConnected ? anchorBtn : document.querySelector(rowSelector + '[data-session-id="' + sessionId + '"]');
+  }
 
   var menu = document.createElement("div");
   menu.className = "session-ctx-menu";
@@ -268,8 +284,8 @@ function showSessionCtxMenu(anchorBtn, sessionId, title, cliSid, sessionData) {
   renameItem.innerHTML = iconHtml("pencil") + " <span>Rename</span>";
   renameItem.addEventListener("click", function (e) {
     e.stopPropagation();
-    closeSessionContextMenu(false);
-    startSessionInlineRename(anchorBtn, sessionData);
+    var row = currentAnchor(); closeSessionContextMenu(false);
+    if (row) startSessionInlineRename(row, sessionData);
   });
   menu.appendChild(renameItem);
 
@@ -305,26 +321,13 @@ function showSessionCtxMenu(anchorBtn, sessionId, title, cliSid, sessionData) {
   }
 
   document.body.appendChild(menu);
-  mountSessionContextMenu(menu, anchorBtn, sessionId);
+  mountSessionContextMenu(menu, anchorBtn, sessionId, { resolveAnchor: currentAnchor });
   refreshIcons();
-
-  // Position: fixed relative to the anchor button
-  requestAnimationFrame(function () {
-    var btnRect = anchorBtn.getBoundingClientRect();
-    menu.style.position = "fixed";
-    menu.style.top = (btnRect.bottom + 2) + "px";
-    menu.style.right = (window.innerWidth - btnRect.right) + "px";
-    menu.style.left = "auto";
-    // If menu overflows below viewport, flip up
-    var menuRect = menu.getBoundingClientRect();
-    if (menuRect.bottom > window.innerHeight - 8) {
-      menu.style.top = (btnRect.top - menuRect.height - 2) + "px";
-    }
-  });
+  positionSessionContextMenu(menu, anchorBtn, point);
 }
 
-export function openSessionContextMenu(anchor, session) {
-  showSessionCtxMenu(anchor, session.id, session.title, session.cliSessionId, session);
+export function openSessionContextMenu(anchor, session, point) {
+  showSessionCtxMenu(anchor, session.id, session.title, session.cliSessionId, session, point);
 }
 
 function showSplitGroupCtxMenu(anchor, group) {
@@ -867,9 +870,14 @@ function renderSessionItem(s, options) {
     return function(e) {
       e.preventDefault();
       e.stopPropagation();
-      showSessionCtxMenu(anchor, id, title, cliSid, sData);
+      showSessionCtxMenu(anchor, id, title, cliSid, sData, e.clientX || e.clientY ? { x: e.clientX, y: e.clientY } : null);
     };
   })(s.id, s.title, s.cliSessionId, el, s));
+  el.addEventListener('keydown', function (event) {
+    if (event.key !== 'ContextMenu' && !(event.shiftKey && event.key === 'F10')) return;
+    if (event.target.closest('input, textarea, [contenteditable="true"]')) return;
+    event.preventDefault(); event.stopPropagation(); showSessionCtxMenu(el, s.id, s.title, s.cliSessionId, s);
+  });
 
   // Unread badge
   var unreadBadge = document.createElement("span");
@@ -975,6 +983,9 @@ function sessionRenderFingerprint(sessions) {
 }
 
 export function renderSessionList(sessions) {
+  // Pane activation consumes this exact list, but its sidebar is parent-owned.
+  // Avoid building every hidden session/folder/Worker row in each iframe.
+  if (store.get('paneMode')) { if (sessions) cachedSessions = sessions; return; }
   if (sessions) {
     // A reconnect and a streaming turn both re-send this list unchanged;
     // rebuilding the sidebar for an identical frame is what made it flicker.
@@ -983,7 +994,6 @@ export function renderSessionList(sessions) {
     cachedSessions = sessions;
   }
 
-  closeSessionContextMenu(false);
   cancelSessionInlineRename(false);
 
   // Remember the inline folder draft before either surface is rebuilt: the mobile
@@ -1007,6 +1017,26 @@ export function renderSessionList(sessions) {
   hierarchySessionIds.forEach(function (id) { groupedIds.delete(id); });
   var sessionsById = new Map();
   for (var si = 0; si < visibleSessions.length; si++) sessionsById.set(visibleSessions[si].id, visibleSessions[si]);
+  var presentationItems = [];
+  var presentationViews = store.get('projectSplitViews') || [];
+  for (var pvi = 0; pvi < presentationViews.length; pvi++) {
+    var presentationView = presentationViewForSidebar(presentationViews[pvi].id);
+    if (!presentationView || !Array.isArray(presentationView.sessions) || presentationView.sessions.length < 2 || presentationView.sessions.length > 8) continue;
+    var presentationMembers = [], validPresentation = true, presentationActivity = 0;
+    for (var pmi = 0; pmi < presentationView.sessions.length; pmi++) {
+      var presentationRef = presentationView.sessions[pmi], presentationSession = null;
+      for (var psi = 0; psi < visibleSessions.length; psi++) {
+        if (visibleSessions[psi].id === presentationRef.id && visibleSessions[psi].sessionOriginId === presentationRef.sessionOriginId) presentationSession = visibleSessions[psi];
+      }
+      if (!presentationSession || presentationSession.sessionRole === "worker" || presentationSession.isMate || presentationSession.isTui ||
+          groupedIds.has(presentationSession.id)) { validPresentation = false; break; }
+      presentationMembers.push(presentationSession); presentationActivity = Math.max(presentationActivity, presentationSession.lastActivity || 0);
+    }
+    if (!validPresentation) continue;
+    for (var pgm = 0; pgm < presentationMembers.length; pgm++) groupedIds.add(presentationMembers[pgm].id);
+    presentationItems.push({ type: "split-group", group: Object.assign({ presentation: true }, presentationView), members: presentationMembers,
+      lastActivity: presentationActivity });
+  }
   var loopGroups = {}; // groupKey -> [sessions]
   var normalSessions = [];
   for (var i = 0; i < visibleSessions.length; i++) {
@@ -1056,6 +1086,7 @@ export function renderSessionList(sessions) {
       lastActivity: splitLastActivity,
     });
   }
+  for (var pitem = 0; pitem < presentationItems.length; pitem++) items.push(presentationItems[pitem]);
   var groupKeys = Object.keys(loopGroups);
   for (var k = 0; k < groupKeys.length; k++) {
     var gk = groupKeys[k];
@@ -1079,9 +1110,9 @@ export function renderSessionList(sessions) {
     searching: matchIds !== null,
     matchIds: matchIds,
     sessions: cachedSessions,
-    renderItem: function (it) {
+    renderItem: function (it, containerId, surface) {
       if (it.type === "loop") return renderLoopGroup(it.loopId, it.children, it.groupKey) || document.createElement("div");
-      if (it.type === "split-group") return renderSplitGroupItem(it.group, it.members);
+      if (it.type === "split-group") return it.group.presentation ? renderPresentationSplitViewItem(it.group, it.members, renderSessionItem, containerId, surface) : renderSplitGroupItem(it.group, it.members);
       if (it.type === "driver-hierarchy") return renderDesktopDriverHierarchy(it.root, renderSessionItem, rerender, matchIds);
       if (it.type === "orphan-workers") return document.createElement("div");
       return renderSessionItem(it.data);
@@ -1101,6 +1132,8 @@ export function renderSessionList(sessions) {
   renderOrdinarySections(layout, folderCtx, regularContainer);
   getSessionListEl().appendChild(regularContainer);
   refreshIcons();
+  reconcileSessionContextMenu();
+  reconcileFolderMenu();
   if (updatePageTitle) updatePageTitle();
   // Recorded from the sessions actually rendered, so a null-argument re-render
   // driven by other state refreshes the fingerprint rather than stranding it.

package/lib/public/modules/sidebar.js

@@ -63,11 +63,27 @@ export function closeSidebar() {
 }
 
 export function toggleSidebarCollapse() {
-  if (!ctx) return;
-  var layout = ctx.$("layout");
+  var layout = document.getElementById("layout");
+  if (!layout && ctx) layout = ctx.$("layout");
+  if (!layout) return;
   var collapsed = layout.classList.toggle("sidebar-collapsed");
   try { localStorage.setItem("sidebar-collapsed", collapsed ? "1" : ""); } catch (e) {}
-  setTimeout(function () { syncResizeHandles(); }, 210);
+  updateSidebarToggleState(collapsed);
+  if (ctx) setTimeout(function () { syncResizeHandles(); }, 210);
+}
+
+function updateSidebarToggleState(collapsed) {
+  var buttons = document.querySelectorAll("#sidebar-toggle-btn, #sidebar-expand-btn, #mate-sidebar-toggle-btn, #sidebar-shell-expand-btn");
+  for (var i = 0; i < buttons.length; i++) {
+    buttons[i].setAttribute("aria-expanded", collapsed ? "false" : "true");
+    buttons[i].title = collapsed ? "Open sidebar" : "Collapse sidebar";
+    buttons[i].setAttribute("aria-label", collapsed ? "Open sidebar" : "Collapse sidebar");
+    if (buttons[i].id === "sidebar-shell-expand-btn") {
+      var splitVisible = document.getElementById("split-host");
+      var desktop = !window.matchMedia || window.matchMedia("(min-width: 769px)").matches;
+      buttons[i].hidden = !collapsed || !desktop || !splitVisible || !splitVisible.classList.contains("visible");
+    }
+  }
 }
 
 export function initSidebar(_ctx) {
@@ -106,6 +122,7 @@ export function initSidebar(_ctx) {
       ctx.$("layout").classList.add("sidebar-collapsed");
     }
   } catch (e) {}
+  updateSidebarToggleState(ctx.$("layout").classList.contains("sidebar-collapsed"));
 
   if (ctx.newSessionBtn) {
     ctx.newSessionBtn.addEventListener("click", function () {

package/lib/public/modules/split-group-helpers.js

@@ -39,7 +39,7 @@ export function splitGroupRoles(group) {
   var driverId = pair.driverId;
   var workerIds = hasWorkerIds ? (Array.isArray(pair.workerIds) ? pair.workerIds.slice() : []) :
     (pair.workerId !== undefined ? [pair.workerId] : []);
-  if (!Number.isInteger(driverId) || workerIds.length < 1 || workerIds.length > 2) return null;
+  if (!Number.isInteger(driverId) || workerIds.length < 1) return null;
   if (group.members.indexOf(driverId) === -1) return null;
   var ordered = [driverId];
   for (var i = 0; i < workerIds.length; i++) {

package/lib/public/modules/split-group-restore.js

@@ -26,7 +26,7 @@ export function reconcileSplitIdentity(state, previous, host) {
 
 // The initial owner response can arrive after history and split metadata.
 // Wait for it so identity cleanup cannot discard panes we just restored.
-export function restoreSplitGroup(openGroup) {
+export function restoreSplitGroup() {
   var state = store.snap();
   if (state.authIdentityLoaded === false || state.isMultiUserMode && !state.myUserId) return;
   if (!isCurrentProjectSessionReady(state, getWs())) return;
@@ -36,6 +36,10 @@ export function restoreSplitGroup(openGroup) {
     return;
   }
   if (state.paneMode) return;
+  var activePresentation = (state.projectSplitViews || []).find(function (view) { return view.id === state.projectSplitViewActiveId; });
+  if (activePresentation && activePresentation.sessions.some(function (session) {
+    return session.id === state.activeSessionId || session.sessionOriginId === state.projectSplitViewFocusedOrigin;
+  })) return;
   if (split) {
     var reconciliation = reconcileRestoredSplit(split, state.splitGroups);
     if (reconciliation.action === "clear") {
@@ -55,14 +59,7 @@ export function restoreSplitGroup(openGroup) {
     }
     return;
   }
-  var activeId = store.get('activeSessionId');
-  if (!activeId) return;
-  var groups = store.get('splitGroups') || [];
-  for (var i = 0; i < groups.length; i++) {
-    var members = groups[i].members || [];
-    if (members.indexOf(activeId) !== -1) {
-      openGroup(groups[i]);
-      return;
-    }
-  }
+  // An execution group is not a presentation choice. Restore an explicitly
+  // saved legacy split above, but keep an ordinary selected Driver in its
+  // single Pane even when it owns Workers. Worker Controls opens the pair.
 }

package/lib/public/modules/split-pair-ui.js

@@ -325,3 +325,21 @@ export function syncPairChrome(host, split) {
     livePane.querySelector(".split-pane-header").appendChild(live);
   }
 }
+
+// A reconciled pane may move from a legacy Worker pair into a presentation
+// Split view. Remove pair-only role and runtime chrome before refreshing the
+// new session metadata; legacy rendering adds it again immediately afterward.
+export function clearPanePairChrome(paneEl) {
+  if (!paneEl) return;
+  paneEl.classList.remove("split-pane-role-driver");
+  paneEl.classList.remove("split-pane-role-worker");
+  if (paneEl.style.removeProperty) {
+    paneEl.style.removeProperty("--split-pane-order");
+    paneEl.style.removeProperty("--split-worker-row");
+  }
+  [".split-pair-role", ".split-pair-live", ".split-pair-set-driver", ".split-worker-runtime"].forEach(function (selector) {
+    Array.from(paneEl.querySelectorAll(selector)).forEach(function (item) { item.remove(); });
+  });
+  var header = paneEl.querySelector(".split-pane-header");
+  if (header) header.classList.remove("has-worker-runtime");
+}

package/lib/public/modules/split-pane-header-state.js

@@ -0,0 +1,45 @@
+import { store } from './store.js';
+import { getCachedSessions } from './sidebar-sessions.js';
+import { livePaneBinding, paneTarget, samePaneTarget } from './pane-binding.js';
+
+function exactReadyPane(paneEl, frame) {
+  if (!paneEl || !frame || !frame.clayPane || !store.get('connected') || frame.dataset.requestedSessionId) return false;
+  var live = frame.clayPane.identity();
+  var sessionId = Number(paneEl.dataset.sessionId);
+  var target = live && paneTarget(store.snap(), getCachedSessions(), live.sessionId);
+  return !!(live && live.ready && sessionId === live.sessionId && Number(frame.dataset.sessionId) === live.sessionId &&
+    live.binding && live.binding.sessionOriginId === frame.dataset.sessionOriginId &&
+    samePaneTarget(target, live.binding) && livePaneBinding(frame));
+}
+
+export function syncPaneHeaderState(paneEl) {
+  var header = paneEl && paneEl.querySelector('.split-pane-header');
+  var frame = paneEl && paneEl.querySelector('.split-pane-frame');
+  if (!header || !frame) return false;
+  var ready = exactReadyPane(paneEl, frame);
+  header.setAttribute('aria-busy', ready ? 'false' : 'true');
+  header.dataset.paneLoading = ready ? 'false' : 'true';
+  header.inert = !ready;
+  var actions = header.querySelectorAll('.split-pane-info, .split-pane-search, .split-pane-context, .split-pane-sidebar, .split-view-arrange-trigger');
+  for (var i = 0; i < actions.length; i++) {
+    var action = actions[i];
+    if (!ready) {
+      if (action.dataset.panePriorDisabled == null) action.dataset.panePriorDisabled = action.disabled ? 'true' : 'false';
+      action.disabled = true;
+    } else if (action.dataset.panePriorDisabled != null) {
+      action.disabled = action.dataset.panePriorDisabled === 'true';
+      delete action.dataset.panePriorDisabled;
+    }
+  }
+  var close = paneEl.querySelector('.split-pane-close');
+  if (close) {
+    var host = paneEl.parentNode;
+    var singletonOnly = !!host && host.id === 'split-host' && host.dataset && host.dataset.singlePane === 'true' &&
+      host.querySelectorAll('.split-pane').length === 1;
+    close.hidden = singletonOnly;
+    close.disabled = !ready || singletonOnly;
+  }
+  var title = paneEl.querySelector('.split-pane-title');
+  if (title) title.setAttribute('aria-disabled', ready ? 'false' : 'true');
+  return ready;
+}