some more crap

Author: nojaf

lib_dev/process.js

@@ -25,21 +25,21 @@ function resolveBin(bin) {
 
 const gitBin = resolveBin("git");
 
-// Resolve Node from PATH (works when running under Bun),
-// fall back to execPath if resolution fails
-let nodeBin;
-try {
-  nodeBin = resolveBin("node");
-  console.log("Resolved nodeBin", nodeBin);
-} catch (_err) {
-  console.log("Failed to resolve nodeBin", _err);
-  nodeBin = execPath;
+// Helpers to resolve node and npm-cli when needed
+function getNodeBin() {
+  try {
+    return resolveBin("node");
+  } catch (_err) {
+    return execPath;
+  }
 }
 
-const npmCli = path.join(
-  path.dirname(nodeBin),
-  "../lib/node_modules/npm/bin/npm-cli.js",
-);
+function getNpmCli(nodeBin) {
+  return path.join(
+    path.dirname(nodeBin),
+    "../lib/node_modules/npm/bin/npm-cli.js",
+  );
+}
 
 /**
  * @typedef {{
@@ -301,10 +301,46 @@ export function setup(cwd = process.cwd()) {
      * @param {ExecOptions} [options]
      * @return {Promise<ExecResult>}
      */
-    npm(args = [], options = {}) {
+    async npm(args = [], options = {}) {
       console.log("the options", options);
-      // Always invoke npm via the current Node.js executable to avoid PATH/resolution issues
-      // on different runners or when using Bun to execute this script.
+      // Validate working directory to avoid confusing ENOENT from invalid cwd
+      if (options.cwd) {
+        try {
+          await fs.stat(options.cwd);
+        } catch (e) {
+          console.error("Invalid cwd for npm", options.cwd, e);
+          throw e;
+        }
+      }
+
+      // 1) Prefer corepack to resolve the correct npm
+      try {
+        return await exec("corepack", ["npm", ...args], options);
+      } catch (_corepackErr) {
+        // ignore and try next
+      }
+
+      // 2) Try PATH npm
+      try {
+        return await exec("npm", args, options);
+      } catch (_npmErr) {
+        // ignore and try fallback
+      }
+
+      // 3) Fallback: node + npm-cli resolved at call time
+      const nodeBin = getNodeBin();
+      const npmCli = getNpmCli(nodeBin);
+      try {
+        await fs.access(nodeBin);
+      } catch (e) {
+        console.error("nodeBin not accessible", nodeBin, e);
+      }
+      try {
+        await fs.access(npmCli);
+      } catch (e) {
+        console.error("npmCli not accessible", npmCli, e);
+      }
+      console.log("Falling back to node+cli", { nodeBin, npmCli });
       return exec(nodeBin, [npmCli, ...args], options);
     },
   };