clay-server 2.37.0-beta.1 → 2.37.0-beta.2

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

@@ -175,14 +175,37 @@ export function addToMessages(el) {
 
 export function scrollToBottom() {
   if (prependAnchor) return;
-  var newMsgBtn = document.getElementById("new-msg-btn");
-  if (isUserScrolledUp) {
-    newMsgBtn.textContent = NEW_MSG_BTN_ACTIVITY;
-    newMsgBtn.classList.remove("hidden");
+  var messagesEl = getMessagesEl();
+  if (!messagesEl) return;
+  // Compute the user's current scroll position from the DOM rather than
+  // the cached isUserScrolledUp flag. The flag is updated by an async
+  // scroll-event listener; if a delta arrives between the user's wheel
+  // input and that listener firing, the cached flag is still false and
+  // we'd snap them back to the bottom against their intent. Reading
+  // scrollTop/scrollHeight here is synchronous and race-free.
+  var distFromBottom = messagesEl.scrollHeight - messagesEl.scrollTop - messagesEl.clientHeight;
+  if (distFromBottom > 150 || isUserScrolledUp) {
+    // Keep the flag and the "New activity" button in sync even when the
+    // scroll-listener hasn't fired yet, so other call sites observing
+    // isUserScrolledUp see the truth too.
+    if (distFromBottom > 150) isUserScrolledUp = true;
+    var newMsgBtn = document.getElementById("new-msg-btn");
+    if (newMsgBtn) {
+      newMsgBtn.textContent = NEW_MSG_BTN_ACTIVITY;
+      newMsgBtn.classList.remove("hidden");
+    }
     return;
   }
-  var messagesEl = getMessagesEl();
   requestAnimationFrame(function () {
+    // Re-check just before the actual write — the user may have scrolled
+    // up during the frame between the synchronous gate above and this rAF
+    // firing. Without this re-check the snap-back race re-emerges at a
+    // single-frame granularity.
+    var dist = messagesEl.scrollHeight - messagesEl.scrollTop - messagesEl.clientHeight;
+    if (dist > 150) {
+      isUserScrolledUp = true;
+      return;
+    }
     messagesEl.scrollTop = messagesEl.scrollHeight;
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.37.0-beta.1",
+  "version": "2.37.0-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",