@ai-ecoverse/slicc-kernel 1.147.5 → 1.147.7

package/dist/kernel-worker.js

@@ -1091,7 +1091,7 @@ var RemoteWatch = class {
     if (data.ack !== void 0 && data.to === this.tab && data.from !== void 0) {
       this.acked(data.ack, data.from);
     }
-    if (data.changed !== void 0) this.emit({ paths: data.changed, trees: [] });
+    if (data.changed !== void 0) this.emit({ paths: data.changed, trees: [], content: true });
   }
   arrived(peer) {
     this.peers.add(peer);
@@ -1400,6 +1400,18 @@ var Extent = class {
 };
 var LOCKED = /* @__PURE__ */ new Set(["NotReadableError", "NoModificationAllowedError", "InvalidStateError"]);
 var SYNC_BACKOFF_MS = [5, 10, 20, 40, 80];
+async function unlocked(name2, op) {
+  for (let attempt = 0; ; attempt++) {
+    try {
+      return await op();
+    } catch (err) {
+      if (!LOCKED.has(err?.name)) throw err;
+      const delay = SYNC_BACKOFF_MS[attempt];
+      if (delay === void 0) throw fsError("EBUSY", name2);
+      await new Promise((resolve2) => setTimeout(resolve2, delay));
+    }
+  }
+}
 async function openSync(handle) {
   const sync = handle.createSyncAccessHandle;
   if (!sync) return void 0;
@@ -1526,7 +1538,12 @@ var OpfsFs = class {
       meta.listen?.((c) => {
         for (const path of [...c.paths ?? [], ...c.trees ?? []]) this.forget(path);
         const moved2 = movedOf(c.moved);
-        remote?.emit({ paths: c.paths ?? [], trees: c.trees ?? [], ...moved2 ? { moved: moved2 } : {} });
+        remote?.emit({
+          paths: c.paths ?? [],
+          trees: c.trees ?? [],
+          content: true,
+          ...moved2 ? { moved: moved2 } : {}
+        });
       });
       remote?.listen((c) => {
         for (const path of [...c.paths, ...c.trees]) this.forget(path);
@@ -2594,7 +2611,10 @@ var OpfsFs = class {
       try {
         await this.inDir(
           dir,
-          (parent) => this.io(parent.removeEntry(name2, { recursive: options.recursive === true }))
+          (parent) => unlocked(
+            name2,
+            () => this.io(parent.removeEntry(name2, { recursive: options.recursive === true }))
+          )
         );
       } catch (err) {
         throw translate(err, path);
@@ -7785,7 +7805,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.147.5" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.147.7" : "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
@@ -9938,6 +9958,7 @@ var RealmProxy = class {
     const stopping = () => socket.close(1001, "the proxy is stopping");
     stop.addEventListener("abort", stopping, { once: true });
     let guestDone = false;
+    let guestClosed = false;
     let closeSent = false;
     const outbound2 = (async () => {
       for await (const data of socket.messages) {
@@ -9951,6 +9972,7 @@ var RealmProxy = class {
       if (guestDone) return;
       closeSent = true;
       await toGuest(closeFrame(wireCode(closed.code), closed.reason));
+      if (guestClosed) return;
       AbortSignal.timeout(this.limits.closeWaitMs).addEventListener("abort", () => done5.abort(), {
         once: true
       });
@@ -9965,15 +9987,13 @@ var RealmProxy = class {
           continue;
         }
         if (event.kind === "close") {
-          guestDone = true;
           if (closeSent) break;
+          guestClosed = true;
           const code = wireCode(event.code);
           socket.close(code, event.reason);
-          const reply = await Promise.race([
-            socket.closed,
-            quietly(this.limits.closeWaitMs).then(() => ({ code, reason: event.reason }))
-          ]);
-          await toGuest(closeFrame(wireCode(reply.code), reply.reason));
+          await Promise.race([outbound2, quietly(this.limits.closeWaitMs)]);
+          guestDone = true;
+          if (!closeSent) await toGuest(closeFrame(code, event.reason));
           break;
         }
         while (socket.buffered > SEND_BUFFER2 && !reading.aborted) await quietly(10);
@@ -10829,13 +10849,14 @@ var FsWatchers = class {
       this.watchers.delete(watcher);
     };
   }
-  typedWatch(root, recursive, alias) {
+  typedWatch(root, recursive, alias, directory = recursive) {
     const main = normalizePath(root);
     const other = alias === void 0 ? main : normalizePath(alias);
     const watch = {
       roots: other === main ? [main] : [main, other],
       names: /* @__PURE__ */ new Map(),
       recursive,
+      directory,
       notes: [],
       overflowed: false,
       ended: false,
@@ -10923,6 +10944,19 @@ var FsWatchers = class {
         if (!followed2.has(watch)) route(watch, "rename", at, seq2);
     }
   }
+  heard(type, paths) {
+    if (this.typed.size === 0) return;
+    for (const path of paths) {
+      const at = normalizePath(path);
+      const seq2 = ++this.seq;
+      for (const watch of [...this.typed]) {
+        if (type === "rename" && watch.roots.some((root) => at === root || under3(root, at)))
+          continue;
+        if (type === "change" && watch.directory && watch.roots.includes(at)) continue;
+        route(watch, type, at, seq2);
+      }
+    }
+  }
   changed(...paths) {
     this.report(paths);
     this.emit("change", paths);
@@ -29278,6 +29312,8 @@ var Launcher = class {
       this.changes.flush();
       this.cwds.touched(change.paths, change.trees);
       this.rewritten(change.paths, change.trees);
+      this.watchers.heard(change.content ? "change" : "rename", change.paths);
+      this.watchers.heard("rename", change.trees ?? []);
     });
     const holders = [this.held, this.openFiles];
     this.unlinked = new UnlinkedKeeper(
@@ -30092,9 +30128,18 @@ var Launcher = class {
     return id2().then(
       (before) => read().then(
         (first) => id2().then(
-          (after) => after.exeId === before.exeId ? [first, after] : this.reread(target, read).then(
-            (again) => id2().then((last) => [again, last])
-          )
+          (after) => {
+            if (after.exeId === before.exeId) return [first, after];
+            const gone = [
+              first,
+              { exeId: `gone:${crypto.randomUUID()}` }
+            ];
+            if (after.exeId === void 0) return gone;
+            return this.reread(target, read).then(
+              (again) => id2().then((last) => [again, last]),
+              () => gone
+            );
+          }
         )
       )
     );
@@ -30956,7 +31001,12 @@ var Launcher = class {
         if (g) await readable(g, "watch", at);
         const st = await this.fs.stat(at);
         const real = await this.fs.realpath?.(at, true).catch(() => at) ?? at;
-        const watch = this.watchers.typedWatch(real, recursive && st.isDirectory, at);
+        const watch = this.watchers.typedWatch(
+          real,
+          recursive && st.isDirectory,
+          at,
+          st.isDirectory
+        );
         if (!g || g.cred.euid === 0) return watch;
         return visibleTo2(watch, real, async (dir) => {
           const walked = await access(g.fs, g.cred, dir, R_OK | X_OK, { directory: true });