@wix/evalforge-evaluator 0.67.0 → 0.69.0

package/build/index.js

@@ -6451,7 +6451,6 @@ var import_crypto = require("crypto");
 
 // src/run-scenario/agents/claude-code/write-mcp.ts
 var import_promises4 = require("fs/promises");
-var import_child_process = require("child_process");
 var import_path6 = require("path");
 var import_evalforge_types2 = require("@wix/evalforge-types");
 async function writeMcpToFilesystem(cwd, mcps) {
@@ -6477,6 +6476,11 @@ async function writeMcpToFilesystem(cwd, mcps) {
   await (0, import_promises4.writeFile)(filePath, content, "utf8");
   console.log(`[MCP] Written to ${filePath}`);
 }
+
+// src/run-scenario/agents/claude-code/mcp-setup.ts
+var import_promises5 = require("fs/promises");
+var import_child_process = require("child_process");
+var import_path7 = require("path");
 async function probeMcpServers(mcps, probeMs = 5e3) {
   const results = [];
   for (const mcp of mcps) {
@@ -6544,56 +6548,165 @@ spawn error: ${err.message}`;
     }, probeMs);
   });
 }
+async function preInstallMcpPackages(mcps, timeoutMs = 12e4) {
+  const packages = extractNpxPackages(mcps);
+  if (packages.length === 0) return [];
+  const results = [];
+  for (const pkg of packages) {
+    const startMs = Date.now();
+    const alreadyInstalled = await isPackageGloballyInstalled(pkg);
+    if (alreadyInstalled) {
+      const durationMs2 = Date.now() - startMs;
+      console.log(
+        `[MCP] Package already installed globally, skipping: ${pkg} (${durationMs2}ms)`
+      );
+      results.push({
+        package: pkg,
+        success: true,
+        skipped: true,
+        output: "already installed",
+        durationMs: durationMs2
+      });
+      continue;
+    }
+    console.log(`[MCP] Pre-installing npx package globally: ${pkg}`);
+    const result = await installPackageGlobally(pkg, timeoutMs);
+    const durationMs = Date.now() - startMs;
+    results.push({ package: pkg, skipped: false, durationMs, ...result });
+    console.log(
+      `[MCP] Install ${pkg}: ${result.success ? "SUCCESS" : "FAILED"} (${durationMs}ms)`
+    );
+  }
+  return results;
+}
+function isPackageGloballyInstalled(pkg) {
+  return new Promise((resolve2) => {
+    let settled = false;
+    const child = (0, import_child_process.spawn)("npm", ["ls", "-g", "--depth=0", pkg], {
+      stdio: ["pipe", "pipe", "pipe"],
+      env: process.env
+    });
+    child.on("close", (code2) => {
+      if (!settled) {
+        settled = true;
+        resolve2(code2 === 0);
+      }
+    });
+    child.on("error", () => {
+      if (!settled) {
+        settled = true;
+        resolve2(false);
+      }
+    });
+    setTimeout(() => {
+      if (!settled) {
+        settled = true;
+        child.kill("SIGTERM");
+        resolve2(false);
+      }
+    }, 5e3);
+  });
+}
+function extractNpxPackages(mcps) {
+  const packages = [];
+  for (const mcp of mcps) {
+    const config = mcp.config;
+    for (const [, value] of Object.entries(config)) {
+      if (typeof value !== "object" || value === null) continue;
+      const cfg = value;
+      if (cfg.command !== "npx" || !Array.isArray(cfg.args)) continue;
+      for (const arg of cfg.args) {
+        if (!arg.startsWith("-")) {
+          packages.push(arg);
+          break;
+        }
+      }
+    }
+  }
+  return [...new Set(packages)];
+}
+function installPackageGlobally(pkg, timeoutMs) {
+  return new Promise((resolve2) => {
+    let output = "";
+    let settled = false;
+    const child = (0, import_child_process.spawn)("sh", ["-c", `npm install -g ${pkg} 2>&1`], {
+      stdio: ["pipe", "pipe", "pipe"],
+      env: process.env
+    });
+    child.stdout.on("data", (chunk) => {
+      output += chunk.toString();
+    });
+    child.stderr.on("data", (chunk) => {
+      output += chunk.toString();
+    });
+    child.on("close", (code2) => {
+      if (!settled) {
+        settled = true;
+        resolve2({ success: code2 === 0, output: output.slice(-1e3) });
+      }
+    });
+    child.on("error", (err) => {
+      if (!settled) {
+        settled = true;
+        resolve2({ success: false, output: `spawn error: ${err.message}` });
+      }
+    });
+    setTimeout(() => {
+      if (!settled) {
+        settled = true;
+        child.kill("SIGTERM");
+        resolve2({
+          success: false,
+          output: output.slice(-1e3) + "\n[install timed out]"
+        });
+      }
+    }, timeoutMs);
+  });
+}
 async function probeNpmConfig(cwd) {
   const homedir = process.env.HOME ?? "~";
-  const [
-    cwdNpmrc,
-    homeNpmrc,
-    projectRootNpmrc,
-    globalNpmrc,
-    npmConfigListFull,
-    npmConfigGetRegistry,
-    npmViewWixMcp
-  ] = await Promise.all([
-    (0, import_promises4.readFile)((0, import_path6.join)(cwd, ".npmrc"), "utf8").catch(
-      (e) => `[not found: ${e.message}]`
-    ),
-    (0, import_promises4.readFile)((0, import_path6.join)(homedir, ".npmrc"), "utf8").catch(
-      (e) => `[not found: ${e.message}]`
-    ),
-    (0, import_promises4.readFile)("/user-code/.npmrc", "utf8").catch(
+  const [wixAuthFile, npmInstallDryRun, mcpPackageInstalled] = await Promise.all([
+    (0, import_promises5.readFile)((0, import_path7.join)(homedir, ".wix", "auth", "api-key.json"), "utf8").catch(
       (e) => `[not found: ${e.message}]`
     ),
     runShellCapture(
-      'echo "=== globalconfig ===" && npm config get globalconfig && cat "$(npm config get globalconfig)" 2>/dev/null || echo "[no global npmrc]" && echo "=== userconfig ===" && npm config get userconfig && cat "$(npm config get userconfig)" 2>/dev/null || echo "[no user npmrc]" && echo "=== prefix ===" && npm config get prefix && cat "$(npm config get prefix)/etc/npmrc" 2>/dev/null || echo "[no prefix npmrc]"',
+      "npm install --dry-run @wix/mcp 2>&1 | tail -15",
       cwd,
-      5e3
+      15e3
     ),
-    runShellCapture("npm config list -l 2>&1 | head -60", cwd, 5e3),
-    runShellCapture("npm config get registry", cwd, 3e3),
     runShellCapture(
-      "npm view @wix/mcp version --registry https://registry.npmjs.org 2>&1",
+      'ls -la $(npm root -g)/@wix/mcp/package.json 2>/dev/null || echo "[not globally installed]" && npm list -g @wix/mcp 2>&1 | tail -5',
       cwd,
-      1e4
+      5e3
     )
   ]);
+  const wixAuthParsed = (() => {
+    try {
+      const parsed = JSON.parse(wixAuthFile);
+      return JSON.stringify({
+        hasToken: typeof parsed.token === "string",
+        tokenLength: typeof parsed.token === "string" ? parsed.token.length : 0,
+        hasAccountId: typeof parsed.accountId === "string",
+        hasUserInfo: typeof parsed.userInfo === "object"
+      });
+    } catch {
+      return wixAuthFile.slice(0, 500);
+    }
+  })();
   const npmEnvVars = {};
   for (const [key, value] of Object.entries(process.env)) {
     const lk = key.toLowerCase();
-    if (lk.startsWith("npm_config") || lk.includes("token") || lk.includes("auth") || lk.includes("registry")) {
+    if (lk.startsWith("npm_config") || lk.includes("token") || lk.includes("auth") || lk.includes("registry") || lk.startsWith("wix_")) {
       npmEnvVars[key] = lk.includes("token") || lk.includes("auth") || lk.includes("secret") ? `[REDACTED, length=${(value ?? "").length}]` : value;
     }
   }
   return {
     cwd,
     processCwd: process.cwd(),
-    cwdNpmrc: cwdNpmrc.slice(0, 1e3),
-    homeNpmrc: homeNpmrc.slice(0, 1e3),
-    projectRootNpmrc: projectRootNpmrc.slice(0, 1e3),
-    globalNpmrc: globalNpmrc.slice(0, 2e3),
-    npmConfigListFull: npmConfigListFull.slice(0, 3e3),
-    npmConfigGetRegistry: npmConfigGetRegistry.trim(),
-    npmViewWixMcp: npmViewWixMcp.trim().slice(0, 500),
+    wixAuthFile: wixAuthParsed,
+    wixAuthFileExists: !wixAuthFile.startsWith("[not found"),
+    npmInstallDryRun: npmInstallDryRun.trim().slice(0, 1500),
+    mcpPackageInstalled: mcpPackageInstalled.trim().slice(0, 500),
     npmEnvVars,
     homedir
   };
@@ -6636,8 +6749,8 @@ function runShellCapture(cmd, cwd, timeoutMs) {
 }
 
 // src/run-scenario/agents/claude-code/write-sub-agents.ts
-var import_promises5 = require("fs/promises");
-var import_path7 = require("path");
+var import_promises6 = require("fs/promises");
+var import_path8 = require("path");
 var AGENTS_DIR = ".claude/agents";
 function toAgentFilename(name2, index, nameCount) {
   const base = (name2 || "").toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "").replace(/^-+|-+$/g, "") || `sub-agent-${index}`;
@@ -6647,13 +6760,13 @@ function toAgentFilename(name2, index, nameCount) {
 }
 async function writeSubAgentsToFilesystem(cwd, subAgents) {
   if (subAgents.length === 0) return;
-  const agentsDir = (0, import_path7.join)(cwd, AGENTS_DIR);
-  await (0, import_promises5.mkdir)(agentsDir, { recursive: true });
+  const agentsDir = (0, import_path8.join)(cwd, AGENTS_DIR);
+  await (0, import_promises6.mkdir)(agentsDir, { recursive: true });
   const nameCount = /* @__PURE__ */ new Map();
   for (const [i, agent] of subAgents.entries()) {
     const filename = toAgentFilename(agent.name, i, nameCount);
-    const filePath = (0, import_path7.join)(agentsDir, `${filename}.md`);
-    await (0, import_promises5.writeFile)(filePath, agent.subAgentMd, "utf8");
+    const filePath = (0, import_path8.join)(agentsDir, `${filename}.md`);
+    await (0, import_promises6.writeFile)(filePath, agent.subAgentMd, "utf8");
   }
   console.log(`[SubAgents] Written to ${agentsDir}`);
 }
@@ -6887,8 +7000,30 @@ async function executeWithClaudeCode(skills, scenario, options) {
   const startTime = /* @__PURE__ */ new Date();
   const allMessages = [];
   if (options.mcps && options.mcps.length > 0) {
-    process.env.npm_config__auth = "";
     await writeMcpToFilesystem(options.cwd, options.mcps);
+    const installResults = await preInstallMcpPackages(options.mcps);
+    if (installResults.length > 0 && options.traceContext) {
+      emitTraceEvent(
+        {
+          evalRunId: options.traceContext.evalRunId,
+          scenarioId: options.traceContext.scenarioId,
+          scenarioName: options.traceContext.scenarioName,
+          targetId: options.traceContext.targetId,
+          targetName: options.traceContext.targetName,
+          stepNumber: 0,
+          type: import_evalforge_types3.LiveTraceEventType.DIAGNOSTIC,
+          outputPreview: JSON.stringify({
+            event: "mcp-pre-install",
+            results: installResults
+          }).slice(0, 2e3),
+          timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+          isComplete: false
+        },
+        options.traceContext.tracePushUrl,
+        options.traceContext.routeHeader,
+        options.traceContext.authToken
+      );
+    }
     const probeResults = await probeMcpServers(options.mcps);
     if (options.traceContext) {
       emitTraceEvent(
@@ -7759,7 +7894,7 @@ defaultRegistry.register(claudeCodeAdapter);
 
 // src/run-scenario/file-diff.ts
 var import_fs6 = require("fs");
-var import_path8 = require("path");
+var import_path9 = require("path");
 
 // ../../node_modules/diff/lib/index.mjs
 function Diff() {
@@ -7935,7 +8070,7 @@ Diff.prototype = {
   tokenize: function tokenize(value) {
     return Array.from(value);
   },
-  join: function join5(chars) {
+  join: function join6(chars) {
     return chars.join("");
   },
   postProcess: function postProcess(changeObjects) {
@@ -8375,8 +8510,8 @@ function snapshotDirectory(dir, baseDir) {
   }
   const entries = (0, import_fs6.readdirSync)(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const fullPath = (0, import_path8.join)(dir, entry.name);
-    const relativePath = (0, import_path8.relative)(base, fullPath);
+    const fullPath = (0, import_path9.join)(dir, entry.name);
+    const relativePath = (0, import_path9.relative)(base, fullPath);
     if (shouldIgnore(entry.name)) {
       continue;
     }