@ai-ecoverse/slicc-kernel 1.147.10 → 1.148.1

package/dist/kernel-worker.js

@@ -1071,6 +1071,9 @@ var RemoteWatch = class {
       await new Promise((resolve2) => setTimeout(resolve2, ANNOUNCE_POLL_MS));
     }
   }
+  legacy() {
+    return [...this.peers].filter((peer) => !this.ackers.has(peer));
+  }
   crowded() {
     return !this.settled || this.peers.size > 0;
   }
@@ -1078,7 +1081,7 @@ var RemoteWatch = class {
     return `${this.name}:${tab}`;
   }
   receive(data) {
-    const sender = data.hello ?? data.here;
+    const sender = data.hello ?? data.here ?? (data.paths !== void 0 ? data.tab : void 0);
     if (sender !== void 0 && data.renames) this.ackers.add(sender);
     if (data.hello !== void 0) this.greeted(data.hello);
     if (data.renaming !== void 0 && data.tab !== void 0) this.heard(data);
@@ -1185,7 +1188,7 @@ var RemoteWatch = class {
   announce(paths) {
     this.mine = [...paths];
     const seq2 = ++this.seq;
-    this.channel.postMessage({ tab: this.tab, paths: this.mine, seq: seq2 });
+    this.channel.postMessage({ tab: this.tab, paths: this.mine, seq: seq2, renames: true });
     return this.acks(seq2, this.peers);
   }
   renamingTree(rename, cap = RENAME_ACK_MAX_MS) {
@@ -1564,6 +1567,19 @@ var OpfsFs = class {
     for (const path of paths) this.forget(path);
     this.channel?.postMessage(paths);
   }
+  async fileId(path) {
+    const found = await this.locate(path, true);
+    const [entry] = await this.meta.get([found.path]);
+    if (entry?.fid !== void 0) return entry.fid;
+    const fid = crypto.randomUUID();
+    await this.meta.update(found.path, (now) => ({
+      ...occupied(now),
+      path: found.path,
+      fid: now?.fid ?? fid
+    }));
+    const [stored] = await this.meta.get([found.path]);
+    return stored?.fid ?? fid;
+  }
   heldUnder = () => [];
   heldBy(held) {
     this.heldUnder = held;
@@ -2161,6 +2177,7 @@ var OpfsFs = class {
       atime: new Date(meta?.atimeMs ?? mtime),
       ctime: new Date(Math.max(touched ?? meta?.ctimeMs ?? mtime, modified)),
       ino: meta?.ino ?? inodeOf(path),
+      ...meta?.fid !== void 0 ? { fid: meta.fid } : {},
       ...this.ranged && !directory ? { ranged: true } : {}
     };
   }
@@ -2798,6 +2815,17 @@ var OpfsFs = class {
   }
   async admitted(locks, lock, from, to, place, hooks) {
     const remote = this.remote;
+    const older = remote?.legacy() ?? [];
+    if (older.length > 0) {
+      this.ackBusy++;
+      if (!this.warnedLegacy) {
+        this.warnedLegacy = true;
+        console.warn(
+          `slicc-kernel: renaming ${from} to ${to} gave up (EBUSY): a tab running an older slicc-kernel shares this root and can't be waited for; reload it to rename directories (#1309)`
+        );
+      }
+      throw fsError("EBUSY", from);
+    }
     if (remote && !this.shared() && !await remote.joinedAll(RENAME_ACK_MAX_MS)) {
       this.ackBusy++;
       console.warn(
@@ -2848,6 +2876,7 @@ var OpfsFs = class {
     await run2;
   }
   renameAcks = 0;
+  warnedLegacy = false;
   ackBusy = 0;
   ackMs = [];
   ownLocks = /* @__PURE__ */ new Set();
@@ -7826,7 +7855,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.147.10" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.148.1" : "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
@@ -13429,6 +13458,7 @@ function statJson(s) {
     atimeMs: s.atime.getTime(),
     ctimeMs: s.ctime.getTime(),
     ino: s.ino,
+    ...s.fid !== void 0 ? { fid: s.fid } : {},
     ...s.nlink !== void 0 ? { nlink: s.nlink } : {},
     ...s.dev !== void 0 ? { dev: s.dev } : {},
     ...s.readonly ? { readonly: true } : {},
@@ -30161,7 +30191,9 @@ var Launcher = class {
             ];
             if (after.exeId === void 0) return gone;
             return this.reread(target, read).then(
-              (again) => id2().then((last) => [again, last]),
+              (again) => id2().then(
+                (last) => [again, last.exeId === after.exeId ? last : gone[1]]
+              ),
               () => gone
             );
           }
@@ -30179,8 +30211,13 @@ var Launcher = class {
     if (target.abi !== "wasi" || (target.copy ?? target.glue) !== target.wasm) {
       return Promise.resolve({});
     }
+    const assign = this.mounts.locate(target.wasm) === void 0 ? this.rootFs.fileId : void 0;
     return this.base.stat(target.wasm).then(
-      (st) => exeIdOf(fileIdentity(st.ino, st.mtime.getTime())),
+      async (st) => {
+        const fid = st.fid ?? await assign?.call(this.rootFs, target.wasm);
+        if (fid === void 0) return exeIdOf(fileIdentity(st.ino, st.mtime.getTime()));
+        return { exeId: `fid:${fid}:${st.mtime.getTime()}` };
+      },
       () => ({})
     );
   }