clay-server 2.40.0-beta.3 → 2.40.0

package/lib/terminal-manager.js

@@ -3,6 +3,13 @@ var { createTerminal } = require("./terminal");
 var MAX_TERMINALS = 10;
 var SCROLLBACK_MAX = 50 * 1024; // 50 KB per terminal
 
+// Idle reclaim: background `claude` TUI PTYs that nobody is viewing and that
+// have produced no output / received no input for this long are killed to
+// free system resources. Safe because TUI sessions resume on demand from
+// their on-disk transcript (lazy resume), so the conversation isn't lost.
+var TUI_IDLE_REAP_MS = 3 * 60 * 1000;   // 3 minutes
+var TUI_REAP_INTERVAL_MS = 60 * 1000;   // sweep cadence
+
 /**
  * Create a terminal manager for a project.
  * Manages persistent PTY sessions with scrollback buffering.
@@ -49,6 +56,7 @@ function createTerminalManager(opts) {
       rows: rows || 24,
       title: (opts && opts.title) || ("Terminal " + id),
       kind: (opts && opts.kind) || "shell",
+      lastActivityAt: Date.now(),
       exited: false,
       exitCode: null,
       subscribers: new Set(),
@@ -60,6 +68,7 @@ function createTerminalManager(opts) {
     pty.onData(function (data) {
       // Buffer scrollback with timestamps
       var ts = Date.now();
+      session.lastActivityAt = ts; // output counts as activity (don't reap a working claude)
       session.scrollback.push({ ts: ts, data: data });
       session.scrollbackSize += data.length;
       session.totalBytesWritten += data.length;
@@ -149,6 +158,7 @@ function createTerminalManager(opts) {
   function write(id, data) {
     var session = terminals.get(id);
     if (session && session.pty) {
+      session.lastActivityAt = Date.now(); // user input counts as activity
       session.pty.write(data);
     }
   }
@@ -225,7 +235,40 @@ function createTerminalManager(opts) {
     };
   }
 
+  // Periodic sweep: reclaim idle background TUI PTYs. A terminal is reaped
+  // only when it's a `tui-session`, has no live subscribers (nobody's viewing
+  // it), and has seen no input/output for TUI_IDLE_REAP_MS. The session is
+  // flagged reclaimed so its onExitHook keeps the Clay session record
+  // (lazy-resume re-spawns claude on demand) instead of deleting it.
+  function reapIdleTuiTerminals() {
+    var now = Date.now();
+    var toReap = [];
+    for (var session of terminals.values()) {
+      if (session.kind !== "tui-session" || session.exited || !session.pty) continue;
+      if (session.subscribers.size > 0) continue;
+      if (now - (session.lastActivityAt || 0) < TUI_IDLE_REAP_MS) continue;
+      toReap.push(session);
+    }
+    for (var i = 0; i < toReap.length; i++) {
+      toReap[i].reclaimed = true;
+      close(toReap[i].id); // pty.kill -> onExit -> onExitHook(session)
+    }
+  }
+
+  // Flag a terminal as reclaimed (PTY closed but the owning Clay session
+  // should be kept, not deleted). Used by idle reap and by an explicit
+  // user "Close" before close() so the onExitHook can tell the difference
+  // from a real /exit.
+  function markReclaimed(id) {
+    var session = terminals.get(id);
+    if (session) session.reclaimed = true;
+  }
+
+  var reapTimer = setInterval(reapIdleTuiTerminals, TUI_REAP_INTERVAL_MS);
+  if (reapTimer && typeof reapTimer.unref === "function") reapTimer.unref();
+
   function destroyAll() {
+    if (reapTimer) { clearInterval(reapTimer); reapTimer = null; }
     for (var session of terminals.values()) {
       // Shutdown teardown: pty.kill triggers pty.onExit asynchronously, and
       // that handler would normally invoke onExitHook (which for TUI
@@ -260,6 +303,7 @@ function createTerminalManager(opts) {
     getScrollback: getScrollback,
     destroyAll: destroyAll,
     has: has,
+    markReclaimed: markReclaimed,
   };
 }
 

package/lib/ws-schema.js

@@ -17,6 +17,8 @@ var schema = {
   // Session management
   // -----------------------------------------------------------------------
   "switch_session":           { direction: "c2s", handler: "lib/project-sessions.js", description: "Switch the active session by local ID" },
+  "resume_tui_session":       { direction: "c2s", handler: "lib/project-sessions.js", description: "Spawn the claude --resume PTY for a TUI session shown read-only (lazy resume)" },
+  "suspend_tui_session":      { direction: "c2s", handler: "lib/project-sessions.js", description: "Close a live TUI session's PTY now but keep it resumable (explicit Close)" },
   "new_session":              { direction: "c2s", handler: "lib/project-sessions.js", description: "Create a new blank session" },
   "delete_session":           { direction: "c2s", handler: "lib/project-sessions.js", description: "Delete a session by ID" },
   "rename_session":           { direction: "c2s", handler: "lib/project-sessions.js", description: "Rename a session" },

package/package.json

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