clay-server 2.36.0 → 2.36.1-beta.2

package/bin/cli.js

@@ -1503,11 +1503,9 @@ async function forkDaemon(mode, keepAwake, extraProjects, addCwd, wantOsUsers) {
         break;
       }
     }
-    // Restore access settings from previous config
+    // Restore project-level settings from previous config
     if (prevProjectMap[cwd]) {
-      if (prevProjectMap[cwd].visibility) cwdEntry.visibility = prevProjectMap[cwd].visibility;
-      if (prevProjectMap[cwd].allowedUsers) cwdEntry.allowedUsers = prevProjectMap[cwd].allowedUsers;
-      if (prevProjectMap[cwd].ownerId) cwdEntry.ownerId = prevProjectMap[cwd].ownerId;
+      cwdEntry = Object.assign({}, prevProjectMap[cwd], cwdEntry);
     }
     allProjects.push(cwdEntry);
     usedSlugs.push(slug);
@@ -1522,21 +1520,19 @@ async function forkDaemon(mode, keepAwake, extraProjects, addCwd, wantOsUsers) {
       var rpSlug = generateSlug(rp.path, usedSlugs);
       usedSlugs.push(rpSlug);
       var rpEntry = { path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() };
-      // Restore access settings from previous config
+      // Restore project-level settings from previous config
       if (prevProjectMap[rp.path]) {
-        if (prevProjectMap[rp.path].visibility) rpEntry.visibility = prevProjectMap[rp.path].visibility;
-        if (prevProjectMap[rp.path].allowedUsers) rpEntry.allowedUsers = prevProjectMap[rp.path].allowedUsers;
-        if (prevProjectMap[rp.path].ownerId) rpEntry.ownerId = prevProjectMap[rp.path].ownerId;
+        rpEntry = Object.assign({}, prevProjectMap[rp.path], rpEntry);
       }
       allProjects.push(rpEntry);
     }
   }
 
-  var config = {
+  var config = Object.assign({}, prevConfig || {}, {
     pid: null,
     port: port,
     host: host,
-    pinHash: mode === "multi" && cliPin ? generateAuthToken(cliPin) : null,
+    pinHash: mode === "multi" && cliPin ? generateAuthToken(cliPin) : (prevConfig && prevConfig.pinHash) || null,
     tls: hasTls,
     builtinCert: hasBuiltinCert,
     mkcertDetected: mkcertDetected,
@@ -1548,7 +1544,7 @@ async function forkDaemon(mode, keepAwake, extraProjects, addCwd, wantOsUsers) {
     mode: mode || "single",
     setupCompleted: true,
     projects: allProjects,
-  };
+  });
 
   ensureConfigDir();
   saveConfig(config);
@@ -1687,8 +1683,7 @@ async function devMode(mode, keepAwake, existingPinHash, wantOsUsers) {
   }
   // Restore access settings for cwd from previous config
   if (prevDevProjectMap[cwd]) {
-    if (prevDevProjectMap[cwd].visibility) cwdDevEntry.visibility = prevDevProjectMap[cwd].visibility;
-    if (prevDevProjectMap[cwd].allowedUsers) cwdDevEntry.allowedUsers = prevDevProjectMap[cwd].allowedUsers;
+    cwdDevEntry = Object.assign({}, prevDevProjectMap[cwd], cwdDevEntry);
   }
   var allProjects = [cwdDevEntry];
   var usedSlugs = [slug];
@@ -1697,15 +1692,14 @@ async function devMode(mode, keepAwake, existingPinHash, wantOsUsers) {
     var rpSlug = generateSlug(rp.path, usedSlugs);
     usedSlugs.push(rpSlug);
     var rpDevEntry = { path: rp.path, slug: rpSlug, title: rp.title || undefined, icon: rp.icon || undefined, addedAt: rp.addedAt || Date.now() };
-    // Restore access settings from previous config
+    // Restore project-level settings from previous config
     if (prevDevProjectMap[rp.path]) {
-      if (prevDevProjectMap[rp.path].visibility) rpDevEntry.visibility = prevDevProjectMap[rp.path].visibility;
-      if (prevDevProjectMap[rp.path].allowedUsers) rpDevEntry.allowedUsers = prevDevProjectMap[rp.path].allowedUsers;
+      rpDevEntry = Object.assign({}, prevDevProjectMap[rp.path], rpDevEntry);
     }
     allProjects.push(rpDevEntry);
   }
 
-  var config = {
+  var config = Object.assign({}, prevDevConfig || {}, {
     pid: null,
     port: port,
     host: host,
@@ -1720,7 +1714,7 @@ async function devMode(mode, keepAwake, existingPinHash, wantOsUsers) {
     setupCompleted: true,
     projects: allProjects,
     osUsers: wantOsUsers || (prevDevConfig ? (prevDevConfig.osUsers || false) : false),
-  };
+  });
 
   ensureConfigDir();
   saveConfig(config);

package/lib/project.js

@@ -911,7 +911,19 @@ function createProjectContext(opts) {
         var firstModel = vendorModels[0] || "";
         // model value can be string or {value, displayName} object
         var defaultModel = typeof firstModel === "string" ? firstModel : (firstModel.value || "");
-        sendTo(ws, { type: "model_info", model: defaultModel, models: vendorModels, vendor: msg.vendor, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
+        // Preserve the user's current model selection if it belongs to this
+        // vendor, rather than always snapping back to the vendor's default.
+        var modelToSend = defaultModel;
+        if (sm.currentModel) {
+          for (var mi = 0; mi < vendorModels.length; mi++) {
+            var mv = typeof vendorModels[mi] === "string" ? vendorModels[mi] : (vendorModels[mi].value || "");
+            if (mv === sm.currentModel) {
+              modelToSend = sm.currentModel;
+              break;
+            }
+          }
+        }
+        sendTo(ws, { type: "model_info", model: modelToSend, models: vendorModels, vendor: msg.vendor, availableVendors: sm.availableVendors || [], installedVendors: sm.installedVendors || [] });
       })();
       return;
     }

package/lib/public/app.js

@@ -66,7 +66,7 @@ import { initAppNotifications, handleNotificationsState as _notifHandleState, ha
 import { createStore, store } from './modules/store.js';
 import { initPanels, updateConfigChip as _panUpdateConfigChip, getModelEffortLevels as _panGetModelEffortLevels, accumulateUsage as _panAccumulateUsage, updateUsagePanel as _panUpdateUsagePanel, resetUsage as _panResetUsage, toggleUsagePanel as _panToggleUsagePanel, formatTokens as _panFormatTokens, updateStatusPanel as _panUpdateStatusPanel, requestProcessStats as _panRequestProcessStats, toggleStatusPanel as _panToggleStatusPanel, accumulateContext as _panAccumulateContext, updateContextPanel as _panUpdateContextPanel, resetContext as _panResetContext, resetContextData as _panResetContextData, minimizeContext as _panMinimizeContext, expandContext as _panExpandContext, toggleContextPanel as _panToggleContextPanel, getContextView as _panGetContextView, renderCtxPopover as _panRenderCtxPopover, hideCtxPopover as _panHideCtxPopover, formatBytes as _panFormatBytes, formatUptime as _panFormatUptime, getModelSupportsEffort as _panGetModelSupportsEffort, getSessionUsage, setSessionUsage, getContextData, setContextData, setContextView as _panSetContextView, applyContextView as _panApplyContextView } from './modules/app-panels.js';
 import { initProjects, updateProjectList as _projUpdateProjectList, renderProjectList as _projRenderProjectList, renderTopbarPresence as _projRenderTopbarPresence, switchProject as _projSwitchProject, resetClientState as _projResetClientState, confirmRemoveProject as _projConfirmRemoveProject, handleRemoveProjectCheckResult as _projHandleRemoveProjectCheckResult, handleRemoveProjectResult as _projHandleRemoveProjectResult, openAddProjectModal as _projOpenAddProjectModal, closeAddProjectModal as _projCloseAddProjectModal, handleBrowseDirResult as _projHandleBrowseDirResult, handleAddProjectResult as _projHandleAddProjectResult, handleCloneProgress as _projHandleCloneProgress, showUpdateAvailable as _projShowUpdateAvailable, getCachedProjects, setCachedProjects, getCachedProjectCount, getCachedRemovedProjects, setCachedRemovedProjects } from './modules/app-projects.js';
-import { initRendering, addToMessages as _renAddToMessages, scrollToBottom as _renScrollToBottom, forceScrollToBottom as _renForceScrollToBottom, addUserMessage as _renAddUserMessage, getMsgTime as _renGetMsgTime, shouldGroupMessage as _renShouldGroupMessage, ensureAssistantBlock as _renEnsureAssistantBlock, addCopyHandler as _renAddCopyHandler, appendDelta as _renAppendDelta, flushStreamBuffer as _renFlushStreamBuffer, finalizeAssistantBlock as _renFinalizeAssistantBlock, addSystemMessage as _renAddSystemMessage, addConflictMessage as _renAddConflictMessage, addContextOverflowMessage as _renAddContextOverflowMessage, showClaudePreThinking as _renShowClaudePreThinking, showMatePreThinking as _renShowMatePreThinking, removeMatePreThinking as _renRemoveMatePreThinking, showSuggestionChips as _renShowSuggestionChips, hideSuggestionChips as _renHideSuggestionChips, getGhostSuggestion as _renGetGhostSuggestion, getTurnCounter, setTurnCounter, getPrependAnchor, setPrependAnchor, getActivityEl, setActivityEl, getIsUserScrolledUp, setIsUserScrolledUp } from './modules/app-rendering.js';
+import { initRendering, addToMessages as _renAddToMessages, scrollToBottom as _renScrollToBottom, forceScrollToBottom as _renForceScrollToBottom, addUserMessage as _renAddUserMessage, getMsgTime as _renGetMsgTime, shouldGroupMessage as _renShouldGroupMessage, ensureAssistantBlock as _renEnsureAssistantBlock, addCopyHandler as _renAddCopyHandler, appendDelta as _renAppendDelta, flushStreamBuffer as _renFlushStreamBuffer, finalizeAssistantBlock as _renFinalizeAssistantBlock, addSystemMessage as _renAddSystemMessage, addConflictMessage as _renAddConflictMessage, addContextOverflowMessage as _renAddContextOverflowMessage, showClaudePreThinking as _renShowClaudePreThinking, showMatePreThinking as _renShowMatePreThinking, removeMatePreThinking as _renRemoveMatePreThinking, showSuggestionChips as _renShowSuggestionChips, hideSuggestionChips as _renHideSuggestionChips, getGhostSuggestion as _renGetGhostSuggestion, getTurnCounter, setTurnCounter, getPrependAnchor, setPrependAnchor, getActivityEl, setActivityEl, getIsUserScrolledUp, setIsUserScrolledUp, getStickyBottom, armStickyBottom, disarmStickyBottom } from './modules/app-rendering.js';
 import { initDm, openDm as _dmOpenDm, enterDmMode as _dmEnterDmMode, exitDmMode as _dmExitDmMode, handleMateCreatedInApp as _dmHandleMateCreatedInApp, renderAvailableBuiltins as _dmRenderAvailableBuiltins, buildMateInterviewPrompt as _dmBuildMateInterviewPrompt, updateMateIconStatus as _dmUpdateMateIconStatus, connectMateProject as _dmConnectMateProject, disconnectMateProject as _dmDisconnectMateProject, appendDmMessage as _dmAppendDmMessage, showDmTypingIndicator as _dmShowDmTypingIndicator, handleDmSend as _dmHandleDmSend } from './modules/app-dm.js';
 import { initMention, handleMentionStart, handleMentionStream, handleMentionDone, handleMentionError, handleMentionActivity, renderMentionUser, renderMentionResponse } from './modules/mention.js';
 import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateResumed, handleDebateTurn, handleDebateActivity, handleDebateStream, handleDebateTurnDone, handleDebateCommentQueued, handleDebateCommentInjected, handleDebateEnded, handleDebateError, renderDebateStarted, renderDebateTurnDone, renderDebateEnded, renderDebateCommentInjected, renderDebateUserResume, openDebateModal, closeDebateModal, handleDebateBriefReady, renderDebateBriefReady, isDebateActive, resetDebateState, exportDebateAsPdf, renderMcpDebateProposal } from './modules/debate.js';
@@ -518,6 +518,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   var newMsgBtnActivity = "\u2193 New activity";
 
   messagesEl.addEventListener("scroll", function () {
+    // While sticky-bottom is armed (e.g. just after history_done or a "New
+    // activity" click), suppress "user scrolled up" detection. Growth-induced
+    // scroll events from deferred layout are not the user — the ResizeObserver
+    // is busy re-pinning to bottom. Real user input (wheel/touch/PageUp)
+    // disarms the flag separately, so this gate doesn't block genuine intent.
+    if (getStickyBottom()) return;
     var distFromBottom = messagesEl.scrollHeight - messagesEl.scrollTop - messagesEl.clientHeight;
     var scrolledUp = distFromBottom > 150;
     setIsUserScrolledUp(scrolledUp);

package/lib/public/modules/app-messages.js

@@ -38,7 +38,7 @@ import { handleMcpServersState } from './mcp-ui.js';
 import { handleLoopRegistryUpdated, handleScheduleRunStarted, handleScheduleRunFinished, handleLoopScheduled, isSchedulerOpen, enterCraftingMode, exitCraftingMode, handleLoopRegistryFiles } from './scheduler.js';
 
 // --- App module imports ---
-import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips } from './app-rendering.js';
+import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips, armStickyBottom } from './app-rendering.js';
 import { setActivity, startUrgentBlink, stopUrgentBlink, blinkSessionDot, updateCrossProjectBlink } from './app-favicon.js';
 import { setStatus } from './app-connection.js';
 import { getModelEffortLevels, accumulateUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
@@ -190,10 +190,29 @@ export function processMessage(msg) {
           var dbBanner = document.getElementById("debate-floor-banner");
           if (dbBanner) dbBanner.remove();
         }
-        scrollToBottom();
-        // Scroll to tool element if navigating from file edit history
+        // Resume landing position: arm sticky-bottom for ~1.5s so deferred
+        // layout (tool widgets via tools.js, markdown/syntax highlighting,
+        // image loads, IntersectionObserver-driven todo sticky reflows)
+        // can't strand the user mid-conversation. The ResizeObserver
+        // re-pins on every height change while armed. Disarms early on
+        // any real user scroll input.
+        // Skip arming when we have a pending in-conversation navigate
+        // target (file-edit deeplink) — the navigate block below scrolls
+        // that element into view, and sticky-bottom would fight it.
         var nav = getPendingNavigate();
-        if (nav && (nav.toolId || nav.assistantUuid)) {
+        var hasNavTarget = nav && (nav.toolId || nav.assistantUuid);
+        if (hasNavTarget) {
+          // Navigate block below will scrollIntoView on the target — don't
+          // arm sticky-bottom or it would fight that scroll.
+          scrollToBottom();
+        } else {
+          // Quiet window: ResizeObserver extends this for as long as
+          // layout keeps shifting (long sessions, late-rendering tool
+          // widgets, image loads), bounded by an internal hard ceiling.
+          armStickyBottom(750);
+        }
+        // Scroll to tool element if navigating from file edit history
+        if (hasNavTarget) {
           requestAnimationFrame(function() {
             // Prefer scrolling to the exact tool element
             var target = nav.toolId ? messagesEl.querySelector('[data-tool-id="' + nav.toolId + '"]') : null;
@@ -370,7 +389,11 @@ export function processMessage(msg) {
         if (_modelVal && typeof _modelVal === "object") _modelVal = _modelVal.value || _modelVal.displayName || "";
         var _miUpdate = { currentModels: msg.models || [] };
         if (Object.prototype.hasOwnProperty.call(msg, "model")) {
-          _miUpdate.currentModel = _modelVal || "";
+          if (store.get('vendorSelectionLocked') && store.get('currentModel')) {
+            // Keep the user's existing selection; only update models list
+          } else {
+            _miUpdate.currentModel = _modelVal || "";
+          }
         } else {
           _miUpdate.currentModel = store.get('currentModel');
         }

package/lib/public/modules/app-rendering.js

@@ -36,6 +36,109 @@ var streamDrainTimer = null;
 var isUserScrolledUp = false;
 var scrollThreshold = 150;
 
+// --- Sticky-bottom mode ---
+// While armed, a ResizeObserver re-pins #messages to scrollHeight on every
+// height change so deferred content (tools, syntax highlighting, images,
+// IntersectionObserver-driven reflows) doesn't strand the user mid-page.
+// The scroll listener in app.js consults getStickyBottom() and ignores
+// growth-induced scroll events while armed.
+//
+// Disarm rules:
+//   - Real user input (wheel / touchmove / PageUp / Home / ArrowUp): immediate.
+//   - Quiet detector: armStickyBottom(durationMs) treats durationMs as the
+//     QUIET WINDOW, not a hard timer. Each ResizeObserver callback resets
+//     a debounce timer; sticky-bottom only disarms after no resize for
+//     durationMs. Long-settling sessions (large todo widgets, slow code
+//     highlighting) keep extending the window naturally.
+//   - Hard ceiling: a separate cap prevents pathological lock-in.
+var stickyBottom = false;
+var stickyBottomQuietTimer = null;
+var stickyBottomCeilingTimer = null;
+var stickyBottomQuietMs = 750;
+var stickyBottomCeilingMs = 8000;
+var stickyBottomResizeObs = null;
+var stickyBottomInputBound = false;
+
+export function getStickyBottom() { return stickyBottom; }
+
+function pinToBottomNow() {
+  var messagesEl = getMessagesEl();
+  if (!messagesEl) return;
+  messagesEl.scrollTop = messagesEl.scrollHeight;
+}
+
+function ensureStickyInfrastructure() {
+  var messagesEl = getMessagesEl();
+  if (!messagesEl) return;
+  if (!stickyBottomResizeObs && typeof ResizeObserver !== "undefined") {
+    stickyBottomResizeObs = new ResizeObserver(function () {
+      if (!stickyBottom) return;
+      // Re-pin on every layout change while armed.
+      pinToBottomNow();
+      // Reset the quiet timer — settling has not finished yet.
+      if (stickyBottomQuietTimer) clearTimeout(stickyBottomQuietTimer);
+      stickyBottomQuietTimer = setTimeout(disarmStickyBottom, stickyBottomQuietMs);
+    });
+    stickyBottomResizeObs.observe(messagesEl);
+    // Also observe direct children so child-size changes (image loads, code
+    // block highlighting, expanding tool groups) trigger a re-pin even when
+    // they don't change the scroller's own size.
+    var kids = messagesEl.children;
+    for (var i = 0; i < kids.length; i++) stickyBottomResizeObs.observe(kids[i]);
+  }
+  if (!stickyBottomInputBound) {
+    stickyBottomInputBound = true;
+    var disarmOnUserScroll = function () { disarmStickyBottom(); };
+    messagesEl.addEventListener("wheel", disarmOnUserScroll, { passive: true });
+    messagesEl.addEventListener("touchmove", disarmOnUserScroll, { passive: true });
+    document.addEventListener("keydown", function (e) {
+      if (!stickyBottom) return;
+      if (e.key === "PageUp" || e.key === "Home" || e.key === "ArrowUp") {
+        disarmStickyBottom();
+      }
+    });
+  }
+}
+
+export function armStickyBottom(durationMs) {
+  if (prependAnchor) return; // never fight pagination
+  ensureStickyInfrastructure();
+  stickyBottom = true;
+  isUserScrolledUp = false;
+  var newMsgBtn = document.getElementById("new-msg-btn");
+  if (newMsgBtn) {
+    newMsgBtn.classList.add("hidden");
+    newMsgBtn.textContent = NEW_MSG_BTN_DEFAULT;
+  }
+  pinToBottomNow();
+  // After children may have been replaced since last arm, re-observe.
+  if (stickyBottomResizeObs) {
+    var messagesEl = getMessagesEl();
+    if (messagesEl) {
+      var kids = messagesEl.children;
+      for (var i = 0; i < kids.length; i++) {
+        try { stickyBottomResizeObs.observe(kids[i]); } catch (e) {}
+      }
+    }
+  }
+  // Quiet window: callers pass intended quiet duration; ResizeObserver
+  // resets this each time layout changes, so the actual armed duration
+  // stretches to "no resize for durationMs".
+  stickyBottomQuietMs = durationMs || 750;
+  if (stickyBottomQuietTimer) clearTimeout(stickyBottomQuietTimer);
+  stickyBottomQuietTimer = setTimeout(disarmStickyBottom, stickyBottomQuietMs);
+  // Hard ceiling so we never lock the scroller indefinitely if some
+  // animation/observer keeps firing forever.
+  if (stickyBottomCeilingTimer) clearTimeout(stickyBottomCeilingTimer);
+  stickyBottomCeilingTimer = setTimeout(disarmStickyBottom, stickyBottomCeilingMs);
+}
+
+export function disarmStickyBottom() {
+  stickyBottom = false;
+  if (stickyBottomQuietTimer) { clearTimeout(stickyBottomQuietTimer); stickyBottomQuietTimer = null; }
+  if (stickyBottomCeilingTimer) { clearTimeout(stickyBottomCeilingTimer); stickyBottomCeilingTimer = null; }
+}
+
 export function initRendering() {
   // Update input placeholder when vendor changes
   store.subscribe(function (state, prev) {
@@ -86,14 +189,11 @@ export function scrollToBottom() {
 
 export function forceScrollToBottom() {
   if (prependAnchor) return;
-  isUserScrolledUp = false;
-  var newMsgBtn = document.getElementById("new-msg-btn");
-  newMsgBtn.classList.add("hidden");
-  newMsgBtn.textContent = NEW_MSG_BTN_DEFAULT;
-  var messagesEl = getMessagesEl();
-  requestAnimationFrame(function () {
-    messagesEl.scrollTop = messagesEl.scrollHeight;
-  });
+  // Arm sticky-bottom mode so deferred layout (tool widgets, code highlighting,
+  // image loads) can't strand the user partway down — single-rAF pin captures
+  // a stale scrollHeight, then growth below pushes the bottom further away.
+  // The quiet detector extends the window automatically while layout shifts.
+  armStickyBottom(750);
 }
 
 export function getMsgTime() {

package/lib/public/modules/tools.js

@@ -10,6 +10,16 @@ import { VENDOR_NAMES } from './app-rendering.js';
 
 var ctx;
 
+// During history replay, individual tool renders (todos, file edits, command
+// outputs) must not auto-scroll. The history_done handler arms sticky-bottom
+// which pins the viewport to the true bottom after the whole replay settles.
+// Per-tool scroll calls during replay fight that and re-anchor the user to
+// whichever tool widget grew last (commonly the todo widget).
+function maybeScrollToBottom() {
+  if (store.get('replayingHistory')) return;
+  if (ctx && ctx.scrollToBottom) ctx.scrollToBottom();
+}
+
 // --- Plan mode state ---
 var inPlanMode = false;
 var planContent = null;
@@ -365,7 +375,7 @@ export function renderAskUserQuestion(toolId, input) {
   ctx.addToMessages(container);
   disableMainInput();
   ctx.setActivity(null);
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 }
 
 export function disableMainInput() {
@@ -602,7 +612,7 @@ function renderFormalPermission(requestId, toolName, toolInput, decisionReason)
   pendingPermissions[requestId] = container;
   refreshIcons();
   ctx.setActivity(null);
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 }
 
 function renderPlanPermission(requestId) {
@@ -709,7 +719,7 @@ function renderPlanPermission(requestId) {
   pendingPermissions[requestId] = container;
   refreshIcons();
   ctx.setActivity(null);
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
   // Focus the feedback input after render
   setTimeout(function () { feedbackInput.focus(); }, 50);
 }
@@ -888,7 +898,7 @@ function renderConversationalPermission(requestId, toolName, toolInput, mateId,
   pendingPermissions[requestId] = container;
   refreshIcons();
   ctx.setActivity(null);
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 }
 
 function sendPermissionResponse(container, requestId, decision) {
@@ -1115,7 +1125,7 @@ export function renderElicitationRequest(msg) {
   pendingElicitations[msg.requestId] = container;
   refreshIcons();
   ctx.setActivity(null);
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 }
 
 function sendElicitationResponse(container, requestId, action, content) {
@@ -1194,7 +1204,7 @@ export function renderPlanBanner(type) {
 
   ctx.addToMessages(el);
   refreshIcons();
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
   return el;
 }
 
@@ -1255,7 +1265,7 @@ export function renderPlanCard(content) {
   }
 
   refreshIcons();
-  if (isNew) ctx.scrollToBottom();
+  if (isNew) maybeScrollToBottom();
   return el;
 }
 
@@ -1388,7 +1398,7 @@ function renderTodoWidget() {
   }
   updateTodoSticky();
   refreshIcons();
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 }
 
 function setupTodoObserver() {
@@ -1517,7 +1527,7 @@ export function startThinking() {
     }
     currentThinking = { el: el, fullText: "", startTime: Date.now() };
     refreshIcons();
-    ctx.scrollToBottom();
+    maybeScrollToBottom();
     if (!el.classList.contains("mate-thinking")) {
       ctx.setActivity("thinking");
     }
@@ -1561,7 +1571,7 @@ export function startThinking() {
 
   ctx.addToMessages(el);
   refreshIcons();
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
   thinkingGroup = { el: el, count: 0, totalDuration: 0 };
   currentThinking = { el: el, fullText: "", startTime: Date.now() };
   if (!ctx.isMateDm()) {
@@ -1573,7 +1583,7 @@ export function appendThinking(text) {
   if (!currentThinking) return;
   currentThinking.fullText += text;
   currentThinking.el.querySelector(".thinking-content").textContent = currentThinking.fullText;
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 }
 
 export function stopThinking(duration) {
@@ -1699,7 +1709,7 @@ export function createToolItem(id, name) {
   updateToolGroupHeader(currentToolGroup);
 
   refreshIcons();
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 
   tools[id] = { el: el, name: name, input: null, done: false, groupId: currentToolGroup.id };
   ctx.setActivity("Running " + name + "...");
@@ -1737,7 +1747,7 @@ export function updateToolExecuting(id, name, input) {
   var subtitleText = tool.el.querySelector(".tool-subtitle-text");
   if (subtitleText) subtitleText.textContent = toolActivityText(name, input);
 
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 }
 
 // Shared chrome (filename header + unified/split toggle) for diff renderings.
@@ -2029,7 +2039,7 @@ export function updateToolResult(id, content, isError, images) {
   });
 
   markToolDone(id, isError);
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 }
 
 export function markToolDone(id, isError) {
@@ -2087,7 +2097,7 @@ export function updateSubagentActivity(parentToolId, text) {
   }
 
   ctx.setActivity(text);
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 }
 
 export function addSubagentToolEntry(parentToolId, toolName, toolId, text) {
@@ -2121,7 +2131,7 @@ export function addSubagentToolEntry(parentToolId, toolName, toolId, text) {
   log.scrollTop = log.scrollHeight;
 
   ctx.setActivity(text);
-  ctx.scrollToBottom();
+  maybeScrollToBottom();
 }
 
 function fmtTokens(n) {
@@ -2254,7 +2264,7 @@ export function addTurnMeta(cost, duration) {
   if (parts.length) {
     div.textContent = parts.join(" \u00b7 ");
     ctx.addToMessages(div);
-    ctx.scrollToBottom();
+    maybeScrollToBottom();
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.36.0",
+  "version": "2.36.1-beta.2",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",