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

package/lib/session-split-groups.js

@@ -1,7 +1,9 @@
 var crypto = require("crypto");
-var fs = require("fs");
-var path = require("path");
 var durableAnchors = require("./session-split-group-anchors");
+var splitRoles = require("./session-split-group-roles");
+var versionedStore = require("./session-split-group-v2-store");
+var multiWorkerFeature = require("./multi-worker-feature");
+var groupPersistence = require("./session-split-group-persistence");
 function truncateTitle(title) {
   var value = String(title || "New Session");
   return value.length > 20 ? value.slice(0, 19) + "…" : value;
@@ -11,92 +13,14 @@ function autoGroupName(leftTitle, rightTitle) {
 }
 function createSplitGroupStore(opts) {
   var sessions = opts.sessions;
-  var groupsFile = path.join(opts.sessionsDir, "split-groups.json");
   var usersModule = opts.usersModule;
   var broadcast = opts.broadcast || function () {};
   var onPairChanged = opts.onPairChanged || function () {};
   var groups = [];
   var stagedTransfers = [];
-  function refreshPairAnchors(group) {
-    if (!group.pair) return;
-    var anchors = durableAnchors.pairAnchors(group, sessions);
-    group.pairCliIds = anchors.cli;
-    group.pairOriginIds = anchors.origin;
-  }
-  function save() {
-    for (var gi = 0; gi < groups.length; gi++) {
-      var anchors = durableAnchors.memberAnchors(groups[gi], sessions);
-      groups[gi].memberCliIds = anchors.cli;
-      groups[gi].memberOriginIds = anchors.origin;
-      refreshPairAnchors(groups[gi]);
-    }
-    var serialized = JSON.stringify(groups, null, 2) + "\n";
-    if (typeof opts.persistGroups === "function") {
-      if (opts.persistGroups(groupsFile, serialized) === false) throw new Error("Split group persistence returned false");
-      return;
-    }
-    var tmp = groupsFile + ".tmp." + process.pid;
-    fs.mkdirSync(opts.sessionsDir, { recursive: true });
-    fs.writeFileSync(tmp, serialized);
-    if (process.platform !== "win32") {
-      try { fs.chmodSync(tmp, 0o600); } catch (e) {}
-    }
-    fs.renameSync(tmp, groupsFile);
-  }
-  function validRecord(group) {
-    return group && typeof group.id === "string" && Array.isArray(group.members) &&
-      group.members.length === 2 && group.members[0] !== group.members[1] &&
-      Number.isInteger(group.members[0]) && Number.isInteger(group.members[1]) &&
-      sessions.has(group.members[0]) && sessions.has(group.members[1]);
-  }
-  function load() {
-    var loaded = [];
-    var shouldRewrite = false;
-    try {
-      loaded = JSON.parse(fs.readFileSync(groupsFile, "utf8"));
-      if (!Array.isArray(loaded)) loaded = [];
-    } catch (e) {
-      if (e.code !== "ENOENT") shouldRewrite = true;
-    }
-    var claimed = {};
-    groups = loaded.filter(function (group) {
-      // Remap members from the durable cliSessionIds; the stored localIds
-      // are only trusted for legacy records that predate memberCliIds.
-      if (group && (Array.isArray(group.memberCliIds) || Array.isArray(group.memberOriginIds))) {
-        var memberCliIds = Array.isArray(group.memberCliIds) ? group.memberCliIds : [null, null];
-        var memberOriginIds = Array.isArray(group.memberOriginIds) ? group.memberOriginIds : [null, null];
-        var left = durableAnchors.findSession(sessions, memberCliIds[0], memberOriginIds[0]);
-        var right = durableAnchors.findSession(sessions, memberCliIds[1], memberOriginIds[1]);
-        if (!left || !right || left === right) return false;
-        if (group.members[0] !== left.localId || group.members[1] !== right.localId) {
-          group.members = [left.localId, right.localId];
-          shouldRewrite = true;
-        }
-      }
-      if (group && group.pair && (Array.isArray(group.pairCliIds) || Array.isArray(group.pairOriginIds))) {
-        var pairCliIds = Array.isArray(group.pairCliIds) ? group.pairCliIds : [null, null];
-        var pairOriginIds = Array.isArray(group.pairOriginIds) ? group.pairOriginIds : [null, null];
-        var driver = durableAnchors.findSession(sessions, pairCliIds[0], pairOriginIds[0]);
-        var worker = durableAnchors.findSession(sessions, pairCliIds[1], pairOriginIds[1]);
-        if (driver && worker) {
-          group.pair.driverId = driver.localId;
-          group.pair.workerId = worker.localId;
-        }
-      }
-      if (group && group.pair) {
-        var pairValid = Array.isArray(group.members) && group.pair.driverId !== group.pair.workerId &&
-          group.members.indexOf(group.pair.driverId) !== -1 &&
-          group.members.indexOf(group.pair.workerId) !== -1;
-        if (!pairValid) return false;
-      }
-      if (!validRecord(group) || claimed[group.members[0]] || claimed[group.members[1]]) return false;
-      claimed[group.members[0]] = true;
-      claimed[group.members[1]] = true;
-      return true;
-    });
-    if (groups.length !== loaded.length) shouldRewrite = true;
-    if (shouldRewrite) save();
-  }
+  var versionedEnabled = multiWorkerFeature.isEnabled(opts.multiWorkerFeature);
+  var persistence = groupPersistence.attachPersistence(Object.assign({}, opts, { versionedEnabled: versionedEnabled }));
+  function save() { return persistence.save(groups); }
   function isMultiUser() {
     return !!(usersModule && usersModule.isMultiUser && usersModule.isMultiUser());
   }
@@ -153,6 +77,8 @@ function createSplitGroupStore(opts) {
     if (!left || !right) return { ok: false, error: "Session not found" };
     if (!canAccess(ws, left) || !canAccess(ws, right)) return { ok: false, error: "Session access denied" };
     if (membershipGroup(members[0]) || membershipGroup(members[1])) return { ok: false, error: "A session can belong to only one split group" };
+    var roleCheck = splitRoles.validateStorePair(msg.pair, members);
+    if (!roleCheck.ok) return { ok: false, error: roleCheck.error };
     var requestedName = typeof msg.name === "string" ? msg.name.trim().slice(0, 80) : "";
     var group = {
       id: "sg_" + Date.now().toString(36) + "_" + crypto.randomBytes(3).toString("hex"),
@@ -183,7 +109,8 @@ function createSplitGroupStore(opts) {
     if ((left.ownerId || null) !== (ownerId || null) || (right.ownerId || null) !== (ownerId || null)) return { ok: false, error: "Session owner does not match the scheduled task owner" };
     if (membershipGroup(left.localId) || membershipGroup(right.localId)) return { ok: false, error: "A session can belong to only one split group" };
     var pair = msg && msg.pair;
-    if (!pair || pair.driverId !== left.localId || pair.workerId !== right.localId) return { ok: false, error: "Pair roles must reference both split group members" };
+    var roleCheck = splitRoles.validateStorePair(pair, members);
+    if (!roleCheck.ok || !pair || pair.driverId !== left.localId || pair.workerId !== right.localId) return { ok: false, error: roleCheck.error || "Pair roles must reference both split group members" };
     var requestedName = typeof msg.name === "string" ? msg.name.trim().slice(0, 80) : "";
     var group = {
       id: "sg_" + Date.now().toString(36) + "_" + crypto.randomBytes(3).toString("hex"),
@@ -206,12 +133,13 @@ function createSplitGroupStore(opts) {
     onPairChanged(removed);
     return true;
   }
-  // Runtime pair lookup sees this isolated projection while ordinary list,
-  // save, anchor refresh, broadcast, and unrelated mutations keep using the
-  // durable source-owned record until commit.
   function beginOwnedDriverTransfer(ownerId, msg) {
     var group = groups.find(function (item) { return item.id === (msg && msg.id); });
     if (!group || (group.ownerId || null) !== (ownerId || null)) return { ok: false, error: "Split group not found" };
+    var transferRoles = splitRoles.normalizePair(group.pair, group.members);
+    if (transferRoles.ok && transferRoles.kind === "versioned") {
+      return { ok: false, error: "Version 2 Driver transfer is not enabled" };
+    }
     if (!group.pair || group.pair.driverId !== msg.sourceDriverId || group.pair.workerId !== msg.workerId) {
       return { ok: false, error: "The split pair changed before Driver transfer" };
     }
@@ -391,6 +319,8 @@ function createSplitGroupStore(opts) {
       return { ok: false, error: "Driver must be a member of the split group" };
     }
     var workerId = group.members[0] === msg.driverId ? group.members[1] : group.members[0];
+    var roleCheck = splitRoles.validateStorePair({ driverId: msg.driverId, workerId: workerId }, group.members);
+    if (!roleCheck.ok) return { ok: false, error: roleCheck.error };
     group.pair = { driverId: msg.driverId, workerId: workerId };
     save();
     broadcast();
@@ -398,22 +328,57 @@ function createSplitGroupStore(opts) {
     return { ok: true, group: group };
   }
 
-  function dissolve(ws, msg) {
+  function dissolve(ws, msg, hooks) {
     var index = groups.findIndex(function (item) { return item.id === (msg && msg.id); });
     if (index === -1) return { ok: false, error: "Split group not found" };
     if (!canOwn(ws, groups[index])) return { ok: false, error: "Only the group owner can separate it" };
     var removed = groups.splice(index, 1)[0];
-    save();
+    try { save(); }
+    catch (error) { groups.splice(index, 0, removed); return { ok: false, error: error.message || String(error) }; }
+    if (hooks && typeof hooks.afterPersist === "function") {
+      groups.splice(index, 0, removed);
+      var accepted;
+      try { accepted = hooks.afterPersist(); }
+      catch (error) { accepted = { ok: false, error: error.message || String(error) }; }
+      if (!accepted || accepted.ok === false) {
+        try { save(); }
+        catch (rollbackError) {
+          return { ok: false, error: (accepted && accepted.error || "close transaction rejected") +
+            "; persistence rollback failed: " + (rollbackError.message || String(rollbackError)) };
+        }
+        return { ok: false, error: accepted && accepted.error || "close transaction rejected" };
+      }
+      groups.splice(index, 1);
+    }
     broadcast();
     return { ok: true, group: removed };
   }
 
   function dissolveBySession(localId) {
-    var before = groups.length;
-    groups = groups.filter(function (group) { return group.members.indexOf(localId) === -1; });
-    if (groups.length === before) return false;
-    save();
+    var index = groups.findIndex(function (group) { return group.members.indexOf(localId) !== -1; });
+    if (index === -1) return false;
+    var group = groups[index];
+    var normalized = splitRoles.normalizePair(group.pair, group.members);
+    var beforeMembers = group.members.slice();
+    var beforePair = group.pair && Object.assign({}, group.pair);
+    if (beforePair && Array.isArray(beforePair.workerIds)) beforePair.workerIds = beforePair.workerIds.slice();
+    var removed = null;
+    if (normalized.ok && normalized.kind === "versioned" && normalized.driverId !== localId &&
+        normalized.workerIds.length > 1) {
+      var remaining = normalized.workerIds.filter(function (id) { return id !== localId; });
+      group.members = [normalized.driverId].concat(remaining);
+      group.pair = { version: 2, driverId: normalized.driverId, workerIds: remaining };
+    } else {
+      removed = groups.splice(index, 1)[0];
+    }
+    try { save(); }
+    catch (error) {
+      if (removed) groups.splice(index, 0, removed);
+      else { group.members = beforeMembers; group.pair = beforePair; }
+      return false;
+    }
     broadcast();
+    onPairChanged(group);
     return true;
   }
 
@@ -421,6 +386,11 @@ function createSplitGroupStore(opts) {
     var group = groupForMember(localId);
     if (!group) return false;
     var fresh = durableAnchors.memberAnchors(group, sessions);
+    if (fresh && fresh.version === 2) {
+      if (JSON.stringify(fresh) === JSON.stringify(group.memberAnchors || null)) return false;
+      save();
+      return true;
+    }
     var prevCli = Array.isArray(group.memberCliIds) ? group.memberCliIds : [null, null];
     var prevOrigin = Array.isArray(group.memberOriginIds) ? group.memberOriginIds : [null, null];
     if (fresh.cli[0] === prevCli[0] && fresh.cli[1] === prevCli[1] &&
@@ -445,11 +415,54 @@ function createSplitGroupStore(opts) {
     return true;
   }
 
-  load();
+  function removeVersionedGroup(group, hooks) {
+    var index = groups.indexOf(group);
+    if (index === -1) return { ok: false, error: "Split group not found" };
+    groups.splice(index, 1);
+    try { save(); }
+    catch (error) {
+      groups.splice(index, 0, group);
+      return { ok: false, error: error.message || String(error) };
+    }
+    if (hooks && typeof hooks.afterPersist === "function") {
+      groups.splice(index, 0, group);
+      var accepted;
+      try { accepted = hooks.afterPersist(); }
+      catch (error) { accepted = { ok: false, error: error.message || String(error) }; }
+      if (!accepted || accepted.ok === false) {
+        try { save(); }
+        catch (rollbackError) {
+          return { ok: false, error: (accepted && accepted.error || "close transaction rejected") +
+            "; persistence rollback failed: " + (rollbackError.message || String(rollbackError)) };
+        }
+        return { ok: false, error: accepted && accepted.error || "close transaction rejected" };
+      }
+      groups.splice(index, 1);
+    }
+    broadcast();
+    onPairChanged(group);
+    return { ok: true, group: group };
+  }
+  function versionedChanged(group) {
+    broadcast();
+    onPairChanged(group);
+  }
+  var versionedMutations = versionedStore.attachVersionedMutations({
+    sessions: sessions,
+    enabled: versionedEnabled,
+    groups: function () { return groups; },
+    membershipGroup: membershipGroup,
+    save: save,
+    remove: removeVersionedGroup,
+    changed: versionedChanged,
+  });
+  groups = persistence.load();
   return { create: create, createOwned: createOwned, dissolveOwned: dissolveOwned,
     beginOwnedDriverTransfer: beginOwnedDriverTransfer, commitOwnedDriverTransfer: commitOwnedDriverTransfer,
     rollbackOwnedDriverTransfer: rollbackOwnedDriverTransfer,
     rename: rename, setPair: setPair, dissolve: dissolve, dissolveBySession: dissolveBySession,
+    addWorker: versionedMutations.addWorker, replaceWorker: versionedMutations.replaceWorker,
+    removeWorker: versionedMutations.removeWorker,
     refreshAutoName: refreshAutoName, refreshAnchors: refreshAnchors,
     listFor: listFor, groupForMember: groupForMember, get groups() { return groups; } };
 }
@@ -461,13 +474,11 @@ function attachSplitGroups(ctx) {
     usersModule: ctx.usersModule,
     broadcast: broadcast,
     onPairChanged: ctx.onPairChanged,
+    multiWorkerFeature: ctx.multiWorkerFeature,
   });
 
   function sendState(ws) {
     if (!ws) return;
-    // Pane clients need the same owner-scoped pair roles as the parent shell.
-    // The Worker composer lock resolves its role from this projection; hiding
-    // the projection from panes leaves a configured Worker looking editable.
     ctx.sendTo(ws, { type: "split_groups", groups: store.listFor(ws) });
   }
 
@@ -495,5 +506,4 @@ function attachSplitGroups(ctx) {
   return { handleMessage: handleMessage, sendConnectionState: sendState, store: store };
 }
 
-module.exports = { attachSplitGroups: attachSplitGroups, createSplitGroupStore: createSplitGroupStore,
-  autoGroupName: autoGroupName };
+module.exports = { attachSplitGroups: attachSplitGroups, createSplitGroupStore: createSplitGroupStore, autoGroupName: autoGroupName };

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,16 +245,19 @@ function createSessionManager(opts) {
   }
 
   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;
     }
   }
 
@@ -274,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++) {
@@ -283,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; });
@@ -308,6 +327,7 @@ function createSessionManager(opts) {
         queryInstance: null,
         messageQueue: null,
         cliSessionId: m.cliSessionId,
+        _sessionRecordId: loaded[i].recordId,
         blocks: {},
         sentToolResults: {},
         pendingPermissions: {},
@@ -386,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;
     });
@@ -846,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
@@ -915,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) {
@@ -962,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);
@@ -1031,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
@@ -1087,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) {
@@ -1384,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,6 +41,8 @@ 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" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "4.3.0-beta.1",
+  "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"