clay-server 4.1.0-beta.13 → 4.1.0-beta.14

package/lib/public/modules/app-rate-limit.js

@@ -13,6 +13,7 @@ var rateLimitResetTimer = null;
 var rateLimitUsageEl = null;
 var rateLimitResetState = {};
 var rateLimitTickTimer = null;
+var rateLimitPopoverTimers = [];
 var fastModeIndicatorEl = null;
 
 // --- Internal helpers ---
@@ -25,7 +26,7 @@ function getVendorUsageMeta(vendor) {
     codex: {
       icon: "/codex-avatar.png",
       alt: "Codex",
-      href: "https://chatgpt.com/admin/usage",
+      href: "https://chatgpt.com/codex/settings/usage",
       title: "Check usage on ChatGPT",
     },
     claude: {
@@ -35,7 +36,7 @@ function getVendorUsageMeta(vendor) {
       title: "Check usage on claude.ai",
     },
   };
-  return fallbacks[vendor] || fallbacks.claude;
+  return fallbacks[vendor] || null;
 }
 
 function vendorTracksRateLimits(vendor) {
@@ -51,6 +52,37 @@ function vendorSupportsScheduledMessages(vendor) {
   return scheduledMessageVendors.indexOf(vendor) !== -1;
 }
 
+function rateLimitEventAppliesToPane(msg, state) {
+  var activeSessionId = state.activeSessionId;
+  var activeVendor = state.currentVendor || "claude";
+  if (!msg) return false;
+  if (msg.sessionId != null && String(msg.sessionId) !== String(activeSessionId)) return false;
+  if (msg.vendor) return msg.vendor === activeVendor;
+  // Legacy Claude records predate vendor/session stamps. Never project them
+  // into a non-Claude pane, where they would look like Claude usage.
+  return activeVendor === "claude";
+}
+
+function rateLimitStateKey(sessionId, vendor) {
+  return String(store.get('currentSlug') || "") + "\u0000" +
+    String(store.get('myUserId') || "") + "\u0000" +
+    String(sessionId == null ? "" : sessionId) + "\u0000" + String(vendor || "claude");
+}
+
+function getActiveRateLimitState() {
+  var state = store.get('rateLimitState') || {};
+  var key = rateLimitStateKey(store.get('activeSessionId'), store.get('currentVendor'));
+  return state[key] || {};
+}
+
+function setActiveRateLimitState(next) {
+  var state = Object.assign({}, store.get('rateLimitState') || {});
+  var key = rateLimitStateKey(store.get('activeSessionId'), store.get('currentVendor'));
+  state[key] = next;
+  store.set({ rateLimitState: state });
+  rateLimitResetState = next;
+}
+
 function rateLimitTypeLabel(type) {
   if (!type) return "Usage";
   var labels = {
@@ -108,13 +140,15 @@ function updateRateLimitIndicator(msg) {
   var isRejected = msg.status === "rejected";
   var pillClass = "header-rate-limit" + (isRejected ? " rejected" : " warning");
   var label = isRejected ? "Rate limited" : "Rate warning";
+  var meta = getVendorUsageMeta(store.get('currentVendor') || "claude");
+  var link = meta
+    ? '<a href="' + meta.href + '" target="_blank" rel="noopener" class="rate-limit-link" title="' + meta.title + '">' + iconHtml("external-link") + "</a>"
+    : '<span class="rate-limit-link unavailable" title="Usage information is unavailable for this vendor">' + iconHtml("external-link") + "</span>";
   rateLimitIndicatorEl.innerHTML =
     '<span class="' + pillClass + '">' +
       iconHtml("alert-triangle") +
       '<span class="header-pill-text">' + label + "</span>" +
-      '<a href="https://claude.ai/settings/usage" target="_blank" rel="noopener" class="rate-limit-link">' +
-        iconHtml("external-link") +
-      "</a>" +
+      link +
     "</span>";
   refreshIcons();
 }
@@ -131,10 +165,12 @@ function showRateLimitPopover(text, isRejected) {
   rateLimitIndicatorEl.appendChild(pop);
 
   // Auto-dismiss after 5s
-  setTimeout(function () {
+  var fadeTimer = setTimeout(function () {
     pop.classList.add("fade-out");
-    setTimeout(function () { if (pop.parentNode) pop.remove(); }, 300);
+    var removeTimer = setTimeout(function () { if (pop.parentNode) pop.remove(); }, 300);
+    rateLimitPopoverTimers.push(removeTimer);
   }, 5000);
+  rateLimitPopoverTimers.push(fadeTimer);
 }
 
 function clearRateLimitIndicator() {
@@ -168,22 +204,81 @@ function tickRateLimitUsage() {
   if (!rateLimitUsageEl) return;
   var parts = [];
   var types = ["five_hour", "seven_day", "seven_day_opus", "seven_day_sonnet"];
+  var nextState = Object.assign({}, rateLimitResetState);
+  var changed = false;
   for (var i = 0; i < types.length; i++) {
     var entry = rateLimitResetState[types[i]];
     if (!entry || !entry.resetsAt) continue;
     var timeStr = formatResetTime(entry.resetsAt);
-    if (!timeStr) { delete rateLimitResetState[types[i]]; continue; }
+    if (!timeStr) { delete nextState[types[i]]; changed = true; continue; }
     parts.push(rateLimitTypeShortLabel(types[i]) + " resets " + timeStr);
   }
+  if (changed) setActiveRateLimitState(nextState);
   if (parts.length === 0) {
-    rateLimitUsageEl.innerHTML = iconHtml("activity") + '<span>Check usage</span>' + iconHtml("external-link");
-    refreshIcons();
+    renderRateLimitUsage();
+    return;
+  }
+  renderRateLimitUsage();
+}
+
+function renderRateLimitUsage() {
+  var activeVendor = store.get('currentVendor') || "claude";
+  if (!vendorTracksRateLimits(activeVendor)) {
+    if (rateLimitUsageEl) {
+      rateLimitUsageEl.remove();
+      rateLimitUsageEl = null;
+    }
     if (rateLimitTickTimer) { clearInterval(rateLimitTickTimer); rateLimitTickTimer = null; }
     return;
   }
-  var label = parts.join(" · ");
-  rateLimitUsageEl.innerHTML = iconHtml("activity") + '<span>' + label + '</span>' + iconHtml("external-link");
+
+  rateLimitResetState = getActiveRateLimitState();
+  var topBarActions = document.querySelector("#top-bar .top-bar-actions");
+  if (!topBarActions) return;
+  if (!rateLimitUsageEl) {
+    rateLimitUsageEl = document.createElement("a");
+    rateLimitUsageEl.id = "rate-limit-usage-link";
+    rateLimitUsageEl.className = "top-bar-pill pill-dim usage-check-link";
+    rateLimitUsageEl.target = "_blank";
+    rateLimitUsageEl.rel = "noopener";
+    var ref = document.getElementById("skip-perms-pill");
+    topBarActions.insertBefore(rateLimitUsageEl, ref);
+  }
+  rateLimitUsageEl.style.display = "";
+
+  var parts = [];
+  var types = ["five_hour", "seven_day", "seven_day_opus", "seven_day_sonnet"];
+  for (var i = 0; i < types.length; i++) {
+    var entry = rateLimitResetState[types[i]];
+    if (!entry || !entry.resetsAt) continue;
+    var timeStr = formatResetTime(entry.resetsAt);
+    if (!timeStr) continue;
+    parts.push(rateLimitTypeShortLabel(types[i]) + " resets " + timeStr);
+  }
+
+  var label = parts.length > 0 ? parts.join(" · ") : "Check usage";
+  var meta = getVendorUsageMeta(activeVendor);
+  if (meta) {
+    rateLimitUsageEl.href = meta.href;
+    rateLimitUsageEl.title = meta.title;
+    rateLimitUsageEl.removeAttribute("aria-disabled");
+    rateLimitUsageEl.innerHTML =
+      '<img src="' + meta.icon + '" class="usage-check-vendor-icon" alt="' + meta.alt + '">' +
+      '<span>' + label + '</span>' + iconHtml("external-link");
+  } else {
+    rateLimitUsageEl.removeAttribute("href");
+    rateLimitUsageEl.setAttribute("aria-disabled", "true");
+    rateLimitUsageEl.title = "Usage information is unavailable for this vendor";
+    rateLimitUsageEl.innerHTML = '<span>' + (parts.length > 0 ? label : "Usage unavailable") + '</span>';
+  }
   refreshIcons();
+
+  if (parts.length > 0 && !rateLimitTickTimer) {
+    rateLimitTickTimer = setInterval(tickRateLimitUsage, 30000);
+  } else if (parts.length === 0 && rateLimitTickTimer) {
+    clearInterval(rateLimitTickTimer);
+    rateLimitTickTimer = null;
+  }
 }
 
 // --- Exported functions ---
@@ -193,15 +288,32 @@ export function initRateLimit() {
     if (state.currentVendor !== prev.currentVendor && state.currentVendor) {
       if (!vendorSupportsScheduledMessages(state.currentVendor)) clearScheduleDelay();
     }
-    if (state.currentVendor !== prev.currentVendor || state.vendorInfo !== prev.vendorInfo) {
-      if (rateLimitUsageEl) {
-        rateLimitUsageEl.style.display = vendorTracksRateLimits(state.currentVendor || "claude") ? "" : "none";
-      }
+    if (state.currentVendor !== prev.currentVendor || state.activeSessionId !== prev.activeSessionId
+        || state.currentSlug !== prev.currentSlug || state.myUserId !== prev.myUserId) {
+      resetRateLimitState();
+    }
+    if (state.vendorInfo !== prev.vendorInfo && state.currentVendor === prev.currentVendor && state.activeSessionId === prev.activeSessionId
+        && state.currentSlug === prev.currentSlug && state.myUserId === prev.myUserId) {
+      renderRateLimitUsage();
     }
   });
 }
 
 export function handleRateLimitEvent(msg) {
+  if (!rateLimitEventAppliesToPane(msg, store.snap())) return;
+  if (msg.resetsAt && msg.resetsAt <= Date.now()) {
+    var expiredState = Object.assign({}, getActiveRateLimitState());
+    if (msg.rateLimitType) delete expiredState[msg.rateLimitType];
+    setActiveRateLimitState(expiredState);
+    clearRateLimitIndicator();
+    renderRateLimitUsage();
+    return;
+  }
+  if (msg.rateLimitType && msg.resetsAt) {
+    var eventState = Object.assign({}, getActiveRateLimitState());
+    eventState[msg.rateLimitType] = { resetsAt: msg.resetsAt, status: msg.status };
+    setActiveRateLimitState(eventState);
+  }
   var isRejected = msg.status === "rejected";
   var typeLabel = rateLimitTypeLabel(msg.rateLimitType);
   var popoverText = "";
@@ -226,8 +338,12 @@ export function handleRateLimitEvent(msg) {
     rateLimitResetTimer = setTimeout(function () {
       rateLimitResetsAt = null;
       rateLimitResetTimer = null;
+      var currentState = Object.assign({}, getActiveRateLimitState());
+      delete currentState[msg.rateLimitType];
+      setActiveRateLimitState(currentState);
       // Clear schedule mode when rate limit resets
       clearScheduleDelay();
+      renderRateLimitUsage();
     }, msg.resetsAt - Date.now() + 1000);
   } else {
     var pct = msg.utilization ? Math.round(msg.utilization * 100) : null;
@@ -239,58 +355,19 @@ export function handleRateLimitEvent(msg) {
 }
 
 export function updateRateLimitUsage(msg) {
+  if (!rateLimitEventAppliesToPane(msg, store.snap())) return;
   var activeVendor = store.get('currentVendor') || "claude";
   if (!vendorTracksRateLimits(activeVendor)) {
-    if (rateLimitUsageEl) rateLimitUsageEl.style.display = "none";
+    renderRateLimitUsage();
     return;
   }
   if (msg.rateLimitType && msg.resetsAt) {
-    rateLimitResetState[msg.rateLimitType] = { resetsAt: msg.resetsAt, status: msg.status };
-  }
-
-  var topBarActions = document.querySelector("#top-bar .top-bar-actions");
-  if (!topBarActions) return;
-
-  if (!rateLimitUsageEl) {
-    rateLimitUsageEl = document.createElement("a");
-    rateLimitUsageEl.id = "rate-limit-usage-link";
-    rateLimitUsageEl.className = "top-bar-pill pill-dim usage-check-link";
-    rateLimitUsageEl.target = "_blank";
-    rateLimitUsageEl.rel = "noopener";
-    var ref = document.getElementById("skip-perms-pill");
-    topBarActions.insertBefore(rateLimitUsageEl, ref);
-  }
-  rateLimitUsageEl.style.display = "";
-
-  // Build label from available reset times
-  var parts = [];
-  var types = ["five_hour", "seven_day", "seven_day_opus", "seven_day_sonnet"];
-  for (var i = 0; i < types.length; i++) {
-    var entry = rateLimitResetState[types[i]];
-    if (!entry || !entry.resetsAt) continue;
-    var timeStr = formatResetTime(entry.resetsAt);
-    if (!timeStr) continue;
-    parts.push(rateLimitTypeShortLabel(types[i]) + " resets " + timeStr);
+    var nextState = Object.assign({}, getActiveRateLimitState());
+    nextState[msg.rateLimitType] = { resetsAt: msg.resetsAt, status: msg.status };
+    setActiveRateLimitState(nextState);
   }
 
-  var label = parts.length > 0 ? parts.join(" · ") : "Check usage";
-  var vendor = activeVendor;
-  var meta = getVendorUsageMeta(vendor);
-  rateLimitUsageEl.href = meta.href;
-  rateLimitUsageEl.title = meta.title;
-  rateLimitUsageEl.innerHTML =
-    '<img src="' + meta.icon + '" class="usage-check-vendor-icon" alt="' + meta.alt + '">' +
-    '<span>' + label + '</span>' +
-    iconHtml("external-link");
-  refreshIcons();
-
-  // Start or stop live countdown tick
-  if (parts.length > 0 && !rateLimitTickTimer) {
-    rateLimitTickTimer = setInterval(tickRateLimitUsage, 30000);
-  } else if (parts.length === 0 && rateLimitTickTimer) {
-    clearInterval(rateLimitTickTimer);
-    rateLimitTickTimer = null;
-  }
+  renderRateLimitUsage();
 }
 
 export function handleFastModeState(state) {
@@ -322,6 +399,16 @@ export function handleFastModeState(state) {
 
 export function resetRateLimitState() {
   clearRateLimitIndicator();
+  rateLimitResetsAt = null;
+  if (rateLimitResetTimer) { clearTimeout(rateLimitResetTimer); rateLimitResetTimer = null; }
+  clearScheduleDelay();
+  for (var i = 0; i < rateLimitPopoverTimers.length; i++) clearTimeout(rateLimitPopoverTimers[i]);
+  rateLimitPopoverTimers = [];
+  if (rateLimitTickTimer) { clearInterval(rateLimitTickTimer); rateLimitTickTimer = null; }
   if (rateLimitCountdownTimer) { clearInterval(rateLimitCountdownTimer); rateLimitCountdownTimer = null; }
+  rateLimitResetState = getActiveRateLimitState();
+  renderRateLimitUsage();
   if (fastModeIndicatorEl) { fastModeIndicatorEl.remove(); fastModeIndicatorEl = null; }
 }
+
+export { rateLimitEventAppliesToPane, getVendorUsageMeta };

package/lib/public/modules/filebrowser-tabs.js

@@ -101,4 +101,5 @@ export function closeFileViewerTab(path) {
 }
 
 export function focusedFileViewerTab() { return focusedPath; }
+export function focusedFileViewerTabData() { return focusedPath && tabs.has(focusedPath) ? tabs.get(focusedPath) : null; }
 export function clearFileViewerTabs() { tabs.clear(); focusedPath = null; previewPath = null; render(); }

package/lib/public/modules/filebrowser.js

@@ -2,15 +2,14 @@ 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 { closeTerminal } from './terminal.js';
+import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench, isRightWorkbenchCurrent } from './right-workbench.js';
 import { renderUnifiedDiff, renderSplitDiff } from './diff.js';
 import { initFileIcons, getFileIconSvg, getFolderIconSvg } from './fileicons.js';
 import { copyMarkdownFormatting } from './rich-clipboard.js';
 import { animateMarkdownChange, beginMarkdownPresentation, cancelMarkdownFollow, isFollowingMarkdown } from './markdown-live-edit.js';
 import { store } from './store.js';
 import { enterMarkdownSlides, exitMarkdownSlides, handleMarkdownSlideKey, syncMarkdownSlidesButton, toggleMarkdownSlideLevelMenu } from './markdown-slides.js';
-import { initFileViewerTabs, openFileViewerTab, previewFileViewerTab, updateFileViewerTab, closeFileViewerTab, focusedFileViewerTab, clearFileViewerTabs } from './filebrowser-tabs.js';
-import { closeIssues } from './issues.js';
+import { initFileViewerTabs, openFileViewerTab, previewFileViewerTab, updateFileViewerTab, closeFileViewerTab, focusedFileViewerTab, focusedFileViewerTabData, clearFileViewerTabs } from './filebrowser-tabs.js';
 import { initFileBrowserContextMenu, downloadProjectFile } from './filebrowser-context-menu.js';
 import { registerClayFileLinkOpener } from './clay-file-links.js';
 
@@ -41,10 +40,13 @@ export function initFileBrowser(_ctx) {
   if (mainPanels && ctx.fileViewerEl) mainPanels.appendChild(ctx.fileViewerEl);
   initFileViewerTabs({
     onFocus: function(path) {
+      claimRightWorkbench("file-viewer");
+      ctx.fileViewerEl.classList.remove("hidden");
       if (path !== currentFilePath) requestFileContent(path);
     },
     onEmpty: function() { teardownFileViewer(); },
   });
+  registerRightWorkbench("file-viewer", teardownFileViewer);
 
   // Load material file icons in background
   initFileIcons().then(function () {
@@ -149,7 +151,7 @@ export function initFileBrowser(_ctx) {
 
   // Close button
   document.getElementById("file-viewer-close").addEventListener("click", function () {
-    closeFileViewerTab(focusedFileViewerTab());
+    closeFileViewer();
   });
 
   // Full-viewport presentation toggle
@@ -395,6 +397,7 @@ function kbCollapseOrAscend() {
 function kbActivate() {
   if (!_kbFocused) return;
   if (!isDirRow(_kbFocused) && _kbFocused.dataset.path) {
+    claimRightWorkbench("file-viewer");
     openFileViewerTab(_kbFocused.dataset.path);
   }
   _kbFocused.click();
@@ -477,10 +480,7 @@ function ensureRenderedMarkdown() {
 }
 
 export function closeFileViewer() {
-  if (focusedFileViewerTab()) {
-    closeFileViewerTab(focusedFileViewerTab());
-    return;
-  }
+  releaseRightWorkbench("file-viewer");
   teardownFileViewer();
 }
 
@@ -512,6 +512,7 @@ export function setFileViewerFullscreen(enabled) {
 }
 
 export function resetFileBrowser() {
+  releaseRightWorkbench("file-viewer");
   clearFileViewerTabs();
   teardownFileViewer();
   // Clear all cached state
@@ -552,12 +553,13 @@ export function openFile(filePath, opts) {
   if (!state.connected) return false;
   if (opts && opts.projectSlug && opts.projectSlug !== state.currentSlug) return false;
   if (opts && opts.sessionId && String(opts.sessionId) !== String(state.activeSessionId)) return false;
-  closeIssues();
+  var workbenchRevision = claimRightWorkbench("file-viewer");
   if (followedFileChanged(filePath) || (opts && opts.diff && isFollowingMarkdown(filePath))) {
     cancelMarkdownFollow();
   }
   pendingRenderedOpen = !!(opts && opts.rendered);
   store.set({ pendingFileNavigation: opts && opts.line ? { path: filePath, line: opts.line, column: opts.column || null, requestId: null } : null });
+  store.set({ fileViewerOpenRevision: workbenchRevision });
   openFileViewerTab(filePath);
   if (opts && opts.diff) {
     pendingOpenMode = { type: "diff", oldStr: opts.diff.oldStr, newStr: opts.diff.newStr };
@@ -567,9 +569,28 @@ export function openFile(filePath, opts) {
   requestFileContent(filePath);
 }
 
+export function reopenFileViewer() {
+  var workbenchRevision = claimRightWorkbench("file-viewer");
+  store.set({ fileViewerOpenRevision: workbenchRevision });
+  if (!focusedFileViewerTab()) return false;
+  ctx.fileViewerEl.classList.remove("hidden");
+  var tab = focusedFileViewerTabData();
+  if (currentFilePath === focusedFileViewerTab() && currentContent != null) {
+    sendWatch(currentFilePath);
+    return true;
+  }
+  if (tab && tab.content != null) {
+    showFileContent({ path: focusedFileViewerTab(), content: tab.content, size: tab.content.length });
+    return true;
+  }
+  requestFileContent(focusedFileViewerTab());
+  return true;
+}
+
 export function openWorkingTreeDiff(diff) {
   if (!diff || !diff.path) return;
-  closeIssues();
+  var workbenchRevision = claimRightWorkbench("file-viewer");
+  store.set({ fileViewerOpenRevision: workbenchRevision });
   openFileViewerTab(diff.path);
   pendingRenderedOpen = false;
   pendingOpenMode = diff.binary ? null : {
@@ -588,6 +609,8 @@ export function openWorkingTreeDiff(diff) {
 
 export function presentMarkdownEdit(msg) {
   if (!msg || !beginMarkdownPresentation(msg.path)) return;
+  var workbenchRevision = claimRightWorkbench("file-viewer");
+  store.set({ fileViewerOpenRevision: workbenchRevision });
   openFileViewerTab(msg.path, { content: msg.content });
   pendingOpenMode = null;
   pendingRenderedOpen = true;
@@ -687,7 +710,7 @@ function requestDirectory(dirPath) {
 function requestFileContent(filePath) {
   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 } });
+  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 } });
   var pending = store.get('pendingFileNavigation');
   if (pending && pending.path === filePath) store.set({ pendingFileNavigation: Object.assign({}, pending, { requestId: requestId }) });
   if (ctx.ws && ctx.connected) {
@@ -811,6 +834,7 @@ function renderFilteredTree(container, tree, depth, query) {
       (function (rowEl, childEl, folderName) {
         rowEl.addEventListener("click", function (e) {
           e.stopPropagation();
+          claimRightWorkbench("file-viewer");
           var isExpanded = rowEl.classList.contains("expanded");
           rowEl.classList.toggle("expanded");
           childEl.classList.toggle("hidden", isExpanded);
@@ -833,6 +857,7 @@ function renderFilteredTree(container, tree, depth, query) {
       (function (filePath, rowEl) {
         rowEl.addEventListener("click", function (e) {
           e.stopPropagation();
+          claimRightWorkbench("file-viewer");
           if (followedFileChanged(filePath)) cancelMarkdownFollow();
           var prev = ctx.fileTreeEl.querySelector(".file-tree-item.active");
           if (prev) prev.classList.remove("active");
@@ -843,7 +868,7 @@ function renderFilteredTree(container, tree, depth, query) {
         });
         rowEl.addEventListener("dblclick", function (e) {
           e.stopPropagation();
-          openFileViewerTab(filePath);
+          openFile(filePath);
         });
       })(entry.path, row);
 
@@ -973,7 +998,7 @@ export function handleFsRead(msg) {
   if ((request.projectSlug || null) !== (msg.projectSlug || null)) return;
   if ((request.sessionId || null) !== (msg.sessionId == null ? null : String(msg.sessionId))) return;
   if ((request.accountId || null) !== (msg.accountId || null)) return;
-  showFileContent(msg);
+  showFileContent(msg, request.workbenchRevision);
 }
 
 // --- Tree rendering ---
@@ -1040,6 +1065,7 @@ function renderEntries(container, entries, depth) {
       (function (dirPath, childEl, rowEl, folderName) {
         rowEl.addEventListener("click", function (e) {
           e.stopPropagation();
+          claimRightWorkbench("file-viewer");
           var isExpanded = rowEl.classList.contains("expanded");
           if (isExpanded) {
             rowEl.classList.remove("expanded");
@@ -1079,6 +1105,7 @@ function renderEntries(container, entries, depth) {
       (function (filePath, rowEl) {
         rowEl.addEventListener("click", function (e) {
           e.stopPropagation();
+          claimRightWorkbench("file-viewer");
           if (followedFileChanged(filePath)) cancelMarkdownFollow();
           // Mark active
           var prev = ctx.fileTreeEl.querySelector(".file-tree-item.active");
@@ -1093,7 +1120,7 @@ function renderEntries(container, entries, depth) {
         });
         rowEl.addEventListener("dblclick", function (e) {
           e.stopPropagation();
-          openFileViewerTab(filePath);
+          openFile(filePath);
         });
       })(entry.path, row);
 
@@ -1105,8 +1132,9 @@ function renderEntries(container, entries, depth) {
 
 // --- File viewer ---
 
-function showFileContent(msg) {
+function showFileContent(msg, expectedRevision) {
   if (!updateFileViewerTab(msg.path, { content: msg.content })) return;
+  if (expectedRevision != null && !isRightWorkbenchCurrent("file-viewer", expectedRevision)) return;
   var pathEl = document.getElementById("file-viewer-path");
   var bodyEl = document.getElementById("file-viewer-body");
   var renderBtn = document.getElementById("file-viewer-render");
@@ -1183,7 +1211,6 @@ function showFileContent(msg) {
     }
   }
 
-  closeTerminal();
   ctx.fileViewerEl.classList.remove("hidden");
   sendWatch(msg.path);
   refreshIcons();
@@ -1291,7 +1318,7 @@ function pathsReferToSameFile(left, right) {
 }
 
 export function handleFileChanged(msg) {
-  if (!msg.path || msg.path !== currentFilePath) return;
+  if (!msg.path || !pathsReferToSameFile(msg.path, currentFilePath)) return;
   if (ctx.fileViewerEl.classList.contains("hidden")) return;
   if (historyVisible || inlineDiffActive) return;
   if (msg.content === currentContent) return;
@@ -1299,7 +1326,7 @@ export function handleFileChanged(msg) {
   var bodyEl = document.getElementById("file-viewer-body");
   var scrollPos = bodyEl ? bodyEl.scrollTop : 0;
   pendingRefresh = true;
-  showFileContent(msg);
+  showFileContent(msg.path === currentFilePath ? msg : Object.assign({}, msg, { path: currentFilePath }));
   if (bodyEl) bodyEl.scrollTop = scrollPos;
 }
 

package/lib/public/modules/issues.js

@@ -1,11 +1,7 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { showToast } from './utils.js';
-import { closeProjectLogs } from './project-logs.js';
-import { closeScheduledTasks } from './scheduled-tasks.js';
-import { closeNotesBrowser } from './sticky-notes-browser.js';
-import { closeFileViewer } from './filebrowser.js';
-import { closeTerminal } from './terminal.js';
+import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
 import { refreshIcons } from './icons.js';
 import { renderIssueList, renderIssueDetail, renderIssueForm, renderIssueHistory, statusLabel } from './issues-render.js';
 function panel() { return document.getElementById('issues-panel'); }
@@ -81,6 +77,7 @@ function confirmDelete() {
   store.set({ issuesMutationRequest: request('issue_delete', { ref: entry.ref, expectedRevision: entry.revision }, 'delete') });
 }
 export function closeIssues() {
+  releaseRightWorkbench("issues");
   bumpViewGeneration();
   if (panel()) panel().classList.add('hidden');
   store.set({ issuesOpen: false });
@@ -91,7 +88,7 @@ export function openIssues(ref) {
   if (!panel() || store.get('isMate')) return;
   panel().querySelector('.issues-notice').textContent = '';
   bumpViewGeneration();
-  closeProjectLogs(); closeScheduledTasks(); closeNotesBrowser(); closeFileViewer(); closeTerminal();
+  claimRightWorkbench("issues");
   panel().classList.remove('hidden');
   store.set({ issuesOpen: true });
   var button = document.getElementById('issues-btn');
@@ -102,6 +99,7 @@ export function openIssues(ref) {
 export function initIssues() {
   var host = document.getElementById('main-panels');
   if (!host || panel()) return;
+  registerRightWorkbench("issues", closeIssues);
   var el = document.createElement('section');
   el.id = 'issues-panel'; el.className = 'hidden'; el.setAttribute('aria-label', 'Project Issues');
   el.innerHTML = '<header class="issues-topbar"><button class="issues-icon-btn" data-issues-back aria-label="Back to issues" title="Back to issue list"><i data-lucide="arrow-left"></i></button><span class="issues-title"><i data-lucide="circle-dot"></i>Issues</span><span class="issues-subtitle">Manage issues through Driver chat.</span><div class="issues-window-actions"><button class="issues-icon-btn" data-issues-wide aria-label="Widen Issues" title="Widen Issues" aria-pressed="false"><i data-lucide="chevrons-left-right"></i></button><button class="issues-icon-btn" data-issues-full aria-label="Toggle Issues fullscreen" title="Toggle fullscreen" aria-pressed="false"><i data-lucide="maximize-2"></i></button><button class="issues-icon-btn" data-issues-close aria-label="Close Issues" title="Close Issues"><i data-lucide="x"></i></button></div></header><div class="issues-filters"><label class="issues-search"><i data-lucide="search"></i><input name="query" type="search" placeholder="Search issues" aria-label="Search issues"></label><select name="filter-status" aria-label="Filter status"><option value="">All statuses</option><option value="open">Open</option><option value="in_progress">In progress</option><option value="resolved">Resolved</option><option value="closed">Closed</option></select><select name="filter-type" aria-label="Filter type"><option value="">All types</option><option>bug</option><option>feature</option><option>plan</option></select></div><p class="issues-notice" role="status"></p><main class="issues-content" role="region" aria-live="polite"></main><div class="issues-delete-dialog hidden" role="dialog" aria-modal="true" aria-labelledby="issues-delete-heading"><div class="issues-delete-card"><h2 id="issues-delete-heading">Delete this issue?</h2><p>This removes the issue from the board but preserves its history.</p><p class="issues-delete-title"></p><p class="issues-delete-status" role="status"></p><div><button type="button" data-issue-delete-cancel>Cancel</button><button type="button" data-issue-delete-confirm>Delete issue</button></div></div></div>';

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

@@ -16,10 +16,7 @@ import { showToast } from './utils.js';
 import { showScheduledResultNotification } from './scheduled-result-notification.js';
 import * as scheduledResultClient from './scheduled-result-client.js';
 import { clearPendingScheduledResultRead, handleScheduledResultDisplayed, initScheduledResultDisplay, openScheduledResultSession } from './scheduled-result-display.js';
-import { closeScheduledTasks } from './scheduled-tasks.js';
-import { closeNotesBrowser } from './sticky-notes-browser.js';
-import { closeFileViewer } from './filebrowser.js';
-import { closeTerminal } from './terminal.js';
+import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
 import { renderFilter, renderContextFilter, renderList, renderDetail } from './project-logs-render.js';
 
 var panel = null;
@@ -285,6 +282,7 @@ function applyContextFilter(contextMode) {
 // --- Lifecycle -----------------------------------------------------------
 
 export function initProjectLogs() {
+  registerRightWorkbench("project-logs", closeProjectLogs);
   var button = document.getElementById("project-logs-btn");
   if (!button) return;
   button.addEventListener("click", function () {
@@ -331,11 +329,7 @@ export function initProjectLogs() {
 export function openProjectLogs() {
   ensurePanel();
   if (!panel) return;
-  closeScheduledTasks();
-  closeNotesBrowser();
-  // Claim the single right workbench slot.
-  try { closeFileViewer(); } catch (e) {}
-  try { closeTerminal(); } catch (e) {}
+  claimRightWorkbench("project-logs");
   panel.classList.remove("hidden");
   applyWindowState(store.get('projectLogsWide'), false);
   var button = document.getElementById("project-logs-btn");
@@ -355,6 +349,7 @@ export function openProjectLog(ref) {
 }
 
 export function closeProjectLogs() {
+  releaseRightWorkbench("project-logs");
   if (!store.get('projectLogsOpen')) return;
   if (panel) {
     panel.classList.add("hidden");

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

@@ -0,0 +1,44 @@
+// Single arbitration point for the mutually exclusive right-side workbench.
+
+import { store } from './store.js';
+
+var closers = {};
+
+export function registerRightWorkbench(name, close) {
+  if (!name || typeof close !== "function") return;
+  closers[name] = close;
+}
+
+export function claimRightWorkbench(name) {
+  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 */ }
+  }
+  return nextRevision;
+}
+
+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);
+}
+
+export function isRightWorkbenchCurrent(name, expectedRevision) {
+  return store.get("rightWorkbenchOwner") === name && store.get("rightWorkbenchRevision") === expectedRevision;
+}
+
+export function resetRightWorkbench() {
+  storeSet(null, (store.get("rightWorkbenchRevision") || 0) + 1);
+}
+
+store.subscribe(function (state, previous) {
+  if (state.currentSlug === previous.currentSlug && state.myUserId === previous.myUserId) return;
+  resetRightWorkbench();
+});