@rynx-ai/daemon 0.1.11-beta.43 → 0.1.11-beta.45

package/bundled-plugins/plugins/lark/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rynx-ai/plugin-channel-lark",
-  "version": "0.1.11-beta.43",
+  "version": "0.1.11-beta.45",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/rynx-ai/rynx.git",

package/dist/daemon-server.js

@@ -23,7 +23,6 @@ import { APP_BROWSER_HOST_BOOTSTRAP_TYPE, AppBrowserHostSupervisor, parseAppBrow
 import { buildControlDeps, listControlAgentModels } from "./control-deps.js";
 import { createBrowserArtifactManagementService } from "./browser-artifact-management.js";
 import { createDaemonBuildStatus } from "./daemon-build-status.js";
-import { MaintenanceLeaseStore } from "./maintenance-lease.js";
 import { BrowserRunnerSessionContextProvider } from "./browser-runner-session-context.js";
 import { removeLegacyPluginSkillSnapshot, snapshotEnabledPluginSkillSources, } from "./plugin-skill-context.js";
 import { installedDaemonVersion } from "./entry-path.js";
@@ -259,13 +258,7 @@ export async function startRynxDaemonServer({ config, warn = defaultWarn, onShut
         const appConfig = config ?? loadConfig();
         const admissionGate = new CloseableAdmissionGate();
         let shutdownAccepted = false;
-        const maintenanceLease = new MaintenanceLeaseStore({
-            // Expiry restores the gate primitive for a process that outlives its
-            // upgrader. The independent accepted-shutdown fence below still prevents
-            // new work after an irreversible server shutdown has begun.
-            onExpired: () => admissionGate.reopen(),
-        });
-        const admissionOpen = () => !shutdownAccepted && !maintenanceLease.isActive();
+        const admissionOpen = () => !shutdownAccepted;
         const reserveAdmission = () => !admissionOpen()
             ? undefined
             : admissionGate.tryReserve();
@@ -606,35 +599,12 @@ export async function startRynxDaemonServer({ config, warn = defaultWarn, onShut
         });
         let requestServerShutdown;
         let shutdownAttempt;
-        let shutdownAttemptLeaseToken;
-        const shutdownIfIdle = (maintenanceLeaseToken) => {
-            if (maintenanceLease.isActive()) {
-                if (!maintenanceLeaseToken || !maintenanceLease.isHeldBy(maintenanceLeaseToken)) {
-                    return Promise.reject(new Error("a different maintenance lease is already active"));
-                }
-                // The previous daemon may have persisted the lease and exited after
-                // its 202 response was lost. A replacement process holding the same
-                // token must perform its own close/drain/shutdown; returning accepted
-                // without scheduling this PID would strand the updater waiting for a
-                // process that can never exit.
-            }
+        const shutdownIfIdle = () => {
             if (shutdownAccepted) {
-                if (maintenanceLeaseToken) {
-                    maintenanceLease.acquire(maintenanceLeaseToken);
-                    return Promise.resolve({
-                        outcome: "accepted",
-                        maintenanceLease: "active",
-                    });
-                }
                 return Promise.resolve({ outcome: "accepted" });
             }
-            if (shutdownAttempt) {
-                if (maintenanceLeaseToken === shutdownAttemptLeaseToken) {
-                    return shutdownAttempt;
-                }
-                return Promise.reject(new Error("another idle shutdown check is already in progress"));
-            }
-            shutdownAttemptLeaseToken = maintenanceLeaseToken;
+            if (shutdownAttempt)
+                return shutdownAttempt;
             const attempt = (async () => {
                 await admissionGate.closeAndDrain();
                 const runtimeActivity = sessionRuntimeServices.sessionRuntimeIndex.activitySnapshot();
@@ -658,37 +628,25 @@ export async function startRynxDaemonServer({ config, warn = defaultWarn, onShut
                     admissionGate.reopen();
                     throw new Error("idle daemon shutdown was requested before server lifecycle was ready");
                 }
-                const acquiredLease = maintenanceLeaseToken
-                    ? maintenanceLease.acquire(maintenanceLeaseToken)
-                    : false;
                 shutdownAccepted = true;
                 try {
                     void shutdown().catch((error) => {
                         shutdownAccepted = false;
-                        if (acquiredLease && maintenanceLeaseToken) {
-                            maintenanceLease.release(maintenanceLeaseToken);
-                        }
                         admissionGate.reopen();
                         warn(`idle daemon shutdown failed: ${error instanceof Error ? error.message : String(error)}`);
                     });
                 }
                 catch (error) {
                     shutdownAccepted = false;
-                    if (acquiredLease && maintenanceLeaseToken) {
-                        maintenanceLease.release(maintenanceLeaseToken);
-                    }
                     admissionGate.reopen();
                     throw error;
                 }
-                return maintenanceLeaseToken
-                    ? { outcome: "accepted", maintenanceLease: "active" }
-                    : { outcome: "accepted" };
+                return { outcome: "accepted" };
             })();
             shutdownAttempt = attempt;
             void attempt.finally(() => {
                 if (shutdownAttempt === attempt) {
                     shutdownAttempt = undefined;
-                    shutdownAttemptLeaseToken = undefined;
                 }
             }).catch(() => undefined);
             return attempt;
@@ -701,14 +659,6 @@ export async function startRynxDaemonServer({ config, warn = defaultWarn, onShut
                 publicKey: installationIdentity.publicKey,
             }),
             buildStatus: daemonBuildStatus,
-            releaseMaintenanceLease: (token) => ({
-                outcome: (() => {
-                    const outcome = maintenanceLease.release(token);
-                    if (outcome === "released")
-                        admissionGate.reopen();
-                    return outcome;
-                })(),
-            }),
             pluginManagement: {
                 listPlugins: () => pluginManagement.list(),
                 setPluginEnabled: (pluginId, enabled) => pluginManagement.setEnabled(pluginId, enabled),
@@ -914,6 +864,7 @@ export async function startRynxDaemonServer({ config, warn = defaultWarn, onShut
         server.shutdown = () => {
             if (shutdownPromise)
                 return shutdownPromise;
+            shutdownAccepted = true;
             // Fence Local admission without closing the Desktop Browser Host WS.
             // Browser handles can therefore close gracefully before full teardown.
             server.stopAccepting();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rynx-ai/daemon",
-  "version": "0.1.11-beta.43",
+  "version": "0.1.11-beta.45",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/rynx-ai/rynx.git",
@@ -51,18 +51,18 @@
     "tar": "^7.5.19",
     "undici": "^7.28.0",
     "ws": "^8.21.0",
-    "@rynx-ai/core": "0.1.11-beta.43",
-    "@rynx-ai/plugin-runner": "0.1.11-beta.43",
-    "@rynx-ai/plugin-sdk": "0.1.11-beta.43",
-    "@rynx-ai/protocol": "0.1.11-beta.43",
-    "@rynx-ai/remote-runtime-client": "0.1.11-beta.43",
-    "@rynx-ai/emulator": "0.1.11-beta.43",
-    "@rynx-ai/server": "0.1.11-beta.43"
+    "@rynx-ai/emulator": "0.1.11-beta.45",
+    "@rynx-ai/plugin-runner": "0.1.11-beta.45",
+    "@rynx-ai/plugin-sdk": "0.1.11-beta.45",
+    "@rynx-ai/protocol": "0.1.11-beta.45",
+    "@rynx-ai/remote-runtime-client": "0.1.11-beta.45",
+    "@rynx-ai/core": "0.1.11-beta.45",
+    "@rynx-ai/server": "0.1.11-beta.45"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
-    "@rynx-ai/plugin-channel-lark": "0.1.11-beta.43",
-    "@rynx-ai/browser-cdp": "0.1.11-beta.43"
+    "@rynx-ai/plugin-channel-lark": "0.1.11-beta.45",
+    "@rynx-ai/browser-cdp": "0.1.11-beta.45"
   },
   "scripts": {
     "build": "rm -rf dist bundled-plugins && tsc -p tsconfig.json && chmod +x dist/index-daemon.js && node ../../scripts/stage-bundled-plugins.mjs",

package/dist/maintenance-lease.d.ts

@@ -1,39 +0,0 @@
-export type MaintenanceLeaseReleaseOutcome = "released" | "not_active" | "denied";
-export interface MaintenanceLeaseStoreOptions {
-    filePath?: string;
-    now?: () => number;
-    ttlMs?: number;
-    /** Test seam; production fsyncs the lease directory after rename/remove. */
-    syncDirectory?: (directory: string) => void;
-    /** Process-local recovery hook, invoked once when a live lease is observed expired. */
-    onExpired?: () => void;
-}
-export declare function maintenanceLeaseFile(env?: NodeJS.ProcessEnv): string;
-/**
- * Cross-process admission fence used only during daemon replacement.
- *
- * The raw bearer token is never persisted. The bounded expiry means a crashed
- * upgrader cannot leave the daemon permanently unavailable, while atomic rename
- * ensures a replacement daemon sees either the complete lease or no lease.
- */
-export declare class MaintenanceLeaseStore {
-    private readonly filePath;
-    private readonly now;
-    private readonly ttlMs;
-    private readonly syncDirectory;
-    private readonly onExpired;
-    private lease;
-    private expiryTimer;
-    constructor(options?: MaintenanceLeaseStoreOptions);
-    isActive(): boolean;
-    isHeldBy(token: string): boolean;
-    acquire(token: string): boolean;
-    release(token: string): MaintenanceLeaseReleaseOutcome;
-    private readPersistedLease;
-    private writePersistedLease;
-    private clear;
-    private clearFile;
-    private expire;
-    private scheduleExpiry;
-    private cancelExpiry;
-}

package/dist/maintenance-lease.js

@@ -1,263 +0,0 @@
-import { createHash, timingSafeEqual } from "node:crypto";
-import { closeSync, fsyncSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, writeFileSync, } from "node:fs";
-import { dirname, join } from "node:path";
-import { rynxHome } from "@rynx-ai/core";
-const LEASE_SCHEMA_VERSION = 1;
-// The lease is acquired only after shutdown-if-idle has closed admission and
-// confirmed the daemon is idle. Keep a bounded cutover/rollback window without
-// fencing a recovered daemon for hours when an updater disappears.
-const DEFAULT_LEASE_TTL_MS = 15 * 60 * 1_000;
-// Accept the previous production bound during rolling upgrades, then shorten
-// it on load. Reject anything beyond that historical contract as corrupt.
-const LEGACY_MAX_LEASE_TTL_MS = 30 * 60 * 60 * 1_000;
-const EXPIRY_RETRY_MS = 1_000;
-const MAX_TIMER_DELAY_MS = 2_147_483_647;
-const LEASE_TOKEN_PATTERN = /^[A-Za-z0-9_-]{32,256}$/;
-export function maintenanceLeaseFile(env = process.env) {
-    return join(rynxHome(env), "maintenance-lease.json");
-}
-/**
- * Cross-process admission fence used only during daemon replacement.
- *
- * The raw bearer token is never persisted. The bounded expiry means a crashed
- * upgrader cannot leave the daemon permanently unavailable, while atomic rename
- * ensures a replacement daemon sees either the complete lease or no lease.
- */
-export class MaintenanceLeaseStore {
-    filePath;
-    now;
-    ttlMs;
-    syncDirectory;
-    onExpired;
-    lease;
-    expiryTimer;
-    constructor(options = {}) {
-        this.filePath = options.filePath ?? maintenanceLeaseFile();
-        this.now = options.now ?? (() => Date.now());
-        this.ttlMs = options.ttlMs ?? DEFAULT_LEASE_TTL_MS;
-        this.syncDirectory = options.syncDirectory ?? fsyncDirectory;
-        this.onExpired = options.onExpired ?? (() => undefined);
-        if (!Number.isSafeInteger(this.ttlMs) || this.ttlMs <= 0) {
-            throw new Error("maintenance lease TTL must be a positive safe integer");
-        }
-        this.lease = this.readPersistedLease();
-        this.scheduleExpiry();
-    }
-    isActive() {
-        if (!this.lease)
-            return false;
-        if (this.lease.expiresAt > this.now())
-            return true;
-        this.expire();
-        return false;
-    }
-    isHeldBy(token) {
-        let tokenHash;
-        try {
-            tokenHash = hashLeaseToken(token);
-        }
-        catch {
-            return false;
-        }
-        return Boolean(this.isActive()
-            && this.lease
-            && hashesEqual(this.lease.tokenHash, tokenHash));
-    }
-    acquire(token) {
-        const tokenHash = hashLeaseToken(token);
-        if (this.isActive()) {
-            if (this.lease && hashesEqual(this.lease.tokenHash, tokenHash)) {
-                const createdAt = this.now();
-                const renewed = {
-                    schemaVersion: LEASE_SCHEMA_VERSION,
-                    tokenHash,
-                    createdAt,
-                    expiresAt: createdAt + this.ttlMs,
-                };
-                // Fail closed in memory if persistence reaches an indeterminate I/O
-                // outcome; the caller sees the error, but this process must not reopen
-                // admission around a lease file that may already have been renamed.
-                this.lease = renewed;
-                try {
-                    this.writePersistedLease(renewed);
-                }
-                finally {
-                    this.scheduleExpiry();
-                }
-                return false;
-            }
-            throw new Error("a different maintenance lease is already active");
-        }
-        const createdAt = this.now();
-        const lease = {
-            schemaVersion: LEASE_SCHEMA_VERSION,
-            tokenHash,
-            createdAt,
-            expiresAt: createdAt + this.ttlMs,
-        };
-        this.lease = lease;
-        try {
-            this.writePersistedLease(lease);
-        }
-        finally {
-            this.scheduleExpiry();
-        }
-        return true;
-    }
-    release(token) {
-        if (!this.isActive())
-            return "not_active";
-        const lease = this.lease;
-        if (!lease)
-            return "not_active";
-        let tokenHash;
-        try {
-            tokenHash = hashLeaseToken(token);
-        }
-        catch {
-            return "denied";
-        }
-        if (!hashesEqual(lease.tokenHash, tokenHash))
-            return "denied";
-        this.clear();
-        return "released";
-    }
-    readPersistedLease() {
-        let parsed;
-        try {
-            parsed = JSON.parse(readFileSync(this.filePath, "utf8"));
-        }
-        catch (error) {
-            if (error
-                && typeof error === "object"
-                && "code" in error
-                && error.code === "ENOENT")
-                return undefined;
-            throw new Error("maintenance lease state is unreadable", { cause: error });
-        }
-        if (!isPersistedLease(parsed, Math.max(this.ttlMs, LEGACY_MAX_LEASE_TTL_MS))) {
-            throw new Error("maintenance lease state is invalid");
-        }
-        const now = this.now();
-        if (parsed.expiresAt <= now) {
-            this.clearFile();
-            return undefined;
-        }
-        if (parsed.expiresAt - parsed.createdAt > this.ttlMs) {
-            const shortened = {
-                ...parsed,
-                createdAt: now,
-                expiresAt: Math.min(parsed.expiresAt, now + this.ttlMs),
-            };
-            this.writePersistedLease(shortened);
-            return shortened;
-        }
-        return parsed;
-    }
-    writePersistedLease(lease) {
-        const parent = dirname(this.filePath);
-        mkdirSync(parent, { recursive: true, mode: 0o700 });
-        const temporary = `${this.filePath}.${process.pid}.${Date.now()}.tmp`;
-        let descriptor;
-        try {
-            descriptor = openSync(temporary, "wx", 0o600);
-            writeFileSync(descriptor, `${JSON.stringify(lease)}\n`, "utf8");
-            fsyncSync(descriptor);
-            closeSync(descriptor);
-            descriptor = undefined;
-            renameSync(temporary, this.filePath);
-            this.syncDirectory(parent);
-        }
-        finally {
-            if (descriptor !== undefined)
-                closeSync(descriptor);
-            rmSync(temporary, { force: true });
-        }
-    }
-    clear() {
-        this.clearFile();
-        this.lease = undefined;
-        this.cancelExpiry();
-    }
-    clearFile() {
-        rmSync(this.filePath, { force: true });
-        this.syncDirectory(dirname(this.filePath));
-    }
-    expire() {
-        this.clear();
-        this.onExpired();
-    }
-    scheduleExpiry(delayOverride) {
-        this.cancelExpiry();
-        if (!this.lease)
-            return;
-        const delay = delayOverride ?? Math.max(0, this.lease.expiresAt - this.now());
-        this.expiryTimer = setTimeout(() => {
-            this.expiryTimer = undefined;
-            if (!this.lease)
-                return;
-            if (this.lease.expiresAt > this.now()) {
-                this.scheduleExpiry();
-                return;
-            }
-            try {
-                this.expire();
-            }
-            catch {
-                // Keep the in-memory fence and retry cleanup. A failed durability
-                // operation must not turn an expired lease into open admission.
-                this.scheduleExpiry(EXPIRY_RETRY_MS);
-            }
-        }, Math.min(delay, MAX_TIMER_DELAY_MS));
-        this.expiryTimer.unref?.();
-    }
-    cancelExpiry() {
-        if (this.expiryTimer)
-            clearTimeout(this.expiryTimer);
-        this.expiryTimer = undefined;
-    }
-}
-function fsyncDirectory(directory) {
-    let descriptor;
-    try {
-        descriptor = openSync(directory, "r");
-        fsyncSync(descriptor);
-    }
-    catch (error) {
-        if (error
-            && typeof error === "object"
-            && "code" in error
-            && error.code === "ENOENT")
-            return;
-        throw error;
-    }
-    finally {
-        if (descriptor !== undefined)
-            closeSync(descriptor);
-    }
-}
-function hashLeaseToken(token) {
-    if (!LEASE_TOKEN_PATTERN.test(token)) {
-        throw new Error("maintenance lease token must be 32-256 base64url characters");
-    }
-    return createHash("sha256").update(token, "utf8").digest("hex");
-}
-function hashesEqual(left, right) {
-    const leftBuffer = Buffer.from(left, "hex");
-    const rightBuffer = Buffer.from(right, "hex");
-    return leftBuffer.length === rightBuffer.length
-        && timingSafeEqual(leftBuffer, rightBuffer);
-}
-function isPersistedLease(value, maximumTtlMs) {
-    if (!value || typeof value !== "object")
-        return false;
-    const candidate = value;
-    return candidate.schemaVersion === LEASE_SCHEMA_VERSION
-        && typeof candidate.tokenHash === "string"
-        && /^[a-f0-9]{64}$/.test(candidate.tokenHash)
-        && Number.isSafeInteger(candidate.createdAt)
-        && Number.isSafeInteger(candidate.expiresAt)
-        && candidate.createdAt >= 0
-        && candidate.expiresAt > candidate.createdAt
-        && candidate.expiresAt - candidate.createdAt <= maximumTtlMs;
-}