clay-server 5.3.0-beta.1 → 5.3.0-beta.3

package/lib/project-worker-conversation.js

@@ -5,6 +5,7 @@ var provenance = require("./session-provenance");
 function attachProjectWorkerConversation(ctx) {
   var sm = ctx.sm;
   var users = ctx.usersModule;
+  var watches = new WeakMap();
   var MAX_MESSAGES = 120;
   var MAX_TEXT = 8000;
   var MAX_PAGE_TEXT = 64000;
@@ -136,19 +137,82 @@ function attachProjectWorkerConversation(ctx) {
     if (!nextBefore && index >= 0) nextBefore = { index: index, offset: offset };
     return { messages: rows, nextBefore: nextBefore, hasMore: nextBefore !== null };
   }
+  // Follow recorded events forward without dropping an intervening busy burst.
+  function snapshotAfter(history, after) {
+    var rows = [], index = after.index, offset = after.offset, budget = MAX_PAGE_TEXT;
+    while (index < history.length && rows.length < MAX_MESSAGES && budget > 0) {
+      var item = record(history, index);
+      if (!item || offset >= item.text.length) { index++; offset = 0; continue; }
+      var metadataSize = (item.toolName || '').length + (item.toolId || '').length;
+      if (budget <= metadataSize) break;
+      var end = Math.min(item.text.length, offset + Math.min(MAX_TEXT, budget - metadataSize));
+      rows.push({ role: item.role, text: item.text.slice(offset, end), recordIndex: index, recordType: history[index].type,
+        start: offset, end: end, toolName: item.toolName || null, toolId: item.toolId || null, isError: item.isError === true });
+      budget -= end - offset + metadataSize;
+      offset = end;
+    }
+    while (index < history.length) {
+      var remaining = record(history, index);
+      if (remaining && offset < remaining.text.length) break;
+      index++; offset = 0;
+    }
+    return { messages: rows, hasMore: false, nextBefore: null, moreRecent: index < history.length };
+  }
+  function stopWatching(ws) {
+    var watch = watches.get(ws);
+    if (!watch) return;
+    watches.delete(ws);
+    clearTimeout(watch.timer);
+    if (watch.release) watch.release();
+    if (ws.removeListener) ws.removeListener('close', watch.close);
+  }
+  function watchWorker(ws, msg, pair) {
+    stopWatching(ws);
+    msg = { requestId: msg.requestId.slice(0, 160), parentSessionOriginId: pair.driver.sessionOriginId,
+      workerSessionOriginId: pair.worker.sessionOriginId, generation: msg.generation };
+    var watch = { worker: pair.worker, requestId: msg.requestId, timer: null };
+    watch.close = function () { stopWatching(ws); };
+    watch.notify = function () {
+      if (watch.timer) return;
+      watch.timer = setTimeout(function () {
+        watch.timer = null;
+        var user = actor(ws), latest = user && exactPair(ws, msg, user);
+        if (ws.readyState !== 1 || !latest || latest.worker !== pair.worker || latest.driver !== pair.driver) { stopWatching(ws); return; }
+        send(ws, { type: 'split_worker_conversation_changed', subscriptionId: msg.requestId,
+          parentSessionOriginId: msg.parentSessionOriginId, workerSessionOriginId: msg.workerSessionOriginId,
+          generation: msg.generation, isProcessing: pair.worker.isProcessing === true });
+      }, 32);
+    };
+    watch.release = sm.subscribeSession(pair.worker.localId, watch.notify);
+    watches.set(ws, watch);
+    if (ws.once) ws.once('close', watch.close);
+  }
   function handleMessage(ws, msg) {
     if (!msg || msg.type !== "split_worker_conversation_request") return false;
     var requestId = typeof msg.requestId === "string" ? msg.requestId.slice(0, 160) : "";
     var response = { type: "split_worker_conversation", requestId: requestId, pageBefore: msg.before == null ? null : msg.before,
       parentSessionOriginId: msg.parentSessionOriginId || null, workerSessionOriginId: msg.workerSessionOriginId || null,
       generation: msg.generation || null, messages: [], hasMore: false, nextBefore: null };
+    if (msg.watch === false) {
+      var watch = watches.get(ws);
+      if (watch && watch.requestId === msg.requestId && watch.worker.sessionOriginId === msg.workerSessionOriginId) stopWatching(ws);
+      return true;
+    }
     var current = actor(ws), pair = current && exactPair(ws, msg, current);
     if (!requestId || !pair) response.error = "This Worker conversation is no longer available.";
     else {
-      var before = msg.before == null ? pair.worker.history.length : msg.before;
-      if (!(Number.isInteger(before) && before >= 0) && !(before && typeof before === "object" && Number.isInteger(before.index) && Number.isInteger(before.offset) && before.index >= 0 && before.offset >= 0)) response.error = "Worker conversation page is invalid.";
-      else Object.assign(response, snapshot(pair.worker.history || [], before));
+      if (msg.after != null) {
+        var after = msg.after;
+        if (msg.before != null || !after || !Number.isInteger(after.index) || after.index < 0 || after.index >= pair.worker.history.length ||
+            !Number.isInteger(after.offset) || after.offset < 0) response.error = 'Worker activity cursor is invalid.';
+        else Object.assign(response, snapshotAfter(pair.worker.history || [], after));
+      } else {
+        var before = msg.before == null ? pair.worker.history.length : msg.before;
+        if (!(Number.isInteger(before) && before >= 0) && !(before && typeof before === "object" && Number.isInteger(before.index) && Number.isInteger(before.offset) && before.index >= 0 && before.offset >= 0)) response.error = "Worker conversation page is invalid.";
+        else Object.assign(response, snapshot(pair.worker.history || [], before));
+      }
     }
+    if (!response.error && msg.watch === true) watchWorker(ws, msg, pair);
     send(ws, response);
     return true;
   }

package/lib/public/css/pane.css

@@ -229,31 +229,6 @@ body.pane-mode #input-area {
 }
 .split-pair-live { color: var(--accent); background: color-mix(in srgb, var(--accent) 10%, transparent); animation: pair-status-pulse 1.5s ease-in-out infinite; }
 
-#split-host.split-delegating::after {
-  content: "→";
-  position: absolute;
-  z-index: 4;
-  top: calc(50% - 10px);
-  left: calc(50% - 17px);
-  width: 34px;
-  height: 20px;
-  display: grid;
-  place-items: center;
-  border: 1px solid color-mix(in srgb, var(--accent) 35%, var(--border));
-  border-radius: 999px;
-  pointer-events: none;
-  background: var(--sidebar-bg);
-  color: var(--accent);
-  font-size: 14px;
-  font-weight: 800;
-  animation: pair-divider-flow 1.1s ease-in-out infinite;
-  filter: drop-shadow(0 0 4px color-mix(in srgb, var(--accent) 65%, transparent));
-}
-
-#split-host.split-direction-left::after { content: "←"; animation-name: pair-divider-flow-left; }
-
-@keyframes pair-divider-flow { 0%, 100% { transform: translateX(-3px); opacity: 0.65; } 50% { transform: translateX(3px); opacity: 1; } }
-@keyframes pair-divider-flow-left { 0%, 100% { transform: translateX(3px); opacity: 0.65; } 50% { transform: translateX(-3px); opacity: 1; } }
 @keyframes pair-status-pulse { 50% { opacity: 0.55; } }
 
 /* Worker activity notice shown while this pane processes a delegated task. */
@@ -596,18 +571,7 @@ body.pane-mode #input-area {
     flex: 1 1 auto;
   }
 
-  #split-host:has(.split-pane-role-worker).split-delegating::after {
-    content: "↑";
-    /* Center on worker bottom + half the gap, accounting for the shell
-       inset and the 30% basis being relative to the inset content box. */
-    top: calc(var(--split-shell-inset) + var(--split-worker-height) + var(--split-pane-gap-half) - 10px);
-    animation-name: pair-divider-flow-up;
-  }
 
-  @keyframes pair-divider-flow-up {
-    0%, 100% { transform: translateY(3px); opacity: 0.65; }
-    50% { transform: translateY(-3px); opacity: 1; }
-  }
 }
 
 /* Prevent an iframe from taking the pointer midway through a note gesture. */

package/lib/public/css/session-folders.css

@@ -21,7 +21,7 @@
 
 .session-folder-chevron, .session-folder-icon { display: inline-flex; flex: none; }
 .session-folder-chevron svg, .session-folder-icon svg { width: 12px; height: 12px; display: block; }
-.session-folder-chevron { transition: transform 0.15s ease; }
+.session-folder-chevron { align-items: center; justify-content: center; min-height: 20px; min-width: 16px; margin: -4px -2px; transition: transform 0.15s ease; }
 .session-folder-toggle[aria-expanded="true"] .session-folder-chevron { transform: rotate(90deg); }
 .session-folder-favorites .session-folder-icon { color: var(--accent); }
 .session-folder-label { flex: 0 1 auto; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }

package/lib/public/css/split-view-layout.css

@@ -274,7 +274,7 @@ body.split-view-resizing .split-pane-frame { pointer-events: none; }
 .split-view-worker-controls:hover { background: var(--sidebar-hover); color: var(--text); }
 .split-view-worker-controls:focus-visible { outline: 2px solid var(--accent); outline-offset: -2px; }
 .split-view-worker-dot { width: 5px; height: 5px; flex: 0 0 5px; border-radius: 50%; background: var(--text-dimmer); }
-.split-view-worker-dot[data-state="working"] { background: var(--brand-green); animation: split-view-working 1.6s ease-in-out infinite; }
+.split-view-worker-dot[data-state="working"] { background: var(--brand-green); }
 .split-view-worker-dot[data-state="waiting"] { background: var(--brand-gold); }
 @keyframes split-view-working { 0%, 100% { opacity: 1; } 50% { opacity: .35; } }
 .split-view-group { margin: 2px 0 8px; }
@@ -404,11 +404,12 @@ body.split-view-resizing .split-pane-frame { pointer-events: none; }
 .split-view-worker-popover-header strong { flex: 1; min-width: 0; font-size: 12px; }
 .split-view-worker-popover-source { padding: 0 13px 10px; color: var(--text-dimmer); font-size: 10px; }
 .split-view-worker-popover-body { flex: 1; min-height: 0; overflow: auto; padding: 14px; }
-.split-view-worker-popover-body .message { display: block; margin: 0 0 18px; padding: 0; max-width: none; }
+.split-view-worker-popover-body .message { display: flex; flex-direction: column; align-items: stretch; margin: 0 0 18px; padding: 0; max-width: none; }
 .split-view-worker-popover-body .author { display: block; margin-bottom: 4px; font-size: 11px; color: var(--text-muted); }
 .split-view-worker-popover-body .message-body { white-space: normal; overflow-wrap: anywhere; font-size: 12px; line-height: 1.65; }
 .split-view-worker-popover-body .message-body pre { white-space: pre-wrap; }
-.split-view-worker-popover-body .worker-tool-message summary { cursor: pointer; font-size: 11px; }
+.split-view-worker-popover-body .worker-tool-message pre { max-height: 280px; overflow: auto; white-space: pre-wrap; overflow-wrap: anywhere; }
+.split-view-worker-popover-body .worker-tool-message summary { cursor: pointer; font-size: 13px; }
 .split-view-worker-popover-body .worker-tool-message { padding: 6px 8px; border-radius: 5px; background: var(--bg-alt); }
 .split-view-worker-popover-footer { padding: 8px 13px; border-top: 1px solid var(--border-subtle); color: var(--text-dimmer); font-size: 10px; }
 .split-view-worker-page-status { display: block; margin-top: 3px; line-height: 1.4; }
@@ -458,3 +459,6 @@ body.split-view-resizing .split-pane-frame { pointer-events: none; }
 #split-view-arrange-context-list button { display: block; width: 100%; min-height: 28px; padding: 5px 7px; text-align: left; font-size: 11px; }
 #split-view-arrange-context-list [aria-selected="true"] { background: var(--accent-bg); color: var(--accent); }
 .split-view-arrange [data-focus-layout] { width: 100%; min-height: 29px; margin-top: 5px; border-top: 1px solid var(--border-subtle); font-size: 11px; }
+
+/* Light reflects received WebSocket output, independent of processing state. */
+.split-view-worker-dot.io { background: var(--brand-green); box-shadow: 0 0 5px var(--brand-green); }

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

@@ -139,7 +139,7 @@ export function blinkIO() {
 
 export function blinkSessionDot(sessionId) {
   // A favorite is on screen twice; blink every copy.
-  var els = document.querySelectorAll('.session-item[data-session-id="' + sessionId + '"] .session-processing');
+  var els = document.querySelectorAll('.session-item[data-session-id="' + sessionId + '"] .session-processing, .split-view-worker-chip[data-worker-session-id="' + sessionId + '"] .split-view-worker-dot');
   if (!els.length) return;
   for (var i = 0; i < els.length; i++) els[i].classList.add("io");
   clearTimeout(sessionIoTimers[sessionId]);

package/lib/public/modules/app-message-cards.js

@@ -166,7 +166,7 @@ export function addUserMessage(text, images, pastes, fromUserId, fromUserName, d
 
   addToMessages(div);
   refreshIcons();
-  forceScrollToBottom();
+  forceScrollToBottom(div);
 }
 
 export function addSystemMessage(text, isError) {

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

@@ -1,3 +1,4 @@
+import { showCreatedWorkerPresentation } from './worker-created-presentation.js';
 import { handleWorkerRemovalResult } from './split-view-worker-removal.js';
 import { handleStudioDocumentMessage } from './clay-studio-document.js';
 import { saveSessionRichDraft, restoreSessionRichDraft } from './session-rich-drafts.js';
@@ -55,7 +56,7 @@ import { handlePaletteSessionSwitch, handlePaletteHistoryDone, handlePaletteHist
 import { handleFindInSessionResults } from './session-search.js';
 import { syncPaneTitles, maybeRestoreSplitGroup, openGroup } from './split-view.js';
 import { handleProjectSplitViews, handleProjectSplitViewResult, requestProjectSplitViews } from './split-view-presentations.js';
-import { handleSplitWorkerConversation } from './split-view-workers.js';
+import { handleSplitWorkerConversation, handleWorkerSessionActivity, handleWorkerConversationChanged } from './split-view-workers.js';
 import { showPairDialog, handlePairCreated, handleSplitDelegation, showWorkerDelegationNotice, hideWorkerDelegationNotice } from './split-pair-ui.js';
 import { handleSessionActionMessage } from './session-actions.js';
 import { renderWorkerProposal, updateWorkerProposal } from './worker-proposal.js';
@@ -95,7 +96,7 @@ import { renderGeneratedImage, renderImageGenerationProgress, clearImageGenerati
 import { clearPairResultStatus, handlePairResultStatus } from './pair-result-status.js';
 
 // --- App module imports ---
-import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, resetStreamBuffer, appendDelta, flushStreamBuffer, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips, armStickyBottom, VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
+import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, resetStreamBuffer, appendDelta, flushStreamBuffer, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips, armStickyBottom, releaseTurnAnchor, VENDOR_AVATARS, VENDOR_NAMES } from './app-rendering.js';
 import { setActivity, startUrgentBlink, stopUrgentBlink, blinkSessionDot, updateCrossProjectBlink } from './app-favicon.js';
 import { setStatus } from './app-connection.js';
 import { resolveSwitchedVendor } from './pane-session.js';
@@ -808,6 +809,9 @@ export function processMessage(msg) {
       case "project_split_view_result":
         handleProjectSplitViewResult(msg);
         break;
+      case "split_worker_conversation_changed":
+        handleWorkerConversationChanged(msg);
+        break;
       case "split_worker_conversation":
         handleSplitWorkerConversation(msg);
         break;
@@ -840,7 +844,7 @@ export function processMessage(msg) {
 
       case "pair_session_created":
         var createdPairGroup = handlePairCreated(msg);
-        if (createdPairGroup) openGroup(createdPairGroup);
+        if (createdPairGroup) showCreatedWorkerPresentation(createdPairGroup);
         break;
 
       case "session_handoff_result":
@@ -915,6 +919,7 @@ export function processMessage(msg) {
 
       case "session_io":
         blinkSessionDot(msg.id);
+        handleWorkerSessionActivity(msg);
         break;
 
       case "session_unread":
@@ -1493,6 +1498,7 @@ export function processMessage(msg) {
 
       case "done":
         store.set({ turnActivity: null });
+        releaseTurnAnchor();
         removeMatePreThinking();
         setActivity(null);
         finishThinkingTurn();

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

@@ -24,7 +24,7 @@ import { hideMemory } from './mate-memory.js';
 import { isSchedulerOpen, closeScheduler, resetScheduler } from './scheduler.js';
 import { closeScheduledTasks } from './scheduled-tasks.js';
 import { connect, cancelReconnect, setStatus } from './app-connection.js';
-import { setTurnCounter, setPrependAnchor, setActivityEl, setIsUserScrolledUp, hideSuggestionChips } from './app-rendering.js';
+import { setTurnCounter, setPrependAnchor, setActivityEl, setIsUserScrolledUp, releaseTurnAnchor, hideSuggestionChips } from './app-rendering.js';
 import { resetToolState, enableMainInput, resetTurnMetaCost } from './tools.js';
 import { resetShellCommand } from './shell-command.js';
 import { clearPendingImages } from './input.js';
@@ -210,6 +210,7 @@ export function resetClientState() {
   setPrependAnchor(null);
   store.set({ loadingMore: false });
   setIsUserScrolledUp(false);
+  releaseTurnAnchor();
   document.getElementById("new-msg-btn").classList.add("hidden");
   setRewindMode(false);
   setActivity(null);

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

@@ -8,10 +8,10 @@ import { refreshIcons } from './icons.js';
 import { closeToolGroup } from './tools.js';
 import { sendMessage, hasSendableContent } from './input.js';
 import { getChatLayout } from './theme.js';
-import { addToMessages, addHistoryIndex, scrollToBottom, forceScrollToBottom, getMsgTime, shouldGroupMessage, getTurnCounter, getActivityEl } from './chat-render-runtime.js';
+import { addToMessages, addHistoryIndex, scrollToBottom, forceScrollToBottom, releaseTurnAnchor, getMsgTime, shouldGroupMessage, getTurnCounter, getActivityEl } from './chat-render-runtime.js';
 import { resolveProjectAssistantIdentity, applyProjectAssistantIdentity } from './project-chat-identity.js';
 export { VENDOR_ORDER, EXPERIMENTAL_VENDORS, isExperimentalVendor } from './vendor-priority.js';
-export { initRendering, addToMessages, addHistoryIndex, scrollToBottom, forceScrollToBottom, getMsgTime, shouldGroupMessage, getTurnCounter, setTurnCounter, getPrependAnchor, setPrependAnchor, getActivityEl, setActivityEl, getIsUserScrolledUp, setIsUserScrolledUp, getStickyBottom, armStickyBottom, disarmStickyBottom, VENDOR_AVATARS, VENDOR_NAMES, VENDOR_HOMEPAGES } from './chat-render-runtime.js';
+export { initRendering, addToMessages, addHistoryIndex, scrollToBottom, forceScrollToBottom, releaseTurnAnchor, getMsgTime, shouldGroupMessage, getTurnCounter, setTurnCounter, getPrependAnchor, setPrependAnchor, getActivityEl, setActivityEl, getIsUserScrolledUp, setIsUserScrolledUp, getStickyBottom, armStickyBottom, disarmStickyBottom, VENDOR_AVATARS, VENDOR_NAMES, VENDOR_HOMEPAGES } from './chat-render-runtime.js';
 export { addUserMessage, addSystemMessage, addConflictMessage, addContextOverflowMessage } from './app-message-cards.js';
 
 // --- Module-owned state (not in store) ---

package/lib/public/modules/chat-render-runtime.js

@@ -56,15 +56,25 @@ var stickyBottom = false;
 var stickyBottomQuietTimer = null;
 var stickyBottomCeilingTimer = null;
 var stickyBottomQuietMs = 750;
+var TURN_ANCHOR_MARGIN = 8;
 var stickyBottomCeilingMs = 8000;
 var stickyBottomResizeObs = null;
 var stickyBottomInputBound = false;
+// The sent user turn that the transcript aligns to while its reply arrives.
+var turnAnchor = null;
+// Completion keeps the clamp until the follow settles, so a final render or a
+// 'done' inside the follow window cannot jump past the sent turn.
+var turnAnchorEnded = false;
 
 function layoutScrollLock() { return store.get('paneLayoutScrollLock'); }
 
 export function beginPaneLayoutScrollLock(token, scrollTop) {
   var messagesEl = getMessagesEl();
   if (!messagesEl || !token) return false;
+  // A layout-only change must not undo a send that is still being followed:
+  // the stored reading position predates that explicit new turn, and the
+  // matching end receipt may never arrive. The follow keeps the turn visible.
+  if (stickyBottom || activeTurnAnchor(messagesEl)) return false;
   disarmStickyBottom();
   var userPosition = store.get('paneLastUserScrollTop');
   var position = Number.isFinite(userPosition) ? userPosition : Number.isFinite(scrollTop) ? Math.max(0, scrollTop) : messagesEl.scrollTop;
@@ -88,10 +98,29 @@ export function endPaneLayoutScrollLock(token) {
 
 export function getStickyBottom() { return stickyBottom; }
 
+function activeTurnAnchor(messagesEl) {
+  if (turnAnchor && (!messagesEl || turnAnchor.parentNode !== messagesEl)) { turnAnchor = null; turnAnchorEnded = false; }
+  return turnAnchor;
+}
+
+// Follow the tail, but never past the top of the sent turn: a long immediate
+// reply grows below the user's message instead of pushing it out of view.
+function followTarget(messagesEl) {
+  var anchor = activeTurnAnchor(messagesEl);
+  if (!anchor) return messagesEl.scrollHeight;
+  var top = anchor.getBoundingClientRect().top - messagesEl.getBoundingClientRect().top + messagesEl.scrollTop - TURN_ANCHOR_MARGIN;
+  return Math.min(messagesEl.scrollHeight, Math.max(0, top));
+}
+
+export function releaseTurnAnchor() {
+  if (stickyBottom && turnAnchor) turnAnchorEnded = true;
+  else { turnAnchor = null; turnAnchorEnded = false; }
+}
+
 function pinToBottomNow() {
   var messagesEl = getMessagesEl();
   if (!messagesEl) return;
-  messagesEl.scrollTop = messagesEl.scrollHeight;
+  messagesEl.scrollTop = followTarget(messagesEl);
 }
 
 function ensureStickyInfrastructure() {
@@ -110,12 +139,13 @@ function ensureStickyInfrastructure() {
   }
   if (!stickyBottomInputBound) {
     stickyBottomInputBound = true;
-    var disarmOnUserScroll = function () { disarmStickyBottom(); };
+    var disarmOnUserScroll = function () { disarmStickyBottom(); turnAnchor = null; turnAnchorEnded = false; };
     messagesEl.addEventListener("wheel", disarmOnUserScroll, { passive: true });
     messagesEl.addEventListener("touchmove", disarmOnUserScroll, { passive: true });
+    messagesEl.addEventListener("pointerdown", disarmOnUserScroll, { passive: true });
     document.addEventListener("keydown", function (event) {
-      if (!stickyBottom) return;
-      if (event.key === "PageUp" || event.key === "Home" || event.key === "ArrowUp") disarmStickyBottom();
+      if (!stickyBottom && !turnAnchor) return;
+      if (event.key === "PageUp" || event.key === "Home" || event.key === "ArrowUp") { disarmStickyBottom(); turnAnchor = null; turnAnchorEnded = false; }
     });
   }
 }
@@ -150,6 +180,7 @@ export function armStickyBottom(durationMs) {
 
 export function disarmStickyBottom() {
   stickyBottom = false;
+  if (turnAnchorEnded) { turnAnchor = null; turnAnchorEnded = false; }
   if (stickyBottomQuietTimer) { clearTimeout(stickyBottomQuietTimer); stickyBottomQuietTimer = null; }
   if (stickyBottomCeilingTimer) { clearTimeout(stickyBottomCeilingTimer); stickyBottomCeilingTimer = null; }
 }
@@ -205,6 +236,7 @@ export function addToMessages(element) {
   if (prependAnchor) messagesEl.insertBefore(element, prependAnchor);
   else messagesEl.appendChild(element);
   keepActiveThinkingAtTail();
+  if (stickyBottomResizeObs && stickyBottom) stickyBottomResizeObs.observe(element);
 }
 
 export function addHistoryIndex(element, historyIndex) {
@@ -247,6 +279,16 @@ export function scrollToBottom() {
   if (prependAnchor || store.get('replayingHistory')) return;
   var messagesEl = getMessagesEl();
   if (!messagesEl) return;
+  if (stickyBottom) {
+    pinToBottomNow();
+    requestAnimationFrame(function () { if (stickyBottom && !layoutScrollLock()) pinToBottomNow(); });
+    return;
+  }
+  if (activeTurnAnchor(messagesEl) && !isUserScrolledUp) {
+    messagesEl.scrollTop = followTarget(messagesEl);
+    requestAnimationFrame(function () { if (!layoutScrollLock() && activeTurnAnchor(messagesEl)) messagesEl.scrollTop = followTarget(messagesEl); });
+    return;
+  }
   var distFromBottom = messagesEl.scrollHeight - messagesEl.scrollTop - messagesEl.clientHeight;
   if (distFromBottom > 150 || isUserScrolledUp) {
     if (distFromBottom > 150) isUserScrolledUp = true;
@@ -268,9 +310,16 @@ export function scrollToBottom() {
   });
 }
 
-export function forceScrollToBottom() {
+export function forceScrollToBottom(sentTurnEl) {
   if (prependAnchor || store.get('replayingHistory')) return;
+  // An explicit new turn supersedes a layout-only scroll receipt and any
+  // earlier reading position.
+  if (layoutScrollLock()) store.set({ paneLayoutScrollLock: null });
+  store.set({ paneLastUserScrollTop: null });
+  turnAnchor = sentTurnEl || null;
+  turnAnchorEnded = false;
   armStickyBottom(750);
+  requestAnimationFrame(function () { if (stickyBottom && !layoutScrollLock()) pinToBottomNow(); });
 }
 
 export function getMsgTime() {

package/lib/public/modules/filebrowser.js

@@ -16,6 +16,7 @@ import { initFileBrowserContextMenu, downloadProjectFile } from './filebrowser-c
 import { registerClayFileLinkOpener } from './clay-file-links.js';
 import { isPlantUmlFile, renderPlantUmlPreview, cancelPlantUmlPreview } from './plantuml-preview.js';
 import { isHtmlFile, renderHtmlPreview } from './html-preview.js';
+import { initialMarkdownRendered, rememberMarkdownViewMode, resetMarkdownViewModes } from './markdown-view-mode.js';
 
 var ctx;
 var showDropHint = function () {};
@@ -48,7 +49,7 @@ export function initFileBrowser(_ctx) {
       ctx.fileViewerEl.classList.remove("hidden");
       if (path !== currentFilePath || (store.get("fileViewerIsHtml") && isRendered && !document.querySelector(".file-viewer-html-preview"))) requestFileContent(path);
     },
-    onEmpty: function() { teardownFileViewer(); },
+    onEmpty: function() { resetMarkdownViewModes(); teardownFileViewer(); },
   });
   registerRightWorkbench("file-viewer", teardownFileViewer);
 
@@ -204,6 +205,7 @@ export function initFileBrowser(_ctx) {
   document.getElementById("file-viewer-render").addEventListener("click", function () {
     if (currentContent == null || (!currentIsMarkdown && !currentIsSvg && !store.get("fileViewerIsPlantUml") && !store.get("fileViewerIsHtml"))) return;
     isRendered = !isRendered;
+    if (currentIsMarkdown) rememberMarkdownViewMode((store.get('clayControlFileView') || {}).projectSlug, currentFilePath, isRendered);
     if (store.get("fileViewerIsHtml")) {
       renderHtmlBody();
       return;
@@ -534,6 +536,7 @@ export function setFileViewerFullscreen(enabled) {
 export function resetFileBrowser() {
   releaseRightWorkbench("file-viewer");
   clearFileViewerTabs();
+  resetMarkdownViewModes();
   teardownFileViewer();
   // Clear all cached state
   treeData = {};
@@ -1217,6 +1220,7 @@ function showFileContent(msg, expectedRevision) {
     store.set({ fileViewerIsHtml: !lightweightPreview && isHtmlFile(msg.path) });
     store.set({ fileViewerIsPlantUml: !lightweightPreview && isPlantUmlFile(msg.path) });
     if (lightweightPreview) isRendered = false;
+    if (currentIsMarkdown && !keepRenderState) isRendered = initialMarkdownRendered((store.get('clayControlFileView') || {}).projectSlug, msg.path, store.get('pendingFileNavigation'), pendingOpenMode);
     if (pendingRenderedOpen && currentIsMarkdown) isRendered = true;
 
     if (currentIsMarkdown || currentIsSvg || store.get("fileViewerIsPlantUml") || store.get("fileViewerIsHtml")) {
@@ -1227,7 +1231,7 @@ function showFileContent(msg, expectedRevision) {
       copyBtn.title = "Copy contents";
     }
 
-    // Markdown starts as source; HTML, SVG and diagrams start as previews.
+    // Markdown, HTML, SVG and diagrams start as previews; a line target or diff starts as source.
     if (lightweightPreview) {
       renderLargeTextFile(bodyEl, msg.content, msg.size);
     } else if (currentIsMarkdown) {

package/lib/public/modules/markdown-view-mode.js

@@ -0,0 +1,34 @@
+// Initial Markdown view for the file viewer. Rendered is the default; an
+// explicit line target or diff needs source rows, and a toggle made by the
+// user for a path in this tab session is respected on later focus/reopen.
+// Choices are scoped to the source project that owns the file.
+
+import { store } from './store.js';
+
+function modeKey(projectSlug, path) {
+  return JSON.stringify([projectSlug || null, path]);
+}
+
+function chosenMode(projectSlug, path) {
+  var modes = store.get('fileViewerMarkdownModes') || {};
+  var key = modeKey(projectSlug, path);
+  return Object.prototype.hasOwnProperty.call(modes, key) ? modes[key] : null;
+}
+
+export function initialMarkdownRendered(projectSlug, path, pendingNavigation, pendingMode) {
+  if (pendingNavigation && pendingNavigation.line && pendingNavigation.path === path) return false;
+  if (pendingMode && pendingMode.type === 'diff') return false;
+  var chosen = chosenMode(projectSlug, path);
+  return chosen ? chosen === 'rendered' : true;
+}
+
+export function rememberMarkdownViewMode(projectSlug, path, rendered) {
+  if (!path) return;
+  var next = Object.assign({}, store.get('fileViewerMarkdownModes') || {});
+  next[modeKey(projectSlug, path)] = rendered ? 'rendered' : 'source';
+  store.set({ fileViewerMarkdownModes: next });
+}
+
+export function resetMarkdownViewModes() {
+  store.set({ fileViewerMarkdownModes: {} });
+}

package/lib/public/modules/pane-file-bridge.js

@@ -59,9 +59,14 @@ export function handlePaneFileMessage(event, host, openFile, openFiles) {
   if (!msg || msg.type !== "clay-pane-open-file") return false;
   var frame = paneFrame(host, event.source);
   var state = store.snap();
-  var pane = matchingPane(frame, state.splitPanes);
-  if (frame && frame.clayPane && !livePaneBinding(frame, msg)) return true;
-  if (!pane || !hasLivePaneSource(frame, pane) || String(pane.slug) !== String(state.currentSlug) || msg.projectSlug !== frame.dataset.projectSlug || String(msg.sessionId) !== String(frame.dataset.sessionId) || !validLocation(msg.line) || !validLocation(msg.column)) return true;
+  // A live reusable pane is authorized by its document binding, which covers
+  // legacy splits, saved views and single-session views. Other frames keep the
+  // legacy split membership and URL checks.
+  var live = frame && frame.clayPane;
+  var pane = live ? { slug: frame.dataset.projectSlug, sessionId: frame.dataset.sessionId } : matchingPane(frame, state.splitPanes);
+  if (live && !livePaneBinding(frame, msg)) return true;
+  if (live && Number(msg.sessionId) !== live.identity().sessionId) return true;
+  if (!pane || (!live && !hasLivePaneSource(frame, pane)) || String(pane.slug) !== String(state.currentSlug) || msg.projectSlug !== frame.dataset.projectSlug || String(msg.sessionId) !== String(frame.dataset.sessionId) || !validLocation(msg.line) || !validLocation(msg.column)) return true;
   if (typeof msg.path !== "string" || !msg.path) return true;
   if (!state.connected || typeof openFile !== "function") return true;
   // The frame/session association was validated above. The host browser owns

package/lib/public/modules/session-folder-collapse.js

@@ -89,7 +89,8 @@ function setAccessibleState(root, body, toggle, open) {
 }
 
 function finish(key, token, root, body, toggle, open) {
-  if (currentRecord(key, token)) putRecord(key, null);
+  if (!currentRecord(key, token) || !root.isConnected) return;
+  putRecord(key, null);
   cleanBody(body);
   setAccessibleState(root, body, toggle, open);
   body.hidden = !open;

package/lib/public/modules/session-folder-dnd.js

@@ -186,8 +186,11 @@ function ghostFor(label) {
 }
 
 export function wireFolderDrag(header, folderId, label) {
-  header.setAttribute("draggable", "true");
+  // Keep disclosure clicks separate from the native folder-reorder gesture.
+  var handle = header.querySelector('.session-folder-label') || header;
+  handle.setAttribute("draggable", "true");
   header.addEventListener("dragstart", function (event) {
+    if (event.target.closest && event.target.closest('.session-folder-chevron, .session-folder-new-btn')) { event.preventDefault(); return; }
     var root = header.closest(".session-folder-folder");
     var parent = root && root.parentElement;
     if (!parent) return;

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

@@ -3,6 +3,8 @@
 import { store } from './store.js';
 import { getCachedSessions } from './sidebar-sessions.js';
 import { showToast } from './utils.js';
+import { currentFolderState, sendFolderOp } from './session-folders.js';
+import { organizePresentationView } from './split-view-presentations.js';
 
 var host = null;
 var commitDrop = null;
@@ -48,6 +50,13 @@ function onPointerDown(event) {
 function targetAt(x, y) {
   var element = document.elementFromPoint(x, y);
   if (!element || !element.closest || element.closest(".workbench, .split-view-menu, .split-view-arrange, [role='dialog'], .session-folder-view-menu, .session-context-menu, .session-folder-menu")) return null;
+  var folder = element.closest(".session-folder");
+  if (folder && !element.closest(".session-folder-unit, .session-item, .split-view-group")) {
+    var folderId = folder.dataset.folderId;
+    if (folderId === "favorites" || folderId === "unfiled" || currentFolderState().folders.some(function (item) { return item.id === folderId; })) {
+      return { folderId: folderId, element: folder, sidebar: true };
+    }
+  }
   var sidebar = sidebarTargetAt(element);
   if (sidebar) return sidebar;
   var pane = element.closest('.split-pane');
@@ -143,6 +152,11 @@ function renderPreview(drag, x, y) {
   if (!preview || !target) { if (preview) preview.hidden = true; return; }
   if (target.sidebar) {
     preview.hidden = true;
+    if (target.folderId) {
+      target.element.classList.add("session-folder-drop");
+      ghost.textContent += target.folderId === "favorites" ? " · Add to Favorites" : " · Move to folder";
+      return;
+    }
     var sameView = target.viewId && target.viewId === drag.sourceViewId;
     var view = viewForOrigin(target.origin), blocked = !sameView && view && view.sessions.length >= 8;
     target.element.dataset.splitViewDrop = blocked ? 'blocked' : 'ready';
@@ -181,6 +195,7 @@ function renderPreview(drag, x, y) {
 }
 
 function clearSidebarPreview() {
+  document.querySelectorAll('.session-folder-drop').forEach(function (element) { element.classList.remove('session-folder-drop'); });
   document.querySelectorAll('[data-split-view-drop]').forEach(function (element) { delete element.dataset.splitViewDrop; });
 }
 
@@ -225,6 +240,15 @@ function onPointerUp(event) {
     cleanup(true, true); showToast("Eight sessions are already open. Close a pane to add another.", "warn"); return;
   }
   cleanup(true, true);
+  if (target && target.folderId) {
+    var session = sessionById(drag.sessionId);
+    if (!validSession(session) || session.sessionOriginId !== drag.origin) return;
+    var view = viewForOrigin(drag.origin), favorite = target.folderId === 'favorites';
+    var folderId = target.folderId === 'unfiled' ? null : target.folderId;
+    if (view) organizePresentationView(view.id, view.revision, favorite ? view.folderId || null : folderId, favorite ? true : view.favorite === true);
+    else sendFolderOp(favorite ? { op: 'set_favorite', sessionId: session.id, favorite: true } : { op: 'place_session', sessionId: session.id, folderId: folderId });
+    return;
+  }
   if (target && drag.origin !== target.origin && commitDrop) commitDrop(drag, target);
 }
 

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

@@ -108,6 +108,9 @@ export function handleProjectSplitViews(msg) {
     renderActive();
     return true;
   }
+  // A repeated read must not cancel a captured gesture in an unchanged view.
+  if (state.projectSplitViewHydrated && !state.projectSplitViewPending && !msg.error && !state.projectSplitViewError &&
+      msg.revision === state.projectSplitViewRevision && JSON.stringify(nextViews) === JSON.stringify(state.projectSplitViews)) return true;
   var pending = state.projectSplitViewPending;
   if (state.projectSplitViewDrag || state.projectSplitViewDividerDrag) cleanupTransientInteractions(state);
   var activeId = state.projectSplitViewActiveId;
@@ -195,7 +198,7 @@ function mutation(type, body, meta) {
   }
   return true;
 }
-function setActiveView(id, preferredOrigin) {
+export function setActiveView(id, preferredOrigin) {
   var state = store.snap(), view = viewExists(state.projectSplitViews, id);
   if (!view) return false;
   try {
@@ -217,7 +220,7 @@ function checkMountedPaneDrafts() {
   if (!host) return;
   Array.from(host.querySelectorAll('.split-pane-frame')).forEach(function (frame) { if (frame.clayPane) frame.clayPane.checkDraft(); });
 }
-function switchToStandalone(sessionId) {
+export function switchToStandalone(sessionId) {
   var state = store.snap();
   try {
     if (state.projectSplitViewActiveId || state.splitPanes) checkMountedPaneDrafts();