@ponythewhite/base-context 1.0.8 → 1.0.10

package/dist/modes/daemon/daemon-mode.js

@@ -50,7 +50,7 @@ import { DaemonRlmCapacityClient } from "./daemon-rlm-capacity.js";
 import { getDaemonRuntimeIdentity } from "./daemon-runtime-identity.js";
 import { buildRlmChildSnapshots, buildSessionList, classifySessionRosterStatus, hasLiveSessionWork, inactiveLifecycleForSession, scheduledJobRegistrations, snapshotActiveSessionSummary, summaryForActiveSession, } from "./daemon-session-list.js";
 import { DaemonSessionSummarizer } from "./daemon-session-summarizer.js";
-import { cleanupDaemonSocketPath, defaultDaemonSocketPath, getDaemonSocketIdentity, normalizeSocketPath, prepareDaemonSocketPath, restrictDaemonSocketPath, } from "./daemon-socket.js";
+import { cleanupDaemonSocketPath, closeDaemonServer, defaultDaemonSocketPath, getDaemonSocketIdentity, normalizeSocketPath, prepareDaemonSocketPath, restrictDaemonSocketPath, } from "./daemon-socket.js";
 import { assertDaemonSupervisorOwnerCurrent, isDaemonShutdownAdmissionActive } from "./daemon-supervisor-ownership.js";
 import { DAEMON_WORKER_ACTIVE_SESSION_ID_ENV, DAEMON_WORKER_PEER_TRANSPORT_CAPABILITY, DAEMON_WORKER_RECOVERY_JOURNAL_ENV, DAEMON_WORKER_ROLE_ENV, DAEMON_WORKER_ROSTER_CAPABILITY, DAEMON_WORKER_SUPERVISOR_SOCKET_ENV, DAEMON_WORKER_TOKEN_ENV, isDaemonWorkerFrameHeader, ROSTER_HEARTBEAT_INTERVAL_MS, SESSION_LEASE_OWNER_ID_ENV, SESSION_LEASES_ENABLED_ENV, } from "./daemon-worker-protocol.js";
 import { MutationDrainLatch } from "./mutation-drain-latch.js";
@@ -3520,7 +3520,7 @@ export class AgentDaemon {
                     });
                 }
                 if (streamsSnapshot) {
-                    const snapshotId = `${state.activeSessionId}-${state.eventGeneration}-${state.lastEventSequence}`;
+                    const snapshotId = `${result.activeSessionId}-${result.lastEventCursor?.generation}-${result.lastEventSequence}`;
                     let transcript;
                     try {
                         transcript = createSnapshotTranscriptChunks({
@@ -4541,20 +4541,18 @@ export class AgentDaemon {
     }
     async createAttachResult(client, state, command) {
         const snapshot = await this.createSessionSnapshot(state);
+        const { lastEventSequence, lastEventCursor } = snapshot;
         const replay = command.resumeCursor?.activeSessionId && command.resumeCursor.activeSessionId !== state.activeSessionId
             ? {
                 status: "unavailable",
                 fromSequence: "sequence" in command.resumeCursor
                     ? command.resumeCursor.sequence
                     : command.resumeCursor.eventSequence,
-                toSequence: state.lastEventSequence,
-                toCursor: {
-                    generation: state.eventGeneration,
-                    sequence: state.lastEventSequence,
-                },
+                toSequence: lastEventSequence,
+                toCursor: lastEventCursor,
                 reason: "resume_cursor_session_mismatch",
             }
-            : createDaemonReplayInfo(command.resumeCursor, state.lastEventSequence, state.eventGeneration);
+            : createDaemonReplayInfo(command.resumeCursor, lastEventSequence, lastEventCursor?.generation);
         // Slim clients read summary/messages from the snapshot; duplicating them at
         // the top level would serialize the full history twice more per attach.
         const capabilities = daemonClientCapabilitiesForSession(client, state.activeSessionId);
@@ -4565,11 +4563,8 @@ export class AgentDaemon {
             ...(slim ? {} : { state: snapshot.summary, messages: snapshot.messages }),
             snapshot,
             replay,
-            lastEventSequence: state.lastEventSequence,
-            lastEventCursor: {
-                generation: state.eventGeneration,
-                sequence: state.lastEventSequence,
-            },
+            lastEventSequence,
+            lastEventCursor,
             client: {
                 id: client.id,
                 capabilities: [...capabilities],
@@ -6018,10 +6013,9 @@ Use prime_context read/search with selected lines or a query.`;
         }
     }
     beginReplacementSnapshot(client, state, message) {
-        const snapshotId = `${state.activeSessionId}-${state.eventGeneration}-${state.lastEventSequence}`;
         // Mark before the registry read so later events queue behind this snapshot.
         const snapshotSignal = markClientSnapshotStreaming(client, state.activeSessionId);
-        void this.prepareReplacementSnapshot(client, state, message, snapshotId, snapshotSignal).catch((error) => {
+        void this.prepareReplacementSnapshot(client, state, message, snapshotSignal).catch((error) => {
             finishClientSnapshotStreaming(client, state.activeSessionId);
             this.log(`could not prepare replacement snapshot: ${String(error)}`);
             if (!client.socket.destroyed && this.sessions.get(state.activeSessionId) === state) {
@@ -6032,7 +6026,7 @@ Use prime_context read/search with selected lines or a query.`;
             }
         });
     }
-    async prepareReplacementSnapshot(client, state, message, snapshotId, snapshotSignal) {
+    async prepareReplacementSnapshot(client, state, message, snapshotSignal) {
         const result = await this.createAttachResult(client, state, {
             type: "attach",
             activeSessionId: state.activeSessionId,
@@ -6044,6 +6038,7 @@ Use prime_context read/search with selected lines or a query.`;
             }
             return;
         }
+        const snapshotId = `${result.activeSessionId}-${result.lastEventCursor?.generation}-${result.lastEventSequence}`;
         const transcript = createSnapshotTranscriptChunks({
             activeSessionId: state.activeSessionId,
             snapshotId,
@@ -6404,10 +6399,10 @@ Use prime_context read/search with selected lines or a query.`;
                             state: result.snapshot.state,
                             messages: [],
                             snapshotFollows: true,
-                            meta: createDaemonEventMeta(activeSessionId, state.lastEventSequence, undefined, state.eventGeneration),
+                            meta: createDaemonEventMeta(activeSessionId, result.lastEventSequence, undefined, result.lastEventCursor?.generation),
                         });
                     }
-                    const snapshotId = `${activeSessionId}-${state.eventGeneration}-${state.lastEventSequence}`;
+                    const snapshotId = `${result.activeSessionId}-${result.lastEventCursor?.generation}-${result.lastEventSequence}`;
                     const snapshotSignal = markClientSnapshotStreaming(client, activeSessionId);
                     let transcript;
                     try {
@@ -6435,7 +6430,7 @@ Use prime_context read/search with selected lines or a query.`;
                     }, transcript, purpose === "replacement" ? "replacement" : "catchup", snapshotSignal, true);
                     continue;
                 }
-                const meta = createDaemonEventMeta(activeSessionId, state.lastEventSequence, undefined, state.eventGeneration);
+                const meta = createDaemonEventMeta(activeSessionId, result.lastEventSequence, undefined, result.lastEventCursor?.generation);
                 const catchup = purpose === "replacement"
                     ? {
                         type: "session_replaced",
@@ -6613,17 +6608,7 @@ Use prime_context read/search with selected lines or a query.`;
             shutdownFailure = true;
             this.log(`RLM journal shutdown failed: ${error instanceof Error ? error.message : String(error)}`);
         }
-        for (const client of this.clients) {
-            client.detachInput();
-            client.socket.end();
-        }
-        await new Promise((resolveClose) => {
-            if (!this.server) {
-                resolveClose();
-                return;
-            }
-            this.server.close(() => resolveClose());
-        });
+        await closeDaemonServer(this.server, this.clients);
         this.cleanupSocketPath();
         process.exit(exitCode || (shutdownFailure ? 1 : 0));
     }