clay-server 4.7.1-beta.4 → 4.7.1-beta.5

package/lib/yoke/adapters/codex.js

@@ -14,6 +14,7 @@ var { resolveOsUserInfo } = require("../../os-users");
 var backgroundTasks = require("../codex-background-tasks");
 var codexUserInput = require("../codex-user-input");
 var createTurnStop = require("../codex-turn-stop").createTurnStop;
+var idleRecovery = require("../codex-idle-recovery");
 
 // --- Reasoning defaults ---
 // Reasoning summaries are the only readable thinking channel Codex offers:
@@ -895,6 +896,9 @@ function createCodexQueryHandle(appServer, queryOpts) {
   var messageWaiting = null;
   var messageQueueEnded = false;
   var handlerEntry = null;
+  var inputRevision = 0;
+  var resolveLoopFinished;
+  var loopFinished = new Promise(function(resolve) { resolveLoopFinished = resolve; });
 
   function pushMessageToQueue(msg) {
     if (messageQueueEnded) return false;
@@ -1314,6 +1318,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
 
     state.done = true;
     endIterator();
+    resolveLoopFinished();
   }
 
   var handle = {
@@ -1333,6 +1338,7 @@ function createCodexQueryHandle(appServer, queryOpts) {
 
     pushMessage: function(text, images) {
       if (iteratorDone || state.done || messageQueueEnded) return false;
+      inputRevision++;
       var input;
       if (images && images.length > 0) {
         input = [];
@@ -1354,6 +1360,16 @@ function createCodexQueryHandle(appServer, queryOpts) {
       }
     },
 
+    getIdleRecoverySnapshot: function() {
+      if (!state.threadId || !messageWaiting || messageQueue.length || messageQueueEnded || iteratorDone || isCancelled()) return null;
+      return { threadId: state.threadId, revision: inputRevision };
+    },
+
+    retireIdleForRecovery: function() {
+      handle.endInput();
+      return loopFinished;
+    },
+
     setModel: function(model) {
       state.model = model || DEFAULT_CODEX_MODEL;
       return Promise.resolve();
@@ -1477,6 +1493,7 @@ function createCodexAdapter(opts) {
   var _initPromise = null;
   var _initializing = false;
   var _shutdownPromise = null;
+  var _shutdownEpoch = 0;
   var _refCount = 0;
   var _lastActiveAt = Date.now();
   var _shuttingDown = false;
@@ -1560,10 +1577,6 @@ function createCodexAdapter(opts) {
     updateLastActiveAt();
   }
 
-  function waitForRecoveryHandoff() {
-    return _recoveryHandoff || Promise.resolve();
-  }
-
   function retainRecoveryRuntime(runtime) {
     _recoveryRuntimes.push(runtime);
   }
@@ -1612,6 +1625,11 @@ function createCodexAdapter(opts) {
   }
 
   async function createIsolatedRecoveryQuery(queryOpts) {
+    var shutdownEpoch = _shutdownEpoch;
+    function checkCurrent() {
+      idleRecovery.checkAbort(queryOpts);
+      if (_shuttingDown || shutdownEpoch !== _shutdownEpoch) throw createShutdownError();
+    }
     var releaseHandoff;
     var priorHandoff = _recoveryHandoff;
     var myHandoff = new Promise(function(resolve) { releaseHandoff = resolve; });
@@ -1619,6 +1637,11 @@ function createCodexAdapter(opts) {
     await (priorHandoff || Promise.resolve());
     try {
       await _recoveryCleanup;
+      checkCurrent();
+      if (!_initializing && _refCount > 0) {
+        await idleRecovery.retireIdleQueries(_activeQueries.slice(), _appServer, checkCurrent);
+      }
+      checkCurrent();
       if (_refCount > 0 || _initializing) {
         throw new Error("Codex resumed-tool recovery is waiting for an active shared runtime; retry after its current queries finish.");
       }
@@ -1626,6 +1649,7 @@ function createCodexAdapter(opts) {
         var stopped = await adapter.shutdownIfIdle(0);
         if (!stopped) throw new Error("Codex resumed-tool recovery could not safely release the shared runtime; retry after its current queries finish.");
       }
+      checkCurrent();
       var recoveryRuntime = createCodexAdapter(Object.assign({}, _defaultInitOpts, {
         recoveryRuntime: true,
         recoverySessionMcpServer: queryOpts.sessionMcpServer,
@@ -1792,6 +1816,13 @@ function createCodexAdapter(opts) {
       if (_shuttingDown) {
         return Promise.reject(createShutdownError());
       }
+      if (_recoveryHandoff) {
+        var initEpoch = _shutdownEpoch;
+        return _recoveryHandoff.then(function() {
+          if (initEpoch !== _shutdownEpoch) throw createShutdownError();
+          return adapter.init(initOpts);
+        });
+      }
 
       var effectiveInitOpts = Object.assign({}, _defaultInitOpts, initOpts || {});
 
@@ -2004,10 +2035,25 @@ function createCodexAdapter(opts) {
       if (queryOpts && queryOpts.sessionMcpServer && queryOpts.resumeSessionId && !queryOpts.isolatedRecovery) {
         return createIsolatedRecoveryQuery(queryOpts);
       }
-      await waitForRecoveryHandoff();
-
-      if (!_appServer || !_appServer.started) {
-        await adapter.init(queryOpts || {});
+      var queryEpoch = _shutdownEpoch;
+      // Recheck after every await: recovery may replace the runtime while an
+      // ordinary start is waiting for initialization or an earlier handoff.
+      while (true) {
+        idleRecovery.checkAbort(queryOpts || {});
+        if (_shuttingDown || queryEpoch !== _shutdownEpoch) throw createShutdownError();
+        if (_recoveryHandoff) {
+          await _recoveryHandoff;
+          continue;
+        }
+        if (_initializing && _initPromise) {
+          await _initPromise;
+          continue;
+        }
+        if (!_appServer || !_appServer.started) {
+          await adapter.init(queryOpts || {});
+          continue;
+        }
+        break;
       }
 
       if (_shuttingDown) {
@@ -2186,6 +2232,7 @@ function createCodexAdapter(opts) {
 
     // Shutdown the app-server process
     shutdown: function() {
+      _shutdownEpoch++;
       return Promise.all([
         beginShutdown(true),
         shutdownUserRuntimes("shutdown"),

package/lib/yoke/codex-idle-recovery.js

@@ -0,0 +1,52 @@
+// Retire retained inputs only after every query is verified idle. The adapter
+// holds admission closed while this runs; existing handles may still receive
+// messages, so their input revisions must be checked again after each probe.
+function checkAbort(queryOpts) {
+  var signal = queryOpts.abortController && queryOpts.abortController.signal;
+  if (signal && signal.aborted) {
+    var error = new Error("Query cancelled");
+    error.name = "AbortError";
+    throw error;
+  }
+}
+
+function terminalsAreIdle(result) {
+  if (!result || result.nextCursor) return false;
+  var terminals = Array.isArray(result) ? result
+    : result.data || result.terminals || result.backgroundTerminals || result.items;
+  if (!Array.isArray(terminals)) return false;
+  return terminals.every(function(terminal) {
+    var status = String(terminal && (terminal.status || terminal.state) || "").toLowerCase();
+    return /^(exited|terminated|completed|failed)$/.test(status);
+  });
+}
+
+async function retireIdleQueries(entries, server, checkCurrent) {
+  checkCurrent();
+  var candidates = [];
+  for (var i = 0; i < entries.length; i++) {
+    var handle = entries[i].handle;
+    var snapshot = handle && handle.getIdleRecoverySnapshot && handle.getIdleRecoverySnapshot();
+    if (!snapshot) return false;
+    candidates.push({ handle: handle, snapshot: snapshot });
+  }
+  var safe = await Promise.all(candidates.map(function(candidate) {
+    return server.send("thread/backgroundTerminals/list", {
+      threadId: candidate.snapshot.threadId,
+    }, 5000).then(terminalsAreIdle, function() { return false; });
+  }));
+  checkCurrent();
+  for (var ci = 0; ci < candidates.length; ci++) {
+    var current = candidates[ci].handle.getIdleRecoverySnapshot();
+    if (!safe[ci] || !current || current.revision !== candidates[ci].snapshot.revision) return false;
+  }
+  // No awaits between validation and closing every input. A new send either
+  // already invalidated its snapshot or sees a closed input and resumes anew.
+  var finished = candidates.map(function(candidate) {
+    return candidate.handle.retireIdleForRecovery();
+  });
+  await Promise.all(finished);
+  return true;
+}
+
+module.exports = { retireIdleQueries: retireIdleQueries, checkAbort: checkAbort };

package/package.json

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