@ponythewhite/base-context 1.0.13 → 1.0.15

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

@@ -52,7 +52,7 @@ import { buildRlmChildSnapshots, buildSessionList, classifySessionRosterStatus,
 import { DaemonSessionSummarizer } from "./daemon-session-summarizer.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 { DAEMON_WORKER_ACTIVE_SESSION_ID_ENV, DAEMON_WORKER_PEER_TRANSPORT_CAPABILITY, DAEMON_WORKER_RECOVERY_JOURNAL_ENV, DAEMON_WORKER_RLM_LEDGER_SESSION_DIR_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";
 import { createRlmLedgerRegistrySeedSource, RlmSpawnLedger, readLegacyRlmSubagentRegistry as readLegacyRlmSubagentRegistryFile, rlmLedgerPath, tombstoneSavedSessionDelete, } from "./rlm-ledger.js";
 import { readRlmSubagentDisplayEntry, rlmSubagentDisplayPath, writeRlmSubagentDisplayEntry, } from "./rlm-subagent-display.js";
@@ -666,7 +666,8 @@ export class AgentDaemon {
     }
     /** Root sessions dir that keys this daemon's spawn ledger. */
     rlmLedgerSessionsDir() {
-        return this.options.defaultSessionConfig.sessionDir ?? getSessionsDir(this.agentDir);
+        const assigned = this.options.worker ? process.env[DAEMON_WORKER_RLM_LEDGER_SESSION_DIR_ENV] : undefined;
+        return assigned ?? this.options.defaultSessionConfig.sessionDir ?? getSessionsDir(this.agentDir);
     }
     async openRlmJournalOwner() {
         if (this.options.worker)
@@ -3461,7 +3462,7 @@ export class AgentDaemon {
                     cwd,
                     sessionDir,
                     agentDir: this.agentDir,
-                    ledgerSessionDir: sessionDir ?? this.rlmLedgerSessionsDir(),
+                    ledgerSessionDir: this.rlmLedgerSessionsDir(),
                     scope: command.scope,
                 }, pageQuery);
                 return success(command.id, "list_saved_sessions", page);
@@ -6382,6 +6383,10 @@ Use prime_context read/search with selected lines or a query.`;
             if (!state || !state.clients.has(client)) {
                 continue;
             }
+            const streamsSnapshot = client.transport === "private-framed" &&
+                daemonClientCapabilitiesForSession(client, activeSessionId).has("chunked_snapshot");
+            const snapshotSignal = streamsSnapshot ? markClientSnapshotStreaming(client, activeSessionId) : undefined;
+            let ownsSnapshot = streamsSnapshot;
             try {
                 const result = await this.createAttachResult(client, state, {
                     type: "attach",
@@ -6390,8 +6395,7 @@ Use prime_context read/search with selected lines or a query.`;
                 if (this.sessions.get(activeSessionId) !== state || !state.clients.has(client)) {
                     continue;
                 }
-                if (client.transport === "private-framed" &&
-                    daemonClientCapabilitiesForSession(client, activeSessionId).has("chunked_snapshot")) {
+                if (snapshotSignal) {
                     if (purpose === "replacement") {
                         this.write(client, {
                             type: "session_replaced",
@@ -6403,21 +6407,14 @@ Use prime_context read/search with selected lines or a query.`;
                         });
                     }
                     const snapshotId = `${result.activeSessionId}-${result.lastEventCursor?.generation}-${result.lastEventSequence}`;
-                    const snapshotSignal = markClientSnapshotStreaming(client, activeSessionId);
-                    let transcript;
-                    try {
-                        transcript = createSnapshotTranscriptChunks({
-                            activeSessionId,
-                            snapshotId,
-                            messages: result.snapshot.messages,
-                            targetChunkBytes: SNAPSHOT_TARGET_CHUNK_BYTES,
-                            signal: snapshotSignal,
-                        });
-                    }
-                    catch (error) {
-                        finishClientSnapshotStreaming(client, activeSessionId);
-                        throw error;
-                    }
+                    const transcript = createSnapshotTranscriptChunks({
+                        activeSessionId,
+                        snapshotId,
+                        messages: result.snapshot.messages,
+                        targetChunkBytes: SNAPSHOT_TARGET_CHUNK_BYTES,
+                        signal: snapshotSignal,
+                    });
+                    ownsSnapshot = false;
                     await this.streamWorkerSnapshot(client, {
                         ...result,
                         messages: result.messages ? [] : undefined,
@@ -6455,6 +6452,10 @@ Use prime_context read/search with selected lines or a query.`;
                 this.scheduleClientCatchupRetry(client);
                 return "retry-later";
             }
+            finally {
+                if (ownsSnapshot)
+                    finishClientSnapshotStreaming(client, activeSessionId);
+            }
         }
         return "drained";
     }