@openclaw/fs-safe 0.5.0 → 0.5.2

package/dist/file-lock-sync.js

@@ -2,8 +2,11 @@ import fs from "node:fs";
 import path from "node:path";
 import { FsSafeError } from "./errors.js";
 import { readSidecarLockSnapshotSync, relativeSidecarLockPath, removeSidecarLockIfUnchangedSync, serializeSidecarLockPayload, sidecarLockSnapshotMatches, } from "./sidecar-lock-reclaim.js";
-import { computeSidecarLockDelayMs, sidecarLockPayloadIsStale, } from "./sidecar-lock-policy.js";
+import { computeSidecarLockDelayMs, sidecarLockPayloadCreatedAtMs, } from "./sidecar-lock-policy.js";
+import { sleepSync } from "./timing.js";
 const SYNC_HELD_LOCKS_KEY = Symbol.for("fsSafe.syncSidecarLocks");
+const SYNC_CLEANUP_REGISTERED_KEY = Symbol.for("fsSafe.syncSidecarLockCleanupRegistered");
+const SYNC_CLEANUP_HANDLER_KEY = Symbol.for("fsSafe.syncSidecarLockCleanupHandler");
 function getSyncHeldLocks() {
     const globalWithState = globalThis;
     if (!globalWithState[SYNC_HELD_LOCKS_KEY]) {
@@ -11,6 +14,36 @@ function getSyncHeldLocks() {
     }
     return globalWithState[SYNC_HELD_LOCKS_KEY];
 }
+function releaseAllSyncHeldLocks() {
+    const heldLocks = getSyncHeldLocks();
+    for (const [normalizedTargetPath, held] of heldLocks) {
+        if (held.timer) {
+            clearInterval(held.timer);
+            held.timer = undefined;
+        }
+        try {
+            fs.closeSync(held.fd);
+        }
+        catch {
+            // Best-effort process-exit cleanup.
+        }
+        try {
+            removeSidecarLockIfUnchangedSync(held.lockPath, held.snapshot);
+        }
+        catch {
+            // A surviving sidecar fails closed and can be reclaimed by policy.
+        }
+        heldLocks.delete(normalizedTargetPath);
+    }
+}
+function ensureSyncExitCleanupRegistered() {
+    const globalWithCleanup = globalThis;
+    if (globalWithCleanup[SYNC_CLEANUP_REGISTERED_KEY])
+        return;
+    globalWithCleanup[SYNC_CLEANUP_REGISTERED_KEY] = true;
+    globalWithCleanup[SYNC_CLEANUP_HANDLER_KEY] = releaseAllSyncHeldLocks;
+    process.on("exit", releaseAllSyncHeldLocks);
+}
 function verifySyncHeldLock(held) {
     const current = readSidecarLockSnapshotSync(held.lockPath, held.parsePayload);
     return !!current && sidecarLockSnapshotMatches(current, held.snapshot);
@@ -71,8 +104,9 @@ function boundedLockPath(lockPath, lockRoot) {
     return path.join(parentReal, path.basename(resolved));
 }
 function defaultShouldReclaim(payload, lockPath, staleMs, nowMs) {
-    if (sidecarLockPayloadIsStale(payload, staleMs, nowMs))
-        return true;
+    const createdAtMs = sidecarLockPayloadCreatedAtMs(payload);
+    if (createdAtMs !== null)
+        return nowMs - createdAtMs > staleMs;
     try {
         return nowMs - fs.statSync(lockPath).mtimeMs > staleMs;
     }
@@ -80,8 +114,16 @@ function defaultShouldReclaim(payload, lockPath, staleMs, nowMs) {
         return true;
     }
 }
-function sleep(milliseconds) {
-    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, milliseconds);
+function reclaimGuardExists(reclaimGuardPath) {
+    try {
+        fs.lstatSync(reclaimGuardPath);
+        return true;
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return false;
+        throw error;
+    }
 }
 export function acquireFileLockSync(targetPath, options) {
     const normalizedTargetPath = normalizeTargetPath(targetPath);
@@ -99,7 +141,25 @@ export function acquireFileLockSync(targetPath, options) {
     const retry = options.retry ?? {};
     const startedAt = Date.now();
     let attempt = 0;
+    const reclaimGuardPath = `${lockPath}.reclaim`;
+    const waitForRetry = () => {
+        const elapsed = Date.now() - startedAt;
+        const timedOut = options.timeoutMs !== undefined && elapsed >= options.timeoutMs;
+        if (timedOut || (retry.retries !== undefined && attempt >= retry.retries)) {
+            throw Object.assign(new Error(`file lock timeout for ${normalizedTargetPath}`), {
+                code: "file_lock_timeout",
+                lockPath,
+                normalizedTargetPath,
+            });
+        }
+        sleepSync(computeSidecarLockDelayMs(retry, attempt));
+        attempt += 1;
+    };
     while (true) {
+        if (reclaimGuardExists(reclaimGuardPath)) {
+            waitForRetry();
+            continue;
+        }
         let fd;
         try {
             const payload = options.payload();
@@ -126,6 +186,7 @@ export function acquireFileLockSync(targetPath, options) {
                 snapshot,
             };
             heldLocks.set(normalizedTargetPath, createdHeld);
+            ensureSyncExitCleanupRegistered();
             const returnedHandle = createSyncHeldLockHandle(createdHeld);
             if (options.onCompromised && (options.compromiseCheckIntervalMs ?? 0) > 0) {
                 createdHeld.timer = setInterval(() => {
@@ -151,20 +212,12 @@ export function acquireFileLockSync(targetPath, options) {
             if (error.code !== "EEXIST")
                 throw error;
             if (heldLocks.has(normalizedTargetPath)) {
-                const elapsed = Date.now() - startedAt;
-                const timedOut = options.timeoutMs !== undefined && elapsed >= options.timeoutMs;
-                if (timedOut || (retry.retries !== undefined && attempt >= retry.retries)) {
-                    throw Object.assign(new Error(`file lock timeout for ${normalizedTargetPath}`), {
-                        code: "file_lock_timeout",
-                        lockPath,
-                        normalizedTargetPath,
-                    });
-                }
-                sleep(computeSidecarLockDelayMs(retry, attempt));
-                attempt += 1;
+                waitForRetry();
                 continue;
             }
-            const snapshot = readSidecarLockSnapshotSync(lockPath, options.parsePayload);
+            const snapshot = readSidecarLockSnapshotSync(lockPath, options.parsePayload, {
+                rejectNonFile: true,
+            });
             if (!snapshot)
                 continue;
             const nowMs = Date.now();
@@ -187,18 +240,28 @@ export function acquireFileLockSync(targetPath, options) {
                         raw: snapshot.raw,
                         payload: snapshot.payload,
                     })) {
-                    const reclaimGuard = `${lockPath}.reclaim`;
+                    let ownsReclaimGuard = false;
                     try {
-                        fs.mkdirSync(reclaimGuard);
+                        fs.mkdirSync(reclaimGuardPath);
+                        ownsReclaimGuard = true;
                         if (removeSidecarLockIfUnchangedSync(lockPath, snapshot))
                             continue;
                     }
-                    finally {
-                        try {
-                            fs.rmdirSync(reclaimGuard);
+                    catch (reclaimError) {
+                        if (reclaimError.code !== "EEXIST") {
+                            throw reclaimError;
                         }
-                        catch {
-                            // A surviving reclaim guard fails closed.
+                        waitForRetry();
+                        continue;
+                    }
+                    finally {
+                        if (ownsReclaimGuard) {
+                            try {
+                                fs.rmdirSync(reclaimGuardPath);
+                            }
+                            catch {
+                                // A surviving reclaim guard fails closed.
+                            }
                         }
                     }
                 }
@@ -208,17 +271,7 @@ export function acquireFileLockSync(targetPath, options) {
                     normalizedTargetPath,
                 });
             }
-            const elapsed = Date.now() - startedAt;
-            const timedOut = options.timeoutMs !== undefined && elapsed >= options.timeoutMs;
-            if (timedOut || (retry.retries !== undefined && attempt >= retry.retries)) {
-                throw Object.assign(new Error(`file lock timeout for ${normalizedTargetPath}`), {
-                    code: "file_lock_timeout",
-                    lockPath,
-                    normalizedTargetPath,
-                });
-            }
-            sleep(computeSidecarLockDelayMs(retry, attempt));
-            attempt += 1;
+            waitForRetry();
         }
     }
 }

package/dist/file-store-boundary.d.ts

@@ -22,4 +22,10 @@ export declare function ensureParentSync(params: {
     filePath: string;
     mode: number;
 }): SyncParentGuard;
+export declare function ensureStoreDirectorySync(params: {
+    rootDir: string;
+    targetDir: string;
+    mode: number;
+    messagePrefix: "private store" | "store";
+}): SyncParentGuard;
 //# sourceMappingURL=file-store-boundary.d.ts.map

package/dist/file-store-boundary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-store-boundary.d.ts","sourceRoot":"","sources":["../src/file-store-boundary.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAA4C,KAAK,IAAI,EAAE,MAAM,WAAW,CAAC;AAGhF,MAAM,MAAM,eAAe,GAAG,kBAAkB,CAAC;AAOjD,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,IAAI,EAChB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhB;AA+CD,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IACpD,MAAM,EAAE,QAAQ,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAuC1D;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAWrE;AAUD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,eAAe,CAwClB"}
+{"version":3,"file":"file-store-boundary.d.ts","sourceRoot":"","sources":["../src/file-store-boundary.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAA4C,KAAK,IAAI,EAAE,MAAM,WAAW,CAAC;AAGhF,MAAM,MAAM,eAAe,GAAG,kBAAkB,CAAC;AAOjD,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,IAAI,EAChB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhB;AA+CD,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IACpD,MAAM,EAAE,QAAQ,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAuC1D;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAWrE;AAUD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,eAAe,CAOlB;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,eAAe,GAAG,OAAO,CAAC;CAC1C,GAAG,eAAe,CAyDlB"}

package/dist/file-store-boundary.js

@@ -5,6 +5,7 @@ import { Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { assertSyncDirectoryGuard as assertDirectoryGuardSync, createSyncDirectoryGuard, } from "./directory-guard.js";
 import { FsSafeError } from "./errors.js";
+import { sameFileIdentity } from "./file-identity.js";
 import { isPathInside, isPathRelativeEscape } from "./path.js";
 import { resolveOpenedFileRealPathForHandle, root } from "./root.js";
 import { resolveSecureTempRoot } from "./secure-temp-dir.js";
@@ -128,8 +129,16 @@ function chmodDirectorySyncBestEffort(dir, mode) {
     }
 }
 export function ensureParentSync(params) {
+    return ensureStoreDirectorySync({
+        rootDir: params.rootDir,
+        targetDir: path.dirname(path.resolve(params.filePath)),
+        mode: params.mode,
+        messagePrefix: "store",
+    });
+}
+export function ensureStoreDirectorySync(params) {
     const rootDir = path.resolve(params.rootDir);
-    const dir = path.dirname(path.resolve(params.filePath));
+    const dir = path.resolve(params.targetDir);
     const relative = path.relative(rootDir, dir);
     if (isPathRelativeEscape(relative)) {
         throw new FsSafeError("outside-workspace", "file path escapes store root");
@@ -137,7 +146,7 @@ export function ensureParentSync(params) {
     syncFs.mkdirSync(rootDir, { recursive: true, mode: params.mode });
     const rootStat = syncFs.lstatSync(rootDir);
     if (rootStat.isSymbolicLink() || !rootStat.isDirectory()) {
-        throw new FsSafeError("not-file", `store root must be a directory: ${rootDir}`);
+        throw new FsSafeError("not-file", `${params.messagePrefix} root must be a directory: ${rootDir}`);
     }
     const rootReal = syncFs.realpathSync(rootDir);
     chmodDirectorySyncBestEffort(rootDir, params.mode);
@@ -147,7 +156,7 @@ export function ensureParentSync(params) {
         try {
             const stat = syncFs.lstatSync(current);
             if (stat.isSymbolicLink() || !stat.isDirectory()) {
-                throw new FsSafeError("not-file", `store directory component must be a directory: ${current}`);
+                throw new FsSafeError("not-file", `${params.messagePrefix} directory component must be a directory: ${current}`);
             }
         }
         catch (error) {
@@ -156,9 +165,15 @@ export function ensureParentSync(params) {
             }
             syncFs.mkdirSync(current, { mode: params.mode });
         }
+        const currentRootStat = syncFs.lstatSync(rootDir);
+        const currentRootReal = syncFs.realpathSync(rootDir);
         const currentReal = syncFs.realpathSync(current);
-        if (!isPathInside(rootReal, currentReal)) {
-            throw new FsSafeError("outside-workspace", "store directory escapes root");
+        if (currentRootStat.isSymbolicLink() ||
+            !currentRootStat.isDirectory() ||
+            !sameFileIdentity(rootStat, currentRootStat) ||
+            currentRootReal !== rootReal ||
+            !isPathInside(rootReal, currentReal)) {
+            throw new FsSafeError("outside-workspace", `${params.messagePrefix} directory escapes root`);
         }
         chmodDirectorySyncBestEffort(current, params.mode);
     }

package/dist/file-store-sync-write.d.ts

@@ -0,0 +1,9 @@
+export declare function writeFileSyncAtomic(params: {
+    rootDir: string;
+    filePath: string;
+    content: string | Uint8Array;
+    privateMode: boolean;
+    dirMode: number;
+    mode: number;
+}): string;
+//# sourceMappingURL=file-store-sync-write.d.ts.map

package/dist/file-store-sync-write.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-store-sync-write.d.ts","sourceRoot":"","sources":["../src/file-store-sync-write.ts"],"names":[],"mappings":"AAuBA,wBAAgB,mBAAmB,CAAC,MAAM,EAAE;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,MAAM,CA+ET"}

package/dist/file-store-sync-write.js

@@ -0,0 +1,97 @@
+import { randomUUID } from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import { FsSafeError } from "./errors.js";
+import { sameFileIdentity } from "./file-identity.js";
+import { assertSyncDirectoryGuard, ensureParentSync, ensureStoreDirectorySync, } from "./file-store-boundary.js";
+import { isPathInside } from "./path.js";
+import { getFsSafeTestHooks } from "./test-hooks.js";
+function ensurePrivateDirectorySync(rootDir, targetDir, mode) {
+    return ensureStoreDirectorySync({
+        rootDir,
+        targetDir,
+        mode,
+        messagePrefix: "private store",
+    });
+}
+export function writeFileSyncAtomic(params) {
+    const filePath = path.resolve(params.filePath);
+    if (!isPathInside(params.rootDir, filePath)) {
+        throw new FsSafeError("outside-workspace", "file path escapes store root");
+    }
+    let parentGuard;
+    if (params.privateMode) {
+        parentGuard = ensurePrivateDirectorySync(params.rootDir, path.dirname(filePath), params.dirMode);
+        try {
+            const stat = fs.lstatSync(filePath);
+            if (stat.isSymbolicLink() || !stat.isFile()) {
+                throw new FsSafeError("not-file", `private store target must be a regular file: ${filePath}`);
+            }
+        }
+        catch (error) {
+            if (error.code !== "ENOENT") {
+                throw error;
+            }
+        }
+    }
+    else {
+        parentGuard = ensureParentSync({
+            rootDir: params.rootDir,
+            filePath,
+            mode: params.dirMode,
+        });
+    }
+    const tempPath = path.join(parentGuard?.dir ?? path.dirname(filePath), `.fs-safe-${process.pid}-${randomUUID()}.tmp`);
+    let tempExists = false;
+    try {
+        getFsSafeTestHooks()?.beforeFileStoreSyncPrivateWrite?.(filePath);
+        if (parentGuard) {
+            assertSyncDirectoryGuard(parentGuard);
+        }
+        fs.writeFileSync(tempPath, params.content, { flag: "wx", mode: params.mode });
+        tempExists = true;
+        try {
+            fs.chmodSync(tempPath, params.mode);
+        }
+        catch {
+            // Best-effort on platforms that do not enforce POSIX modes.
+        }
+        const tempStat = fs.lstatSync(tempPath);
+        if (parentGuard) {
+            assertSyncDirectoryGuard(parentGuard);
+        }
+        fs.renameSync(tempPath, filePath);
+        tempExists = false;
+        if (parentGuard) {
+            assertSyncDirectoryGuard(parentGuard);
+        }
+        try {
+            const publishedStat = fs.lstatSync(filePath);
+            if (publishedStat.isSymbolicLink() ||
+                !publishedStat.isFile() ||
+                publishedStat.nlink > 1 ||
+                !sameFileIdentity(tempStat, publishedStat)) {
+                throw new FsSafeError("path-mismatch", "store target changed after write");
+            }
+        }
+        catch (error) {
+            if (error instanceof FsSafeError) {
+                throw error;
+            }
+            throw new FsSafeError("path-mismatch", "store target changed after write", {
+                cause: error instanceof Error ? error : undefined,
+            });
+        }
+        return filePath;
+    }
+    finally {
+        if (tempExists) {
+            try {
+                fs.unlinkSync(tempPath);
+            }
+            catch {
+                // Best-effort cleanup after write failure.
+            }
+        }
+    }
+}

package/dist/file-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-store.d.ts","sourceRoot":"","sources":["../src/file-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file-store.d.ts","sourceRoot":"","sources":["../src/file-store.ts"],"names":[],"mappings":"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"}

package/dist/file-store.js

@@ -1,36 +1,30 @@
-import { randomUUID } from "node:crypto";
 import syncFs from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { readFileDescriptorBoundedSync } from "./bounded-read.js";
-import { createSyncDirectoryGuard } from "./directory-guard.js";
 import { FsSafeError } from "./errors.js";
-import { pruneExpiredStoreEntries, } from "./file-store-prune.js";
-import { assertSyncDirectoryGuard, ensureParentInRoot, ensureParentSync, openWritableStoreRoot, writeStreamToTempSource, } from "./file-store-boundary.js";
-import { readFileStoreCopySource } from "./file-store-source.js";
+import { pruneExpiredStoreEntries } from "./file-store-prune.js";
+import { ensureParentInRoot, openWritableStoreRoot, writeStreamToTempSource, } from "./file-store-boundary.js";
+import { writeFileSyncAtomic } from "./file-store-sync-write.js";
 import { createJsonStore } from "./json-document-store.js";
 import { stringifyJsonDocument } from "./json-stringify.js";
-import { isPathInside, resolveSafeRelativePath } from "./path.js";
+import { resolveSafeRelativePath } from "./path.js";
 import { root } from "./root.js";
 import { DEFAULT_ROOT_MAX_BYTES } from "./root-impl.js";
+import { readRegularFile } from "./regular-file.js";
 import { matchRootFileOpenFailure, openRootFileSync } from "./root-file.js";
+import { assertNoDriveRelativePathSegments } from "./safe-path-segment.js";
 import { writeSecretFileAtomic } from "./secret-file.js";
-import { getFsSafeTestHooks } from "./test-hooks.js";
 function assertRelativePath(relativePath) {
     const raw = relativePath.trim();
-    if (!raw) {
-        throw new FsSafeError("invalid-path", "relative path must be non-empty");
+    if (!raw || raw !== relativePath) {
+        throw new FsSafeError("invalid-path", "store key must be non-empty and unpadded");
     }
-    return raw.replaceAll("\\", "/");
+    return assertNoDriveRelativePathSegments(raw.replaceAll("\\", "/"), "store key");
 }
 function resolveStorePath(rootDir, relativePath) {
     return resolveSafeRelativePath(rootDir, assertRelativePath(relativePath));
 }
-function assertStoreFilePath(rootDir, filePath) {
-    if (!isPathInside(rootDir, filePath)) {
-        throw new FsSafeError("outside-workspace", "file path escapes store root");
-    }
-}
 function assertMaxBytes(size, maxBytes) {
     if (maxBytes !== undefined && size > maxBytes) {
         throw new FsSafeError("too-large", `file exceeds maximum size of ${maxBytes} bytes`);
@@ -69,6 +63,33 @@ function handleSyncStoreReadOpenFailure(opened) {
         },
     });
 }
+async function readFileStoreCopySource(params) {
+    const sourceStat = await fs.lstat(params.sourcePath);
+    if (sourceStat.isSymbolicLink() || !sourceStat.isFile()) {
+        throw new FsSafeError("not-file", "source path is not a file");
+    }
+    if (params.maxBytes !== undefined && sourceStat.size > params.maxBytes) {
+        throw new FsSafeError("too-large", `file exceeds maximum size of ${params.maxBytes} bytes`);
+    }
+    try {
+        return (await readRegularFile({ filePath: params.sourcePath, maxBytes: params.maxBytes }))
+            .buffer;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (message.includes("regular file") || message.includes("not a regular file")) {
+            throw new FsSafeError("not-file", "source path is not a file", {
+                cause: error instanceof Error ? error : undefined,
+            });
+        }
+        if (params.maxBytes !== undefined && message.includes(`exceeds ${params.maxBytes} bytes`)) {
+            throw new FsSafeError("too-large", `file exceeds maximum size of ${params.maxBytes} bytes`, {
+                cause: error instanceof Error ? error : undefined,
+            });
+        }
+        throw error;
+    }
+}
 async function copyIntoRoot(params) {
     const relativePath = assertRelativePath(params.relativePath);
     const destination = resolveStorePath(params.rootDir, relativePath);
@@ -264,119 +285,6 @@ export function fileStore(options) {
         },
     };
 }
-function ensurePrivateDirectorySync(rootDir, targetDir, mode) {
-    const root = path.resolve(rootDir);
-    const target = path.resolve(targetDir);
-    assertStoreFilePath(root, target);
-    let current = root;
-    syncFs.mkdirSync(current, { recursive: true, mode });
-    const rootStat = syncFs.lstatSync(current);
-    if (rootStat.isSymbolicLink() || !rootStat.isDirectory()) {
-        throw new FsSafeError("not-file", `private store root must be a directory: ${current}`);
-    }
-    try {
-        syncFs.chmodSync(current, mode);
-    }
-    catch {
-        // Best-effort on platforms that do not enforce POSIX modes.
-    }
-    for (const segment of path.relative(root, target).split(path.sep).filter(Boolean)) {
-        current = path.join(current, segment);
-        try {
-            const stat = syncFs.lstatSync(current);
-            if (stat.isSymbolicLink() || !stat.isDirectory()) {
-                throw new FsSafeError("not-file", `private store directory component must be a directory: ${current}`);
-            }
-        }
-        catch (error) {
-            if (error.code !== "ENOENT") {
-                throw error;
-            }
-            syncFs.mkdirSync(current, { mode });
-        }
-        const rootReal = syncFs.realpathSync(root);
-        const currentReal = syncFs.realpathSync(current);
-        if (!isPathInside(rootReal, currentReal)) {
-            throw new FsSafeError("outside-workspace", "private store directory escapes root");
-        }
-        try {
-            syncFs.chmodSync(current, mode);
-        }
-        catch {
-            // Best-effort on platforms that do not enforce POSIX modes.
-        }
-    }
-    const guard = createSyncDirectoryGuard(target);
-    assertSyncDirectoryGuard(guard);
-    return guard;
-}
-function writeFileSyncAtomic(params) {
-    const filePath = path.resolve(params.filePath);
-    assertStoreFilePath(params.rootDir, filePath);
-    let parentGuard;
-    if (params.privateMode) {
-        parentGuard = ensurePrivateDirectorySync(params.rootDir, path.dirname(filePath), params.dirMode);
-        try {
-            const stat = syncFs.lstatSync(filePath);
-            if (stat.isSymbolicLink() || !stat.isFile()) {
-                throw new FsSafeError("not-file", `private store target must be a regular file: ${filePath}`);
-            }
-        }
-        catch (error) {
-            if (error.code !== "ENOENT") {
-                throw error;
-            }
-        }
-    }
-    else {
-        parentGuard = ensureParentSync({
-            rootDir: params.rootDir,
-            filePath,
-            mode: params.dirMode,
-        });
-    }
-    const tempPath = path.join(parentGuard?.dir ?? path.dirname(filePath), `.fs-safe-${process.pid}-${randomUUID()}.tmp`);
-    let tempExists = false;
-    try {
-        getFsSafeTestHooks()?.beforeFileStoreSyncPrivateWrite?.(filePath);
-        if (parentGuard) {
-            assertSyncDirectoryGuard(parentGuard);
-        }
-        syncFs.writeFileSync(tempPath, params.content, { flag: "wx", mode: params.mode });
-        tempExists = true;
-        try {
-            syncFs.chmodSync(tempPath, params.mode);
-        }
-        catch {
-            // Best-effort on platforms that do not enforce POSIX modes.
-        }
-        if (parentGuard) {
-            assertSyncDirectoryGuard(parentGuard);
-        }
-        syncFs.renameSync(tempPath, filePath);
-        tempExists = false;
-        if (parentGuard) {
-            assertSyncDirectoryGuard(parentGuard);
-        }
-        try {
-            syncFs.chmodSync(filePath, params.mode);
-        }
-        catch {
-            // Best-effort on platforms that do not enforce POSIX modes.
-        }
-        return filePath;
-    }
-    finally {
-        if (tempExists) {
-            try {
-                syncFs.unlinkSync(tempPath);
-            }
-            catch {
-                // Best-effort cleanup after write failure.
-            }
-        }
-    }
-}
 export function fileStoreSync(options) {
     const rootDir = path.resolve(options.rootDir);
     const privateMode = options.private ?? false;

package/dist/filename.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filename.d.ts","sourceRoot":"","sources":["../src/filename.ts"],"names":[],"mappings":"AAIA,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CA2BxF"}
+{"version":3,"file":"filename.d.ts","sourceRoot":"","sources":["../src/filename.ts"],"names":[],"mappings":"AA4BA,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAgCxF"}

package/dist/filename.js

@@ -1,5 +1,27 @@
 import path from "node:path";
+import { WINDOWS_RESERVED_DEVICE_NAMES } from "./device-path.js";
 const WINDOWS_INVALID_FILE_NAME_CHARACTERS = new Set('<>:"/\\|?*');
+function trimWindowsIgnoredSuffix(value) {
+    let end = value.length;
+    while (end > 0) {
+        const character = value.charCodeAt(end - 1);
+        if (character !== 0x20 && character !== 0x2e) {
+            break;
+        }
+        end -= 1;
+    }
+    return end === value.length ? value : value.slice(0, end);
+}
+function suffixWindowsReservedDeviceName(fileName) {
+    const extensionIndex = fileName.indexOf(".");
+    const baseNameEnd = extensionIndex < 0 ? fileName.length : extensionIndex;
+    const baseName = fileName.slice(0, baseNameEnd);
+    const deviceBaseName = trimWindowsIgnoredSuffix(baseName);
+    if (!WINDOWS_RESERVED_DEVICE_NAMES.has(deviceBaseName.toUpperCase())) {
+        return fileName;
+    }
+    return `${baseName}_${fileName.slice(baseNameEnd)}`;
+}
 export function sanitizeUntrustedFileName(fileName, fallbackName) {
     const trimmed = typeof fileName === "string" ? fileName.trim() : "";
     if (!trimmed) {
@@ -21,8 +43,13 @@ export function sanitizeUntrustedFileName(fileName, fallbackName) {
     if (!base || base === "." || base === "..") {
         return fallbackName;
     }
+    base = suffixWindowsReservedDeviceName(base);
     if (base.length > 200) {
         base = base.slice(0, 200);
+        const trailingCodeUnit = base.charCodeAt(base.length - 1);
+        if (trailingCodeUnit >= 0xd800 && trailingCodeUnit <= 0xdbff) {
+            base = base.slice(0, -1);
+        }
     }
     return base;
 }

package/dist/guarded-mkdir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"guarded-mkdir.d.ts","sourceRoot":"","sources":["../src/guarded-mkdir.ts"],"names":[],"mappings":"AA0BA;;;;;GAKG;AACH,wBAAsB,6BAA6B,CAAC,MAAM,EAAE;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CACnE,GAAG,OAAO,CAAC,MAAM,CAAC,CAuDlB"}
+{"version":3,"file":"guarded-mkdir.d.ts","sourceRoot":"","sources":["../src/guarded-mkdir.ts"],"names":[],"mappings":"AAyBA;;;;;GAKG;AACH,wBAAsB,6BAA6B,CAAC,MAAM,EAAE;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CACnE,GAAG,OAAO,CAAC,MAAM,CAAC,CAuDlB"}