@orchagent/cli 0.2.8 → 0.2.9

package/dist/commands/run.js

@@ -48,6 +48,13 @@ const output_1 = require("../lib/output");
 const llm_1 = require("../lib/llm");
 const DEFAULT_VERSION = 'latest';
 const AGENTS_DIR = path_1.default.join(os_1.default.homedir(), '.orchagent', 'agents');
+// Local execution environment variables
+const LOCAL_EXECUTION_ENV = 'ORCHAGENT_LOCAL_EXECUTION';
+const AGENTS_DIR_ENV = 'ORCHAGENT_AGENTS_DIR';
+const CALL_CHAIN_ENV = 'ORCHAGENT_CALL_CHAIN';
+const DEADLINE_MS_ENV = 'ORCHAGENT_DEADLINE_MS';
+const MAX_HOPS_ENV = 'ORCHAGENT_MAX_HOPS';
+const DOWNSTREAM_REMAINING_ENV = 'ORCHAGENT_DOWNSTREAM_REMAINING';
 function parseAgentRef(value) {
     const [ref, versionPart] = value.split('@');
     const version = versionPart?.trim() || DEFAULT_VERSION;
@@ -70,7 +77,7 @@ async function checkDependencies(config, dependencies) {
         const [org, agent] = dep.id.split('/');
         try {
             const agentData = await downloadAgent(config, org, agent, dep.version);
-            const downloadable = !!(agentData.source_url || agentData.pip_package || agentData.type === 'prompt');
+            const downloadable = !!(agentData.source_url || agentData.pip_package || agentData.has_bundle || agentData.type === 'prompt');
             results.push({ dep, downloadable, agentData });
         }
         catch {
@@ -117,6 +124,12 @@ async function promptUserForDeps(depStatuses) {
         });
     });
 }
+async function downloadSkillDependency(config, ref, defaultOrg) {
+    const parsed = parseSkillRef(ref);
+    const org = parsed.org ?? defaultOrg;
+    const skillData = await (0, api_1.publicRequest)(config, `/public/agents/${org}/${parsed.skill}/${parsed.version}/download`);
+    await saveAgentLocally(org, parsed.skill, skillData);
+}
 async function downloadDependenciesRecursively(config, depStatuses, visited = new Set()) {
     for (const status of depStatuses) {
         if (!status.downloadable || !status.agentData)
@@ -127,12 +140,27 @@ async function downloadDependenciesRecursively(config, depStatuses, visited = ne
         visited.add(depRef);
         const [org, agent] = status.dep.id.split('/');
         process.stderr.write(`\nDownloading dependency: ${depRef}...\n`);
-        // Save the dependency locally
+        // Save the dependency metadata locally
         await saveAgentLocally(org, agent, status.agentData);
-        // Install if it's a code agent
+        // For bundle-based agents, also extract the bundle
+        if (status.agentData.has_bundle) {
+            await saveBundleLocally(config, org, agent, status.dep.version);
+        }
+        // Install if it's a pip/source code agent
         if (status.agentData.type === 'code' && (status.agentData.source_url || status.agentData.pip_package)) {
             await installCodeAgent(status.agentData);
         }
+        // Download default skills
+        const defaultSkills = status.agentData.default_skills || [];
+        for (const skillRef of defaultSkills) {
+            try {
+                await downloadSkillDependency(config, skillRef, org);
+            }
+            catch {
+                // Skill download failed - not critical, continue
+                process.stderr.write(`  Warning: Failed to download skill ${skillRef}\n`);
+            }
+        }
         // Recursively download its dependencies
         if (status.agentData.dependencies && status.agentData.dependencies.length > 0) {
             const nestedStatuses = await checkDependencies(config, status.agentData.dependencies);
@@ -393,9 +421,32 @@ async function executeBundleAgent(config, org, agentName, version, agentData, ar
         }
         // Run the entrypoint with input via stdin
         process.stderr.write(`\nRunning: python3 ${entrypoint}\n\n`);
+        // Pass auth credentials to subprocess for orchestrator agents calling sub-agents
+        const subprocessEnv = { ...process.env };
+        if (config.apiKey) {
+            subprocessEnv.ORCHAGENT_SERVICE_KEY = config.apiKey;
+            subprocessEnv.ORCHAGENT_API_URL = config.apiUrl;
+        }
+        // For orchestrator agents with dependencies, enable local execution mode
+        if (agentData.dependencies && agentData.dependencies.length > 0) {
+            subprocessEnv[LOCAL_EXECUTION_ENV] = 'true';
+            subprocessEnv[AGENTS_DIR_ENV] = AGENTS_DIR;
+            // Initialize call chain with this agent
+            const agentRef = `${org}/${agentName}@${version}`;
+            subprocessEnv[CALL_CHAIN_ENV] = agentRef;
+            // Set deadline from manifest timeout (default 120s)
+            const manifest = agentData;
+            const timeoutMs = manifest.manifest?.timeout_ms || 120000;
+            subprocessEnv[DEADLINE_MS_ENV] = String(Date.now() + timeoutMs);
+            // Set max hops from manifest (default 10)
+            subprocessEnv[MAX_HOPS_ENV] = String(manifest.manifest?.max_hops || 10);
+            // Set downstream cap
+            subprocessEnv[DOWNSTREAM_REMAINING_ENV] = String(manifest.manifest?.per_call_downstream_cap || 100);
+        }
         const proc = (0, child_process_1.spawn)('python3', [entrypointPath], {
             cwd: extractDir,
             stdio: ['pipe', 'pipe', 'pipe'],
+            env: subprocessEnv,
         });
         // Send input JSON via stdin
         proc.stdin.write(inputJson);
@@ -484,6 +535,51 @@ async function saveAgentLocally(org, agent, agentData) {
     }
     return agentDir;
 }
+async function saveBundleLocally(config, org, agent, version) {
+    const agentDir = path_1.default.join(AGENTS_DIR, org, agent);
+    const bundleDir = path_1.default.join(agentDir, 'bundle');
+    // Check if already extracted with same version
+    const metaPath = path_1.default.join(agentDir, 'agent.json');
+    try {
+        const existingMeta = await promises_1.default.readFile(metaPath, 'utf-8');
+        const existing = JSON.parse(existingMeta);
+        if (existing.version === version) {
+            // Check if bundle dir exists
+            try {
+                await promises_1.default.access(bundleDir);
+                return bundleDir; // Already cached
+            }
+            catch {
+                // Bundle dir doesn't exist, need to extract
+            }
+        }
+    }
+    catch {
+        // Metadata doesn't exist, need to download
+    }
+    // Download and extract bundle
+    process.stderr.write(`Downloading bundle for ${org}/${agent}@${version}...\n`);
+    const bundleBuffer = await (0, api_1.downloadCodeBundle)(config, org, agent, version);
+    const tempZip = path_1.default.join(os_1.default.tmpdir(), `bundle-${Date.now()}.zip`);
+    await promises_1.default.writeFile(tempZip, bundleBuffer);
+    // Clean and recreate bundle directory
+    try {
+        await promises_1.default.rm(bundleDir, { recursive: true, force: true });
+    }
+    catch {
+        // Directory might not exist
+    }
+    await promises_1.default.mkdir(bundleDir, { recursive: true });
+    await unzipBundle(tempZip, bundleDir);
+    // Clean up temp file
+    try {
+        await promises_1.default.rm(tempZip);
+    }
+    catch {
+        // Ignore cleanup errors
+    }
+    return bundleDir;
+}
 function registerRunCommand(program) {
     program
         .command('run <agent> [args...]')

package/package.json

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