@ai-ecoverse/slicc-kernel 1.140.4 → 1.140.5

package/dist/kernel-worker.js

@@ -7128,7 +7128,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.140.4" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.140.5" : "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
@@ -7442,7 +7442,7 @@ function winners(tier) {
   }
   return out;
 }
-async function scanCommands(fs, modules, binsFrom = Number.POSITIVE_INFINITY, kernel = KERNEL_VERSION) {
+async function scanCommands(fs, modules, binsFrom = Number.POSITIVE_INFINITY, kernel = KERNEL_VERSION, refused3) {
   const found = /* @__PURE__ */ new Map();
   const physical = physicalResolver(fs);
   const tiers = (typeof modules === "string" ? [modules] : modules).map(
@@ -7450,6 +7450,7 @@ async function scanCommands(fs, modules, binsFrom = Number.POSITIVE_INFINITY, ke
   );
   for (const [index, roots] of tiers.entries()) {
     const tier = await tierPackages(fs, physical, roots, index >= binsFrom, kernel);
+    if (refused3) refused3.push(...tier.flatMap((entry) => entry.commands.filter((c) => c.refused)));
     for (const [name2, { pkg, command }] of winners(tier)) {
       if (!found.has(name2)) found.set(name2, await withPackagePaths(fs, pkg, command));
     }
@@ -27447,7 +27448,13 @@ function refusing(command) {
     args: [`${command.name}: ${command.refused}`],
     refused: command.refused,
     shows: command.script ?? command.wasm,
-    origin: { abi: command.abi, glue: command.glue, wasm: command.wasm }
+    origin: {
+      abi: command.abi,
+      glue: command.glue,
+      wasm: command.wasm,
+      ...command.variants ? { variants: command.variants.map((one) => one.wasm) } : {},
+      ...command.script ? { script: true } : {}
+    }
   };
 }
 
@@ -28416,7 +28423,16 @@ var Launcher = class {
     if (!found) {
       found = this.trustedAppended().then(async (appended2) => {
         const tiers = await this.tiers(scope, appended2);
-        return scanCommands(this.scanned, tiers, tiers.length - appended2.length);
+        const refused3 = [];
+        const commands = await scanCommands(
+          this.scanned,
+          tiers,
+          tiers.length - appended2.length,
+          void 0,
+          refused3
+        );
+        this.refusedOf.set(commands, refused3.map(refusing));
+        return commands;
       }).then(
         (commands) => this.refusals(commands).set(SUDO_COMMAND.name, SUDO_COMMAND).set(CRONTAB_COMMAND.name, CRONTAB_COMMAND)
       );
@@ -28424,6 +28440,7 @@ var Launcher = class {
     }
     return found;
   }
+  refusedOf = /* @__PURE__ */ new WeakMap();
   refusals(commands) {
     for (const [name2, command] of commands) {
       if (!command.refused) continue;
@@ -28577,22 +28594,30 @@ var Launcher = class {
     return await this.commandAt(path, scope) ?? await this.refusedAt(path, name2, scope);
   }
   async refusedAt(path, name2, scope) {
-    const refused3 = [...(await this.commands(scope)).values()].filter((c) => c.origin);
-    if (refused3.length === 0 || !await this.base.exists(path)) return void 0;
+    const refused3 = this.refusedOf.get(await this.commands(scope)) ?? [];
+    if (refused3.length === 0) return void 0;
+    const st = await this.base.stat(path).catch(() => void 0);
+    if (!st?.isFile) return void 0;
     const real = await physicalPathAsync(this.base, path).catch(() => path);
-    const at = async (c, which) => {
-      const own = c.origin[which];
-      return own === path || await physicalPathAsync(this.base, own).catch(() => own) === real;
-    };
+    const same3 = async (own) => own === path || await physicalPathAsync(this.base, own).catch(() => own) === real;
     const owners = [];
     for (const c of refused3) {
-      if (await at(c, "glue") || await at(c, "wasm")) owners.push(c);
+      const origin = c.origin;
+      for (const own of [origin.glue, origin.wasm, ...origin.variants ?? []]) {
+        if (!await same3(own)) continue;
+        owners.push(c);
+        break;
+      }
     }
-    if (owners.length > 0) return owners.find((c) => c.name === name2) ?? owners[0];
+    const stem = name2.replace(/\.wasm$/, "");
+    const named = owners.find((c) => c.name === name2) ?? owners.find((c) => c.name === stem);
+    return named ?? owners[0] ?? await this.refusedCopy(real, name2, refused3);
+  }
+  async refusedCopy(real, name2, refused3) {
     const dir = real.slice(0, real.lastIndexOf("/"));
     for (const c of refused3) {
       const origin = c.origin;
-      if (origin.abi !== "emscripten" || c.name !== name2) continue;
+      if (origin.abi !== "emscripten" || origin.script || c.name !== name2) continue;
       const own = await physicalPathAsync(this.base, origin.glue).catch(() => origin.glue);
       if (own.slice(0, own.lastIndexOf("/")) === dir && await this.sameFile(real, own)) return c;
     }