@orchagent/cli 0.3.59 → 0.3.60

package/dist/commands/init.js

@@ -248,7 +248,7 @@ function registerInitCommand(program) {
             }
         }
         if (initMode.flavor === 'direct_llm' && runMode === 'always_on') {
-            throw new errors_1.CliError("run_mode=always_on requires a non-direct runtime. Use legacy '--type tool' or add runtime.command in orchagent.json.");
+            throw new errors_1.CliError("run_mode=always_on requires runtime.command in orchagent.json (e.g. \"runtime\": { \"command\": \"python main.py\" }).");
         }
         // Create manifest and type-specific files
         const manifest = JSON.parse(MANIFEST_TEMPLATE);

package/dist/commands/pull.js

@@ -36,6 +36,11 @@ function resolveEngine(data) {
     if (ee === 'direct_llm' || ee === 'managed_loop' || ee === 'code_runtime') {
         return ee;
     }
+    const runtimeCommand = data.runtime?.command;
+    if (typeof runtimeCommand === 'string' && runtimeCommand.trim())
+        return 'code_runtime';
+    if (data.loop && Object.keys(data.loop).length > 0)
+        return 'managed_loop';
     const normalized = (data.type || '').toLowerCase();
     if (normalized === 'tool' || normalized === 'code')
         return 'code_runtime';
@@ -43,6 +48,15 @@ function resolveEngine(data) {
         return 'managed_loop';
     return 'direct_llm';
 }
+function commandForEntrypoint(entrypoint) {
+    if (entrypoint.endsWith('.js')
+        || entrypoint.endsWith('.mjs')
+        || entrypoint.endsWith('.cjs')
+        || entrypoint.endsWith('.ts')) {
+        return `node ${entrypoint}`;
+    }
+    return `python ${entrypoint}`;
+}
 // ─── Agent Resolution ───────────────────────────────────────────────────────
 async function resolveAgent(config, org, agent, version) {
     // 1. Try public download endpoint
@@ -55,10 +69,13 @@ async function resolveAgent(config, org, agent, version) {
             type: data.type || 'agent',
             run_mode: data.run_mode,
             execution_engine: data.execution_engine,
+            runtime: data.runtime,
+            loop: data.loop,
             callable: data.callable,
             prompt: data.prompt,
             input_schema: data.input_schema,
             output_schema: data.output_schema,
+            dependencies: data.dependencies,
             supported_providers: data.supported_providers,
             default_models: data.default_models,
             default_skills: data.default_skills,
@@ -133,7 +150,7 @@ async function tryOwnerFallback(config, org, agent, version) {
 }
 async function resolveFromMyAgents(config, agent, version, org) {
     const agents = await (0, api_1.listMyAgents)(config);
-    const matching = agents.filter(a => a.name === agent);
+    const matching = agents.filter(a => a.name === agent && a.org_slug === org);
     if (matching.length === 0)
         return null;
     let target;
@@ -157,10 +174,13 @@ function mapAgentToPullData(agent) {
         type: agent.type,
         run_mode: agent.run_mode ?? null,
         execution_engine: agent.execution_engine ?? null,
+        runtime: agent.runtime ?? null,
+        loop: agent.loop ?? null,
         callable: agent.callable,
         prompt: agent.prompt,
         input_schema: agent.input_schema,
         output_schema: agent.output_schema,
+        dependencies: agent.manifest?.dependencies,
         supported_providers: agent.supported_providers,
         default_models: agent.default_models,
         tags: agent.tags,
@@ -207,6 +227,16 @@ function buildManifest(data) {
     // Engine-specific fields
     const engine = resolveEngine(data);
     if (engine === 'code_runtime') {
+        const runtime = (data.runtime && typeof data.runtime === 'object' && Object.keys(data.runtime).length > 0)
+            ? { ...data.runtime }
+            : undefined;
+        const runtimeCommand = (typeof runtime?.command === 'string' && runtime.command.trim())
+            ? runtime.command
+            : (data.run_command?.trim()
+                || (data.entrypoint ? commandForEntrypoint(data.entrypoint) : undefined));
+        if (runtimeCommand) {
+            manifest.runtime = { ...(runtime || {}), command: runtimeCommand };
+        }
         if (data.entrypoint && data.entrypoint !== 'sandbox_main.py') {
             manifest.entrypoint = data.entrypoint;
         }
@@ -217,9 +247,32 @@ function buildManifest(data) {
         if (data.run_command)
             manifest.run_command = data.run_command;
     }
+    if (engine === 'managed_loop') {
+        const loop = (data.loop && typeof data.loop === 'object' && Object.keys(data.loop).length > 0)
+            ? { ...data.loop }
+            : undefined;
+        if (loop) {
+            manifest.loop = loop;
+            const loopCustomTools = loop.custom_tools;
+            if (Array.isArray(loopCustomTools) && loopCustomTools.length > 0) {
+                manifest.custom_tools = loopCustomTools;
+            }
+            const loopMaxTurns = loop.max_turns;
+            if (typeof loopMaxTurns === 'number') {
+                manifest.max_turns = loopMaxTurns;
+            }
+        }
+    }
     // Include orchestration manifest if present (for dependencies, etc.)
     if (data.manifest && typeof data.manifest === 'object') {
         const m = { ...data.manifest };
+        if (data.dependencies
+            && data.dependencies.length > 0
+            && (!Array.isArray(m.dependencies)
+                || m.dependencies?.length === 0)) {
+            ;
+            m.dependencies = data.dependencies;
+        }
         // Clean up fields that are already top-level
         delete m.runtime;
         delete m.loop;
@@ -227,6 +280,9 @@ function buildManifest(data) {
             manifest.manifest = m;
         }
     }
+    else if (data.dependencies && data.dependencies.length > 0) {
+        manifest.manifest = { dependencies: data.dependencies };
+    }
     return manifest;
 }
 // ─── Bundle Download + Extraction ───────────────────────────────────────────
@@ -235,8 +291,11 @@ async function downloadBundle(config, org, agent, version, agentId) {
         return await (0, api_1.downloadCodeBundle)(config, org, agent, version);
     }
     catch (err) {
-        if (!(err instanceof api_1.ApiError) || err.status !== 404)
+        if (!(err instanceof api_1.ApiError))
+            throw err;
+        if (err.status !== 404 && !(err.status === 403 && config.apiKey && agentId)) {
             throw err;
+        }
     }
     if (config.apiKey && agentId) {
         try {

package/dist/commands/service.js

@@ -174,7 +174,7 @@ function registerServiceCommand(program) {
             process.stdout.write(`  ${chalk_1.default.bold('Name:')}     ${svc.service_name}\n`);
             process.stdout.write(`  ${chalk_1.default.bold('Agent:')}    ${svc.agent_name}@${svc.agent_version}\n`);
             process.stdout.write(`  ${chalk_1.default.bold('State:')}    ${stateColor(svc.current_state)}\n`);
-            process.stdout.write(`  ${chalk_1.default.bold('URL:')}      ${svc.cloud_run_url || '-'}\n`);
+            process.stdout.write(`  ${chalk_1.default.bold('URL:')}      ${svc.provider_url || svc.cloud_run_url || '-'}\n`);
             process.stdout.write(`\n`);
             process.stdout.write(chalk_1.default.gray(`View logs: orch service logs ${svc.id}\n`));
         }
@@ -334,8 +334,8 @@ function registerServiceCommand(program) {
             process.stdout.write(`  Fail Streak:  ${chalk_1.default.red(String(svc.consecutive_restart_failures))} / ${svc.max_restart_failures}\n`);
         }
         process.stdout.write(`  Instances:    ${svc.min_instances}-${svc.max_instances}\n`);
-        process.stdout.write(`  Cloud Run:    ${svc.cloud_run_service || '-'}\n`);
-        process.stdout.write(`  URL:          ${svc.cloud_run_url || '-'}\n`);
+        process.stdout.write(`  Service ID:   ${svc.provider_service_id || svc.cloud_run_service || '-'}\n`);
+        process.stdout.write(`  URL:          ${svc.provider_url || svc.cloud_run_url || '-'}\n`);
         process.stdout.write(`  Deployed:     ${formatDate(svc.last_deployed_at)}\n`);
         process.stdout.write(`  Last Restart: ${formatDate(svc.last_restart_at)}\n`);
         if (svc.last_error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orchagent/cli",
-  "version": "0.3.59",
+  "version": "0.3.60",
   "description": "Command-line interface for orchagent — deploy and run AI agents for your team",
   "license": "MIT",
   "author": "orchagent <hello@orchagent.io>",