clay-server 5.2.0-beta.8 → 5.2.0-beta.9

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

@@ -0,0 +1,214 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { getCachedSessions } from './sidebar-sessions.js';
+import { takeComposerDraft, restoreComposerDraft } from './input.js';
+import { resetHistoryReplayBatch } from './history-replay-batch.js';
+import { updateContextPanel } from './app-panels.js';
+import { paneTarget, samePaneBinding, samePaneTarget } from './pane-binding.js';
+
+function enabled() {
+  return store.get('paneMode') && !store.get('paneActivationUnsupported') && !store.get('activeProjectMateId') && !/^\/p\/mate-/.test(location.pathname) && !new URLSearchParams(location.search).has('contextual') && window.parent !== window;
+}
+function block(value) {
+  var app = document.getElementById('app');
+  if (app) app.inert = value;
+  document.documentElement.dataset.paneReady = value ? 'false' : 'true';
+}
+function draftKey() { return String(store.get('myUserId')) + ':' + store.get('sessionOriginId'); }
+function clearDeadline() {
+  if (store.get('paneActivationTimer')) clearTimeout(store.get('paneActivationTimer'));
+  store.set({ paneActivationTimer: null });
+}
+function failed(requestId) {
+  var pending = store.get('panePendingBinding');
+  if (!pending || requestId !== pending.requestId) return;
+  clearDeadline();
+  store.set({ paneReady: false, panePendingBinding: null });
+  block(true);
+  var frame = window.frameElement;
+  if (frame) frame.dispatchEvent(new window.parent.CustomEvent('clay-pane-activation-failed'));
+}
+
+// Claim ordinary initial pins before the legacy session-list handler runs.
+// Authentication, list and group metadata can arrive in either order; the
+// subscription retries when those authoritative prerequisites become ready.
+export function primePaneSession() {
+  if (!enabled() || !window.frameElement || !window.frameElement.clayPane) return false;
+  var id = store.get('paneSessionId');
+  var session = (getCachedSessions() || []).find(function (item) { return item.id === id; });
+  if (!session || session.isMate || (session.runtimeMode || session.mode || 'gui') !== 'gui' || session.tuiSuspended) return false;
+  activatePaneSession(id);
+  return true;
+}
+
+export function activatePaneSession(id, force, expectedTarget) {
+  var state = store.snap(), ws = getWs();
+  if (state.authIdentityLoaded === false) return false;
+  if (state.isMultiUserMode && !state.myUserId) return false;
+  if (!enabled() || !state.connected || !ws || ws.readyState !== 1 || state.splitGroupsProjectSlug !== state.currentSlug) return false;
+  var target = paneTarget(state, getCachedSessions(), id);
+  if (!target) return false;
+  if (expectedTarget && !samePaneTarget(target, expectedTarget)) return false;
+  var sourceFrame = window.frameElement;
+  if (!expectedTarget && sourceFrame && Number(sourceFrame.dataset && sourceFrame.dataset.sessionId) === id && sourceFrame.dataset.sessionOriginId && sourceFrame.dataset.sessionOriginId !== target.sessionOriginId) return false;
+  var old = state.paneCommittedBinding, pending = state.panePendingBinding;
+  if (!force && !state.paneSuspended && samePaneTarget(pending || old, target)) return true;
+  if (!pending && state.sessionOriginId) {
+    var draft;
+    try { draft = takeComposerDraft(); } catch (error) { return false; }
+    var drafts = Object.assign({}, state.paneRichDrafts || {});
+    drafts[draftKey()] = draft;
+    store.set({ paneRichDrafts: drafts });
+  }
+  clearDeadline();
+  resetHistoryReplayBatch();
+  var generation = (store.get('paneActivationGeneration') || 0) + 1;
+  target = Object.assign({}, target, { generation: generation, requestId: 'pane-' + generation + '-' + Math.random().toString(36).slice(2, 12) });
+  var path = new URL(store.get('wsPath'), location.origin);
+  path.searchParams.set('session', String(id));
+  store.set({ paneActivationGeneration: generation, panePendingBinding: target, paneReady: false, paneSuspended: false,
+    paneSessionId: id, panePinPending: false, wsPath: path.pathname + path.search });
+  block(true);
+  store.set({ paneActivationTimer: setTimeout(function () { failed(target.requestId); }, 12000) });
+  ws.send(JSON.stringify({ type: 'switch_session', id: id, paneActivation: target }));
+  return true;
+}
+
+// Runs before replay batching, so an obsolete history_meta cannot open a batch
+// that later consumes destination messages.
+export function filterPaneActivation(message) {
+  if (!enabled()) return false;
+  var pending = store.get('panePendingBinding'), committed = store.get('paneCommittedBinding');
+  if (message.type === 'pane_activation_rejected') { failed(message.requestId); return true; }
+  if (!pending && !committed) return !!message.paneActivation;
+  if (['session_list', 'split_groups', 'session_presence', 'pong', 'account_auth_required', 'project_removed', 'project_access_revoked'].indexOf(message.type) >= 0 && !message.paneActivation) return false;
+  var expected = pending || committed;
+  if (!samePaneBinding(expected, message.paneActivation)) return true;
+  if (message.type === 'pane_activation_started') return true;
+  if (message.type === 'pane_activation_snapshot_done') {
+    if (!pending) return true;
+    var draft = (store.get('paneRichDrafts') || {})[String(store.get('myUserId')) + ':' + expected.sessionOriginId];
+    restoreComposerDraft(draft || { text: '', start: 0, end: 0 });
+    function paint() {
+      if (store.get('panePendingBinding') !== expected || !store.get('connected') || store.get('paneSuspended')) return;
+      var current = paneTarget(store.snap(), getCachedSessions(), expected.sessionId);
+      var messages = document.getElementById('messages');
+      if (!samePaneTarget(current, expected) ||
+        store.get('activeSessionId') !== expected.sessionId || store.get('sessionOriginId') !== expected.sessionOriginId || store.get('replayingHistory') ||
+        !messages || messages.dataset.controlSessionId !== String(expected.sessionId) || messages.dataset.controlSessionOrigin !== expected.sessionOriginId) { failed(expected.requestId); return; }
+      clearDeadline();
+      store.set({ paneCommittedBinding: expected, panePendingBinding: null, paneReady: true });
+      block(false);
+      var frame = window.frameElement;
+      if (frame) frame.dispatchEvent(new window.parent.CustomEvent('clay-pane-ready'));
+      updateContextPanel();
+    }
+    requestAnimationFrame(function () { requestAnimationFrame(paint); });
+    return true;
+  }
+  return false;
+}
+
+export function paneOutgoing(data) {
+  var message;
+  try { message = JSON.parse(data); } catch (error) { return null; }
+  if (['ping', 'pong', 'clay_ui_ready'].indexOf(message.type) >= 0) return data;
+  if (store.get('deferredSessionSwitch') && store.get('deferredSessionSwitch').draining) return null;
+  if (message.type === 'switch_session') {
+    var entry = store.get('pendingSessionEntryNavigation');
+    if (entry && entry.projectSlug === store.get('currentSlug') && String(entry.sessionId) !== String(message.id)) store.set({ pendingSessionEntryNavigation: null });
+    if (enabled() && (store.get('panePendingBinding') || store.get('paneCommittedBinding')) && !message.paneActivation) return null;
+    return data;
+  }
+  if (store.get('deferredSessionSwitch')) {
+    var source = store.get('deferredSessionSwitch');
+    if (source.draining) return null;
+    if (message.type === 'stop') return JSON.stringify(Object.assign({}, message, { sessionId: source.sessionId, sessionOriginId: source.origin }));
+    return null;
+  }
+  if (!enabled()) return data;
+  var binding = store.get('paneCommittedBinding');
+  if (store.get('panePendingBinding') || store.get('paneSuspended') || binding && !store.get('paneReady')) return null;
+  if (!binding) return ['stop', 'user_message', 'permission_response', 'ask_user_response', 'elicitation_response', 'user_dialog_response', 'input_sync'].indexOf(message.type) >= 0 ? null : data;
+  if (message.paneBinding && !samePaneBinding(binding, message.paneBinding)) return null;
+  var gesture = (store.get('paneActionEvents') || []).find(function (entry) { return entry.event.isTrusted && entry.event.eventPhase && samePaneBinding(entry.binding, binding); });
+  var action = store.get('paneCallbackBinding') || gesture && gesture.binding;
+  var read = /^(get_|list_)|(_get|_list|_options)$/.test(message.type) || message.type === 'load_more_history';
+  if (!message.paneBinding && !read && !samePaneBinding(action, binding)) return null;
+  return JSON.stringify(Object.assign({}, message, { paneBinding: message.paneBinding || action || binding }));
+}
+
+export function refreshPaneActivation() {
+  if (!enabled()) return;
+  var binding = store.get('panePendingBinding') || store.get('paneCommittedBinding');
+  if (!binding) return;
+  var current = paneTarget(store.snap(), getCachedSessions(), binding.sessionId);
+  if (samePaneTarget(current, binding)) return;
+  if (store.get('panePendingBinding')) failed(binding.requestId);
+  else { store.set({ paneReady: false }); block(true); }
+}
+
+export function initPaneActivation() {
+  if (!enabled() || !window.frameElement) return;
+  var frame = window.frameElement;
+  var latestId = Number(frame.dataset && (frame.dataset.requestedSessionId || frame.dataset.sessionId));
+  if (Number.isSafeInteger(latestId) && latestId > 0 && frame.dataset.projectSlug === store.get('currentSlug')) {
+    var latestPath = new URL(store.get('wsPath'), location.origin);
+    latestPath.searchParams.set('session', String(latestId));
+    store.set({ paneSessionId: latestId, panePinPending: true, wsPath: latestPath.pathname + latestPath.search });
+  }
+  block(true);
+  frame.clayPane = {
+    source: window, document: document,
+    identity: function () {
+      var binding = store.get('paneCommittedBinding');
+      return binding && { ownerId: binding.viewerId, projectSlug: binding.projectSlug, sessionId: binding.sessionId,
+        binding: binding, ready: store.get('connected') && store.get('paneReady') && !store.get('paneSuspended') };
+    },
+    activate: activatePaneSession,
+    checkDraft: function () { if (!store.get('panePendingBinding')) { var draft = takeComposerDraft(); restoreComposerDraft(draft); } },
+    suspend: function () { store.set({ paneSuspended: true, paneReady: false }); block(true); },
+  };
+  // A pointer that began on the previous conversation cannot become a Stop or
+  // approval click on the replacement conversation after hydration.
+  document.addEventListener('pointerdown', function () { store.set({ panePointerBinding: store.get('paneCommittedBinding') }); }, true);
+  document.addEventListener('click', function (event) {
+    if (store.get('paneSuspended') || !store.get('paneReady') && store.get('panePendingBinding') || event.detail && store.get('panePointerBinding') !== store.get('paneCommittedBinding')) {
+      event.preventDefault(); event.stopImmediatePropagation();
+    }
+  }, true);
+  ['click', 'input', 'change', 'keydown', 'keyup', 'submit', 'blur'].forEach(function (name) {
+    document.addEventListener(name, function (event) {
+      var keys = store.get('paneHeldKeys') || {};
+      var binding = store.get('paneCommittedBinding');
+      var previousKey = keys[event.code || event.key];
+      var staleKey = (name === 'keyup' || name === 'keydown' && event.repeat) && previousKey && !samePaneBinding(previousKey, binding);
+      if (name === 'keydown' && !event.repeat) keys[event.code || event.key] = binding;
+      if (name === 'keyup') delete keys[event.code || event.key];
+      if (staleKey || store.get('panePendingBinding') || store.get('paneSuspended') || !store.get('paneReady')) {
+        event.preventDefault(); event.stopImmediatePropagation(); return;
+      }
+      var events = (store.get('paneActionEvents') || []).filter(function (entry) { return entry.event.eventPhase; });
+      events.push({ event: event, binding: binding });
+      store.set({ paneHeldKeys: keys, paneActionEvents: events });
+    }, true);
+  });
+  store.subscribe(function (state, previous) {
+    if (state.activeSessionMode === 'tui' && previous.activeSessionMode !== 'tui') {
+      delete frame.clayPane; store.set({ paneActivationUnsupported: true }); block(false); return;
+    }
+    if (!state.connected && previous.connected) {
+      clearDeadline();
+      store.set({ paneReady: false, panePendingBinding: null, paneCommittedBinding: null }); block(true);
+    }
+    if (state.connected && (state.splitGroups !== previous.splitGroups || state.splitGroupsProjectSlug !== previous.splitGroupsProjectSlug || state.paneBindingSessions !== previous.paneBindingSessions || state.authIdentityLoaded !== previous.authIdentityLoaded || state.myUserId !== previous.myUserId || state.activeSessionId !== previous.activeSessionId || state.connected !== previous.connected)) {
+      queueMicrotask(function () {
+        refreshPaneActivation();
+        if (!store.get('panePendingBinding') && !store.get('paneSuspended')) {
+          if (store.get('panePinPending')) primePaneSession();
+          else if (store.get('activeSessionId') === store.get('paneSessionId')) activatePaneSession(store.get('paneSessionId'));
+        }
+      });
+    }
+  });
+}

package/lib/public/modules/pane-binding.js

@@ -0,0 +1,82 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+
+export function captureSessionAction() {
+  var state = store.snap();
+  return { projectSlug: state.currentSlug, ownerId: state.myUserId, sessionId: state.activeSessionId,
+    origin: state.sessionOriginId, socket: getWs(), binding: state.paneCommittedBinding || null,
+    epoch: state.sessionActionEpoch || 0 };
+}
+
+export function sessionActionCurrent(action, draftCompletion) {
+  var state = store.snap();
+  return !!action && action.socket === getWs() && state.connected &&
+    action.projectSlug === state.currentSlug && action.ownerId === state.myUserId &&
+    action.sessionId === state.activeSessionId && action.origin === state.sessionOriginId &&
+    action.epoch === (state.sessionActionEpoch || 0) &&
+    (draftCompletion || !state.deferredSessionSwitch) && !state.panePendingBinding && !state.paneSuspended &&
+    (action.binding ? state.paneReady && samePaneBinding(action.binding, state.paneCommittedBinding) : !state.paneCommittedBinding);
+}
+
+// Capture at callback creation, never when an old callback eventually sends.
+export function sessionCallback(callback, draftCompletion) {
+  var action = captureSessionAction();
+  return function () {
+    if (!sessionActionCurrent(action, draftCompletion)) return;
+    var previous = store.get('paneCallbackBinding');
+    store.set({ paneCallbackBinding: action.binding });
+    try { return callback.apply(this, arguments); }
+    finally { store.set({ paneCallbackBinding: previous }); }
+  };
+}
+
+export function samePaneBinding(a, b) {
+  return !!a && !!b && ['requestId', 'generation', 'projectSlug', 'viewerId', 'ownerId', 'sessionId', 'sessionOriginId', 'role', 'workerGeneration', 'groupStamp', 'parentSessionOriginId'].every(function (key) { return a[key] === b[key]; });
+}
+
+export function samePaneTarget(a, b) {
+  return !!a && !!b && ['projectSlug', 'viewerId', 'ownerId', 'sessionId', 'sessionOriginId', 'role', 'workerGeneration', 'groupStamp', 'parentSessionOriginId'].every(function (key) { return a[key] === b[key]; });
+}
+
+export function paneTarget(state, sessions, id) {
+  var session = (sessions || []).find(function (item) { return item.id === id; });
+  if (!session || session.isMate || !session.sessionOriginId || (session.runtimeMode || session.mode || 'gui') !== 'gui' || session.tuiSuspended) return null;
+  var group = (state.splitGroups || []).find(function (item) { return item.members.indexOf(id) >= 0; });
+  var parent = session.sessionRole === 'worker' && sessions.find(function (item) { return item.id === session.parentSessionId; });
+  if (session.sessionRole === 'worker' && (!parent || !session.parentAvailable || !Number.isSafeInteger(session.workerGeneration) || !parent.sessionOriginId || parent.ownerId !== session.ownerId || !group || !group.pair || group.pair.driverId !== parent.id)) return null;
+  return {
+    projectSlug: state.currentSlug, viewerId: state.myUserId || null, ownerId: session.ownerId || null,
+    sessionId: session.id, sessionOriginId: session.sessionOriginId,
+    role: session.sessionRole === 'worker' ? 'worker' : 'driver', workerGeneration: session.workerGeneration || null,
+    parentSessionOriginId: parent ? parent.sessionOriginId : null,
+    groupStamp: group ? JSON.stringify({ id: group.id, members: group.members, pair: group.pair || null }) : null,
+  };
+}
+
+// Ordinary reusable panes have a live document binding; legacy/canonical frames
+// retain their existing URL and receipt checks in their own bridge paths.
+export function livePaneBinding(frame, message) {
+  if (!frame || !frame.clayPane) return false;
+  var api = frame.clayPane, live = api.identity();
+  var state = store.snap(), split = state.splitPanes;
+  var target = live && paneTarget(state, state.paneBindingSessions || [], live.sessionId);
+  return api.source === frame.contentWindow && api.document === frame.contentDocument && live && live.ready &&
+    samePaneTarget(target, live.binding) &&
+    live.ownerId === (state.myUserId || null) && live.projectSlug === state.currentSlug &&
+    split && split.panes.some(function (pane) { return pane.slug === live.projectSlug && pane.sessionId === live.sessionId; }) &&
+    (!message || samePaneBinding(live.binding, message.paneBinding));
+}
+
+export function paneMessageBinding() {
+  return store.get('paneReady') && !store.get('paneSuspended') ? store.get('paneCommittedBinding') : null;
+}
+
+export function currentPaneReview(container) {
+  if (!container || !container.paneBinding) return true;
+  return container.isConnected !== false && store.get('paneReady') && !store.get('paneSuspended') && samePaneBinding(container.paneBinding, store.get('paneCommittedBinding'));
+}
+
+export function paneCallbackCurrent(binding) {
+  var current = store.get('panePendingBinding') || store.get('paneCommittedBinding');
+  return current ? samePaneBinding(current, binding) : !binding;
+}

package/lib/public/modules/pane-bridge.js

@@ -5,6 +5,7 @@ import { forwardStudioPresentation } from './clay-studio-render.js';
 // Same-origin messages only, both directions.
 
 import { store } from './store.js';
+import { paneMessageBinding, samePaneBinding } from './pane-binding.js';
 import { getEffectiveContextView } from './context-view-preference.js';
 import { forceExternalLinkToNewTab } from './pane-links.js';
 
@@ -12,6 +13,7 @@ export function reportPaneContext(data) {
   if (!store.get('paneMode') || window.parent === window) return;
   window.parent.postMessage({
     type: "clay-pane-context",
+    paneBinding: paneMessageBinding(),
     sessionId: store.get('activeSessionId'),
     pct: data.pct,
     used: data.used,
@@ -27,7 +29,7 @@ export function reportPaneContext(data) {
 // Hand the event to the parent shell, which owns the single flow.
 export function forwardPaneAuthRequired(message) {
   if (!store.get('paneMode') || window.parent === window) return false;
-  window.parent.postMessage({ type: "clay-pane-auth-required", message: message }, window.location.origin);
+  window.parent.postMessage({ type: "clay-pane-auth-required", paneBinding: paneMessageBinding(), message: message }, window.location.origin);
   return true;
 }
 
@@ -38,7 +40,7 @@ export function forwardPaneMarkdownPresentation(message) {
 
 export function forwardPaneIssueReference(ref, projectSlug) {
   if (!store.get('paneMode') || window.parent === window) return false;
-  window.parent.postMessage({ type: "clay-pane-open-issue", ref: ref, projectSlug: projectSlug || store.get('currentSlug') }, window.location.origin);
+  window.parent.postMessage({ type: "clay-pane-open-issue", paneBinding: paneMessageBinding(), ref: ref, projectSlug: projectSlug || store.get('currentSlug') }, window.location.origin);
   return true;
 }
 
@@ -70,6 +72,7 @@ export function initPaneBridge() {
     if (event.origin !== window.location.origin) return;
     var msg = event.data;
     if (!msg || msg.type !== "clay-pane-toggle-context") return;
+    if (event.source !== window.parent || store.get('paneCommittedBinding') && !samePaneBinding(paneMessageBinding(), msg.paneBinding)) return;
     togglePaneContextPanel();
   });
 }

package/lib/public/modules/pane-browser-bridge.js

@@ -1,9 +1,10 @@
 import { store } from './store.js';
+import { livePaneBinding, paneMessageBinding } from './pane-binding.js';
 import { showToast } from './utils.js';
 
 export function forwardPaneBrowserLink(url) {
   if (!store.get('paneMode') || window.parent === window) return false;
-  window.parent.postMessage({ type: 'clay-pane-open-browser', url: url, projectSlug: store.get('currentSlug'), sessionId: String(store.get('activeSessionId')) }, window.location.origin);
+  window.parent.postMessage({ type: 'clay-pane-open-browser', paneBinding: paneMessageBinding(), url: url, projectSlug: store.get('currentSlug'), sessionId: String(store.get('activeSessionId')) }, window.location.origin);
   return true;
 }
 export function handlePaneBrowserMessage(event, host) {
@@ -13,8 +14,9 @@ export function handlePaneBrowserMessage(event, host) {
   var pane = frame && s.splitPanes && s.splitPanes.panes && s.splitPanes.panes.find(function (item) { return String(item.slug) === frame.dataset.projectSlug && String(item.sessionId) === frame.dataset.sessionId; });
   if (!pane || msg.projectSlug !== s.currentSlug || msg.projectSlug !== frame.dataset.projectSlug || String(msg.sessionId) !== frame.dataset.sessionId) return true;
   var expected = new URL('/p/' + encodeURIComponent(pane.slug) + '/?pane=1&session=' + encodeURIComponent(pane.sessionId), window.location.href).href;
-  if (frame.src !== expected) return true;
+  if (frame.clayPane ? !livePaneBinding(frame, msg) : frame.src !== expected) return true;
   // The authenticated host owns the browser; a live same-project pane supplies only a URL.
-  import('./shared-browser.js').then(function (module) { module.openSharedBrowserAt(msg.url); }).catch(function (error) { showToast(error.message || 'Could not open the browser.', 'warn'); });
+  var binding = frame.clayPane && frame.clayPane.identity().binding;
+  import('./shared-browser.js').then(function (module) { if (binding && (!livePaneBinding(frame, msg) || frame.clayPane.identity().binding !== binding)) return; module.openSharedBrowserAt(msg.url); }).catch(function (error) { showToast(error.message || 'Could not open the browser.', 'warn'); });
   return true;
 }

package/lib/public/modules/pane-file-bridge.js

@@ -1,4 +1,5 @@
 import { store } from './store.js';
+import { livePaneBinding, paneMessageBinding } from './pane-binding.js';
 
 function paneFrame(host, source) {
   if (!host || !source) return null;
@@ -19,6 +20,7 @@ function matchingPane(frame, split) {
 }
 
 function hasLivePaneSource(frame, pane) {
+  if (frame && frame.clayPane) return livePaneBinding(frame);
   if (!frame || !pane || typeof frame.src !== "string") return false;
   var expected = "/p/" + encodeURIComponent(pane.slug) + "/?pane=1&session=" + encodeURIComponent(pane.sessionId);
   try { return new URL(expected, window.location.href).href === frame.src; } catch (e) { return false; }
@@ -41,6 +43,7 @@ export function forwardPaneFileReference(path, opts) {
   if (!store.get('paneMode') || window.parent === window || typeof path !== "string" || !path) return false;
   window.parent.postMessage({
     type: "clay-pane-open-file",
+    paneBinding: paneMessageBinding(),
     path: path,
     line: opts && opts.line != null ? opts.line : null,
     column: opts && opts.column != null ? opts.column : null,
@@ -57,6 +60,7 @@ export function handlePaneFileMessage(event, host, openFile, openFiles) {
   var frame = paneFrame(host, event.source);
   var state = store.snap();
   var pane = matchingPane(frame, state.splitPanes);
+  if (frame && frame.clayPane && !livePaneBinding(frame, msg)) return true;
   if (!pane || !hasLivePaneSource(frame, pane) || String(pane.slug) !== String(state.currentSlug) || msg.projectSlug !== frame.dataset.projectSlug || String(msg.sessionId) !== String(frame.dataset.sessionId) || !validLocation(msg.line) || !validLocation(msg.column)) return true;
   if (typeof msg.path !== "string" || !msg.path) return true;
   if (!state.connected || typeof openFile !== "function") return true;

package/lib/public/modules/pane-issue-bridge.js

@@ -1,4 +1,5 @@
 import { store } from './store.js';
+import { livePaneBinding } from './pane-binding.js';
 import { openIssues } from './issues.js';
 
 function isIssueReference(ref) {
@@ -8,7 +9,7 @@ function isIssueReference(ref) {
 function isPaneSource(host, source) {
   var frames = host.querySelectorAll(".split-pane-frame");
   for (var i = 0; i < frames.length; i++) {
-    if (frames[i].contentWindow === source) return true;
+    if (frames[i].contentWindow === source) return !frames[i].clayPane || livePaneBinding(frames[i]);
   }
   return false;
 }
@@ -18,6 +19,8 @@ export function handlePaneIssueMessage(event, host) {
   var msg = event.data;
   if (!msg || msg.type !== "clay-pane-open-issue") return false;
   if (!isIssueReference(msg.ref) || !isPaneSource(host, event.source)) return true;
+  var frame = Array.from(host.querySelectorAll('.split-pane-frame')).find(function (item) { return item.contentWindow === event.source; });
+  if (frame && frame.clayPane && !livePaneBinding(frame, msg)) return true;
 
   var issueTarget = store.get('issuesCache') && store.get('issuesCache')[msg.ref];
   var projectSlug = (issueTarget && issueTarget.projectSlug) || msg.projectSlug || store.get('currentSlug');

package/lib/public/modules/rewind.js

@@ -1,5 +1,7 @@
 import { escapeHtml } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
+import { store } from './store.js';
+import { captureSessionAction, sessionActionCurrent } from './pane-binding.js';
 
 var ctx;
 var rewindMode = false;
@@ -81,6 +83,7 @@ function initiateRewind(uuid) {
     return;
   }
   pendingRewindUuid = uuid;
+  store.set({ rewindAction: captureSessionAction() });
   rewindPreviewInFlight = true;
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({ type: "rewind_preview", uuid: uuid }));
@@ -120,6 +123,7 @@ function updateSummaryForMode() {
 }
 
 export function showRewindModal(data) {
+  if (!sessionActionCurrent(store.get('rewindAction'))) return;
   rewindPreviewInFlight = false;
 
   // Ignore stale preview results that don't match current pending UUID
@@ -367,6 +371,7 @@ export function initRewind(_ctx) {
   });
 
   rewindConfirmBtn.addEventListener("click", function() {
+    if (!sessionActionCurrent(store.get('rewindAction'))) { hideRewindModal(); return; }
     if (rewindExecuting) return;
     if (pendingRewindUuid && ctx.ws && ctx.connected) {
       rewindExecuting = true;

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

@@ -4,6 +4,7 @@ import { addSystemMessage, VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.
 import { openPairDialog } from './split-pair-ui.js';
 import { buildAgentVendorSelect, fillAgentModels, buildAgentEffortSelect, fillAgentEffort } from './agent-config-selects.js';
 import { showToast } from './utils.js';
+import { sessionCallback, captureSessionAction, sessionActionCurrent } from './pane-binding.js';
 
 var addWorkerButton = null;
 var handoffButton = null;
@@ -33,6 +34,7 @@ function handoffField(labelText, control) {
 function requestHandoffDialog() {
   var ws = getWs();
   if (!ws || ws.readyState !== 1) return;
+  store.set({ handoffAction: captureSessionAction() });
   ws.send(JSON.stringify({ type: "handoff_session_options" }));
 }
 
@@ -47,6 +49,7 @@ function openWorkerDialog() {
 }
 
 function showHandoffDialog(options) {
+  if (!sessionActionCurrent(store.get('handoffAction'))) return;
   closeHandoffDialog();
   var installed = options.installedVendors || [];
   var vendorInfo = store.get('vendorInfo') || {};
@@ -147,7 +150,7 @@ function showHandoffDialog(options) {
     if (event.key === "Escape") closeHandoffDialog();
   };
   document.addEventListener("keydown", handoffEscapeHandler);
-  submit.addEventListener("click", function () {
+  submit.addEventListener("click", sessionCallback(function () {
     var ws = getWs();
     if (!ws || ws.readyState !== 1) return;
     ws.send(JSON.stringify({
@@ -158,7 +161,7 @@ function showHandoffDialog(options) {
     }));
     submit.disabled = true;
     submit.textContent = "Continuing…";
-  });
+  }));
   vendorSelect.focus();
 }
 

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

@@ -109,6 +109,8 @@ function currentRenameCanSend(state) {
     String(store.get('activeSessionId')) === String(state.sessionId) :
     state && state.row && String(state.row.dataset.sessionId) === String(state.sessionId);
   return !!(state && state.row && state.row.isConnected && sameSession &&
+    (state.source !== 'header' || state.origin === store.get('sessionOriginId')) &&
+    state.epoch === (store.get('sessionActionEpoch') || 0) && !store.get('panePendingBinding') && !store.get('deferredSessionSwitch') &&
     store.get('connected') && state.ws === ws && ws && ws.readyState === 1 &&
     state.slug === store.get('currentSlug') &&
     (!permissions || permissions.sessionRename !== false));
@@ -158,6 +160,8 @@ function beginSessionInlineRename(row, title, control, session, source, inputCla
     input: input,
     originalNodes: originalNodes,
     sessionId: session.id,
+    origin: session.sessionOriginId,
+    epoch: store.get('sessionActionEpoch') || 0,
     currentTitle: session.title || "New Session",
     control: control || null,
     controlDisplay: controlDisplay,
@@ -202,6 +206,7 @@ export function startHeaderSessionInlineRename(title, control, session) {
 
 store.subscribe(function (state, previous) {
   if (state.currentSlug !== previous.currentSlug || state.dmMode !== previous.dmMode ||
+      state.sessionActionEpoch !== previous.sessionActionEpoch || state.panePendingBinding !== previous.panePendingBinding ||
       (previous.connected && !state.connected)) {
     closeSessionContextMenu(false);
     cancelSessionInlineRename(false);

package/lib/public/modules/session-rich-drafts.js

@@ -0,0 +1,21 @@
+import { store } from './store.js';
+import { takeComposerDraft, restoreComposerDraft } from './input.js';
+
+function key() { return [store.get('myUserId') || '', store.get('currentSlug') || '', store.get('sessionOriginId') || ''].join(':'); }
+export function checkComposerDeparture() {
+  var draft = takeComposerDraft();
+  restoreComposerDraft(draft);
+}
+export function saveSessionRichDraft() {
+  if (store.get('activeProjectMateId') || !store.get('sessionOriginId') || store.get('panePendingBinding')) return;
+  var drafts = Object.assign({}, store.get('sessionRichDrafts') || {});
+  var draft = takeComposerDraft();
+  drafts[key()] = draft;
+  restoreComposerDraft(draft);
+  store.set({ sessionRichDrafts: drafts });
+}
+export function restoreSessionRichDraft() {
+  if (store.get('activeProjectMateId') || store.get('panePendingBinding')) return;
+  var draft = (store.get('sessionRichDrafts') || {})[key()];
+  restoreComposerDraft(draft || { text: (store.get('sessionDrafts') || {})[store.get('activeSessionId')] || '', start: 0, end: 0 });
+}

package/lib/public/modules/session-switch-defer.js

@@ -0,0 +1,67 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { composerDepartureReason } from './input.js';
+import { processMessage } from './app-message-router.js';
+
+function notice(show, message) {
+  var element = document.getElementById('session-switch-wait');
+  if (!show) { if (element) element.remove(); return; }
+  if (element) { if (message) element.textContent = message; return; }
+  var area = document.getElementById('input-area');
+  if (!area) return;
+  element = document.createElement('div'); element.id = 'session-switch-wait';
+  element.className = 'session-switch-wait'; element.setAttribute('role', 'status');
+  element.textContent = 'Session change waiting. Finish or discard voice input, or wait for attachments. Your draft stays with this conversation.';
+  area.prepend(element);
+}
+
+// Keep the source composer and its async completions together. The destination
+// replay waits in order; it cannot change identity midway through an upload.
+export function deferSessionSwitch(message) {
+  var pending = store.get('deferredSessionSwitch');
+  if (pending && pending.draining) return false;
+  if (['account_auth_required', 'project_removed', 'project_access_revoked'].indexOf(message.type) >= 0) {
+    store.set({ deferredSessionSwitch: null }); notice(false); return false;
+  }
+  if (!pending && message.type === 'session_switched' && composerDepartureReason()) {
+    pending = { socket: getWs(), projectSlug: store.get('currentSlug'), ownerId: store.get('myUserId'),
+      sessionId: store.get('activeSessionId'), origin: store.get('sessionOriginId'), processing: store.get('processing'), messages: [] };
+    var speech = store.get('speechActive');
+    if (speech) speech.autoSend = false;
+    store.set({ deferredSessionSwitch: pending }); notice(true);
+  }
+  if (!pending) return false;
+  if (pending.projectSlug === store.get('currentSlug') && pending.ownerId === store.get('myUserId')) pending.socket = getWs();
+  if (store.get('connected') && pending.processing && !store.get('processing')) store.set({ processing: true });
+  pending.messages.push(message);
+  if (message.type === 'session_list' || message.type === 'session_switched') queueMicrotask(drain);
+  return true;
+}
+
+function drain() {
+  var pending = store.get('deferredSessionSwitch');
+  if (!pending || pending.draining || composerDepartureReason() || !store.get('connected')) return;
+  if (pending.socket !== getWs() || pending.projectSlug !== store.get('currentSlug') || pending.ownerId !== store.get('myUserId')) return;
+  var latestSwitch, latestList;
+  pending.messages.forEach(function (message) {
+    if (message.type === 'session_switched') latestSwitch = message;
+    if (message.type === 'session_list') latestList = message;
+  });
+  if (!latestSwitch || !latestList) return;
+  var target = (latestList.sessions || []).find(function (session) { return session.id === latestSwitch.id; });
+  if (!target || target.sessionOriginId !== latestSwitch.sessionOriginId) {
+    notice(true, 'The conversation changed while your draft was waiting. Your draft is preserved. Choose a conversation to continue.');
+    return;
+  }
+  // Restoring superseded snapshots must not trigger outbound session effects
+  // before the final authoritative target is installed.
+  pending.draining = true;
+  pending.finalSwitch = latestSwitch;
+  pending.messages.forEach(processMessage);
+  store.set({ deferredSessionSwitch: null }); notice(false);
+}
+
+store.subscribe(function (state, previous) {
+  if (state.deferredSessionSwitch && (state.composerUploadingCount !== previous.composerUploadingCount ||
+      state.speechActive !== previous.speechActive || state.speechRetry !== previous.speechRetry || state.connected !== previous.connected)) queueMicrotask(drain);
+});