@orchagent/cli 0.2.3 → 0.2.5

package/dist/commands/run.js

@@ -289,7 +289,9 @@ async function unzipBundle(zipPath, destDir) {
         });
     });
 }
-async function executeBundleAgent(config, org, agentName, version, agentData, args) {
+async function executeBundleAgent(config, org, agentName, version, agentData, args, inputOption) {
+    // Capture the user's working directory before we change anything
+    const userCwd = process.cwd();
     // Create temp directory for the bundle
     const tempDir = path_1.default.join(os_1.default.tmpdir(), `orchagent-${agentName}-${Date.now()}`);
     await promises_1.default.mkdir(tempDir, { recursive: true });
@@ -331,30 +333,50 @@ async function executeBundleAgent(config, org, agentName, version, agentData, ar
         catch {
             throw new errors_1.CliError(`Entrypoint not found: ${entrypoint}`);
         }
-        // Build input JSON from args
-        // The first arg should be the input (file path or JSON string)
+        // Build input JSON from --input option or positional args
         let inputJson = '{}';
-        if (args.length > 0) {
+        if (inputOption) {
+            // --input was provided, use it directly (should be valid JSON)
+            try {
+                // Parse and re-stringify to validate JSON
+                const parsed = JSON.parse(inputOption);
+                // Resolve any relative paths in the input to absolute paths
+                if (typeof parsed === 'object' && parsed !== null) {
+                    for (const key of ['path', 'directory', 'file_path']) {
+                        if (typeof parsed[key] === 'string' && !path_1.default.isAbsolute(parsed[key])) {
+                            parsed[key] = path_1.default.resolve(userCwd, parsed[key]);
+                        }
+                    }
+                }
+                inputJson = JSON.stringify(parsed);
+            }
+            catch {
+                throw new errors_1.CliError('Invalid JSON in --input option');
+            }
+        }
+        else if (args.length > 0) {
             const firstArg = args[0];
+            // Resolve to absolute path relative to user's working directory
+            const resolvedArg = path_1.default.isAbsolute(firstArg) ? firstArg : path_1.default.resolve(userCwd, firstArg);
             // Check if it's a file path
             try {
-                const stat = await promises_1.default.stat(firstArg);
+                const stat = await promises_1.default.stat(resolvedArg);
                 if (stat.isFile()) {
                     // Read file content as input
-                    const fileContent = await promises_1.default.readFile(firstArg, 'utf-8');
+                    const fileContent = await promises_1.default.readFile(resolvedArg, 'utf-8');
                     // Check if it's already JSON
                     try {
                         JSON.parse(fileContent);
                         inputJson = fileContent;
                     }
                     catch {
-                        // Wrap as file_path in JSON
-                        inputJson = JSON.stringify({ file_path: firstArg });
+                        // Wrap as file_path in JSON (use absolute path)
+                        inputJson = JSON.stringify({ file_path: resolvedArg });
                     }
                 }
                 else if (stat.isDirectory()) {
-                    // Pass directory path
-                    inputJson = JSON.stringify({ directory: firstArg });
+                    // Pass directory path (use absolute path)
+                    inputJson = JSON.stringify({ directory: resolvedArg });
                 }
             }
             catch {
@@ -364,7 +386,7 @@ async function executeBundleAgent(config, org, agentName, version, agentData, ar
                     inputJson = firstArg;
                 }
                 catch {
-                    // Treat as a simple string input
+                    // Treat as a simple string input (could be a URL)
                     inputJson = JSON.stringify({ input: firstArg });
                 }
             }
@@ -390,29 +412,47 @@ async function executeBundleAgent(config, org, agentName, version, agentData, ar
             stderr += text;
             process.stderr.write(text);
         });
-        await new Promise((resolve, reject) => {
+        const exitCode = await new Promise((resolve) => {
             proc.on('close', (code) => {
-                if (code !== 0) {
-                    reject(new errors_1.CliError(`Agent exited with code ${code}`));
-                }
-                else {
-                    resolve();
-                }
+                resolve(code ?? 1);
             });
             proc.on('error', (err) => {
-                reject(err);
+                process.stderr.write(`Error running agent: ${err.message}\n`);
+                resolve(1);
             });
         });
-        // Parse and print the output
+        // Handle output - check for errors in stdout even on failure
         if (stdout.trim()) {
             try {
                 const result = JSON.parse(stdout.trim());
+                // Check if it's an error response
+                if (exitCode !== 0 && typeof result === 'object' && result !== null && 'error' in result) {
+                    throw new errors_1.CliError(`Agent error: ${result.error}`);
+                }
+                if (exitCode !== 0) {
+                    // Non-zero exit but output isn't an error object - show it and fail
+                    (0, output_1.printJson)(result);
+                    throw new errors_1.CliError(`Agent exited with code ${exitCode}`);
+                }
+                // Success - print result
                 (0, output_1.printJson)(result);
             }
-            catch {
+            catch (err) {
+                if (err instanceof errors_1.CliError)
+                    throw err;
                 // Not JSON, print as-is
                 process.stdout.write(stdout);
+                if (exitCode !== 0) {
+                    throw new errors_1.CliError(`Agent exited with code ${exitCode}`);
+                }
+            }
+        }
+        else if (exitCode !== 0) {
+            // No stdout, check stderr
+            if (stderr.trim()) {
+                throw new errors_1.CliError(`Agent error: ${stderr.trim()}`);
             }
+            throw new errors_1.CliError(`Agent exited with code ${exitCode} (no output)`);
         }
     }
     finally {
@@ -518,7 +558,7 @@ function registerRunCommand(program) {
                     return;
                 }
                 // Execute the bundle-based code agent locally
-                await executeBundleAgent(resolved, org, parsed.agent, parsed.version, agentData, args);
+                await executeBundleAgent(resolved, org, parsed.agent, parsed.version, agentData, args, options.input);
                 return;
             }
             // Check for pip/source-based local execution (legacy)

package/package.json

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