@orchagent/cli 0.3.24 → 0.3.25

package/dist/commands/test.js

@@ -14,6 +14,27 @@ const chokidar_1 = __importDefault(require("chokidar"));
 const errors_1 = require("../lib/errors");
 const config_1 = require("../lib/config");
 const llm_1 = require("../lib/llm");
+/**
+ * Validate a fixture and return helpful errors
+ */
+function validateFixture(data, fixturePath) {
+    const fileName = path_1.default.basename(fixturePath);
+    if (typeof data !== 'object' || data === null) {
+        throw new errors_1.CliError(`Invalid fixture ${fileName}: must be a JSON object`);
+    }
+    const obj = data;
+    if (!obj.input || typeof obj.input !== 'object') {
+        throw new errors_1.CliError(`Invalid fixture ${fileName}: missing required "input" field.\n` +
+            `  Expected format: { "input": {...}, "expected_output": {...} }`);
+    }
+    if (!obj.expected_output && !obj.expected_contains) {
+        throw new errors_1.CliError(`Invalid fixture ${fileName}: must have "expected_output" or "expected_contains".\n` +
+            `  Add one of:\n` +
+            `    "expected_output": {"key": "exact value to match"}\n` +
+            `    "expected_contains": ["substring to find"]`);
+    }
+    return data;
+}
 /**
  * Parse SKILL.md frontmatter
  */
@@ -70,8 +91,10 @@ function runCommand(command, args, cwd, verbose) {
  * Check if a command exists
  */
 async function commandExists(command) {
+    const isWindows = process.platform === 'win32';
+    const checker = isWindows ? 'where' : 'which';
     try {
-        const proc = (0, child_process_1.spawn)('which', [command], { shell: true });
+        const proc = (0, child_process_1.spawn)(checker, [command], { shell: true, stdio: 'ignore' });
         return new Promise((resolve) => {
             proc.on('close', (code) => resolve(code === 0));
             proc.on('error', () => resolve(false));
@@ -204,22 +227,28 @@ async function discoverTests(agentDir) {
  */
 async function runPythonTests(agentDir, verbose) {
     process.stderr.write(chalk_1.default.blue('\nRunning Python tests...\n\n'));
-    // Check if pytest is available
+    // Check if pytest is available directly
     const hasPytest = await commandExists('pytest');
-    let command;
-    let args;
     if (hasPytest) {
-        command = 'pytest';
-        args = verbose ? ['-v'] : [];
+        const args = verbose ? ['-v'] : [];
+        const { code } = await runCommand('pytest', args, agentDir, verbose);
+        return code;
     }
-    else {
-        command = 'python3';
-        args = ['-m', 'pytest'];
-        if (verbose)
-            args.push('-v');
+    // Try Python commands in order of preference
+    const pythonCommands = process.platform === 'win32'
+        ? ['python', 'py', 'python3']
+        : ['python3', 'python'];
+    for (const pythonCmd of pythonCommands) {
+        if (await commandExists(pythonCmd)) {
+            const args = ['-m', 'pytest'];
+            if (verbose)
+                args.push('-v');
+            const { code } = await runCommand(pythonCmd, args, agentDir, verbose);
+            return code;
+        }
     }
-    const { code } = await runCommand(command, args, agentDir, verbose);
-    return code;
+    process.stderr.write(chalk_1.default.red('No Python interpreter found. Install Python and pytest.\n'));
+    return 1;
 }
 /**
  * Run JavaScript/TypeScript tests
@@ -292,8 +321,8 @@ async function runFixtureTests(agentDir, fixtures, verbose, config) {
         throw new errors_1.CliError('No LLM key found for fixture tests.\n' +
             'Set an environment variable (e.g., OPENAI_API_KEY) or run `orchagent keys add <provider>`');
     }
-    const { provider, key } = detected;
-    const model = (0, llm_1.getDefaultModel)(provider);
+    const { provider, key, model: serverModel } = detected;
+    const model = serverModel ?? (0, llm_1.getDefaultModel)(provider);
     let passed = 0;
     let failed = 0;
     for (const fixturePath of fixtures) {
@@ -301,7 +330,14 @@ async function runFixtureTests(agentDir, fixtures, verbose, config) {
         process.stderr.write(`  ${fixtureName}: `);
         try {
             const raw = await promises_1.default.readFile(fixturePath, 'utf-8');
-            const fixture = JSON.parse(raw);
+            let parsed;
+            try {
+                parsed = JSON.parse(raw);
+            }
+            catch (e) {
+                throw new errors_1.CliError(`Invalid JSON in ${path_1.default.basename(fixturePath)}: ${e.message}`);
+            }
+            const fixture = validateFixture(parsed, fixturePath);
             // Build and call LLM
             const fullPrompt = (0, llm_1.buildPrompt)(prompt, fixture.input);
             const result = await (0, llm_1.callLlm)(provider, key, model, fullPrompt, outputSchema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orchagent/cli",
-  "version": "0.3.24",
+  "version": "0.3.25",
   "description": "Command-line interface for the orchagent AI agent marketplace",
   "license": "MIT",
   "author": "orchagent <hello@orchagent.io>",