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

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();
+});

package/lib/public/modules/scheduled-tasks.js

@@ -2,10 +2,7 @@ import { store } from './store.js';
 import { getWs } from './ws-ref.js';
 import { refreshIcons, iconHtml } from './icons.js';
 import { showToast } from './utils.js';
-import { closeProjectLogs } from './project-logs.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 { humanRecurrence } from './scheduled-task-recurrence.js';
 import { humanScheduleRule } from './scheduled-task-schedule-rule.js';
 import { readExecutionRuntime, renderExecutionRuntime } from './scheduled-task-engine.js';
@@ -320,7 +317,7 @@ export function openScheduledTasks() {
   if (!canOpen()) { closeScheduledTasks(); return; }
   ensurePanel();
   if (!panel) return;
-  closeProjectLogs(); closeNotesBrowser(); closeFileViewer(); closeTerminal();
+  claimRightWorkbench("scheduled-tasks");
   panel.classList.remove("hidden");
   applyWindowState(store.get('scheduledTasksWide'), false);
   store.set({ scheduledTasksOpen: true });
@@ -330,6 +327,7 @@ export function openScheduledTasks() {
 }
 
 export function closeScheduledTasks() {
+  releaseRightWorkbench("scheduled-tasks");
   if (panel) panel.classList.add("hidden");
   setCreateMenu(false);
   applyWindowState(store.get('scheduledTasksWide'), false);
@@ -430,6 +428,7 @@ export function handleScheduledTaskSessionSwitched(msg) {
 }
 
 export function initScheduledTasks() {
+  registerRightWorkbench("scheduled-tasks", closeScheduledTasks);
   var button = document.getElementById("scheduler-btn");
   if (button) button.addEventListener("click", function () { if (isScheduledTasksOpen()) closeScheduledTasks(); else openScheduledTasks(); });
   document.addEventListener("click", handleDocumentClick);

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;