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

package/lib/project.js

@@ -18,6 +18,32 @@ var userPresence = require("./user-presence");
 var { attachDebate } = require("./project-debate");
 var MAX_UPLOAD_BYTES = 50 * 1024 * 1024; // 50 MB
 
+// --- Context Sources persistence ---
+var _ctxSrcConfig = require("./config");
+var _ctxSrcDir = path.join(_ctxSrcConfig.CONFIG_DIR, "context-sources");
+
+function loadContextSources(slug) {
+  try {
+    var filePath = path.join(_ctxSrcDir, slug + ".json");
+    var data = JSON.parse(fs.readFileSync(filePath, "utf8"));
+    return data.active || [];
+  } catch (e) {
+    return [];
+  }
+}
+
+function saveContextSources(slug, activeIds) {
+  try {
+    if (!fs.existsSync(_ctxSrcDir)) {
+      fs.mkdirSync(_ctxSrcDir, { recursive: true });
+    }
+    var filePath = path.join(_ctxSrcDir, slug + ".json");
+    fs.writeFileSync(filePath, JSON.stringify({ active: activeIds }), "utf8");
+  } catch (e) {
+    console.error("[context-sources] Failed to save:", e.message);
+  }
+}
+
 // Validate environment variable string (KEY=VALUE per line)
 // Returns null if valid, or an error string if invalid
 function validateEnvString(str) {
@@ -1235,6 +1261,7 @@ function createProjectContext(opts) {
     }
     sendTo(ws, { type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode || "default", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
     sendTo(ws, { type: "term_list", terminals: tm.list() });
+    sendTo(ws, { type: "context_sources_state", active: loadContextSources(slug) });
     sendTo(ws, { type: "notes_list", notes: nm.list() });
     sendTo(ws, { type: "loop_registry_updated", records: getHubSchedules() });
 
@@ -2204,6 +2231,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 +2262,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 +2328,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();
         }
       })();
@@ -3365,6 +3401,14 @@ function createProjectContext(opts) {
       if (msg.id) {
         tm.close(msg.id);
         send({ type: "term_list", terminals: tm.list() });
+        // Remove closed terminal from context sources
+        var saved = loadContextSources(slug);
+        var termKey = "term:" + msg.id;
+        var filtered = saved.filter(function(id) { return id !== termKey; });
+        if (filtered.length !== saved.length) {
+          saveContextSources(slug, filtered);
+          send({ type: "context_sources_state", active: filtered });
+        }
       }
       return;
     }
@@ -3377,6 +3421,13 @@ function createProjectContext(opts) {
       return;
     }
 
+    // --- Context Sources ---
+    if (msg.type === "context_sources_save") {
+      var activeIds = msg.active || [];
+      saveContextSources(slug, activeIds);
+      return;
+    }
+
     // --- Scheduled tasks permission gate ---
     if (msg.type === "loop_start" || msg.type === "loop_stop" || msg.type === "loop_registry_files" ||
         msg.type === "loop_registry_list" || msg.type === "loop_registry_update" || msg.type === "loop_registry_rename" ||
@@ -3835,6 +3886,91 @@ function createProjectContext(opts) {
       fullText = mentionPrefix + "\n\n" + fullText;
     }
 
+    // Inject active terminal context sources (delta only: send new output since last message)
+    var TERM_CONTEXT_MAX = 8192; // 8KB max per terminal per message
+    var TERM_HEAD_SIZE = 2048;   // keep first 2KB for error context
+    var TERM_TAIL_SIZE = 6144;   // keep last 6KB for recent state
+    var ctxSources = loadContextSources(slug);
+    if (ctxSources.length > 0) {
+      if (!session._termContextCursors) session._termContextCursors = {};
+      var termContextParts = [];
+      for (var ci = 0; ci < ctxSources.length; ci++) {
+        var srcId = ctxSources[ci];
+        if (srcId.startsWith("term:")) {
+          var termId = parseInt(srcId.split(":")[1], 10);
+          var sb = tm.getScrollback(termId);
+          if (sb) {
+            var lastCursor;
+            if (termId in session._termContextCursors) {
+              lastCursor = session._termContextCursors[termId];
+              // Terminal was recycled (closed and reopened with same ID) — reset cursor
+              if (lastCursor > sb.totalBytesWritten) lastCursor = 0;
+            } else {
+              // First time seeing this terminal — include last 8KB (what user can see now)
+              lastCursor = Math.max(0, sb.totalBytesWritten - TERM_CONTEXT_MAX);
+            }
+            var newBytes = sb.totalBytesWritten - lastCursor;
+            session._termContextCursors[termId] = sb.totalBytesWritten;
+            if (newBytes <= 0) continue;
+            // Build timestamped delta from chunks
+            var deltaChunks = [];
+            var bytePos = sb.bufferStart;
+            for (var chunkIdx = 0; chunkIdx < sb.chunks.length; chunkIdx++) {
+              var chunk = sb.chunks[chunkIdx];
+              var chunkEnd = bytePos + chunk.data.length;
+              if (chunkEnd > lastCursor) {
+                // This chunk has new content
+                var chunkData = chunk.data;
+                if (bytePos < lastCursor) {
+                  // Partial chunk: only the part after lastCursor
+                  chunkData = chunkData.slice(lastCursor - bytePos);
+                }
+                deltaChunks.push({ ts: chunk.ts, data: chunkData });
+              }
+              bytePos = chunkEnd;
+            }
+            if (deltaChunks.length === 0) continue;
+            // Format with timestamps: group by second to avoid excessive timestamps
+            var lines = [];
+            var lastTimeSec = 0;
+            for (var di = 0; di < deltaChunks.length; di++) {
+              var dc = deltaChunks[di];
+              var cleaned = dc.data.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "");
+              if (!cleaned) continue;
+              var timeSec = Math.floor(dc.ts / 1000);
+              if (timeSec !== lastTimeSec) {
+                var d = new Date(dc.ts);
+                var timeStr = d.toTimeString().slice(0, 8); // HH:MM:SS
+                lines.push("[" + timeStr + "] " + cleaned);
+                lastTimeSec = timeSec;
+              } else {
+                lines.push(cleaned);
+              }
+            }
+            var delta = lines.join("").trim();
+            if (!delta) continue;
+            var termInfo = tm.list().find(function(t) { return t.id === termId; });
+            var termTitle = termInfo ? termInfo.title : "Terminal " + termId;
+            var header;
+            if (delta.length > TERM_CONTEXT_MAX) {
+              var head = delta.slice(0, TERM_HEAD_SIZE);
+              var tail = delta.slice(-TERM_TAIL_SIZE);
+              var omittedBytes = delta.length - TERM_HEAD_SIZE - TERM_TAIL_SIZE;
+              var omittedLines = delta.slice(TERM_HEAD_SIZE, delta.length - TERM_TAIL_SIZE).split("\n").length;
+              delta = head + "\n\n... (" + omittedLines + " lines / " + Math.round(omittedBytes / 1024) + "KB omitted) ...\n\n" + tail;
+              header = "[New terminal output from " + termTitle + " (large output, head+tail shown)]";
+            } else {
+              header = "[New terminal output from " + termTitle + "]";
+            }
+            termContextParts.push(header + "\n```\n" + delta + "\n```");
+          }
+        }
+      }
+      if (termContextParts.length > 0) {
+        fullText = termContextParts.join("\n\n") + "\n\n" + fullText;
+      }
+    }
+
     if (!session.isProcessing) {
       session.isProcessing = true;
       onProcessingChanged();

package/lib/public/app.js

@@ -6,15 +6,16 @@ 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';
 import { initFileBrowser, loadRootDirectory, refreshTree, handleFsList, handleFsRead, handleDirChanged, refreshIfOpen, handleFileChanged, handleFileHistory, handleGitDiff, handleFileAt, getPendingNavigate, closeFileViewer, resetFileBrowser } from './modules/filebrowser.js';
 import { initTerminal, openTerminal, closeTerminal, resetTerminals, handleTermList, handleTermCreated, handleTermOutput, handleTermResized, handleTermExited, handleTermClosed, sendTerminalCommand } from './modules/terminal.js';
+import { initContextSources, updateTerminalList, handleContextSourcesState, getActiveSources, hasActiveSources } from './modules/context-sources.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 +2469,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 +2669,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) {
@@ -3660,23 +3664,13 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     suggestionChipsEl.innerHTML = "";
     var chip = document.createElement("button");
     chip.className = "suggestion-chip";
-    chip.innerHTML =
-      '<span class="suggestion-chip-send">' + iconHtml("sparkles") +
-      '<span class="suggestion-chip-text">' + escapeHtml(suggestion) + '</span></span>' +
-      '<span class="suggestion-chip-edit">' + iconHtml("pencil") + '</span>';
+    chip.innerHTML = iconHtml("sparkles") +
+      '<span class="suggestion-chip-text">' + escapeHtml(suggestion) + '</span>';
     chip.addEventListener("click", function () {
       inputEl.value = suggestion;
       hideSuggestionChips();
       sendMessage();
     });
-    chip.querySelector(".suggestion-chip-edit").addEventListener("click", function (e) {
-      e.stopPropagation();
-      inputEl.value = suggestion;
-      inputEl.focus();
-      inputEl.select();
-      autoResize();
-      hideSuggestionChips();
-    });
     suggestionChipsEl.appendChild(chip);
     suggestionChipsEl.classList.remove("hidden");
     refreshIcons();
@@ -3718,6 +3712,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     setStatus("connected");
     if (!loopActive) enableMainInput();
     resetUsage();
+    resetTurnMetaCost();
     resetContext();
     // Clear header indicators
     clearRateLimitIndicator();
@@ -4711,6 +4706,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 +4715,7 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
           break;
 
         case "rewind_error":
+          onRewindError();
           clearPendingRewindUuid();
           addSystemMessage(msg.text || "Rewind failed.", true);
           break;
@@ -4791,6 +4788,11 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
 
         case "term_list":
           handleTermList(msg);
+          updateTerminalList(msg.terminals);
+          break;
+
+        case "context_sources_state":
+          handleContextSourcesState(msg);
           break;
 
         case "term_created":
@@ -4980,6 +4982,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) {
@@ -5741,6 +5759,12 @@ import { initDebate, handleDebatePreparing, handleDebateStarted, handleDebateRes
     fileViewerEl: $("file-viewer"),
   });
 
+  // --- Context Sources ---
+  initContextSources({
+    get ws() { return ws; },
+    get connected() { return connected; },
+  });
+
   // --- Playbook Engine ---
   initPlaybook();
 

package/lib/public/css/input.css

@@ -271,6 +271,165 @@
   border-color: var(--error);
 }
 
+/* ==========================================================================
+   Context Sources — chips above input
+   ========================================================================== */
+
+#context-sources-bar {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 4px;
+  padding: 0 8px 4px;
+  position: relative;
+}
+
+#context-sources-add {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 6px 12px;
+  border-radius: 6px;
+  border: 1px dashed var(--border);
+  background: transparent;
+  color: var(--text-dimmer);
+  font-family: inherit;
+  font-size: 12px;
+  font-weight: 500;
+  cursor: pointer;
+  transition: color 0.15s, border-color 0.15s, background 0.15s;
+}
+
+#context-sources-add .lucide { width: 12px; height: 12px; }
+
+#context-sources-add:hover {
+  color: var(--text-secondary);
+  border-color: var(--text-dimmer);
+  background: var(--sidebar-hover);
+}
+
+#context-sources-chips {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 4px;
+}
+
+.context-chip {
+  display: inline-flex;
+  align-items: stretch;
+  padding: 0;
+  border-radius: 8px;
+  background: var(--bg-alt);
+  color: var(--text);
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1;
+  white-space: nowrap;
+  border: 1px solid var(--border);
+  transition: border-color 0.15s;
+}
+
+.context-chip-label {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 6px 10px 6px 12px;
+}
+
+.context-chip-label .lucide { width: 14px; height: 14px; flex-shrink: 0; color: var(--accent); }
+
+.context-chip-remove {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 30px;
+  border: none;
+  border-left: 1px solid var(--border);
+  background: transparent;
+  color: var(--text-muted);
+  cursor: pointer;
+  padding: 0;
+  border-radius: 0 8px 8px 0;
+  transition: color 0.15s, background 0.15s;
+}
+
+.context-chip-remove:hover {
+  color: var(--text);
+  background: rgba(var(--overlay-rgb), 0.08);
+}
+
+.context-chip-remove .lucide { width: 14px; height: 14px; }
+
+#context-sources-picker.hidden { display: none; }
+
+#context-sources-picker {
+  position: absolute;
+  bottom: calc(100% + 4px);
+  left: 0;
+  min-width: 200px;
+  background: var(--sidebar-bg);
+  border: 1px solid var(--border);
+  border-radius: 10px;
+  padding: 4px 0;
+  box-shadow: 0 4px 12px rgba(var(--shadow-rgb), 0.15);
+  z-index: 200;
+  animation: ctxPickerAppear 0.12s ease-out;
+}
+
+@keyframes ctxPickerAppear {
+  from { opacity: 0; transform: scale(0.95); }
+  to { opacity: 1; transform: scale(1); }
+}
+
+.context-picker-section-label {
+  font-size: 10px;
+  font-weight: 600;
+  color: var(--text-dimmer);
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  padding: 8px 12px 4px;
+}
+
+.context-picker-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  padding: 8px 12px;
+  font-size: 13px;
+  color: var(--text-secondary);
+  background: none;
+  border: none;
+  cursor: pointer;
+  transition: background 0.15s;
+}
+
+.context-picker-item:hover {
+  background: rgba(var(--overlay-rgb), 0.05);
+}
+
+.context-picker-item .lucide { width: 14px; height: 14px; flex-shrink: 0; }
+
+.context-picker-check {
+  margin-left: auto;
+  width: 14px;
+  height: 14px;
+  color: var(--accent);
+  display: none;
+}
+
+.context-picker-item.active .context-picker-check {
+  display: block;
+}
+
+.context-picker-empty {
+  padding: 12px;
+  color: var(--text-dimmer);
+  font-size: 13px;
+  text-align: center;
+}
+
 /* ==========================================================================
    Input Area — Claude-style unified container
    ========================================================================== */
@@ -521,98 +680,53 @@
 #suggestion-chips {
   display: flex;
   flex-wrap: wrap;
-  gap: 6px;
-  padding: 8px 6px;
+  gap: 4px;
+  padding: 4px 6px;
   position: absolute;
   bottom: 100%;
   left: 0;
   right: 0;
   z-index: 5;
-  background: transparent;
 }
 
 #suggestion-chips.hidden { display: none; }
 
 .suggestion-chip {
   display: inline-flex;
-  align-items: stretch;
-  padding: 0;
-  border-radius: 16px;
+  align-items: center;
+  gap: 5px;
+  padding: 4px 10px 4px 8px;
+  border-radius: 6px;
   border: 1px solid var(--border);
-  background: var(--bg-alt);
+  background: rgba(var(--overlay-rgb), 0.08);
   color: var(--text-secondary);
-  font-size: 13px;
+  font-size: 12px;
   font-family: inherit;
   cursor: pointer;
-  transition: border-color 0.15s;
+  transition: border-color 0.15s, background 0.15s, color 0.15s;
   text-align: left;
   max-width: 100%;
-  line-height: 1.3;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  line-height: 1.2;
 }
 
 .suggestion-chip:hover {
   border-color: var(--accent);
+  background: var(--accent-bg);
+  color: var(--accent);
 }
 
 .suggestion-chip .lucide {
-  width: 14px;
-  height: 14px;
+  width: 12px;
+  height: 12px;
   flex-shrink: 0;
   color: var(--accent);
 }
 
-.suggestion-chip-send {
-  display: inline-flex;
-  align-items: center;
-  gap: 5px;
-  flex: 1;
-  min-width: 0;
-  padding: 8px 10px 8px 14px;
-  border-radius: 16px 0 0 16px;
-  transition: background 0.15s, color 0.15s;
-}
-
-.suggestion-chip-send:hover {
-  background: var(--accent-bg);
-  color: var(--accent);
-}
-
 .suggestion-chip-text {
   flex: 1;
   min-width: 0;
 }
 
-.suggestion-chip-edit {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  padding: 8px 12px;
-  border-left: 1px solid var(--border);
-  border-radius: 0 16px 16px 0;
-  background: rgba(128, 128, 128, 0.07);
-  cursor: pointer;
-  transition: background 0.15s, border-color 0.15s;
-}
-
-.suggestion-chip:hover .suggestion-chip-edit {
-  border-left-color: var(--accent);
-}
-
-.suggestion-chip-edit:hover {
-  background: var(--accent-bg);
-}
-
-.suggestion-chip-edit .lucide {
-  width: 14px;
-  height: 14px;
-  color: var(--text-secondary);
-}
-
-.suggestion-chip-edit:hover .lucide {
-  color: var(--accent);
-}
-
 /* ==========================================================================
    Animations
    ========================================================================== */

package/lib/public/css/menus.css

@@ -474,6 +474,13 @@
 
 #config-chip .lucide { width: 10px; height: 10px; }
 #config-chip .config-chip-icon { display: none; }
+
+@media (max-width: 1000px) {
+  #config-chip .config-chip-icon { display: inline-flex; width: 16px; height: 16px; }
+  #config-chip-label { display: none; }
+  #config-chip .lucide:last-child { display: none; }
+  #config-chip { padding: 0 6px; }
+}
 #config-chip:hover { color: var(--text-secondary); background: rgba(var(--overlay-rgb),0.06); }
 #config-chip.active { color: var(--text-secondary); background: rgba(var(--overlay-rgb),0.06); }
 

package/lib/public/css/sidebar.css

@@ -257,6 +257,16 @@
   letter-spacing: 0.5px;
 }
 
+/* --- Section labels --- */
+.sidebar-section-label {
+  font-size: 11px;
+  font-weight: 600;
+  color: var(--text-dimmer);
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  padding: 4px 12px 2px;
+}
+
 /* --- Tools section --- */
 #sidebar-tools {
   flex-shrink: 0;

package/lib/public/index.html

@@ -415,6 +415,13 @@
       <div id="input-wrapper">
         <div id="mention-menu"></div>
         <div id="slash-menu"></div>
+        <div id="context-sources-bar">
+          <div id="context-sources-chips"></div>
+          <button id="context-sources-add" type="button" title="Add context source"><i data-lucide="plus"></i><span>Context Sources</span></button>
+          <div id="context-sources-picker" class="hidden">
+            <div class="context-picker-section" id="context-picker-terminals"></div>
+          </div>
+        </div>
         <div id="suggestion-chips" class="hidden"></div>
         <div id="input-row">
           <div id="context-mini" class="hidden">

package/lib/public/modules/context-sources.js

@@ -0,0 +1,226 @@
+// Context Sources — attach terminal output (and future browser tabs) as context for Claude
+
+var ctx = null;
+var activeSourceIds = new Set();
+var terminalList = []; // synced from terminal module's term_list
+
+export function initContextSources(_ctx) {
+  ctx = _ctx;
+
+  var addBtn = document.getElementById("context-sources-add");
+  var picker = document.getElementById("context-sources-picker");
+
+  addBtn.addEventListener("click", function(e) {
+    e.stopPropagation();
+    if (picker.classList.contains("hidden")) {
+      renderPicker();
+      picker.classList.remove("hidden");
+      document.addEventListener("click", closePicker, true);
+    } else {
+      closePicker();
+    }
+  });
+
+  picker.addEventListener("click", function(e) {
+    e.stopPropagation();
+  });
+}
+
+function closePicker() {
+  var picker = document.getElementById("context-sources-picker");
+  picker.classList.add("hidden");
+  document.removeEventListener("click", closePicker, true);
+}
+
+// Restore state from server
+export function handleContextSourcesState(msg) {
+  var saved = msg.active || [];
+  activeSourceIds = new Set(saved);
+  renderChips();
+}
+
+// Save active sources to server
+function saveToServer() {
+  if (ctx && ctx.ws && ctx.connected) {
+    ctx.ws.send(JSON.stringify({
+      type: "context_sources_save",
+      active: Array.from(activeSourceIds)
+    }));
+  }
+}
+
+// Called when term_list arrives from server
+export function updateTerminalList(terminals) {
+  terminalList = terminals || [];
+
+  // Remove active sources that no longer exist
+  var changed = false;
+  for (var id of activeSourceIds) {
+    if (id.startsWith("term:")) {
+      var termId = parseInt(id.split(":")[1], 10);
+      var found = false;
+      for (var i = 0; i < terminalList.length; i++) {
+        if (terminalList[i].id === termId) { found = true; break; }
+      }
+      if (!found) {
+        activeSourceIds.delete(id);
+        changed = true;
+      }
+    }
+  }
+
+  if (changed) saveToServer();
+  renderChips();
+
+  // If picker is open, re-render it
+  var picker = document.getElementById("context-sources-picker");
+  if (!picker.classList.contains("hidden")) {
+    renderPicker();
+  }
+}
+
+function toggleSource(sourceId) {
+  if (activeSourceIds.has(sourceId)) {
+    activeSourceIds.delete(sourceId);
+  } else {
+    activeSourceIds.add(sourceId);
+  }
+  saveToServer();
+  renderChips();
+  renderPicker();
+}
+
+function removeSource(sourceId) {
+  activeSourceIds.delete(sourceId);
+  saveToServer();
+  renderChips();
+
+  var picker = document.getElementById("context-sources-picker");
+  if (!picker.classList.contains("hidden")) {
+    renderPicker();
+  }
+}
+
+function renderChips() {
+  var container = document.getElementById("context-sources-chips");
+  container.innerHTML = "";
+
+  for (var id of activeSourceIds) {
+    var chip = document.createElement("div");
+    chip.className = "context-chip";
+
+    var label = getSourceLabel(id);
+    var iconName = getSourceIcon(id);
+
+    var labelEl = document.createElement("span");
+    labelEl.className = "context-chip-label";
+    labelEl.innerHTML =
+      '<i data-lucide="' + iconName + '"></i>' +
+      '<span>' + escapeHtml(label) + '</span>';
+    chip.appendChild(labelEl);
+
+    var removeBtn = document.createElement("button");
+    removeBtn.type = "button";
+    removeBtn.className = "context-chip-remove";
+    removeBtn.title = "Remove";
+    removeBtn.innerHTML = '<i data-lucide="minus"></i>';
+    removeBtn.setAttribute("data-source-id", id);
+    removeBtn.addEventListener("click", function(e) {
+      e.stopPropagation();
+      removeSource(this.getAttribute("data-source-id"));
+      if (typeof lucide !== "undefined") lucide.createIcons();
+    });
+
+    chip.appendChild(removeBtn);
+    container.appendChild(chip);
+  }
+
+  // Update add button label
+  var addBtn = document.getElementById("context-sources-add");
+  var labelSpan = addBtn.querySelector("span");
+  if (activeSourceIds.size > 0) {
+    labelSpan.textContent = "";
+    labelSpan.style.display = "none";
+  } else {
+    labelSpan.textContent = "Context Sources";
+    labelSpan.style.display = "";
+  }
+
+  if (typeof lucide !== "undefined") lucide.createIcons();
+}
+
+function renderPicker() {
+  var section = document.getElementById("context-picker-terminals");
+  section.innerHTML = "";
+
+  var sectionLabel = document.createElement("div");
+  sectionLabel.className = "context-picker-section-label";
+  sectionLabel.textContent = "Terminals";
+  section.appendChild(sectionLabel);
+
+  if (terminalList.length === 0) {
+    var empty = document.createElement("div");
+    empty.className = "context-picker-empty";
+    empty.textContent = "No terminals open";
+    section.appendChild(empty);
+    return;
+  }
+
+  for (var i = 0; i < terminalList.length; i++) {
+    var term = terminalList[i];
+    var sourceId = "term:" + term.id;
+    var isActive = activeSourceIds.has(sourceId);
+
+    var item = document.createElement("div");
+    item.className = "context-picker-item" + (isActive ? " active" : "");
+    item.setAttribute("data-source-id", sourceId);
+
+    item.innerHTML =
+      '<i data-lucide="square-terminal"></i>' +
+      '<span>' + escapeHtml(term.title || ("Terminal " + term.id)) + '</span>' +
+      '<i data-lucide="check" class="context-picker-check"></i>';
+
+    item.addEventListener("click", function() {
+      toggleSource(this.getAttribute("data-source-id"));
+      if (typeof lucide !== "undefined") lucide.createIcons();
+    });
+
+    section.appendChild(item);
+  }
+
+  if (typeof lucide !== "undefined") lucide.createIcons();
+}
+
+function getSourceLabel(id) {
+  if (id.startsWith("term:")) {
+    var termId = parseInt(id.split(":")[1], 10);
+    for (var i = 0; i < terminalList.length; i++) {
+      if (terminalList[i].id === termId) {
+        return terminalList[i].title || ("Terminal " + termId);
+      }
+    }
+    return "Terminal " + termId;
+  }
+  return id;
+}
+
+function getSourceIcon(id) {
+  if (id.startsWith("term:")) return "square-terminal";
+  return "circle";
+}
+
+// Get active source IDs (for use when sending messages)
+export function getActiveSources() {
+  return Array.from(activeSourceIds);
+}
+
+// Check if any sources are active
+export function hasActiveSources() {
+  return activeSourceIds.size > 0;
+}
+
+function escapeHtml(str) {
+  var div = document.createElement("div");
+  div.textContent = str;
+  return div.innerHTML;
+}

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/lib/terminal-manager.js

@@ -28,6 +28,7 @@ function createTerminalManager(opts) {
       pty: pty,
       scrollback: [],
       scrollbackSize: 0,
+      totalBytesWritten: 0,
       cols: cols || 80,
       rows: rows || 24,
       title: "Terminal " + id,
@@ -38,11 +39,13 @@ function createTerminalManager(opts) {
     };
 
     pty.onData(function (data) {
-      // Buffer scrollback
-      session.scrollback.push(data);
+      // Buffer scrollback with timestamps
+      var ts = Date.now();
+      session.scrollback.push({ ts: ts, data: data });
       session.scrollbackSize += data.length;
+      session.totalBytesWritten += data.length;
       while (session.scrollbackSize > SCROLLBACK_MAX && session.scrollback.length > 1) {
-        session.scrollbackSize -= session.scrollback[0].length;
+        session.scrollbackSize -= session.scrollback[0].data.length;
         session.scrollback.shift();
       }
 
@@ -81,7 +84,7 @@ function createTerminalManager(opts) {
 
     // Replay scrollback only for newly attached clients
     if (!alreadySubscribed && session.scrollback.length > 0) {
-      var replay = session.scrollback.join("");
+      var replay = session.scrollback.map(function(c) { return c.data; }).join("");
       sendTo(ws, { type: "term_output", id: id, data: replay });
     }
 
@@ -176,6 +179,18 @@ function createTerminalManager(opts) {
     return result;
   }
 
+  function getScrollback(id) {
+    var session = terminals.get(id);
+    if (!session) return null;
+    var content = session.scrollback.map(function(c) { return c.data; }).join("");
+    return {
+      content: content,
+      chunks: session.scrollback,
+      totalBytesWritten: session.totalBytesWritten,
+      bufferStart: session.totalBytesWritten - content.length
+    };
+  }
+
   function destroyAll() {
     for (var session of terminals.values()) {
       if (session.pty) {
@@ -196,6 +211,7 @@ function createTerminalManager(opts) {
     close: close,
     rename: rename,
     list: list,
+    getScrollback: getScrollback,
     destroyAll: destroyAll,
   };
 }

package/package.json

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