clay-server 4.1.0-beta.8 → 4.1.0

package/lib/public/modules/chat-render-runtime.js

@@ -145,8 +145,26 @@ export function addToMessages(element) {
   var messagesEl = getMessagesEl();
   if (prependAnchor) messagesEl.insertBefore(element, prependAnchor);
   else messagesEl.appendChild(element);
-  var scheduled = document.getElementById("scheduled-msg-bubble");
-  if (scheduled && element !== scheduled && scheduled.parentNode === messagesEl) messagesEl.appendChild(scheduled);
+  keepActiveThinkingAtTail();
+}
+
+// Thinking is a single accumulating record for the active turn. Other live
+// transcript entries may arrive between reasoning segments, so keep only the
+// currently active record after the tail activity indicator.
+export function keepActiveThinkingAtTail() {
+  if (prependAnchor || store.get('replayingHistory')) return;
+  var thinkingState = store.get('thinkingState');
+  var thinkingEl = thinkingState && thinkingState.active && thinkingState.el;
+  var messagesEl = getMessagesEl();
+  if (!thinkingEl || !messagesEl || thinkingEl.parentNode !== messagesEl) return;
+  if (activityEl && activityEl.parentNode === messagesEl) {
+    if (activityEl.nextSibling !== thinkingEl || messagesEl.lastElementChild !== thinkingEl) {
+      messagesEl.appendChild(activityEl);
+      messagesEl.appendChild(thinkingEl);
+    }
+  } else if (messagesEl.lastElementChild !== thinkingEl) {
+    messagesEl.appendChild(thinkingEl);
+  }
 }
 
 export function scrollToBottom() {

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

@@ -1,5 +1,6 @@
 import { store } from './store.js';
 import { getWs } from './ws-ref.js';
+import { forwardPaneIssueReference } from './pane-bridge.js';
 function accountKey(state) { return state.isMultiUserMode ? 'user:' + String(state.myUserId || '') : 'single'; }
 function requestContext(state) { return { accountKey: accountKey(state), projectSlug: state.currentSlug || null, epoch: state.issuesEpoch || 0 }; }
 function sameContext(request, state) {
@@ -42,12 +43,17 @@ function createIssueLink(ref, labelText) {
     button.appendChild(meta);
   }
   var cache = store.get('issuesCache') || {};
-  if (cache[ref]) { button.textContent = cache[ref].status.replace(/_/g, ' ') + ' · ' + cache[ref].title; button.dataset.status = cache[ref].status; }
+  if (cache[ref]) updateIssueLink(button, cache[ref]);
   setTimeout(function () { resolve(ref); }, 0);
   return button;
 }
 
 export function enhanceClayIssueLinks(root) {
+  root.querySelectorAll('a').forEach(function (anchor) {
+    var ref = anchor.getAttribute('data-clay-record-ref') || anchor.getAttribute('href');
+    if (anchor.closest('pre, code, button') || !isExactClayIssueReference(ref)) return;
+    anchor.replaceWith(createIssueLink(ref.trim(), anchor.textContent.trim()));
+  });
   var codeNodes = root.querySelectorAll("code");
   for (var codeIndex = 0; codeIndex < codeNodes.length; codeIndex++) {
     var code = codeNodes[codeIndex];
@@ -80,6 +86,20 @@ export function enhanceClayIssueLinks(root) {
   }
 }
 
+export function updateIssueLink(button, target) {
+  var status = target.status || 'open';
+  var title = target.title || 'Issue';
+  button.replaceChildren();
+  var label = document.createElement('span');
+  label.textContent = 'Issue';
+  var meta = document.createElement('small');
+  meta.textContent = title;
+  button.append(label, meta);
+  button.dataset.status = status;
+  button.title = title + ' · ' + status.replace(/_/g, ' ');
+  button.setAttribute('aria-label', 'Open Project Issue: ' + button.title);
+}
+
 function resolve(ref) {
   var ws = getWs();
   var requests = store.get('issueLinkRequests') || {};
@@ -101,7 +121,7 @@ export function handleIssueReference(msg) {
   }
   document.querySelectorAll('[data-issue-ref]').forEach(function (button) {
     if (button.dataset.issueRef !== msg.ref) return;
-    if (msg.target) { button.textContent = msg.target.status.replace(/_/g, ' ') + ' · ' + msg.target.title; button.dataset.status = msg.target.status; }
+    if (msg.target) updateIssueLink(button, msg.target);
     else button.title = msg.error || 'Issue unavailable';
   });
   if (store.get('issueLinkOpenRef') === msg.ref) {
@@ -111,6 +131,7 @@ export function handleIssueReference(msg) {
   return true;
 }
 function navigate(target) {
+  if (forwardPaneIssueReference(target.ref, target.projectSlug)) return;
   if (target.projectSlug !== store.get('currentSlug')) { window.location.assign('/p/' + encodeURIComponent(target.projectSlug) + '/?issue=' + encodeURIComponent(target.ref)); return; }
   import('./issues.js').then(function (module) { module.openIssues(target.ref); });
 }

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

@@ -1,4 +1,9 @@
-import { enhanceClayIssueLinks } from './clay-issue-links.js';
+import { enhanceClayIssueLinks, isExactClayIssueReference } from './clay-issue-links.js';
+
+export function renderClayRecordLink(href, text) {
+  if (!isExactClayLogReference(href) && !isExactClayIssueReference(href)) return null;
+  return '<a href="#" data-clay-record-ref="' + href.trim() + '">' + text + '</a>';
+}
 export function parseClayLogReferences(text) {
   var pattern = /\[clayos\/(log:[A-Za-z0-9_-]{24})(?:\s+[\u2014-]\s+([^\]\n]{1,80}))?\]|(^|[^A-Za-z0-9_/:])(log:[A-Za-z0-9_-]{24})(?![A-Za-z0-9_-])/g;
   var results = [];
@@ -39,6 +44,11 @@ function createLogLink(ref, labelText) {
 
 export function enhanceClayLogLinks(root) {
   enhanceClayIssueLinks(root);
+  root.querySelectorAll('a').forEach(function (anchor) {
+    var ref = anchor.getAttribute('data-clay-record-ref') || anchor.getAttribute('href');
+    if (anchor.closest('pre, code, button') || !isExactClayLogReference(ref)) return;
+    anchor.replaceWith(createLogLink(ref.trim(), anchor.textContent.trim()));
+  });
   var codeNodes = root.querySelectorAll("code");
   for (var codeIndex = 0; codeIndex < codeNodes.length; codeIndex++) {
     var code = codeNodes[codeIndex];

package/lib/public/modules/context-view-preference.js

@@ -0,0 +1,143 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+
+var MODES = ["off", "mini", "panel"];
+var sequence = 0;
+
+function validMode(mode) { return MODES.indexOf(mode) !== -1; }
+function nextRequestId(prefix) { sequence += 1; return prefix + Date.now() + "-" + sequence; }
+function accountId() { return store.get("myUserId") || "default"; }
+function initialState() {
+  return { mode: "off", canonicalMode: "off", preferencePresent: false, loading: false, saving: false, requestId: null, saveRequestId: null, pendingSaves: [], accountId: null, serverEpoch: null, rejectedEpoch: null, canonicalRevision: 0, error: "" };
+}
+
+function send(message) {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  ws.send(JSON.stringify(message));
+  return true;
+}
+
+export function getContextView() {
+  var state = store.get("contextViewPreferenceState") || initialState();
+  return validMode(state.mode) ? state.mode : "off";
+}
+
+export function getEffectiveContextView() {
+  if (store.get("paneMode") !== true) return getContextView();
+  var override = store.get("contextViewOverride");
+  return override === null || override === undefined ? getContextView() : (validMode(override) ? override : getContextView());
+}
+
+export function beginContextViewConnection() {
+  var state = store.get("contextViewPreferenceState") || initialState();
+  store.set({ contextViewPreferenceState: Object.assign({}, state, {
+    mode: validMode(state.canonicalMode) ? state.canonicalMode : "off",
+    loading: false,
+    saving: false,
+    requestId: null,
+    saveRequestId: null,
+    pendingSaves: [],
+    rejectedEpoch: state.serverEpoch || null,
+    serverEpoch: null,
+    canonicalRevision: 0,
+    error: "",
+  }) });
+}
+
+export function requestContextView() {
+  var id = nextRequestId("context-view-");
+  var state = store.get("contextViewPreferenceState") || initialState();
+  store.set({ contextViewPreferenceState: Object.assign({}, state, { loading: true, requestId: id, error: "" }) });
+  if (!send({ type: "context_view_get", requestId: id })) {
+    store.set({ contextViewPreferenceState: Object.assign({}, store.get("contextViewPreferenceState") || initialState(), { loading: false, requestId: null, error: "Clay is offline. Reconnect and try again." }) });
+    return false;
+  }
+  return true;
+}
+
+export function setContextView(mode) {
+  if (!validMode(mode)) return false;
+  var id = nextRequestId("context-view-save-");
+  var state = store.get("contextViewPreferenceState") || initialState();
+  var pendingSaves = (state.pendingSaves || []).concat([{ requestId: id, mode: mode }]);
+  store.set({ contextViewPreferenceState: Object.assign({}, state, { mode: mode, saving: true, saveRequestId: id, pendingSaves: pendingSaves, error: "" }) });
+  if (!send({ type: "context_view_set", requestId: id, mode: mode })) {
+    var reverted = store.get("contextViewPreferenceState") || initialState();
+    pendingSaves = (reverted.pendingSaves || []).filter(function (item) { return item.requestId !== id; });
+    var pendingMode = pendingSaves.length ? pendingSaves[pendingSaves.length - 1].mode : (reverted.canonicalMode || "off");
+    store.set({ contextViewPreferenceState: Object.assign({}, reverted, { mode: pendingMode, saving: pendingSaves.length > 0, saveRequestId: pendingSaves.length ? pendingSaves[pendingSaves.length - 1].requestId : null, pendingSaves: pendingSaves, error: "Clay is offline. Reconnect and try again." }) });
+    return false;
+  }
+  return true;
+}
+
+export function handleContextViewMessage(msg) {
+  if (!msg || msg.type !== "context_view_state") return false;
+  var state = store.get("contextViewPreferenceState") || initialState();
+  var currentAccount = accountId();
+  var isGetReply = !!msg.requestId && msg.requestId === state.requestId;
+  var pendingSaves = state.pendingSaves || [];
+  var saveIndex = -1;
+  for (var i = 0; i < pendingSaves.length; i++) if (pendingSaves[i].requestId === msg.requestId) saveIndex = i;
+  var isSaveReply = !!msg.requestId && saveIndex !== -1;
+  var isOlderSaveRevision = isSaveReply && typeof msg.canonicalRevision === "number" && msg.canonicalRevision < (state.canonicalRevision || 0);
+  var isCorrelatedAccountFailure = (isGetReply || isSaveReply) && msg.accountId === null && msg.accountAvailable === false;
+  if ((!isCorrelatedAccountFailure && msg.accountId !== currentAccount) || (msg.accountId === null && !isCorrelatedAccountFailure)) return true;
+  if (msg.serverEpoch && state.serverEpoch && msg.serverEpoch !== state.serverEpoch && (!msg.requestId || (!isGetReply && !isSaveReply))) return true;
+  if (msg.serverEpoch && state.rejectedEpoch && msg.serverEpoch === state.rejectedEpoch && (!isGetReply && !isSaveReply)) return true;
+  if (msg.canonicalRevision !== undefined && msg.canonicalRevision < (state.canonicalRevision || 0) && msg.serverEpoch === state.serverEpoch && !isSaveReply) return true;
+  if (msg.requestId && !isGetReply && !isSaveReply) return true;
+  if (msg.requestId && !isSaveReply && msg.ready === false && state.saving) return true;
+  var next = Object.assign({}, state, {
+    accountId: msg.accountId || currentAccount,
+    serverEpoch: msg.serverEpoch || state.serverEpoch || null,
+    rejectedEpoch: isGetReply || isSaveReply ? null : state.rejectedEpoch || null,
+    canonicalRevision: isOlderSaveRevision ? (state.canonicalRevision || 0) : (typeof msg.canonicalRevision === "number" ? msg.canonicalRevision : state.canonicalRevision || 0),
+    loading: isGetReply ? false : state.loading,
+    saving: state.saving,
+    requestId: isGetReply ? null : state.requestId,
+    saveRequestId: state.saveRequestId,
+    error: msg.error || "",
+  });
+  if (Object.prototype.hasOwnProperty.call(msg, "mode") && validMode(msg.mode) && msg.ready !== false && !isCorrelatedAccountFailure) {
+    if (isSaveReply) {
+      if (!isOlderSaveRevision && msg.ready !== false) {
+        pendingSaves = pendingSaves.slice(saveIndex + 1);
+      } else {
+        pendingSaves = pendingSaves.filter(function (item) { return item.requestId !== msg.requestId; });
+      }
+    }
+    if (!isOlderSaveRevision) {
+      next.canonicalMode = msg.mode;
+      next.preferencePresent = msg.preferencePresent === true;
+    }
+    if (pendingSaves.length) {
+      next.mode = pendingSaves[pendingSaves.length - 1].mode;
+      next.saving = true;
+      next.saveRequestId = pendingSaves[pendingSaves.length - 1].requestId;
+    } else {
+      next.mode = next.canonicalMode;
+      next.saving = false;
+      next.saveRequestId = null;
+    }
+    next.pendingSaves = pendingSaves;
+  } else if (isSaveReply && (msg.ready === false || isCorrelatedAccountFailure)) {
+    pendingSaves = pendingSaves.filter(function (item) { return item.requestId !== msg.requestId; });
+    next.pendingSaves = pendingSaves;
+    next.mode = pendingSaves.length ? pendingSaves[pendingSaves.length - 1].mode : (state.canonicalMode || "off");
+    next.saving = pendingSaves.length > 0;
+    next.saveRequestId = pendingSaves.length ? pendingSaves[pendingSaves.length - 1].requestId : null;
+  }
+  store.set({ contextViewPreferenceState: next });
+  return true;
+}
+
+store.subscribe(function (state, previous) {
+  if (state.myUserId !== previous.myUserId || state.currentSlug !== previous.currentSlug) {
+    store.set({ contextViewPreferenceState: Object.assign({}, initialState(), { accountId: accountId() }), contextViewOverride: null });
+    if (state.connected) requestContextView();
+  }
+});
+
+export { validMode };

package/lib/public/modules/default-vendor.js

@@ -0,0 +1,116 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { firstInstalledVendor } from './vendor-priority.js';
+
+function send(message) {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  ws.send(JSON.stringify(message));
+  return true;
+}
+
+var sequence = 0;
+
+function nextRequestId(prefix) {
+  sequence += 1;
+  return prefix + Date.now() + "-" + sequence;
+}
+
+function emptyState(accountId, projectSlug) {
+  return { loading: false, saving: false, getRequestId: null, saveRequestId: null, preference: null, preferencePresent: false, installedVendors: [], accountId: accountId || null, projectSlug: projectSlug || null, serverEpoch: null, canonicalRevision: 0, error: "" };
+}
+
+export function requestDefaultVendor() {
+  var id = nextRequestId("default-vendor-");
+  var state = store.get("defaultVendorState") || {};
+  store.set({ defaultVendorState: Object.assign({}, state, { loading: true, getRequestId: id, error: "" }) });
+  if (!send({ type: "default_vendor_get", requestId: id })) {
+    store.set({ defaultVendorState: Object.assign({}, store.get("defaultVendorState") || {}, { loading: false, getRequestId: null, error: "Clay is offline. Reconnect and try again." }) });
+    return false;
+  }
+  return true;
+}
+
+export function beginDefaultVendorConnection() {
+  var state = store.get("defaultVendorState") || {};
+  store.set({ defaultVendorState: Object.assign({}, state, {
+    loading: false,
+    saving: false,
+    getRequestId: null,
+    saveRequestId: null,
+    preference: null,
+    preferencePresent: false,
+    installedVendors: [],
+    accountId: store.get("myUserId") || "default",
+    projectSlug: store.get("currentSlug") || null,
+    serverEpoch: null,
+    canonicalRevision: 0,
+    error: "",
+  }) });
+}
+
+export function saveDefaultVendor(vendor) {
+  var state = store.get("defaultVendorState") || {};
+  if (vendor !== "" && (state.installedVendors || []).indexOf(vendor) === -1) return false;
+  var id = nextRequestId("default-vendor-save-");
+  store.set({ defaultVendorState: Object.assign({}, state, { saving: true, saveRequestId: id, error: "" }) });
+  if (!send({ type: "default_vendor_set", requestId: id, vendor: vendor })) {
+    store.set({ defaultVendorState: Object.assign({}, store.get("defaultVendorState") || {}, { saving: false, saveRequestId: null, error: "Clay is offline. Reconnect and try again." }) });
+    return false;
+  }
+  return true;
+}
+
+export function handleDefaultVendorMessage(msg) {
+  if (!msg || msg.type !== "default_vendor_state") return false;
+  var state = store.get("defaultVendorState") || {};
+  var accountId = store.get("myUserId") || "default";
+  var projectSlug = store.get("currentSlug") || null;
+  var isGetReply = !!msg.requestId && msg.requestId === state.getRequestId;
+  var isSaveReply = !!msg.requestId && msg.requestId === state.saveRequestId;
+  var isCorrelatedAccountFailure = (isGetReply || isSaveReply) && msg.accountId === null && msg.accountAvailable === false;
+  if ((!isCorrelatedAccountFailure && msg.accountId !== accountId) || (msg.accountId === null && !isCorrelatedAccountFailure)) return true;
+  if (Object.prototype.hasOwnProperty.call(msg, "projectSlug") && msg.projectSlug !== projectSlug) return true;
+  if (msg.serverEpoch && state.serverEpoch && msg.serverEpoch !== state.serverEpoch && (!msg.requestId || (msg.requestId !== state.getRequestId && msg.requestId !== state.saveRequestId))) return true;
+  if (msg.canonicalRevision !== undefined && msg.canonicalRevision < (state.canonicalRevision || 0) && msg.serverEpoch === state.serverEpoch) return true;
+  if (msg.requestId && !isGetReply && !isSaveReply) return true;
+  if (msg.requestId && !isSaveReply && msg.ready === false && state.saving) return true;
+  var next = Object.assign({}, state, {
+    accountId: msg.accountId || accountId,
+    projectSlug: projectSlug,
+    serverEpoch: msg.serverEpoch || state.serverEpoch || null,
+    canonicalRevision: typeof msg.canonicalRevision === "number" ? msg.canonicalRevision : state.canonicalRevision || 0,
+    installedVendors: Array.isArray(msg.installedVendors) ? msg.installedVendors : state.installedVendors || [],
+    loading: isGetReply ? false : state.loading,
+    saving: isSaveReply ? false : state.saving,
+    getRequestId: isGetReply ? null : state.getRequestId,
+    saveRequestId: isSaveReply ? null : state.saveRequestId,
+    error: msg.error || ""
+  });
+  if (Object.prototype.hasOwnProperty.call(msg, "preference")) {
+    next.preference = msg.preference || null;
+    next.preferencePresent = msg.preferencePresent === true;
+  }
+  store.set({ defaultVendorState: next });
+  return true;
+}
+
+store.subscribe(function (state, previous) {
+  if (state.myUserId !== previous.myUserId || state.currentSlug !== previous.currentSlug) {
+    var accountId = state.myUserId || "default";
+    store.set({ defaultVendorState: emptyState(accountId, state.currentSlug || null) });
+    if (state.connected) requestDefaultVendor();
+  }
+});
+
+export function resolvePreferredVendor(installedVendors) {
+  var installed = Array.isArray(installedVendors) ? installedVendors : [];
+  var state = store.get("defaultVendorState") || {};
+  if (state.preference && installed.indexOf(state.preference) !== -1) return state.preference;
+  return firstInstalledVendor(installed);
+}
+
+export function defaultVendorUnavailable(installedVendors) {
+  var state = store.get("defaultVendorState") || {};
+  return !!state.preference && (installedVendors || []).indexOf(state.preference) === -1;
+}

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;
 }