@lousy-agents/agent-shell 5.14.7 → 5.14.9

package/dist/index.js

@@ -2,7 +2,7 @@
 import { createRequire as __rspack_createRequire } from "node:module";
 const __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
 var __webpack_modules__ = ({
-391(__unused_rspack_module, __unused_rspack___webpack_exports__, __webpack_require__) {
+145(__unused_rspack_module, __unused_rspack___webpack_exports__, __webpack_require__) {
 
 ;// CONCATENATED MODULE: external "node:child_process"
 const external_node_child_process_namespaceObject = __rspack_createRequire_require("node:child_process");
@@ -340,7 +340,7 @@ function splitSafeRelativePath(relativePath) {
 function resolveSafeRelativePath(rootDir, relativePath) {
     const root = path.resolve(rootDir);
     const target = path.resolve(root, ...splitSafeRelativePath(relativePath));
-    if (target !== root && !target.startsWith(root + path.sep)) {
+    if (!path_isPathInside(root, target)) {
         throw new FsSafeError("outside-workspace", "relative path escapes root");
     }
     return target;
@@ -673,6 +673,85 @@ def reject_unsafe_endpoint(st):
     if stat.S_ISREG(mode) and st.st_nlink > 1:
         raise OSError(errno.EPERM, "hardlinked file endpoint is not allowed")
 
+def copy_bytes(source_fd, dest_fd):
+    while True:
+        chunk = os.read(source_fd, 65536)
+        if not chunk:
+            break
+        view = memoryview(chunk)
+        while view:
+            written = os.write(dest_fd, view)
+            if written <= 0:
+                raise OSError(errno.EIO, "short write")
+            view = view[written:]
+
+def write_all(fd, data):
+    view = memoryview(data)
+    while view:
+        written = os.write(fd, view)
+        if written <= 0:
+            raise OSError(errno.EIO, "short write")
+        view = view[written:]
+
+def link_unsupported(exc):
+    unsupported = (errno.EPERM, errno.EOPNOTSUPP, getattr(errno, "ENOTSUP", errno.EOPNOTSUPP))
+    return getattr(exc, "errno", None) in unsupported
+
+def link_no_replace(name, new_name, source_fd, target_fd):
+    linked = False
+    try:
+        os.link(name, new_name, src_dir_fd=source_fd, dst_dir_fd=target_fd, follow_symlinks=False)
+        linked = True
+        os.unlink(name, dir_fd=source_fd)
+    except Exception:
+        if linked:
+            try: os.unlink(new_name, dir_fd=target_fd)
+            except FileNotFoundError: pass
+        raise
+    os.fsync(source_fd)
+    if source_fd != target_fd:
+        os.fsync(target_fd)
+
+def copy_file_no_replace(source_parent_fd, source_name, target_parent_fd, basename, mode, expected=None, unlink_source=False):
+    source_fd = os.open(source_name, READ_FLAGS, dir_fd=source_parent_fd)
+    dest_fd = None
+    success = False
+    try:
+        if expected is not None:
+            source_stat = os.fstat(source_fd)
+            if source_stat.st_dev != expected.st_dev or source_stat.st_ino != expected.st_ino:
+                raise RuntimeError("fs-safe-source-mismatch")
+        dest_fd = os.open(basename, WRITE_FLAGS, mode, dir_fd=target_parent_fd)
+        copy_bytes(source_fd, dest_fd)
+        os.fsync(dest_fd)
+        success = True
+    finally:
+        os.close(source_fd)
+        if dest_fd is not None:
+            os.close(dest_fd)
+        if dest_fd is not None and not success:
+            try: os.unlink(basename, dir_fd=target_parent_fd)
+            except FileNotFoundError: pass
+    if unlink_source:
+        try:
+            os.unlink(source_name, dir_fd=source_parent_fd)
+        except Exception:
+            try: os.unlink(basename, dir_fd=target_parent_fd)
+            except FileNotFoundError: pass
+            raise
+
+def commit_temp_file(parent_fd, temp_name, basename, overwrite, mode):
+    if overwrite:
+        os.replace(temp_name, basename, src_dir_fd=parent_fd, dst_dir_fd=parent_fd)
+    else:
+        try:
+            os.link(temp_name, basename, src_dir_fd=parent_fd, dst_dir_fd=parent_fd, follow_symlinks=False)
+            os.unlink(temp_name, dir_fd=parent_fd)
+        except OSError as exc:
+            if not link_unsupported(exc):
+                raise
+            copy_file_no_replace(parent_fd, temp_name, parent_fd, basename, mode, unlink_source=True)
+
 def stat_path(root_fd, payload):
     relative = payload.get("relativePath", "")
     segments = split_relative(relative)
@@ -747,7 +826,18 @@ def rename_path(root_fd, payload):
     try:
         from_stat = os.lstat(from_base, dir_fd=from_parent_fd)
         reject_unsafe_endpoint(from_stat)
-        if not payload.get("overwrite", True):
+        overwrite = payload.get("overwrite", True)
+        if not overwrite and stat.S_ISREG(from_stat.st_mode):
+            try:
+                link_no_replace(from_base, to_base, from_parent_fd, to_parent_fd)
+            except OSError as exc:
+                if not link_unsupported(exc):
+                    raise
+                copy_file_no_replace(from_parent_fd, from_base, to_parent_fd, to_base, stat.S_IMODE(from_stat.st_mode), from_stat, True)
+            return None
+        if not overwrite and stat.S_ISDIR(from_stat.st_mode):
+            raise RuntimeError("fs-safe-directory-noreplace-unsupported")
+        if not overwrite:
             try:
                 os.lstat(to_base, dir_fd=to_parent_fd)
                 raise FileExistsError(errno.EEXIST, "destination exists", to_base)
@@ -792,16 +882,11 @@ def write_path(root_fd, payload):
             except FileNotFoundError:
                 pass
         temp_name, temp_fd = create_temp_file(parent_fd, basename, mode)
-        view = memoryview(data)
-        while view:
-            written = os.write(temp_fd, view)
-            if written <= 0:
-                raise OSError(errno.EIO, "short write")
-            view = view[written:]
+        write_all(temp_fd, data)
         os.fsync(temp_fd)
         os.close(temp_fd)
         temp_fd = None
-        os.replace(temp_name, basename, src_dir_fd=parent_fd, dst_dir_fd=parent_fd)
+        commit_temp_file(parent_fd, temp_name, basename, overwrite, mode)
         temp_name = None
         os.fsync(parent_fd)
         result_stat = os.stat(basename, dir_fd=parent_fd, follow_symlinks=False)
@@ -834,12 +919,6 @@ def copy_path(root_fd, payload):
         if max_bytes >= 0 and source_stat.st_size > max_bytes:
             raise RuntimeError("fs-safe-too-large:%d:%d" % (max_bytes, source_stat.st_size))
         parent_fd = walk_dir(root_fd, split_relative(payload.get("relativeParentPath", "")), bool(payload.get("mkdir", True)))
-        if not overwrite:
-            try:
-                os.lstat(basename, dir_fd=parent_fd)
-                raise FileExistsError(errno.EEXIST, "destination exists", basename)
-            except FileNotFoundError:
-                pass
         temp_name, temp_fd = create_temp_file(parent_fd, basename, mode)
         written_bytes = 0
         while True:
@@ -858,7 +937,7 @@ def copy_path(root_fd, payload):
         os.fsync(temp_fd)
         os.close(temp_fd)
         temp_fd = None
-        os.replace(temp_name, basename, src_dir_fd=parent_fd, dst_dir_fd=parent_fd)
+        commit_temp_file(parent_fd, temp_name, basename, overwrite, mode)
         temp_name = None
         os.fsync(parent_fd)
         result_stat = os.stat(basename, dir_fd=parent_fd, follow_symlinks=False)
@@ -982,6 +1061,9 @@ function mapWorkerError(response) {
     if (message.includes("fs-safe-source-mismatch")) {
         return new errors_FsSafeError("path-mismatch", "source path changed during copy");
     }
+    if (message.includes("fs-safe-directory-noreplace-unsupported")) {
+        return new errors_FsSafeError("invalid-path", "directory moves require overwrite: true");
+    }
     if (code === "FileNotFoundError" || errno === 2) {
         return new errors_FsSafeError("not-found", "file not found");
     }
@@ -999,19 +1081,19 @@ function mapWorkerError(response) {
     }
     return new errors_FsSafeError("helper-failed", message);
 }
-function rejectPending(error) {
-    if (!worker) {
+function rejectPending(error, targetWorker = worker) {
+    if (!targetWorker || worker !== targetWorker) {
         return;
     }
-    setWorkerRef(worker, false);
-    for (const pending of worker.pending.values()) {
+    setWorkerRef(targetWorker, false);
+    for (const pending of targetWorker.pending.values()) {
         pending.reject(error);
     }
-    worker.pending.clear();
+    targetWorker.pending.clear();
     worker = null;
 }
-function handleWorkerLine(line) {
-    if (!worker || !line.trim()) {
+function handleWorkerLine(currentWorker, line) {
+    if (worker !== currentWorker || !line.trim()) {
         return;
     }
     let decoded;
@@ -1019,11 +1101,11 @@ function handleWorkerLine(line) {
         decoded = JSON.parse(line);
     }
     catch {
-        rejectPending(new errors_FsSafeError("helper-failed", `pinned helper returned invalid JSON: ${line}`));
+        rejectPending(new errors_FsSafeError("helper-failed", `pinned helper returned invalid JSON: ${line}`), currentWorker);
         return;
     }
     if (typeof decoded !== "object" || decoded === null || !("id" in decoded)) {
-        rejectPending(new errors_FsSafeError("helper-failed", "pinned helper returned invalid response"));
+        rejectPending(new errors_FsSafeError("helper-failed", "pinned helper returned invalid response"), currentWorker);
         return;
     }
     const response = decoded;
@@ -1031,13 +1113,13 @@ function handleWorkerLine(line) {
     if (id === undefined) {
         return;
     }
-    const pending = worker.pending.get(id);
+    const pending = currentWorker.pending.get(id);
     if (!pending) {
         return;
     }
-    worker.pending.delete(id);
-    if (worker.pending.size === 0) {
-        setWorkerRef(worker, false);
+    currentWorker.pending.delete(id);
+    if (currentWorker.pending.size === 0) {
+        setWorkerRef(currentWorker, false);
     }
     if (response.ok === true) {
         pending.resolve(response.result);
@@ -1053,28 +1135,28 @@ function getWorker() {
     const child = (0,external_node_child_process_namespaceObject.spawn)(resolvePython(), ["-u", "-c", PINNED_PYTHON_WORKER_SOURCE], {
         stdio: ["pipe", "pipe", "pipe"],
     });
-    worker = { child, pending: new Map(), stderr: "", stdoutBuffer: "" };
+    const currentWorker = { child, pending: new Map(), stderr: "", stdoutBuffer: "" };
+    worker = currentWorker;
     child.stdout.setEncoding("utf8");
     child.stderr.setEncoding("utf8");
     child.stdout.on("data", (chunk) => {
-        const current = worker;
-        if (!current) {
+        if (worker !== currentWorker) {
             return;
         }
-        current.stdoutBuffer += chunk;
+        currentWorker.stdoutBuffer += chunk;
         for (;;) {
-            const newline = current.stdoutBuffer.indexOf("\n");
+            const newline = currentWorker.stdoutBuffer.indexOf("\n");
             if (newline < 0) {
                 break;
             }
-            const line = current.stdoutBuffer.slice(0, newline);
-            current.stdoutBuffer = current.stdoutBuffer.slice(newline + 1);
-            handleWorkerLine(line);
+            const line = currentWorker.stdoutBuffer.slice(0, newline);
+            currentWorker.stdoutBuffer = currentWorker.stdoutBuffer.slice(newline + 1);
+            handleWorkerLine(currentWorker, line);
         }
     });
     child.stderr.on("data", (chunk) => {
-        if (worker) {
-            worker.stderr = `${worker.stderr}${chunk}`.slice(-4096);
+        if (worker === currentWorker) {
+            currentWorker.stderr = `${currentWorker.stderr}${chunk}`.slice(-4096);
         }
     });
     child.once("error", (error) => {
@@ -1083,17 +1165,17 @@ function getWorker() {
             : error instanceof Error
                 ? error
                 : new Error(String(error));
-        rejectPending(mapped);
+        rejectPending(mapped, currentWorker);
     });
     child.once("close", (code, signal) => {
-        const stderr = worker?.stderr.trim();
-        rejectPending(new errors_FsSafeError("helper-failed", stderr || `pinned helper exited with code ${code ?? "null"} (${signal ?? "?"})`));
+        const stderr = currentWorker.stderr.trim();
+        rejectPending(new errors_FsSafeError("helper-failed", stderr || `pinned helper exited with code ${code ?? "null"} (${signal ?? "?"})`), currentWorker);
     });
     process.once("exit", () => {
         child.kill("SIGTERM");
     });
-    setWorkerRef(worker, false);
-    return worker;
+    setWorkerRef(currentWorker, false);
+    return currentWorker;
 }
 function setRefable(value, ref) {
     if (!value) {
@@ -2340,6 +2422,15 @@ function __setFsSafeTestHooksForTest(hooks) {
     test_hooks_fsSafeTestHooks = hooks;
 }
 
+;// CONCATENATED MODULE: ../../node_modules/@openclaw/fs-safe/dist/json-stringify.js
+function stringifyJsonDocument(value, replacer, space) {
+    const text = JSON.stringify(value, replacer, space);
+    if (typeof text !== "string") {
+        throw new TypeError("value is not representable as a JSON document");
+    }
+    return text;
+}
+
 ;// CONCATENATED MODULE: ../../node_modules/@openclaw/fs-safe/dist/temp-cleanup.js
 
 const tempCleanupEntries = new Map();
@@ -2427,6 +2518,7 @@ async function serializePathWrite(key, run) {
 
 
 
+
 
 
 function logWarn(message) {
@@ -2667,12 +2759,12 @@ class RootHandle {
     }
     async writeJson(relativePath, data, options = {}) {
         const { replacer, space, trailingNewline = true, ...writeOptions } = options;
-        const json = JSON.stringify(data, replacer, space);
+        const json = stringifyJsonDocument(data, replacer, space);
         await this.write(relativePath, trailingNewline ? `${json}\n` : json, writeOptions);
     }
     async createJson(relativePath, data, options = {}) {
         const { replacer, space, trailingNewline = true, ...writeOptions } = options;
-        const json = JSON.stringify(data, replacer, space);
+        const json = stringifyJsonDocument(data, replacer, space);
         await this.create(relativePath, trailingNewline ? `${json}\n` : json, writeOptions);
     }
     async copyIn(relativePath, sourcePath, options = {}) {
@@ -3457,6 +3549,9 @@ async function movePathFallback(root, params) {
     if (sourceStat.isFile() && sourceStat.nlink > 1) {
         throw new errors_FsSafeError("hardlink", "hardlinked path not allowed");
     }
+    if (!params.overwrite && sourceStat.isDirectory()) {
+        throw new errors_FsSafeError("invalid-path", "directory moves require overwrite: true");
+    }
     if (!params.overwrite) {
         try {
             await promises_namespaceObject.lstat(target.resolved);
@@ -14782,4 +14877,4 @@ if (installedChunkData !== 0) { // 0 means "already installed".'
 // module factories are used so entry inlining is disabled
 // startup
 // Load entry module and return exports
-var __webpack_exports__ = __webpack_require__(391);
+var __webpack_exports__ = __webpack_require__(145);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lousy-agents/agent-shell",
-    "version": "5.14.7",
+    "version": "5.14.9",
     "description": "A flight recorder for npm script execution",
     "type": "module",
     "repository": {
@@ -36,7 +36,7 @@
         "build": "rspack build --config rspack.config.ts && chmod +x dist/index.js"
     },
     "dependencies": {
-        "@openclaw/fs-safe": "0.2.4",
+        "@openclaw/fs-safe": "0.2.5",
         "zod": "4.4.3"
     },
     "peerDependencies": {