@openclaw/openshell-sandbox 2026.9.4 → 2026.9.6

package/node_modules/@openclaw/fs-safe/dist/temp-workspace-owner.js

@@ -2,12 +2,11 @@ import { randomUUID } from "node:crypto";
 import fsSync from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { createAsyncDirectoryGuard, createSyncDirectoryGuard } from "./directory-guard.js";
 import { FsSafeError } from "./errors.js";
+import { assertNoWindowsPathAlias, resolvePathPreservingWindowsRoot } from "./windows-path-alias.js";
 import { sameFileIdentityForCleanup } from "./file-identity.js";
-import { withAsyncDirectoryGuards, withSyncDirectoryGuards } from "./guarded-mutation.js";
 import { getNativeBinding } from "./native.js";
-import { assertStagedDirectoryCurrent, openStagedDirectory } from "./staged-directory.js";
+import { openTempWorkspaceCleanupParent, TempWorkspaceRetainedChild, } from "./temp-workspace-descriptor.js";
 import { getFsSafeTestHooks } from "./test-hooks.js";
 function isNativeCleanupBinding(binding) {
     return typeof binding?.renameNoReplace === "function" &&
@@ -25,9 +24,27 @@ function nativeRemovalError(result) {
 export class TempWorkspaceCleanupCapability {
     binding;
     parent;
+    #admission;
+    #safety;
     #ownedTreeRemovalAvailable;
-    #closed = false;
-    constructor(root, safety) {
+    #phase = "new";
+    constructor(root, safety, admission, dirMode) {
+        assertNoWindowsPathAlias(root, "filesystem");
+        const admittedRoot = admission.dir;
+        assertNoWindowsPathAlias(admittedRoot, "filesystem");
+        const resolvedRoot = resolvePathPreservingWindowsRoot(root);
+        assertNoWindowsPathAlias(resolvedRoot, "filesystem");
+        if (resolvedRoot !== resolvePathPreservingWindowsRoot(admittedRoot)) {
+            throw new FsSafeError("path-mismatch", "temp workspace cleanup parent differs from admitted root");
+        }
+        this.#admission = admission;
+        this.#safety = safety;
+        // POSIX enumeration reopens fd-relative ".", so retaining O_RDONLY before
+        // chmod cannot supply read/search authority that the final mode removes.
+        const childModeAllowsRemoval = process.platform === "win32" || (dirMode & 0o500) === 0o500;
+        if (safety === "require-bounded" && !childModeAllowsRemoval) {
+            throw new FsSafeError("helper-unavailable", "temp workspace owned-tree cleanup requires owner read and search in dirMode");
+        }
         let binding;
         try {
             binding = getNativeBinding();
@@ -39,51 +56,138 @@ export class TempWorkspaceCleanupCapability {
         this.binding = binding;
         let parent;
         try {
-            parent = openStagedDirectory(root);
-            assertStagedDirectoryCurrent(parent.receipt);
+            parent = openTempWorkspaceCleanupParent(root, admission);
         }
-        catch {
-            if (parent)
-                fsSync.closeSync(parent.fd);
-            parent = undefined;
+        catch (error) {
+            // Failed descriptor closure must retain the original admission failure too.
+            if (error instanceof AggregateError)
+                throw error;
         }
-        this.parent = parent;
         let available = false;
-        if (parent && isNativeCleanupBinding(binding)) {
+        if (childModeAllowsRemoval && parent?.access === "read" && isNativeCleanupBinding(binding)) {
+            let probeReady = false;
+            try {
+                admission.prepareCleanupProbe(parent.fd);
+                probeReady = true;
+            }
+            catch (error) {
+                // A descriptor that cannot be associated even provisionally must not
+                // reach native code or remain available to compatible cleanup.
+                try {
+                    fsSync.closeSync(parent.fd);
+                }
+                catch (closeError) {
+                    throw new AggregateError([error, closeError], "temp workspace cleanup parent probe admission and close failed");
+                }
+                parent = undefined;
+            }
             try {
-                available = binding.ownedTreeRemovalAvailable(parent.fd) === true;
+                if (probeReady && parent) {
+                    available = binding.ownedTreeRemovalAvailable(parent.fd) === true;
+                }
             }
             catch {
                 // Runtime denial must select fallback or reject before child creation.
             }
         }
+        this.parent = parent;
         this.#ownedTreeRemovalAvailable = available;
-        if (safety === "require-bounded" && !this.canRemoveOwnedTree) {
+        if (safety === "require-bounded" && !this.#ownedTreeRemovalAvailable) {
             this.close();
             throw new FsSafeError("helper-unavailable", "temp workspace owned-tree cleanup is unavailable");
         }
     }
     get canRemoveOwnedTree() {
-        return !this.#closed && this.#ownedTreeRemovalAvailable;
+        return (this.#phase === "ready" || this.#phase === "sealed") &&
+            this.#ownedTreeRemovalAvailable;
     }
-    assertCurrent() {
-        if (this.#closed || !this.parent) {
+    prepareChildCreation() {
+        const replay = this.#phase === "ready";
+        if (this.#phase !== "new" && !replay) {
             throw new FsSafeError("path-mismatch", "temp workspace cleanup parent is unavailable");
         }
-        assertStagedDirectoryCurrent(this.parent.receipt);
-        const current = fsSync.fstatSync(this.parent.fd, { bigint: true });
-        if (!sameFileIdentityForCleanup(current, this.parent.receipt.identity)) {
-            throw new FsSafeError("path-mismatch", "temp workspace cleanup parent changed");
+        // A failed initial admission or receipt replay is terminal: no earlier
+        // authority may survive a partial revalidation.
+        this.#phase = "failed";
+        if (replay) {
+            if (this.parent)
+                this.#admission.associateAncestry(this.parent.fd);
+            else
+                this.#admission.assertAncestry();
+        }
+        else {
+            this.#admission.prepareChildCreation(this.parent?.fd);
         }
+        // The retained descriptor cannot authorize cleanup until the complete
+        // ancestry and its exact descriptor association succeeded together.
+        this.#phase = "ready";
+    }
+    #assertCurrent(ancestry) {
+        if ((this.#phase !== "ready" && this.#phase !== "sealed") || !this.parent) {
+            throw new FsSafeError("path-mismatch", "temp workspace cleanup parent is unavailable");
+        }
+        if (ancestry)
+            this.#admission.associateAncestry(this.parent.fd);
+        else
+            this.#admission.associateCurrent(this.parent.fd);
+    }
+    admitChildDescriptor(canEnumerate) {
+        if (this.#phase !== "ready") {
+            throw new FsSafeError("path-mismatch", "temp workspace cleanup parent is unavailable");
+        }
+        // From this point the capability belongs to this successfully created
+        // child. Collision retries and further preparation must remain impossible.
+        this.#phase = "sealed";
+        const bounded = this.canRemoveOwnedTree && canEnumerate;
+        if (this.#safety === "require-bounded" && !bounded) {
+            throw new FsSafeError("helper-unavailable", "temp workspace owned-tree cleanup requires a readable child descriptor");
+        }
+        return bounded;
+    }
+    assertCurrent() {
+        this.#assertCurrent(false);
+    }
+    assertAncestryCurrent() {
+        this.#assertCurrent(true);
     }
     close() {
-        if (this.#closed)
+        if (this.#phase === "closed")
             return;
-        this.#closed = true;
+        this.#phase = "closed";
         if (this.parent)
             fsSync.closeSync(this.parent.fd);
     }
 }
+export function throwTempWorkspaceCreationFailure(error, retainedChild, capability, owner, label = "temp workspace") {
+    try {
+        if (owner)
+            owner.cleanupSync();
+        else {
+            const closeErrors = [];
+            try {
+                retainedChild?.close();
+            }
+            catch (closeError) {
+                closeErrors.push(closeError);
+            }
+            try {
+                capability.close();
+            }
+            catch (closeError) {
+                closeErrors.push(closeError);
+            }
+            if (closeErrors.length === 1)
+                throw closeErrors[0];
+            if (closeErrors.length > 1) {
+                throw new AggregateError(closeErrors, `${label} admission descriptor close failed`);
+            }
+        }
+    }
+    catch (cleanupError) {
+        throw new AggregateError([error, cleanupError], `${label} creation and cleanup both failed`);
+    }
+    throw error;
+}
 export class TempWorkspaceCleanupOwner {
     #dir;
     #identity;
@@ -94,21 +198,12 @@ export class TempWorkspaceCleanupOwner {
     #exitInterrupted = false;
     #result;
     #pending;
-    constructor(dir, identity, capability) {
-        this.#dir = dir;
-        this.#identity = { dev: identity.dev, ino: identity.ino };
+    constructor(retained, capability, retainDescriptor) {
+        const child = retained.transfer(retainDescriptor);
+        this.#dir = child.dir;
+        this.#identity = child.identity;
         this.#capability = capability;
-        let directory;
-        if (capability.canRemoveOwnedTree) {
-            directory = openStagedDirectory(dir);
-            const current = fsSync.fstatSync(directory.fd, { bigint: true });
-            if (!sameFileIdentityForCleanup(current, this.#identity)) {
-                fsSync.closeSync(directory.fd);
-                capability.close();
-                throw new FsSafeError("path-mismatch", "temp workspace changed while retaining cleanup authority");
-            }
-        }
-        this.#directory = directory;
+        this.#directory = child.directory;
     }
     #repeat() {
         return this.#result === "removed" ? "missing" : this.#result;
@@ -186,11 +281,10 @@ export class TempWorkspaceCleanupOwner {
                 this.#capability.binding.renameNoReplace(parent.fd, path.basename(this.#dir), parent.fd, name);
             }
             else {
-                const guard = createSyncDirectoryGuard(parent.receipt.path);
-                withSyncDirectoryGuards([guard], () => {
-                    this.#capability.assertCurrent();
-                    fsSync.renameSync(this.#dir, quarantinePath);
-                });
+                // The admitted receipt is exact and descriptor-associated. Reuse it as
+                // the pre/post parent fence instead of layering a numeric guard over it.
+                this.#capability.assertCurrent();
+                fsSync.renameSync(this.#dir, quarantinePath);
             }
             this.#capability.assertCurrent();
             const quarantined = fsSync.lstatSync(quarantinePath, { bigint: true });
@@ -230,24 +324,19 @@ export class TempWorkspaceCleanupOwner {
                 await beforeNativeRemoval(quarantine.path);
             return this.#mapRemoval(await this.#capability.binding.removeOwnedTree(this.#capability.parent.fd, quarantine.name, this.#directory.fd));
         }
-        let removalError;
         try {
-            const guard = await createAsyncDirectoryGuard(this.#capability.parent.receipt.path);
-            await withAsyncDirectoryGuards([guard], async () => {
-                this.#assertQuarantine(quarantine);
-                try {
-                    await fs.rm(quarantine.path, { recursive: true, force: true });
-                }
-                catch (error) {
-                    removalError = error;
-                    throw error;
-                }
-            });
+            this.#assertQuarantine(quarantine);
+        }
+        catch {
+            return "indeterminate";
+        }
+        // Removal failures propagate unchanged; only authority uncertainty becomes a receipt.
+        await fs.rm(quarantine.path, { recursive: true, force: true });
+        try {
+            this.#capability.assertCurrent();
             return "removed";
         }
-        catch (error) {
-            if (error === removalError)
-                throw error;
+        catch {
             return "indeterminate";
         }
     }
@@ -256,24 +345,18 @@ export class TempWorkspaceCleanupOwner {
             getFsSafeTestHooks()?.beforeTempWorkspaceNativeRemovalSync?.(quarantine.path);
             return this.#mapRemoval(this.#capability.binding.removeOwnedTreeSync(this.#capability.parent.fd, quarantine.name, this.#directory.fd));
         }
-        let removalError;
         try {
-            const guard = createSyncDirectoryGuard(this.#capability.parent.receipt.path);
-            withSyncDirectoryGuards([guard], () => {
-                this.#assertQuarantine(quarantine);
-                try {
-                    fsSync.rmSync(quarantine.path, { recursive: true, force: true });
-                }
-                catch (error) {
-                    removalError = error;
-                    throw error;
-                }
-            });
+            this.#assertQuarantine(quarantine);
+        }
+        catch {
+            return "indeterminate";
+        }
+        fsSync.rmSync(quarantine.path, { recursive: true, force: true });
+        try {
+            this.#capability.assertCurrent();
             return "removed";
         }
-        catch (error) {
-            if (error === removalError)
-                throw error;
+        catch {
             return "indeterminate";
         }
     }

package/node_modules/@openclaw/fs-safe/dist/temp-workspace-types.d.ts

@@ -0,0 +1,39 @@
+import type { FileStore, FileStoreSync } from "./file-store.js";
+import type { TempPathIdentityReceipt } from "./temp-cleanup.js";
+import type { TempWorkspaceCleanupResult, TempWorkspaceCleanupSafety } from "./temp-workspace-owner.js";
+export type TempWorkspaceOptions = {
+    rootDir: string;
+    prefix: string;
+    dirMode?: number;
+    mode?: number;
+    cleanupSafety?: TempWorkspaceCleanupSafety;
+};
+export type TempWorkspace = {
+    dir: string;
+    identity: TempPathIdentityReceipt;
+    store: FileStore;
+    path(fileName: string): string;
+    write(fileName: string, data: string | Uint8Array): Promise<string>;
+    writeText(fileName: string, data: string): Promise<string>;
+    writeJson(fileName: string, data: unknown, options?: {
+        trailingNewline?: boolean;
+    }): Promise<string>;
+    copyIn(fileName: string, sourcePath: string): Promise<string>;
+    read(fileName: string): Promise<Buffer>;
+    cleanup(): Promise<TempWorkspaceCleanupResult>;
+    [Symbol.asyncDispose](): Promise<void>;
+};
+export type TempWorkspaceSync = {
+    dir: string;
+    identity: TempPathIdentityReceipt;
+    store: FileStoreSync;
+    path(fileName: string): string;
+    write(fileName: string, data: string | Uint8Array): string;
+    writeText(fileName: string, data: string): string;
+    writeJson(fileName: string, data: unknown, options?: {
+        trailingNewline?: boolean;
+    }): string;
+    read(fileName: string): Buffer;
+    cleanup(): TempWorkspaceCleanupResult;
+    [Symbol.dispose](): void;
+};

package/node_modules/@openclaw/fs-safe/dist/temp-workspace-types.js

@@ -0,0 +1 @@
+export {};

package/node_modules/@openclaw/fs-safe/dist/temp.d.ts

@@ -1,4 +1,3 @@
 export { tempWorkspace, type TempWorkspace, type TempWorkspaceOptions, type TempWorkspaceCleanupResult, type TempWorkspaceCleanupSafety, tempWorkspaceSync, type TempWorkspaceSync, withTempWorkspace, withTempWorkspaceSync, } from "./private-temp-workspace.js";
 export type { TempPathIdentityReceipt } from "./temp-cleanup.js";
-export { resolveSecureTempRoot, type ResolveSecureTempRootOptions } from "./secure-temp-dir.js";
-//# sourceMappingURL=temp.d.ts.map
+export { resolveSecureTempRoot, type ResolveSecureTempRootOptions, type SecureTempRootDescriptorAdapter, } from "./secure-temp-dir.js";

package/node_modules/@openclaw/fs-safe/dist/temp.js

@@ -1,2 +1,2 @@
 export { tempWorkspace, tempWorkspaceSync, withTempWorkspace, withTempWorkspaceSync, } from "./private-temp-workspace.js";
-export { resolveSecureTempRoot } from "./secure-temp-dir.js";
+export { resolveSecureTempRoot, } from "./secure-temp-dir.js";

package/node_modules/@openclaw/fs-safe/dist/test-hooks.d.ts

@@ -5,10 +5,17 @@ export type FsSafeTestHooks = {
     beforeOpen?: (filePath: string, flags: number) => Promise<void> | void;
     afterOpen?: (filePath: string, handle: FileHandle) => Promise<void> | void;
     afterOpenedPathIdentityCheck?: (filePath: string, handle: FileHandle) => Promise<void> | void;
+    afterRootReadPathResolution?: (filePath: string) => Promise<void> | void;
+    beforeRootReadFinalFence?: (filePath: string, handle: FileHandle) => Promise<void> | void;
+    afterRootReadFinalPathIdentityCheck?: (filePath: string, handle: FileHandle) => void;
     beforeArchiveOutputMutation?: (operation: "mkdir" | "chmod", targetPath: string) => Promise<void> | void;
     beforeFileStorePruneDescend?: (dirPath: string) => Promise<void> | void;
     beforeFileStoreSyncPrivateWrite?: (filePath: string) => void;
     beforeRootFallbackMutation?: (operation: "mkdir" | "move" | "remove", targetPath: string) => Promise<void> | void;
+    beforePinnedWriteParentAdmission?: (targetPath: string) => Promise<void> | void;
+    beforeRootStatObservation?: (targetPath: string) => Promise<void> | void;
+    beforeRootStatInitialObservation?: (targetPath: string) => Promise<void> | void;
+    beforeRootListObservation?: (directoryPath: string, withFileTypes: boolean) => Promise<void> | void;
     afterPinnedWriteFallbackRename?: (targetPath: string) => Promise<void> | void;
     beforeSiblingTempWrite?: (tempPath: string) => Promise<void> | void;
     beforeSidecarLockSnapshotOpen?: (lockPath: string) => Promise<void> | void;
@@ -22,4 +29,3 @@ export type FsSafeTestHooks = {
 };
 export declare function getFsSafeTestHooks(): FsSafeTestHooks | undefined;
 export declare function __setFsSafeTestHooksForTest(hooks?: FsSafeTestHooks): void;
-//# sourceMappingURL=test-hooks.d.ts.map

package/node_modules/@openclaw/fs-safe/dist/text-atomic.d.ts

@@ -11,4 +11,3 @@ export type WriteTextAtomicOptions = {
     durable?: boolean;
 };
 export declare function writeTextAtomic(filePath: string, content: string, options?: WriteTextAtomicOptions): Promise<void>;
-//# sourceMappingURL=text-atomic.d.ts.map

package/node_modules/@openclaw/fs-safe/dist/text-atomic.js

@@ -1,9 +1,11 @@
 import { replaceFileAtomic } from "./replace-file.js";
+import { admitStandalonePublicationPath } from "./windows-path-alias.js";
 export async function writeTextAtomic(filePath, content, options) {
+    const admittedPath = admitStandalonePublicationPath(filePath);
     const payload = options?.trailingNewline && !content.endsWith("\n") ? `${content}\n` : content;
     const durable = options?.durable ?? true;
     await replaceFileAtomic({
-        filePath,
+        filePath: admittedPath,
         content: payload,
         mode: options?.mode ?? 0o600,
         dirMode: options?.dirMode ?? (0o777 & ~process.umask()),

package/node_modules/@openclaw/fs-safe/dist/timing.d.ts

@@ -1,3 +1,4 @@
+export declare function scheduleTimeout(callback: () => void, ms: number): () => void;
 export declare function sleep(ms: number): Promise<void>;
 export declare function sleepSync(ms: number): void;
 export declare function withTimeout<T>(promise: Promise<T>, timeoutMs: number, labelOrOptions?: string | {
@@ -5,4 +6,3 @@ export declare function withTimeout<T>(promise: Promise<T>, timeoutMs: number, l
     message?: string;
     createError?: () => Error;
 }): Promise<T>;
-//# sourceMappingURL=timing.d.ts.map

package/node_modules/@openclaw/fs-safe/dist/timing.js

@@ -1,5 +1,26 @@
+const MAX_TIMER_DELAY_MS = 2 ** 31 - 1;
+export function scheduleTimeout(callback, ms) {
+    let timer;
+    if (Number.isFinite(ms) && ms > MAX_TIMER_DELAY_MS) {
+        const startedAt = performance.now();
+        const tick = () => {
+            const remaining = ms - (performance.now() - startedAt);
+            if (remaining <= 0)
+                callback();
+            else
+                timer = setTimeout(tick, Math.min(remaining, MAX_TIMER_DELAY_MS));
+        };
+        // Node clamps overflowing delays to 1 ms. Rearm bounded timers against a
+        // monotonic clock so clock changes and event-loop stalls cannot shorten them.
+        timer = setTimeout(tick, MAX_TIMER_DELAY_MS);
+    }
+    else {
+        timer = setTimeout(callback, ms);
+    }
+    return () => clearTimeout(timer);
+}
 export function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, ms));
+    return new Promise((resolve) => { scheduleTimeout(resolve, ms); });
 }
 export function sleepSync(ms) {
     if (ms <= 0) {
@@ -16,12 +37,12 @@ export async function withTimeout(promise, timeoutMs, labelOrOptions = {
     const options = typeof labelOrOptions === "string" ? { label: labelOrOptions } : labelOrOptions;
     const createError = options.createError ??
         (() => new Error(options.message ?? `${options.label ?? "operation"} timed out after ${timeoutMs}ms`));
-    let timeoutId;
+    let cancelTimeout;
     try {
         return await Promise.race([
             promise,
             new Promise((_, reject) => {
-                timeoutId = setTimeout(() => {
+                cancelTimeout = scheduleTimeout(() => {
                     try {
                         reject(createError());
                     }
@@ -33,8 +54,6 @@ export async function withTimeout(promise, timeoutMs, labelOrOptions = {
         ]);
     }
     finally {
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
+        cancelTimeout?.();
     }
 }

package/node_modules/@openclaw/fs-safe/dist/trash.d.ts

@@ -2,4 +2,3 @@ export type MovePathToTrashOptions = {
     allowedRoots?: Iterable<string>;
 };
 export declare function movePathToTrash(targetPath: string, options?: MovePathToTrashOptions): Promise<string>;
-//# sourceMappingURL=trash.d.ts.map

package/node_modules/@openclaw/fs-safe/dist/trash.js

@@ -3,7 +3,10 @@ import os from "node:os";
 import path from "node:path";
 import { sameFileIdentity } from "./file-identity.js";
 import { guardedRenameSync, guardedRmSync } from "./guarded-mutation.js";
+import { realpathSync } from "./realpath.js";
+import { recursiveMkdirPath } from "./recursive-mkdir-path.js";
 import { getFsSafeTestHooks } from "./test-hooks.js";
+import { hasWindowsPathAlias, resolvePathPreservingWindowsRoot, } from "./windows-path-alias.js";
 const TRASH_DESTINATION_COLLISION_CODES = new Set(["EEXIST", "ENOTEMPTY", "ERR_FS_CP_EEXIST"]);
 const TRASH_DESTINATION_RETRY_LIMIT = 4;
 function getFsErrorCode(error) {
@@ -18,34 +21,62 @@ function isTrashDestinationCollision(error) {
     return Boolean(code && TRASH_DESTINATION_COLLISION_CODES.has(code));
 }
 function isSameOrChildPath(candidate, parent) {
-    return candidate === parent || candidate.startsWith(`${parent}${path.sep}`);
+    return candidate === parent || candidate.startsWith(parent.endsWith(path.sep) ? parent : `${parent}${path.sep}`);
+}
+function assertNoTrashPathAlias(value, label) {
+    if (hasWindowsPathAlias(value, "filesystem")) {
+        throw new Error(`Refusing to trash ${label} using a Windows filesystem namespace alias: ${value}`);
+    }
+}
+function collectAllowedTrashRoots(allowedRoots) {
+    const roots = [...(allowedRoots ?? [os.homedir(), os.tmpdir()])];
+    for (const root of roots)
+        assertNoTrashPathAlias(root, "allowed root");
+    return roots;
 }
 function resolveAllowedTrashRoots(allowedRoots) {
-    const roots = [...(allowedRoots ?? [os.homedir(), os.tmpdir()])].flatMap((root) => {
-        const lexicalRoot = path.resolve(root);
+    const roots = allowedRoots.flatMap((root) => {
+        assertNoTrashPathAlias(root, "allowed root");
+        const lexicalRoot = resolvePathPreservingWindowsRoot(root);
+        assertNoTrashPathAlias(lexicalRoot, "allowed root");
+        let realRoot;
         try {
             // Keep both spellings: broken symlink targets cannot be realpathed and
             // may only compare equal to the caller's lexical allowed root.
-            return [path.resolve(fs.realpathSync.native(root)), lexicalRoot];
+            realRoot = realpathSync.native(root);
         }
         catch {
             return [lexicalRoot];
         }
+        assertNoTrashPathAlias(realRoot, "allowed root");
+        const resolvedRealRoot = resolvePathPreservingWindowsRoot(realRoot);
+        assertNoTrashPathAlias(resolvedRealRoot, "allowed root");
+        return [resolvedRealRoot, lexicalRoot];
     });
     return [...new Set(roots)];
 }
 function resolveTrashTargetPath(targetPath) {
+    assertNoTrashPathAlias(targetPath, "target path");
+    let realPath;
     try {
-        return { path: path.resolve(fs.realpathSync.native(targetPath)), resolved: true };
+        realPath = realpathSync.native(targetPath);
     }
     catch {
         // Broken symlinks are valid trash targets. Fall back to the lexical path,
         // then rely on lstat identity so the move renames the symlink itself.
-        return { path: path.resolve(targetPath), resolved: false };
+        const lexicalPath = path.resolve(targetPath);
+        assertNoTrashPathAlias(lexicalPath, "target path");
+        return { path: lexicalPath, resolved: false };
     }
+    const resolvedPath = path.resolve(realPath);
+    assertNoTrashPathAlias(resolvedPath, "target path");
+    return { path: resolvedPath, resolved: true };
 }
 function assertAllowedTrashTarget(targetPath, allowedRoots) {
-    const stat = fs.lstatSync(path.resolve(targetPath));
+    assertNoTrashPathAlias(targetPath, "target path");
+    const lexicalTarget = path.resolve(targetPath);
+    assertNoTrashPathAlias(lexicalTarget, "target path");
+    const stat = fs.lstatSync(lexicalTarget);
     const resolvedTarget = resolveTrashTargetPath(targetPath);
     const resolvedTargetPath = resolvedTarget.path;
     const isAllowed = resolveAllowedTrashRoots(allowedRoots).some((root) => resolvedTargetPath !== root && isSameOrChildPath(resolvedTargetPath, root));
@@ -53,7 +84,7 @@ function assertAllowedTrashTarget(targetPath, allowedRoots) {
         throw new Error(`Refusing to trash path outside allowed roots: ${targetPath}`);
     }
     return {
-        path: path.resolve(targetPath),
+        path: lexicalTarget,
         realPath: resolvedTargetPath,
         realPathResolved: resolvedTarget.resolved,
         stat,
@@ -74,21 +105,27 @@ function assertTrashTargetGuard(guard) {
 }
 function resolveTrashDir() {
     const homeDir = os.homedir();
+    assertNoTrashPathAlias(homeDir, "home directory");
     const trashDir = path.join(homeDir, ".Trash");
-    fs.mkdirSync(trashDir, { recursive: true, mode: 0o700 });
+    assertNoTrashPathAlias(trashDir, "trash directory");
+    fs.mkdirSync(recursiveMkdirPath(trashDir), { recursive: true, mode: 0o700 });
     const trashDirStat = fs.lstatSync(trashDir);
     if (!trashDirStat.isDirectory() || trashDirStat.isSymbolicLink()) {
         throw new Error(`Refusing to use non-directory/symlink trash directory: ${trashDir}`);
     }
-    const realHome = path.resolve(fs.realpathSync.native(homeDir));
-    const resolvedTrashDir = path.resolve(fs.realpathSync.native(trashDir));
+    const realHome = path.resolve(realpathSync.native(homeDir));
+    const resolvedTrashDir = path.resolve(realpathSync.native(trashDir));
+    assertNoTrashPathAlias(realHome, "home directory");
+    assertNoTrashPathAlias(resolvedTrashDir, "trash directory");
     if (resolvedTrashDir === realHome || !isSameOrChildPath(resolvedTrashDir, realHome)) {
         throw new Error(`Trash directory escaped home directory: ${trashDir}`);
     }
     return resolvedTrashDir;
 }
 function trashBaseName(targetPath) {
+    assertNoTrashPathAlias(targetPath, "target path");
     const resolvedTargetPath = path.resolve(targetPath);
+    assertNoTrashPathAlias(resolvedTargetPath, "target path");
     if (resolvedTargetPath === path.parse(resolvedTargetPath).root) {
         throw new Error(`Refusing to trash root path: ${targetPath}`);
     }
@@ -99,18 +136,26 @@ function trashBaseName(targetPath) {
     return base;
 }
 function resolveContainedPath(root, leaf) {
+    assertNoTrashPathAlias(root, "destination root");
+    assertNoTrashPathAlias(leaf, "destination name");
     const resolvedRoot = path.resolve(root);
     const resolvedPath = path.resolve(resolvedRoot, leaf);
+    assertNoTrashPathAlias(resolvedRoot, "destination root");
+    assertNoTrashPathAlias(resolvedPath, "destination path");
     if (!isSameOrChildPath(resolvedPath, resolvedRoot) || resolvedPath === resolvedRoot) {
         throw new Error(`Trash destination escaped trash directory: ${resolvedPath}`);
     }
     return resolvedPath;
 }
 function reserveTrashDestination(trashDir, base, timestamp) {
-    const containerPrefix = resolveContainedPath(trashDir, `${base}-${timestamp}-`);
+    assertNoTrashPathAlias(trashDir, "trash directory");
+    assertNoTrashPathAlias(base, "destination name");
+    const containerPrefix = resolveContainedPath(trashDir, `.fs-safe-trash-${timestamp}-`);
     const container = fs.mkdtempSync(containerPrefix);
     const resolvedContainer = path.resolve(container);
     const resolvedTrashDir = path.resolve(trashDir);
+    assertNoTrashPathAlias(resolvedContainer, "destination container");
+    assertNoTrashPathAlias(resolvedTrashDir, "trash directory");
     if (resolvedContainer === resolvedTrashDir ||
         !isSameOrChildPath(resolvedContainer, resolvedTrashDir)) {
         throw new Error(`Trash destination escaped trash directory: ${container}`);
@@ -120,6 +165,7 @@ function reserveTrashDestination(trashDir, base, timestamp) {
 function copyTrashTargetSync(target, dest) {
     if (target.stat.isSymbolicLink()) {
         const linkTarget = fs.readlinkSync(target.path);
+        assertNoTrashPathAlias(linkTarget, "symlink target");
         assertTrashTargetGuard(target);
         fs.symlinkSync(linkTarget, dest);
         return;
@@ -157,8 +203,10 @@ function movePathToDestination(target, dest) {
 }
 export async function movePathToTrash(targetPath, options = {}) {
     // Avoid resolving external trash helpers through the service PATH during cleanup.
+    assertNoTrashPathAlias(targetPath, "target path");
+    const allowedRoots = collectAllowedTrashRoots(options.allowedRoots);
     const base = trashBaseName(targetPath);
-    const target = assertAllowedTrashTarget(targetPath, options.allowedRoots);
+    const target = assertAllowedTrashTarget(targetPath, allowedRoots);
     const trashDir = resolveTrashDir();
     const timestamp = Date.now();
     for (let attempt = 0; attempt < TRASH_DESTINATION_RETRY_LIMIT; attempt += 1) {

package/node_modules/@openclaw/fs-safe/dist/types.d.ts

@@ -20,4 +20,3 @@ export type BasePathOptions = {
     rootDir: string;
     relativePath: string;
 };
-//# sourceMappingURL=types.d.ts.map

package/node_modules/@openclaw/fs-safe/dist/unicode-path.d.ts

@@ -0,0 +1,2 @@
+export declare function lowerCaseNfc(value: string): string;
+export declare function maxNormalizedUtf8Bytes(value: string, includeRaw?: boolean): number;