@ai-ecoverse/slicc-kernel 1.134.3 → 1.134.4

package/dist/node-process-worker.js

@@ -6591,6 +6591,84 @@ var init_wasi_imports = __esm({
   }
 });
 
+// src/kernel/held-cwd.ts
+var CWD_SLOTS, UNTRACKED, HeldCwd;
+var init_held_cwd = __esm({
+  "src/kernel/held-cwd.ts"() {
+    "use strict";
+    CWD_SLOTS = 1024;
+    UNTRACKED = CWD_SLOTS - 1;
+    HeldCwd = class {
+      view;
+      seen;
+      dead = false;
+      slot;
+      at;
+      ask;
+      constructor(sab, slot2, ask, state) {
+        this.view = new Int32Array(sab);
+        this.slot = slot2;
+        this.ask = ask;
+        this.seen = state.seen;
+        this.dead = state.dead;
+        this.at = state.path;
+      }
+      moved(reply, path) {
+        if (reply.slot === void 0) return false;
+        this.slot = reply.slot;
+        this.seen = reply.seen ?? Atomics.load(this.view, reply.slot);
+        this.dead = reply.dead === true;
+        this.at = path;
+        return true;
+      }
+      follow() {
+        const answer2 = this.ask();
+        if (answer2.slot !== void 0) this.slot = answer2.slot;
+        this.seen = answer2.gen;
+        this.dead = !answer2.alive;
+        return answer2.alive;
+      }
+      alive(path) {
+        if (path !== void 0 && this.at !== void 0 && path !== this.at) {
+          this.at = path;
+          return this.follow();
+        }
+        if (this.dead) return false;
+        if (Atomics.load(this.view, this.slot) === this.seen) return true;
+        return this.follow();
+      }
+      get current() {
+        return this.slot;
+      }
+    };
+  }
+});
+
+// src/realm/emscripten-held-cwd.ts
+function holdingCwd(Fs, held2, chdirred) {
+  const { chdir, cwd } = Fs;
+  if (!chdir || !cwd) return;
+  Fs.sliccHeldCwd = () => cwd.call(Fs);
+  Fs.sliccCwdGone = () => !held2.alive();
+  Fs.cwd = () => {
+    const path = cwd.call(Fs);
+    return held2.alive() ? path : `${path}${DELETED}`;
+  };
+  Fs.chdir = (path) => {
+    chdir.call(Fs, path);
+    held2.moved(chdirred(cwd.call(Fs)));
+  };
+}
+var DELETED, relativeHere, cwdFor;
+var init_emscripten_held_cwd = __esm({
+  "src/realm/emscripten-held-cwd.ts"() {
+    "use strict";
+    DELETED = " (deleted)";
+    relativeHere = (path) => !path.startsWith("/") && path.split("/")[0] !== "..";
+    cwdFor = (cwd, held2, path) => held2 && relativeHere(path) && !held2.alive() ? `${cwd}${DELETED}` : cwd;
+  }
+});
+
 // src/version.ts
 function procVersion() {
   return `Linux version ${OS_RELEASE} (slicc-kernel ${KERNEL_VERSION}) #1 SMP PREEMPT_DYNAMIC
@@ -6600,7 +6678,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.134.3" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.134.4" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -7791,7 +7869,7 @@ function createSyncSabTransport(sab, port3, deps = {}) {
     call(req, timeoutMs2, label, transfer = []) {
       if (deps.memory) publishMemory(sab, deps.memory());
       const id = ++seq;
-      calls += Number(!PATH_OPS.has(req.op));
+      calls += Number(!UNCOUNTED_OPS.has(req.op));
       let out = null;
       let status2 = 0;
       let offset = 0;
@@ -8013,7 +8091,7 @@ function createSyncFsSabBridge(transport, opts = {}) {
     statfs: (path = "/") => parseSyncFsUsage(json2({ op: "statfs", path }, path))
   };
 }
-var PATH_OPS, calls, looks, SPIN_MS, SPIN_STRIDE, SPIN_STRIDES, SPIN_CORES, spinning, SPIN_CAP_MS;
+var UNCOUNTED_OPS, calls, looks, SPIN_MS, SPIN_STRIDE, SPIN_STRIDES, SPIN_CORES, spinning, SPIN_CAP_MS;
 var init_sync_sab_bridge = __esm({
   "src/realm/sync-sab-bridge.ts"() {
     "use strict";
@@ -8021,7 +8099,7 @@ var init_sync_sab_bridge = __esm({
     init_cpu_clock();
     init_sync_fs_wire();
     init_sync_sab_wire();
-    PATH_OPS = new Set(SYNC_FS_OPS);
+    UNCOUNTED_OPS = /* @__PURE__ */ new Set([...SYNC_FS_OPS, "cwd-check", "cwd-chdir"]);
     calls = 0;
     looks = 0;
     SPIN_MS = 0.06;
@@ -10068,6 +10146,15 @@ function kernelChecks(Fs, memory, call2) {
   bridge.access(liveNodePath(node), call2.amode, kind, (call2.flags & AT_SYMLINK_NOFOLLOW2) !== 0);
   return 0;
 }
+function goneCwdGetcwd(imports, fs, glue) {
+  wrapImport(
+    imports,
+    "getcwd",
+    glue,
+    (own) => (...args) => fs()?.sliccCwdGone?.() === true ? -44 : own(...args),
+    true
+  );
+}
 function kernelAccess(imports, fs, memory, glue) {
   wrapImport(imports, "faccessat", glue, (own) => (dirfd, path, amode, flags) => {
     const Fs = fs();
@@ -10255,7 +10342,8 @@ var init_process_fds = __esm({
       fdWrite: "fd_write",
       fdRead: "fd_read",
       sleepMs: "slicc_sleep_ms",
-      flock: "__syscall_flock"
+      flock: "__syscall_flock",
+      getcwd: "__syscall_getcwd"
     };
     UTIME_NOW = 1073741823;
     UTIME_OMIT = 1073741822;
@@ -10707,6 +10795,8 @@ var init_procfs = __esm({
         slicc_opfs_calls: (listing2) => `${listing2.opfsCalls ?? 0}
 `,
         slicc_opfs_ops: (listing2) => `${listing2.opfsOps ?? 0}
+`,
+        slicc_cwd_checks: (listing2) => `${listing2.cwdChecks ?? 0}
 `
       }
     };
@@ -12907,7 +12997,7 @@ function forkRestarted(deps, state, snapshotAt) {
       const live = deps.memory?.();
       if (live) memory = new Uint8Array(live.buffer).slice();
     }
-    const forked = { ...state, memory, streams: streams2, cwd: deps.Fs.cwd() };
+    const forked = { ...state, memory, streams: streams2, cwd: heldCwdOf(deps.Fs) };
     return deps.transport.call(
       { op: "proc-fork", state: forked, restart: true },
       Infinity,
@@ -13047,7 +13137,7 @@ function createProcessKernel(deps) {
       file,
       argv,
       env: env ?? deps.env,
-      cwd: cwd ?? Fs.cwd(),
+      cwd: cwd ?? heldCwdOf(Fs),
       ...cwd !== null ? { chdir: true } : {},
       stdio,
       ...inherit.length > 0 ? { inherit } : {},
@@ -13143,7 +13233,7 @@ function createProcessKernel(deps) {
     }
   };
 }
-var S_IFMT3, UNSEEDED, S_IFDIR2, POLLIN2, POLLOUT2, POLLERR2, POLLHUP2, POLLNVAL, SELECT_SLICE_MS, WUNTRACED, WCONTINUED;
+var S_IFMT3, UNSEEDED, S_IFDIR2, POLLIN2, POLLOUT2, POLLERR2, POLLHUP2, POLLNVAL, SELECT_SLICE_MS, WUNTRACED, WCONTINUED, heldCwdOf;
 var init_process_children = __esm({
   "src/process/process-children.ts"() {
     "use strict";
@@ -13162,6 +13252,7 @@ var init_process_children = __esm({
     SELECT_SLICE_MS = 20;
     WUNTRACED = 2;
     WCONTINUED = 8;
+    heldCwdOf = (Fs) => (Fs.sliccHeldCwd ?? Fs.cwd).call(Fs);
   }
 });
 
@@ -13782,6 +13873,7 @@ function kernelWrappers(imports, module, deps) {
   const fsOf = () => ownValue(module, "FS");
   noFollowUtimes(imports, fsOf, kernelGlue?.utimensat ?? utimensatOf(module), memory);
   kernelAccess(imports, fsOf, memory, kernelGlue);
+  goneCwdGetcwd(imports, fsOf, kernelGlue);
   kernelLink(imports, fsOf, memory, kernelGlue);
   devCreations(imports, fsOf, memory, kernelGlue);
   kernelUname(imports, hostnameOf(init.env), memory, kernelGlue);
@@ -13799,6 +13891,19 @@ function kernelWrappers(imports, module, deps) {
   reportGrowth(imports, grown, kernelGlue);
   holdWhileStopped(imports, new Int32Array(init.sab, 0, SAB_HEADER_I32), kernelGlue, deps.poll);
 }
+function heldIn(fs, init, transport) {
+  if (!init.held) return;
+  const ask = (req) => {
+    const r = transport.call(req, Number.POSITIVE_INFINITY, req.op);
+    return r.ok && r.kind === "json" ? r.json : {};
+  };
+  const check = () => ask({ op: "cwd-check" });
+  holdingCwd(
+    fs,
+    new HeldCwd(init.held.sab, init.held.slot, check, init.held),
+    (path) => ask({ op: "cwd-chdir", path })
+  );
+}
 function bridgeFlags(init) {
   return {
     ...init.owners ? { owners: true } : {},
@@ -13929,15 +14034,15 @@ async function runWasmProcess(init, port3, deps = {}) {
     warn: deps.warn ?? say(2),
     cred: init.owners ? init.cred : void 0
   });
+  heldIn(running.FS, init, transport);
   early = () => signals.quiet(() => vfs.flushDirty());
   closeDropsLocks(running.FS, sys);
   const sigpipe = () => running.sliccSigpipe?.() === 1 || sigpipeSpared(gated);
   const restartable = () => signals.restartable();
-  const owners = init.owners ? { owners: true } : {};
   const streams2 = new KernelStreams(running.FS, sys, {
     sigpipe,
     restartable,
-    ...owners,
+    ...init.owners ? { owners: true } : {},
     program: init.argv0
   });
   trackCloseOnExec(running.FS);
@@ -14076,9 +14181,11 @@ var FS_OPS, O_RDONLY2, O_WRONLY6, O_RDWR6, O_ACCMODE5, O_DIRECTORY2, accessMode,
 var init_process_runtime = __esm({
   "src/process/process-runtime.ts"() {
     "use strict";
+    init_held_cwd();
     init_loopback_names();
     init_protocol();
     init_signals();
+    init_emscripten_held_cwd();
     init_emscripten_vfs_hook();
     init_live_vfs_fs();
     init_sync_fs_wire();
@@ -14962,13 +15069,19 @@ function tracked2(pending, writeAll, writeSome, failed5) {
     })();
   };
 }
+function heldOn(init, lane, syncKernel) {
+  if (!init || lane === noLane) return void 0;
+  const ask = () => syncKernel.json({ op: "cwd-check" });
+  return new HeldCwd(init.sab, init.slot, ask, init);
+}
 function createContext(o) {
   const { kernel } = o;
   const infos = /* @__PURE__ */ new Map();
   const handles = /* @__PURE__ */ new Map();
   const pending = /* @__PURE__ */ new Set();
   const random = o.random ?? cryptoRandom;
-  const resolve = (path) => resolvePath(o.cwd, path);
+  let held2;
+  const resolve = (path) => resolvePath(cwdFor(o.cwd, held2, path), path);
   const tryDev = (abs) => resolveDevAsync(kernel, abs);
   let exiting;
   const exit = (code2 = 0) => {
@@ -15020,6 +15133,7 @@ function createContext(o) {
   const lane = o.lane ?? laneOf(void 0);
   if (o.lane && o.lane !== noLane) kernel.syncLane = o.lane;
   const syncKernel = new JsSyncKernel(lane, kernel, unwind);
+  held2 = heldOn(o.held, lane, syncKernel);
   const terminal = ttyOps(kernel, syncKernel);
   const shared = { pid: o.pid, resolve, random, infos, handles, closing };
   const wasi = wasiFor({ lane, pid: o.pid, cwd: o.cwd, resolve, fs: o.fs, owned: o.owned });
@@ -15302,7 +15416,9 @@ var init_js_context = __esm({
   "src/process/js/js-context.ts"() {
     "use strict";
     init_physical_path();
+    init_held_cwd();
     init_signals();
+    init_emscripten_held_cwd();
     init_sync_fs_wire();
     init_version();
     init_js_children();
@@ -15504,6 +15620,7 @@ async function runJs(init, port3, deps, thread) {
     strays,
     thread: threadContext(port3, thread),
     ...thread?.owned ? { owned: thread.owned } : {},
+    held: init.held,
     failed: () => failedWith
   });
   const say = (text) => ctx.write(2, `${init.argv0}: ${text}
@@ -15561,59 +15678,6 @@ var init_js_runtime = __esm({
   }
 });
 
-// src/kernel/held-cwd.ts
-var CWD_SLOTS, UNTRACKED, HeldCwd;
-var init_held_cwd = __esm({
-  "src/kernel/held-cwd.ts"() {
-    "use strict";
-    CWD_SLOTS = 1024;
-    UNTRACKED = CWD_SLOTS - 1;
-    HeldCwd = class {
-      view;
-      seen;
-      dead = false;
-      slot;
-      at;
-      ask;
-      constructor(sab, slot2, ask, state) {
-        this.view = new Int32Array(sab);
-        this.slot = slot2;
-        this.ask = ask;
-        this.seen = state.seen;
-        this.dead = state.dead;
-        this.at = state.path;
-      }
-      moved(reply, path) {
-        if (reply.slot === void 0) return false;
-        this.slot = reply.slot;
-        this.seen = reply.seen ?? Atomics.load(this.view, reply.slot);
-        this.dead = reply.dead === true;
-        this.at = path;
-        return true;
-      }
-      follow() {
-        const answer2 = this.ask();
-        if (answer2.slot !== void 0) this.slot = answer2.slot;
-        this.seen = answer2.gen;
-        this.dead = !answer2.alive;
-        return answer2.alive;
-      }
-      alive(path) {
-        if (path !== void 0 && this.at !== void 0 && path !== this.at) {
-          this.at = path;
-          return this.follow();
-        }
-        if (this.dead) return false;
-        if (Atomics.load(this.view, this.slot) === this.seen) return true;
-        return this.follow();
-      }
-      get current() {
-        return this.slot;
-      }
-    };
-  }
-});
-
 // src/process/wasi/dylink.ts
 function dylinkInfo(module) {
   const [section2] = WebAssembly.Module.customSections(module, "dylink.0");