@openclaw/fs-safe 0.17.0 → 0.18.0

package/dist/secret-read-async.js

@@ -5,11 +5,11 @@ import { assertNoUnsafeDeviceReadPath } from "./device-path.js";
 import { FsSafeError } from "./errors.js";
 import { resolveReadOpenFlags } from "./read-open-flags.js";
 import { realpathSync } from "./realpath.js";
-import { inspectFileIdentity } from "./strict-file-identity.js";
+import { inspectFileIdentitySync } from "./strict-file-identity.js";
 import { prepareSecretRead, secretPathErrorCode, secretReadError, trimSecretFileContent, } from "./secret-read-policy.js";
 import { assertNoWindowsPathAlias } from "./windows-path-alias.js";
 export async function readSecretFile(filePath, label, options = {}) {
-    const { resolvedPath, maxBytes, rejectSymlink, rejectHardlinks, previewStat, inspectInput } = prepareSecretRead(filePath, label, options);
+    const { resolvedPath, maxBytes, rejectHardlinks, previewStat, inspectInput } = prepareSecretRead(filePath, label, options);
     let handle;
     let raw;
     try {
@@ -18,20 +18,20 @@ export async function readSecretFile(filePath, label, options = {}) {
         assertNoUnsafeDeviceReadPath(realPath);
         handle = await fs.open(realPath, resolveReadOpenFlags());
         const openedHandle = handle;
-        const openedStat = await inspectFileIdentity(async () => {
+        const openedStat = inspectFileIdentitySync(() => {
             const stat = fsSync.fstatSync(openedHandle.fd, { bigint: true });
             if (!stat.isFile() || (rejectHardlinks && stat.nlink > 1n)) {
                 throw new FsSafeError("path-mismatch", "security validation failed");
             }
             return stat;
         }, previewStat);
-        await inspectFileIdentity(async () => {
+        inspectFileIdentitySync(() => {
             const stat = fsSync.lstatSync(realPath, { bigint: true });
             if (!stat.isFile())
                 throw new FsSafeError("path-mismatch", "security validation failed");
             return stat;
         }, openedStat);
-        await inspectFileIdentity(() => inspectInput("secret path became a symlink"), openedStat);
+        inspectFileIdentitySync(() => inspectInput("secret path became a symlink"), openedStat);
         raw = (await readFileHandleBounded(handle, maxBytes)).toString("utf8");
     }
     catch (error) {

package/dist/secret-read-policy.d.ts

@@ -18,4 +18,3 @@ export declare function prepareSecretRead(filePath: string, label: string, optio
     previewStat: BigIntStats;
     inspectInput: (symlinkMessage: string) => BigIntStats;
 };
-//# sourceMappingURL=secret-read-policy.d.ts.map

package/dist/secret.d.ts

@@ -1,4 +1,3 @@
 export { createSecretFileAtomic, PRIVATE_SECRET_DIR_MODE, PRIVATE_SECRET_FILE_MODE, readSecretFileSync, tryReadSecretFileSync, writeSecretFileAtomic, } from "./secret-file.js";
 export { DEFAULT_SECRET_FILE_MAX_BYTES, type SecretFileReadOptions } from "./secret-read-policy.js";
 export { readSecretFile, tryReadSecretFile } from "./secret-read-async.js";
-//# sourceMappingURL=secret.d.ts.map

package/dist/secure-file-windows.d.ts

@@ -1,11 +1,6 @@
 import type { BigIntStats, Stats } from "node:fs";
 import type { PermissionCheck } from "./permissions.js";
 type ExactIdentity = Pick<BigIntStats, "dev" | "ino">;
-export declare function inspectSecureWindowsDescriptor(params: {
-    fd: number;
-    identity: ExactIdentity;
-    stat: Stats;
-}): PermissionCheck;
 /** Both mechanisms inspect the same borrowed handle; the caller owns its lifetime. */
 export declare function inspectSecureWindowsFile(params: {
     fd: number;
@@ -13,4 +8,3 @@ export declare function inspectSecureWindowsFile(params: {
     stat: Stats;
 }): Promise<PermissionCheck>;
 export {};
-//# sourceMappingURL=secure-file-windows.d.ts.map

package/dist/secure-file-windows.js

@@ -29,27 +29,6 @@ function parseIdentity(value) {
         ino: BigInt(`0x${match[2]}`),
     };
 }
-export function inspectSecureWindowsDescriptor(params) {
-    let native;
-    try {
-        native = getNativeBinding();
-    }
-    catch (cause) {
-        permissionUnverified("Windows descriptor ACL verification requires the matching native helper", cause);
-    }
-    const inspect = native?.inspectWindowsSecureFileHandle;
-    if (typeof inspect !== "function") {
-        permissionUnverified("Windows descriptor ACL verification requires an up-to-date native helper");
-    }
-    let result;
-    try {
-        result = inspect.call(native, params.fd);
-    }
-    catch (cause) {
-        permissionUnverified("Windows descriptor ACL verification failed", cause);
-    }
-    return inspectDescriptorResult(params, result, "native");
-}
 function inspectDescriptorResult(params, result, mechanism) {
     if (!isRecord(result))
         permissionUnverified("Windows descriptor ACL facts were malformed");
@@ -85,19 +64,25 @@ export async function inspectSecureWindowsFile(params) {
     catch (cause) {
         permissionUnverified("Windows descriptor ACL verification requires the matching native helper", cause);
     }
-    if (typeof native?.inspectWindowsSecureFileHandle === "function") {
-        return inspectSecureWindowsDescriptor(params);
-    }
-    if (getFsSafeNativeConfig().mode === "require") {
+    const inspect = native?.inspectWindowsSecureFileHandle;
+    const nativeAvailable = typeof inspect === "function";
+    if (!nativeAvailable && getFsSafeNativeConfig().mode === "require") {
         permissionUnverified("Windows descriptor ACL verification requires an up-to-date native helper");
     }
-    warnNativeFallback("windows-secure-file", "Windows descriptor ACL inspection uses a slower built-in system command.");
+    if (!nativeAvailable) {
+        warnNativeFallback("windows-secure-file", "Windows descriptor ACL inspection uses a slower built-in system command.");
+    }
     let result;
     try {
-        result = await inspectWindowsDescriptorCommand(params.fd);
+        if (nativeAvailable) {
+            result = inspect.call(native, params.fd);
+        }
+        else {
+            result = await inspectWindowsDescriptorCommand(params.fd);
+        }
     }
     catch (cause) {
         permissionUnverified("Windows descriptor ACL verification failed", cause);
     }
-    return inspectDescriptorResult(params, result, "system-command");
+    return inspectDescriptorResult(params, result, nativeAvailable ? "native" : "system-command");
 }

package/dist/secure-file.d.ts

@@ -29,4 +29,3 @@ export type SecureFileReadResult = {
     permissions?: PermissionCheck;
 };
 export declare function readSecureFile(options: SecureFileReadOptions): Promise<SecureFileReadResult>;
-//# sourceMappingURL=secure-file.d.ts.map

package/dist/secure-file.js

@@ -12,7 +12,7 @@ import { formatPermissionErrorDetail } from "./permission-exec.js";
 import { resolveReadOpenFlags } from "./read-open-flags.js";
 import { realpathSync } from "./realpath.js";
 import { inspectPathPermissions, isGroupReadable, isGroupWritable, isWorldReadable, isWorldWritable, modeBits, } from "./permissions.js";
-import { inspectFileIdentity } from "./strict-file-identity.js";
+import { inspectFileIdentitySync } from "./strict-file-identity.js";
 import { inspectSecureWindowsFile } from "./secure-file-windows.js";
 import { scheduleTimeout } from "./timing.js";
 import { anchorWindowsDriveRelativePath, assertNoWindowsPathAlias, resolvePathPreservingWindowsRoot, } from "./windows-path-alias.js";
@@ -139,9 +139,9 @@ async function openSecureHandle(options, maxBytes) {
         if (!openedStat.isFile()) {
             throw new FsSafeError("not-file", `${label(options)} must be a file: ${options.filePath}`);
         }
-        const openedIdentity = await inspectFileIdentity(() => fsSync.fstatSync(handle.fd, { bigint: true }));
+        const openedIdentity = inspectFileIdentitySync(() => fsSync.fstatSync(handle.fd, { bigint: true }));
         assertNotHardlinked(options, openedIdentity);
-        await inspectFileIdentity(async () => {
+        inspectFileIdentitySync(() => {
             const pathStat = options.trust?.allowSymlink
                 ? fsSync.statSync(options.filePath, { bigint: true })
                 : fsSync.lstatSync(options.filePath, { bigint: true });
@@ -153,7 +153,7 @@ async function openSecureHandle(options, maxBytes) {
         }, openedIdentity);
         const realPath = realpathSync.native(options.filePath);
         assertNoWindowsPathAlias(realPath, "filesystem", `${label(options)} resolved path uses a Windows filesystem namespace alias`);
-        await inspectFileIdentity(() => {
+        inspectFileIdentitySync(() => {
             const realPathStat = fsSync.statSync(realPath, { bigint: true });
             assertNotHardlinked(options, realPathStat);
             return realPathStat;
@@ -168,11 +168,11 @@ async function openSecureHandle(options, maxBytes) {
         throw err;
     }
 }
-async function assertTrustedDirs(options, realPath) {
+function assertTrustedDirs(options, realPath) {
     if (!options.trust?.trustedDirs || options.trust.trustedDirs.length === 0) {
         return;
     }
-    const trusted = await Promise.all(options.trust.trustedDirs.map(async (dir) => {
+    const trusted = options.trust.trustedDirs.map((dir) => {
         let realPath;
         try {
             realPath = realpathSync.native(dir);
@@ -182,7 +182,7 @@ async function assertTrustedDirs(options, realPath) {
         }
         assertNoWindowsPathAlias(realPath, "filesystem", "trusted directory uses a Windows filesystem namespace alias");
         return realPath;
-    }));
+    });
     if (!trusted.some((dir) => isPathInside(dir, realPath))) {
         throw new FsSafeError("outside-workspace", `${label(options)} is outside trustedDirs: ${realPath}`);
     }
@@ -281,10 +281,10 @@ export async function readSecureFile(options) {
     assertNoWindowsPathAlias(options.filePath, "filesystem", `${label(options)} path uses a Windows filesystem namespace alias`);
     const opened = await openSecureHandle(options, maxBytes);
     try {
-        await assertTrustedDirs(options, opened.realPath);
+        assertTrustedDirs(options, opened.realPath);
         const permissions = await assertSecurePermissions(options, opened.pathStat, opened.realPath, opened.identity, opened.handle.fd);
         const buffer = await readHandleWithTimeout(opened.handle, options.io?.timeoutMs, maxBytes);
-        const finalIdentity = await inspectFileIdentity(() => fsSync.fstatSync(opened.handle.fd, { bigint: true }), opened.identity);
+        const finalIdentity = inspectFileIdentitySync(() => fsSync.fstatSync(opened.handle.fd, { bigint: true }), opened.identity);
         if (!finalIdentity.isFile()) {
             throw new FsSafeError("not-file", `${label(options)} must remain a file: ${options.filePath}`);
         }

package/dist/secure-temp-dir.d.ts

@@ -27,4 +27,3 @@ export type ResolveSecureTempRootOptions = {
     warningPrefix?: string;
 };
 export declare function resolveSecureTempRoot(options: ResolveSecureTempRootOptions): string;
-//# sourceMappingURL=secure-temp-dir.d.ts.map

package/dist/secure-temp-repair.d.ts

@@ -32,4 +32,3 @@ export declare function secureTempDirectoryReceipt(stat: ExactDirectoryStat, uid
 /** No pathname chmod, search-only descriptors, procfs, or reopening fallback. */
 export declare function repairSecureTempDirectory(candidate: string, expected: SecureTempDirectoryReceipt, uid: number, adapter: SecureTempRepairAdapter, access: () => void, repaired: () => void, finalize?: boolean): void;
 export {};
-//# sourceMappingURL=secure-temp-repair.d.ts.map

package/dist/sibling-staged-file.d.ts

@@ -15,4 +15,3 @@ export declare function writeCallbackSibling<T>(params: {
     filePath: string;
     result: T;
 }>;
-//# sourceMappingURL=sibling-staged-file.d.ts.map

package/dist/sibling-staged-file.js

@@ -2,7 +2,7 @@ import { syncFileBestEffort } from "./file-sync.js";
 import fsSync, {} from "node:fs";
 import fs, {} from "node:fs/promises";
 import path from "node:path";
-import { assertAsyncDirectoryGuard, assertDirectoryIdentitySync, createAsyncDirectoryGuard, } from "./directory-guard.js";
+import { assertDirectoryIdentitySync, createAsyncDirectoryGuard, } from "./directory-guard.js";
 import { syncDirectoryBestEffort } from "./directory-durability.js";
 import { isWindowsReservedDeviceName } from "./device-path.js";
 import { FsSafeError } from "./errors.js";
@@ -10,7 +10,7 @@ import { getNativeBinding } from "./native.js";
 import { handoffPrivateProducerFile, } from "./private-producer-handoff.js";
 import { resolveReadOpenFlags } from "./read-open-flags.js";
 import { rootFromDirectoryGuard } from "./root-impl.js";
-import { inspectFileIdentity } from "./strict-file-identity.js";
+import { inspectFileIdentitySync } from "./strict-file-identity.js";
 import { registerTempPathForExit } from "./temp-cleanup.js";
 import { createOwnedTempFile } from "./temp-target.js";
 import { serializePathWrite } from "./write-queue.js";
@@ -52,8 +52,8 @@ function assertRegularFile(stat) {
         throw new FsSafeError("hardlink", "sibling temp must have exactly one link");
     }
 }
-async function inspectStage(inspect, expected) {
-    return await inspectFileIdentity(async () => {
+function inspectStage(inspect, expected) {
+    return inspectFileIdentitySync(() => {
         const stat = inspect();
         assertRegularFile(stat);
         return stat;
@@ -67,12 +67,7 @@ function aggregateErrors(errors, message) {
 // Own the workspace before the producer can leave partial output. The finished
 // file still enters the ordinary sibling admission and publication lifecycle.
 async function writeIsolatedProducer(params) {
-    const tempPath = params.tempPath;
-    const write = params.write;
-    const writeReceiver = params.writeReceiver;
-    const parentGuard = params.parentGuard;
-    const assertParent = params.assertParent;
-    const syncTempFile = params.syncTempFile;
+    const { tempPath, write, writeReceiver, parentGuard, assertParent, syncTempFile } = params;
     assertParent();
     const targetRoot = rootFromDirectoryGuard(parentGuard);
     // Select the handoff before invoking the producer. Missing required native
@@ -150,7 +145,9 @@ export async function writeCallbackSibling(params) {
     const syncTempFile = params.syncTempFile;
     const syncParentDir = params.syncParentDir;
     const guard = await createAsyncDirectoryGuard(parent, { bigint: true });
-    const assertParent = () => assertAsyncDirectoryGuard(guard);
+    const assertParent = () => assertDirectoryIdentitySync(parent, {
+        dev: guard.stat.dev, ino: guard.stat.ino, realPath: guard.realPath,
+    });
     let handle;
     let identity;
     let unregister;
@@ -158,10 +155,10 @@ export async function writeCallbackSibling(params) {
     let renamed = false;
     let failure;
     const inspectPath = (pathname, expected) => inspectStage(() => fsSync.lstatSync(pathname, { bigint: true }), expected);
-    const assertCurrent = async (pathname) => {
-        await assertParent();
-        const opened = await inspectStage(() => fsSync.fstatSync(handle.fd, { bigint: true }), identity);
-        const current = await inspectPath(pathname, opened);
+    const assertCurrent = (pathname) => {
+        assertParent();
+        const opened = inspectStage(() => fsSync.fstatSync(handle.fd, { bigint: true }), identity);
+        const current = inspectPath(pathname, opened);
         if (maxBytes !== undefined &&
             (opened.size > maxBytes || current.size > maxBytes)) {
             throw new FsSafeError("too-large", `sibling temp exceeds maxBytes (${maxBytes})`);
@@ -176,11 +173,7 @@ export async function writeCallbackSibling(params) {
                 writeReceiver: params,
                 parentGuard: guard,
                 syncTempFile: syncTempFile,
-                assertParent: () => assertDirectoryIdentitySync(parent, {
-                    dev: guard.stat.dev,
-                    ino: guard.stat.ino,
-                    realPath: guard.realPath,
-                }),
+                assertParent,
             });
             result = isolated.result;
             cleanupWorkspace = isolated.cleanupWorkspace;
@@ -193,13 +186,10 @@ export async function writeCallbackSibling(params) {
         else {
             result = await Reflect.apply(write, params, [tempPath]);
         }
-        await assertParent();
-        if (handle) {
-            const opened = await inspectStage(() => fsSync.fstatSync(handle.fd, { bigint: true }), identity);
-            await inspectPath(tempPath, opened);
-        }
-        else {
-            const before = await inspectPath(tempPath);
+        assertParent();
+        let expected = identity;
+        if (!handle) {
+            expected = inspectPath(tempPath);
             try {
                 // No create/truncate flags; O_NONBLOCK also bounds a FIFO swap during open.
                 const access = syncTempFile ? fsSync.constants.O_RDWR : fsSync.constants.O_RDONLY;
@@ -211,12 +201,14 @@ export async function writeCallbackSibling(params) {
                 }
                 throw error;
             }
-            const opened = await inspectStage(() => fsSync.fstatSync(handle.fd, { bigint: true }), before);
-            await inspectPath(tempPath, opened);
+        }
+        const opened = inspectStage(() => fsSync.fstatSync(handle.fd, { bigint: true }), expected);
+        inspectPath(tempPath, opened);
+        if (!identity) {
             identity = opened;
             unregister = registerTempPathForExit(tempPath, { identity, singleLinkFile: true });
         }
-        await assertParent();
+        assertParent();
         if (cleanupWorkspace) {
             const cleanup = cleanupWorkspace;
             cleanupWorkspace = undefined;
@@ -233,7 +225,7 @@ export async function writeCallbackSibling(params) {
             throw new FsSafeError("invalid-path", "final path must differ from the sibling temp path");
         }
         await serializePathWrite(filePath, async () => {
-            await assertCurrent(tempPath);
+            assertCurrent(tempPath);
             if (mode !== undefined) {
                 try {
                     await handle.chmod(mode);
@@ -242,20 +234,21 @@ export async function writeCallbackSibling(params) {
                     if (!ignoreModeError)
                         throw error;
                 }
+                assertCurrent(tempPath);
             }
             if (syncTempFile) {
-                await assertCurrent(tempPath);
                 await syncFileBestEffort(handle);
+                assertCurrent(tempPath);
             }
-            await assertCurrent(tempPath);
             await fs.rename(tempPath, filePath);
             // A later verification failure never authorizes rollback of the final name.
             renamed = true;
             unregister();
-            await assertCurrent(filePath);
-            if (syncParentDir)
+            assertCurrent(filePath);
+            if (syncParentDir) {
                 await syncDirectoryBestEffort(parent);
-            await assertCurrent(filePath);
+                assertCurrent(filePath);
+            }
         });
         return { filePath, result };
     }
@@ -276,9 +269,9 @@ export async function writeCallbackSibling(params) {
         try {
             if (!renamed && identity) {
                 try {
-                    await assertParent();
-                    await inspectStage(() => fsSync.fstatSync(handle.fd, { bigint: true }), identity);
-                    await inspectPath(tempPath, identity);
+                    assertParent();
+                    inspectStage(() => fsSync.fstatSync(handle.fd, { bigint: true }), identity);
+                    inspectPath(tempPath, identity);
                     await fs.unlink(tempPath);
                     unregister?.();
                 }

package/dist/sibling-temp.d.ts

@@ -26,4 +26,3 @@ export declare function writeViaSiblingTempPath(params: {
     fallbackFileName?: string;
     tempPrefix?: string;
 }): Promise<void>;
-//# sourceMappingURL=sibling-temp.d.ts.map

package/dist/sidecar-lock-acquire.d.ts

@@ -1,5 +1,4 @@
 import type { SidecarLockAcquireOptions, SidecarLockHandle } from "./sidecar-lock-types.js";
-import { type SidecarLockAcquisitionContext } from "./sidecar-lock-admission.js";
+import type { SidecarLockAcquisitionContext } from "./sidecar-lock-admission.js";
 export type { HeldSidecarLock } from "./sidecar-lock-admission.js";
 export declare function acquireSidecarLock<TPayload extends Record<string, unknown>>(options: SidecarLockAcquireOptions<TPayload>, context: SidecarLockAcquisitionContext): Promise<SidecarLockHandle>;
-//# sourceMappingURL=sidecar-lock-acquire.d.ts.map

package/dist/sidecar-lock-acquire.js

@@ -5,12 +5,11 @@ import { fileObservation } from "./file-observation.js";
 import { readFileHandleBounded } from "./bounded-read.js";
 import { openSidecarRoot } from "./sidecar-lock-root.js";
 import { createNativeExclusiveFile } from "./native-operations.js";
-import { computeSidecarLockDelayMs, isTransientLockFileDenial, maxTransientLockDenials, validateSidecarLockStaleMs, validateSidecarLockRetryOptions, validateSidecarLockCompromiseCheckIntervalMs, validateSidecarLockTimeoutMs, } from "./sidecar-lock-policy.js";
+import { sidecarLockRetryDelay, sidecarLockTimeout, isTransientLockFileDenial, maxTransientLockDenials, validateSidecarLockStaleMs, validateSidecarLockRetryOptions, validateSidecarLockCompromiseCheckIntervalMs, validateSidecarLockTimeoutMs, } from "./sidecar-lock-policy.js";
 import { relativeSidecarLockPath, removeSidecarLockIfUnchanged, serializeSidecarLockPayload, sidecarReclaimGuardExists, } from "./sidecar-lock-reclaim.js";
 import { awaitSidecarAdmissionBoundary, conditionalSidecarLockParser, observeHeldSidecarParser, observeSidecarLockParser, runSidecarAdmissionBoundary, } from "./sidecar-lock-admission-parser.js";
 import { handleStaleSidecarAdmission, } from "./sidecar-lock-stale-admission.js";
 import { ancestryHasSidecarAdmission, captureSidecarAdmissionAncestry, createSidecarAdmissionController, } from "./sidecar-lock-admission-context.js";
-import { sidecarLockTimeout } from "./sidecar-lock-admission.js";
 import { resolveSidecarLockPaths } from "./sidecar-lock-target.js";
 import { createSuppressedError } from "./suppressed-error.js";
 import { sleep } from "./timing.js";
@@ -34,11 +33,25 @@ export async function acquireSidecarLock(options, context) {
     const requestedReentrantOwner = options.reentrantOwner;
     const { lockPath, normalizedTargetPath } = await resolveSidecarLockPaths(targetPath, explicitLockPath, lockRoot);
     const activeDescendant = ancestryHasSidecarAdmission(admissionAncestry, context.admissions, normalizedTargetPath);
-    let held = context.held.get(normalizedTargetPath);
-    if (held &&
+    const isReentrant = (candidate) => !!candidate &&
         requestedReentrantOwner !== undefined &&
-        held.reentrantOwner !== undefined &&
-        requestedReentrantOwner === held.reentrantOwner) {
+        candidate.reentrantOwner !== undefined &&
+        requestedReentrantOwner === candidate.reentrantOwner;
+    const reuseHeldLock = (candidate) => {
+        const lifecycle = context.ensureExitCleanupRegistered();
+        context.assertRetainOnExitSupported(retainOnExit);
+        if (context.held.get(normalizedTargetPath) !== candidate || candidate.releasePromise)
+            return undefined;
+        candidate.refCount = (candidate.refCount ?? 1) + 1;
+        // Any same-owner request upgrades exit retention; later requests never revoke it.
+        if (retainOnExit === true)
+            candidate.retainOnExit = true;
+        const returnedHandle = context.handleForHeldLock(normalizedTargetPath, candidate);
+        context.armExitCleanup(lifecycle);
+        return returnedHandle;
+    };
+    let held = context.held.get(normalizedTargetPath);
+    if (isReentrant(held)) {
         // Join a final release before deciding whether this completed owner remains.
         // Successful cleanup requires a fresh acquisition; failed cleanup can retry.
         if (held.releasePromise) {
@@ -47,23 +60,10 @@ export async function acquireSidecarLock(options, context) {
             await held.releasePromise.catch(() => undefined);
             held = context.held.get(normalizedTargetPath);
         }
-        if (held &&
-            requestedReentrantOwner !== undefined &&
-            held.reentrantOwner !== undefined &&
-            requestedReentrantOwner === held.reentrantOwner) {
-            const lifecycle = context.ensureExitCleanupRegistered();
-            context.assertRetainOnExitSupported(retainOnExit);
-            if (context.held.get(normalizedTargetPath) === held && !held.releasePromise) {
-                held.refCount = (held.refCount ?? 1) + 1;
-                // Retention is monotonic: any same-owner request to keep the sidecar on
-                // exit upgrades the held lock; a later default acquisition never revokes it.
-                if (retainOnExit === true) {
-                    held.retainOnExit = true;
-                }
-                const returnedHandle = context.handleForHeldLock(normalizedTargetPath, held);
-                context.armExitCleanup(lifecycle);
-                return returnedHandle;
-            }
+        if (isReentrant(held)) {
+            const reused = reuseHeldLock(held);
+            if (reused)
+                return reused;
         }
     }
     if (activeDescendant)
@@ -90,17 +90,9 @@ export async function acquireSidecarLock(options, context) {
     const withinDenialBudget = () => ++transientDenials <= maxTransientLockDenials;
     const waitForRetry = async () => {
         admission.release();
-        const elapsed = Date.now() - startedAt;
-        if ((timeoutMs !== undefined &&
-            timeoutMs !== Number.POSITIVE_INFINITY &&
-            elapsed >= timeoutMs) ||
-            (retry.retries !== undefined && attempt >= retry.retries)) {
+        const delay = sidecarLockRetryDelay(retry, timeoutMs === Number.POSITIVE_INFINITY ? undefined : timeoutMs, Date.now() - startedAt, attempt);
+        if (delay === undefined)
             throw sidecarLockTimeout(lockPath, normalizedTargetPath);
-        }
-        const remaining = timeoutMs === undefined || timeoutMs === Number.POSITIVE_INFINITY
-            ? Number.POSITIVE_INFINITY
-            : Math.max(0, timeoutMs - elapsed);
-        const delay = Math.min(computeSidecarLockDelayMs(retry, attempt), remaining);
         attempt += 1;
         await sleep(delay);
     };
@@ -123,29 +115,16 @@ export async function acquireSidecarLock(options, context) {
         while (true) {
             if (!admission.owns) {
                 held = context.held.get(normalizedTargetPath);
-                if (held &&
-                    requestedReentrantOwner !== undefined &&
-                    held.reentrantOwner !== undefined &&
-                    requestedReentrantOwner === held.reentrantOwner) {
+                if (isReentrant(held)) {
                     if (held.releasePromise) {
                         await held.releasePromise.catch(() => undefined);
                         held = context.held.get(normalizedTargetPath);
                     }
-                    if (held &&
-                        requestedReentrantOwner !== undefined &&
-                        held.reentrantOwner !== undefined &&
-                        requestedReentrantOwner === held.reentrantOwner) {
-                        const lifecycle = context.ensureExitCleanupRegistered();
-                        context.assertRetainOnExitSupported(retainOnExit);
-                        if (context.held.get(normalizedTargetPath) !== held || held.releasePromise) {
-                            continue;
-                        }
-                        held.refCount = (held.refCount ?? 1) + 1;
-                        if (retainOnExit === true)
-                            held.retainOnExit = true;
-                        const returnedHandle = context.handleForHeldLock(normalizedTargetPath, held);
-                        context.armExitCleanup(lifecycle);
-                        return returnedHandle;
+                    if (isReentrant(held)) {
+                        const reused = reuseHeldLock(held);
+                        if (reused)
+                            return reused;
+                        continue;
                     }
                 }
                 if (context.admissions.has(normalizedTargetPath)) {

package/dist/sidecar-lock-admission-context.d.ts

@@ -16,4 +16,3 @@ export declare function createSidecarAdmissionController(ancestry: SidecarAdmiss
     run<T>(callback: () => T): T;
 };
 export {};
-//# sourceMappingURL=sidecar-lock-admission-context.d.ts.map

package/dist/sidecar-lock-admission-parser.d.ts

@@ -40,4 +40,3 @@ export declare function observeHeldSidecarParser(params: {
     isTransientDenial(error: unknown): boolean;
 }): Promise<HeldSidecarParserObservation>;
 export {};
-//# sourceMappingURL=sidecar-lock-admission-parser.d.ts.map

package/dist/sidecar-lock-admission.d.ts

@@ -2,11 +2,10 @@ import type { NativeFileHandle } from "./native-operations.js";
 import type { Root } from "./root-impl.js";
 import type { SidecarLockSnapshot } from "./sidecar-lock-reclaim.js";
 import type { SidecarLockHandle } from "./sidecar-lock-types.js";
-type SidecarFileHandle = Pick<NativeFileHandle, "fd" | "close" | "stat" | "writeFile">;
 export type HeldSidecarLock = {
     refCount: number;
     reentrantOwner?: string;
-    handle: SidecarFileHandle;
+    handle: NativeFileHandle;
     lockPath: string;
     snapshot: SidecarLockSnapshot;
     acquiredAt: number;
@@ -30,6 +29,3 @@ export type SidecarLockAcquisitionContext = {
     assertRetainOnExitSupported(retainOnExit: boolean | undefined): void;
     handleForHeldLock(normalizedTargetPath: string, held: HeldSidecarLock): SidecarLockHandle;
 };
-export declare function sidecarLockTimeout(lockPath: string, normalizedTargetPath: string): Error;
-export {};
-//# sourceMappingURL=sidecar-lock-admission.d.ts.map

package/dist/sidecar-lock-admission.js

@@ -1,7 +1 @@
-export function sidecarLockTimeout(lockPath, normalizedTargetPath) {
-    return Object.assign(new Error(`file lock timeout for ${normalizedTargetPath}`), {
-        code: "file_lock_timeout",
-        lockPath,
-        normalizedTargetPath,
-    });
-}
+export {};

package/dist/sidecar-lock-handle.d.ts

@@ -24,4 +24,3 @@ export declare function createHeldSidecarLockHandle(params: {
         retry?: boolean;
     }) => Promise<unknown>;
 }): SidecarLockHandle;
-//# sourceMappingURL=sidecar-lock-handle.d.ts.map

package/dist/sidecar-lock-policy.d.ts

@@ -4,6 +4,9 @@ export declare function validateSidecarLockTimeoutMs(timeoutMs: number | undefin
 export declare function validateSidecarLockStaleMs(staleMs: number | undefined): void;
 export declare function validateSidecarLockCompromiseCheckIntervalMs(intervalMs: number | undefined): void;
 export declare function computeSidecarLockDelayMs(retry: SidecarLockRetryOptions, attempt: number): number;
+export declare function sidecarLockTimeout(lockPath: string, normalizedTargetPath: string): Error;
+/** Undefined means the deadline or retry count is exhausted. */
+export declare function sidecarLockRetryDelay(retry: SidecarLockRetryOptions, timeoutMs: number | undefined, elapsed: number, attempt: number): number | undefined;
 export declare const maxTransientLockDenials = 8;
 export declare function isTransientLockFileDenial(error: unknown, lockPath: string): boolean;
 export declare function sidecarLockPayloadCreatedAtMs(payload: unknown): number | null;
@@ -13,4 +16,3 @@ export declare function defaultSidecarLockShouldReclaim(params: {
     staleMs: number;
     nowMs: number;
 }): Promise<boolean>;
-//# sourceMappingURL=sidecar-lock-policy.d.ts.map

package/dist/sidecar-lock-policy.js

@@ -55,6 +55,22 @@ export function computeSidecarLockDelayMs(retry, attempt) {
     const jitter = retry.randomize ? 1 + Math.random() : 1;
     return Math.min(maxTimeout, Math.round(base * jitter));
 }
+export function sidecarLockTimeout(lockPath, normalizedTargetPath) {
+    return Object.assign(new Error(`file lock timeout for ${normalizedTargetPath}`), {
+        code: "file_lock_timeout",
+        lockPath,
+        normalizedTargetPath,
+    });
+}
+/** Undefined means the deadline or retry count is exhausted. */
+export function sidecarLockRetryDelay(retry, timeoutMs, elapsed, attempt) {
+    if ((timeoutMs !== undefined && elapsed >= timeoutMs) ||
+        (retry.retries !== undefined && attempt >= retry.retries))
+        return undefined;
+    const remaining = timeoutMs === undefined || timeoutMs === Number.POSITIVE_INFINITY
+        ? Number.POSITIVE_INFINITY : Math.max(0, timeoutMs - elapsed);
+    return Math.min(computeSidecarLockDelayMs(retry, attempt), remaining);
+}
 // Windows denies access to a lock file while a just-unlinked directory entry
 // is still being torn down, so a contended acquire sees EPERM on a name that is
 // already gone -- both when creating it exclusively and when reading the

package/dist/sidecar-lock-reclaim.d.ts

@@ -65,4 +65,3 @@ export declare function removeStaleSidecarLockIfAllowed(params: {
     assertGuardHeld?: () => Promise<void>;
 }): Promise<"removed" | "changed" | "not-approved">;
 export {};
-//# sourceMappingURL=sidecar-lock-reclaim.d.ts.map

package/dist/sidecar-lock-registration.d.ts

@@ -0,0 +1,13 @@
+type CleanupRegistration = {
+    event: "exit" | "beforeExit";
+    registered: symbol;
+    registering: symbol;
+    handler: symbol;
+    retainAware?: symbol;
+    reentryError(): Error;
+};
+/** Preserve the legacy, first-registration-wins protocol across package copies. */
+export declare function ensureSidecarLockCleanupRegistered<T extends true | {
+    armed: boolean;
+}>(keys: CleanupRegistration, cleanup: () => void, marker: T): T;
+export {};