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

package/lib/public/modules/popup-chat-rendering.js

@@ -0,0 +1,244 @@
+// Popup transcript presentation hooks. Tool identity, lifecycle and evidence
+// stay owned by tools.js; this module only controls the compact activity view.
+import { iconHtml } from './icons.js';
+import { syncToolGroupDisclosure } from './clay-tool-activity.js';
+
+// Mounted transcript nodes own completed records without retaining removed history.
+var mountedToolGroups = new WeakMap();
+export function rememberMountedToolGroup(group) { mountedToolGroups.set(group.el, group); }
+export function mountedToolGroup(element) { return mountedToolGroups.get(element) || null; }
+export function transcriptToolGroups(root) {
+  return root ? Array.from(root.querySelectorAll('.tool-group')).map(mountedToolGroup).filter(function (group) { return !!group; }) : [];
+}
+
+export function setPopupChatRendering(enabled) {
+  if (typeof document === 'undefined' || !document.body) return false;
+  document.body.classList.toggle('popup-chat-rendering', enabled === true);
+  if (!enabled) {
+    var rows = document.querySelectorAll('.popup-chat-activity-row[hidden]');
+    for (var i = 0; i < rows.length; i++) rows[i].hidden = false;
+    var groups = document.querySelectorAll('.popup-chat-activity');
+    for (var j = 0; j < groups.length; j++) {
+      var items = groups[j].querySelector('.tool-group-items');
+      if (items) {
+        var expanded = !groups[j].classList.contains('collapsed');
+        items.inert = !expanded;
+        items.setAttribute('aria-hidden', String(!expanded));
+      }
+    }
+  }
+  return enabled === true;
+}
+
+export function shouldEnablePopupChatRendering(body, state, frame, identity) {
+  return !!(body && body.classList && body.classList.contains('contextual-chat-pane') && state && state.paneMode && frame &&
+    identity && identity.kind === 'mate' && identity.mateId && identity.mateId === frame.dataset.mateId &&
+    state.myUserId && state.sessionOriginId && state.paneSessionId && state.activeSessionId === state.paneSessionId &&
+    (!frame.dataset.expectedSessionOrigin || frame.dataset.expectedSessionOrigin === state.sessionOriginId));
+}
+
+export function popupChatContextIsReady(body, state, frame, identity, surface) {
+  if (!body || !body.classList || !body.classList.contains('contextual-chat-pane')) return false;
+  if (!state || !state.paneMode || !state.connected || !state.myUserId || !state.contextualSessionReady) return false;
+  if (!state.sessionOriginId || state.activeSessionId !== state.paneSessionId) return false;
+  if (!frame || !frame.dataset || !frame.dataset.mateId || frame.dataset.ownerId !== state.myUserId) return false;
+  if (frame.hidden || frame.inert || !surface || surface.dataset.mode !== 'popover' || !surface.contains(frame)) return false;
+  if (String(frame.dataset.sessionId || '') !== String(state.paneSessionId || '')) return false;
+  if (frame.dataset.expectedSessionOrigin && frame.dataset.expectedSessionOrigin !== state.sessionOriginId) return false;
+  if (state.activeProjectMateId !== frame.dataset.mateId) return false;
+  if (!identity || identity.kind !== 'mate' || identity.mateId !== frame.dataset.mateId) return false;
+  return true;
+}
+
+export function popupChatRenderingEnabled(identity) {
+  return !!(identity && identity.kind === 'mate' && typeof document !== 'undefined' &&
+    document.body && document.body.classList.contains('popup-chat-rendering'));
+}
+
+export function popupChatRenderingActive() {
+  return typeof document !== 'undefined' && document.body && document.body.classList.contains('popup-chat-rendering');
+}
+
+export function reconcilePopupToolGroups(groups, active, activate, deactivate) {
+  for (var i = 0; i < groups.length; i++) {
+    var group = groups[i];
+    if (!group) continue;
+    if (active) {
+      group.popupChat = true;
+      activate(group);
+    } else if (group.popupChat) {
+      deactivate(group);
+      group.popupChat = false;
+    }
+  }
+}
+
+function decorateTool(tool) {
+  if (!tool || !tool.el || tool.popupOriginalName !== undefined) return;
+  var name = tool.el.querySelector('.tool-name');
+  tool.popupOriginalName = name.textContent;
+  tool.popupOriginalHidden = tool.el.hidden;
+  tool.popupOriginalInert = tool.el.inert;
+  tool.el.classList.add('popup-chat-activity-row');
+  // Native descriptions own reference nodes and their handlers throughout mode changes.
+  if (!tool.clayActivity) {
+    tool.popupPresentedName = popupToolActionLabel(tool.name);
+    name.textContent = tool.popupPresentedName;
+  }
+}
+
+function decorateGroup(group) {
+  if (!group || !group.el || group.popupOriginalState) return;
+  var header = group.el.querySelector('.tool-group-header');
+  var label = group.el.querySelector('.tool-group-label');
+  group.popupOriginalState = {
+    label: label.textContent,
+    collapsed: group.el.classList.contains('collapsed'),
+    userToggled: !!group.userToggled,
+    groupDisplay: group.el.style.display,
+    headerDisplay: header.style.display,
+    headerAriaExpanded: header.getAttribute('aria-expanded'),
+    headerAriaLabel: header.getAttribute('aria-label'),
+    headerTitle: header.title
+  };
+  group.el.classList.add('popup-chat-activity');
+  var icon = document.createElement('span');
+  icon.className = 'popup-chat-activity-icon';
+  icon.setAttribute('aria-hidden', 'true');
+  icon.innerHTML = iconHtml('activity');
+  var heading = document.createElement('span');
+  heading.className = 'popup-chat-activity-heading';
+  heading.textContent = 'Activity';
+  label.textContent = '';
+  label.appendChild(heading);
+  var count = document.createElement('span');
+  count.className = 'popup-chat-activity-count';
+  count.setAttribute('aria-label', '0 recorded events');
+  header.insertBefore(icon, label);
+  header.insertBefore(count, header.querySelector('.tool-group-status-icon'));
+  for (var i = 0; i < group.toolIds.length; i++) decorateTool(group.toolRecords[group.toolIds[i]]);
+}
+
+function restoreGroup(group) {
+  if (!group || !group.el) return;
+  for (var i = 0; i < group.toolIds.length; i++) {
+    var tool = group.toolRecords[group.toolIds[i]];
+    if (!tool || !tool.el || tool.popupOriginalName === undefined) continue;
+    var name = tool.el.querySelector('.tool-name');
+    if (!tool.clayActivity && name.textContent === tool.popupPresentedName) name.textContent = tool.popupOriginalName;
+    tool.el.hidden = tool.popupOriginalHidden;
+    tool.el.inert = tool.popupOriginalInert;
+    tool.el.classList.remove('popup-chat-activity-row');
+    delete tool.popupOriginalName;
+    delete tool.popupPresentedName;
+    delete tool.popupOriginalHidden;
+    delete tool.popupOriginalInert;
+  }
+  var original = group.popupOriginalState;
+  group.popupOriginalState = null;
+  if (!original) return;
+  var label = group.el.querySelector('.tool-group-label');
+  var header = group.el.querySelector('.tool-group-header');
+  label.textContent = original.label;
+  group.el.style.display = original.groupDisplay;
+  header.style.display = original.headerDisplay;
+  group.userToggled = original.userToggled;
+  group.el.classList.toggle('collapsed', original.collapsed);
+  if (original.headerAriaLabel === null) header.removeAttribute('aria-label');
+  else header.setAttribute('aria-label', original.headerAriaLabel);
+  header.title = original.headerTitle;
+  var icon = header.querySelector('.popup-chat-activity-icon');
+  var count = header.querySelector('.popup-chat-activity-count');
+  if (icon) icon.remove();
+  if (count) count.remove();
+  group.el.classList.remove('popup-chat-activity');
+  syncToolGroupDisclosure(group.el);
+  if (original.headerAriaExpanded !== null) header.setAttribute('aria-expanded', original.headerAriaExpanded);
+}
+
+export function syncPopupChatToolGroups(enabled, groups, identity) {
+  var active = !!(enabled && popupChatRenderingActive() && identity && identity.kind === 'mate');
+  reconcilePopupToolGroups(groups, active, function (group) {
+    decorateGroup(group);
+    for (var i = 0; i < group.toolIds.length; i++) decorateTool(group.toolRecords[group.toolIds[i]]);
+    group.el.style.display = '';
+    group.el.querySelector('.tool-group-header').style.display = '';
+    if (!group.userToggled) group.el.classList.add('collapsed');
+    syncToolGroupDisclosure(group.el);
+    syncPopupActivityGroup(group);
+  }, restoreGroup);
+}
+
+function hasIndependentControl(row) {
+  if (!row || !row.querySelectorAll) return false;
+  var controls = row.querySelectorAll('button, a[href], input, select, textarea, [role="button"], [role="menuitem"], [role="option"]');
+  var disclosure = row.querySelector('.tool-header');
+  if (row.querySelector('.tool-desc-link')) return true;
+  for (var i = 0; i < controls.length; i++) {
+    if (controls[i] !== disclosure) return true;
+  }
+  return false;
+}
+
+export function syncPopupActivityGroup(group) {
+  if (!group || !group.popupChat || !group.el) return false;
+  var header = group.el.querySelector('.tool-group-header');
+  var items = group.el.querySelector('.tool-group-items');
+  var count = group.el.querySelector('.popup-chat-activity-count');
+  if (!header || !items) return false;
+
+  var expanded = !group.el.classList.contains('collapsed');
+  var rows = items.children;
+  var firstVisible = Math.max(0, rows.length - 2);
+  var pinned = 0;
+  for (var i = 0; i < rows.length; i++) {
+    var row = rows[i];
+    var keepVisible = hasIndependentControl(row);
+    if (keepVisible) pinned++;
+    row.classList.add('popup-chat-activity-row');
+    row.hidden = !expanded && i < firstVisible && !keepVisible;
+    row.inert = row.hidden;
+  }
+
+  // The native group disclosure remains the one control for revealing older
+  // activity. In popup mode the visible recent rows stay reachable even while
+  // the rest of the group is collapsed.
+  items.inert = false;
+  items.setAttribute('aria-hidden', 'false');
+  header.setAttribute('aria-expanded', String(expanded));
+  header.setAttribute('aria-label', 'Activity, ' + group.toolCount + ' recorded events. ' + (expanded ? 'Hide older activity' : 'Show older activity'));
+  header.title = expanded ? 'Hide older activity' : 'Show older activity';
+  if (count) {
+    count.textContent = String(group.toolCount);
+    count.setAttribute('aria-label', group.toolCount + ' recorded events');
+    count.dataset.pinnedCount = String(pinned);
+  }
+  return true;
+}
+
+export function popupToolActionLabel(name) {
+  var labels = {
+    Read: 'Read', Edit: 'Edit', Write: 'Write', Bash: 'Command',
+    Grep: 'Search files', Glob: 'Find files', WebSearch: 'Web search',
+    WebFetch: 'Fetch page', Task: 'Task'
+  };
+  return labels[name] || name || 'Tool activity';
+}
+
+export function popupToolDescription(name, input) {
+  input = input && typeof input === 'object' ? input : {};
+  if (name === 'Read' || name === 'Edit' || name === 'Write') {
+    var filePath = typeof input.file_path === 'string' ? input.file_path : '';
+    var parts = filePath.split('/');
+    return parts.length > 3 ? '…/' + parts.slice(-3).join('/') : filePath;
+  }
+  if (name === 'Bash') return typeof input.description === 'string' ? input.description.slice(0, 100) : '';
+  if (name === 'Grep') return typeof input.pattern === 'string' ? input.pattern.slice(0, 100) : '';
+  if (name === 'Glob') return typeof input.pattern === 'string' ? input.pattern.slice(0, 100) : '';
+  if (name === 'WebSearch') return typeof input.query === 'string' ? input.query.slice(0, 100) : '';
+  if (name === 'WebFetch') {
+    try { return new URL(input.url).hostname; } catch (error) { return ''; }
+  }
+  if (name === 'Task') return typeof input.description === 'string' ? input.description.slice(0, 100) : '';
+  return '';
+}

package/lib/public/modules/project-activation.js

@@ -70,7 +70,7 @@ export function isProjectSessionReady(state, socket) {
 }
 
 export function splitPanesMatchProject(split, slug) {
-  if (!split || !Array.isArray(split.panes) || split.panes.length < 2 || split.panes.length > 3 || !slug) return false;
+  if (!split || !Array.isArray(split.panes) || split.panes.length < 2 || !slug) return false;
   for (var i = 0; i < split.panes.length; i++) if (split.panes[i].slug !== slug) return false;
   return true;
 }
@@ -78,7 +78,7 @@ export function splitPanesMatchProject(split, slug) {
 export function hasCurrentSplitGroup(split, groups) {
   if (!split || !split.groupId) return true;
   var members = split.panes && split.panes.map(function (pane) { return pane.sessionId; });
-  if (!members || members.length < 2 || members.length > 3) return false;
+  if (!members || members.length < 2) return false;
   var available = Array.isArray(groups) ? groups : [];
   for (var i = 0; i < available.length; i++) {
     var group = available[i];

package/lib/public/modules/qrcode.js

@@ -1,4 +1,6 @@
-import { copyToClipboard } from './utils.js';
+import { ensurePaneFeatureAssets } from './pane-feature-assets.js';
+import { store } from './store.js';
+import { showToast, copyToClipboard } from './utils.js';
 
 var activeShareUrl = null;
 var activeShareTitle = null;
@@ -32,6 +34,15 @@ export function triggerShare(options) {
     return;
   }
 
+  if (typeof qrcode === 'undefined') {
+    var owner = store.get('myUserId'), slug = store.get('currentSlug'), generation = store.get('projectSplitViewSocketGeneration');
+    ensurePaneFeatureAssets('qr').then(function () {
+      if (owner === store.get('myUserId') && slug === store.get('currentSlug') && generation === store.get('projectSplitViewSocketGeneration')) triggerShare(options);
+    }).catch(function (error) {
+      if (owner === store.get('myUserId') && slug === store.get('currentSlug') && generation === store.get('projectSplitViewSocketGeneration')) showToast(error.message, 'error');
+    });
+    return;
+  }
   // Show QR overlay
   var qrOverlay = document.getElementById("qr-overlay");
   var qrCanvas = document.getElementById("qr-canvas");

package/lib/public/modules/right-workbench.js

@@ -1,8 +1,73 @@
 // Single arbitration point for the mutually exclusive right-side workbench.
 
 import { store } from './store.js';
+import { iconHtml, refreshIcons } from './icons.js';
+import { showToast } from './utils.js';
 
 var closers = {};
+var panelIds = { terminal: 'terminal-container', browser: 'shared-browser-panel', 'file-viewer': 'file-viewer',
+  'project-logs': 'project-logs-panel', you: 'you-panel', issues: 'issues-panel', linear: 'linear-panel',
+  'notes-browser': 'notes-browser', 'scheduled-tasks': 'scheduled-tasks-panel', debates: 'debates-workbench',
+  'mcp-skills': 'mcp-skills-workbench', 'mate-knowledge': 'mate-knowledge-workbench', wireframe: 'wireframe-panel' };
+
+// Pane startup does not need account settings for a closed workbench.
+function ensureLayoutPreference() {
+  var account = store.get('myUserId'), project = store.get('currentSlug');
+  return import('./workbench-layout-preference.js').then(function (api) {
+    if (account !== store.get('myUserId') || project !== store.get('currentSlug')) return false;
+    return api.ensureWorkbenchLayoutPreference();
+  }).catch(function () {
+    if (account !== store.get('myUserId') || project !== store.get('currentSlug')) return false;
+    store.set({ workbenchLayoutPreference: Object.assign({}, store.get('workbenchLayoutPreference') || {}, {
+      loading: false, saving: false, error: 'Workbench layout could not be loaded. Try again.'
+    }) });
+    return false;
+  });
+}
+
+function renderLayoutControls() {
+  if (typeof document === 'undefined') return;
+  var main = document.getElementById('main-panels');
+  if (!main) return;
+  var state = store.get('workbenchLayoutPreference') || {}, docked = state.mode === 'docked';
+  main.dataset.workbenchMode = docked ? 'docked' : 'overlay';
+  var panel = document.getElementById(panelIds[store.get('rightWorkbenchOwner')]);
+  if (!panel) return;
+  var header = panel.querySelector(':scope > header, :scope > .file-viewer-header .file-viewer-tabbar, :scope > .terminal-header');
+  if (!header) return;
+  var button = panel.querySelector('.workbench-layout-toggle');
+  if (!button) {
+    var actions = header.querySelector('[class*="window-actions"], .terminal-header-actions, .shared-browser-window, :scope.mcp-skills-header > div') || header;
+    button = document.createElement('button'); button.type = 'button'; button.className = 'workbench-layout-toggle';
+    button.addEventListener('click', function () {
+      var current = store.get('workbenchLayoutPreference') || {};
+      if (!current.ready || current.loading || current.saving) { ensureLayoutPreference(); return; }
+      var owner = store.get('myUserId'), project = store.get('currentSlug');
+      function currentTarget() { return button.isConnected && owner === store.get('myUserId') && project === store.get('currentSlug'); }
+      import('./workbench-layout-preference.js').then(function (api) {
+        var fresh = store.get('workbenchLayoutPreference') || {};
+        if (!currentTarget() || fresh.mode !== current.mode || fresh.revision !== current.revision || fresh.loading || fresh.saving || !fresh.ready) return false;
+        return api.saveWorkbenchLayoutMode(current.mode === 'docked' ? 'overlay' : 'docked');
+      }).then(function (saved) {
+        if (saved === false && currentTarget()) showToast((store.get('workbenchLayoutPreference') || {}).error || 'Workbench layout could not be saved. Try again.', 'error');
+      }).catch(function (error) {
+        if (currentTarget()) showToast(error.message || 'Workbench layout could not be saved. Try again.', 'error');
+      });
+    });
+    var anchor = actions === header ? header.querySelector('[data-knowledge-wide]') : actions.firstElementChild;
+    actions.insertBefore(button, anchor || null);
+  }
+  if (button.dataset.mode !== (docked ? 'docked' : 'overlay')) {
+    button.dataset.mode = docked ? 'docked' : 'overlay';
+    button.innerHTML = iconHtml(docked ? 'layers-2' : 'panel-right');
+    refreshIcons();
+  }
+  button.setAttribute('aria-label', docked ? 'Float workbench over sessions' : 'Dock workbench beside sessions');
+  button.title = state.error || button.getAttribute('aria-label');
+  button.setAttribute('aria-pressed', docked ? 'true' : 'false');
+  button.disabled = !!state.loading || !!state.saving;
+  button.setAttribute('aria-busy', state.loading || state.saving ? 'true' : 'false');
+}
 
 export function registerRightWorkbench(name, close) {
   if (!name || typeof close !== "function") return;
@@ -10,6 +75,7 @@ export function registerRightWorkbench(name, close) {
 }
 
 export function claimRightWorkbench(name) {
+  if (typeof document !== 'undefined') ensureLayoutPreference();
   var previousRevision = store.get("rightWorkbenchRevision") || 0;
   var nextRevision = previousRevision + 1;
   storeSet(name, nextRevision);
@@ -18,6 +84,7 @@ export function claimRightWorkbench(name) {
     if (keys[i] === name) continue;
     try { closers[keys[i]](); } catch (error) { /* one panel must not block another */ }
   }
+  if (typeof requestAnimationFrame === 'function') requestAnimationFrame(renderLayoutControls);
   return nextRevision;
 }
 
@@ -39,6 +106,7 @@ export function resetRightWorkbench() {
 }
 
 store.subscribe(function (state, previous) {
+  if (state.workbenchLayoutPreference !== previous.workbenchLayoutPreference || state.rightWorkbenchOwner !== previous.rightWorkbenchOwner) renderLayoutControls();
   if (state.currentSlug === previous.currentSlug && state.myUserId === previous.myUserId) return;
   resetRightWorkbench();
 });

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

@@ -0,0 +1,79 @@
+import { store } from './store.js';
+
+export var SEARCH_HINT_INTERVAL = 180000;
+export var SEARCH_HINT_QUESTIONS = Object.freeze([
+  'What was I working on recently?',
+  'Where did I leave off yesterday?',
+  'What did I review recently?',
+  "Find the session I said I'd return to.",
+  'What work did I leave unfinished?',
+  'What did we decide about this project?',
+  'Why did we choose this approach?',
+  'Find the conversation about this bug.',
+  'Which sessions need my attention?',
+  "What's happening across this view?",
+  'What are my Workers doing?',
+  'Which sessions are waiting for approval?'
+]);
+export function searchHintText(index) {
+  return 'Search or ask Clay, like “' + SEARCH_HINT_QUESTIONS[index % SEARCH_HINT_QUESTIONS.length] + '”';
+}
+
+var trigger = null, input = null, timer = null, unsubscribe = null;
+function relevantFocus(target) { return !!target && (target === input || trigger && trigger.contains(target)); }
+function available() {
+  return trigger && input && !document.hidden && !store.get('paneMode') && window === window.top &&
+    !store.get('searchHintsPaletteOpen') && !store.get('searchHintsHovered') && !store.get('searchHintsFocused');
+}
+function cancelTimer() { if (timer !== null) { clearTimeout(timer); timer = null; } }
+function paint() {
+  var label = trigger.querySelector('.cmd-palette-searchbar-text');
+  var text = searchHintText(store.get('searchHintIndex') || 0);
+  if (label) label.textContent = text;
+  input.placeholder = text;
+}
+function schedule() {
+  if (!available()) { cancelTimer(); return; }
+  if (timer !== null) return;
+  timer = setTimeout(function () {
+    timer = null;
+    if (!available()) return;
+    store.set({ searchHintIndex: ((store.get('searchHintIndex') || 0) + 1) % SEARCH_HINT_QUESTIONS.length });
+    paint(); schedule();
+  }, SEARCH_HINT_INTERVAL);
+}
+function visibilityChanged() { cancelTimer(); schedule(); }
+function enter() { store.set({ searchHintsHovered: true }); }
+function leave() { store.set({ searchHintsHovered: false }); }
+function focusIn(event) { store.set({ searchHintsFocused: relevantFocus(event.target) }); }
+function focusOut(event) { store.set({ searchHintsFocused: relevantFocus(event.relatedTarget) }); }
+export function setSearchHintsPaletteOpen(open) { store.set({ searchHintsPaletteOpen: open === true }); }
+export function disposeSearchHints() {
+  cancelTimer();
+  if (!trigger) return;
+  trigger.removeEventListener('mouseenter', enter); trigger.removeEventListener('mouseleave', leave);
+  document.removeEventListener('focusin', focusIn); document.removeEventListener('focusout', focusOut);
+  document.removeEventListener('visibilitychange', visibilityChanged);
+  if (unsubscribe) unsubscribe();
+  trigger = null; input = null; unsubscribe = null;
+}
+export function initSearchHints(button, field) {
+  if (button) button.removeAttribute('title');
+  if (trigger === button && input === field) return;
+  disposeSearchHints();
+  if (!button || !field) return;
+  trigger = button; input = field;
+  store.set({ searchHintIndex: store.get('searchHintIndex') || 0, searchHintsPaletteOpen: false,
+    searchHintsHovered: trigger.matches(':hover'), searchHintsFocused: relevantFocus(document.activeElement) });
+  if (!store.get('searchHintsFocused')) paint();
+  trigger.addEventListener('mouseenter', enter); trigger.addEventListener('mouseleave', leave);
+  document.addEventListener('focusin', focusIn); document.addEventListener('focusout', focusOut);
+  document.addEventListener('visibilitychange', visibilityChanged);
+  unsubscribe = store.subscribe(function (state, previous) {
+    if (state.paneMode !== previous.paneMode || state.searchHintsPaletteOpen !== previous.searchHintsPaletteOpen ||
+        state.searchHintsHovered !== previous.searchHintsHovered || state.searchHintsFocused !== previous.searchHintsFocused) {
+      cancelTimer(); schedule();
+    }
+  });
+  schedule();
+}

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

@@ -22,6 +22,7 @@ export function closeSessionContextMenu(restoreFocus) {
   document.removeEventListener("keydown", onMenuKey, true);
   window.removeEventListener("blur", onWindowBlur);
   if (state.anchor) state.anchor.setAttribute("aria-expanded", "false");
+  state.el.hidden = true;
   if (state.el && state.el.isConnected) state.el.remove();
   if (restoreFocus !== false && state.anchor && state.anchor.isConnected) {
     state.anchor.focus({ preventScroll: true });
@@ -54,10 +55,40 @@ function onMenuKey(event) {
     event.preventDefault();
     event.stopPropagation();
     closeSessionContextMenu(true);
+    return;
+  }
+  var items = Array.from(state.el.querySelectorAll('button:not([disabled])')), index = items.indexOf(document.activeElement), next = null;
+  if (!items.length) return;
+  if (event.key === 'ArrowDown' || event.key === 'Tab') next = (index + (event.shiftKey ? -1 : 1) + items.length) % items.length;
+  else if (event.key === 'ArrowUp') next = (index - 1 + items.length) % items.length;
+  else if (event.key === 'Home') next = 0;
+  else if (event.key === 'End') next = items.length - 1;
+  if (next !== null) { event.preventDefault(); event.stopPropagation(); items[next].focus({ preventScroll: true }); }
+}
+
+export function positionSessionContextMenu(menu, anchor, point) {
+  var rect = anchor.getBoundingClientRect(), box = menu.getBoundingClientRect();
+  var x = point ? point.x : rect.left, y = point ? point.y : rect.bottom + 2;
+  menu.style.left = Math.max(8, Math.min(x, window.innerWidth - box.width - 8)) + 'px';
+  menu.style.top = Math.max(8, Math.min(y, window.innerHeight - box.height - 8)) + 'px';
+  menu.style.right = 'auto';
+}
+
+export function reconcileSessionContextMenu() {
+  var state = menuState(); if (!state) return;
+  var anchor = state.resolveAnchor ? state.resolveAnchor() : state.anchor;
+  if (!anchor || !anchor.isConnected || state.slug !== store.get('currentSlug') || state.viewerId !== store.get('myUserId') || state.ws !== getWs()) {
+    closeSessionContextMenu(false); return;
   }
+  if (anchor === state.anchor) return;
+  state.anchor.setAttribute('aria-expanded', 'false');
+  var hadTabIndex = anchor.hasAttribute('tabindex'), tabIndex = anchor.getAttribute('tabindex');
+  anchor.setAttribute('aria-haspopup', 'menu'); anchor.setAttribute('aria-expanded', 'true');
+  if (!hadTabIndex) anchor.setAttribute('tabindex', '-1');
+  store.set({ sessionContextMenu: Object.assign({}, state, { anchor: anchor, anchorHadTabIndex: hadTabIndex, anchorTabIndex: tabIndex }) });
 }
 
-export function mountSessionContextMenu(menu, anchor, sessionId) {
+export function mountSessionContextMenu(menu, anchor, sessionId, options) {
   closeSessionContextMenu(false);
   menu.setAttribute("role", "menu");
   var items = menu.querySelectorAll("button");
@@ -76,6 +107,8 @@ export function mountSessionContextMenu(menu, anchor, sessionId) {
     anchorHadTabIndex: anchorHadTabIndex,
     anchorTabIndex: anchorTabIndex,
     sessionId: sessionId || null,
+    resolveAnchor: options && options.resolveAnchor || null,
+    slug: store.get('currentSlug'), viewerId: store.get('myUserId'), ws: getWs(),
   } });
   document.addEventListener("pointerdown", onOutsidePress, true);
   document.addEventListener("mousedown", onOutsidePress, true);
@@ -205,7 +238,7 @@ export function startHeaderSessionInlineRename(title, control, session) {
 }
 
 store.subscribe(function (state, previous) {
-  if (state.currentSlug !== previous.currentSlug || state.dmMode !== previous.dmMode ||
+  if (state.currentSlug !== previous.currentSlug || state.myUserId !== previous.myUserId || state.dmMode !== previous.dmMode ||
       state.sessionActionEpoch !== previous.sessionActionEpoch || state.panePendingBinding !== previous.panePendingBinding ||
       (previous.connected && !state.connected)) {
     closeSessionContextMenu(false);

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;