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

package/lib/pane-pending-interactions.js

@@ -0,0 +1,20 @@
+// Pending requests can precede the initial history window. Restate their exact
+// display payloads before snapshot completion, without resolving or replaying
+// any human decision. Client renderers deduplicate by their original IDs.
+function send(session, emit) {
+  Object.keys(session.pendingAskUser || {}).forEach(function (id) {
+    var pending = session.pendingAskUser[id];
+    var input = pending.input || { questions: pending.request && pending.request.questions || [] };
+    emit({ type: 'ask_user_pending', toolId: id, input: input });
+  });
+  Object.keys(session.pendingElicitations || {}).forEach(function (id) {
+    var request = session.pendingElicitations[id].request || {};
+    emit({ type: 'elicitation_request', requestId: id, serverName: request.serverName, message: request.message,
+      mode: request.mode || 'form', url: request.url || null, elicitationId: request.elicitationId || null, requestedSchema: request.requestedSchema || null });
+  });
+  Object.keys(session.pendingUserDialogs || {}).forEach(function (id) {
+    var request = session.pendingUserDialogs[id].request || {};
+    emit({ type: 'user_dialog_request', requestId: id, dialogKind: request.dialogKind, payload: request.payload || {}, toolUseId: request.toolUseID || null });
+  });
+}
+module.exports = { send: send };

package/lib/pane-session-activation.js

@@ -0,0 +1,114 @@
+var provenance = require('./session-provenance');
+
+// This opt-in protocol only describes an authenticated ordinary pane snapshot.
+// It grants no action authority and is never a visible-render acknowledgement.
+function begin(ctx, ws, msg) {
+  if (!Object.prototype.hasOwnProperty.call(msg, 'paneActivation')) {
+    ws._clayPaneActivation = null;
+    return null;
+  }
+  var request = msg.paneActivation;
+  var session = ctx.sm.sessions.get(msg.id);
+  var userId = ws._clayUser && ws._clayUser.id || null;
+  var worker = provenance.isWorker(session);
+  var parentSession = worker && Array.from(ctx.sm.sessions.values()).find(function (parent) { return parent.sessionOriginId === session.sessionProvenance.parentSessionOriginId && !provenance.isWorker(parent); });
+  var identity = session && {
+    requestId: request && request.requestId,
+    generation: request && request.generation,
+    projectSlug: ctx.slug,
+    viewerId: userId,
+    ownerId: session.ownerId || null,
+    sessionId: session.localId,
+    sessionOriginId: session.sessionOriginId,
+    role: worker ? 'worker' : 'driver',
+    workerGeneration: worker ? session.sessionProvenance.generation : null,
+    parentSessionOriginId: worker ? session.sessionProvenance.parentSessionOriginId : null,
+    groupStamp: groupStamp(),
+  };
+  function groupStamp() {
+    var group = ctx.splitStore && ctx.splitStore.groupForMember(msg.id);
+    return group ? JSON.stringify({ id: group.id, members: group.members, pair: group.pair || null }) : null;
+  }
+  function allowed() {
+    if (typeof ws._clayAuthCheck === 'function' && !ws._clayAuthCheck()) return false;
+    var access = ctx.getProjectAccess ? ctx.getProjectAccess() : { visibility: 'public' };
+    if (!ctx.usersModule.isMultiUser()) return !session.ownerId;
+    return !!userId &&
+      !!ctx.usersModule.findUserById(userId) &&
+      ctx.usersModule.canAccessProject(userId, access) &&
+      ctx.usersModule.canAccessSession(userId, session, access);
+  }
+  var valid = request && typeof request === 'object' &&
+    typeof request.requestId === 'string' && /^[a-zA-Z0-9_-]{1,96}$/.test(request.requestId) &&
+    Number.isSafeInteger(request.generation) && request.generation > (ws._clayPaneActivationGeneration || 0) &&
+    ws._clayPane === true && !ws._clayContextual && !ctx.isMate && ws.readyState === 1 &&
+    session && session.sessionOriginId && !session.isMate &&
+    (session.runtimeMode || session.mode || 'gui') === 'gui' && !session.tuiSuspended &&
+    request.projectSlug === identity.projectSlug && request.viewerId === identity.viewerId &&
+    request.ownerId === identity.ownerId && request.sessionOriginId === identity.sessionOriginId &&
+    request.role === identity.role && request.workerGeneration === identity.workerGeneration &&
+    (!ctx.splitStore || request.groupStamp === identity.groupStamp && request.parentSessionOriginId === identity.parentSessionOriginId) &&
+    (!worker || Number.isSafeInteger(identity.workerGeneration) && identity.workerGeneration > 0) && allowed();
+  if (!valid) {
+    // Do not disclose whether a foreign or removed session exists.
+    ctx.sendTo(ws, { type: 'pane_activation_rejected', requestId: request && typeof request.requestId === 'string' ? request.requestId.slice(0, 96) : null });
+    return false;
+  }
+  ws._clayPaneActivationGeneration = identity.generation;
+  ws._clayPaneActivation = identity;
+  function current() {
+    return ws.readyState === 1 && ws._clayPane === true && !ws._clayContextual && !ctx.isMate && !session.isMate &&
+      ws._clayPaneActivation === identity &&
+      ctx.sm.sessions.get(msg.id) === session && session.sessionOriginId === identity.sessionOriginId &&
+      (ws._clayUser && ws._clayUser.id || null) === userId &&
+      (session.ownerId || null) === identity.ownerId &&
+      (session.runtimeMode || session.mode || 'gui') === 'gui' && !session.tuiSuspended &&
+      (provenance.isWorker(session) ? 'worker' : 'driver') === identity.role &&
+      (provenance.isWorker(session) ? session.sessionProvenance.generation : null) === identity.workerGeneration &&
+      groupStamp() === identity.groupStamp &&
+      (!worker || parentSession && ctx.sm.sessions.get(parentSession.localId) === parentSession &&
+        session.sessionProvenance.parentSessionOriginId === identity.parentSessionOriginId && parentSession.sessionOriginId === identity.parentSessionOriginId &&
+        !provenance.isWorker(parentSession) && (parentSession.ownerId || null) === identity.ownerId) &&
+      allowed();
+  }
+  function send(message) {
+    if (current() && ws._clayActiveSession === session.localId) ctx.sendTo(ws, Object.assign({}, message, { paneActivation: identity }));
+  }
+  var historyItems = [], historyText = 0;
+  // Only synchronous replay uses this bounded envelope. Each actual disclosure
+  // rechecks live authorization; nothing is cached across a send or async work.
+  send.history = function (message) {
+    if (message.type === 'history_done') {
+      flushHistory();
+      send(message);
+      return;
+    }
+    historyItems.push(message);
+    historyText += typeof message.text === 'string' ? message.text.length : 0;
+    if (historyItems.length >= 100 || historyText >= 65536) flushHistory();
+  };
+  function flushHistory() {
+    if (!historyItems.length) return;
+    var items = historyItems;
+    historyItems = []; historyText = 0;
+    send({ type: 'pane_history_batch', items: items });
+  }
+  if (current()) ctx.sendTo(ws, { type: 'pane_activation_started', paneActivation: identity });
+  ws._clayPaneActivationValid = function () { return current() && ws._clayActiveSession === identity.sessionId; };
+  return {
+    validate: function () {
+      if (current()) return true;
+      ctx.sendTo(ws, { type: 'pane_activation_rejected', requestId: identity.requestId });
+      ws._clayPaneActivation = null;
+      return false;
+    },
+    send: send,
+    finish: function () {
+      // Includes history listeners, status, permissions and context sources.
+      // Consumers still need to observe their own DOM/composer readiness.
+      if (ws._clayActiveSession === session.localId) send({ type: 'pane_activation_snapshot_done' });
+    },
+  };
+}
+
+module.exports = { begin: begin };

package/lib/pane-session-transport.js

@@ -0,0 +1,26 @@
+var AsyncLocalStorage = require('node:async_hooks').AsyncLocalStorage;
+var requests = new AsyncLocalStorage();
+
+function same(a, b) {
+  return !!a && !!b && ['requestId', 'generation', 'projectSlug', 'viewerId', 'ownerId', 'sessionId', 'sessionOriginId', 'role', 'workerGeneration', 'groupStamp', 'parentSessionOriginId'].every(function (key) { return a[key] === b[key]; });
+}
+function run(ws, msg, dispatch) {
+  var binding = ws._clayPaneActivation;
+  if (!binding && msg.paneBinding || binding && msg.type === 'switch_session' && !msg.paneActivation) return;
+  if (binding && ['switch_session', 'ping', 'pong', 'clay_ui_ready'].indexOf(msg.type) < 0) {
+    if (!same(binding, msg.paneBinding) || !ws._clayPaneActivationValid || !ws._clayPaneActivationValid()) return;
+  }
+  return requests.run({ ws: ws, binding: binding || null }, function () { return dispatch(ws, msg); });
+}
+// A direct asynchronous reply retains the request's original binding. Live
+// provider events instead supply their authoritative source session explicitly.
+function outbound(ws, message, sessionId) {
+  if (!message || message.paneActivation || /^pane_activation_/.test(message.type)) return message;
+  var scope = requests.getStore();
+  var binding = sessionId === undefined ? scope && scope.ws === ws && scope.binding : ws._clayPaneActivation;
+  if (!binding) return message;
+  if (sessionId !== undefined && binding.sessionId !== sessionId) return null;
+  if (!same(binding, ws._clayPaneActivation) || !ws._clayPaneActivationValid || !ws._clayPaneActivationValid()) return null;
+  return Object.assign({}, message, { paneActivation: binding });
+}
+module.exports = { run: run, outbound: outbound, same: same };

package/lib/project-sessions.js

@@ -804,6 +804,8 @@ function attachSessions(ctx) {
     // adoptOrphanedCliSessions). Click a session in the sidebar instead.
 
     if (msg.type === "switch_session") {
+      var paneActivation = require('./pane-session-activation').begin(ctx, ws, msg);
+      if (paneActivation === false) return true;
       if (msg.id && sm.sessions.has(msg.id)) {
         // resolveSessionForView sets runtimeMode / runtimeTerminalId /
         // tuiSuspended (and hydrates the transcript) before sm.switchSession
@@ -817,6 +819,7 @@ function attachSessions(ctx) {
           resolveSessionForView(xmTarget, ws);
         }
         var switchTargetSess = sm.sessions.get(msg.id);
+        if (paneActivation && !paneActivation.validate()) return true;
         var switchTargetVendor = switchTargetSess && (switchTargetSess.vendor || sm.defaultVendor || "claude");
         if (switchTargetSess && !switchTargetSess.effort) {
           switchTargetSess.effort = yoke.clampEffort(
@@ -829,20 +832,20 @@ function attachSessions(ctx) {
         if (usersModule.isMultiUser() && ws._clayUser) {
           var switchTarget = sm.sessions.get(msg.id);
           if (!usersModule.canAccessSession(ws._clayUser.id, switchTarget, { visibility: "public" })) return true;
-          ws._clayActiveSession = msg.id;
-          sm.switchSession(msg.id, ws, hydrateImageRefs);
+          sm.switchSession(msg.id, ws, hydrateImageRefs, paneActivation && paneActivation.send, paneActivation && paneActivation.validate);
           if (!ws._clayPane) broadcastPresence();
         } else {
-          ws._clayActiveSession = msg.id;
-          sm.switchSession(msg.id, ws, hydrateImageRefs);
+          sm.switchSession(msg.id, ws, hydrateImageRefs, paneActivation && paneActivation.send, paneActivation && paneActivation.validate);
         }
         // Send per-session context sources
         if (typeof loadContextSources === "function") {
           var switchedSources = loadContextSources(slug, msg.id);
-          sendTo(ws, { type: "context_sources_state", active: switchedSources });
+          if (paneActivation) paneActivation.send({ type: "context_sources_state", active: switchedSources });
+          else sendTo(ws, { type: "context_sources_state", active: switchedSources });
         }
         var swPresKey = ws._clayUser ? ws._clayUser.id : "_default";
         if (!ws._clayPane) userPresence.setPresence(slug, swPresKey, userPresence.sessionIdForPersistence(switchTargetSess), null);
+        if (paneActivation) paneActivation.finish();
       }
       return true;
     }
@@ -1084,6 +1087,12 @@ function attachSessions(ctx) {
 
     if (msg.type === "stop") {
       var session = getSessionForWs(ws);
+      if (msg.sessionId != null || msg.sessionOriginId != null) {
+        session = sm.sessions.get(msg.sessionId);
+        if (!session || session.sessionOriginId !== msg.sessionOriginId ||
+            !usersModule.isMultiUser() && session.ownerId ||
+            usersModule.isMultiUser() && (!ws._clayUser || !usersModule.canAccessSession(ws._clayUser.id, session, getProjectAccess()))) return true;
+      }
       stopSession(session, ws && ws._clayUser);
       return true;
     }
@@ -1465,6 +1474,7 @@ function attachSessions(ctx) {
       var sessionId = sm.permissionRequestIndex[requestId];
       var session = sessionId ? sm.sessions.get(sessionId) : getSessionForWs(ws);
       if (!session) return true;
+      if (ws._clayPaneActivation && session.localId !== ws._clayPaneActivation.sessionId) return true;
       var pending = session.pendingPermissions[requestId];
       if (!pending) return true;
       delete sm.permissionRequestIndex[requestId];

package/lib/project.js

@@ -459,7 +459,8 @@ function createProjectContext(opts) {
       if (obj.type === "loop_registry_updated") payload.records = getHubSchedules(userId);
       else payload.schedules = getHubSchedules(userId);
     }
-    ws.send(JSON.stringify(payload));
+    payload = require('./pane-session-transport').outbound(ws, payload);
+    if (payload) ws.send(JSON.stringify(payload));
   }
 
   function sendToAdmins(obj) {
@@ -555,7 +556,8 @@ function createProjectContext(opts) {
     var data = JSON.stringify(obj), delivered = 0;
     for (var ws of clients) {
       if (ws.readyState === 1 && canReceiveMate(ws) && canReceiveYou(ws, sessionId) && ws._clayActiveSession === sessionId) {
-        ws.send(data); delivered++; if (onSent) onSent(ws);
+        var panePayload = require('./pane-session-transport').outbound(ws, obj, sessionId);
+        if (panePayload) { ws.send(JSON.stringify(panePayload)); delivered++; if (onSent) onSent(ws); }
       }
     }
     homeDebateClients.forEach(function (ws) {
@@ -569,7 +571,8 @@ function createProjectContext(opts) {
     var data = JSON.stringify(obj);
     for (var ws of clients) {
       if (ws !== sender && ws.readyState === 1 && canReceiveMate(ws) && canReceiveYou(ws, sessionId) && ws._clayActiveSession === sessionId) {
-        ws.send(data);
+        var panePayload = require('./pane-session-transport').outbound(ws, obj, sessionId);
+        if (panePayload) ws.send(JSON.stringify(panePayload));
       }
     }
   }
@@ -1827,6 +1830,10 @@ function createProjectContext(opts) {
   }
 
   function handleMessage(ws, msg) {
+    return require('./pane-session-transport').run(ws, msg, dispatchMessage);
+  }
+
+  function dispatchMessage(ws, msg) {
     if (!_requestAccess.permitMessage(ws, msg)) return;
     // --- Keep-alive (delegated to project-connection.js) ---
     // Answered before any routing so a ping can never be forwarded elsewhere.
@@ -2147,6 +2154,7 @@ function createProjectContext(opts) {
   });
   sm.setSessionHydrator(_sessionSkillCatalog.hydrate);
   var _sessions = attachSessions({
+    splitStore: _splitGroups.store,
     adapters: adapters,
     isPendingQueuePaused: function (session) { return _pendingMessageQueue.isPaused(session); },
     cwd: cwd,

package/lib/public/app.js

@@ -35,6 +35,7 @@ import { initQrCode, triggerShare } from './modules/qrcode.js';
 import { initFileBrowser, loadRootDirectory, reopenFileViewer, refreshTree, handleFsList, handleFsRead, handleDirChanged, refreshIfOpen, handleFileChanged, handleFileHistory, handleGitDiff, handleFileAt, getPendingNavigate, closeFileViewer, resetFileBrowser } from './modules/filebrowser.js';
 import { initGitPanel } from './modules/git-panel.js';
 import { initWorkerPaneLock } from './modules/worker-pane-lock.js';
+import { initPaneActivation } from './modules/pane-activation.js';
 import { initAutonomousRun } from './modules/autonomous-run.js';
 import { initLoopInterview } from './modules/loop-interview.js';
 import { initTerminal, openTerminal, closeTerminal, resetTerminals, handleTermList, handleTermCreated, handleTermOutput, handleTermResized, handleTermExited, handleTermClosed, sendTerminalCommand } from './modules/terminal.js';
@@ -295,6 +296,16 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     paneMode: paneMode,
     paneSessionId: paneSessionId,
     panePinPending: paneMode && !!paneSessionId,
+    paneCommittedBinding: null, panePendingBinding: null, paneReady: false, paneSuspended: false,
+    paneActivationGeneration: 0, paneActivationTimer: null, panePointerBinding: null, paneRichDrafts: {},
+    sessionRichDrafts: {},
+    sessionActionEpoch: 0, composerUploadingCount: 0, deferredSessionSwitch: null,
+    paneCallbackBinding: null, paneActionEvents: [], paneHeldKeys: {}, rewindAction: null, handoffAction: null,
+    authIdentityLoaded: false,
+    splitIdentityBlockedSocket: null,
+    splitIdentityHydrated: false,
+    paneActivationUnsupported: false,
+    paneBindingSessions: [],
     splitPanes: null,
     splitGroups: [],
     sessionFolders: null,
@@ -320,6 +331,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     replayingHistory: false,
     historyReplayBatch: null,
     pendingSessionEntryNavigation: null,
+    sessionEntryHighlight: null,
     sessionNavigationRequestId: null,
     projectName: projectName,
     cwd: "",
@@ -1169,6 +1181,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
       if (document.body) document.body.classList.add('is-multi-user');
     }
     if (d.user && d.user.id) { store.set({ myUserId: d.user.id }); requestDefaultVendor(); }
+    store.set({ authIdentityLoaded: true });
     store.set({ permissions: d.permissions || null, projectsAccessLoaded: true });
     if (d.mustChangePin) showForceChangePinOverlay();
     // Single-user mode: clear user strip skeletons immediately (no presence message will arrive)
@@ -1266,6 +1279,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   initSharedBrowser();
   initStudioBridge();
   initWorkerPaneLock();
+  initPaneActivation();
 
   // --- Terminal ---
   initTerminal({

package/lib/public/css/contextual-clay.css

@@ -50,7 +50,7 @@ html.contextual-pane-boot #connect-overlay { display: none !important; }
 #contextual-clay [data-conversation-notice]:not([hidden]) { display: flex; align-items: center; gap: 8px; flex-shrink: 0; padding: 6px 12px; border-bottom: 1px solid var(--border-subtle); font-size: 12px; color: var(--text-secondary); }
 #contextual-clay [data-conversation-notice] span { flex: 1; }
 #contextual-clay [data-conversation-notice] button { color: var(--accent); white-space: nowrap; }
-#contextual-clay [data-clay-expand] span, #contextual-clay [data-mate-new] span { display: none; }
+#contextual-clay [data-clay-expand] span { display: none; }
 @media (pointer: coarse) { #contextual-clay [data-mate-history] summary, #contextual-clay [data-mate-session-list] button { min-width: 44px; min-height: 44px; } }
 @starting-style {
   #contextual-clay[data-mode="popover"]:not([hidden]) { opacity: 0; transform: translateX(-4px); }

package/lib/public/css/input.css

@@ -1754,3 +1754,9 @@ body:not(.worker-pane-locked) #input-bottom-right:has(#send-btn.stop:not(:disabl
   margin: 8px auto 0;
 }
 #input-area > #generation-stop.hidden { display: none; }
+
+.session-switch-wait {
+  padding: 6px 8px;
+  font-size: 12px;
+  color: var(--text-secondary);
+}

package/lib/public/css/sticky-notes.css

@@ -927,15 +927,41 @@
   .sticky-note:not(.sticky-note-flight-away) { transition-duration: 0ms; }
 }
 
-/* Checklist inputs retain the card's compact reading rhythm. */
-.sn-task-form { display: grid; gap: 6px; }
-.sn-task-row { display: flex; align-items: center; gap: 6px; }
-.sn-task-form input { min-width: 0; width: 100%; box-sizing: border-box; border: 1px solid transparent; border-radius: 4px; background: transparent; color: inherit; font: inherit; padding: 3px 4px; }
-.sn-task-form input:hover, .sn-task-form input:focus { border-color: color-mix(in srgb, var(--note-ink) 25%, transparent); }
-.sn-task-title { font-weight: 600 !important; }
-.sn-task-form button { color: inherit; background: transparent; border: 0; font: inherit; cursor: pointer; }
-.sn-task-form .sn-check { flex-shrink: 0; }
-.sn-task-form .sn-task-save { justify-self: start; padding: 4px 8px; border: 1px solid color-mix(in srgb, var(--note-ink) 25%, transparent); border-radius: 4px; }
-.sn-task-form button:focus-visible, .sn-task-form input:focus-visible { outline: 2px solid var(--accent); outline-offset: 1px; }
+/* Checklist writing stays on the stationery surface. */
+.sn-task-form { display: flex; flex-direction: column; gap: 2px; min-height: 100%; box-sizing: border-box; padding: 2px 2px 0; }
+.sn-task-form textarea { display: block; min-width: 0; width: 100%; box-sizing: border-box; border: 1px solid transparent; border-radius: 4px; background: transparent; color: inherit; font: inherit; line-height: 1.5; padding: 4px; margin: 0; resize: none; field-sizing: content; overflow: hidden; overflow-wrap: anywhere; }
+.sn-task-form textarea:hover { background: color-mix(in srgb, var(--note-ink) 4%, transparent); }
+.sn-task-form textarea:focus { background: color-mix(in srgb, var(--note-ink) 5%, transparent); }
+.sn-task-form textarea::placeholder { color: inherit; opacity: .58; }
+.sn-task-form .sn-task-title { font-size: 16px; font-weight: 650; line-height: 1.35; letter-spacing: -.02em; padding: 2px 4px; }
+.sn-task-summary { font-size: 11px; opacity: .65; padding: 0 4px 8px; }
+.sn-task-row { display: grid; grid-template-columns: 26px minmax(0, 1fr) 26px; align-items: start; gap: 1px; }
+.sn-task-form button { color: inherit; background: transparent; border: 0; font: inherit; cursor: pointer; border-radius: 4px; }
+.sn-task-form .sn-check { width: 26px; height: 29px; margin: 0; padding: 0; opacity: 1; transform: none; display: grid; place-items: center; }
+.sn-task-box { display: grid; place-items: center; width: 15px; height: 15px; box-sizing: border-box; border: 1.25px solid color-mix(in srgb, var(--note-ink) 55%, transparent); border-radius: 4px; }
+.sn-task-box svg { width: 13px; height: 13px; visibility: hidden; }
+.sn-task-form .checked .sn-task-box { background: var(--note-ink); border-color: var(--note-ink); color: var(--note-surface); }
+.sn-task-form .checked .sn-task-box svg { visibility: visible; }
+.sn-task-row.is-complete textarea:not(:focus) { text-decoration: line-through; text-decoration-color: color-mix(in srgb, var(--note-ink) 45%, transparent); color: color-mix(in srgb, var(--note-ink) 68%, transparent); }
+.sn-task-remove { width: 26px; height: 29px; padding: 0; display: grid; place-items: center; opacity: 0; }
+.sn-task-remove .lucide, .sn-task-plus .lucide { width: 14px; height: 14px; }
+.sn-task-row:hover .sn-task-remove, .sn-task-row:focus-within .sn-task-remove { opacity: .65; }
+.sn-task-form button:hover { background: color-mix(in srgb, var(--note-ink) 8%, transparent); }
+.sn-task-form button:active:not(:disabled) { transform: translateY(1px); }
+.sn-task-add { display: grid; grid-template-columns: 26px minmax(0, 1fr); align-items: start; gap: 1px; margin-top: 4px; }
+.sn-task-plus { display: grid; place-items: center; height: 29px; opacity: .55; }
+.sn-task-footer { display: flex; align-items: center; flex-wrap: wrap; justify-content: space-between; gap: 4px 8px; margin-top: auto; padding: 10px 4px 2px; }
+.sn-task-feedback { flex: 1 1 100px; font-size: 11px; line-height: 1.4; opacity: .75; overflow-wrap: anywhere; }
+.sn-task-form .sn-task-save { font-size: 11px; font-weight: 550; min-height: 28px; padding: 3px 8px; border: 1px solid color-mix(in srgb, var(--note-ink) 20%, transparent); }
+.sn-task-form button:disabled { cursor: default; opacity: .45; }
+.sn-task-form button:focus-visible, .sn-task-form textarea:focus-visible { outline: 2px solid var(--note-ink); outline-offset: -1px; }
 .sticky-note-header .sticky-note-md-btn[hidden] { display: none !important; }
-.sn-task-remove .lucide { width: 13px; height: 13px; }
+@media (hover: none), (pointer: coarse) {
+  .sn-task-row { grid-template-columns: 36px minmax(0, 1fr) 36px; }
+  .sn-task-form .sn-check, .sn-task-remove { width: 36px; height: 36px; }
+  .sn-task-remove { opacity: .6; }
+  .sn-task-add { grid-template-columns: 36px minmax(0, 1fr); }
+  .sn-task-plus { height: 36px; }
+  .sn-task-form textarea { padding-top: 7px; padding-bottom: 7px; }
+  .sn-task-form .sn-task-save { min-height: 36px; }
+}

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

@@ -26,6 +26,7 @@ import { clearMcpPermissionModePending } from './mcp-ui.js';
 import { createWebSocketLifecycle } from './websocket-lifecycle.js';
 import { createWebSocketWatchdog } from './websocket-watchdog.js';
 import { resetHistoryReplayBatch } from './history-replay-batch.js';
+import { paneOutgoing } from './pane-activation.js';
 
 var connectOverlay = null;
 var hasConnectedOnce = false;
@@ -371,6 +372,8 @@ export function connect() {
     var currentWs = getWs();
     var _origSend = currentWs.send.bind(currentWs);
     currentWs.send = function (data) {
+      data = paneOutgoing(data);
+      if (data === null) return false;
       blinkIO();
       return _origSend(data);
     };

package/lib/public/modules/app-message-router.js

@@ -17,6 +17,8 @@ import { handleDefaultAiMessage } from './default-ai.js';
 import { handleCursorSharingMessage } from './cursor-sharing-preference.js';
 import { handlePendingMessageQueueMessage } from './pending-message-queue.js';
 import { receiveHistoryReplay } from './history-replay-batch.js';
+import { filterPaneActivation } from './pane-activation.js';
+import { deferSessionSwitch } from './session-switch-defer.js';
 import { handleProjectMateCreationMessage } from './project-mate-creation-workspace.js';
 import { handleProjectDebatePlanningMessage } from './project-debate-planning-workspace.js';
 
@@ -94,6 +96,17 @@ export function handleHomeProtocolMessage(msg) {
 }
 
 export function processMessage(msg) {
+  if (filterPaneActivation(msg)) return;
+  if (deferSessionSwitch(msg)) return;
+  if (msg.type === 'pane_history_batch') {
+    if (!msg.paneActivation || !Array.isArray(msg.items) || msg.items.length > 100) return;
+    msg.items.forEach(function (item) {
+      // Every original event keeps its order/index and goes through the same
+      // stale-binding filter and replay handler as an individual socket event.
+      if (item && item.type !== 'pane_history_batch') processMessage(Object.assign({}, item, { paneActivation: msg.paneActivation }));
+    });
+    return;
+  }
   receiveHistoryReplay(msg, dispatchMessage);
 }
 

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

@@ -1,4 +1,7 @@
 import { handleStudioDocumentMessage } from './clay-studio-document.js';
+import { saveSessionRichDraft, restoreSessionRichDraft } from './session-rich-drafts.js';
+import { refreshPaneActivation, primePaneSession } from './pane-activation.js';
+import { paneCallbackCurrent } from './pane-binding.js';
 import { handleClayControlActivity } from './clay-control-activity.js';
 import { handleContextualWorkspaceMessage } from './contextual-clay-workspace.js';
 import { handleContextualSessionMessage } from './contextual-clay-session.js';
@@ -268,6 +271,7 @@ export function processMessage(msg) {
         break;
 
       case "history_done":
+        var historyPaintEpoch = store.get('sessionActionEpoch') || 0;
         if (messagesEl && msg.sessionId === store.get("activeSessionId") && msg.sessionOriginId === store.get("sessionOriginId")) { messagesEl.dataset.controlSessionId = String(msg.sessionId); messagesEl.dataset.controlSessionOrigin = msg.sessionOriginId; messagesEl.dataset.controlHistoryRevision = msg.controlHistoryRevision || ""; }
         store.set({ replayingHistory: false });
         resumeThinkingAfterReplay(store.get('sessionIsProcessing'));
@@ -350,6 +354,7 @@ export function processMessage(msg) {
         // Scroll to tool element if navigating from file edit history
         if (hasNavTarget) {
           requestAnimationFrame(function() {
+            if (historyPaintEpoch !== (store.get('sessionActionEpoch') || 0) || !paneCallbackCurrent(msg.paneActivation)) return;
             // Prefer scrolling to the exact tool element
             var target = nav.toolId ? messagesEl.querySelector('[data-tool-id="' + nav.toolId + '"]') : null;
             if (!target && nav.assistantUuid) {
@@ -365,7 +370,7 @@ export function processMessage(msg) {
             }
           });
         }
-        requestAnimationFrame(function () { handlePaletteHistoryDone(); });
+        requestAnimationFrame(function () { if (historyPaintEpoch === (store.get('sessionActionEpoch') || 0) && paneCallbackCurrent(msg.paneActivation)) handlePaletteHistoryDone(); });
         break;
 
       case "restore_mate_dm":
@@ -777,9 +782,11 @@ export function processMessage(msg) {
         markProjectSessionListHydrated();
         renderMateSessionList(msg.sessions || []);
         renderSessionList(msg.sessions || []);
+        store.set({ paneBindingSessions: msg.sessions || [] });
+        refreshPaneActivation();
         syncGithubSessions(msg.sessions || []);
         syncPaneTitles();
-        var panePin = resolvePaneSession(store.get('paneMode'), store.get('panePinPending'), store.get('paneSessionId'), msg.sessions);
+        var panePin = resolvePaneSession(store.get('paneMode') && !primePaneSession(), store.get('panePinPending'), store.get('paneSessionId'), msg.sessions);
         if (panePin.consumed) {
           store.set({ panePinPending: false });
           if (panePin.sessionId && getWs() && getWs().readyState === 1) {
@@ -906,6 +913,8 @@ export function processMessage(msg) {
         break;
 
       case "session_switched":
+        saveSessionRichDraft();
+        store.set({ sessionActionEpoch: (store.get('sessionActionEpoch') || 0) + 1 });
         clearPairResultStatus();
         resetStreamBuffer();
         syncAutonomousRunForSession(msg.autonomousRun || null);
@@ -923,7 +932,7 @@ export function processMessage(msg) {
           ? msg.runtimeTerminalId
           : (typeof msg.terminalId === "number" ? msg.terminalId : null);
         var _sessionRole = msg.sessionRole === "worker" ? "worker" : "driver";
-        store.set({ activeSessionId: msg.id, sessionOriginId: msg.sessionOriginId || null, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || "", currentEffort: msg.effort || store.get('currentEffort'), vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, turnActivity: null, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || store.get('currentMode'), effectivePermissionMode: msg.effectivePermissionMode || null, permissionCapabilities: msg.permissionCapabilities || { auto: false, mcpOverride: false }, mcpPermissionModeOverrides: msg.mcpPermissionModeOverrides || {}, activeSessionMateId: _sessionRole === "worker" ? null : (store.get('activeProjectMateId') || null), activeSessionMateName: _sessionRole === "worker" ? "" : (store.get('activeProjectMateName') || "") });
+        store.set({ activeSessionId: msg.id, sessionOriginId: msg.sessionOriginId || null, cliSessionId: msg.cliSessionId || null, currentModel: msg.model || "", currentEffort: msg.effort || '', vendorCapabilities: msg.capabilities || {}, sessionIsProcessing: !!msg.isProcessing, turnActivity: null, activeSessionMode: _effectiveMode, activeTerminalId: _effectiveTerminalId, sessionHasHistory: !!msg.hasHistory, sessionVendorBound: !!msg.vendor || !!msg.hasHistory, sessionFullAccess: msg.permissionMode === "bypassPermissions", currentMode: msg.permissionMode || 'default', effectivePermissionMode: msg.effectivePermissionMode || null, permissionCapabilities: msg.permissionCapabilities || { auto: false, mcpOverride: false }, mcpPermissionModeOverrides: msg.mcpPermissionModeOverrides || {}, activeSessionMateId: _sessionRole === "worker" ? null : (store.get('activeProjectMateId') || null), activeSessionMateName: _sessionRole === "worker" ? "" : (store.get('activeProjectMateName') || "") });
         handleScheduledTaskSessionSwitched(msg);
         requestLoopInterviewState();
         activateDeliverySession(msg.id, msg.cliSessionId || null, msg.sessionOriginId || null);
@@ -998,14 +1007,19 @@ export function processMessage(msg) {
         // Restore draft for incoming session
         var draft = store.get('sessionDrafts')[store.get('activeSessionId')] || "";
         inputEl.value = draft;
+        restoreSessionRichDraft();
         autoResize();
         if (!("ontouchstart" in window)) {
           inputEl.focus();
         }
         // Reload survival: a restored active session that is a split-group
         // member reopens its group (no-op when a split is already open).
-        finishProjectSessionActivation();
-        maybeRestoreSplitGroup();
+        var deferredSwitch = store.get('deferredSessionSwitch');
+        if (!deferredSwitch || !deferredSwitch.draining || deferredSwitch.finalSwitch === msg) {
+          finishProjectSessionActivation();
+          maybeRestoreSplitGroup();
+          handlePaletteSessionSwitch(true);
+        }
         break;
 
       case "session_full_access_changed":
@@ -1350,6 +1364,11 @@ export function processMessage(msg) {
         stopUrgentBlink();
         break;
 
+      case "ask_user_pending":
+        renderAskUserQuestion(msg.toolId, msg.input);
+        startUrgentBlink();
+        break;
+
       case "permission_request_pending":
         store.set({ turnActivity: null });
         setActivity(null);
@@ -1770,6 +1789,7 @@ export function processMessage(msg) {
           store.set({ pendingTermCommand: null });
           // Small delay to let terminal initialize
           setTimeout(function() {
+            if (!paneCallbackCurrent(msg.paneActivation)) return;
             sendTerminalCommand(cmd);
           }, 300);
         }

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

@@ -3,6 +3,8 @@
 
 import { refreshIcons, iconHtml } from './icons.js';
 import { getWs } from './ws-ref.js';
+import { store } from './store.js';
+import { sessionCallback } from './pane-binding.js';
 import { updateBrowserTabList } from './context-sources.js';
 import { setExtensionConnected } from './mcp-ui.js';
 import { initPasteModal } from './paste-modal.js';
@@ -270,7 +272,7 @@ export function showConfirm(text, onConfirm, okLabel, destructive, onCancel) {
   confirmCancelCallback = null;
   if (replaced) replaced();
   confirmText.textContent = text;
-  confirmCallback = onConfirm;
+  confirmCallback = store.get('paneCommittedBinding') ? sessionCallback(onConfirm) : onConfirm;
   confirmCancelCallback = onCancel || null;
   confirmOk.textContent = okLabel || "Delete";
   confirmOk.className = "confirm-btn " + (destructive === false ? "confirm-ok" : "confirm-delete");

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

@@ -1,4 +1,5 @@
 import { prepareContextualWorkspaceDeparture } from './contextual-clay-workspace.js';
+import { checkComposerDeparture, saveSessionRichDraft } from './session-rich-drafts.js';
 // app-projects.js - Project list, switching, add/remove project modals
 // Extracted from app.js (PR-29)
 
@@ -391,6 +392,10 @@ export function resetClientState() {
 
 export function switchProject(slug) {
   if (!slug) return;
+  if (slug !== store.get('currentSlug')) {
+    try { checkComposerDeparture(); saveSessionRichDraft(); }
+    catch (error) { showToast(error.message, 'warn'); return; }
+  }
   if (prepareContextualWorkspaceDeparture(slug) === false) return;
   var target = cachedProjects.find(function (project) { return project.slug === slug; });
   if (target && target.contentAccess === false && target.administrativeAccess === true) {

package/lib/public/modules/clay-owner-navigation.js

@@ -1,5 +1,4 @@
 import { observeNavigationRendering } from './clay-navigation-render.js';
-import { dismissContextualClay } from './contextual-clay.js';
 import { showClayNavigationActivity, clearClayControlActivity } from './clay-control-activity.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
@@ -23,8 +22,6 @@ export function handleOwnerNavigation(msg) {
   var status = 'refused';
   if (accepted && msg.target && typeof msg.target.projectSlug === 'string' && Number.isSafeInteger(msg.target.sessionId)) {
     try {
-      var contextual = store.get('contextualClay') || {};
-      if (msg.target.contextualSourceMateId && contextual.mateId === msg.target.contextualSourceMateId && contextual.mode === 'popover') dismissContextualClay(false);
       showClayNavigationActivity(msg.target, false); navigateToSession(msg.target, null, msg.target.entryIndex); status = 'accepted';
     } catch (error) { showClayNavigationActivity(msg.target, true); status = 'failed'; }
   }

package/lib/public/modules/clay-studio-render.js

@@ -1,5 +1,6 @@
 import { forwardDocumentSource } from './clay-studio-document.js';
 import { store } from './store.js';
+import { paneMessageBinding, livePaneBinding } from './pane-binding.js';
 import { getWs } from './ws-ref.js';
 import { contextualMateStamp } from './contextual-mate-identity.js';
 import { visibleTarget } from './clay-control-target-visibility.js';
@@ -34,7 +35,7 @@ export function forwardStudioPresentation(message, type) {
   if (Object.keys(receipts).length >= 100) return true;
   if (evidence) receipts[evidence.id] = { evidence: evidence, socket: getWs() };
   store.set({ clayStudioRelays: receipts });
-  window.parent.postMessage({ type: type, message: message, studioSource: frame.clayStudioSource.identity() }, location.origin);
+  window.parent.postMessage({ type: type, message: message, paneBinding: paneMessageBinding(), studioSource: frame.clayStudioSource.identity() }, location.origin);
   return true;
 }
 export function trustedStudioFrame(event, data) {
@@ -45,6 +46,7 @@ export function trustedStudioFrame(event, data) {
   if (!live || !live.connected || live.ownerId !== (store.get('myUserId') || null) || live.ownerId !== expected.ownerId || live.slug !== expected.slug || live.sessionId !== expected.sessionId || live.origin !== expected.origin || live.runtime !== expected.runtime) return null;
   if (new URL(frame.src, location.href).pathname !== '/p/' + encodeURIComponent(live.slug) + '/') return null;
   if (frame.classList.contains('split-pane-frame')) {
+    if (frame.clayPane && !livePaneBinding(frame, data)) return null;
     var split = store.get('splitPanes');
     if (!split || !split.panes.some(function (pane) { return pane.slug === live.slug && String(pane.sessionId) === String(live.sessionId); })) return null;
   } else {