@ai-ecoverse/slicc-kernel 1.146.2 → 1.146.4

package/README.md

@@ -754,6 +754,10 @@ The proxy answers `200` with `Content-Type: application/vnd.slicc.raw-fetch`: a
 
 **Renaming a directory on the OPFS root** ([#1122](https://github.com/ai-ecoverse/slicc-kernel/issues/1122)): Chrome's OPFS can move a file but not a directory. So the kernel renames a directory by creating the new tree and moving each file into it (copying a file only if it can't move, e.g. while it's open elsewhere), then removing the old tree. Within the kernel the rename is atomic to readers: a lookup or listing under the old or the new name, or of either parent, waits until the whole tree has moved. So a stage-then-rename updater (pnpm's, an atomic config write) is never seen half there. Another tab sharing the root sees it all at once too (see below). A root whose directories can move (the Node memory root) renames them in one step. **If the page reloads or crashes mid-rename**, some files are already in the new tree and the rest are still in the old one. So before the first move, the kernel writes the rename's intent (`{ from, to }`) to its metadata store, and clears it after the last. At the next boot, when no other tab shares the root (the same rule as for the boot's other repair of stale metadata), the kernel finishes every recorded rename: it moves what's left into the new tree, removes the old name, and clears the record. The moved directory and its files keep their owner, mode and inode, as after a rename that wasn't stopped. While another tab shares the root, a kernel finishes only renames whose kernel is gone ([#1141](https://github.com/ai-ecoverse/slicc-kernel/issues/1141)): the renaming kernel holds a Web Lock (`slicc-rename:<id>`, named in the record) for the whole rename, and the browser releases it when that tab closes or its worker ends. A kernel that boots beside a peer, and every kernel that sees a peer go, finishes each recorded rename whose lock is free, taking that lock while it does, so two survivors never replay the same rename and a live kernel's rename is never touched. A record without a lock (written by an older kernel, or where Web Locks are missing) waits for a boot that's alone, as before. While another tab finishes a rename, this kernel's readers wait as for its own, and so do the other tabs'. A kernel whose wait for another tab's rename ends with the lock free and the record still there finishes the rename itself, under that lock, and a boot that's alone takes a record's lock too, so a third tab that boots meanwhile waits for it.
 
+**An open file stays bound to the file it opened** ([#1394](https://github.com/ai-ecoverse/slicc-kernel/issues/1394)): as on Linux, a program's open file keeps reaching the file it opened when its name is later renamed over, by a file or a symlink, by the program itself or by another process.
+- **The kernel keeps it:** the program keeps the file's contents before its own rename over the name, as it already did before its own unlink, and a rename by another process sets the held file aside, as an unlink does. Reads and writes through the descriptor reach the old file, and `fstat` keeps its inode.
+- **Another tab:** a tab doesn't know which files another tab holds open, so a rename over the name there can't keep the file. The descriptor then fails with `ESTALE`; it never reads or writes the file the name now names. `/proc/sys/kernel/slicc_stale_fds` counts these.
+
 **A rename by another process** ([#1257](https://github.com/ai-ecoverse/slicc-kernel/issues/1257)): as on Linux, where a descriptor names the file and not its path, a program's open file follows a rename of that file, or of a directory above it, by another process.
 - **The journal:** the kernel keeps the last 4096 renames it applied, each from and to a path, and counts them in the change buffer it shares with its processes. A rename in another tab on the same root reaches it through the sidecar's move notice.
 - **Catching up:** before a WASI or Emscripten program uses an open file's path (a read, a write, a seek, an `fsync`, a close, an open), it reads that count once. If another process renamed something since, and the program holds files open, it asks the kernel once for the renames of the paths it holds and moves its open files to their new names. The kernel answers only about the paths the program sent, and, under `users: 'enforce'`, drops every rename whose old or new name the program couldn't look up (search permission on each directory above it), so no process learns names in a directory it can't search. A program's own rename moves the count without asking, when nothing else came in between.

package/dist/kernel-worker.js

@@ -7728,7 +7728,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.146.2" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.146.4" : "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
@@ -8600,6 +8600,55 @@ var Crontabs = class {
 
 // src/fs/unlinked.ts
 var UNLINKED_DIR = ".slicc-unlinked";
+var PathMarks = class {
+  gen = 0;
+  floor = 0;
+  touched = /* @__PURE__ */ new Map();
+  flying = /* @__PURE__ */ new Map();
+  generation() {
+    return this.gen;
+  }
+  touch(target) {
+    this.gen += 1;
+    this.touched.delete(target);
+    this.touched.set(target, this.gen);
+    if (this.touched.size <= TOUCHED_MAX) return;
+    const [oldest, at] = this.touched.entries().next().value;
+    this.touched.delete(oldest);
+    this.floor = at;
+  }
+  changedSince(path, gen) {
+    if (gen < this.floor) return true;
+    for (let p = path; this.touched.size > 0; p = parentOf5(p)) {
+      if ((this.touched.get(p) ?? 0) > gen) return true;
+      if (p === "/") return false;
+    }
+    return false;
+  }
+  async around(paths, op) {
+    for (const p of paths) {
+      this.flying.set(p, (this.flying.get(p) ?? 0) + 1);
+      this.touch(p);
+    }
+    try {
+      return await op();
+    } finally {
+      for (const p of paths) {
+        const n = (this.flying.get(p) ?? 1) - 1;
+        if (n > 0) this.flying.set(p, n);
+        else this.flying.delete(p);
+        this.touch(p);
+      }
+    }
+  }
+  inFlight(path) {
+    for (let p = path; this.flying.size > 0; p = parentOf5(p)) {
+      if (this.flying.has(p)) return true;
+      if (p === "/") return false;
+    }
+    return false;
+  }
+};
 function webLocks() {
   return globalThis.navigator?.locks;
 }
@@ -8653,14 +8702,13 @@ var UnlinkedKeeper = class {
   queue = Promise.resolve();
   count = 0;
   replacing = /* @__PURE__ */ new Map();
-  gen = 0;
-  floor = 0;
-  touched = /* @__PURE__ */ new Map();
+  marks;
   replaced = 0;
   links = /* @__PURE__ */ new Map();
   linked = /* @__PURE__ */ new Map();
   dirOwner;
   constructor(fs, holders, rootOf, options = {}) {
+    this.marks = options.marks ?? new PathMarks();
     const { locks, owner } = options;
     this.dirOwner = options.dirOwner;
     this.fs = fs;
@@ -8682,7 +8730,6 @@ var UnlinkedKeeper = class {
     const { replacing } = this;
     const replace = async (target, op) => {
       const { promise, resolve: resolve2 } = Promise.withResolvers();
-      keeper.touch(target);
       let mine;
       const gated = () => {
         const before = replacing.get(target);
@@ -8693,10 +8740,9 @@ var UnlinkedKeeper = class {
         if (mine) mine.sealed = true;
       };
       try {
-        await op(gated, sealed);
+        await keeper.marks.around([target], () => op(gated, sealed));
       } finally {
         keeper.replaced += 1;
-        keeper.touch(target);
         resolve2();
         if (mine && replacing.get(target) === mine) replacing.delete(target);
       }
@@ -8747,25 +8793,15 @@ var UnlinkedKeeper = class {
         const target = fs.resolvePath("/", to);
         const source = fs.resolvePath("/", from);
         if (target === source) return fs.rename(from, to);
-        keeper.touch(source);
-        try {
-          await replace(target, async (gated, sealed) => {
+        await keeper.marks.around(
+          [source],
+          () => replace(target, async (gated, sealed) => {
             const pinned = await keeper.pin(target, gated, sealed);
             await keeper.settle(pinned, () => fs.rename(from, to));
-          });
-        } finally {
-          keeper.touch(source);
-        }
-      },
-      async symlink(target, path, owner) {
-        const at = fs.resolvePath("/", path);
-        keeper.touch(at);
-        try {
-          await fs.symlink(target, path, owner);
-        } finally {
-          keeper.touch(at);
-        }
+          })
+        );
       },
+      symlink: (target, path, owner) => keeper.marks.around([fs.resolvePath("/", path)], () => fs.symlink(target, path, owner)),
       readdir: async (path) => visible(await fs.readdir(path)),
       readdirStat: async (path) => (await fs.readdirStat(path)).filter(([name2]) => name2 !== UNLINKED_DIR).map(([name2, st]) => [name2, st && counted2(st)])
     };
@@ -8777,24 +8813,13 @@ var UnlinkedKeeper = class {
     }
   }
   generation() {
-    return this.gen;
+    return this.marks.generation();
   }
   changedSince(path, gen) {
-    if (gen < this.floor) return true;
-    for (let p = path; this.touched.size > 0; p = parentOf5(p)) {
-      if ((this.touched.get(p) ?? 0) > gen) return true;
-      if (p === "/") return false;
-    }
-    return false;
+    return this.marks.changedSince(path, gen);
   }
-  touch(target) {
-    this.gen += 1;
-    this.touched.delete(target);
-    this.touched.set(target, this.gen);
-    if (this.touched.size <= TOUCHED_MAX) return;
-    const [oldest, at] = this.touched.entries().next().value;
-    this.touched.delete(oldest);
-    this.floor = at;
+  inFlight(path) {
+    return this.marks.inFlight(path);
   }
   missed(path) {
     for (let p = path; this.replacing.size > 0; p = parentOf5(p)) {
@@ -10606,16 +10631,16 @@ var FreshModules = class {
         if (size < MAGIC.length && this.fresh.has(normalizePath(path))) await decide(path);
       };
     }
-    const bound2 = /* @__PURE__ */ new WeakMap();
+    const bound3 = /* @__PURE__ */ new WeakMap();
     return new Proxy(fs, {
       get(target, key, receiver) {
         if (Object.hasOwn(overrides, key)) return overrides[key];
         const value2 = Reflect.get(target, key, receiver);
         if (typeof value2 !== "function") return value2;
-        let method = bound2.get(value2);
+        let method = bound3.get(value2);
         if (method === void 0) {
           method = value2.bind(target);
-          bound2.set(value2, method);
+          bound3.set(value2, method);
         }
         return method;
       }
@@ -11855,6 +11880,12 @@ var HeldSet = class extends Set {
     holds2.onIdle = this.idle;
     return super.add(holds2);
   }
+  doubt(paths, over) {
+    for (const holds2 of this) {
+      for (const path of paths) holds2.doubt(path, true);
+      if (over !== void 0) holds2.doubt(over);
+    }
+  }
   delete(holds2) {
     const removed = super.delete(holds2);
     for (const path of /* @__PURE__ */ new Set([...holds2.keys(), ...holds2.opens.keys()])) this.idle(path);
@@ -11876,6 +11907,9 @@ var HeldPaths = class extends Map {
   uses = /* @__PURE__ */ new Map();
   lastHandle = 0;
   owning;
+  bound = /* @__PURE__ */ new Map();
+  doubted = /* @__PURE__ */ new Map();
+  doubts = 0;
   onIdle;
   keyOf(path) {
     return this.aliases.get(path) ?? path;
@@ -11896,6 +11930,21 @@ var HeldPaths = class extends Map {
   handlesAt(path) {
     return [...this.handles].filter(([, key]) => key === path).map(([id2]) => id2);
   }
+  doubt(over, exact = false) {
+    if (this.bound.size === 0) return;
+    for (const [handle, key] of this.handles) {
+      if (!this.bound.has(handle) || this.keptHandles.has(handle)) continue;
+      if (exact ? key === over : within6(key, over)) this.doubted.set(handle, ++this.doubts);
+    }
+  }
+  boundIno(handle) {
+    const doubt = this.doubted.get(handle);
+    const ino = this.bound.get(handle);
+    return doubt === void 0 || ino === void 0 ? void 0 : { ino, doubt };
+  }
+  trust(handle, doubt) {
+    if (this.doubted.get(handle) === doubt) this.doubted.delete(handle);
+  }
   keptFor(handle) {
     return this.keptHandles.get(handle);
   }
@@ -11932,8 +11981,16 @@ var HeldPaths = class extends Map {
     for (const file of [...this.uses.keys()]) this.letGo(file, true);
     this.keptHandles.clear();
   }
-  hold(path, on, open2 = false, real, handle) {
-    if (open2) return this.holdOpen(path, on, real, handle);
+  hold(path, on, open2 = false, real, handle, ino) {
+    if (open2) {
+      const made2 = this.holdOpen(path, on, real, handle);
+      if (handle !== void 0) {
+        this.bound.delete(handle);
+        this.doubted.delete(handle);
+      }
+      if (made2 !== void 0 && ino !== void 0) this.bound.set(made2, ino);
+      return made2;
+    }
     this.holdWrite(path, on);
     return void 0;
   }
@@ -13610,13 +13667,24 @@ async function holdOp(entry, path, req) {
       const real = await entry.fs.realpath?.(path, true).catch(() => path);
       await entry.source?.open(path, real);
       await stillThere(entry, path, req);
-      if (!r || !r.missed(path) && !r.changedSince(path, gen))
-        return json2(entry.hold?.(path, on, open2, real) ?? null);
+      if (req.nofollow && !await ownEntry(entry, path, real ?? path)) continue;
+      if (!r || !r.missed(path) && !r.changedSince(path, gen) && !r.inFlight?.(path))
+        return json2(entry.hold?.(path, on, open2, real, void 0, req.ino) ?? null);
     }
   }
   entry.hold?.(path, on, open2, void 0, req.handle);
   return done2;
 }
+async function ownEntry(entry, path, real) {
+  const own = await entry.fs.realpath?.(path, false).catch((err) => {
+    if (err.code !== "ENOENT") throw err;
+    return path;
+  });
+  if (own !== void 0 && own !== real) return false;
+  const st = await entry.fs.lstat(path);
+  if (st.isSymbolicLink) throw syncError("ELOOP", path);
+  return true;
+}
 async function followed(g, path) {
   const st = await g.fs.lstat(path).catch(() => void 0);
   if (st?.isSymbolicLink && !trustedLink(permOf(st), g.links)) deny(g, "follow", path);
@@ -13751,10 +13819,26 @@ async function linkedElsewhere(fs, path, from) {
   return !(source && source.ino === st.ino && source.dev === st.dev);
 }
 async function keptOr(entry, path, handle) {
-  if (handle !== void 0) return entry.keptFor?.(handle)?.hidden ?? path;
+  if (handle !== void 0) {
+    const hidden = entry.keptFor?.(handle)?.hidden;
+    if (hidden !== void 0) return hidden;
+    await bound(entry, path, handle);
+    return path;
+  }
   const kept = entry.unlinked?.(path);
   return kept && !await entry.fs.exists(path) ? kept.hidden : path;
 }
+async function bound(entry, path, handle) {
+  const bound3 = entry.boundIno?.(handle);
+  if (bound3 === void 0) return;
+  const now = await entry.fs.stat(path).catch(() => void 0);
+  if (now?.ino === bound3.ino) {
+    entry.trust?.(handle, bound3.doubt);
+    return;
+  }
+  staleFds++;
+  throw syncError("ESTALE", path);
+}
 async function keptStat(entry, req) {
   const hidden = entry.keptFor?.(req.handle ?? -1)?.hidden;
   if (hidden === void 0)
@@ -13781,6 +13865,10 @@ var served = 0;
 function servedFsCalls() {
   return served;
 }
+var staleFds = 0;
+function staleFdCount() {
+  return staleFds;
+}
 async function dispatchSyncFs(req) {
   served++;
   const entry = resolveSyncFsToken(req.token);
@@ -14556,6 +14644,8 @@ var SYS_TREE = {
     slicc_cwd_checks: (listing) => `${listing.cwdChecks ?? 0}
 `,
     slicc_rename_ack_busy: (listing) => `${listing.renameAcks?.busy ?? 0}
+`,
+    slicc_stale_fds: (listing) => `${listing.staleFds ?? 0}
 `,
     slicc_rename_acks: (listing) => {
       const samples = [...listing.renameAcks?.ackMs ?? []].sort((a, b) => a - b);
@@ -19228,7 +19318,7 @@ async function writeAll3(file, bytes) {
   const write = file.write;
   for (let at = 0; at < bytes.length; ) at += await write.call(file, bytes.subarray(at));
 }
-function bound(file, key) {
+function bound2(file, key) {
   const method = file[key];
   return typeof method === "function" ? { [key]: method.bind(file) } : {};
 }
@@ -19320,9 +19410,9 @@ function scrubbed(inner, scrubber, idleMs = SCRUB_IDLE_MS) {
     later(stream.idle());
   };
   return new OpenFile({
-    ...bound(file, "read"),
-    ...bound(file, "peek"),
-    ...bound(file, "stat"),
+    ...bound2(file, "read"),
+    ...bound2(file, "peek"),
+    ...bound2(file, "stat"),
     poll: () => {
       const state = pollFile(file);
       return quiet2() ? state : { ...state, writable: false };
@@ -25041,7 +25131,9 @@ function holdingToken(opts, holds2, caller) {
     ...opts.statfs ? { statfs: opts.statfs } : {},
     ...opts.renames ? { renames: opts.renames } : {},
     ...opts.renameSeq ? { renameSeq: opts.renameSeq } : {},
-    hold: (path, on, open2, real, handle) => holds2.hold(path, on, open2, real, handle),
+    hold: (path, on, open2, real, handle, ino) => holds2.hold(path, on, open2, real, handle, ino),
+    boundIno: holds2.boundIno.bind(holds2),
+    trust: holds2.trust.bind(holds2),
     keptFor: (handle) => holds2.keptFor(handle),
     unlinked: (path) => holds2.keptAt(path),
     gate: (path, op) => opts.unlinkGate && holds2.holding(path) ? opts.unlinkGate.run(holds2.keyOf(path), op) : op(),
@@ -28971,6 +29063,7 @@ var Launcher = class {
   fstabRetries;
   inserted = /* @__PURE__ */ new Map();
   openFiles = /* @__PURE__ */ new Set();
+  pathMarks = new PathMarks();
   deciding = /* @__PURE__ */ new Map();
   identities = { asked: 0, timedOut: 0 };
   nodes;
@@ -29091,6 +29184,7 @@ var Launcher = class {
     this.openFiles.add(this.nodes);
     options.fs.onPeer?.(() => this.flushOpen());
     options.fs.remoteChanges?.((change) => {
+      this.held.doubt(change.paths, change.moved?.to);
       if (change.moved) this.moved(change.moved.from, change.moved.to);
       this.changes.flush();
       this.cwds.touched(change.paths, change.trees);
@@ -29105,6 +29199,7 @@ var Launcher = class {
         locks: webLocks(),
         busy: (path) => [...this.openFiles].some((nodes) => nodes.holds(path)),
         owner: options.unlinkOwner,
+        marks: this.pathMarks,
         ...this.owners ? { dirOwner: { uid: 0, gid: 0, mode: 448 } } : {}
       }
     );
@@ -30102,7 +30197,8 @@ var Launcher = class {
         opfsCalls: this.rootFs.opfsCalls?.() ?? 0,
         opfsOps: this.rootFs.opfsOps?.() ?? 0,
         cwdChecks: this.cwds.checks,
-        renameAcks: this.rootFs.renameWaits?.()
+        renameAcks: this.rootFs.renameWaits?.(),
+        staleFds: staleFdCount()
       }),
       sudo: (call, signal) => this.sudo(pid, call, signal),
       crontab: (call) => this.crontab(pid, call),
@@ -31026,6 +31122,7 @@ var Launcher = class {
         locks: webLocks(),
         busy: (path) => [...this.openFiles].some((open2) => open2.holds(path)),
         owner: this.unlinkOwnerOption,
+        marks: this.pathMarks,
         ...this.owners ? { dirOwner: { uid: 0, gid: 0, mode: 448 } } : {}
       }
     );
@@ -31079,6 +31176,7 @@ var Launcher = class {
     this.renameLog.add(from, to);
     if (source) return;
     for (const nodes of this.openFiles) nodes.renamed(from, to);
+    for (const holds2 of this.held) holds2.renamed(from, to);
     this.watchers.moved(from, to);
   }
   processChain(fs, nodes, unlinked) {