@wix/evalforge-evaluator 0.192.0 → 0.194.0

package/build/index.mjs

@@ -7390,12 +7390,41 @@ async function writeFilesToDirectory(targetDir, files) {
 }
 
 // src/run-scenario/install-dependencies.ts
-import { mkdirSync, existsSync, readFileSync, copyFileSync, cpSync } from "fs";
+import {
+  mkdirSync,
+  existsSync,
+  readFileSync,
+  readdirSync,
+  copyFileSync,
+  cpSync
+} from "fs";
 import { createHash } from "crypto";
 import path from "path";
 import { spawn, execFileSync } from "child_process";
-var INSTALL_TIMEOUT_MS = 9e4;
+var INSTALL_TIMEOUT_MS = 1e5;
+var BUN_BOOTSTRAP_TIMEOUT_MS = 6e4;
 var HEARTBEAT_INTERVAL_MS = 5e3;
+function reportRegistry(workDir, onProgress) {
+  try {
+    const registry = execFileSync("npm", ["config", "get", "registry"], {
+      cwd: workDir,
+      encoding: "utf8"
+    }).trim();
+    onProgress(`[diag] npm registry = ${registry}`);
+  } catch (err) {
+    onProgress(
+      `[diag] npm registry = <unreadable: ${err instanceof Error ? err.message : String(err)}>`
+    );
+  }
+}
+function reportNodeModules(workDir, onProgress) {
+  try {
+    const nm = path.join(workDir, "node_modules");
+    const count = existsSync(nm) ? readdirSync(nm).length : 0;
+    onProgress(`[diag] node_modules top-level entries: ${count}`);
+  } catch {
+  }
+}
 function defaultExec(cmd, args, opts) {
   return new Promise((resolve3, reject) => {
     const child = spawn(cmd, args, {
@@ -7462,33 +7491,74 @@ function cloneDirectory(src, dest) {
     cpSync(src, dest, { recursive: true });
   }
 }
-async function runInstall(exec, pm, workDir, onProgress) {
-  onProgress(`[diag] npm install starting: ${pm.cmd} ${pm.args.join(" ")}`);
+async function runCommand(exec, cmd, args, workDir, onProgress, label, timeoutMs) {
+  onProgress(`[diag] ${label} starting: ${cmd} ${args.join(" ")}`);
   const startedAt = Date.now();
   const heartbeat = setInterval(() => {
     onProgress(
-      `[diag] npm install still running: ${Math.round(
+      `[diag] ${label} still running: ${Math.round(
         (Date.now() - startedAt) / 1e3
       )}s elapsed`
     );
   }, HEARTBEAT_INTERVAL_MS);
   try {
-    await exec(pm.cmd, pm.args, {
+    await exec(cmd, args, {
       cwd: workDir,
-      timeoutMs: INSTALL_TIMEOUT_MS,
+      timeoutMs,
       env: { ...process.env, NODE_ENV: "development" }
     });
-    onProgress(`[diag] npm install finished in ${Date.now() - startedAt}ms`);
+    onProgress(`[diag] ${label} finished in ${Date.now() - startedAt}ms`);
     return true;
   } catch (err) {
     onProgress(
-      `[diag] npm install FAILED after ${Date.now() - startedAt}ms: ${err instanceof Error ? err.message : String(err)}`
+      `[diag] ${label} FAILED after ${Date.now() - startedAt}ms: ${err instanceof Error ? err.message : String(err)}`
     );
     return false;
   } finally {
     clearInterval(heartbeat);
   }
 }
+async function runInstall(exec, pm, workDir, onProgress) {
+  reportRegistry(workDir, onProgress);
+  const bunReady = await runCommand(
+    exec,
+    "npm",
+    ["install", "-g", "bun"],
+    workDir,
+    onProgress,
+    "bun bootstrap",
+    BUN_BOOTSTRAP_TIMEOUT_MS
+  );
+  if (bunReady) {
+    const bunOk = await runCommand(
+      exec,
+      "bun",
+      ["install", "--ignore-scripts"],
+      workDir,
+      onProgress,
+      "bun install",
+      INSTALL_TIMEOUT_MS
+    );
+    if (bunOk) {
+      reportNodeModules(workDir, onProgress);
+      return true;
+    }
+    onProgress("[diag] bun install failed \u2014 falling back to npm");
+  } else {
+    onProgress("[diag] bun bootstrap failed \u2014 falling back to npm");
+  }
+  const ok = await runCommand(
+    exec,
+    pm.cmd,
+    pm.args,
+    workDir,
+    onProgress,
+    "npm install",
+    INSTALL_TIMEOUT_MS
+  );
+  reportNodeModules(workDir, onProgress);
+  return ok;
+}
 async function installWithCache(workDir, exec, cacheBase, pm, onProgress) {
   const sourceContent = readFileSync(
     path.join(workDir, pm.cacheSourceFile),
@@ -11344,7 +11414,7 @@ var simpleAgentAdapter = new SimpleAgentAdapter();
 defaultRegistry.register(simpleAgentAdapter);
 
 // src/run-scenario/file-diff.ts
-import { readdirSync, readFileSync as readFileSync3, statSync, existsSync as existsSync3 } from "fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync3, statSync, existsSync as existsSync3 } from "fs";
 import { join as join10, relative } from "path";
 
 // ../../node_modules/diff/lib/index.mjs
@@ -11968,7 +12038,7 @@ function snapshotDirectory(dir, baseDir) {
   if (!existsSync3(dir)) {
     return snapshot;
   }
-  const entries = readdirSync(dir, { withFileTypes: true });
+  const entries = readdirSync2(dir, { withFileTypes: true });
   for (const entry of entries) {
     const fullPath = join10(dir, entry.name);
     const relativePath = relative(base, fullPath);