clay-server 4.7.1-beta.3 → 4.7.1-beta.4

package/lib/project-connection.js

@@ -260,7 +260,7 @@ function attachConnection(ctx) {
       }
       var _vendorCaps = (sm.capabilitiesByVendor && sm.capabilitiesByVendor[active.vendor || sm.defaultVendor || "claude"]) || {};
       var activePermissionState = permissionModes.clientState(active, sm.currentPermissionMode, sm.defaultVendor);
-      sendTo(ws, { type: "session_switched", id: active.localId, sessionOriginId: active.sessionOriginId || null, cliSessionId: active.cliSessionId || null, loop: active.loop || null, vendor: active.vendor || null, model: active.model || null, effort: active.effort || initialEffort || null, hasHistory: (active.history && active.history.length > 0), capabilities: _vendorCaps, mode: active.mode || "gui", terminalId: typeof active.terminalId === "number" ? active.terminalId : null, runtimeMode: active.runtimeMode || null, runtimeTerminalId: typeof active.runtimeTerminalId === "number" ? active.runtimeTerminalId : null, tuiSuspended: !!active.tuiSuspended, permissionMode: activePermissionState.requestedPermissionMode, effectivePermissionMode: activePermissionState.effectivePermissionMode, permissionCapabilities: activePermissionState.permissionCapabilities, mcpPermissionModeOverrides: activePermissionState.mcpPermissionModeOverrides });
+      sendTo(ws, { type: "session_switched", id: active.localId, sessionOriginId: active.sessionOriginId || null, cliSessionId: active.cliSessionId || null, loop: active.loop || null, vendor: active.vendor || null, model: active.model || null, effort: active.effort || initialEffort || null, hasHistory: (active.history && active.history.length > 0), capabilities: _vendorCaps, isProcessing: !!active.isProcessing, mode: active.mode || "gui", terminalId: typeof active.terminalId === "number" ? active.terminalId : null, runtimeMode: active.runtimeMode || null, runtimeTerminalId: typeof active.runtimeTerminalId === "number" ? active.runtimeTerminalId : null, tuiSuspended: !!active.tuiSuspended, permissionMode: activePermissionState.requestedPermissionMode, effectivePermissionMode: activePermissionState.effectivePermissionMode, permissionCapabilities: activePermissionState.permissionCapabilities, mcpPermissionModeOverrides: activePermissionState.mcpPermissionModeOverrides });
       if (ctx.autonomousRun) sendTo(ws, { type: "autonomous_run_state", sessionId: active.localId, run: ctx.autonomousRun.project(active.autonomousRun) });
       // Send per-session context sources
       var sessionSources = loadContextSources(slug, active.localId);

package/lib/project-sessions.js

@@ -1760,7 +1760,7 @@ function attachSessions(ctx) {
         // Send feedback as next user message if there's text
         if (feedback) {
           setTimeout(function () {
-            var userMsg = { type: "user_message", text: feedback };
+            var userMsg = { type: "user_message", text: feedback, planFeedback: true };
             session.history.push(userMsg);
             sm.appendToSessionFile(session, userMsg);
             sendToSession(session.localId, userMsg);

package/lib/public/app.js

@@ -284,6 +284,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     loadingMore: false,
     historyTotal: 0,
     replayingHistory: false,
+    historyReplayBatch: null,
     projectName: projectName,
     cwd: "",
     currentSlug: currentSlug,

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

@@ -24,6 +24,7 @@ import { clearPermissionModePending } from './permission-control.js';
 import { clearMcpPermissionModePending } from './mcp-ui.js';
 import { createWebSocketLifecycle } from './websocket-lifecycle.js';
 import { createWebSocketWatchdog } from './websocket-watchdog.js';
+import { resetHistoryReplayBatch } from './history-replay-batch.js';
 
 var connectOverlay = null;
 var hasConnectedOnce = false;
@@ -324,6 +325,7 @@ function onConnected() {
 
 export function connect() {
   if (lifecycle.isOffline()) return;
+  resetHistoryReplayBatch();
   var attemptEpoch = lifecycle.beginAttempt();
   attemptStartedAt = Date.now();
   var ws = getWs();

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

@@ -14,6 +14,7 @@ import { handleClaySessionTarget } from './command-palette.js';
 import { handleDefaultAiMessage } from './default-ai.js';
 import { handleCursorSharingMessage } from './cursor-sharing-preference.js';
 import { handlePendingMessageQueueMessage } from './pending-message-queue.js';
+import { receiveHistoryReplay } from './history-replay-batch.js';
 
 export function handleHomeProtocolMessage(msg) {
   if (handleIssueReference(msg)) return true;
@@ -82,6 +83,10 @@ export function handleHomeProtocolMessage(msg) {
 }
 
 export function processMessage(msg) {
+  receiveHistoryReplay(msg, dispatchMessage);
+}
+
+function dispatchMessage(msg) {
   if (handlePendingMessageQueueMessage(msg)) return;
   if (handleDefaultAiMessage(msg)) return;
   if (handleCursorSharingMessage(msg)) return;

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

@@ -67,7 +67,7 @@ import { renderGeneratedImage, renderImageGenerationProgress, clearImageGenerati
 import { clearPairResultStatus, handlePairResultStatus } from './pair-result-status.js';
 
 // --- App module imports ---
-import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, removeMatePreThinking, resetStreamBuffer, appendDelta, 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, 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 { resolvePaneSession, resolveSwitchedVendor } from './pane-session.js';
@@ -251,16 +251,14 @@ export function processMessage(msg) {
         }
         updateContextPanel();
         updateUsagePanel();
-        // Render + finalize any incomplete turn from the replayed history
-        var _hs = store.snap();
-        if (_hs.currentMsgEl && _hs.currentFullText) {
-          var replayContentEl = _hs.currentMsgEl.querySelector(".md-content");
-          if (replayContentEl) {
-            replayContentEl.innerHTML = renderMarkdown(_hs.currentFullText);
-          }
+        // Keep the active answer and tools attached so live deltas continue
+        // the restored turn instead of starting a second answer bubble.
+        if (store.get('sessionIsProcessing')) {
+          flushStreamBuffer();
+        } else {
+          markAllToolsDone();
+          finalizeAssistantBlock();
         }
-        markAllToolsDone();
-        finalizeAssistantBlock();
         stopUrgentBlink();
         // Clean up debate UI if debate is not active after replay
         if (!isDebateActive()) {
@@ -975,6 +973,12 @@ export function processMessage(msg) {
         if (msg.sessionId != null && String(msg.sessionId) !== String(store.get('activeSessionId'))) break;
         if (msg.clientMessageId && messagesEl.querySelector('[data-client-message-id="' + msg.clientMessageId + '"]')) break;
         if (!store.get('replayingHistory')) beginMarkdownTurn();
+        // A recorded user turn closes the previous one. Tools left open by an
+        // interrupted earlier turn must not keep spinning in a restored
+        // running session, where history_done keeps current tools active.
+        // Question answers, plan feedback and Driver delegations are injected
+        // mid-turn, so tools before them may still be running.
+        else if (!msg.askUserAnswer && !msg.planFeedback && !msg.delegated) markAllToolsDone();
         resetThinkingGroup();
         if (msg.planContent) {
           setPlanContent(msg.planContent);

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

@@ -168,7 +168,7 @@ export function keepActiveThinkingAtTail() {
 }
 
 export function scrollToBottom() {
-  if (prependAnchor) return;
+  if (prependAnchor || store.get('replayingHistory')) return;
   var messagesEl = getMessagesEl();
   if (!messagesEl) return;
   var distFromBottom = messagesEl.scrollHeight - messagesEl.scrollTop - messagesEl.clientHeight;
@@ -192,7 +192,7 @@ export function scrollToBottom() {
 }
 
 export function forceScrollToBottom() {
-  if (prependAnchor) return;
+  if (prependAnchor || store.get('replayingHistory')) return;
   armStickyBottom(750);
 }
 

package/lib/public/modules/history-replay-batch.js

@@ -0,0 +1,113 @@
+import { store } from './store.js';
+
+// Recovery bounds for a replay whose history_done never arrives. Either limit
+// restores everything received so far and lets later messages through, so a
+// lost terminator cannot capture live output indefinitely.
+export var HISTORY_REPLAY_TIMEOUT_MS = 20000;
+export var HISTORY_REPLAY_MAX_EVENTS = 200000;
+export var HISTORY_REPLAY_MAX_TEXT = 16 * 1024 * 1024;
+var MAX_LOGGED_FAILURES = 5;
+
+function cancelTimer(batch) {
+  if (batch && batch.timer) {
+    clearTimeout(batch.timer);
+    batch.timer = null;
+  }
+}
+
+export function resetHistoryReplayBatch() {
+  cancelTimer(store.get('historyReplayBatch'));
+  store.set({ historyReplayBatch: null, replayingHistory: false });
+}
+
+function canCombine(previous, message) {
+  if (!previous || previous.type !== message.type || typeof previous.text !== 'string' || typeof message.text !== 'string') return false;
+  if (message.type !== 'delta' && message.type !== 'thinking_delta') return false;
+  // Keep identity/metadata boundaries intact. Timestamps on individual tokens
+  // can differ; the first token still supplies the message's display time.
+  var keys = Object.keys(previous).concat(Object.keys(message));
+  return keys.every(function (key) {
+    return key === 'text' || key === '_ts' || previous[key] === message[key];
+  });
+}
+
+function finishText(batch) {
+  if (!batch.textParts) return;
+  batch.items[batch.items.length - 1].text = batch.textParts.join('');
+  batch.textParts = null;
+}
+
+// Diagnostics name the entry type and error class only. Error messages and
+// stacks can quote transcript content, so they are never logged.
+function describeFailure(msg, err) {
+  var type = msg && typeof msg.type === 'string' && /^[A-Za-z0-9_]{1,64}$/.test(msg.type) ? msg.type : 'unknown';
+  var name = err && typeof err.name === 'string' && /^[A-Za-z]{1,64}$/.test(err.name) ? err.name : 'Error';
+  return type + ' entry failed with ' + name;
+}
+
+function deliver(batch, done, dispatch) {
+  cancelTimer(batch);
+  finishText(batch);
+  if (store.get('historyReplayBatch') === batch) store.set({ historyReplayBatch: null });
+  var entries = batch.items.concat([done]);
+  var failures = 0;
+  try {
+    // Each entry is isolated like a separate socket message: one bad record
+    // must not discard the rest of the transcript or history_done cleanup.
+    for (var i = 0; i < entries.length; i++) {
+      try {
+        dispatch(entries[i]);
+      } catch (err) {
+        failures++;
+        if (failures <= MAX_LOGGED_FAILURES) {
+          console.error('[history-replay] Restored history ' + (i + 1) + '/' + entries.length + ': ' + describeFailure(entries[i], err));
+        }
+      }
+    }
+    if (failures > MAX_LOGGED_FAILURES) {
+      console.error('[history-replay] ' + (failures - MAX_LOGGED_FAILURES) + ' more restored history failures were not logged.');
+    }
+  } finally {
+    store.set({ replayingHistory: false });
+  }
+}
+
+function recover(batch, reason, dispatch) {
+  if (store.get('historyReplayBatch') !== batch) return;
+  console.warn('[history-replay] history_done missing after ' + batch.received + ' events (' + reason + '); restoring received history.');
+  deliver(batch, { type: 'history_done', replayRecovered: true }, dispatch);
+}
+
+// WebSocket history arrives across many browser tasks. Collect it before
+// calling the normal handlers so the browser cannot paint intermediate tools,
+// Thinking segments or old answers between those tasks.
+export function receiveHistoryReplay(msg, dispatch) {
+  if (msg.type === 'session_switched' || msg.type === 'project_info') resetHistoryReplayBatch();
+  if (msg.type === 'history_meta') {
+    cancelTimer(store.get('historyReplayBatch'));
+    var started = { items: [msg], textParts: null, received: 1, text: 0, timer: null };
+    started.timer = setTimeout(function () { recover(started, 'timeout', dispatch); }, HISTORY_REPLAY_TIMEOUT_MS);
+    store.set({ historyReplayBatch: started });
+    return;
+  }
+  var batch = store.get('historyReplayBatch');
+  if (!batch) {
+    dispatch(msg);
+    return;
+  }
+  if (msg.type === 'history_done') {
+    deliver(batch, msg, dispatch);
+    return;
+  }
+  batch.received++;
+  if (typeof msg.text === 'string') batch.text += msg.text.length;
+  var previous = batch.items[batch.items.length - 1];
+  if (canCombine(previous, msg)) {
+    if (!batch.textParts) batch.textParts = [previous.text];
+    batch.textParts.push(msg.text);
+  } else {
+    finishText(batch);
+    batch.items.push(Object.assign({}, msg));
+  }
+  if (batch.received >= HISTORY_REPLAY_MAX_EVENTS || batch.text >= HISTORY_REPLAY_MAX_TEXT) recover(batch, 'size', dispatch);
+}

package/package.json

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