clay-server 4.1.0-beta.9 → 4.1.0

package/lib/public/modules/sidebar-mobile.js

@@ -15,6 +15,7 @@ import {
   startNewSession
 } from './sidebar-sessions.js';
 import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, VENDOR_HOMEPAGES, isExperimentalVendor } from './app-rendering.js';
+import { defaultVendorUnavailable, resolvePreferredVendor, saveDefaultVendor } from './default-vendor.js';
 import {
   getCachedProjectList,
   getCachedCurrentSlug,
@@ -36,7 +37,7 @@ import { showHomeHub } from './app-home-hub.js';
 import { openHomeChat } from './home-mate-chat.js';
 import { openTerminal } from './terminal.js';
 import { requestKnowledgeList } from './mate-knowledge.js';
-import { loadRootDirectory } from './filebrowser.js';
+import { loadRootDirectory, reopenFileViewer } from './filebrowser.js';
 import {
   prepareSidebarHierarchy,
   renderMobileDriverHierarchy,
@@ -91,6 +92,7 @@ export function openMobileSheet(type) {
       listEl.appendChild(fileTree);
       fileTree.classList.remove("hidden");
     }
+    reopenFileViewer();
     loadRootDirectory();
   } else if (type === "mate-knowledge") {
     titleEl.textContent = "Knowledge";
@@ -674,14 +676,17 @@ function renderMobileSessionsInto(container) {
   // the project's last-used vendor, plus a chevron that expands the full
   // vendor list. The list expands inline rather than as a fixed-position
   // popover because it lives inside a scrolling bottom sheet.
-  var mobileDefaultVendor = resolveDefaultVendor();
+  var mobileDefaultVendor = resolvePreferredVendor(store.get('installedVendors') || []) || resolveDefaultVendor();
   var mobileInstalled = store.get('installedVendors') || [];
+  var mobileDefaultState = store.get('defaultVendorState') || {};
 
   var newRow = document.createElement("div");
   newRow.className = "mobile-session-new-row";
 
   var mainBtn = document.createElement("button");
   mainBtn.className = "mobile-session-new mobile-session-new-main";
+  mainBtn.title = "New " + (VENDOR_NAMES[mobileDefaultVendor] || mobileDefaultVendor) + " session";
+  if (defaultVendorUnavailable(mobileInstalled)) mainBtn.title += " (saved default is unavailable; using installed priority)";
   mainBtn.innerHTML = '<img src="' + (VENDOR_AVATARS[mobileDefaultVendor] || VENDOR_AVATARS.claude) +
     '" class="mobile-session-new-icon" alt=""><span>New ' + (VENDOR_NAMES[mobileDefaultVendor] || mobileDefaultVendor) + ' session</span>';
   mainBtn.addEventListener("click", function () {
@@ -703,12 +708,20 @@ function renderMobileSessionsInto(container) {
   });
   newRow.appendChild(chevronBtn);
 
+  if (defaultVendorUnavailable(mobileInstalled) && mobileDefaultState.preference) {
+    var mobileFallbackNote = document.createElement("div");
+    mobileFallbackNote.className = "mobile-session-new-preference-status mobile-session-new-fallback-note";
+    mobileFallbackNote.textContent = "Saved default " + (VENDOR_NAMES[mobileDefaultState.preference] || mobileDefaultState.preference) + " is unavailable. Using " + (VENDOR_NAMES[mobileDefaultVendor] || mobileDefaultVendor) + ".";
+  }
+
   // Every known vendor is listed. Uninstalled ones stay visible but disabled,
   // and tapping one opens the vendor's homepage.
   for (var vi = 0; vi < VENDOR_ORDER.length; vi++) {
     (function (vendor) {
       var isInstalled = mobileInstalled.indexOf(vendor) !== -1;
       var name = VENDOR_NAMES[vendor] || vendor;
+      var vendorRow = document.createElement("div");
+      vendorRow.className = "mobile-vendor-row";
       var vBtn = document.createElement("button");
       vBtn.className = "mobile-session-new mobile-session-new-vendor";
       if (!isInstalled) vBtn.classList.add("disabled");
@@ -725,11 +738,46 @@ function renderMobileSessionsInto(container) {
         startNewSession(vendor);
         closeMobileSheet();
       });
-      vendorList.appendChild(vBtn);
+      vendorRow.appendChild(vBtn);
+      if (isInstalled) {
+        var defaultBtn = document.createElement("button");
+        defaultBtn.type = "button";
+        defaultBtn.className = "mobile-vendor-set-default";
+        defaultBtn.textContent = mobileDefaultState.saving ? "Saving…" : (vendor === mobileDefaultVendor && !defaultVendorUnavailable(mobileInstalled) ? "Default" : "Set default");
+        defaultBtn.disabled = mobileDefaultState.saving === true;
+        defaultBtn.setAttribute("aria-label", "Set " + name + " as default vendor");
+        defaultBtn.addEventListener("click", function (e) {
+          e.preventDefault();
+          e.stopPropagation();
+          saveDefaultVendor(vendor);
+        });
+        vendorRow.appendChild(defaultBtn);
+      }
+      vendorList.appendChild(vendorRow);
     })(VENDOR_ORDER[vi]);
   }
 
+  var automaticBtn = document.createElement("button");
+  automaticBtn.className = "mobile-session-new mobile-session-new-vendor mobile-session-new-automatic";
+  automaticBtn.type = "button";
+  automaticBtn.textContent = "Use automatic default";
+  automaticBtn.disabled = mobileDefaultState.saving === true;
+  automaticBtn.addEventListener("click", function (e) {
+    e.preventDefault();
+    e.stopPropagation();
+    saveDefaultVendor("");
+  });
+  vendorList.appendChild(automaticBtn);
+  if (mobileDefaultState.error) {
+    var mobileStatus = document.createElement("div");
+    mobileStatus.className = "mobile-session-new-preference-status";
+    mobileStatus.setAttribute("role", "alert");
+    mobileStatus.textContent = mobileDefaultState.error;
+    vendorList.appendChild(mobileStatus);
+  }
+
   container.appendChild(newRow);
+  if (mobileFallbackNote) container.appendChild(mobileFallbackNote);
   container.appendChild(vendorList);
 
   // Partition: loop sessions vs normal sessions (same logic as desktop renderSessionList)

package/lib/public/modules/sidebar-sessions.js

@@ -15,6 +15,7 @@ import { refreshMobileChatSheet } from './sidebar-mobile.js';
 import { VENDOR_AVATARS, VENDOR_NAMES, VENDOR_ORDER, VENDOR_HOMEPAGES, isExperimentalVendor } from './app-rendering.js';
 import { openGroup, separateGroup } from './split-view.js';
 import { groupedSessionIds } from './split-group-helpers.js';
+import { defaultVendorUnavailable, resolvePreferredVendor, saveDefaultVendor } from './default-vendor.js';
 import { openPairDialog } from './split-pair-ui.js';
 import {
   hierarchyItemMatches,
@@ -41,6 +42,7 @@ var countdownContainer = null;
 
 // --- Session context menu ---
 var sessionCtxMenu = null;
+var sessionCtxMenuAnchor = null;
 var sessionCtxSessionId = null;
 var draggedSessionId = null;
 var draggedSessionBookmarked = false;
@@ -48,6 +50,18 @@ var headerSearchOpen = false;
 var armedDeleteSessionId = null;
 var armedDeleteTimer = null;
 
+store.subscribe(function (state, previous) {
+  if (state.defaultVendorState !== previous.defaultVendorState || state.installedVendors !== previous.installedVendors) {
+    var reopenNewMenu = !!(sessionCtxMenu && sessionCtxMenuAnchor);
+    if (reopenNewMenu) closeSessionCtxMenu();
+    if (getSessionListEl()) renderSessionList();
+    if (reopenNewMenu) {
+      var freshAnchor = getSessionListEl().querySelector(".session-top-action.split-chevron");
+      if (freshAnchor) showNewSessionMenu(freshAnchor, resolveDefaultVendor());
+    }
+  }
+});
+
 function sendSessionBookmark(sessionId, bookmarked) {
   if (getWs() && store.get('connected')) {
     getWs().send(JSON.stringify({ type: "set_session_bookmark", sessionId: sessionId, bookmarked: !!bookmarked }));
@@ -317,10 +331,7 @@ function appendSessionCloseButton(el, session) {
 // installed-vendor priority (Claude, then Codex, then the remaining vendors).
 export function resolveDefaultVendor() {
   var installed = store.get('installedVendors') || [];
-  for (var i = 0; i < VENDOR_ORDER.length; i++) {
-    if (installed.indexOf(VENDOR_ORDER[i]) !== -1) return VENDOR_ORDER[i];
-  }
-  return "claude";
+  return resolvePreferredVendor(installed) || "claude";
 }
 
 // Single entry point for session creation from the sidebar. Optimistically
@@ -361,6 +372,7 @@ function renderSessionTopActions() {
   mainBtn.className = "session-top-action split-main";
   mainBtn.type = "button";
   mainBtn.title = "New " + (VENDOR_NAMES[defaultVendor] || defaultVendor) + " session";
+  if (defaultVendorUnavailable(store.get('installedVendors') || [])) mainBtn.title += " (saved default is unavailable; using installed priority)";
   mainBtn.innerHTML = '<img src="' + (VENDOR_AVATARS[defaultVendor] || VENDOR_AVATARS.claude) +
     '" class="session-top-action-icon" alt=""><span>New session</span>';
   mainBtn.addEventListener("click", function () {
@@ -394,6 +406,15 @@ function showNewSessionMenu(anchorBtn, defaultVendor) {
   var menu = document.createElement("div");
   menu.className = "session-ctx-menu session-new-menu";
   var installed = store.get('installedVendors') || [];
+  var defaultVendorState = store.get('defaultVendorState') || {};
+  sessionCtxMenuAnchor = anchorBtn;
+
+  if (defaultVendorUnavailable(installed) && defaultVendorState.preference) {
+    var fallbackNote = document.createElement("div");
+    fallbackNote.className = "session-new-preference-status session-new-fallback-note";
+    fallbackNote.textContent = "Saved default " + (VENDOR_NAMES[defaultVendorState.preference] || defaultVendorState.preference) + " is unavailable. Using " + (VENDOR_NAMES[defaultVendor] || defaultVendor) + ".";
+    menu.appendChild(fallbackNote);
+  }
 
   // Every known vendor is listed. Uninstalled ones stay visible but disabled,
   // and clicking one opens the vendor's homepage so the user can install it.
@@ -401,6 +422,8 @@ function showNewSessionMenu(anchorBtn, defaultVendor) {
     (function (vendor) {
       var isInstalled = installed.indexOf(vendor) !== -1;
       var name = VENDOR_NAMES[vendor] || vendor;
+      var row = document.createElement("div");
+      row.className = "session-new-vendor-row";
       var item = document.createElement("button");
       item.className = "session-ctx-item session-new-vendor";
       if (!isInstalled) item.classList.add("disabled");
@@ -423,10 +446,46 @@ function showNewSessionMenu(anchorBtn, defaultVendor) {
         }
         startNewSession(vendor);
       });
-      menu.appendChild(item);
+      row.appendChild(item);
+      if (isInstalled) {
+        var defaultBtn = document.createElement("button");
+        defaultBtn.type = "button";
+        defaultBtn.className = "session-new-set-default";
+        defaultBtn.textContent = defaultVendorState.saving ? "Saving…" : (vendor === defaultVendor && !defaultVendorUnavailable(installed) ? "Default" : "Set default");
+        defaultBtn.disabled = defaultVendorState.saving === true;
+        defaultBtn.setAttribute("aria-label", "Set " + name + " as default vendor");
+        defaultBtn.title = "Use " + name + " for New session by default";
+        defaultBtn.addEventListener("click", function (e) {
+          e.preventDefault();
+          e.stopPropagation();
+          saveDefaultVendor(vendor);
+        });
+        row.appendChild(defaultBtn);
+      }
+      menu.appendChild(row);
     })(VENDOR_ORDER[i]);
   }
 
+  var automatic = document.createElement("button");
+  automatic.className = "session-ctx-item session-new-automatic";
+  automatic.type = "button";
+  automatic.textContent = "Use automatic default";
+  automatic.disabled = defaultVendorState.saving === true;
+  automatic.title = "Use Clay's installed-vendor priority";
+  automatic.addEventListener("click", function (e) {
+    e.stopPropagation();
+    closeSessionCtxMenu();
+    saveDefaultVendor("");
+  });
+  menu.appendChild(automatic);
+  if (defaultVendorState.error) {
+    var status = document.createElement("div");
+    status.className = "session-new-preference-status";
+    status.setAttribute("role", "alert");
+    status.textContent = defaultVendorState.error;
+    menu.appendChild(status);
+  }
+
   if (installed.length > 0) {
     var pairSep = document.createElement("div");
     pairSep.className = "session-ctx-sep";
@@ -660,6 +719,7 @@ export function getExpandedLoopRuns() {
 // --- Context menu ---
 
 function closeSessionCtxMenu() {
+  sessionCtxMenuAnchor = null;
   if (sessionCtxMenu) {
     sessionCtxMenu.remove();
     sessionCtxMenu = null;

package/lib/public/modules/split-session-boundary.js

@@ -0,0 +1,28 @@
+import { store } from './store.js';
+import { isProjectSessionReady } from './project-activation.js';
+
+export function isCurrentProjectSessionReady(state, socket) {
+  return isProjectSessionReady(state, socket);
+}
+
+export function clearProjectSplitState() {
+  store.set({
+    splitPanes: null,
+    splitGroups: [],
+    splitDelegations: {},
+    splitGroupsProjectSlug: null,
+    sessionListProjectSlug: null,
+    activeSessionId: null,
+    sessionActivatedProjectSlug: null,
+  });
+}
+
+export function markProjectSessionListHydrated() {
+  var slug = store.get('activeProjectSlug');
+  if (slug) store.set({ sessionListProjectSlug: slug });
+}
+
+export function applyProjectSplitGroups(groups) {
+  var slug = store.get('activeProjectSlug');
+  store.set({ splitGroups: groups || [], splitGroupsProjectSlug: slug || null });
+}

package/lib/public/modules/split-view.js

@@ -12,6 +12,9 @@ import { showConfirm } from './app-misc.js';
 import { syncPairChrome } from './split-pair-ui.js';
 import { presentMarkdownEdit } from './filebrowser.js';
 import { autoStartLoginIfNeeded } from './vendor-login.js';
+import { isCurrentProjectSessionReady } from './split-session-boundary.js';
+import { splitPanesMatchProject, hasCurrentSplitGroup, reconcileRestoredSplit } from './project-activation.js';
+import { handlePaneIssueMessage } from './pane-issue-bridge.js';
 
 var host = null;
 var nativeApp = null;
@@ -85,10 +88,11 @@ function showDropOverlay() {
   dropOverlay.classList.add("visible");
 }
 
-function switchNativeSession(sessionId) {
+function switchNativeSession(sessionId, expectedSlug) {
   store.set({ splitPanes: null });
   var ws = getWs();
-  if (ws && ws.readyState === 1) {
+  var state = store.snap();
+  if ((!expectedSlug || expectedSlug === state.currentSlug) && isCurrentProjectSessionReady(state, ws)) {
     ws.send(JSON.stringify({ type: "switch_session", id: sessionId }));
   }
 }
@@ -99,7 +103,7 @@ function closePane(index) {
   if (split.groupId && getWs() && getWs().readyState === 1) {
     getWs().send(JSON.stringify({ type: "split_group_dissolve", id: split.groupId }));
   }
-  switchNativeSession(split.panes[index === 0 ? 1 : 0].sessionId);
+  switchNativeSession(split.panes[index === 0 ? 1 : 0].sessionId, split.panes[index === 0 ? 1 : 0].slug);
 }
 
 function startPaneRename(header, titleEl, pane) {
@@ -288,6 +292,7 @@ function handlePaneMessage(event) {
     if (msg.message) autoStartLoginIfNeeded(msg.message);
     return;
   }
+  if (handlePaneIssueMessage(event, host)) return;
   if (msg.type !== "clay-pane-context") return;
   var frames = host.querySelectorAll(".split-pane-frame");
   for (var i = 0; i < frames.length; i++) {
@@ -372,7 +377,7 @@ export function openGroup(group) {
   var activeId = store.get('activeSessionId');
   if (activeId !== group.members[0] && activeId !== group.members[1]) {
     var ws = getWs();
-    if (ws && ws.readyState === 1) {
+    if (isCurrentProjectSessionReady(store.snap(), ws)) {
       ws.send(JSON.stringify({ type: "switch_session", id: group.members[0] }));
     }
   }
@@ -384,7 +389,33 @@ export function openGroup(group) {
 // group member, reopen that group. Safe to call often -- no-ops unless a
 // group member is active natively with no split open.
 export function maybeRestoreSplitGroup() {
-  if (store.get('paneMode') || store.get('splitPanes')) return;
+  var state = store.snap();
+  if (!isCurrentProjectSessionReady(state, getWs())) return;
+  var split = state.splitPanes;
+  if (split && !splitPanesMatchProject(split, state.currentSlug)) {
+    store.set({ splitPanes: null });
+    return;
+  }
+  if (state.paneMode) return;
+  if (split) {
+    var reconciliation = reconcileRestoredSplit(split, state.splitGroups);
+    if (reconciliation.action === "clear") {
+      store.set({ splitPanes: null });
+      return;
+    }
+    if (reconciliation.action === "rebuild") {
+      var rebuilt = reconciliation.group;
+      if (!sessionById(rebuilt.members[0]) || !sessionById(rebuilt.members[1])) {
+        store.set({ splitPanes: null });
+        return;
+      }
+      store.set({ splitPanes: {
+        groupId: rebuilt.id,
+        panes: [paneForSession(rebuilt.members[0]), paneForSession(rebuilt.members[1])],
+      } });
+    }
+    return;
+  }
   var activeId = store.get('activeSessionId');
   if (!activeId) return;
   var groups = store.get('splitGroups') || [];
@@ -505,12 +536,16 @@ export function initSplitView() {
       }
     }
     if (state.splitGroups !== prev.splitGroups) {
+      if (!isCurrentProjectSessionReady(state, getWs())) return;
       var split = state.splitPanes;
       if (!split || !split.panes) return;
+      if (!splitPanesMatchProject(split, state.currentSlug)) {
+        store.set({ splitPanes: null });
+        return;
+      }
       syncPairChrome(host, split);
       if (split.groupId) {
-        var stillExists = state.splitGroups.some(function (group) { return group.id === split.groupId; });
-        if (!stillExists) switchNativeSession(split.panes[0].sessionId);
+            if (!hasCurrentSplitGroup(split, state.splitGroups)) switchNativeSession(split.panes[0].sessionId, state.currentSlug);
         return;
       }
       var ids = [split.panes[0].sessionId, split.panes[1].sessionId];

package/lib/public/modules/sticky-notes-browser.js

@@ -4,9 +4,8 @@
 // the canvas over the conversation; this pane lists them, splits them into Open
 // and Closed, and is where a note is completed or brought back.
 //
-// Completion here is Close, never delete. A closed note leaves the active
-// canvas and moves to the Closed tab, where it stays readable and reversible.
-// There is deliberately no destructive control on this surface at all.
+// Completion here is Close. Permanent deletion is available only for closed
+// notes and always requires an explicit, accessible confirmation.
 
 import { store } from './store.js';
 import { iconHtml, refreshIcons } from './icons.js';
@@ -14,25 +13,18 @@ import { renderMiniMarkdown, getTitle } from './sticky-note-markdown.js';
 import { enhanceClayLogLinks } from './clay-log-links.js';
 import { send } from './sticky-notes-shared.js';
 import { listNoteData, focusNoteOnCanvas, hideNotes, showNotes } from './sticky-notes.js';
+import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
 
 var panel = null;
 var gridEl = null;
 var tabsEl = null;
+var deleteDialog = null;
+var deleteTrigger = null;
+var deleteRequestCounter = 0;
+var deleteRequestTimer = null;
 
 // Registered by app.js so this module never imports the other right-pane tools
 // and cannot form an import cycle with them.
-var exclusiveClosers = [];
-
-export function registerExclusiveClosers(fns) {
-  exclusiveClosers = (fns || []).filter(function (fn) { return typeof fn === "function"; });
-}
-
-function closeOtherRightTools() {
-  for (var i = 0; i < exclusiveClosers.length; i++) {
-    try { exclusiveClosers[i](); } catch (e) { /* a missing tool must not block opening */ }
-  }
-}
-
 function isClosed(data) {
   if (!data) return false;
   if (data.state === "closed") return true;
@@ -74,11 +66,15 @@ function ensurePanel() {
       '</div>' +
     '</header>' +
     '<div id="notes-browser-tabs" class="notes-browser-tabs" role="tablist" aria-label="Sticky Notes state"></div>' +
-    '<div id="notes-browser-grid" class="notes-browser-grid" role="list"></div>';
+    '<div id="notes-browser-grid" class="notes-browser-grid" role="list"></div>' +
+    '<div id="notes-delete-dialog" class="notes-delete-dialog hidden" role="dialog" aria-modal="true" aria-labelledby="notes-delete-heading">' +
+      '<div class="notes-delete-dialog-card"><h2 id="notes-delete-heading">Delete this note permanently?</h2><p>This permanently removes the note. It cannot be restored.</p><p class="notes-delete-dialog-title"></p><p class="notes-delete-dialog-status" role="status"></p><div class="notes-delete-dialog-actions"><button type="button" data-action="cancel">Cancel</button><button type="button" class="danger" data-action="delete">Delete permanently</button></div></div>' +
+    '</div>';
   panels.appendChild(panel);
 
   gridEl = panel.querySelector("#notes-browser-grid");
   tabsEl = panel.querySelector("#notes-browser-tabs");
+  deleteDialog = panel.querySelector("#notes-delete-dialog");
 
   panel.querySelector("#notes-browser-close").addEventListener("click", closeNotesBrowser);
   panel.querySelector("#notes-browser-wide").addEventListener("click", function () {
@@ -87,6 +83,29 @@ function ensurePanel() {
   panel.querySelector("#notes-browser-fullscreen").addEventListener("click", function () {
     applyWindowState(store.get('notesBrowserWide'), !store.get('notesBrowserFullscreen'));
   });
+  deleteDialog.querySelector('[data-action="cancel"]').addEventListener("click", closeDeleteDialog);
+  deleteDialog.querySelector('[data-action="delete"]').addEventListener("click", confirmDelete);
+  deleteDialog.addEventListener("click", function (event) { if (event.target === deleteDialog) closeDeleteDialog(); });
+  deleteDialog.addEventListener("keydown", function (event) {
+    if (event.key === "Escape") {
+      event.preventDefault();
+      event.stopPropagation();
+      closeDeleteDialog(true);
+      return;
+    }
+    if (event.key !== "Tab") return;
+    var focusable = deleteDialog.querySelectorAll("button:not(:disabled), [href], input:not(:disabled), select:not(:disabled), textarea:not(:disabled), [tabindex]:not([tabindex='-1'])");
+    if (!focusable.length) return;
+    var first = focusable[0];
+    var last = focusable[focusable.length - 1];
+    if (event.shiftKey && document.activeElement === first) {
+      event.preventDefault();
+      last.focus();
+    } else if (!event.shiftKey && document.activeElement === last) {
+      event.preventDefault();
+      first.focus();
+    }
+  });
   refreshIcons();
 }
 
@@ -177,7 +196,8 @@ function buildCard(data) {
   title.textContent = getTitle(data.text) || "Untitled";
   header.appendChild(title);
 
-  // Exactly one lifecycle action per card, and it is never destructive.
+  // Closing and reopening are lifecycle actions; permanent deletion is offered
+  // separately below only because this card is known to be closed.
   var action = document.createElement("button");
   action.type = "button";
   action.className = "notes-browser-card-action";
@@ -211,6 +231,14 @@ function buildCard(data) {
   card.appendChild(body);
 
   if (closed) {
+    var deleteAction = document.createElement("button");
+    deleteAction.type = "button";
+    deleteAction.className = "notes-browser-card-action notes-browser-card-delete";
+    deleteAction.innerHTML = iconHtml("trash-2") + "<span>Delete permanently</span>";
+    deleteAction.title = "Permanently delete this closed note";
+    deleteAction.setAttribute("aria-label", "Delete permanently: " + title.textContent);
+    deleteAction.addEventListener("click", function (e) { e.stopPropagation(); openDeleteDialog(data, deleteAction); });
+    header.appendChild(deleteAction);
     var meta = document.createElement("p");
     meta.className = "notes-browser-card-meta";
     meta.textContent = closedMeta(data);
@@ -235,6 +263,77 @@ function buildCard(data) {
   return card;
 }
 
+function nextDeleteRequestId() {
+  deleteRequestCounter++;
+  return "delete-note-" + Date.now() + "-" + deleteRequestCounter;
+}
+
+function accountKey() {
+  return store.get('myUserId') ? String(store.get('myUserId')) : "single";
+}
+
+function openDeleteDialog(data, trigger) {
+  if (!deleteDialog || !data || !isClosed(data)) return;
+  deleteTrigger = trigger || null;
+  store.set({ notesDeletePending: { noteId: data.id, requestId: null, projectSlug: store.get('currentSlug') || null, accountKey: accountKey() } });
+  deleteDialog.querySelector(".notes-delete-dialog-title").textContent = getTitle(data.text) || "Untitled";
+  deleteDialog.querySelector(".notes-delete-dialog-status").textContent = "";
+  deleteDialog.querySelector('[data-action="delete"]').disabled = false;
+  deleteDialog.querySelector('[data-action="cancel"]').disabled = false;
+  deleteDialog.classList.remove("hidden");
+  deleteDialog.querySelector('[data-action="cancel"]').focus();
+}
+
+function closeDeleteDialog(force) {
+  var pending = store.get('notesDeletePending');
+  if (!force && pending && pending.requestId) return;
+  if (deleteRequestTimer) { clearTimeout(deleteRequestTimer); deleteRequestTimer = null; }
+  if (deleteDialog) deleteDialog.classList.add("hidden");
+  store.set({ notesDeletePending: null });
+  if (deleteTrigger && deleteTrigger.isConnected) deleteTrigger.focus();
+  deleteTrigger = null;
+}
+
+function confirmDelete() {
+  var pending = store.get('notesDeletePending');
+  if (!pending || !deleteDialog) return;
+  if (!store.get('connected')) {
+    deleteDialog.querySelector(".notes-delete-dialog-status").textContent = "Sticky Notes are unavailable while disconnected.";
+    return;
+  }
+  var requestId = nextDeleteRequestId();
+  store.set({ notesDeletePending: Object.assign({}, pending, { requestId: requestId }) });
+  deleteDialog.querySelector('[data-action="delete"]').disabled = true;
+  deleteDialog.querySelector('[data-action="cancel"]').disabled = true;
+  deleteDialog.querySelector(".notes-delete-dialog-status").textContent = "Deleting permanently...";
+  send({ type: "note_delete_permanently", id: pending.noteId, requestId: requestId });
+  deleteRequestTimer = setTimeout(function () {
+    var active = store.get('notesDeletePending');
+    if (!deleteDialog || !active || active.requestId !== requestId) return;
+    store.set({ notesDeletePending: Object.assign({}, active, { requestId: null }) });
+    deleteDialog.querySelector('[data-action="delete"]').disabled = false;
+    deleteDialog.querySelector('[data-action="cancel"]').disabled = false;
+    deleteDialog.querySelector(".notes-delete-dialog-status").textContent = "The delete request timed out. Try again.";
+    deleteRequestTimer = null;
+  }, 10000);
+}
+
+export function handleNoteDeleteResult(msg) {
+  var pending = store.get('notesDeletePending');
+  if (!deleteDialog || !msg || msg.projectSlug !== store.get('currentSlug') ||
+      msg.requestId !== (pending && pending.requestId) || !pending || msg.noteId !== pending.noteId ||
+      msg.projectSlug !== pending.projectSlug || pending.accountKey !== accountKey()) return;
+  if (deleteRequestTimer) { clearTimeout(deleteRequestTimer); deleteRequestTimer = null; }
+  if (msg.ok) {
+    closeDeleteDialog(true);
+    return;
+  }
+  store.set({ notesDeletePending: Object.assign({}, pending, { requestId: null }) });
+  deleteDialog.querySelector('[data-action="delete"]').disabled = false;
+  deleteDialog.querySelector('[data-action="cancel"]').disabled = false;
+  deleteDialog.querySelector(".notes-delete-dialog-status").textContent = msg.error || "The note could not be deleted.";
+}
+
 function emptyState(tab) {
   var empty = document.createElement("div");
   empty.className = "notes-browser-empty";
@@ -253,6 +352,11 @@ function emptyState(tab) {
 export function renderNotesBrowser() {
   if (!gridEl) return;
   var all = listNoteData();
+  var pending = store.get('notesDeletePending');
+  if (pending) {
+    var pendingCurrent = all.filter(function (item) { return item && item.id === pending.noteId; })[0];
+    if (!pendingCurrent || !isClosed(pendingCurrent)) closeDeleteDialog(true);
+  }
   var open = openNotes(all);
   var closed = closedNotes(all);
   renderTabs(open.length, closed.length);
@@ -283,7 +387,7 @@ export function renderNotesBrowser() {
 export function openNotesBrowser() {
   ensurePanel();
   if (!panel) return;
-  closeOtherRightTools();
+  claimRightWorkbench("notes-browser");
   // The floating canvas would otherwise sit on top of the pane.
   hideNotes();
   panel.classList.remove("hidden");
@@ -295,6 +399,10 @@ export function openNotesBrowser() {
 }
 
 export function closeNotesBrowser() {
+  // Reset destructive UI state even when the panel was already closed. Right
+  // workbench/project transitions can race with panel visibility updates.
+  closeDeleteDialog(true);
+  releaseRightWorkbench("notes-browser");
   if (!store.get('notesBrowserOpen')) return;
   if (panel) panel.classList.add("hidden");
   // Fullscreen is always dropped on close so the next open is a bounded pane.
@@ -311,12 +419,16 @@ export function isNotesBrowserOpen() {
 }
 
 export function initNotesBrowser() {
+  registerRightWorkbench("notes-browser", closeNotesBrowser);
   document.addEventListener("keydown", function (e) {
     if (e.key !== "Escape") return;
+    if (deleteDialog && !deleteDialog.classList.contains("hidden")) return;
     if (!store.get('notesBrowserOpen')) return;
     closeNotesBrowser();
   });
   store.subscribe(function (state, previous) {
+    if (state.connected !== previous.connected || state.myUserId !== previous.myUserId ||
+        state.isMultiUserMode !== previous.isMultiUserMode) closeDeleteDialog(true);
     if (state.currentSlug === previous.currentSlug) return;
     // A different project starts from a closed, bounded, Open-tab pane.
     closeNotesBrowser();

package/lib/public/modules/sticky-notes.js

@@ -424,13 +424,12 @@ export function handleNoteWritten(msg) {
 // an older daemon on the other end of the socket still must not corrupt state.
 export function handleNoteDeleted(msg) {
   var entry = notes.get(msg.id);
-  if (!entry) return;
-  entry.el.remove();
+  if (entry) entry.el.remove();
+  clearNoteTimers(msg.id);
   notes.delete(msg.id);
   updateBadge();
   updateSidebarBadge();
 
-  clearNoteTimers(msg.id);
   refreshBrowser();
 }
 

package/lib/public/modules/terminal.js

@@ -1,11 +1,10 @@
 import { iconHtml, refreshIcons } from './icons.js';
 import { closeSidebar } from './sidebar.js';
-import { closeFileViewer } from './filebrowser.js';
+import { claimRightWorkbench, registerRightWorkbench, releaseRightWorkbench } from './right-workbench.js';
 import { copyToClipboard } from './utils.js';
 import { getTerminalTheme } from './theme.js';
 import { getTerminalFontFamily, getTerminalFontSize, onTerminalFontChange } from './terminal-prefs.js';
 import { createKeyToolbar } from './terminal-toolbar.js';
-import { closeIssues } from './issues.js';
 
 var ctx;
 var tabs = new Map(); // termId -> { id, title, exited, xterm, fitAddon, bodyEl }
@@ -136,6 +135,7 @@ function createMultiLineLinkProvider(xterm) {
 // --- Init ---
 export function initTerminal(_ctx) {
   ctx = _ctx;
+  registerRightWorkbench("terminal", closeTerminal);
 
   // Close panel button
   document.getElementById("terminal-close").addEventListener("click", function () {
@@ -193,8 +193,7 @@ export function openTerminal() {
   var container = ctx.terminalContainerEl;
 
   // Hide file viewer if open (also unwatches)
-  closeFileViewer();
-  closeIssues();
+  claimRightWorkbench("terminal");
 
   container.classList.remove("hidden");
   isOpen = true;
@@ -224,6 +223,7 @@ export function openTerminal() {
 
 // --- Close terminal panel (hide, detach, but keep PTYs alive) ---
 export function closeTerminal() {
+  releaseRightWorkbench("terminal");
   var container = ctx.terminalContainerEl;
   container.classList.remove("panel-fullscreen");
   container.classList.add("hidden");