chainlesschain 0.162.197 → 0.162.200

package/src/gateways/ws/session-protocol.js

@@ -6,6 +6,7 @@ import {
 } from "../../runtime/runtime-events.js";
 import { createSessionRecord } from "../../runtime/contracts/session-record.js";
 import { loadSideEffectLedger } from "../../lib/side-effect-ledger-store.js";
+import { acquireSessionHostLease } from "../../lib/session-host-lease.js";
 import { reconcileSideEffects } from "../../lib/side-effect-ledger.js";
 import {
   formatMcpLedgerRecoveryNotice,
@@ -532,11 +533,20 @@ async function ensureSessionHandler(server, ws, session) {
     });
   } else {
     const { WSAgentHandler } = await import("./ws-agent-handler.js");
-    handler = new WSAgentHandler({
-      session,
-      interaction: session.interaction,
-      db: server.sessionManager.db,
+    const sessionHostLease = acquireSessionHostLease(session.id, {
+      hostKind: "ws",
     });
+    try {
+      handler = new WSAgentHandler({
+        session,
+        interaction: session.interaction,
+        db: server.sessionManager.db,
+        sessionHostLease,
+      });
+    } catch (error) {
+      sessionHostLease.release();
+      throw error;
+    }
   }
 
   server.sessionHandlers.set(session.id, handler);

package/src/gateways/ws/ws-agent-handler.js

@@ -79,6 +79,7 @@ export class WSAgentHandler {
     approvalGate,
     agentLoop: runAgentLoop,
     canonicalSessionStore,
+    sessionHostLease = null,
   }) {
     this.session = session;
     this.interaction = interaction;
@@ -86,6 +87,25 @@ export class WSAgentHandler {
     this._processing = false;
     this._abortController = null;
     this._activeRequestId = null;
+    this._sessionHostLease = sessionHostLease;
+    this._onSessionHostLeaseAbort = null;
+    if (sessionHostLease?.signal) {
+      this._onSessionHostLeaseAbort = () => {
+        const reason =
+          sessionHostLease.signal.reason ||
+          createAbortError("Session host lease was lost");
+        if (this._abortController && !this._abortController.signal.aborted) {
+          this._abortController.abort(reason);
+        }
+        this.interaction?.rejectAllPending?.(reason);
+      };
+      sessionHostLease.signal.addEventListener(
+        "abort",
+        this._onSessionHostLeaseAbort,
+        { once: true },
+      );
+      if (sessionHostLease.signal.aborted) this._onSessionHostLeaseAbort();
+    }
     // P0-2: monotonic sequence for crash-safe side-effect ledger op ids. The
     // session id + a per-op nonce keep ids unique across turns and processes.
     this._sideEffectSeq = 0;
@@ -98,6 +118,7 @@ export class WSAgentHandler {
     this._approvalGate = approvalGate || null;
     this._approvalGateInit = Boolean(approvalGate);
     this._mcpRecoveryRuntime = null;
+    this._mcpRecoverySink = null;
     this._mcpRecoveryRevision = null;
     this._mcpRecoveryClient = null;
     this._agentLoop = runAgentLoop || agentLoop;
@@ -361,6 +382,9 @@ export class WSAgentHandler {
           },
         );
       }
+      this._mcpRecoverySink = createSessionMcpLedgerSink(session.id, {
+        recovery: session.mcpLedgerRecovery || null,
+      });
       this._mcpRecoveryRuntime = createMcpHostRecoveryRuntime({
         bundle: {
           mcpClient: rawClient,
@@ -369,7 +393,7 @@ export class WSAgentHandler {
         },
         rawClient,
         sessionId: session.id,
-        sink: createSessionMcpLedgerSink(session.id),
+        sink: this._mcpRecoverySink,
         recovery: session.mcpLedgerRecovery || null,
         controller,
       });
@@ -383,6 +407,9 @@ export class WSAgentHandler {
           replayDenied: [],
         },
       );
+      this._mcpRecoverySink?.replaceRecoveryFence?.(
+        session.mcpLedgerRecovery || null,
+      );
       this._mcpRecoveryRevision = revision;
     }
     return this._mcpRecoveryRuntime;
@@ -479,6 +506,7 @@ export class WSAgentHandler {
 
     try {
       const { session } = this;
+      this._sessionHostLease?.assert?.();
 
       if (session.canonicalJsonlSession === true) {
         canonicalTurn = this._claimCanonicalTurn(userMessage, requestId);
@@ -641,6 +669,7 @@ export class WSAgentHandler {
                     })
                     .start(opId);
                   persistSideEffectLedger(session.id, sideEffectLedger);
+                  this._sessionHostLease?.assert?.();
                 }
               }
               break;
@@ -877,6 +906,15 @@ export class WSAgentHandler {
         reason: "session_closed",
       });
     }
+    if (this._sessionHostLease?.signal && this._onSessionHostLeaseAbort) {
+      this._sessionHostLease.signal.removeEventListener(
+        "abort",
+        this._onSessionHostLeaseAbort,
+      );
+    }
+    this._onSessionHostLeaseAbort = null;
+    this._sessionHostLease?.release?.();
+    this._sessionHostLease = null;
   }
 
   /**