@ponythewhite/base-context 1.0.13 → 1.0.14

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

@@ -35,7 +35,7 @@ import { classifySessionRosterStatus, isEvictableEmptySessionSummary, isSessionS
 import { acquireDaemonSocketPathLease, cleanupDaemonSocketPath, closeDaemonServer, defaultDaemonSocketDir, defaultDaemonSocketPath, getDaemonSocketIdentity, normalizeSocketPath, prepareDaemonSocketPath, restrictDaemonSocketPath, } from "./daemon-socket.js";
 import { acquireDaemonSupervisorOwnership, isDaemonShutdownAdmissionActive, waitForDaemonStartupFence, } from "./daemon-supervisor-ownership.js";
 import { DaemonWorkerAuthenticationError, DaemonWorkerClient, DaemonWorkerCompatibilityError, DaemonWorkerProbeTimeoutError, } from "./daemon-worker-client.js";
-import { DAEMON_WORKER_ACTIVE_SESSION_ID_ENV, DAEMON_WORKER_INSTANCE_ID_ENV, DAEMON_WORKER_PEER_TRANSPORT_CAPABILITY, DAEMON_WORKER_RECOVERY_JOURNAL_ENV, DAEMON_WORKER_ROLE_ENV, DAEMON_WORKER_ROSTER_CAPABILITY, DAEMON_WORKER_STARTUP_GATE_COMMIT, DAEMON_WORKER_STARTUP_GATE_FD_ENV, DAEMON_WORKER_SUPERVISOR_SOCKET_ENV, DAEMON_WORKER_TOKEN_ENV, durableDaemonCreateCommand, durableDaemonWorkerDescriptor, isDaemonRlmCapacitySnapshot, 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_INSTANCE_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_STARTUP_GATE_COMMIT, DAEMON_WORKER_STARTUP_GATE_FD_ENV, DAEMON_WORKER_SUPERVISOR_SOCKET_ENV, DAEMON_WORKER_TOKEN_ENV, durableDaemonCreateCommand, durableDaemonWorkerDescriptor, isDaemonRlmCapacitySnapshot, 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, rlmLedgerPath, tombstoneSavedSessionDelete, } from "./rlm-ledger.js";
 import { captureSavedSessionPageQuery } from "./saved-session-page.js";
@@ -303,6 +303,7 @@ function isDaemonWorkerDescriptor(value, socketPath) {
         (descriptor.pid ?? 0) > 0 &&
         (descriptor.processStartId === undefined || typeof descriptor.processStartId === "string") &&
         (descriptor.ownerClientId === undefined || typeof descriptor.ownerClientId === "string") &&
+        (descriptor.rlmLedgerSessionDir === undefined || typeof descriptor.rlmLedgerSessionDir === "string") &&
         typeof descriptor.socketPath === "string" &&
         typeof descriptor.authenticationToken === "string" &&
         (descriptor.workerInstanceId === undefined || typeof descriptor.workerInstanceId === "string") &&
@@ -1664,7 +1665,7 @@ export class DaemonSupervisor {
         }
         const owner = this.rlmCapacityOwner(worker);
         const journal = this.assertRlmJournalAdmission();
-        const scope = this.rlmJournalScope(worker.descriptor.sessionDir ?? this.defaultSessionConfig.sessionDir);
+        const scope = this.rlmJournalScope(worker.descriptor.rlmLedgerSessionDir ?? worker.descriptor.sessionDir ?? this.defaultSessionConfig.sessionDir);
         if (canonicalSessionPath(scope.journalPath) !== journal.ledgerPath) {
             throw new Error("Worker RLM family is not owned by this supervisor");
         }
@@ -1797,7 +1798,9 @@ export class DaemonSupervisor {
                     throw new Error("Worker authentication failed for RLM ledger mutation");
                 }
                 const owner = this.assertRlmJournalAdmission();
-                const scope = this.rlmJournalScope(worker.descriptor.sessionDir ?? this.defaultSessionConfig.sessionDir);
+                const scope = this.rlmJournalScope(worker.descriptor.rlmLedgerSessionDir ??
+                    worker.descriptor.sessionDir ??
+                    this.defaultSessionConfig.sessionDir);
                 if (canonicalSessionPath(scope.journalPath) !== owner.ledgerPath) {
                     throw new Error("Worker RLM ledger family is not owned by this supervisor");
                 }
@@ -2608,13 +2611,13 @@ export class DaemonSupervisor {
         if ("activeSessionId" in command) {
             const match = await this.findWorkerForClient(client, command.activeSessionId);
             cwd = match.summary.cwd;
-            sessionDir = this.defaultSessionConfig.sessionDir;
+            sessionDir = match.worker.descriptor.sessionDir ?? this.defaultSessionConfig.sessionDir;
         }
         else {
             cwd = resolve(command.cwd);
             sessionDir = command.sessionDir;
         }
-        const { agentDir, sessionsDir: ledgerSessionDir } = this.rlmJournalScope(sessionDir);
+        const { agentDir, sessionsDir: ledgerSessionDir } = this.rlmJournalScope();
         const page = await this.catalog.list(cwd, sessionDir, { page: pageQuery, scope, agentDir, ledgerSessionDir });
         return success(command.id, "list_saved_sessions", page);
     }
@@ -2853,6 +2856,7 @@ export class DaemonSupervisor {
         const recoveryJournalPath = existing?.descriptor.recoveryJournalPath ?? join(this.descriptorDir, `${workerId}.recovery.jsonl`);
         const orphanProcessJournalPath = existing?.descriptor.orphanProcessJournalPath ?? join(this.descriptorDir, `${workerId}.orphans.jsonl`);
         const launch = createCliSubprocessLaunchSpec(["--mode", "daemon", "--daemon-socket", socketPath]);
+        const rlmLedgerSessionDir = this.rlmJournalScope().sessionsDir;
         const workerEnvironment = createCliSubprocessEnv({
             ...process.env,
             ...launchEnv,
@@ -2861,6 +2865,7 @@ export class DaemonSupervisor {
             [DAEMON_WORKER_INSTANCE_ID_ENV]: workerInstanceId,
             [DAEMON_WORKER_ACTIVE_SESSION_ID_ENV]: rootActiveSessionId,
             [DAEMON_WORKER_SUPERVISOR_SOCKET_ENV]: this.socketPath,
+            [DAEMON_WORKER_RLM_LEDGER_SESSION_DIR_ENV]: rlmLedgerSessionDir,
             [DAEMON_WORKER_RECOVERY_JOURNAL_ENV]: recoveryJournalPath,
             [DAEMON_WORKER_STARTUP_GATE_FD_ENV]: String(WORKER_STARTUP_GATE_FD),
             [ORPHAN_PROCESS_JOURNAL_ENV]: orphanProcessJournalPath,
@@ -2930,6 +2935,7 @@ export class DaemonSupervisor {
                 rootActiveSessionId,
                 ownerClientId: existing?.descriptor.ownerClientId ?? ownerClientId,
                 sessionDir: createCommand.config?.sessionDir,
+                rlmLedgerSessionDir,
                 createdAt: existing?.descriptor.createdAt ?? now,
                 updatedAt: now,
                 lifecycle: "starting",