@orchagent/cli 0.3.24 → 0.3.26

package/dist/commands/call.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -170,10 +203,32 @@ argument or --file option instead.
             throw new errors_1.CliError('Missing API key. Run `orchagent login` first.');
         }
         const parsed = parseAgentRef(agentRef);
-        const org = parsed.org ?? resolved.defaultOrg;
+        const configFile = await (0, config_1.loadConfig)();
+        const org = parsed.org ?? configFile.workspace ?? resolved.defaultOrg;
         if (!org) {
             throw new errors_1.CliError('Missing org. Use org/agent or set default org.');
         }
+        // First-use confirmation when workspace is active (and user didn't specify explicit org)
+        if (configFile.workspace && !configFile.workspace_confirmed && !parsed.org) {
+            // Only prompt in interactive mode (TTY)
+            if (process.stdin.isTTY) {
+                const readline = await Promise.resolve().then(() => __importStar(require('readline')));
+                const rl = readline.createInterface({
+                    input: process.stdin,
+                    output: process.stderr,
+                });
+                const answer = await new Promise((resolve) => {
+                    rl.question(`Using workspace: ${configFile.workspace}. Continue? [Y/n]: `, resolve);
+                });
+                rl.close();
+                if (answer.toLowerCase() === 'n') {
+                    throw new errors_1.CliError('Cancelled. Use explicit org/agent or `orch workspace use <slug>`.');
+                }
+                // Save confirmation so we don't prompt again until workspace changes
+                configFile.workspace_confirmed = true;
+                await (0, config_1.saveConfig)(configFile);
+            }
+        }
         const agentMeta = await (0, api_1.getAgentWithFallback)(resolved, org, parsed.agent, parsed.version);
         const endpoint = options.endpoint?.trim() || agentMeta.default_endpoint || 'analyze';
         const headers = {

package/dist/commands/run.js

@@ -816,10 +816,32 @@ Note: Use 'run' for local execution, 'call' for server-side execution.
         }
         const resolved = await (0, config_1.getResolvedConfig)();
         const parsed = parseAgentRef(agentRef);
-        const org = parsed.org ?? resolved.defaultOrg;
+        const configFile = await (0, config_1.loadConfig)();
+        const org = parsed.org ?? configFile.workspace ?? resolved.defaultOrg;
         if (!org) {
             throw new errors_1.CliError('Missing org. Use org/agent format.');
         }
+        // First-use confirmation when workspace is active (and user didn't specify explicit org)
+        if (configFile.workspace && !configFile.workspace_confirmed && !parsed.org) {
+            // Only prompt in interactive mode (TTY)
+            if (process.stdin.isTTY) {
+                const readline = await Promise.resolve().then(() => __importStar(require('readline')));
+                const rl = readline.createInterface({
+                    input: process.stdin,
+                    output: process.stderr,
+                });
+                const answer = await new Promise((resolve) => {
+                    rl.question(`Using workspace: ${configFile.workspace}. Continue? [Y/n]: `, resolve);
+                });
+                rl.close();
+                if (answer.toLowerCase() === 'n') {
+                    throw new errors_1.CliError('Cancelled. Use explicit org/agent or `orch workspace use <slug>`.');
+                }
+                // Save confirmation so we don't prompt again until workspace changes
+                configFile.workspace_confirmed = true;
+                await (0, config_1.saveConfig)(configFile);
+            }
+        }
         // Download agent definition with spinner
         const agentData = await (0, spinner_1.withSpinner)(`Downloading ${org}/${parsed.agent}@${parsed.version}...`, async () => {
             try {

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/dist/commands/workspace.js

@@ -85,6 +85,7 @@ async function useWorkspace(slug) {
     // Save to config
     const configFile = await (0, config_1.loadConfig)();
     configFile.workspace = slug;
+    delete configFile.workspace_confirmed;
     await (0, config_1.saveConfig)(configFile);
     await (0, analytics_1.track)('cli_workspace_use', { slug });
     process.stdout.write(chalk_1.default.green('\u2713') + ` Now using workspace: ${workspace.name} (${workspace.slug})\n`);

package/package.json

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