@ai-ecoverse/slicc-kernel 1.143.0 → 1.143.2

package/dist/node-process-worker.js

@@ -6725,7 +6725,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.143.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.143.2" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });

package/dist/node.js

@@ -4553,6 +4553,7 @@ var escapeRoot = (name2) => name2.replace(/[%:]/g, (c) => `%${c.charCodeAt(0).to
 var LEGACY_RENAME_LOCK = /^slicc-rename:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 var PAIRED = /* @__PURE__ */ new Set(["rename", "link", "copyFile"]);
 var LISTINGS = /* @__PURE__ */ new Set(["readdir", "readdirStat"]);
+var REMOVALS = /* @__PURE__ */ new Set(["rm", "rename"]);
 var RETRY = /* @__PURE__ */ Symbol("retry");
 var ACK_SAMPLES = 4096;
 var INTENT_POLL_MS = 5;
@@ -6027,10 +6028,11 @@ var OpfsFs = class {
     const running = [...this.inflight];
     const reached = await Promise.all(
       running.map(async (op) => {
-        if (op.paths.some((at) => touches(at, trees))) return true;
+        const near = (at) => touches(at, trees, true, op.removing === true);
+        if (op.paths.some(near)) return true;
         for (const at of op.paths) {
           const forms = await this.resolvedForms(at);
-          if (forms.some((form) => touches(form, trees))) return true;
+          if (forms.some(near)) return true;
         }
         return false;
       })
@@ -6047,10 +6049,10 @@ var OpfsFs = class {
       })
     );
   }
-  peerAt(at, listing) {
+  peerAt(at, listing, removing = false) {
     for (const move of this.peerMoves.values()) {
       if (this.ownLocks.has(move.lock)) continue;
-      if (touches(at, move.trees, listing)) return move;
+      if (touches(at, move.trees, listing, removing)) return move;
     }
     return void 0;
   }
@@ -6085,11 +6087,11 @@ var OpfsFs = class {
     this.peerWaits.set(move.lock, wait2);
     return wait2;
   }
-  async peerSettled(at, listing) {
+  async peerSettled(at, listing, removing) {
     await this.lookForRenames();
     for (let reals; ; ) {
       const forms = [at, ...reals ?? []];
-      const move = forms.map((form) => this.peerAt(form, listing)).find(Boolean);
+      const move = forms.map((form) => this.peerAt(form, listing, removing)).find(Boolean);
       if (move) {
         this.peerWaited++;
         await this.peerMoved(move);
@@ -6127,13 +6129,14 @@ var OpfsFs = class {
   async peerOp(name2, args, inner) {
     const paths = (name2 === "symlink" ? args.slice(1, 2) : PAIRED.has(name2) ? args.slice(0, 2) : args.slice(0, 1)).filter((path) => typeof path === "string").map(normalizePath);
     const listing = LISTINGS.has(name2);
+    const removing = REMOVALS.has(name2);
     const checked = [...paths];
     while (this.amongPeers()) {
       checked.length = 0;
-      for (const at of paths) checked.push(...await this.peerSettled(at, listing));
-      if (!checked.some((at) => this.peerAt(at, listing))) break;
+      for (const at of paths) checked.push(...await this.peerSettled(at, listing, removing));
+      if (!checked.some((at) => this.peerAt(at, listing, removing))) break;
     }
-    const busy = { paths: checked, release: () => void 0 };
+    const busy = { paths: checked, removing, release: () => void 0 };
     const done4 = () => {
       this.inflight.delete(busy);
       busy.waiting?.resolve();
@@ -6558,9 +6561,9 @@ var OpfsFs = class {
 function nothing() {
   return void 0;
 }
-function touches(at, trees, listing = true) {
+function touches(at, trees, listing = true, removing = false) {
   return trees.some(
-    ([from, to]) => within3(at, from) || within3(at, to) || listing && (at === parentOf4(from) || at === parentOf4(to))
+    ([from, to]) => within3(at, from) || within3(at, to) || listing && (at === parentOf4(from) || at === parentOf4(to)) || removing && (at === "/" || within3(from, at) || within3(to, at))
   );
 }
 function byIntent(a, b) {
@@ -7979,7 +7982,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.143.0" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.143.2" : "0.0.0-dev";
 var OS_RELEASE = "6.0.0-slicc";
 function procVersion() {
   return `Linux version ${OS_RELEASE} (slicc-kernel ${KERNEL_VERSION}) #1 SMP PREEMPT_DYNAMIC
@@ -10512,7 +10515,7 @@ function route(watch, type, path) {
 }
 function routed(watch, root, type, path) {
   if (path === root || type === "rename" && root !== "/" && under3(root, path)) {
-    noted(watch, { type, filename: baseOf3(root) });
+    noted(watch, { type, filename: watch.names.get(root) ?? baseOf3(root) });
     if (type === "rename") noted(watch, { ended: true });
     return true;
   }
@@ -10522,6 +10525,11 @@ function routed(watch, root, type, path) {
   } else return false;
   return true;
 }
+function remapped(root, from, to) {
+  if (root === from) return to;
+  if (from !== "/" && root.startsWith(`${from}/`)) return to + root.slice(from.length);
+  return void 0;
+}
 var FsWatchers = class {
   watchers = /* @__PURE__ */ new Set();
   typed = /* @__PURE__ */ new Set();
@@ -10556,6 +10564,7 @@ var FsWatchers = class {
     const other = alias === void 0 ? main : normalizePath(alias);
     const watch = {
       roots: other === main ? [main] : [main, other],
+      names: /* @__PURE__ */ new Map(),
       recursive,
       notes: [],
       overflowed: false,
@@ -10605,6 +10614,35 @@ var FsWatchers = class {
       for (const watch of [...this.typed]) route(watch, type, at);
     }
   }
+  moved(from, to) {
+    const source = normalizePath(from);
+    const target = normalizePath(to);
+    const followed2 = /* @__PURE__ */ new Set();
+    for (const watch of this.typed) {
+      const [main] = watch.roots;
+      const roots = watch.roots.map((root) => remapped(root, source, target) ?? root);
+      if (roots.every((root, i) => root === watch.roots[i])) continue;
+      followed2.add(watch);
+      const names2 = /* @__PURE__ */ new Map();
+      watch.roots.forEach((root, i) => {
+        names2.set(roots[i], watch.names.get(root) ?? baseOf3(root));
+      });
+      watch.names = names2;
+      watch.roots = [...new Set(roots)];
+      if (main === source) {
+        noted(watch, { type: "rename", filename: names2.get(target), moved: true });
+      }
+    }
+    return followed2;
+  }
+  renamed(from, to) {
+    const followed2 = this.moved(from, to);
+    if (this.typed.size === 0) return;
+    for (const path of [from, to]) {
+      const at = normalizePath(path);
+      for (const watch of [...this.typed]) if (!followed2.has(watch)) route(watch, "rename", at);
+    }
+  }
   changed(...paths) {
     this.report(paths);
     this.emit("change", paths);
@@ -10708,7 +10746,16 @@ var FsWatchers = class {
         }
       },
       rm: reshaping(after(fs.rm.bind(fs), (path) => [path], "rename")),
-      rename: reshaping(after(fs.rename.bind(fs), (from, to) => [from, to], "rename")),
+      rename: reshaping(async (from, to) => {
+        let done4 = false;
+        try {
+          await fs.rename(from, to);
+          done4 = true;
+        } finally {
+          this.report([from, to]);
+          if (done4) this.renamed(from, to);
+        }
+      }),
       link: reshaping(
         after(
           (from, to, follow2) => fs.link(from, to, follow2),
@@ -13583,7 +13630,7 @@ async function guardAndResolve(entry, path, req) {
     entry: { ...entry, fs: noLinks }
   };
 }
-var REMOVALS = /* @__PURE__ */ new Set(["unlink", "rmdir", "rm"]);
+var REMOVALS2 = /* @__PURE__ */ new Set(["unlink", "rmdir", "rm"]);
 var CREATIONS = /* @__PURE__ */ new Set([
   "write",
   "mkdir",
@@ -13629,7 +13676,7 @@ async function dispatchPath(entry, req) {
   const { fs, cwd } = entry;
   try {
     const path = fs.resolvePath(cwd, req.path);
-    const device = REMOVALS.has(req.op) ? devRemoval(path, entry.cred?.()) : void 0;
+    const device = REMOVALS2.has(req.op) ? devRemoval(path, entry.cred?.()) : void 0;
     if (device) return { ok: false, errno: device, message: `${path}: a device entry stays` };
     const made2 = await newDevName(entry, path, req);
     if (made2) return made2;