@ai-ecoverse/slicc-kernel 1.165.2 → 1.166.0

package/dist/node.js

@@ -3684,7 +3684,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.165.2" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.166.0" : "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
@@ -20000,6 +20000,7 @@ function within7(path, root) {
   return path === root || path.startsWith(root.endsWith("/") ? root : `${root}/`);
 }
 var VfsNode = class {
+  fid;
   data;
   ranged;
   pin;
@@ -20307,6 +20308,7 @@ var VfsNodes = class {
   keepsOnDisk = false;
   changed;
   movedAway;
+  opened;
   dirtied;
   fs;
   entries;
@@ -20466,6 +20468,7 @@ var VfsNodes = class {
     node.ino ??= ino;
     node.opens++;
     if (writable2) node.writers++;
+    if (node.opens === 1) this.opened?.(node);
     return node;
   }
   adopt(path, contents2, dirty, writable2 = false, id2) {
@@ -20477,6 +20480,7 @@ var VfsNodes = class {
     }
     node.opens++;
     if (writable2) node.writers++;
+    if (node.opens === 1) this.opened?.(node);
     return node;
   }
   holds(prefix) {
@@ -20503,6 +20507,32 @@ var VfsNodes = class {
   held() {
     return this.byPath.keys();
   }
+  heldIds() {
+    const out = [];
+    for (const [path, node] of this.byPath) if (!this.kept.has(node)) out.push([path, node.fid]);
+    return out;
+  }
+  holdsAt(path) {
+    return this.byPath.has(path);
+  }
+  async bindIds(id2) {
+    for (const [path, node] of [...this.byPath]) {
+      if (node.fid !== void 0 || this.kept.has(node)) continue;
+      node.fid = await id2(path)?.catch(() => void 0);
+    }
+  }
+  keepBound(paths, fid, file) {
+    for (const at of paths) {
+      const node = this.byPath.get(at);
+      if (!node || this.kept.has(node) || node.fid !== fid) continue;
+      this.byPath.delete(at);
+      node.renamedTo(file.hidden);
+      this.byPath.set(file.hidden, node);
+      this.kept.set(node, file);
+      return true;
+    }
+    return false;
+  }
   owns() {
     return false;
   }
@@ -30566,7 +30596,7 @@ var Launcher = class {
     enableCdp(this.net, this.cdp);
     this.facades.enable(this.net);
     const fs = this.commandFs(this.base);
-    this.nodes = new VfsNodes(fs, (path) => this.released(path));
+    this.nodes = this.openNodes(fs);
     this.nodes.keepsOnDisk = true;
     this.openFiles.add(this.nodes);
     options.fs.onPeer?.(() => this.flushOpen());
@@ -32127,8 +32157,8 @@ var Launcher = class {
     const at = normalizePath(path);
     this.unlinked.closed(at);
     this.writers?.unlinked.closed(at);
-    if (![...this.held].some((holds2) => holds2.holding(at)))
-      void this.rootFs.announceHolds?.([], [at], false);
+    const holding = [...this.held].some((holds2) => holds2.holding(at)) || [...this.openFiles].some((open2) => open2.holdsAt(at));
+    if (!holding) void this.rootFs.announceHolds?.([], [at], false);
     const open = [...this.openFiles].some((nodes) => nodes.writes(at)) || heldUnder(this.held, at);
     if (!open) void this.mounts.commit(at).catch(() => void 0);
   }
@@ -32654,13 +32684,34 @@ var Launcher = class {
       (holds2) => [holds2, [...holds2.boundAt(path, fid), ...holds2.boundAt(hidden, fid)]]
     );
     const keeping = bound3.filter(([, ids]) => ids.length > 0);
-    const file = this.unlinked.adopt(hidden, Math.max(keeping.length, 1));
-    if (keeping.length === 0) file.release();
+    const nodes = [...this.openFiles].filter(
+      (open) => [path, hidden].some((at) => open.holdsAt(at))
+    );
+    const file = this.unlinked.adopt(hidden, Math.max(keeping.length + nodes.length, 1));
+    const kept = nodes.filter((open) => open.keepBound([hidden, path], fid, file)).length;
+    for (let i = kept; i < nodes.length; i++) file.release();
+    if (keeping.length === 0 && nodes.length === 0) file.release();
     for (const [holds2, ids] of keeping) holds2.keepBound(ids, path, file);
     void this.rootFs.announceHolds?.([], [path, hidden], false);
   }
+  openNodes(fs, entries) {
+    const nodes = new VfsNodes(fs, (path) => this.released(path), entries);
+    nodes.opened = (node) => this.nodeOpened(node);
+    return nodes;
+  }
+  nodeOpened(node) {
+    const path = node.path;
+    if (this.locks.shared?.() !== true || this.mounts.locate(path) !== void 0) return;
+    void (async () => {
+      node.fid ??= await this.rootFileId(path)?.catch(() => void 0);
+      if (node.opens > 0) await this.rootFs.announceHolds?.([[node.path, node.fid]], [], false);
+    })();
+  }
   announceHeld() {
-    const held = this.held.heldIds().filter(([path]) => this.mounts.locate(path) === void 0);
+    const nodes = [...this.openFiles].flatMap((open) => open.heldIds());
+    const held = [...this.held.heldIds(), ...nodes].filter(
+      ([path]) => this.mounts.locate(path) === void 0 && !path.startsWith(`/${UNLINKED_DIR}/`)
+    );
     return held.length === 0 ? void 0 : this.rootFs.announceHolds?.(held, [], false);
   }
   rootFileId(path) {
@@ -32674,7 +32725,9 @@ var Launcher = class {
       this.changes.flush();
       this.changes.foreign(crowded);
       if (crowded) {
-        void this.held?.bindIds((path) => this.rootFileId(path)).then(() => this.announceHeld());
+        void this.held.bindIds((path) => this.rootFileId(path)).then(
+          () => Promise.all([...this.openFiles].map((open) => open.bindIds((p) => this.rootFileId(p))))
+        ).then(() => this.announceHeld());
         for (const nodes of this.openFiles) nodes.shared();
       }
     });
@@ -32699,7 +32752,7 @@ var Launcher = class {
   writerStack() {
     const mounted = this.mounts.wrap(this.unguardedRoot);
     const fs = this.commandFs(this.rooted(mounted));
-    const nodes = new VfsNodes(fs, (path) => this.released(path), this.nodes.entries);
+    const nodes = this.openNodes(fs, this.nodes.entries);
     nodes.keepsOnDisk = true;
     this.openFiles.add(nodes);
     const unlinked = new UnlinkedKeeper(
@@ -32764,6 +32817,7 @@ var Launcher = class {
   moved(from, to, source) {
     this.renameLog.add(from, to);
     for (const holds2 of this.held) holds2.renamed(from, to);
+    if (this.mounts.locate(to) === void 0) this.rootFs.rehold?.(from, to);
     if (source) return;
     for (const nodes of this.openFiles) nodes.renamed(from, to);
     this.watchers.moved(from, to);