@ai-ecoverse/slicc-kernel 1.13.0 → 1.14.0

package/README.md

@@ -119,7 +119,7 @@ A WASI preview1 or WASIX program (Zig, Rust, Go, wasi-libc or wasix-libc C) has
 { "slicc": { "abi": "wasi", "commands": { "rg": { "wasm": "bin/rg.wasm" }, "rustc": { "script": "bin/rustc" } } } }
 ```
 
-Entries may also set `argv0`, `args` and `env`, and a package can set `slicc.env` for all of its commands. In `env`, `${package}` is the package directory, `${cwd}` the process's working directory, and `${NAME}` the caller's `NAME` when the program starts (a default naming an unset variable is left out); a relative path that exists in the package (`lib/python3.14`, `./`) becomes that absolute path. The caller's environment wins over these defaults; a `null` value removes the variable for the command, after the caller's environment is applied (a host-networked program can drop the kernel's proxy settings that way), and a command entry can set a variable its package's `slicc.env` removes. The first package to define a name wins. `sh` runs bash as `sh` unless a package provides its own. The installed commands appear as executables in a virtual `/usr/bin` and `/bin`, so `PATH` lookups, `command -v` and `ls /usr/bin` work without writing anything to OPFS. A process can also run a program by the path of its glue when the `.wasm` sits next to it, a wasm module by its own path (as a WASI program), and a script through its `#!` line (including `#!/usr/bin/env name`). Executing any other file fails with `ENOEXEC`, so bash runs it as a shell script, as POSIX shells do. The catalog is re-read at the start of every `run`, so packages installed in between are picked up.
+Entries may also set `argv0`, `args` and `env`, and a package can set `slicc.env` for all of its commands. In `env`, `${package}` is the package directory, `${cwd}` the process's working directory, and `${NAME}` the caller's `NAME` when the program starts (a default naming an unset variable is left out); a relative path that exists in the package (`lib/python3.14`, `./`) becomes that absolute path. The caller's environment wins over these defaults; a `null` value removes the variable for the command, after the caller's environment is applied (a host-networked program can drop the kernel's proxy settings that way), and a command entry can set a variable its package's `slicc.env` removes. The first package to define a name wins. `sh` runs bash as `sh` unless a package provides its own. The installed commands appear as executables in a virtual `/usr/bin` and `/bin`, so `PATH` lookups, `command -v` and `ls /usr/bin` work without writing anything to OPFS. A process can also run a program by the path of its glue when the `.wasm` sits next to it, a wasm module by its own path (as a WASI program), and a script through its `#!` line (including `#!/usr/bin/env name`). Executing any other file fails with `ENOEXEC`, so bash runs it as a shell script, as POSIX shells do. Commands also come from pnpm's global directory. Every process gets `PNPM_HOME=/home/.local/share/pnpm`, unless the embedder sets its own, and has `$PNPM_HOME/bin` on `PATH`. The kernel scans each of pnpm's global install groups (`$PNPM_HOME/global/*/<group>/node_modules`) after `/node_modules`, which wins when both provide a command. The catalog is re-read whenever anything under either changes, so `pnpm add -g @ai-ecoverse/wasi-ripgrep` makes `rg` work in the same shell, and `pnpm remove -g` removes it again.
 
 ### WASI programs
 

package/dist/kernel-worker.js

@@ -3022,9 +3022,28 @@ async function packages(fs, modules) {
   }
   return dirs;
 }
+async function pnpmGlobalRoots(fs, home) {
+  const roots = [];
+  const global = `${home}/global`;
+  for (const version of (await fs.readdir(global).catch(() => [])).sort()) {
+    for (const group of (await fs.readdir(`${global}/${version}`).catch(() => [])).sort()) {
+      const dir = `${global}/${version}/${group}`;
+      const st = await fs.lstat(dir).catch(() => void 0);
+      if (st?.isDirectory && await fs.exists(`${dir}/node_modules`))
+        roots.push(`${dir}/node_modules`);
+    }
+  }
+  return roots;
+}
+async function packagesIn(fs, roots) {
+  const dirs = [];
+  for (const root of typeof roots === "string" ? [roots] : roots)
+    dirs.push(...await packages(fs, root));
+  return dirs;
+}
 async function scanCommands(fs, modules) {
   const found = /* @__PURE__ */ new Map();
-  for (const pkg of await packages(fs, modules)) {
+  for (const pkg of await packagesIn(fs, modules)) {
     let manifest;
     try {
       manifest = JSON.parse(await fs.readFile(`${pkg}/package.json`));
@@ -3043,7 +3062,7 @@ async function scanCommands(fs, modules) {
 }
 async function scanFilesystems(fs, modules) {
   const found = /* @__PURE__ */ new Map();
-  for (const pkg of await packages(fs, modules)) {
+  for (const pkg of await packagesIn(fs, modules)) {
     let manifest;
     try {
       manifest = JSON.parse(await fs.readFile(`${pkg}/package.json`));
@@ -6966,6 +6985,7 @@ function foreignImports(bytes) {
 }
 
 // src/launcher.ts
+var PNPM_HOME = "/home/.local/share/pnpm";
 var COMMAND2 = /^\/(?:usr\/)?bin\/([^/]+)$/;
 var PACKAGE_ROOT = /^(.*\/node_modules\/(?:@[^/]+\/)?[^/]+)\//;
 var ENV_REFERENCE = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
@@ -7055,6 +7075,7 @@ var Launcher = class {
   ca;
   transport;
   watchers = new FsWatchers();
+  pnpmHome;
   mounts;
   createDriverWorker;
   openFiles = /* @__PURE__ */ new Set();
@@ -7071,6 +7092,7 @@ var Launcher = class {
     this.base = this.watchers.wrap(this.mounts.wrap(options.fs));
     this.createWorker = options.createWorker;
     this.createDriverWorker = options.createDriverWorker;
+    this.pnpmHome = options.env?.PNPM_HOME ?? PNPM_HOME;
     this.modulesDir = options.modules ?? "/node_modules";
     this.env = { ...networkEnv(), ...options.env };
     this.ca = kernelCa(options.caStore ?? memoryCaStore());
@@ -7081,11 +7103,17 @@ var Launcher = class {
       ca: this.ca
     });
     this.fs = withCommandDirs(this.base, async () => new Set((await this.commands()).keys()));
+    this.watchers.watch([this.modulesDir, this.pnpmHome], { recursive: true }, () => {
+      this.catalog = void 0;
+    });
   }
   commands() {
-    this.catalog ??= scanCommands(this.base, this.modulesDir);
+    this.catalog ??= this.roots().then((roots) => scanCommands(this.base, roots));
     return this.catalog;
   }
+  async roots() {
+    return [this.modulesDir, ...await pnpmGlobalRoots(this.base, this.pnpmHome)];
+  }
   async resolve(file, argv0, cwd) {
     const name2 = COMMAND2.exec(file)?.[1] ?? (file.includes("/") ? void 0 : file);
     if (name2 !== void 0) {
@@ -7339,7 +7367,7 @@ var Launcher = class {
         }
       };
     }
-    const module = (await scanFilesystems(this.base, this.modulesDir)).get(type);
+    const module = (await scanFilesystems(this.base, await this.roots())).get(type);
     if (!module) throw fsError("ENODEV", `unknown file system type ${type}`);
     if (!this.createDriverWorker)
       throw fsError("ENODEV", `this kernel cannot start ${type} drivers`);
@@ -7379,7 +7407,14 @@ var Launcher = class {
     await writeCaFile(this.base, this.ca).catch(() => void 0);
   }
   environment(cwd, extra) {
-    return { PATH: "/usr/bin:/bin", HOME: "/home", ...this.env, PWD: cwd, ...extra };
+    return {
+      PATH: `/usr/bin:/bin:${this.pnpmHome}/bin`,
+      HOME: "/home",
+      PNPM_HOME: this.pnpmHome,
+      ...this.env,
+      PWD: cwd,
+      ...extra
+    };
   }
   async starting(argv, dir) {
     this.catalog = void 0;