clay-server 4.1.0-beta.9 → 4.2.0-beta.1

package/lib/public/modules/project-session-visibility-settings.js

@@ -0,0 +1,138 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { showToast } from './utils.js';
+
+var requestSequence = 0;
+var initialized = false;
+
+function selectElement() {
+  return document.getElementById("ps-session-visibility-default");
+}
+
+function pendingState() {
+  return (store.get('projectSessionVisibilityState') || {}).pending || null;
+}
+
+function activeState() {
+  return (store.get('projectSessionVisibilityState') || {}).active || null;
+}
+
+function setVisibilityState(active, pending) {
+  store.set({ projectSessionVisibilityState: { active: active || null, pending: pending || null } });
+}
+
+function setSelectState(select, value, disabled) {
+  if (!select) return;
+  select.value = value;
+  select.disabled = !!disabled;
+}
+
+function isCurrentProject(active) {
+  return !!(active && active.slug && active.slug === store.get('currentSlug'));
+}
+
+function isReadOnly(active) {
+  return !active || !active.authorized || active.isWorktree || !isCurrentProject(active);
+}
+
+function renderActiveState() {
+  var active = activeState();
+  var pending = pendingState();
+  var select = selectElement();
+  var inheritedHint = document.getElementById("ps-session-visibility-default-inherited-hint");
+  var nonCurrentHint = document.getElementById("ps-session-visibility-default-non-current-hint");
+  if (inheritedHint) inheritedHint.classList.toggle("hidden", !(active && active.isWorktree));
+  if (nonCurrentHint) nonCurrentHint.classList.toggle("hidden", !(active && active.authorized && !active.isWorktree && !isCurrentProject(active)));
+  if (!select || !active) return;
+  setSelectState(select, active.effectiveValue, isReadOnly(active) || !!(pending && pending.slug === active.slug));
+}
+
+function isAuthorized(project) {
+  var users = store.get('cachedAllUsers') || [];
+  var userId = store.get('myUserId');
+  var currentUser = null;
+  for (var i = 0; i < users.length; i++) {
+    if (users[i].id === userId) { currentUser = users[i]; break; }
+  }
+  return !!(store.get('isMultiUserMode') && project &&
+    ((project.projectOwnerId && project.projectOwnerId === userId) || (currentUser && currentUser.role === "admin")) &&
+    (!store.get('permissions') || store.get('permissions').projectSettings !== false));
+}
+
+export function initProjectSessionVisibilitySettings() {
+  var select = selectElement();
+  if (!select || initialized) return;
+  initialized = true;
+  select.addEventListener("change", function () {
+    var ws = getWs();
+    var active = activeState();
+    var slug = active && active.slug || "";
+    var prior = active && active.effectiveValue || "private";
+    if (!slug || !ws || ws.readyState !== 1 || pendingState() || isReadOnly(active)) {
+      setSelectState(select, prior, isReadOnly(active) || !!pendingState());
+      return;
+    }
+    requestSequence += 1;
+    var requestId = "project-session-visibility-" + Date.now() + "-" + requestSequence;
+    setVisibilityState(active, { requestId: requestId, slug: slug, requested: select.value, previous: prior });
+    setSelectState(select, select.value, true);
+    ws.send(JSON.stringify({ type: "set_project_session_visibility_default", slug: slug, visibility: select.value, requestId: requestId }));
+  });
+
+  store.subscribe(function (state, previous) {
+    if (state.currentSlug !== previous.currentSlug) renderActiveState();
+    if (state.connected || previous.connected !== true) return;
+    var pending = pendingState();
+    if (!pending) return;
+    var current = selectElement();
+    var active = activeState();
+    if (current && active && active.slug === pending.slug) setSelectState(current, pending.previous, isReadOnly(active));
+    setVisibilityState(active, null);
+    renderActiveState();
+  });
+}
+
+export function populateProjectSessionVisibilitySettings(slug, project) {
+  var field = document.getElementById("ps-session-visibility-default-field");
+  var select = selectElement();
+  if (field) field.style.display = isAuthorized(project) ? "" : "none";
+  if (!select) return;
+  var value = project && project.sessionVisibilityDefault === "shared" ? "shared" : "private";
+  var active = { slug: slug || "", effectiveValue: value, isWorktree: !!(project && project.isWorktree), authorized: isAuthorized(project) };
+  var pending = pendingState();
+  setVisibilityState(active, pending);
+  renderActiveState();
+}
+
+export function refreshProjectSessionVisibilitySettings(projects) {
+  var select = selectElement();
+  if (!select) return;
+  var active = activeState();
+  var slug = active && active.slug || "";
+  var source = Array.isArray(projects) ? projects : [];
+  for (var i = 0; i < source.length; i++) {
+    if (source[i] && source[i].slug === slug) {
+      populateProjectSessionVisibilitySettings(slug, source[i]);
+      return;
+    }
+  }
+}
+
+export function handleProjectSessionVisibilityDefault(msg) {
+  var pending = pendingState();
+  if (!pending || msg.requestId !== pending.requestId || msg.slug !== pending.slug) return;
+  var active = activeState();
+  setVisibilityState(active, null);
+  var select = selectElement();
+  if (!select || !active || active.slug !== msg.slug) return;
+  if (!msg.ok) {
+    active = Object.assign({}, active, { effectiveValue: pending.previous });
+    setVisibilityState(active, null);
+    setSelectState(select, pending.previous, isReadOnly(active));
+    showToast(msg.error || "Failed to update new session visibility", "error");
+    return;
+  }
+  active = Object.assign({}, active, { effectiveValue: msg.visibility === "shared" ? "shared" : "private" });
+  setVisibilityState(active, null);
+  setSelectState(select, active.effectiveValue, isReadOnly(active));
+}

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

@@ -4,6 +4,7 @@ import { showToast } from './utils.js';
 import { parseEmojis } from './markdown.js';
 import { closeFileViewer } from './filebrowser.js';
 import { renderModelList, renderModeList, renderEffortBar, renderThinkingBar, renderBetaCard } from './settings-defaults.js';
+import { initProjectSessionVisibilitySettings, populateProjectSessionVisibilitySettings } from './project-session-visibility-settings.js';
 
 var ctx = null;
 var panelEl = null;
@@ -162,6 +163,8 @@ export function initProjectSettings(appCtx, emojiCategories) {
       hideTransferForm();
     });
   }
+
+  initProjectSessionVisibilitySettings();
 }
 
 // ===== Open / Close =====
@@ -246,6 +249,8 @@ function populateProfile() {
   // Icon
   updateIconPreview(currentProject ? currentProject.icon : null);
 
+  populateProjectSessionVisibilitySettings(currentSlug, currentProject);
+
   // Owner (only in multi-user mode)
   var ownerField = document.getElementById("ps-owner-field");
   if (ownerField) {

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-result-client.js

@@ -0,0 +1,33 @@
+// Pure Scheduled Tasks result-news decisions. The production controller owns
+// store, WebSocket, DOM, and peer-module calls directly.
+
+export function scheduledResultStateTransition(state, msg) {
+  var patch = { scheduledResultUnread: Number(msg.unreadCount) || 0 };
+  var openRef = null;
+  if (msg.autoFocus && msg.newestUnreadRef && !state.scheduledResultAutoFocusHandled) {
+    patch.scheduledResultAutoFocusHandled = true;
+    patch.scheduledResultFocusRef = msg.newestUnreadRef;
+    openRef = msg.newestUnreadRef;
+  }
+  return { patch: patch, openRef: openRef };
+}
+
+export function scheduledResultCreatedTransition(state, msg) {
+  if (!msg || !msg.ref || (state.scheduledResultSeenRefs || {})[msg.ref]) return null;
+  var seen = Object.assign({}, state.scheduledResultSeenRefs || {});
+  seen[msg.ref] = true;
+  return { scheduledResultSeenRefs: seen, scheduledResultUnread: (state.scheduledResultUnread || 0) + 1 };
+}
+
+export function shouldAcknowledgeScheduledResult(entry, state, visibilityState) {
+  return !!(entry && entry.scheduledResult && visibilityState !== "hidden" && state.projectLogsOpen && state.projectLogsView === "detail" && state.projectLogsSelectedRef === entry.ref);
+}
+
+export function shouldFocusScheduledResult(entry, state) {
+  return !!(entry && state.scheduledResultFocusRef === entry.ref);
+}
+
+export function scheduledResultSessionId(state, msg) {
+  if (msg.requestId && msg.requestId !== state.scheduledResultSessionRequestId) return null;
+  return typeof msg.sessionId === "number" ? msg.sessionId : null;
+}

package/lib/public/modules/scheduled-result-display.js

@@ -0,0 +1,50 @@
+import { store } from './store.js';
+import { getWs } from './ws-ref.js';
+import { showToast } from './utils.js';
+import { shouldAcknowledgeScheduledResult, shouldFocusScheduledResult } from './scheduled-result-client.js';
+
+function sendRead(ref) {
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) return false;
+  ws.send(JSON.stringify({ type: "scheduled_task_result_mark_read", ref: ref }));
+  return true;
+}
+
+var openRequestCounter = 0;
+export function openScheduledResultSession(entry) {
+  if (!entry || !entry.scheduledResult) return false;
+  openRequestCounter += 1;
+  var requestId = "open-scheduled-session-" + Date.now() + "-" + openRequestCounter;
+  store.set({ scheduledResultSessionRequestId: requestId });
+  var ws = getWs();
+  if (!ws || ws.readyState !== 1) { showToast("Reconnect to view this scheduled session.", "warn"); return false; }
+  ws.send(JSON.stringify({ type: "scheduled_task_result_open_session", requestId: requestId, ref: entry.ref })); return true;
+}
+
+function acknowledgeVisible() {
+  var ref = store.get('scheduledResultPendingReadRef');
+  if (!ref || document.visibilityState === "hidden") return;
+  store.set({ scheduledResultPendingReadRef: null });
+  var state = store.snap();
+  if (state.projectLogsOpen && state.projectLogsView === "detail" && state.projectLogsSelectedRef === ref) sendRead(ref);
+}
+
+export function clearPendingScheduledResultRead() {
+  store.set({ scheduledResultPendingReadRef: null });
+}
+
+export function handleScheduledResultDisplayed(entry) {
+  var state = store.snap();
+  if (shouldFocusScheduledResult(entry, state)) {
+    store.set({ scheduledResultFocusRef: null });
+    var heading = document.querySelector("#project-logs-detail .project-log-document h1");
+    if (heading) { heading.setAttribute("tabindex", "-1"); heading.focus(); }
+  }
+  if (shouldAcknowledgeScheduledResult(entry, store.snap(), document.visibilityState)) {
+    clearPendingScheduledResultRead(); sendRead(entry.ref);
+  } else if (entry && entry.scheduledResult && document.visibilityState === "hidden") store.set({ scheduledResultPendingReadRef: entry.ref });
+}
+
+export function initScheduledResultDisplay() {
+  document.addEventListener("visibilitychange", acknowledgeVisible);
+}

package/lib/public/modules/scheduled-result-notification.js

@@ -0,0 +1,31 @@
+import { refreshIcons, iconHtml } from './icons.js';
+import { escapeHtml } from './utils.js';
+
+function removeBanner(banner) {
+  if (!banner || !banner.parentNode) return;
+  banner.classList.remove("show");
+  setTimeout(function () { if (banner.parentNode) banner.remove(); }, 220);
+}
+
+export function showScheduledResultNotification(title, body, onOpen) {
+  var container = document.querySelector(".notif-banner-container");
+  if (!container) return false;
+  var banner = document.createElement("div");
+  banner.className = "notif-banner";
+  banner.innerHTML =
+    '<div class="notif-banner-icon">' + iconHtml("calendar-check") + '</div>' +
+    '<div class="notif-banner-body"><div class="notif-banner-project">SCHEDULED TASKS</div>' +
+      '<div class="notif-banner-title">' + escapeHtml(title || "Scheduled task finished") + '</div>' +
+      (body ? '<div class="notif-banner-text">' + escapeHtml(body) + '</div>' : '') +
+      '<div class="notif-banner-actions"><button class="notif-banner-result-open">View result</button></div></div>' +
+    '<button class="notif-banner-close" aria-label="Dismiss notification">' + iconHtml("x") + '</button>';
+  container.appendChild(banner);
+  refreshIcons(banner);
+  requestAnimationFrame(function () { banner.classList.add("show"); });
+  banner.querySelector(".notif-banner-result-open").addEventListener("click", function (event) {
+    event.stopPropagation(); removeBanner(banner); if (typeof onOpen === "function") onOpen();
+  });
+  banner.querySelector(".notif-banner-close").addEventListener("click", function (event) { event.stopPropagation(); removeBanner(banner); });
+  setTimeout(function () { removeBanner(banner); }, 8000);
+  return true;
+}

package/lib/public/modules/scheduled-task-presentation.js

@@ -0,0 +1,15 @@
+export function scheduledTaskExecutionLabel(record) {
+  if (record.activeRun) {
+    if (record.activeRun.status === "needs-input") return "Needs input";
+    if (record.activeRun.status === "waiting-worker") return "Waiting for Worker";
+    if (record.activeRun.status === "reviewing") return "Driver reviewing";
+    return "Running";
+  }
+  if (!record.execution) return "Needs setup";
+  if (record.readiness && record.readiness.ok === false) return "Unavailable";
+  return record.enabled === false ? "Paused" : "Active";
+}
+
+export function scheduledTaskOpenRunLabel(record) {
+  return record.activeRun && record.activeRun.status === "needs-input" ? "Open blocked run" : "Open run";
+}

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

@@ -2,16 +2,14 @@ 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';
 import { openDefaultAi } from './default-ai.js';
 import { reconcileScheduledTaskEdit } from './scheduled-task-edit-state.js';
 import { editorFields, fillEditor, readEditor, serverEditorData, validateEditor, handleEditorScheduleChange } from './scheduled-task-form.js';
+import { scheduledTaskExecutionLabel, scheduledTaskOpenRunLabel } from './scheduled-task-presentation.js';
 
 export { isStrictCron, humanRecurrence } from './scheduled-task-recurrence.js';
 
@@ -56,18 +54,6 @@ function scheduleLabel(record) {
   return "No schedule";
 }
 
-function executionLabel(record) {
-  if (record.activeRun) {
-    if (record.activeRun.status === "needs-input") return "Needs input";
-    if (record.activeRun.status === "waiting-worker") return "Waiting for Worker";
-    if (record.activeRun.status === "reviewing") return "Driver reviewing";
-    return "Running";
-  }
-  if (!record.execution) return "Needs setup";
-  if (record.readiness && record.readiness.ok === false) return "Unavailable";
-  return record.enabled === false ? "Paused" : "Active";
-}
-
 function ensurePanel() {
   if (panel) return;
   var host = document.getElementById("main-panels");
@@ -185,7 +171,7 @@ function buildRow(record) {
   row.className = "scheduled-task-row" + (record.enabled === false ? " paused" : "");
   row.dataset.taskId = record.id;
   row.setAttribute("role", "listitem");
-  var stateLabel = executionLabel(record);
+  var stateLabel = scheduledTaskExecutionLabel(record);
   row.innerHTML =
     '<button class="scheduled-task-summary" type="button" data-action="expand" aria-expanded="' + (expandedId === record.id ? "true" : "false") + '">' +
       '<span class="scheduled-task-state-dot" aria-hidden="true"></span>' +
@@ -212,12 +198,12 @@ function buildRow(record) {
       detail.appendChild(instructions);
       var context = document.createElement("div");
       context.className = "scheduled-task-context";
-      var executionState = executionLabel(record);
+      var executionState = scheduledTaskExecutionLabel(record);
       context.textContent = (record.projectTitle || store.get('currentSlug') || "Project") + " · " + executionState + (record.execution ? " · Driver and Split Worker" : " · Choose execution pair in Edit");
       detail.appendChild(context);
       var actions = document.createElement("div");
       actions.className = "scheduled-task-actions";
-      actions.innerHTML = '<button type="button" data-action="edit">' + iconHtml("pencil") + 'Edit</button><button type="button" data-action="toggle">' + iconHtml(record.enabled === false ? "play" : "pause") + (record.enabled === false ? "Resume" : "Pause") + '</button><button type="button" data-action="run">' + iconHtml("zap") + 'Run now</button>' + (record.activeRun || record.latestRun ? '<button type="button" data-action="open-run">' + iconHtml("columns-2") + 'Open run</button>' : '') + '<button type="button" data-action="delete" class="danger">' + iconHtml("trash-2") + 'Delete</button>';
+      actions.innerHTML = '<button type="button" data-action="edit">' + iconHtml("pencil") + 'Edit</button><button type="button" data-action="toggle">' + iconHtml(record.enabled === false ? "play" : "pause") + (record.enabled === false ? "Resume" : "Pause") + '</button><button type="button" data-action="run">' + iconHtml("zap") + 'Run now</button>' + (record.activeRun || record.latestRun ? '<button type="button" data-action="open-run">' + iconHtml("columns-2") + scheduledTaskOpenRunLabel(record) + '</button>' : '') + '<button type="button" data-action="delete" class="danger">' + iconHtml("trash-2") + 'Delete</button>';
       detail.appendChild(actions);
     }
     row.appendChild(detail);
@@ -271,7 +257,7 @@ function handleClick(event) {
   var button = event.target.closest("button[data-action]");
   if (!button) return;
   var action = button.dataset.action;
-  if (action === "default-ai") { openDefaultAi(); return; }
+  if (action === "default-ai") { event.stopPropagation(); openDefaultAi(); return; }
   if (action === "close") { closeScheduledTasks(); return; }
   if (action === "wide") { applyWindowState(!store.get('scheduledTasksWide'), store.get('scheduledTasksFullscreen')); return; }
   if (action === "fullscreen") { applyWindowState(store.get('scheduledTasksWide'), !store.get('scheduledTasksFullscreen')); return; }
@@ -331,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 });
@@ -341,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);
@@ -441,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-projects.js

@@ -1,7 +1,7 @@
 // sidebar-projects.js - Project icon strip, context menus, emoji picker, drag-and-drop, worktree modal
 // Extracted from sidebar.js (PR-36)
 
-import { escapeHtml } from './utils.js';
+import { escapeHtml, showToast } from './utils.js';
 import { iconHtml, refreshIcons } from './icons.js';
 import { openProjectSettings } from './project-settings.js';
 import { triggerShare } from './qrcode.js';
@@ -415,6 +415,11 @@ function showProjectCtxMenu(anchorEl, slug, name, icon, position) {
   closeProjectCtxMenu();
   if (closeUserCtxMenu) closeUserCtxMenu();
   closeEmojiPicker();
+  var projects = getCachedProjects();
+  var targetProject = null;
+  for (var projectIndex = 0; projectIndex < projects.length; projectIndex++) {
+    if (projects[projectIndex].slug === slug) { targetProject = projects[projectIndex]; break; }
+  }
 
   var menu = document.createElement("div");
   menu.className = "project-ctx-menu";
@@ -438,7 +443,13 @@ function showProjectCtxMenu(anchorEl, slug, name, icon, position) {
     settingsItem.addEventListener("click", function (e) {
       e.stopPropagation();
       closeProjectCtxMenu();
-      openProjectSettings(slug, { slug: slug, name: name, icon: icon, projectOwnerId: store.get('currentProjectOwnerId'), ownerLocked: store.get('ownerLocked') });
+      if (!targetProject) {
+        showToast("Project details are unavailable. Refresh and try again.", "error");
+        return;
+      }
+      openProjectSettings(slug, Object.assign({}, targetProject, {
+        name: targetProject.title || targetProject.project || name,
+      }));
     });
     menu.appendChild(settingsItem);
   }
@@ -460,7 +471,7 @@ function showProjectCtxMenu(anchorEl, slug, name, icon, position) {
 
   // --- Manage Access ---
   if (store.get('isMultiUserMode')) {
-    var isProjectOwner = store.get('myUserId') && store.get('currentProjectOwnerId') && store.get('myUserId') === store.get('currentProjectOwnerId');
+    var isProjectOwner = store.get('myUserId') && targetProject && targetProject.projectOwnerId && store.get('myUserId') === targetProject.projectOwnerId;
     var isAdmin = store.get('permissions') && store.get('permissions').projectSettings !== false;
     if (isProjectOwner || isAdmin) {
       var accessItem = document.createElement("button");