@ai-ecoverse/slicc-kernel 1.29.2 → 1.30.1

package/dist/node-process-worker.js

@@ -4156,18 +4156,20 @@ function kernelEntry2() {
 function deviceEntry(meta) {
   return { type: "device", device: meta.device, ...meta.access ? { access: meta.access } : {} };
 }
+function preopenOf(e) {
+  return {
+    ...e.preopen ? { preopen: e.preopen } : {},
+    ...e.twin !== void 0 ? { twin: e.twin } : {}
+  };
+}
 function metaOf(e) {
-  if (e.type === "dir") return { dir: e.path, ...e.preopen ? { preopen: e.preopen } : {} };
+  if (e.type === "dir") return { dir: e.path, ...preopenOf(e) };
   if (e.type === "device") return { device: e.device, ...e.access ? { access: e.access } : {} };
   return void 0;
 }
 function entryOf(info) {
   if (info.meta && "dir" in info.meta) {
-    return {
-      type: "dir",
-      path: info.meta.dir,
-      ...info.meta.preopen ? { preopen: info.meta.preopen } : {}
-    };
+    return { type: "dir", path: info.meta.dir, ...preopenOf(info.meta) };
   }
   if (info.meta && "device" in info.meta) return deviceEntry(info.meta);
   if (info.kind === "held") return void 0;
@@ -4227,9 +4229,9 @@ var init_wasi_fds = __esm({
         this.kernel = kernel;
         this.fs = fs;
       }
-      setup(cwd, inherited) {
+      setup(cwd, inherited, root = false) {
         for (const fd of [0, 1, 2]) this.table.set(fd, kernelEntry2());
-        const preopens = this.preopens(cwd);
+        const preopens = this.preopens(cwd, root);
         const top = 3 + preopens.length;
         for (const { fd, kind, flags, device } of inherited) {
           let at = fd;
@@ -4249,8 +4251,10 @@ var init_wasi_fds = __esm({
           this.table.set(3 + i, entry);
         });
       }
-      preopens(cwd) {
-        const out = [{ type: "dir", path: normalize(cwd), preopen: "." }];
+      preopens(cwd, root) {
+        const here = normalize(cwd);
+        const dot = { type: "dir", path: here, preopen: "." };
+        const out = [dot];
         let names = [];
         try {
           names = this.fs.readdir("/");
@@ -4268,6 +4272,13 @@ var init_wasi_fds = __esm({
           } catch {
           }
         }
+        if (root) {
+          out.push(
+            { type: "dir", path: "/", preopen: "/" },
+            { type: "dir", path: here, preopen: "./" }
+          );
+          dot.twin = 3 + out.length - 1;
+        }
         return out;
       }
       find(fd) {
@@ -4419,8 +4430,13 @@ var init_wasi_fds = __esm({
       chdir(path) {
         const dot = this.find(3);
         if (dot?.type !== "dir" || dot.preopen !== ".") return;
-        dot.path = path;
-        this.kernel.call({ op: "fd-meta", fd: 3, meta: { dir: path, preopen: "." } });
+        const moved = [[3, dot]];
+        const twin = dot.twin === void 0 ? void 0 : this.find(dot.twin);
+        if (twin?.type === "dir" && twin.preopen === "./") moved.push([dot.twin, twin]);
+        for (const [fd, e] of moved) {
+          e.path = path;
+          this.kernel.call({ op: "fd-meta", fd, meta: metaOf(e) });
+        }
         this.bump();
       }
       promoteFiles() {
@@ -4448,8 +4464,7 @@ var init_wasi_fds = __esm({
         for (const [fd, e] of this.table) {
           if (e.type === "kernel")
             out.push({ fd, type: "kernel", nonblock: e.nonblock, append: e.append });
-          else if (e.type === "dir")
-            out.push({ fd, type: "dir", path: e.path, ...e.preopen ? { preopen: e.preopen } : {} });
+          else if (e.type === "dir") out.push({ fd, type: "dir", path: e.path, ...preopenOf(e) });
           else if (e.type === "device") out.push({ fd, ...deviceEntry(e) });
         }
         return out;
@@ -4460,11 +4475,7 @@ var init_wasi_fds = __esm({
           if (f.type === "kernel")
             this.table.set(f.fd, { type: "kernel", nonblock: f.nonblock, append: f.append });
           else if (f.type === "dir")
-            this.table.set(f.fd, {
-              type: "dir",
-              path: f.path,
-              ...f.preopen ? { preopen: f.preopen } : {}
-            });
+            this.table.set(f.fd, { type: "dir", path: f.path, ...preopenOf(f) });
           else this.table.set(f.fd, deviceEntry(f));
         }
         for (const fd of cloexec) this.cloexec.add(fd);
@@ -4926,7 +4937,7 @@ var init_wasi_host = __esm({
         this.fds = new WasiFds(o.kernel, o.fs);
         if (o.shared) this.fds.share(o.shared, true);
         else if (o.forked) this.fds.restore(o.forked.fds, o.forked.cloexec);
-        else this.fds.setup(o.cwd, o.inherited ?? []);
+        else this.fds.setup(o.cwd, o.inherited ?? [], o.preopenRoot === true);
         this.listening = o.shared ? [] : this.fds.sockets();
       }
       get cwd() {
@@ -7343,6 +7354,11 @@ function merge(base, extra) {
   for (const [ns, values] of Object.entries(extra)) out[ns] = { ...base[ns], ...values };
   return out;
 }
+function descriptors(init, fork, threads) {
+  if (fork?.shared && threads) return { shared: threads.ids };
+  if (fork) return { forked: { fds: fork.fds, cloexec: fork.cloexec } };
+  return { inherited: init.fds ?? [], ...init.program.preopenRoot ? { preopenRoot: true } : {} };
+}
 async function runWasiProcess(init, port2) {
   captureBacktraces(init.env);
   const signals = new WasiSignals((sig) => {
@@ -7377,7 +7393,7 @@ async function runWasiProcess(init, port2) {
     parent: () => identify(transport, init).ppid,
     kernel: { sys: traced(stats, "kernel", sys), call: call2 },
     fs: cachingBridge(traced(stats, "fs", createSyncFsSabBridge(transport))),
-    ...fork?.shared && threads ? { shared: threads.ids } : fork ? { forked: { fds: fork.fds, cloexec: fork.cloexec } } : { inherited: init.fds }
+    ...descriptors(init, fork, threads)
   });
   if (threads) {
     threads.beforeSpawn = () => {