clay-server 2.26.0-beta.2 → 2.26.0-beta.3

package/lib/project.js

@@ -2204,6 +2204,8 @@ function createProjectContext(opts) {
     if (msg.type === "rewind_preview") {
       var session = getSessionForWs(ws);
       if (!session || !session.cliSessionId || !msg.uuid) return;
+      // Reject preview requests while a rewind is executing
+      if (session._rewindInProgress) return;
 
       (async function () {
         var result;
@@ -2233,6 +2235,12 @@ function createProjectContext(opts) {
     if (msg.type === "rewind_execute") {
       var session = getSessionForWs(ws);
       if (!session || !session.cliSessionId || !msg.uuid) return;
+      // Guard against concurrent rewind executions
+      if (session._rewindInProgress) {
+        sendTo(ws, { type: "rewind_error", text: "Rewind already in progress." });
+        return;
+      }
+      session._rewindInProgress = true;
       var mode = msg.mode || "both";
 
       (async function () {
@@ -2293,6 +2301,7 @@ function createProjectContext(opts) {
         } catch (err) {
           sendTo(ws, { type: "rewind_error", text: "Rewind failed: " + err.message });
         } finally {
+          session._rewindInProgress = false;
           if (result && result.isTemp) result.cleanup();
         }
       })();

package/lib/public/app.js

@@ -6,7 +6,7 @@ import { initSidebar, renderSessionList, handleSearchResults, updateSessionPrese
 import { initMateSidebar, showMateSidebar, hideMateSidebar, renderMateSessionList, updateMateSidebarProfile, handleMateSearchResults } from './modules/mate-sidebar.js';
 import { initMateKnowledge, requestKnowledgeList, renderKnowledgeList, handleKnowledgeContent, hideKnowledge } from './modules/mate-knowledge.js';
 import { initMateMemory, renderMemoryList, hideMemory } from './modules/mate-memory.js';
-import { initRewind, setRewindMode, showRewindModal, clearPendingRewindUuid, addRewindButton } from './modules/rewind.js';
+import { initRewind, setRewindMode, showRewindModal, clearPendingRewindUuid, addRewindButton, onRewindComplete, onRewindError } from './modules/rewind.js';
 import { initNotifications, showDoneNotification, playDoneSound, isNotifAlertEnabled, isNotifSoundEnabled } from './modules/notifications.js';
 import { initInput, clearPendingImages, handleInputSync, autoResize, builtinCommands, sendMessage, hasSendableContent, setScheduleBtnDisabled, setScheduleDelayMs, clearScheduleDelay } from './modules/input.js';
 import { initQrCode, triggerShare } from './modules/qrcode.js';
@@ -14,7 +14,7 @@ import { initFileBrowser, loadRootDirectory, refreshTree, handleFsList, handleFs
 import { initTerminal, openTerminal, closeTerminal, resetTerminals, handleTermList, handleTermCreated, handleTermOutput, handleTermResized, handleTermExited, handleTermClosed, sendTerminalCommand } from './modules/terminal.js';
 import { initStickyNotes, handleNotesList, handleNoteCreated, handleNoteUpdated, handleNoteDeleted, openArchive, closeArchive, isArchiveOpen, hideNotes, showNotes, isNotesVisible } from './modules/sticky-notes.js';
 import { initTheme, getThemeColor, getComputedVar, onThemeChange, getCurrentTheme } from './modules/theme.js';
-import { initTools, resetToolState, saveToolState, restoreToolState, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionResolved, markPermissionCancelled, renderElicitationRequest, markElicitationResolved, renderPlanBanner, renderPlanCard, handleTodoWrite, handleTaskCreate, handleTaskUpdate, startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, addTurnMeta, enableMainInput, getTools, getPlanContent, setPlanContent, isPlanFilePath, getTodoTools, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, updateSubagentProgress, initSubagentStop, closeToolGroup, removeToolFromGroup } from './modules/tools.js';
+import { initTools, resetToolState, saveToolState, restoreToolState, renderAskUserQuestion, markAskUserAnswered, renderPermissionRequest, markPermissionResolved, markPermissionCancelled, renderElicitationRequest, markElicitationResolved, renderPlanBanner, renderPlanCard, handleTodoWrite, handleTaskCreate, handleTaskUpdate, startThinking, appendThinking, stopThinking, resetThinkingGroup, createToolItem, updateToolExecuting, updateToolResult, markAllToolsDone, addTurnMeta, resetTurnMetaCost, enableMainInput, getTools, getPlanContent, setPlanContent, isPlanFilePath, getTodoTools, updateSubagentActivity, addSubagentToolEntry, markSubagentDone, updateSubagentProgress, initSubagentStop, closeToolGroup, removeToolFromGroup } from './modules/tools.js';
 import { initServerSettings, updateSettingsStats, updateSettingsModels, updateDaemonConfig, handleSetPinResult, handleKeepAwakeChanged, handleAutoContinueChanged, handleRestartResult, handleShutdownResult, handleSharedEnv, handleSharedEnvSaved, handleGlobalClaudeMdRead, handleGlobalClaudeMdWrite } from './modules/server-settings.js';
 import { initProjectSettings, handleInstructionsRead, handleInstructionsWrite, handleProjectEnv, handleProjectEnvSaved, isProjectSettingsOpen, handleProjectSharedEnv, handleProjectSharedEnvSaved, handleProjectOwnerChanged } from './modules/project-settings.js';
 import { initSkills, handleSkillInstalled, handleSkillUninstalled } from './modules/skills.js';
@@ -2468,7 +2468,9 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   }
 
   function accumulateUsage(cost, usage) {
-    if (cost != null) sessionUsage.cost += cost;
+    // cost is the SDK's total_cost_usd — a cumulative running total, not a delta.
+    // Assign directly instead of summing to avoid overcounting.
+    if (cost != null) sessionUsage.cost = cost;
     if (usage) {
       sessionUsage.input += usage.input_tokens || usage.inputTokens || 0;
       sessionUsage.output += usage.output_tokens || usage.outputTokens || 0;
@@ -2666,7 +2668,8 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
   }
 
   function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens) {
-    if (cost != null) contextData.cost += cost;
+    // cost is the SDK's total_cost_usd — a cumulative running total, not a delta.
+    if (cost != null) contextData.cost = cost;
     // Use latest turn values (not cumulative) since each turn's input_tokens
     // already includes the full conversation context up to that point
     if (usage) {
@@ -3718,6 +3721,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     setStatus("connected");
     if (!loopActive) enableMainInput();
     resetUsage();
+    resetTurnMetaCost();
     resetContext();
     // Clear header indicators
     clearRateLimitIndicator();
@@ -4711,6 +4715,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
           break;
 
         case "rewind_complete":
+          onRewindComplete();
           setRewindMode(false);
           var rewindText = "Rewound to earlier point. Files have been restored.";
           if (msg.mode === "chat") rewindText = "Conversation rewound to earlier point.";
@@ -4719,6 +4724,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
           break;
 
         case "rewind_error":
+          onRewindError();
           clearPendingRewindUuid();
           addSystemMessage(msg.text || "Rewind failed.", true);
           break;
@@ -4980,6 +4986,22 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
             // Update mate sidebar if currently viewing this mate
             if (dmMode && dmTargetUser && dmTargetUser.isMate && dmTargetUser.id === msg.mate.id) {
               updateMateSidebarProfile(msg.mate);
+              // Sync dmTargetUser so subsequent renders use fresh data
+              var mp2 = msg.mate.profile || {};
+              dmTargetUser.displayName = mp2.displayName || msg.mate.name || dmTargetUser.displayName;
+              dmTargetUser.avatarStyle = mp2.avatarStyle || dmTargetUser.avatarStyle;
+              dmTargetUser.avatarSeed = mp2.avatarSeed || dmTargetUser.avatarSeed;
+              dmTargetUser.avatarColor = mp2.avatarColor || dmTargetUser.avatarColor;
+              dmTargetUser.avatarCustom = mp2.avatarCustom || "";
+              dmTargetUser.profile = mp2;
+              // Refresh body dataset so new chat bubbles use the updated avatar
+              document.body.dataset.mateAvatarUrl = mateAvatarUrl(dmTargetUser, 36);
+              document.body.dataset.mateName = mp2.displayName || msg.mate.name || "";
+              // Update existing chat bubble avatars
+              var mateAvis = document.querySelectorAll(".dm-bubble-avatar-mate");
+              for (var mbi = 0; mbi < mateAvis.length; mbi++) {
+                mateAvis[mbi].src = document.body.dataset.mateAvatarUrl;
+              }
             }
             // Update DM header if currently chatting with this mate
             if (dmMode && dmTargetUser && dmTargetUser.id === msg.mate.id) {

package/lib/public/modules/rewind.js

@@ -4,6 +4,8 @@ import { iconHtml, refreshIcons } from './icons.js';
 var ctx;
 var rewindMode = false;
 var pendingRewindUuid = null;
+var rewindPreviewInFlight = false;
+var rewindExecuting = false;
 var rewindBannerEl = null;
 var rewindScrollHandler = null;
 var rewindModal, rewindSummary, rewindFilesList, rewindConfirmBtn, rewindCancelBtn, rewindModeOptions;
@@ -50,6 +52,17 @@ export function clearPendingRewindUuid() {
   pendingRewindUuid = null;
 }
 
+export function onRewindComplete() {
+  rewindExecuting = false;
+  rewindPreviewInFlight = false;
+  pendingRewindUuid = null;
+}
+
+export function onRewindError() {
+  rewindExecuting = false;
+  rewindPreviewInFlight = false;
+}
+
 function initiateRewind(uuid) {
   if (ctx.processing) {
     ctx.addSystemMessage("Cannot rewind while processing. Stop the current operation first.", true);
@@ -59,7 +72,16 @@ function initiateRewind(uuid) {
     ctx.addSystemMessage("No rewind point found for this turn.", true);
     return;
   }
+  if (rewindPreviewInFlight) {
+    // Debounce: ignore clicks while a preview is already in flight
+    return;
+  }
+  if (rewindExecuting) {
+    ctx.addSystemMessage("Rewind already in progress.", true);
+    return;
+  }
   pendingRewindUuid = uuid;
+  rewindPreviewInFlight = true;
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({ type: "rewind_preview", uuid: uuid }));
   }
@@ -98,6 +120,17 @@ function updateSummaryForMode() {
 }
 
 export function showRewindModal(data) {
+  rewindPreviewInFlight = false;
+
+  // Ignore stale preview results that don't match current pending UUID
+  if (data.uuid && pendingRewindUuid && data.uuid !== pendingRewindUuid) {
+    return;
+  }
+  // Ignore if a rewind is already executing
+  if (rewindExecuting) {
+    return;
+  }
+
   var p = data.preview || data;
   var filePaths = p.filesChanged || p.filePaths || p.files || [];
   var fileCount = filePaths.length;
@@ -171,6 +204,7 @@ export function showRewindModal(data) {
 export function hideRewindModal() {
   rewindModal.classList.add("hidden");
   pendingRewindUuid = null;
+  rewindPreviewInFlight = false;
 }
 
 export function renderDiffPre(text) {
@@ -333,7 +367,9 @@ export function initRewind(_ctx) {
   });
 
   rewindConfirmBtn.addEventListener("click", function() {
+    if (rewindExecuting) return;
     if (pendingRewindUuid && ctx.ws && ctx.connected) {
+      rewindExecuting = true;
       var mode = getSelectedMode();
       ctx.ws.send(JSON.stringify({ type: "rewind_execute", uuid: pendingRewindUuid, mode: mode }));
     }

package/lib/public/modules/tools.js

@@ -2063,13 +2063,29 @@ export function markSubagentDone(parentToolId, status, summary, usage) {
   if (usage) updateSubagentProgress(parentToolId, usage, null);
 }
 
+var _lastCumulativeCost = 0;
+
+export function resetTurnMetaCost() {
+  _lastCumulativeCost = 0;
+}
+
 export function addTurnMeta(cost, duration) {
   closeToolGroup();
   var div = document.createElement("div");
   div.className = "turn-meta";
   div.dataset.turn = ctx.turnCounter;
   var parts = [];
-  if (cost != null) parts.push("$" + cost.toFixed(4));
+  if (cost != null) {
+    // cost is cumulative total_cost_usd from the SDK.
+    // When the SDK session restarts, total_cost_usd resets to 0 so cost
+    // can drop below _lastCumulativeCost.  In that case the entire cost
+    // value IS the delta for this turn (fresh SDK session).
+    var delta = cost - _lastCumulativeCost;
+    if (delta < 0) delta = cost;
+    _lastCumulativeCost = cost;
+    var deltaStr = delta > 0 ? "+$" + delta.toFixed(4) : "$0.0000";
+    parts.push(deltaStr + " \u2192 $" + cost.toFixed(4));
+  }
   if (duration != null) parts.push((duration / 1000).toFixed(1) + "s");
   if (parts.length) {
     div.textContent = parts.join(" \u00b7 ");
@@ -2114,6 +2130,7 @@ export function saveToolState() {
     currentToolGroup: currentToolGroup,
     toolGroupCounter: toolGroupCounter,
     toolGroups: toolGroups,
+    lastCumulativeCost: _lastCumulativeCost,
   };
 }
 
@@ -2126,6 +2143,7 @@ export function restoreToolState(saved) {
   currentToolGroup = saved.currentToolGroup;
   toolGroupCounter = saved.toolGroupCounter;
   toolGroups = saved.toolGroups;
+  _lastCumulativeCost = saved.lastCumulativeCost || 0;
   if (todoWidgetEl) {
     setupTodoObserver();
   }
@@ -2146,6 +2164,9 @@ export function resetToolState() {
   currentToolGroup = null;
   toolGroupCounter = 0;
   toolGroups = {};
+  // NOTE: do NOT reset _lastCumulativeCost here — it must persist across
+  // turns so addTurnMeta can compute per-turn deltas.  It is only cleared
+  // on new conversation via resetTurnMetaCost().
   var stickyEl = document.getElementById("todo-sticky");
   if (stickyEl) { stickyEl.classList.add("hidden"); stickyEl.innerHTML = ""; }
 }

package/lib/sdk-bridge.js

@@ -1138,6 +1138,8 @@ function createSDKBridge(opts) {
       if (session.lastRewindUuid) {
         queryOptions.resumeSessionAt = session.lastRewindUuid;
         delete session.lastRewindUuid;
+        // Persist the deletion so server restarts don't re-use a stale UUID
+        sm.saveSessionFile(session);
       }
     }
 
@@ -1687,8 +1689,13 @@ function createSDKBridge(opts) {
   }
 
   async function processQueryStream(session) {
+    // Capture references at start so we only clean up OUR resources in finally,
+    // not resources from a newer query that may have been created after an abort.
+    var myQueryInstance = session.queryInstance;
+    var myMessageQueue = session.messageQueue;
+    var myAbortController = session.abortController;
     try {
-      for await (var msg of session.queryInstance) {
+      for await (var msg of myQueryInstance) {
         processSDKMessage(session, msg);
       }
       // Stream ended normally after a task stop — no "result" message was sent,
@@ -1704,7 +1711,7 @@ function createSDKBridge(opts) {
       if (session.isProcessing) {
         session.isProcessing = false;
         onProcessingChanged();
-        if (err.name === "AbortError" || (session.abortController && session.abortController.signal.aborted) || session.taskStopRequested) {
+        if (err.name === "AbortError" || (myAbortController && myAbortController.signal.aborted) || session.taskStopRequested) {
           if (!session.destroying) {
             sendAndRecord(session, { type: "info", text: "Interrupted \u00b7 What should Claude do instead?" });
             sendAndRecord(session, { type: "done", code: 0 });
@@ -1777,16 +1784,19 @@ function createSDKBridge(opts) {
     } finally {
       // Close the SDK query to terminate the underlying claude child process.
       // Without this, the process stays alive indefinitely (single-user mode).
-      if (session.queryInstance) {
+      // Only clean up if the session still references OUR resources.
+      // A rewind + new startQuery may have already replaced these with
+      // a newer query — clobbering them would kill the new query.
+      if (session.queryInstance === myQueryInstance) {
         try {
           if (typeof session.queryInstance.close === "function") {
             session.queryInstance.close();
           }
         } catch (e) {}
+        session.queryInstance = null;
       }
-      session.queryInstance = null;
-      session.messageQueue = null;
-      session.abortController = null;
+      if (session.messageQueue === myMessageQueue) session.messageQueue = null;
+      if (session.abortController === myAbortController) session.abortController = null;
       session.taskStopRequested = false;
       session.pendingPermissions = {};
       session.pendingAskUser = {};
@@ -1952,6 +1962,8 @@ function createSDKBridge(opts) {
       if (session.lastRewindUuid) {
         queryOptions.resumeSessionAt = session.lastRewindUuid;
         delete session.lastRewindUuid;
+        // Persist the deletion so server restarts don't re-use a stale UUID
+        sm.saveSessionFile(session);
       }
     }
 

package/lib/sessions.js

@@ -96,10 +96,14 @@ function createSessionManager(opts) {
         lines.push(JSON.stringify(session.history[i]));
       }
       var sfPath = sessionFilePath(session.cliSessionId);
-      fs.writeFileSync(sfPath, lines.join("\n") + "\n");
+      // Atomic write: write to temp file then rename, so a crash mid-write
+      // cannot leave a truncated/corrupted session file.
+      var tmpPath = sfPath + ".tmp." + process.pid;
+      fs.writeFileSync(tmpPath, lines.join("\n") + "\n");
       if (process.platform !== "win32") {
-        try { fs.chmodSync(sfPath, 0o600); } catch (chmodErr) {}
+        try { fs.chmodSync(tmpPath, 0o600); } catch (chmodErr) {}
       }
+      fs.renameSync(tmpPath, sfPath);
     } catch(e) {
       console.error("[session] Failed to save session file:", e.message);
     }
@@ -123,6 +127,13 @@ function createSessionManager(opts) {
     var files;
     try { files = fs.readdirSync(sessionsDir); } catch { return; }
 
+    // Clean up stale temp files from interrupted atomic writes
+    for (var ti = 0; ti < files.length; ti++) {
+      if (files[ti].indexOf(".tmp.") !== -1) {
+        try { fs.unlinkSync(path.join(sessionsDir, files[ti])); } catch (e) {}
+      }
+    }
+
     var loaded = [];
     for (var i = 0; i < files.length; i++) {
       if (!files[i].endsWith(".jsonl")) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.26.0-beta.2",
+  "version": "2.26.0-beta.3",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",