clay-server 2.26.0-beta.1 → 2.26.0-beta.10

package/lib/sdk-bridge.js

@@ -134,6 +134,7 @@ function createSDKBridge(opts) {
   var mateDisplayName = opts.mateDisplayName || "";
   var isMate = opts.isMate || (slug.indexOf("mate-") === 0);
   var dangerouslySkipPermissions = opts.dangerouslySkipPermissions || false;
+  var mcpServers = opts.mcpServers || null;
   var onProcessingChanged = opts.onProcessingChanged || function () {};
   var onTurnDone = opts.onTurnDone || null;
 
@@ -188,6 +189,10 @@ function createSDKBridge(opts) {
     sm.sendAndRecord(session, obj);
   }
 
+  function sendToSession(session, obj) {
+    sm.sendToSession(session, obj);
+  }
+
   function processSDKMessage(session, parsed) {
     // Timing: log key SDK milestones relative to query start
     if (session._queryStartTs) {
@@ -435,6 +440,15 @@ function createSDKBridge(opts) {
       session.isProcessing = false;
       session.rateLimitResetsAt = null; // clear on success
       onProcessingChanged();
+      // Fetch rich context usage breakdown (fire-and-forget, non-blocking)
+      if (session.queryInstance && typeof session.queryInstance.getContextUsage === "function") {
+        session.queryInstance.getContextUsage().then(function(ctxUsage) {
+          session.lastContextUsage = ctxUsage;
+          sendToSession(session, { type: "context_usage", data: ctxUsage });
+        }).catch(function(e) {
+          console.error("[sdk-bridge] getContextUsage failed (non-fatal):", e.message || e);
+        });
+      }
       var lastStreamInput = session.lastStreamInputTokens || null;
       session.lastStreamInputTokens = null;
       sendAndRecord(session, {
@@ -581,8 +595,26 @@ function createSDKBridge(opts) {
           isUsingOverage: info.isUsingOverage || false,
         });
         // Track rejection for auto-continue / scheduled message support
-        if (info.status === "rejected" && info.resetsAt) {
+        // Skip if using overage (extra usage) — user can continue immediately
+        if (info.status === "rejected" && info.resetsAt && !info.isUsingOverage) {
           session.rateLimitResetsAt = info.resetsAt * 1000;
+
+          // Defensive: if query already completed before this event arrived,
+          // schedule auto-continue now (handles race condition where
+          // rate_limit_event arrives after the result/done event).
+          if (!session.isProcessing && !session.scheduledMessage && !session.destroying) {
+            var lateACEnabled = session.onQueryComplete ||
+              (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
+            if (lateACEnabled) {
+              var lateResetsAt = session.rateLimitResetsAt;
+              session.rateLimitResetsAt = null;
+              session.rateLimitAutoContinuePending = true;
+              console.log("[sdk-bridge] Rate limit event arrived late, scheduling auto-continue for session " + session.localId);
+              if (typeof opts.scheduleMessage === "function") {
+                opts.scheduleMessage(session, "continue", lateResetsAt);
+              }
+            }
+          }
         }
       }
 
@@ -1115,6 +1147,7 @@ function createSDKBridge(opts) {
       agentProgressSummaries: true,
     };
 
+    if (mcpServers) queryOptions.mcpServers = mcpServers;
     if (sm.currentModel) queryOptions.model = sm.currentModel;
     if (sm.currentEffort) queryOptions.effort = sm.currentEffort;
     if (sm.currentBetas && sm.currentBetas.length > 0) queryOptions.betas = sm.currentBetas;
@@ -1138,6 +1171,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);
       }
     }
 
@@ -1194,6 +1229,11 @@ function createSDKBridge(opts) {
           });
           break;
 
+        case "context_usage":
+          session.lastContextUsage = msg.data;
+          sendToSession(session, { type: "context_usage", data: msg.data });
+          break;
+
         case "query_done":
           console.log("[sdk-bridge] IPC query_done received, pid=" + (worker.process ? worker.process.pid : "?"));
           // Mark that we received a proper IPC completion, so the exit
@@ -1299,6 +1339,8 @@ function createSDKBridge(opts) {
             sm.broadcastSessionList();
           }
           cleanupSessionWorker(session, worker);
+          // Mark session as done so late rate_limit_event can detect race condition
+          session.isProcessing = false;
           // Auto-continue on rate limit (scheduler sessions, or user setting)
           var workerDidScheduleAC = false;
           var workerACEnabled = session.onQueryComplete || (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
@@ -1493,6 +1535,18 @@ function createSDKBridge(opts) {
       return Promise.resolve({ behavior: "allow", updatedInput: input });
     }
 
+    // Auto-approve safe browser MCP tools.
+    // Only watch/unwatch: user explicitly chose which tab to share.
+    // Everything else (screenshot, read_page, list_tabs, etc.) can expose
+    // content from tabs the user didn't intend to share, so require approval.
+    var safeBrowserTools = { browser_watch_tab: true, browser_unwatch_tab: true };
+    if (toolName.indexOf("mcp__") === 0 && toolName.indexOf("__browser_") !== -1) {
+      var mcpToolName = toolName.substring(toolName.lastIndexOf("__") + 2);
+      if (safeBrowserTools[mcpToolName]) {
+        return Promise.resolve({ behavior: "allow", updatedInput: input });
+      }
+    }
+
     // Auto-approve safe Bash commands (read-only, non-destructive)
     // Applies to ALL sessions (mates and regular projects alike).
     // These are purely read-only commands that cannot modify files, install
@@ -1687,10 +1741,16 @@ 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);
       }
+      // (getContextUsage moved to processSDKMessage result handler -- fire-and-forget)
       // Stream ended normally after a task stop — no "result" message was sent,
       // so the session is still marked as processing. Send interrupted feedback.
       if (session.isProcessing && session.taskStopRequested) {
@@ -1704,7 +1764,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,22 +1837,29 @@ 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 = {};
       session.pendingElicitations = {};
 
       // Auto-continue on rate limit (scheduler sessions, or user setting)
+      // Mark session as done processing so the late rate_limit_event handler
+      // can detect the race condition and schedule auto-continue itself.
+      session.isProcessing = false;
+
       var didScheduleAutoContinue = false;
       var acEnabled = session.onQueryComplete || (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
       if (session.rateLimitResetsAt && session.rateLimitResetsAt > Date.now()
@@ -1805,6 +1872,10 @@ function createSDKBridge(opts) {
         if (typeof opts.scheduleMessage === "function") {
           opts.scheduleMessage(session, "continue", acResetsAt);
         }
+      } else if (acEnabled && !session.destroying) {
+        // Log why auto-continue was not scheduled (for debugging)
+        console.log("[sdk-bridge] Query done, auto-continue enabled but not scheduled: rateLimitResetsAt=" +
+          session.rateLimitResetsAt + " (will rely on late rate_limit_event handler)");
       }
 
       // Ralph Loop: notify completion so loop orchestrator can proceed
@@ -1911,6 +1982,7 @@ function createSDKBridge(opts) {
       abortController: session.abortController,
       promptSuggestions: true,
       agentProgressSummaries: true,
+      mcpServers: mcpServers || undefined,
       canUseTool: function(toolName, input, toolOpts) {
         return handleCanUseTool(session, toolName, input, toolOpts);
       },
@@ -1952,6 +2024,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/sdk-worker.js

@@ -351,7 +351,19 @@ async function handleQueryStart(msg) {
       }
       sendToDaemon({ type: "sdk_event", event: event });
     }
-    perf("all events streamed (counts=" + JSON.stringify(eventCounts) + "), sending query_done");
+    perf("all events streamed (counts=" + JSON.stringify(eventCounts) + "), fetching context usage");
+    // Fetch context usage breakdown before queryInstance is cleared
+    try {
+      if (queryInstance && typeof queryInstance.getContextUsage === "function") {
+        var ctxUsage = await queryInstance.getContextUsage();
+        sendToDaemon({ type: "context_usage", data: ctxUsage });
+        perf("context usage sent");
+      }
+    } catch (e) {
+      // Non-fatal: SDK may have already shut down
+      console.error("[sdk-worker] getContextUsage failed (non-fatal):", e.message);
+    }
+    perf("sending query_done");
     sendToDaemon({ type: "query_done" });
   } catch (err) {
     var errMsg = err.message || String(err);

package/lib/server.js

@@ -38,6 +38,24 @@ function httpGet(url) {
   });
 }
 
+function httpGetBinary(url) {
+  return new Promise(function (resolve, reject) {
+    var mod = url.startsWith("https") ? https : http;
+    mod.get(url, { headers: { "User-Agent": "Clay/1.0" } }, function (resp) {
+      if (resp.statusCode >= 300 && resp.statusCode < 400 && resp.headers.location) {
+        return httpGetBinary(resp.headers.location).then(resolve, reject);
+      }
+      if (resp.statusCode !== 200) {
+        return reject(new Error("HTTP " + resp.statusCode));
+      }
+      var chunks = [];
+      resp.on("data", function (c) { chunks.push(c); });
+      resp.on("end", function () { resolve(Buffer.concat(chunks)); });
+      resp.on("error", reject);
+    }).on("error", reject);
+  });
+}
+
 function fetchSkillsPage(url) {
   return httpGet(url).then(function (html) {
     // Data is inside self.__next_f.push() with escaped quotes: \"initialSkills\":[{\"source\":...}]
@@ -1018,6 +1036,28 @@ function createServer(opts) {
       return;
     }
 
+    // Chrome extension download (proxy from GitHub)
+    if (fullUrl === "/api/extension/download" && req.method === "GET") {
+      if (!isRequestAuthed(req)) {
+        res.writeHead(401, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "Unauthorized" }));
+        return;
+      }
+      var archiveUrl = "https://github.com/chadbyte/clay-chrome/archive/refs/heads/main.zip";
+      httpGetBinary(archiveUrl).then(function (buf) {
+        res.writeHead(200, {
+          "Content-Type": "application/zip",
+          "Content-Disposition": 'attachment; filename="clay-chrome-extension.zip"',
+          "Content-Length": buf.length,
+        });
+        res.end(buf);
+      }).catch(function (err) {
+        res.writeHead(502, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "Failed to download extension: " + (err.message || "unknown error") }));
+      });
+      return;
+    }
+
     // CORS preflight for cross-origin requests (HTTP onboarding → HTTPS)
     if (req.method === "OPTIONS") {
       res.writeHead(204, {
@@ -2889,6 +2929,8 @@ function createServer(opts) {
       osUsers: osUsers,
       currentVersion: currentVersion,
       lanHost: lanHost,
+      port: portNum,
+      tls: !!tlsOptions,
       getProjectCount: function () { return projects.size; },
       getProjectList: function (userId) {
         var list = [];

package/lib/sessions.js

@@ -1,5 +1,6 @@
 var fs = require("fs");
 var path = require("path");
+var crypto = require("crypto");
 var config = require("./config");
 var utils = require("./utils");
 var users = require("./users");
@@ -75,7 +76,9 @@ function createSessionManager(opts) {
   }
 
   function saveSessionFile(session) {
-    if (!session.cliSessionId) return;
+    if (!session.cliSessionId) {
+      session.cliSessionId = crypto.randomUUID();
+    }
     try {
       var metaObj = {
         type: "meta",
@@ -96,17 +99,24 @@ 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);
     }
   }
 
   function appendToSessionFile(session, obj) {
-    if (!session.cliSessionId) return;
+    if (!session.cliSessionId) {
+      session.cliSessionId = crypto.randomUUID();
+      saveSessionFile(session);
+    }
     session.lastActivity = Date.now();
     try {
       var afPath = sessionFilePath(session.cliSessionId);
@@ -123,6 +133,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;
@@ -226,10 +243,8 @@ function createSessionManager(opts) {
     return [...sessions.values()].filter(function (s) {
       if (s.hidden) return false;
       if (!multiUser) {
-        // Single-user mode: only show sessions without ownerId
         return !s.ownerId;
       }
-      // Multi-user mode: include all sessions (per-user filtering done by canAccessSession)
       return true;
     });
   }
@@ -355,7 +370,7 @@ function createSessionManager(opts) {
       }
     }
 
-    _send({ type: "history_done", lastUsage: lastUsage, lastModelUsage: lastModelUsage, lastCost: lastCost, lastStreamInputTokens: lastStreamInputTokens });
+    _send({ type: "history_done", lastUsage: lastUsage, lastModelUsage: lastModelUsage, lastCost: lastCost, lastStreamInputTokens: lastStreamInputTokens, contextUsage: session.lastContextUsage || null });
   }
 
   function switchSession(localId, targetWs, transform) {
@@ -481,7 +496,23 @@ function createSessionManager(opts) {
     sessions.delete(localId);
   }
 
+  function doSendToSession(session, obj) {
+    // Send to active clients without recording to history/disk (ephemeral data)
+    if (sendEach) {
+      var data = JSON.stringify(obj);
+      sendEach(function (ws) {
+        if (ws._clayActiveSession === session.localId && ws.readyState === 1) {
+          ws.send(data);
+        }
+      });
+    } else if (session.localId === activeSessionId) {
+      send(obj);
+    }
+  }
+
   function doSendAndRecord(session, obj) {
+    // Stamp every recorded message so history replay preserves original times
+    if (!obj._ts) obj._ts = Date.now();
     session.history.push(obj);
     appendToSessionFile(session, obj);
     if (sendEach) {
@@ -726,6 +757,7 @@ function createSessionManager(opts) {
     saveSessionFile: saveSessionFile,
     appendToSessionFile: appendToSessionFile,
     sendAndRecord: doSendAndRecord,
+    sendToSession: doSendToSession,
     findTurnBoundary: findTurnBoundary,
     replayHistory: replayHistory,
     searchSessions: searchSessions,

package/lib/terminal-manager.js

@@ -16,7 +16,7 @@ function createTerminalManager(opts) {
   var nextId = 1;
   var terminals = new Map(); // id -> terminal session
 
-  function create(cols, rows, osUserInfo) {
+  function create(cols, rows, osUserInfo, ownerWs) {
     if (terminals.size >= MAX_TERMINALS) return null;
 
     var pty = createTerminal(cwd, cols, rows, osUserInfo);
@@ -28,20 +28,24 @@ function createTerminalManager(opts) {
       pty: pty,
       scrollback: [],
       scrollbackSize: 0,
+      totalBytesWritten: 0,
       cols: cols || 80,
       rows: rows || 24,
       title: "Terminal " + id,
       exited: false,
       exitCode: null,
       subscribers: new Set(),
+      ownerWs: ownerWs || null,
     };
 
     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();
       }
 
@@ -80,10 +84,15 @@ 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 });
     }
 
+    // Send current terminal dimensions so the client renders at the correct size
+    if (!alreadySubscribed && session.cols && session.rows) {
+      sendTo(ws, { type: "term_resized", id: id, cols: session.cols, rows: session.rows });
+    }
+
     // If already exited, notify
     if (session.exited) {
       sendTo(ws, { type: "term_exited", id: id });
@@ -111,14 +120,22 @@ function createTerminalManager(opts) {
     }
   }
 
-  function resize(id, cols, rows) {
+  function resize(id, cols, rows, sourceWs) {
     var session = terminals.get(id);
     if (!session || !session.pty) return;
+    // Only the terminal owner can resize the PTY.
+    // Observers resizing would cause SIGWINCH and flood the owner with escape sequences.
+    if (session.ownerWs && sourceWs && sourceWs !== session.ownerWs) return;
     if (cols > 0 && rows > 0) {
       try {
         session.pty.resize(cols, rows);
         session.cols = cols;
         session.rows = rows;
+        // Notify other subscribers about the resize so their xterm stays in sync
+        var msg = JSON.stringify({ type: "term_resized", id: id, cols: cols, rows: rows });
+        for (var ws of session.subscribers) {
+          if (ws.readyState === 1 && ws !== sourceWs) ws.send(msg);
+        }
       } catch (e) {}
     }
   }
@@ -162,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) {
@@ -182,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.1",
+  "version": "2.26.0-beta.10",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",
@@ -36,7 +36,7 @@
   "homepage": "https://github.com/chadbyte/claude-relay#readme",
   "author": "Chad",
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.76",
+    "@anthropic-ai/claude-agent-sdk": "^0.2.92",
     "@lydell/node-pty": "^1.2.0-beta.3",
     "nodemailer": "^6.10.1",
     "qrcode-terminal": "^0.12.0",