clay-server 4.3.0-beta.6 → 4.3.0-beta.7

package/lib/sessions.js

@@ -144,17 +144,32 @@ function createSessionManager(opts) {
     }
   }
 
-  function sessionFilePath(cliSessionId) {
-    return path.join(sessionsDir, cliSessionId + ".jsonl");
+  function sessionFilePath(recordId) {
+    return path.join(sessionsDir, recordId + ".jsonl");
+  }
+
+  // A Clay record must exist before a provider assigns its resumable id.
+  // Existing records keep their filename; fresh provider-less sessions use
+  // the already durable origin id and later store cliSessionId as metadata.
+  function sessionRecordId(session) {
+    if (!session) return null;
+    return session._sessionRecordId || session.cliSessionId || session.sessionOriginId || null;
+  }
+
+  function existingSessionRecordId(session) {
+    if (!session) return null;
+    return session._sessionRecordId || session.cliSessionId || null;
   }
 
   function saveSessionFile(session) {
-    if (!session.cliSessionId) return false;
     try {
+      var provenanceMeta = sessionProvenance.metadata(session);
+      var recordId = sessionRecordId(session);
+      if (!recordId) return false;
       var metaObj = {
         type: "meta",
         localId: session.localId,
-        cliSessionId: session.cliSessionId,
+        cliSessionId: session.cliSessionId || null,
         title: session.title,
         titleProvisional: session.titleProvisional === true,
         titleAutoGenerated: session.titleAutoGenerated === true,
@@ -204,7 +219,6 @@ function createSessionManager(opts) {
       if (session.homeDebateInitialTopic) metaObj.homeDebateInitialTopic = session.homeDebateInitialTopic;
       if (session.homeClayEntryRequestId) metaObj.homeClayEntryRequestId = session.homeClayEntryRequestId;
       if (session.homeClayEntryMode) metaObj.homeClayEntryMode = session.homeClayEntryMode;
-      var provenanceMeta = sessionProvenance.metadata(session);
       metaObj.sessionOriginId = provenanceMeta.sessionOriginId;
       if (provenanceMeta.sessionProvenance) metaObj.sessionProvenance = provenanceMeta.sessionProvenance;
       if (Array.isArray(session._workerGenerations)) metaObj.workerGenerations = session._workerGenerations;
@@ -213,7 +227,7 @@ function createSessionManager(opts) {
       for (var i = 0; i < session.history.length; i++) {
         lines.push(JSON.stringify(session.history[i]));
       }
-      var sfPath = sessionFilePath(session.cliSessionId);
+      var sfPath = sessionFilePath(recordId);
       // 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;
@@ -222,6 +236,7 @@ function createSessionManager(opts) {
         try { fs.chmodSync(tmpPath, 0o600); } catch (chmodErr) {}
       }
       fs.renameSync(tmpPath, sfPath);
+      session._sessionRecordId = recordId;
       return true;
     } catch(e) {
       console.error("[session] Failed to save session file:", e.message);
@@ -230,10 +245,11 @@ function createSessionManager(opts) {
   }
 
   function appendToSessionFile(session, obj) {
-    if (!session.cliSessionId) return true;
+    var recordId = existingSessionRecordId(session);
+    if (!recordId) return true;
     session.lastActivity = Date.now();
     try {
-      var afPath = sessionFilePath(session.cliSessionId);
+      var afPath = sessionFilePath(recordId);
       fs.appendFileSync(afPath, JSON.stringify(obj) + "\n");
       if (process.platform !== "win32") {
         try { fs.chmodSync(afPath, 0o600); } catch (chmodErr) {}
@@ -276,7 +292,8 @@ function createSessionManager(opts) {
 
       var meta;
       try { meta = JSON.parse(lines[0]); } catch { continue; }
-      if (meta.type !== "meta" || !meta.cliSessionId) continue;
+      var pendingOrigin = typeof meta.sessionOriginId === "string" && meta.sessionOriginId.trim() && meta.sessionOriginId.length <= 128;
+      if (meta.type !== "meta" || (!meta.cliSessionId && !pendingOrigin)) continue;
 
       var history = [];
       for (var j = 1; j < lines.length; j++) {
@@ -285,7 +302,7 @@ function createSessionManager(opts) {
 
       var fileMtime = 0;
       try { fileMtime = fs.statSync(path.join(sessionsDir, files[i])).mtimeMs; } catch {}
-      loaded.push({ meta: meta, history: history, mtime: fileMtime });
+      loaded.push({ meta: meta, history: history, mtime: fileMtime, recordId: files[i].slice(0, -".jsonl".length) });
     }
 
     loaded.sort(function(a, b) { return a.meta.createdAt - b.meta.createdAt; });
@@ -310,6 +327,7 @@ function createSessionManager(opts) {
         queryInstance: null,
         messageQueue: null,
         cliSessionId: m.cliSessionId,
+        _sessionRecordId: loaded[i].recordId,
         blocks: {},
         sentToolResults: {},
         pendingPermissions: {},
@@ -388,7 +406,7 @@ function createSessionManager(opts) {
       saveSessionFile(session);
       try {
         var preservedTime = new Date(activityTime);
-        fs.utimesSync(sessionFilePath(session.cliSessionId), preservedTime, preservedTime);
+        fs.utimesSync(sessionFilePath(sessionRecordId(session)), preservedTime, preservedTime);
       } catch (e) {}
       delete session._provenanceMigrationNeeded;
     });
@@ -917,10 +935,9 @@ function createSessionManager(opts) {
       session.worker = null;
     }
 
-    if (session.cliSessionId) {
-      rememberDeletedCliSession(session.cliSessionId);
-      try { fs.unlinkSync(sessionFilePath(session.cliSessionId)); } catch(e) {}
-    }
+    if (session.cliSessionId) rememberDeletedCliSession(session.cliSessionId);
+    var recordId = existingSessionRecordId(session);
+    if (recordId) try { fs.unlinkSync(sessionFilePath(recordId)); } catch(e) {}
 
     sessions.delete(localId);
     try { onSessionDeleted(localId, session); } catch (e) {
@@ -964,10 +981,9 @@ function createSessionManager(opts) {
       try { session.worker.kill(); } catch(e) {}
       session.worker = null;
     }
-    if (session.cliSessionId) {
-      rememberDeletedCliSession(session.cliSessionId);
-      try { fs.unlinkSync(sessionFilePath(session.cliSessionId)); } catch(e) {}
-    }
+    if (session.cliSessionId) rememberDeletedCliSession(session.cliSessionId);
+    var recordId = existingSessionRecordId(session);
+    if (recordId) try { fs.unlinkSync(sessionFilePath(recordId)); } catch(e) {}
     sessions.delete(localId);
     try { onSessionDeleted(localId, session); } catch (e) {
       console.error("[session] Session deletion hook failed:", e.message || e);
@@ -1093,7 +1109,8 @@ function createSessionManager(opts) {
   }
 
   function sendAndRecordDurably(session, obj, clientObj) {
-    if (!session || !session.cliSessionId) return false;
+    var recordId = existingSessionRecordId(session);
+    if (!recordId || !fs.existsSync(sessionFilePath(recordId))) return false;
     var saved;
     try { saved = doSendAndRecord(session, obj, clientObj); }
     catch (error) {
@@ -1107,9 +1124,10 @@ function createSessionManager(opts) {
   }
 
   function hasDurableSessionRecord(session, predicate) {
-    if (!session || !session.cliSessionId || typeof predicate !== "function") return false;
+    var recordId = existingSessionRecordId(session);
+    if (!recordId || typeof predicate !== "function") return false;
     try {
-      var lines = fs.readFileSync(sessionFilePath(session.cliSessionId), "utf8").split("\n");
+      var lines = fs.readFileSync(sessionFilePath(recordId), "utf8").split("\n");
       for (var i = lines.length - 1; i >= 0; i--) {
         if (!lines[i]) continue;
         try { if (predicate(JSON.parse(lines[i]))) return true; } catch (error) {}

package/package.json

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