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

package/lib/public/modules/tools.js

@@ -9,6 +9,7 @@ import { openFile } from './filebrowser.js';
 import { mateAvatarUrl } from './avatar.js';
 import { getChatLayout } from './theme.js';
 import { store } from './store.js';
+import { currentPaneReview } from './pane-binding.js';
 import { applyPermissionHints } from './permission-hints.js';
 import { VENDOR_NAMES } from './app-rendering.js';
 import { startThinkingSegment, appendThinkingText, stopThinkingSegment, resetThinkingTurn, clearThinkingState, saveThinkingState, restoreThinkingState, updateThinkingTokenEstimate } from './thinking-lifecycle.js';
@@ -394,12 +395,13 @@ export function renderAskUserQuestion(toolId, input) {
   skipBtn.className = "ask-user-skip";
   skipBtn.textContent = "Skip";
   skipBtn.addEventListener("click", function () {
+    if (!currentPaneReview(container)) return;
     if (container.classList.contains("answered")) return;
     container.classList.add("answered");
     markAskUserRequestAnswered(toolId);
     enableMainInput();
     if (ctx.ws && ctx.connected) {
-      ctx.ws.send(JSON.stringify({ type: "stop" }));
+      ctx.ws.send(JSON.stringify({ type: "stop", paneBinding: container.paneBinding || undefined }));
     }
   });
   actions.appendChild(skipBtn);
@@ -419,6 +421,7 @@ export function renderAskUserQuestion(toolId, input) {
     container.appendChild(mateContentWrap);
   }
 
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
   disableMainInput();
   ctx.setActivity(null);
@@ -436,6 +439,7 @@ export function enableMainInput() {
 }
 
 function submitAskUserAnswer(container, toolId, questions, answers, multiSelections) {
+  if (!currentPaneReview(container)) return;
   if (container.classList.contains("answered") || container.dataset.askUserSubmitted === "true") return;
 
   var result = {};
@@ -461,6 +465,7 @@ function submitAskUserAnswer(container, toolId, questions, answers, multiSelecti
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({
       type: "ask_user_response",
+      paneBinding: container.paneBinding || undefined,
       toolId: toolId,
       answers: result,
     }));
@@ -655,6 +660,7 @@ function renderFormalPermission(requestId, toolName, toolInput, decisionReason)
   container.appendChild(header);
   container.appendChild(body);
   container.appendChild(actions);
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
 
   pendingPermissions[requestId] = container;
@@ -762,6 +768,7 @@ function renderPlanPermission(requestId) {
   container.appendChild(body);
   container.appendChild(actions);
   container.appendChild(feedbackRow);
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
 
   pendingPermissions[requestId] = container;
@@ -769,10 +776,11 @@ function renderPlanPermission(requestId) {
   ctx.setActivity(null);
   maybeScrollToBottom();
   // Focus the feedback input after render
-  setTimeout(function () { feedbackInput.focus(); }, 50);
+  setTimeout(function () { if (currentPaneReview(container)) feedbackInput.focus(); }, 50);
 }
 
 function sendPlanResponse(container, requestId, decision, feedback) {
+  if (!currentPaneReview(container)) return;
   if (container.classList.contains("resolved")) return;
   container.classList.add("resolved");
   if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
@@ -800,6 +808,7 @@ function sendPlanResponse(container, requestId, decision, feedback) {
   if (ctx.ws && ctx.connected) {
     var payload = {
       type: "permission_response",
+      paneBinding: container.paneBinding || undefined,
       requestId: requestId,
       decision: decision,
     };
@@ -954,6 +963,7 @@ function renderConversationalPermission(requestId, toolName, toolInput, mateId,
 
   container.appendChild(content);
 
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
   pendingPermissions[requestId] = container;
   refreshIcons();
@@ -962,6 +972,7 @@ function renderConversationalPermission(requestId, toolName, toolInput, mateId,
 }
 
 function sendPermissionResponse(container, requestId, decision) {
+  if (!currentPaneReview(container)) return;
   if (container.classList.contains("resolved")) return;
   container.classList.add("resolved");
   if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
@@ -979,6 +990,7 @@ function sendPermissionResponse(container, requestId, decision) {
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({
       type: "permission_response",
+      paneBinding: container.paneBinding || undefined,
       requestId: requestId,
       decision: decision,
     }));
@@ -1053,6 +1065,7 @@ export function renderElicitationRequest(msg) {
   var container = buildElicitationCard(msg, function () {
     if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
   });
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
   pendingElicitations[msg.requestId] = container;
   refreshIcons();
@@ -1079,6 +1092,7 @@ export function markElicitationError(requestId, error, expired) {
 var pendingUserDialogs = {};
 
 function sendUserDialogResponse(container, requestId, behavior, result) {
+  if (!currentPaneReview(container)) return;
   if (container.classList.contains("resolved")) return;
   container.classList.add("resolved");
   if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
@@ -1094,6 +1108,7 @@ function sendUserDialogResponse(container, requestId, behavior, result) {
   if (ctx.ws && ctx.connected) {
     var msg = {
       type: "user_dialog_response",
+      paneBinding: container.paneBinding || undefined,
       requestId: requestId,
       behavior: isCancel ? "cancelled" : "completed",
     };
@@ -1185,6 +1200,7 @@ export function renderUserDialogRequest(msg) {
   container.appendChild(header);
   container.appendChild(body);
   container.appendChild(actions);
+  container.paneBinding = store.get("panePendingBinding") || store.get("paneCommittedBinding") || null;
   ctx.addToMessages(container);
 
   pendingUserDialogs[msg.requestId] = container;

package/lib/sessions.js

@@ -789,8 +789,9 @@ function createSessionManager(opts) {
     return 0;
   }
 
-  function replayHistory(session, fromIndex, targetWs, transform) {
-    var _send = (targetWs && sendTo) ? function (obj) { sendTo(targetWs, obj); } : send;
+  function replayHistory(session, fromIndex, targetWs, transform, snapshotSend) {
+    var _send = snapshotSend || ((targetWs && sendTo) ? function (obj) { sendTo(targetWs, obj); } : send);
+    var sendHistory = snapshotSend && snapshotSend.history || _send;
     var total = session.history.length;
     if (typeof fromIndex !== "number") {
       if (total <= INITIAL_HISTORY_SIZE) {
@@ -800,7 +801,7 @@ function createSessionManager(opts) {
       }
     }
 
-    _send({ type: "history_meta", total: total, from: fromIndex });
+    sendHistory({ type: "history_meta", total: total, from: fromIndex });
 
     for (var i = fromIndex; i < total; i++) {
       var _item = session.history[i];
@@ -812,7 +813,7 @@ function createSessionManager(opts) {
       var normalizedItem = require("./yoke/usage").clientEvent(_item, session.vendor || "claude");
       var replayItem = transform ? transform(normalizedItem) : normalizedItem;
       if (replayItem && typeof replayItem === "object") replayItem = Object.assign({}, replayItem, { _historyIndex: i });
-      _send(replayItem);
+      sendHistory(replayItem);
     }
 
     // Find the last result message in the full history for accurate context data
@@ -833,16 +834,17 @@ function createSessionManager(opts) {
       }
     }
 
-    _send({ type: "history_done", controlHistoryRevision: require("./clay-control-target-projection").digest(session.history || []), sessionId: session.localId, sessionOriginId: session.sessionOriginId || null, lastUsage: lastUsage, lastModelUsage: lastModelUsage, lastCost: lastCost, lastStreamInputTokens: lastStreamInputTokens, context: lastContext, contextUsage: require("./yoke/usage").context(session.lastContextUsage, session.vendor || "claude") });
+    sendHistory({ type: "history_done", controlHistoryRevision: require("./clay-control-target-projection").digest(session.history || []), sessionId: session.localId, sessionOriginId: session.sessionOriginId || null, lastUsage: lastUsage, lastModelUsage: lastModelUsage, lastCost: lastCost, lastStreamInputTokens: lastStreamInputTokens, context: lastContext, contextUsage: require("./yoke/usage").context(session.lastContextUsage, session.vendor || "claude") });
     for (var vi = 0; vi < sessionViewedListeners.length; vi++) {
       try { sessionViewedListeners[vi](session, targetWs, _send); } catch (e) {}
     }
   }
 
-  function switchSession(localId, targetWs, transform) {
+  function switchSession(localId, targetWs, transform, snapshotSend, snapshotGuard) {
     var session = sessions.get(localId);
     if (!session) return;
     if (typeof onSessionHydrate === "function") onSessionHydrate(session);
+    if (snapshotGuard && !snapshotGuard()) return;
 
     // Pane sockets (split-view iframes) pin their session via switch_session
     // but must not move the project-global active pointer: reloads and
@@ -863,7 +865,7 @@ function createSessionManager(opts) {
     singleUserUnread[localId] = 0;
 
     // In multi-user mode with a specific client, only send to that client
-    var _send = (targetWs && sendTo) ? function (obj) { sendTo(targetWs, obj); } : send;
+    var _send = snapshotSend || ((targetWs && sendTo) ? function (obj) { sendTo(targetWs, obj); } : send);
 
     var _capsByVendor = capabilitiesByVendor || {};
     var _sessionVendor = session.vendor || defaultVendor || "claude";
@@ -876,7 +878,7 @@ function createSessionManager(opts) {
       || [];
     _send({ type: "slash_commands", commands: _vendorCmds, vendor: _sessionVendor });
     broadcastSessionList();
-    replayHistory(session, undefined, targetWs, transform);
+    replayHistory(session, undefined, targetWs, transform, snapshotSend);
 
     if (session.isProcessing) {
       _send({ type: "status", status: "processing" });
@@ -894,10 +896,15 @@ function createSessionManager(opts) {
         toolInput: p.toolInput,
         toolUseId: p.toolUseId,
         decisionReason: p.decisionReason,
+        defaultToNo: p.defaultToNo,
+        suppressAlwaysAllowRule: p.suppressAlwaysAllowRule,
+        mateId: p.mateId || undefined,
+        vendor: p.vendor || session.vendor || undefined,
       });
     }
 
     // Re-send active mention indicator so returning clients restore the mate avatar state
+    if (snapshotSend) require('./pane-pending-interactions').send(session, _send);
     if (session._mentionInProgress && session._mentionActiveMateId) {
       _send({ type: "mention_processing", mateId: session._mentionActiveMateId, active: true });
     }

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "clay-server",
-  "version": "5.2.0-beta.8",
+  "version": "5.2.0-beta.9",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js"
   },
   "scripts": {
     "dev": "node bin/cli.js --dev",
-    "test": "node --test --test-force-exit test/*.test.js",
-    "semantic-release": "semantic-release"
+    "test": "node --test --test-force-exit --test-skip-pattern=\"^real sidebar (normal|long-turn):\" test/*.test.js",
+    "semantic-release": "semantic-release",
+    "test:pane-performance": "node --test --test-force-exit test/pane-reuse-browser.test.js"
   },
   "files": [
     "bin/",