clay-server 2.36.2-beta.6 → 2.36.2-beta.8

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

@@ -733,6 +733,10 @@ export function processMessage(msg) {
           // applied at history_done time.
           store.set({ sessionIsProcessing: true });
           applyDeadSessionTodoCompaction();
+          // Server confirmed the turn started: pre-thinking dots have done
+          // their job, drop them so they aren't stranded if no further
+          // events make it through.
+          removeMatePreThinking();
           if (!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate) && !store.get('matePreThinkingEl')) {
             setActivity("thinking");
           }
@@ -740,6 +744,10 @@ export function processMessage(msg) {
         break;
 
       case "compacting":
+        // Compacting means the SDK is mid-turn doing context compaction.
+        // Pre-thinking dots have served their purpose, clear them so the
+        // user sees the compaction indicator instead.
+        removeMatePreThinking();
         if (msg.active) {
           setActivity("compacting");
         } else if (!(store.get('dmMode') && store.get('dmTargetUser') && store.get('dmTargetUser').isMate)) {
@@ -934,6 +942,10 @@ export function processMessage(msg) {
         break;
 
       case "result":
+        // Result marks turn end. Drop pre-thinking even if no delta/tool
+        // event ever arrived (e.g. tool-only turn whose progress signals
+        // were missed by the client).
+        removeMatePreThinking();
         setActivity(null);
         stopThinking();
         markAllToolsDone();

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

@@ -623,6 +623,23 @@ function doShowMatePreThinking(mateName, mateAvatar) {
   }
   refreshIcons();
   scrollToBottom();
+  // Safety net: if no server event ever clears these dots (lost in transit,
+  // missed handler, etc.) the user sees them forever and assumes the
+  // session is hung. After 90s with zero progress, clear the indicator
+  // and log a system note so the user knows to retry.
+  if (matePreThinkingTimer) clearTimeout(matePreThinkingTimer);
+  matePreThinkingTimer = setTimeout(function () {
+    var stillThere = store.get('matePreThinkingEl');
+    if (!stillThere) return;
+    stillThere.remove();
+    store.set({ matePreThinkingEl: null });
+    matePreThinkingTimer = null;
+    var note = document.createElement("div");
+    note.className = "system-msg";
+    note.textContent = "No response received in 90s. The server may have stalled. Send another message to retry.";
+    addToMessages(note);
+    scrollToBottom();
+  }, 90000);
 }
 
 export function removeMatePreThinking() {

package/lib/yoke/adapters/claude-worker.js

@@ -271,6 +271,9 @@ function handleMessage(msg) {
     case "stop_task":
       handleStopTask(msg);
       break;
+    case "rewind_files":
+      handleRewindFiles(msg);
+      break;
     case "permission_response":
       handlePermissionResponse(msg);
       break;
@@ -598,6 +601,22 @@ async function handleSetPermissionMode(msg) {
   }
 }
 
+async function handleRewindFiles(msg) {
+  // Bridge the host's rewindFiles call to the in-process SDK query inside
+  // the worker. Both the dryRun preview and the actual restore go through
+  // here; the response carries the SDK's preview/result object back.
+  if (!queryInstance || typeof queryInstance.rewindFiles !== "function") {
+    sendToDaemon({ type: "rewind_files_response", requestId: msg.requestId, error: "rewindFiles not supported by active query" });
+    return;
+  }
+  try {
+    var result = await queryInstance.rewindFiles(msg.uuid, msg.opts || {});
+    sendToDaemon({ type: "rewind_files_response", requestId: msg.requestId, result: result });
+  } catch (e) {
+    sendToDaemon({ type: "rewind_files_response", requestId: msg.requestId, error: (e && e.message) ? e.message : String(e) });
+  }
+}
+
 async function handleStopTask(msg) {
   if (!queryInstance) return;
   try {

package/lib/yoke/adapters/claude.js

@@ -688,6 +688,11 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool)
   var iterEnded = false;
   var iterError = null;
 
+  // Pending request/response correlation for handle methods that need a
+  // result from the worker (e.g. rewindFiles). Each entry is keyed by a
+  // requestId and holds { resolve, reject } of the in-flight Promise.
+  var pendingRewinds = {};
+
   function pushToIter(value) {
     if (iterEnded) return;
     if (iterWaiting) {
@@ -797,6 +802,16 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool)
         pushToIter({ type: "_worker_meta", subtype: msg.type, data: msg });
         break;
 
+      case "rewind_files_response": {
+        var rp = pendingRewinds[msg.requestId];
+        if (rp) {
+          delete pendingRewinds[msg.requestId];
+          if (msg.error) rp.reject(new Error(msg.error));
+          else rp.resolve(msg.result);
+        }
+        break;
+      }
+
       case "query_done":
         console.log("[yoke/claude] IPC query_done received, pid=" + (worker.process ? worker.process.pid : "?"));
         worker._queryEnded = true;
@@ -934,6 +949,22 @@ function createWorkerQueryHandle(worker, canUseTool, onElicitation, callMcpTool)
     endInput: function() {
       worker.send({ type: "end_messages" });
     },
+
+    // Claude SDK specific: rewind files to a previous state. The in-process
+    // handle calls rawQuery.rewindFiles directly; the worker variant has to
+    // hop through IPC and correlate the response by requestId.
+    rewindFiles: function(uuid, opts) {
+      var requestId = crypto.randomUUID();
+      return new Promise(function(resolve, reject) {
+        pendingRewinds[requestId] = { resolve: resolve, reject: reject };
+        try {
+          worker.send({ type: "rewind_files", requestId: requestId, uuid: uuid, opts: opts || {} });
+        } catch (e) {
+          delete pendingRewinds[requestId];
+          reject(e);
+        }
+      });
+    },
   };
 
   return handle;

package/package.json

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