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

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

@@ -7,12 +7,12 @@
 import { store } from './store.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { escapeHtml } from './utils.js';
+import { closeSessionContextMenu, positionSessionContextMenu } from './session-context-menu.js';
 
 var LONG_PRESS_MS = 500;
 var MOVE_TOLERANCE = 10;
 var POST_RELEASE_MS = 400;
 var HOLD_MAX_MS = 15000;
-var EDGE = 8;
 
 function contextState() {
   return store.get('sessionFolderContext') || { press: null, held: null, suppressUntil: 0 };
@@ -72,7 +72,7 @@ function onMenuKey(event) {
 
 // Opens the menu with its top-left corner at the point, kept inside the viewport.
 export function openFolderMenuAt(anchor, entries, point) {
-  closeFolderMenu();
+  closeFolderMenu(false); closeSessionContextMenu(false);
   var menu = document.createElement("div");
   menu.className = "session-ctx-menu session-folder-menu";
   menu.setAttribute("role", "menu");
@@ -94,16 +94,12 @@ export function openFolderMenuAt(anchor, entries, point) {
   });
   menu.style.visibility = "hidden";
   document.body.appendChild(menu);
-  var box = menu.getBoundingClientRect();
-  var left = Math.min(Math.max(EDGE, point.x), Math.max(EDGE, window.innerWidth - box.width - EDGE));
-  var top = point.y;
-  if (top + box.height > window.innerHeight - EDGE) top = Math.min(point.y - box.height, window.innerHeight - box.height - EDGE);
-  top = Math.max(EDGE, top);
-  menu.style.left = left + "px";
-  menu.style.top = top + "px";
-  menu.style.right = "auto";
+  positionSessionContextMenu(menu, anchor, point);
   menu.style.visibility = "";
-  store.set({ sessionFolderMenu: { el: menu, anchor: anchor } });
+  var root = anchor.closest('.session-folder-folder');
+  store.set({ sessionFolderMenu: { el: menu, anchor: anchor, folderId: root && root.dataset.folderId,
+    mobile: !!(root && root.classList.contains('is-mobile')), slug: store.get('currentSlug'), viewerId: store.get('myUserId'),
+    folders: JSON.stringify((store.get('sessionFolders') || {}).folders || []) } });
   document.addEventListener("pointerdown", onMenuOutside, true);
   document.addEventListener("mousedown", onMenuOutside, true);
   document.addEventListener("touchstart", onMenuOutside, true);
@@ -114,6 +110,17 @@ export function openFolderMenuAt(anchor, entries, point) {
   if (first) first.focus({ preventScroll: true });
 }
 
+export function reconcileFolderMenu() {
+  var menu = store.get('sessionFolderMenu'); if (!menu) return;
+  if (!menu.folderId || menu.slug !== store.get('currentSlug') || menu.viewerId !== store.get('myUserId') ||
+      menu.folders !== JSON.stringify((store.get('sessionFolders') || {}).folders || [])) { closeFolderMenu(false); return; }
+  var roots = document.querySelectorAll('.session-folder-folder');
+  var root = Array.from(roots).find(function (item) { return item.dataset.folderId === menu.folderId && item.classList.contains('is-mobile') === menu.mobile; });
+  var anchor = root && root.querySelector('.session-folder-toggle');
+  if (!anchor) { closeFolderMenu(false); return; }
+  if (anchor !== menu.anchor) store.set({ sessionFolderMenu: Object.assign({}, menu, { anchor: anchor }) });
+}
+
 // --- Long press (touch and pen) ---
 
 function onScrollCancel() {
@@ -164,14 +171,14 @@ export function consumeFolderClickSuppress() {
 // entries when it opens, so they always reflect the current folder order.
 export function wireFolderContext(header, anchor, entriesFor) {
   function open(x, y) {
-    if (store.get('sessionFolderMenu')) return;
     openFolderMenuAt(anchor, entriesFor(), { x: x, y: y });
   }
 
   header.addEventListener("contextmenu", function (event) {
     event.preventDefault();
     event.stopPropagation();
-    open(event.clientX, event.clientY);
+    var rect = anchor.getBoundingClientRect();
+    open(event.clientX || event.clientY ? event.clientX : rect.left + 16, event.clientX || event.clientY ? event.clientY : rect.bottom);
   });
 
   header.addEventListener("keydown", function (event) {
@@ -213,3 +220,7 @@ export function wireFolderContext(header, anchor, entriesFor) {
   header.addEventListener("pointerleave", cancelFolderPress);
   header.addEventListener("dragstart", cancelFolderPress);
 }
+
+store.subscribe(function (state, previous) {
+  if (state.myUserId !== previous.myUserId || previous.connected && !state.connected) closeFolderMenu(false);
+});

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

@@ -178,13 +178,28 @@ function radioRow(mode, labelText, hint, current, extraClass) {
   return row;
 }
 
+// Display context only. Session counts and deletion authority still come from the preview.
+function folderHasSavedViews(folderId) {
+  var snapshot = store.snap();
+  if (!snapshot.connected || !snapshot.authIdentityLoaded || snapshot.dmMode || snapshot.paneMode ||
+      !snapshot.currentSlug || snapshot.activeProjectSlug !== snapshot.currentSlug || !snapshot.projectSplitViewHydrated || snapshot.projectSplitViewError ||
+      snapshot.projectSplitViewRequestSlug !== snapshot.currentSlug || snapshot.projectSplitViewRequestSocket !== getWs() ||
+      snapshot.projectSplitViewRequestOwnerId !== (snapshot.myUserId || null) ||
+      snapshot.projectSplitViewRequestGeneration !== snapshot.projectSplitViewSocketGeneration) return false;
+  return (snapshot.projectSplitViews || []).some(function (view) { return view.folderId === folderId; });
+}
+
 function describe(current) {
   var preview = current.preview;
+  var hasViews = folderHasSavedViews(current.folderId);
+  var viewCopy = "Saved Split views will move to Unfiled and keep their Favorites status.";
+  if (preview.sessionCount === 0 && hasViews) return 'The folder "' + current.label + '" contains saved Split views. ' + viewCopy + " No sessions will be deleted.";
   if (preview.sessionCount === 0) return 'The folder "' + current.label + '" is empty. Deleting it does not affect any sessions.';
   var text = 'The folder "' + current.label + '" contains ' + phrase(preview.sessionCount, "session") + ".";
   if (preview.workerCount > 0) {
     text += " " + phrase(preview.workerCount, "Split Worker session") + " owned by those Drivers would be deleted with them, including hidden sessions and previous generations.";
   }
+  if (hasViews) text += " " + viewCopy + " The choices below apply to individually filed sessions; deleting member sessions also removes them from their Split views.";
   return text;
 }
 
@@ -327,7 +342,9 @@ export function handleFolderDeleteState(msg) {
 store.subscribe(function (next, previous) {
   if (next.sessionFolderDelete !== previous.sessionFolderDelete) paint();
   // Retry depends on the connection, so a change in it repaints the dialog.
-  else if (next.connected !== previous.connected && next.sessionFolderDelete) paint();
+  else if (next.sessionFolderDelete && (next.connected !== previous.connected || next.projectSplitViews !== previous.projectSplitViews ||
+      next.projectSplitViewHydrated !== previous.projectSplitViewHydrated || next.projectSplitViewError !== previous.projectSplitViewError ||
+      next.currentSlug !== previous.currentSlug || next.myUserId !== previous.myUserId)) paint();
   var current = next.sessionFolderDelete;
   if (next.currentSlug !== previous.currentSlug || next.dmMode !== previous.dmMode) clearDustParticles("folder-delete-dust");
   if (!current || !previous.connected || next.connected) return;

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

@@ -186,8 +186,11 @@ function ghostFor(label) {
 }
 
 export function wireFolderDrag(header, folderId, label) {
-  header.setAttribute("draggable", "true");
+  // Keep disclosure clicks separate from the native folder-reorder gesture.
+  var handle = header.querySelector('.session-folder-label') || header;
+  handle.setAttribute("draggable", "true");
   header.addEventListener("dragstart", function (event) {
+    if (event.target.closest && event.target.closest('.session-folder-chevron, .session-folder-new-btn')) { event.preventDefault(); return; }
     var root = header.closest(".session-folder-folder");
     var parent = root && root.parentElement;
     if (!parent) return;

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 () {