@ponythewhite/base-context 1.0.8 → 1.0.10

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

@@ -32,7 +32,7 @@ import { DaemonRlmCapacityCoordinator } from "./daemon-rlm-capacity-coordinator.
 import { getDaemonRuntimeIdentity } from "./daemon-runtime-identity.js";
 import { matchesSessionIdSuffix } from "./daemon-session-id.js";
 import { classifySessionRosterStatus, isEvictableEmptySessionSummary, isSessionSummaryBusy, summaryForInactiveSession, } from "./daemon-session-list.js";
-import { acquireDaemonSocketPathLease, cleanupDaemonSocketPath, defaultDaemonSocketDir, defaultDaemonSocketPath, getDaemonSocketIdentity, normalizeSocketPath, prepareDaemonSocketPath, restrictDaemonSocketPath, } from "./daemon-socket.js";
+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";
@@ -1498,7 +1498,10 @@ export class DaemonSupervisor {
             this.write(client, failure(command.id, command.type, "Daemon is preparing an update restart"));
             return;
         }
-        if (mutation && !UPDATE_RESTART_DRAIN_COMMANDS.has(command.type)) {
+        // Releasing an existing pause can unblock a mutation that eviction is draining.
+        if (mutation &&
+            command.type !== "release_session_input_pause" &&
+            !UPDATE_RESTART_DRAIN_COMMANDS.has(command.type)) {
             const idleEvictionFence = this.idleEvictionFence;
             if (idleEvictionFence) {
                 await idleEvictionFence;
@@ -6358,11 +6361,7 @@ export class DaemonSupervisor {
             }
         }
         await this.catalog.stop();
-        for (const client of this.clients) {
-            client.detachInput();
-            client.socket.end();
-        }
-        await new Promise((resolveClose) => this.server?.close(() => resolveClose()) ?? resolveClose());
+        await closeDaemonServer(this.server, this.clients);
         await this.runCleanupStep("daemon socket", () => this.cleanupSocket());
         await this.runCleanupStep("supervisor cache", () => {
             rmSync(this.snapshotCacheRoot, { recursive: true, force: true });