clay-server 4.2.0 → 4.3.0-beta.10

package/lib/sessions.js

@@ -24,6 +24,7 @@ function createSessionManager(opts) {
   var sessionViewedListeners = [];
   var onSessionRenamed = opts.onSessionRenamed || function () {};
   var onSessionIdentityAssigned = opts.onSessionIdentityAssigned || function () {};
+  var sessionIdentityAssignedListeners = [];
   var onSessionHydrate = opts.onSessionHydrate || null;
 
   // --- Multi-session state ---
@@ -143,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;
     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,
@@ -194,6 +210,8 @@ function createSessionManager(opts) {
       if (session.spawn) metaObj.spawn = session.spawn;
       if (session.assignment) metaObj.assignment = session.assignment;
       if (session.handoff) metaObj.handoff = session.handoff;
+      if (session.driverContinuation) metaObj.driverContinuation = session.driverContinuation;
+      if (session.driverContinuationDecline) metaObj.driverContinuationDecline = session.driverContinuationDecline;
       if (session.debateState) metaObj.debateState = session.debateState;
       if (session.debateSetupMode) metaObj.debateSetupMode = true;
       if (session.homeDebatePlanning) metaObj.homeDebatePlanning = true;
@@ -201,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;
@@ -210,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;
@@ -219,22 +236,28 @@ 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);
+      return false;
     }
   }
 
   function appendToSessionFile(session, obj) {
-    if (!session.cliSessionId) return;
+    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) {}
       }
+      return true;
     } catch(e) {
       console.error("[session] Failed to append to session file:", e.message);
+      return false;
     }
   }
 
@@ -269,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++) {
@@ -278,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; });
@@ -303,6 +327,7 @@ function createSessionManager(opts) {
         queryInstance: null,
         messageQueue: null,
         cliSessionId: m.cliSessionId,
+        _sessionRecordId: loaded[i].recordId,
         blocks: {},
         sentToolResults: {},
         pendingPermissions: {},
@@ -327,6 +352,8 @@ function createSessionManager(opts) {
       if (m.spawn) session.spawn = m.spawn;
       if (m.assignment) session.assignment = m.assignment;
       if (m.handoff) session.handoff = m.handoff;
+      if (m.driverContinuation) session.driverContinuation = m.driverContinuation;
+      if (m.driverContinuationDecline) session.driverContinuationDecline = m.driverContinuationDecline;
       if (m.debateState) session.debateState = m.debateState;
       if (m.debateSetupMode) session.debateSetupMode = true;
       if (m.homeDebatePlanning) session.homeDebatePlanning = true;
@@ -379,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;
     });
@@ -839,7 +866,7 @@ function createSessionManager(opts) {
     var _sessionVendor = session.vendor || defaultVendor || "claude";
     var _vendorCaps = _capsByVendor[_sessionVendor] || {};
     var _permissionState = require("./session-permission-mode").clientState(session, "default", defaultVendor);
-    _send({ type: "session_switched", id: localId, cliSessionId: session.cliSessionId || null, loop: session.loop || null, vendor: session.vendor || null, model: session.model || null, effort: session.effort || null, hasHistory: (session.history && session.history.length > 0), capabilities: _vendorCaps, isProcessing: !!session.isProcessing, mode: session.mode || "gui", terminalId: typeof session.terminalId === "number" ? session.terminalId : null, runtimeMode: session.runtimeMode || null, runtimeTerminalId: typeof session.runtimeTerminalId === "number" ? session.runtimeTerminalId : null, tuiSuspended: !!session.tuiSuspended, dangerouslySkipPermissions: !!session.dangerouslySkipPermissions, permissionMode: _permissionState.requestedPermissionMode, effectivePermissionMode: _permissionState.effectivePermissionMode, permissionCapabilities: _permissionState.permissionCapabilities, mcpPermissionModeOverrides: _permissionState.mcpPermissionModeOverrides, autonomousRun: projectAutonomousRun(session.autonomousRun), loopInterviewBrief: session.loopInterviewBrief || null, loopInterviewHandoff: session.loopInterviewHandoff || null, scheduledTaskDraft: session.scheduledTaskDraft || null });
+    _send({ type: "session_switched", id: localId, sessionOriginId: session.sessionOriginId || null, cliSessionId: session.cliSessionId || null, loop: session.loop || null, vendor: session.vendor || null, model: session.model || null, effort: session.effort || null, hasHistory: (session.history && session.history.length > 0), capabilities: _vendorCaps, isProcessing: !!session.isProcessing, mode: session.mode || "gui", terminalId: typeof session.terminalId === "number" ? session.terminalId : null, runtimeMode: session.runtimeMode || null, runtimeTerminalId: typeof session.runtimeTerminalId === "number" ? session.runtimeTerminalId : null, tuiSuspended: !!session.tuiSuspended, dangerouslySkipPermissions: !!session.dangerouslySkipPermissions, permissionMode: _permissionState.requestedPermissionMode, effectivePermissionMode: _permissionState.effectivePermissionMode, permissionCapabilities: _permissionState.permissionCapabilities, mcpPermissionModeOverrides: _permissionState.mcpPermissionModeOverrides, autonomousRun: projectAutonomousRun(session.autonomousRun), loopInterviewBrief: session.loopInterviewBrief || null, loopInterviewHandoff: session.loopInterviewHandoff || null, scheduledTaskDraft: session.scheduledTaskDraft || null });
     // Send vendor-specific slash commands
     var _vendorCmds = (session.slashCommandsByVendor && session.slashCommandsByVendor[_sessionVendor])
       || session.slashCommands
@@ -908,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) {
@@ -955,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);
@@ -1024,7 +1049,7 @@ function createSessionManager(opts) {
     var outgoingObj = clientObj || obj;
     if (!outgoingObj._ts) outgoingObj._ts = obj._ts;
     session.history.push(obj);
-    appendToSessionFile(session, obj);
+    if (appendToSessionFile(session, obj) === false) return false;
     // Per-session out-of-band subscribers mirror mate session events into
     // a parallel UI without joining the project's
     // ws clients set). Subscribers receive the same obj that goes to ws
@@ -1080,6 +1105,35 @@ function createSessionManager(opts) {
     }
     // Notify server for cross-project unread tracking
     if (obj.type === "done") onSessionDone(session);
+    return true;
+  }
+
+  function sendAndRecordDurably(session, obj, clientObj) {
+    var recordId = existingSessionRecordId(session);
+    if (!recordId || !fs.existsSync(sessionFilePath(recordId))) return false;
+    var saved;
+    try { saved = doSendAndRecord(session, obj, clientObj); }
+    catch (error) {
+      var exact = JSON.stringify(obj);
+      if (hasDurableSessionRecord(session, function (record) { return JSON.stringify(record) === exact; })) return true;
+      if (session.history[session.history.length - 1] === obj) session.history.pop();
+      throw error;
+    }
+    if (saved === false && session.history[session.history.length - 1] === obj) session.history.pop();
+    return saved === true;
+  }
+
+  function hasDurableSessionRecord(session, predicate) {
+    var recordId = existingSessionRecordId(session);
+    if (!recordId || typeof predicate !== "function") return false;
+    try {
+      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) {}
+      }
+    } catch (error) {}
+    return false;
   }
 
   function resumeSession(cliSessionId, opts, targetWs) {
@@ -1340,8 +1394,19 @@ function createSessionManager(opts) {
     addOnSessionViewed: function (fn) { if (typeof fn === "function") sessionViewedListeners.push(fn); },
     setOnSessionRenamed: function (fn) { onSessionRenamed = fn || function () {}; },
     setOnSessionIdentityAssigned: function (fn) { onSessionIdentityAssigned = fn || function () {}; },
+    addOnSessionIdentityAssigned: function (fn) {
+      if (typeof fn !== "function") return function () {};
+      sessionIdentityAssignedListeners.push(fn);
+      return function () {
+        sessionIdentityAssignedListeners = sessionIdentityAssignedListeners.filter(function (listener) { return listener !== fn; });
+      };
+    },
     notifySessionRenamed: function (localId) { onSessionRenamed(localId); },
-    notifySessionIdentityAssigned: function (localId) { onSessionIdentityAssigned(localId); },
+    notifySessionIdentityAssigned: function (localId) {
+      onSessionIdentityAssigned(localId);
+      var listeners = sessionIdentityAssignedListeners.slice();
+      for (var i = 0; i < listeners.length; i++) listeners[i](localId);
+    },
     HISTORY_PAGE_SIZE: HISTORY_PAGE_SIZE,
     getActiveSession: getActiveSession,
     createSession: createSession,
@@ -1366,6 +1431,8 @@ function createSessionManager(opts) {
     saveSessionFile: saveSessionFile,
     appendToSessionFile: appendToSessionFile,
     sendAndRecord: doSendAndRecord,
+    sendAndRecordDurably: sendAndRecordDurably,
+    hasDurableSessionRecord: hasDurableSessionRecord,
     subscribeSession: function (localId, cb) {
       var session = sessions.get(localId);
       if (!session) return null;

package/lib/ws-schema.js

@@ -41,9 +41,13 @@ var schema = {
   "split_group_rename":       { direction: "c2s", handler: "lib/session-split-groups.js", description: "Rename a split group" },
   "split_group_dissolve":     { direction: "c2s", handler: "lib/session-split-groups.js", description: "Separate a split group without deleting its sessions" },
   "split_group_set_pair":     { direction: "c2s", handler: "lib/session-split-groups.js", description: "Assign Driver/Worker roles on a split group (driverId null clears them)" },
+  "split_worker_close":       { direction: "c2s", handler: "lib/project-pair-worker-close.js", description: "Close one exact authenticated Worker generation while preserving its peer and session history" },
+  "split_worker_close_result": { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Correlated result of an exact targeted Worker close" },
   "pair_session_options":     { direction: "c2s", handler: "lib/project-session-pair.js", description: "Request vendors/models for the pair-session dialog (response reuses the same type)" },
   "pair_session_create":      { direction: "c2s", handler: "lib/project-session-pair.js", description: "Create a Driver/Split Worker session pair as a split group" },
   "worker_proposal_response": { direction: "c2s", handler: "lib/project-worker-proposal.js", description: "Accept or decline an exact Driver Split Worker configuration with the selected runtime" },
+  "driver_continuation_response": { direction: "c2s", handler: "lib/project-driver-continuation.js", description: "Accept or decline an exact source-bound Driver continuation proposal" },
+  "driver_continuation_open_source": { direction: "c2s", handler: "lib/project-driver-continuation.js", description: "Resolve a successor's stable origin link to its authorized original Driver" },
   "project_assignment_response": { direction: "c2s", handler: "lib/workspace-assignment-service.js", description: "Approve or cancel an exact-session cross-project assignment proposal" },
   "home_clay_session_resolve": { direction: "c2s", handler: "lib/server-home-chat.js", description: "Resolve an opaque Mate session reference through the exact bound source session" },
   "home_clay_session_target": { direction: "s2c", handler: "lib/public/modules/command-palette.js", description: "Return an owner-validated navigation target for a rendered Mate session reference" },
@@ -101,6 +105,10 @@ var schema = {
   "pair_session_created":     { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Result of pair_session_create; carries the new group" },
   "worker_proposal":          { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Recorded Split Worker creation/replacement runtime card with Driver rationale" },
   "worker_proposal_update":   { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Worker card lifecycle and manual/auto decision audit update" },
+  "driver_continuation_proposal": { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Recorded review card for a compact Driver continuation" },
+  "driver_continuation_update": { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Durable exact-proposal continuation lifecycle update" },
+  "driver_continuation_result": { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Correlated response to a continuation decision" },
+  "driver_continuation_context": { direction: "s2c", handler: "lib/public/modules/app-messages.js", description: "Compact inherited context and original-session link in a successor" },
   "project_assignment_proposal": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Approval card for a new owner-bound project assignment" },
   "project_assignment_status": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Durable project assignment lifecycle update" },
   "project_assignment_error": { direction: "s2c", handler: "lib/public/modules/app-message-router.js", description: "Rejected or stale project assignment response" },

package/package.json

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