clay-server 5.3.0-beta.3 → 5.3.0-beta.5

package/lib/ask-user-request-identity.js

@@ -1,3 +1,5 @@
+var normalizeQuestions = require('./yoke/user-input').normalizeQuestions;
+
 function canonicalize(value) {
   if (Array.isArray(value)) return value.map(canonicalize);
   if (!value || typeof value !== "object") return value;
@@ -7,9 +9,24 @@ function canonicalize(value) {
   return result;
 }
 
+// Compare SDK input with the canonical display payload without dropping custom
+// review fields or merging independently identified requests.
+function displayInput(input) {
+  input = input || {};
+  try {
+    var questions = normalizeQuestions(input);
+    return Object.assign({}, input, { questions: questions.map(function (question, index) {
+      var original = input.questions[index];
+      return Object.assign({}, original, question, { options: question.options.map(function (option, optionIndex) {
+        return Object.assign({}, original.options && original.options[optionIndex], option);
+      }) });
+    }) });
+  } catch (_error) { return input; }
+}
+
 function sameAskUserRequest(event, id, input) {
   return !!(event && event.type === "tool_executing" && event.name === "AskUserQuestion"
-    && event.id === id && JSON.stringify(canonicalize(event.input || {})) === JSON.stringify(canonicalize(input || {})));
+    && event.id === id && JSON.stringify(canonicalize(displayInput(event.input))) === JSON.stringify(canonicalize(displayInput(input))));
 }
 
 function hasRecordedAskUserRequest(history, id, input) {

package/lib/project-delegated-follow-up.js

@@ -1,25 +1,29 @@
+var isWorker = require("./session-provenance").isWorker;
+
 function hasEntries(value) {
   return !!(value && Object.keys(value).length > 0);
 }
 
-function unsafeReason(session, isPaired) {
+function unsafeReason(session, isPaired, options) {
+  var opts = options || {}, update = opts.assignmentUpdate === true;
   if (!session || session.hidden) return "Target session is unavailable.";
+  if (isWorker(session) || session.sessionRole === "worker") return "Project follow-ups must target the Driver, not a Worker.";
   if (!session.cliSessionId) return "Target session must have a durable session reference.";
   if (session.sessionVisibility !== "private") return "Target session must be private.";
-  if (session.isProcessing || session._queryStarting || session._awaitingTurnResult) return "Target session must be idle.";
+  if (!opts.allowBusy && (session.isProcessing || session._queryStarting || session._awaitingTurnResult)) return "Target session must be idle.";
   if (hasEntries(session.pendingPermissions) || hasEntries(session.pendingAskUser) || hasEntries(session.pendingElicitations) || hasEntries(session.pendingUserDialogs)) return "Target session is waiting for user input.";
   if ((session.mode && session.mode !== "gui") || (session.runtimeMode && session.runtimeMode !== "gui") || session.terminalId != null || session.runtimeTerminalId != null || session.tuiSuspended) return "Terminal sessions cannot receive project follow-ups.";
   if (session.homeDebatePlanning || session.homeDebatePhase || session.debateSetupMode || session.debateState || session._debate) return "Debate sessions cannot receive project follow-ups.";
-  if (session.loop || session.spawn || session.handoff || session.assignment || session.singleTurn || session._pairDelegation || isPaired) return "Orchestrated sessions cannot receive project follow-ups.";
+  if (session.loop || session.spawn || session.handoff || (!update && (session.assignment || session.singleTurn)) || session._pairDelegation || (isPaired && !(opts.allowBusy && !isWorker(session)))) return "Orchestrated sessions cannot receive project follow-ups.";
   if (session.dangerouslySkipPermissions || session.permissionMode === "bypassPermissions") return "Full-access sessions cannot receive project follow-ups.";
-  if (session.destroying || session.scheduledMessage || session.rateLimitAutoContinuePending || session.taskStopRequested || session._pendingMessageDrainPaused || session._runtimeRefreshRequested || session.pendingPush && session.pendingPush.length) return "Target session is not safely resumable right now.";
+  if (session.destroying || (session.abortController && session.abortController.signal.aborted) || session.scheduledMessage || session.rateLimitAutoContinuePending || session.taskStopRequested || session._lastTurnInterrupted || session._pendingMessageDrainPaused || session._runtimeRefreshRequested || session.pendingPush && session.pendingPush.length) return "Target session is not safely resumable right now.";
   return "";
 }
 
 function attachDelegatedFollowUp(ctx) {
   var sm = ctx.sm;
 
-  function inspect(principal, targetSessionRef) {
+  function inspect(principal, targetSessionRef, options) {
     if (!principal || typeof targetSessionRef !== "string" || targetSessionRef.indexOf("session:") !== 0) {
       throw new Error("A durable opaque targetSessionRef is required.");
     }
@@ -34,15 +38,20 @@ function attachDelegatedFollowUp(ctx) {
       throw new Error("Target session access denied.");
     }
     var paired = !!(ctx.isPairedSession && ctx.isPairedSession(session));
-    var reason = unsafeReason(session, paired);
+    var assignment = session.assignment, opts = options || {};
+    var assignmentUpdate = !!(assignment && opts.parentAssignmentId && assignment.assignmentId === opts.parentAssignmentId &&
+      assignment.sourceMateId === principal.sourceMateId && assignment.sourceProjectSlug === principal.sourceProjectSlug &&
+      assignment.sourceSessionRef === principal.sourceSessionRef);
+    var reason = unsafeReason(session, paired, { allowBusy: opts.allowBusy === true, assignmentUpdate: assignmentUpdate });
     if (reason) throw new Error(reason);
     if (ctx.isPendingQueuePaused && ctx.isPendingQueuePaused(session)) throw new Error("The Driver queue is stopped; explicit owner resume is required.");
     if (!ctx.canResumeVendor(session.vendor)) throw new Error("Target session provider cannot safely resume this conversation.");
-    return { session: session, sessionRef: targetSessionRef, title: session.title || "Existing session" };
+    return { session: session, sessionRef: targetSessionRef, title: session.title || "Existing session", linuxUser: ctx.getLinuxUserForSession(session) || null };
   }
 
   async function dispatch(principal, targetSessionRef, task, metadata, onReady) {
-    var resolved = inspect(principal, targetSessionRef);
+    var resolved = inspect(principal, targetSessionRef, { allowBusy: true, parentAssignmentId: metadata.parentAssignmentId });
+    if (resolved.session.isProcessing || resolved.session._queryStarting || resolved.session._awaitingTurnResult) throw new Error("Driver is still busy; the reviewed follow-up must remain queued.");
     var session = resolved.session;
     var sdk = ctx.getSdk();
     if (!sdk || typeof sdk.pushMessage !== "function" || typeof sdk.startQuery !== "function") {
@@ -64,7 +73,7 @@ function attachDelegatedFollowUp(ctx) {
     sm.broadcastSessionList();
     try {
       var delivered = sdk.pushMessage(session, task);
-      if (!delivered) await sdk.startQuery(session, task, undefined, ctx.getLinuxUserForSession(session));
+      if (!delivered && await sdk.startQuery(session, task, undefined, resolved.linuxUser) === false) throw new Error("Driver runtime did not accept the follow-up.");
     } catch (error) {
       session.isProcessing = false;
       sm.sendAndRecord(session, {

package/lib/public/css/right-workbench.css

@@ -49,15 +49,38 @@
     pointer-events: none;
     clip-path: inset(100%);
   }
-  #main-panels[data-workbench-mode="docked"] > :is(#file-viewer, #terminal-container, #project-logs-panel, #you-panel, #issues-panel, #linear-panel, #notes-browser, #scheduled-tasks-panel, #debates-workbench, #shared-browser-panel, #mcp-skills-workbench, #mate-knowledge-workbench, #wireframe-panel):not(.panel-fullscreen) {
+  #main-panels > :is(#file-viewer, #terminal-container, #project-logs-panel, #you-panel, #issues-panel, #linear-panel, #notes-browser, #scheduled-tasks-panel, #debates-workbench, #shared-browser-panel, #mcp-skills-workbench, #mate-knowledge-workbench, #wireframe-panel)[data-workbench-placement="docked"]:not(.panel-fullscreen) {
     position: relative;
     inset: auto;
-    margin: 8px 8px 8px 0;
-    box-shadow: 0 2px 5px rgba(var(--shadow-rgb), .08);
+    flex: 1 1 0;
+    width: 0;
+    min-width: 240px;
+    max-width: none;
+    height: 100%;
+    max-height: 100%;
+    align-self: stretch;
+    margin: 0;
+    z-index: 0;
+    border: 0;
+    border-left: 1px solid var(--border-subtle);
+    border-radius: 0;
+    background: var(--bg);
+    box-shadow: none;
     animation: none;
   }
 }
 
+@media (min-width: 1024px) {
+  #main-panels > :is(#file-viewer, #shared-browser-panel)[data-workbench-placement="docked"]:is(.file-viewer-wide, .shared-browser-wide):not(.panel-fullscreen) { flex-grow: 2; }
+  #main-panels > [data-workbench-placement="docked"] :is(.terminal-header, .file-viewer-tabbar, .shared-browser-viewport) {
+    background: var(--bg);
+  }
+  #main-panels > #terminal-container[data-workbench-placement="docked"] #terminal-body { background: var(--bg); }
+}
+@media (max-width: 1023px) {
+  #main-panels > [data-workbench-placement="docked"][data-workbench-active="false"] { display: none !important; }
+}
+
 #main-panels .workbench-layout-toggle {
   display: inline-flex;
   align-items: center;

package/lib/public/css/shared-browser.css

@@ -1,5 +1,26 @@
 @import url("./shared-browser-skins.css");
 
+#shared-browser-toggle-btn { position: relative; }
+.shared-browser-count {
+  position: absolute;
+  top: -4px;
+  right: -4px;
+  background: var(--brand-blue);
+  color: var(--brand-ink);
+  font-size: 9px;
+  font-weight: 700;
+  min-width: 14px;
+  height: 14px;
+  border-radius: 7px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 3px;
+  font-family: "Roboto Mono", monospace;
+  pointer-events: none;
+}
+.shared-browser-count.hidden { display: none; }
+
 /* Shared browser uses the existing mutually exclusive right workbench. */
 .shared-browser-panel { width: 50%; max-width: 780px; min-width: 360px; height: calc(100% - 16px); align-self: center; margin: 8px 8px 8px 10px; border: 1px solid var(--border); border-radius: 12px; background: var(--bg); display: flex; flex-direction: column; overflow: hidden; flex-shrink: 0; box-shadow: 4px 8px 18px rgba(var(--shadow-rgb), .14); }
 .shared-browser-panel.hidden, #shared-browser-btn.hidden, #shared-browser-toggle-btn.hidden { display: none; }

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

@@ -59,8 +59,8 @@
   position: absolute;
   top: -4px;
   right: -4px;
-  background: var(--accent);
-  color: #fff;
+  background: var(--brand-gold);
+  color: var(--brand-ink);
   font-size: 9px;
   font-weight: 700;
   min-width: 14px;
@@ -71,6 +71,7 @@
   justify-content: center;
   padding: 0 3px;
   font-family: "Roboto Mono", monospace;
+  pointer-events: none;
 }
 
 .sticky-notes-count.hidden { display: none; }

package/lib/public/index.html

@@ -78,9 +78,9 @@ body { background: transparent; color: inherit; }
       <div id="skip-perms-pill" class="top-bar-pill pill-error hidden"><i data-lucide="shield-off"></i> <span>Skip perms</span></div>
       <div id="client-count" class="top-bar-pill pill-accent hidden"><i data-lucide="users"></i> <span id="client-count-text"></span></div>
       <!-- Right workbench controls: same nodes and handlers as before; app JS returns them to the title bar on mobile. -->
-      <button type="button" id="shared-browser-toggle-btn" class="hidden" title="Browser" aria-label="Browser" aria-controls="shared-browser-panel" aria-expanded="false" disabled><i data-lucide="globe"></i></button>
+      <button type="button" id="shared-browser-toggle-btn" class="hidden" title="Browser" aria-label="Browser" aria-controls="shared-browser-panel" aria-expanded="false" disabled><i data-lucide="globe"></i><span class="shared-browser-count hidden" aria-hidden="true"></span></button>
       <button id="terminal-toggle-btn" title="Terminal"><i data-lucide="square-terminal"></i><span id="terminal-count" class="hidden"></span></button>
-      <button type="button" id="sticky-notes-toggle-btn" aria-label="Hide sticky notes" aria-pressed="false" title="Hide sticky notes" hidden><i data-lucide="sticky-note"></i></button>
+      <button type="button" id="sticky-notes-toggle-btn" aria-label="Hide sticky notes" aria-pressed="false" title="Hide sticky notes" hidden><i data-lucide="sticky-note"></i><span class="sticky-notes-count hidden" aria-hidden="true"></span></button>
       <button id="notif-center-btn" title="Notifications"><i data-lucide="bell"></i><span id="notif-center-badge" class="notif-badge hidden">0</span></button>
       <button id="server-settings-btn" title="Settings" aria-label="Settings" aria-expanded="false"><i data-lucide="settings"></i></button>
     </div>

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

@@ -83,6 +83,21 @@ function createHeaderWorkerHistoryControl(root, context) {
 }
 
 export function initHeader() {
+  store.subscribe(function (state, prev) {
+    if (!state.connected && prev.connected || state.panePendingBinding && state.panePendingBinding !== prev.panePendingBinding) {
+      store.set({ loadingMore: false });
+    }
+    if (state.paneReady && !prev.paneReady || !state.replayingHistory && prev.replayingHistory) {
+      // Replay can expose the sentinel before the pane accepts requests.
+      // Observe it again once the committed conversation is interactive.
+      var messages = getMessagesEl();
+      var sentinel = messages && messages.querySelector('.history-sentinel');
+      if (sentinel && historySentinelObserver) {
+        historySentinelObserver.unobserve(sentinel);
+        historySentinelObserver.observe(sentinel);
+      }
+    }
+  });
   var headerRenameBtn = document.getElementById("header-rename-btn");
   var headerTitleEl = document.getElementById("header-title");
   var headerInfoBtn = document.getElementById("header-info-btn");
@@ -339,12 +354,19 @@ export function updateHistorySentinel() {
 export function requestMoreHistory() {
   var ws = getWs();
   var s = store.snap();
-  if (s.loadingMore || s.historyFrom <= 0 || !ws || !s.connected) return;
+  if (s.loadingMore || s.historyFrom <= 0 || !ws || ws.readyState !== 1 || !s.connected ||
+      s.replayingHistory || s.historyReplayBatch || s.panePendingBinding || s.paneSuspended ||
+      s.paneCommittedBinding && !s.paneReady || s.deferredSessionSwitch) return;
   store.set({ loadingMore: true });
   var messagesEl = getMessagesEl();
   var btn = messagesEl.querySelector(".load-more-btn");
   if (btn) btn.classList.add("loading");
-  ws.send(JSON.stringify({ type: "load_more_history", before: s.historyFrom }));
+  try {
+    ws.send(JSON.stringify({ type: "load_more_history", before: s.historyFrom, paneBinding: s.paneCommittedBinding || undefined }));
+  } catch (error) {
+    store.set({ loadingMore: false });
+    if (btn) btn.classList.remove("loading");
+  }
 }
 
 export function prependOlderHistory(items, meta) {

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

@@ -267,7 +267,7 @@ export function processMessage(msg) {
         break;
 
       case "history_meta":
-        store.set({ historyFrom: msg.from, historyTotal: msg.total, replayingHistory: true });
+        store.set({ historyFrom: msg.from, historyTotal: msg.total, loadingMore: false, replayingHistory: true });
         updateHistorySentinel();
         break;
 

package/lib/public/modules/clay-session-links.js

@@ -1,7 +1,7 @@
 import { parseClaySessionReference, renderClaySessionLink } from './clay-log-links.js';
 
 // The prefix is a display compatibility label, never a navigation target.
-var citationPattern = /\[([A-Za-z0-9][A-Za-z0-9_-]{0,79})\/(session:[A-Za-z0-9_-]{24}(?:#entry-[0-9]+)?)(?:\s+[\u2014-]\s+([^\]\n]{1,80}))?\]/g;
+var citationPattern = /\[([A-Za-z0-9][A-Za-z0-9_-]{0,79})\/(session:[A-Za-z0-9_-]{24}(?:#entry-[0-9]+)?)(?:\s+[\u2014\u00b7-]\s+([^\]\n]{1,80}))?\]/g;
 function matches(text) {
   var pattern = new RegExp(citationPattern.source, 'g'), results = [], match;
   while ((match = pattern.exec(text))) if (parseClaySessionReference(match[2])) results.push({ start: match.index, end: pattern.lastIndex, prefix: match[1], ref: match[2], label: match[3] || '' });

package/lib/public/modules/filebrowser.js

@@ -4,7 +4,7 @@ import { iconHtml, refreshIcons } from './icons.js';
 import { escapeHtml, copyToClipboard } from './utils.js';
 import { renderMarkdown, highlightCodeBlocks, renderMermaidBlocks, exportMarkdownAsPdf } from './markdown.js';
 import { closeSidebar } from './sidebar.js';
-import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench, isRightWorkbenchCurrent } from './right-workbench.js';
+import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench, isRightWorkbenchCurrent, rightWorkbenchRevisionFor } from './right-workbench.js';
 import { renderUnifiedDiff, renderSplitDiff } from './diff.js';
 import { initFileIcons, getFileIconSvg, getFolderIconSvg } from './fileicons.js';
 import { copyMarkdownFormatting } from './rich-clipboard.js';
@@ -739,7 +739,7 @@ function requestFileContent(filePath) {
   if (refreshPresentedDocument(filePath)) return;
   var requestId = "file-read-" + Date.now() + "-" + Math.random().toString(36).slice(2);
   var state = store.snap();
-  store.set({ fileReadRequest: { requestId: requestId, path: filePath, projectSlug: state.currentSlug || null, sessionId: state.activeSessionId != null ? String(state.activeSessionId) : null, accountId: state.myUserId || null, workbenchRevision: store.get('rightWorkbenchRevision') || 0 } });
+  store.set({ fileReadRequest: { requestId: requestId, path: filePath, projectSlug: state.currentSlug || null, sessionId: state.activeSessionId != null ? String(state.activeSessionId) : null, accountId: state.myUserId || null, workbenchRevision: rightWorkbenchRevisionFor('file-viewer') } });
   var pending = store.get('pendingFileNavigation');
   if (pending && pending.path === filePath) store.set({ pendingFileNavigation: Object.assign({}, pending, { requestId: requestId }) });
   if (ctx.ws && ctx.connected) {

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

@@ -1,3 +1,4 @@
+import { paneHeaderRuntime, initPaneHeaderRuntime } from './pane-header-runtime.js';
 import { disarmStickyBottom } from './chat-render-runtime.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
@@ -204,10 +205,12 @@ export function initPaneActivation() {
       return binding && { ownerId: binding.viewerId, projectSlug: binding.projectSlug, sessionId: binding.sessionId,
         binding: binding, ready: store.get('connected') && store.get('paneReady') && !store.get('paneSuspended') };
     },
+    headerRuntime: paneHeaderRuntime,
     activate: activatePaneSession,
     checkDraft: function () { if (!store.get('panePendingBinding')) { var draft = takeComposerDraft(); restoreComposerDraft(draft); } },
     suspend: suspendPane,
   };
+  initPaneHeaderRuntime(frame);
   // 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);

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

@@ -9,14 +9,24 @@ export function forwardPaneBrowserLink(url) {
 }
 export function handlePaneBrowserMessage(event, host) {
   if (!event || event.origin !== window.location.origin || !host || !event.data || event.data.type !== 'clay-pane-open-browser') return false;
-  var msg = event.data, s = store.snap();
+  var msg = event.data, s = Object.assign({}, store.snap());
   var frame = Array.from(host.querySelectorAll('.split-pane-frame')).find(function (item) { return item.contentWindow === event.source; });
-  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 pane = frame && frame.clayPane ? { slug: frame.dataset.projectSlug, sessionId: frame.dataset.sessionId } : 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 (!s.connected || !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.clayPane ? !livePaneBinding(frame, msg) : frame.src !== expected) return true;
   // The authenticated host owns the browser; a live same-project pane supplies only a URL.
-  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'); });
+  var binding = frame.clayPane && frame.clayPane.identity().binding, document = frame.contentDocument;
+  function current() {
+    var now = store.snap();
+    if (!now.connected || now.currentSlug !== s.currentSlug || now.myUserId !== s.myUserId ||
+        now.currentProjectOwnerId !== s.currentProjectOwnerId || now.projectSplitViewSocketGeneration !== s.projectSplitViewSocketGeneration ||
+        frame.contentWindow !== event.source || frame.contentDocument !== document ||
+        frame.dataset.projectSlug !== msg.projectSlug || String(frame.dataset.sessionId) !== String(msg.sessionId) ||
+        !Array.from(host.querySelectorAll('.split-pane-frame')).includes(frame)) return false;
+    if (binding) return !!frame.clayPane && livePaneBinding(frame, msg) && frame.clayPane.identity().binding === binding;
+    return frame.src === expected && !!(now.splitPanes && now.splitPanes.panes.some(function (item) { return String(item.slug) === pane.slug && String(item.sessionId) === String(pane.sessionId); }));
+  }
+  import('./shared-browser.js').then(function (module) { if (current()) module.openSharedBrowserAt(msg.url); }).catch(function (error) { showToast(error.message || 'Could not open the browser.', 'warn'); });
   return true;
 }

package/lib/public/modules/pane-header-runtime.js

@@ -0,0 +1,18 @@
+import { store } from './store.js';
+
+// Read-only presentation metadata from this pane's committed authenticated view.
+export function paneHeaderRuntime() {
+  var state = store.snap(), binding = state.paneCommittedBinding;
+  if (!binding || !state.connected || !state.paneReady || state.paneSuspended || state.panePendingBinding ||
+      state.activeSessionId !== binding.sessionId || state.sessionOriginId !== binding.sessionOriginId ||
+      state.currentSlug !== binding.projectSlug || (state.myUserId || null) !== (binding.viewerId || null)) return null;
+  return { binding: binding, vendor: state.currentVendor, model: state.currentModel || '' };
+}
+
+export function initPaneHeaderRuntime(frame) {
+  store.subscribe(function (state, previous) {
+    if (state.currentModel === previous.currentModel && state.currentVendor === previous.currentVendor) return;
+    if (!paneHeaderRuntime() || frame.contentWindow !== window || frame.contentDocument !== document) return;
+    frame.dispatchEvent(new window.parent.CustomEvent('clay-pane-config'));
+  });
+}

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

@@ -1,4 +1,4 @@
-// Single arbitration point for the mutually exclusive right-side workbench.
+// Shared arbitration for docked background panes and one foreground overlay.
 
 import { store } from './store.js';
 import { iconHtml, refreshIcons } from './icons.js';
@@ -25,48 +25,76 @@ function ensureLayoutPreference() {
   });
 }
 
+function dockedOwners() { return store.get('rightWorkbenchDockedOwners') || []; }
+function openOwner(name) { return store.get('rightWorkbenchOwner') === name || dockedOwners().indexOf(name) !== -1; }
+export function rightWorkbenchRevisionFor(name) {
+  var revisions = store.get('rightWorkbenchPanelRevisions') || {};
+  return revisions[name] == null ? store.get('rightWorkbenchRevision') || 0 : revisions[name];
+}
+function publish(owner, docked, revisions) {
+  store.set({ rightWorkbenchOwner: owner, rightWorkbenchDockedOwners: docked,
+    rightWorkbenchPanelRevisions: revisions, rightWorkbenchRevision: (store.get('rightWorkbenchRevision') || 0) + 1 });
+}
+function setDocked(name, docked) {
+  if (!openOwner(name)) return;
+  var owners = dockedOwners().filter(function (item) { return item !== name; }), previous = store.get('rightWorkbenchOwner');
+  if (docked) owners.push(name);
+  publish(docked ? previous : name, owners, store.get('rightWorkbenchPanelRevisions') || {});
+  if (!docked && previous && previous !== name && owners.indexOf(previous) === -1 && closers[previous]) closers[previous]();
+}
 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 owners = dockedOwners(), state = store.get('workbenchLayoutPreference') || {};
+  main.dataset.workbenchMode = owners.length ? 'docked' : 'overlay';
+  main.dataset.workbenchDocks = String(owners.length);
+  Object.keys(panelIds).forEach(function (name) {
+    var panel = document.getElementById(panelIds[name]);
+    if (!panel) return;
+    var docked = owners.indexOf(name) !== -1;
+    panel.dataset.workbenchPlacement = docked ? 'docked' : 'overlay';
+    panel.dataset.workbenchActive = store.get('rightWorkbenchOwner') === name ? 'true' : 'false';
+    if (!openOwner(name)) 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'), revision = rightWorkbenchRevisionFor(name);
+        var wasDocked = dockedOwners().indexOf(name) !== -1;
+        function currentTarget() { return button.isConnected && openOwner(name) && owner === store.get('myUserId') && project === store.get('currentSlug') &&
+          revision === rightWorkbenchRevisionFor(name) && wasDocked === (dockedOwners().indexOf(name) !== -1); }
+        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(wasDocked ? 'overlay' : 'docked');
+        }).then(function (saved) {
+          if (!currentTarget()) return;
+          var fresh = store.get('workbenchLayoutPreference') || {};
+          if (saved === true && fresh.ready && fresh.mode === (wasDocked ? 'overlay' : 'docked')) setDocked(name, !wasDocked);
+          else if (saved === false) showToast(fresh.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');
+      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) {
@@ -76,37 +104,39 @@ 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);
-  var keys = Object.keys(closers);
-  for (var i = 0; i < keys.length; i++) {
-    if (keys[i] === name) continue;
-    try { closers[keys[i]](); } catch (error) { /* one panel must not block another */ }
-  }
+  var owner = store.get('rightWorkbenchOwner'), docked = dockedOwners().slice(), preference = store.get('workbenchLayoutPreference') || {};
+  if (!owner && !docked.length && preference.ready && preference.mode === 'docked') docked.push(name);
+  var retained = docked.indexOf(name) !== -1 && owner && docked.indexOf(owner) === -1 ? owner : name;
+  var revision = (store.get('rightWorkbenchRevision') || 0) + 1, revisions = Object.assign({}, store.get('rightWorkbenchPanelRevisions') || {});
+  Object.keys(revisions).forEach(function (key) { if (key !== retained && docked.indexOf(key) === -1) delete revisions[key]; });
+  revisions[name] = revision;
+  publish(retained, docked, revisions);
+  Object.keys(closers).forEach(function (key) {
+    if (key === name || key === retained || docked.indexOf(key) !== -1) return;
+    try { closers[key](); } catch (error) { /* one panel must not block another */ }
+  });
   if (typeof requestAnimationFrame === 'function') requestAnimationFrame(renderLayoutControls);
-  return nextRevision;
+  return revision;
 }
-
-function storeSet(name, value) {
-  store.set({ rightWorkbenchOwner: name, rightWorkbenchRevision: value });
-}
-
 export function releaseRightWorkbench(name) {
-  if (store.get("rightWorkbenchOwner") !== name) return;
-  storeSet(null, (store.get("rightWorkbenchRevision") || 0) + 1);
+  if (!openOwner(name)) return;
+  var docked = dockedOwners().filter(function (item) { return item !== name; }), revisions = Object.assign({}, store.get('rightWorkbenchPanelRevisions') || {});
+  delete revisions[name];
+  publish(store.get('rightWorkbenchOwner') === name ? docked[docked.length - 1] || null : store.get('rightWorkbenchOwner'), docked, revisions);
 }
-
 export function isRightWorkbenchCurrent(name, expectedRevision) {
-  return store.get("rightWorkbenchOwner") === name && store.get("rightWorkbenchRevision") === expectedRevision;
+  return openOwner(name) && rightWorkbenchRevisionFor(name) === expectedRevision;
 }
-
 export function resetRightWorkbench() {
-  storeSet(null, (store.get("rightWorkbenchRevision") || 0) + 1);
+  publish(null, [], {});
+  Object.keys(closers).forEach(function (name) { try { closers[name](); } catch (error) { /* Clear other panes after a context change. */ } });
 }
-
 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();
+  if (state.currentSlug !== previous.currentSlug || state.myUserId !== previous.myUserId) { resetRightWorkbench(); return; }
+  var preference = state.workbenchLayoutPreference || {}, before = previous.workbenchLayoutPreference || {};
+  if (!before.ready && preference.ready && preference.mode === 'docked' && !dockedOwners().length && state.rightWorkbenchOwner) {
+    setDocked(state.rightWorkbenchOwner, true); return;
+  }
+  if (state.workbenchLayoutPreference !== previous.workbenchLayoutPreference || state.rightWorkbenchOwner !== previous.rightWorkbenchOwner ||
+      state.rightWorkbenchDockedOwners !== previous.rightWorkbenchDockedOwners) renderLayoutControls();
 });

package/lib/public/modules/shared-browser.js

@@ -82,12 +82,18 @@ function ensurePanel() {
 }
 function renderEntry() {
   var browser = store.get('sharedBrowser');
+  var count = (store.get('sharedBrowsers') || []).length;
   var ready = !!store.get('connected') && !!store.get('activeSessionId');
   var label = !store.get('connected') ? 'Browser · Connecting…' : !store.get('activeSessionId') ? 'Browser · Loading session…' : browser ? 'View browser' : 'Open browser';
   ['shared-browser-btn', 'shared-browser-toggle-btn'].forEach(function (id) {
     var button = document.getElementById(id);
     if (!button) return;
     var title = id === 'shared-browser-toggle-btn' && ready && store.get('sharedBrowserOpen') ? 'Hide browser' : label;
+    if (id === 'shared-browser-toggle-btn') {
+      var badge = button.querySelector('.shared-browser-count');
+      if (badge) { badge.textContent = String(count); badge.classList.toggle('hidden', count === 0); }
+      if (count) title += ' · ' + count + (count === 1 ? ' tab' : ' tabs');
+    }
     button.classList.toggle('hidden', !visibleEntry());
     button.title = ready && browser ? title + ' · ' + browser.phase : title;
     button.setAttribute('aria-label', title);

package/lib/public/modules/split-pane-renderer.js

@@ -1,3 +1,4 @@
+import { renderPaneRuntime } from './split-pane-runtime.js';
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { copyToClipboard } from './utils.js';
@@ -343,7 +344,7 @@ export function createSplitPane(pane, closePane) {
   }); header.appendChild(sidebarButton);
   var search = document.createElement("button"); search.type = "button"; search.className = "split-pane-search"; search.setAttribute("aria-label", "Search this session"); search.title = "Search this session"; search.innerHTML = iconHtml("search");
   header.insertBefore(search, close);
-  frame.addEventListener('clay-pane-ready', function () {
+  function refreshReadyHeader() {
     if (paneEl.classList.contains('split-pane-cached')) return;
     var id = Number(frame.dataset.requestedSessionId || frame.dataset.sessionId), current = sessionById(id);
     var live = frame.clayPane && frame.clayPane.identity(), target = paneTarget(store.snap(), getCachedSessions(), id);
@@ -352,7 +353,9 @@ export function createSplitPane(pane, closePane) {
     frame.dataset.sessionOriginId = live.binding.sessionOriginId;
     updateSplitPaneMetadata(paneEl, { slug: frame.dataset.projectSlug, sessionId: id, title: current.title });
     syncPairChrome(paneEl.parentNode, store.get('splitPanes'));
-  });
+  }
+  frame.addEventListener('clay-pane-ready', refreshReadyHeader);
+  frame.addEventListener('clay-pane-config', refreshReadyHeader);
   frame.addEventListener('clay-pane-activation-failed', function () {
     if (paneEl.classList.contains('split-pane-cached')) return;
     syncPaneHeaderState(paneEl);
@@ -453,12 +456,7 @@ export function updateSplitPaneMetadata(paneEl, pane) {
   var sidebarButton = paneEl.querySelector('.split-pane-sidebar');
   if (sidebarButton) sidebarButton.hidden = store.get('projectSplitViewSingletonOrigin') !== (session && session.sessionOriginId) && paneEl.dataset.active !== 'true';
   if (vendor) { var vendorName = session && session.vendor || "unknown"; vendor.hidden = !VENDOR_AVATARS[vendorName]; if (!vendor.hidden) vendor.src = VENDOR_AVATARS[vendorName]; vendor.title = VENDOR_NAMES[vendorName] || vendorName; }
-  var runtime = paneEl.querySelector('.split-view-runtime');
-  var runtimeName = session && session.vendor || "unknown", runtimeModelName = session && typeof session.model === "string" && session.model.trim() || "Model unavailable";
-  var runtimeIcon = runtime.querySelector('.split-view-runtime-icon'), runtimeModel = runtime.querySelector('.split-view-model');
-  if (runtimeIcon) { runtimeIcon.hidden = !VENDOR_AVATARS[runtimeName]; if (!runtimeIcon.hidden) runtimeIcon.src = VENDOR_AVATARS[runtimeName]; runtimeIcon.title = VENDOR_NAMES[runtimeName] || runtimeName; runtimeIcon.alt = ""; }
-  if (runtimeModel) { runtimeModel.textContent = runtimeModelName; runtimeModel.title = (VENDOR_NAMES[runtimeName] || runtimeName) + " · " + runtimeModelName; }
-  runtime.setAttribute("aria-label", (VENDOR_NAMES[runtimeName] || runtimeName) + " · " + runtimeModelName);
+  renderPaneRuntime(paneEl, session);
   renderPaneWorkers(paneEl, session);
   updatePaneFullAccessButton(paneEl.querySelector('.split-pane-full-access'), session);
   syncPaneHeaderState(paneEl);