@grekt/cli 6.43.0-beta.2 → 6.43.0-beta.4

package/dist/index.js

@@ -104390,16 +104390,15 @@ function detectPromptfoo() {
 function getCommand(mode) {
   return mode === "npx" ? ["npx", "promptfoo"] : ["promptfoo"];
 }
-function assemblePromptfooConfig(config) {
+function assemblePromptMessages(config) {
+  return [
+    { role: "system", content: config.systemPrompt },
+    { role: "user", content: "{{input}}" }
+  ];
+}
+function assemblePromptfooConfig(config, promptPath) {
   return {
-    prompts: [
-      {
-        raw: JSON.stringify([
-          { role: "system", content: config.systemPrompt },
-          { role: "user", content: "{{input}}" }
-        ])
-      }
-    ],
+    prompts: promptPath ? [promptPath] : [assemblePromptMessages(config)],
     providers: [config.provider],
     tests: config.tests.map((test) => ({
       description: test.description,
@@ -104467,19 +104466,19 @@ function createPromptfooEngine() {
       return mode !== "none";
     },
     async run(config) {
-      const promptfooConfig = assemblePromptfooConfig(config);
       if (mode === "global") {
         try {
           const promptfoo = await import("promptfoo");
           const evaluate = promptfoo.evaluate;
           if (typeof evaluate === "function") {
-            const evaluateResult = await evaluate(promptfooConfig);
+            const nodeConfig = assemblePromptfooConfig(config);
+            const evaluateResult = await evaluate(nodeConfig);
             const results = evaluateResult.results ?? [];
             return extractFailures(results);
           }
         } catch {}
       }
-      return runViaCli(mode, promptfooConfig);
+      return runViaCli(mode, config);
     },
     openReport() {
       const cmd = getCommand(mode);
@@ -104487,27 +104486,42 @@ function createPromptfooEngine() {
     }
   };
 }
-async function runViaCli(mode, promptfooConfig) {
+async function runViaCli(mode, config) {
   const tempDir = `${process.env.TMPDIR ?? "/tmp"}/grekt-eval-${Date.now()}`;
   const configPath = `${tempDir}/promptfoo-config.json`;
+  const promptPath = `${tempDir}/prompt.json`;
   const outputPath = `${tempDir}/output.json`;
   const { mkdirSync: mkdirSync3, writeFileSync: writeFileSync2, readFileSync: readFileSync2, rmSync: rmSync2 } = await import("fs");
   mkdirSync3(tempDir, { recursive: true });
   try {
+    writeFileSync2(promptPath, JSON.stringify(assemblePromptMessages(config), null, 2));
+    const promptfooConfig = assemblePromptfooConfig(config, promptPath);
     writeFileSync2(configPath, JSON.stringify(promptfooConfig, null, 2));
     const cmd = getCommand(mode);
-    const result = Bun.spawnSync([...cmd, "eval", "--config", configPath, "--output", outputPath, "--no-cache"], { stdout: "pipe", stderr: "pipe" });
-    if (result.exitCode !== 0) {
-      const stderr = result.stderr.toString();
+    const proc2 = Bun.spawn([...cmd, "eval", "--config", configPath, "--output", outputPath, "--no-cache"], { stdout: "pipe", stderr: "pipe" });
+    const exitCode = await proc2.exited;
+    if (exitCode !== 0) {
+      const stderr = await new Response(proc2.stderr).text();
       throw new Error(`promptfoo eval failed: ${stderr}`);
     }
     const output = JSON.parse(readFileSync2(outputPath, "utf-8"));
-    const results = output.results ?? [];
+    const results = extractResultsArray(output);
     return extractFailures(results);
   } finally {
     rmSync2(tempDir, { recursive: true, force: true });
   }
 }
+function extractResultsArray(output) {
+  if (Array.isArray(output.results))
+    return output.results;
+  const nested = output.results;
+  if (nested && Array.isArray(nested.results))
+    return nested.results;
+  const table = nested?.table;
+  if (table && Array.isArray(table.body))
+    return table.body;
+  return [];
+}
 
 // src/eval/engine-resolver.ts
 var AVAILABLE_ENGINES = [
@@ -104719,6 +104733,7 @@ var evalCommand = new Command("eval").description("Run eval tests against artifa
     }
     process.exit(0);
   }
+  info(`Found ${allDiscovered.length} eval${allDiscovered.length === 1 ? "" : "s"} using ${engine2.name}`);
   const spin = spinner("Running evals...");
   spin.start();
   const results = await runAllEvals(allDiscovered, {
@@ -104971,7 +104986,7 @@ var whoamiCommand = new Command("whoami").description("Show current user").actio
 // package.json
 var package_default = {
   name: "@grekt/cli",
-  version: "6.43.0-beta.2",
+  version: "6.43.0-beta.4",
   description: "AI tools versioned, synced, and shared across tools and teams",
   type: "module",
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grekt/cli",
-  "version": "6.43.0-beta.2",
+  "version": "6.43.0-beta.4",
   "description": "AI tools versioned, synced, and shared across tools and teams",
   "type": "module",
   "bin": {