@orchagent/cli 0.3.53 → 0.3.55

package/dist/commands/run.js

@@ -80,6 +80,28 @@ function parseAgentRef(value) {
     }
     throw new errors_1.CliError('Invalid agent reference. Use org/agent or agent format.');
 }
+function canonicalAgentType(typeValue) {
+    const normalized = (typeValue || 'agent').toLowerCase();
+    return normalized === 'skill' ? 'skill' : 'agent';
+}
+function resolveExecutionEngine(agentData) {
+    if (agentData.execution_engine === 'direct_llm' || agentData.execution_engine === 'managed_loop' || agentData.execution_engine === 'code_runtime') {
+        return agentData.execution_engine;
+    }
+    const runtimeCommand = agentData.runtime?.command;
+    if (runtimeCommand && runtimeCommand.trim())
+        return 'code_runtime';
+    if (agentData.loop && Object.keys(agentData.loop).length > 0)
+        return 'managed_loop';
+    const normalized = (agentData.type || '').toLowerCase();
+    if (normalized === 'tool' || normalized === 'code')
+        return 'code_runtime';
+    if (normalized === 'agentic')
+        return 'managed_loop';
+    if (normalized === 'skill')
+        return 'direct_llm';
+    return 'direct_llm';
+}
 // ─── Validation helpers ─────────────────────────────────────────────────────
 async function validateFilePath(filePath) {
     const stat = await promises_1.default.stat(filePath);
@@ -471,6 +493,9 @@ async function downloadAgent(config, org, agent, version) {
     return {
         id: targetAgent.id,
         type: targetAgent.type,
+        run_mode: targetAgent.run_mode ?? null,
+        execution_engine: targetAgent.execution_engine ?? null,
+        callable: targetAgent.callable,
         name: targetAgent.name,
         version: targetAgent.version,
         description: targetAgent.description,
@@ -506,7 +531,13 @@ 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.has_bundle || agentData.type === 'prompt');
+            const canonicalType = canonicalAgentType(agentData.type);
+            const engine = resolveExecutionEngine(agentData);
+            const downloadable = Boolean(canonicalType === 'skill' ||
+                engine !== 'code_runtime' ||
+                agentData.source_url ||
+                agentData.pip_package ||
+                agentData.has_bundle);
             results.push({ dep, downloadable, agentData });
         }
         catch {
@@ -577,7 +608,7 @@ async function downloadDependenciesRecursively(config, depStatuses, visited = ne
             if (status.agentData.has_bundle) {
                 await saveBundleLocally(config, org, agent, status.dep.version, status.agentData.id);
             }
-            if (status.agentData.type === 'tool' && (status.agentData.source_url || status.agentData.pip_package)) {
+            if (resolveExecutionEngine(status.agentData) === 'code_runtime' && (status.agentData.source_url || status.agentData.pip_package)) {
                 await installTool(status.agentData);
             }
         }, { successText: `Downloaded ${depRef}` });
@@ -1174,7 +1205,7 @@ async function saveAgentLocally(org, agent, agentData) {
     const agentDir = path_1.default.join(AGENTS_DIR, org, agent);
     await promises_1.default.mkdir(agentDir, { recursive: true });
     await promises_1.default.writeFile(path_1.default.join(agentDir, 'agent.json'), JSON.stringify(agentData, null, 2));
-    if (agentData.type === 'prompt' && agentData.prompt) {
+    if (resolveExecutionEngine(agentData) !== 'code_runtime' && agentData.prompt) {
         await promises_1.default.writeFile(path_1.default.join(agentDir, 'prompt.md'), agentData.prompt);
     }
     if (agentData.files) {
@@ -1264,13 +1295,20 @@ async function executeLocalFromDir(dirPath, args, options) {
             `To run a local agent, the directory must contain orchagent.json.\n` +
             `Create one with: orch init`);
     }
-    const agentType = manifest.type || 'tool';
-    if (agentType === 'skill') {
+    const manifestType = manifest.type || 'agent';
+    const localType = canonicalAgentType(manifestType);
+    const localEngine = resolveExecutionEngine({
+        type: manifestType,
+        execution_engine: manifest.execution_engine || null,
+        runtime: manifest.runtime || null,
+        loop: manifest.loop || null,
+    });
+    if (localType === 'skill') {
         throw new errors_1.CliError('Skills cannot be run directly.\n\n' +
             'Skills are instructions meant to be injected into AI agent contexts.\n' +
             `Install with: orchagent skill install <org>/<skill>`);
     }
-    if (agentType === 'agent') {
+    if (localEngine === 'managed_loop') {
         // Read prompt.md
         const promptPath = path_1.default.join(resolved, 'prompt.md');
         let agentPrompt;
@@ -1323,7 +1361,7 @@ async function executeLocalFromDir(dirPath, args, options) {
         await executeAgentLocally(resolved, agentPrompt, agentInputData, agentOutputSchema, customTools, manifest, config, options.provider, options.model);
         return;
     }
-    if (agentType === 'prompt') {
+    if (localEngine === 'direct_llm') {
         // Read prompt.md
         const promptPath = path_1.default.join(resolved, 'prompt.md');
         let prompt;
@@ -1347,7 +1385,9 @@ async function executeLocalFromDir(dirPath, args, options) {
         }
         // Build AgentDownload from local files
         const agentData = {
-            type: 'prompt',
+            type: 'agent',
+            execution_engine: 'direct_llm',
+            run_mode: manifest.run_mode || 'on_demand',
             name: manifest.name || path_1.default.basename(resolved),
             version: manifest.version || 'local',
             description: manifest.description,
@@ -1389,7 +1429,7 @@ async function executeLocalFromDir(dirPath, args, options) {
         (0, output_1.printJson)(result);
         return;
     }
-    // Tool agents with bundle
+    // Code runtime agents with bundle
     const entrypoint = manifest.entrypoint || 'sandbox_main.py';
     const entrypointPath = path_1.default.join(resolved, entrypoint);
     try {
@@ -1399,7 +1439,9 @@ async function executeLocalFromDir(dirPath, args, options) {
         // No local entrypoint — try run_command
         if (manifest.run_command) {
             const agentData = {
-                type: 'tool',
+                type: 'agent',
+                execution_engine: 'code_runtime',
+                run_mode: manifest.run_mode || 'on_demand',
                 name: manifest.name || path_1.default.basename(resolved),
                 version: manifest.version || 'local',
                 supported_providers: manifest.supported_providers || ['any'],
@@ -1412,13 +1454,15 @@ async function executeLocalFromDir(dirPath, args, options) {
         }
         throw new errors_1.CliError(`No entrypoint found in ${resolved}\n\n` +
             `Expected: ${entrypoint}\n` +
-            `For tool agents, ensure the directory contains the entrypoint file\n` +
+            `For code runtime agents, ensure the directory contains the entrypoint file\n` +
             `or has run_command set in orchagent.json.`);
     }
     // Execute bundle-style from local directory
     const config = await (0, config_1.getResolvedConfig)();
     const agentData = {
-        type: 'tool',
+        type: 'agent',
+        execution_engine: 'code_runtime',
+        run_mode: manifest.run_mode || 'on_demand',
         name: manifest.name || path_1.default.basename(resolved),
         version: manifest.version || 'local',
         supported_providers: manifest.supported_providers || ['any'],
@@ -1561,6 +1605,13 @@ async function executeCloud(agentRef, file, options) {
         throw new errors_1.CliError('Missing org. Use org/agent or set default org.');
     }
     const agentMeta = await (0, api_1.getAgentWithFallback)(resolved, org, parsed.agent, parsed.version);
+    const cloudType = canonicalAgentType(agentMeta.type);
+    const cloudEngine = resolveExecutionEngine({
+        type: agentMeta.type,
+        execution_engine: agentMeta.execution_engine ?? null,
+        runtime: agentMeta.runtime ?? null,
+        loop: agentMeta.loop ?? null,
+    });
     // Pre-call balance check for paid agents
     let pricingInfo;
     if ((0, pricing_1.isPaidAgent)(agentMeta)) {
@@ -1680,7 +1731,7 @@ async function executeCloud(agentRef, file, options) {
             ...(options.model && { model: options.model }),
         };
     }
-    else if (agentMeta.type === 'prompt') {
+    else if (cloudEngine !== 'code_runtime') {
         const searchedProviders = effectiveProvider ? [effectiveProvider] : supportedProviders;
         const providerList = searchedProviders.join(', ');
         process.stderr.write(`Warning: No LLM key found for provider(s): ${providerList}\n` +
@@ -1736,7 +1787,7 @@ async function executeCloud(agentRef, file, options) {
             // Merge file content into --data
             const resolvedBody = await resolveJsonBody(options.data);
             const bodyObj = JSON.parse(resolvedBody);
-            if (agentMeta.type === 'prompt') {
+            if (cloudEngine !== 'code_runtime') {
                 const fieldName = options.fileField || inferFileField(agentMeta.input_schema);
                 if (filePaths.length === 1) {
                     await validateFilePath(filePaths[0]);
@@ -1768,7 +1819,7 @@ async function executeCloud(agentRef, file, options) {
                 headers['Content-Type'] = 'application/json';
             }
             else {
-                // Tool agents: send files as multipart, --data as metadata
+                // Code-runtime agents: send files as multipart, --data as metadata
                 let metadata = resolvedBody;
                 if (llmCredentials) {
                     const metaObj = JSON.parse(metadata);
@@ -1793,7 +1844,7 @@ async function executeCloud(agentRef, file, options) {
             }
             headers['Content-Type'] = 'application/json';
         }
-        else if ((filePaths.length > 0 || options.metadata) && agentMeta.type === 'prompt') {
+        else if ((filePaths.length > 0 || options.metadata) && cloudEngine !== 'code_runtime') {
             const fieldName = options.fileField || inferFileField(agentMeta.input_schema);
             let bodyObj = {};
             if (options.metadata) {
@@ -1858,16 +1909,16 @@ async function executeCloud(agentRef, file, options) {
         }
     } // end of non-injection path
     const url = `${resolved.apiUrl.replace(/\/$/, '')}/${org}/${parsed.agent}/${parsed.version}/${endpoint}`;
-    // Enable SSE streaming for agent-type agents (unless --json or --no-stream or --output)
-    const isAgentType = agentMeta.type === 'agent';
-    const wantStream = isAgentType && !options.json && !options.noStream && !options.output;
+    // Enable SSE streaming for managed-loop agents (unless --json or --no-stream or --output)
+    const isManagedLoopAgent = cloudType === 'agent' && cloudEngine === 'managed_loop';
+    const wantStream = isManagedLoopAgent && !options.json && !options.noStream && !options.output;
     if (wantStream) {
         headers['Accept'] = 'text/event-stream';
     }
     const spinner = options.json ? null : (0, spinner_1.createSpinner)(`Running ${org}/${parsed.agent}@${parsed.version}...`);
     spinner?.start();
-    // Agent-type runs can take much longer; use 10 min timeout for streaming
-    const timeoutMs = isAgentType ? 600000 : undefined;
+    // Managed-loop runs can take longer; use 10 min timeout for streaming.
+    const timeoutMs = isManagedLoopAgent ? 600000 : undefined;
     let response;
     try {
         response = await (0, api_1.safeFetchWithRetryForCalls)(url, {
@@ -2126,7 +2177,10 @@ async function executeLocal(agentRef, args, options) {
         catch (err) {
             const agentMeta = await (0, api_1.getPublicAgent)(resolved, org, parsed.agent, parsed.version);
             return {
-                type: agentMeta.type || 'tool',
+                type: agentMeta.type || 'agent',
+                run_mode: agentMeta.run_mode ?? null,
+                execution_engine: agentMeta.execution_engine ?? null,
+                callable: agentMeta.callable,
                 name: agentMeta.name,
                 version: agentMeta.version,
                 description: agentMeta.description || undefined,
@@ -2134,16 +2188,18 @@ async function executeLocal(agentRef, args, options) {
             };
         }
     }, { successText: `Downloaded ${org}/${parsed.agent}@${parsed.version}` });
+    const localType = canonicalAgentType(agentData.type);
+    const localEngine = resolveExecutionEngine(agentData);
     // Skills cannot be run directly
-    if (agentData.type === 'skill') {
+    if (localType === 'skill') {
         throw new errors_1.CliError('Skills cannot be run directly.\n\n' +
             'Skills are instructions meant to be injected into AI agent contexts.\n\n' +
             'Options:\n' +
             `  Install for AI tools:  orchagent skill install ${org}/${parsed.agent}\n` +
             `  Use with an agent:     orchagent run <agent> --skills ${org}/${parsed.agent}`);
     }
-    // Agent type: execute locally with the agent runner
-    if (agentData.type === 'agent') {
+    // Managed-loop agents execute locally with the agent runner.
+    if (localEngine === 'managed_loop') {
         if (!agentData.prompt) {
             throw new errors_1.CliError('Agent prompt not available for local execution.\n\n' +
                 'This agent may have local download disabled.\n' +
@@ -2218,10 +2274,10 @@ async function executeLocal(agentRef, args, options) {
     // Save locally
     const agentDir = await saveAgentLocally(org, parsed.agent, agentData);
     process.stderr.write(`\nAgent saved to: ${agentDir}\n`);
-    if (agentData.type === 'tool') {
+    if (localEngine === 'code_runtime') {
         if (agentData.has_bundle) {
             if (options.downloadOnly) {
-                process.stdout.write(`\nTool has bundle available for local execution.\n`);
+                process.stdout.write(`\nCode runtime bundle is available for local execution.\n`);
                 process.stdout.write(`Run with: orch run ${org}/${parsed.agent} --local [args...]\n`);
                 return;
             }
@@ -2250,8 +2306,8 @@ async function executeLocal(agentRef, args, options) {
             await executeTool(agentData, args);
             return;
         }
-        // Fallback: agent doesn't support local execution
-        process.stdout.write(`\nThis is a tool-based agent that runs on the server.\n`);
+        // Fallback: code runtime agent doesn't support local execution.
+        process.stdout.write(`\nThis code runtime agent is configured for server execution.\n`);
         process.stdout.write(`\nRun without --local: orch run ${org}/${parsed.agent}@${parsed.version} --data '{...}'\n`);
         return;
     }
@@ -2264,9 +2320,9 @@ async function executeLocal(agentRef, args, options) {
     const execLocalFileArgs = options.file ?? [];
     const execLocalKeyedFiles = execLocalFileArgs.filter(a => isKeyedFileArg(a) !== null);
     const execLocalHasInjection = execLocalKeyedFiles.length > 0 || (options.mount ?? []).length > 0;
-    // For prompt-based agents, execute locally
+    // Direct LLM agents execute locally via prompt composition.
     if (!options.input && !execLocalHasInjection) {
-        process.stdout.write(`\nPrompt-based agent ready.\n`);
+        process.stdout.write(`\nAgent ready.\n`);
         process.stdout.write(`Run with: orch run ${org}/${parsed.agent}@${parsed.version} --local --input '{...}'\n`);
         return;
     }

package/dist/commands/schedule.js

@@ -66,7 +66,7 @@ function registerScheduleCommand(program) {
         const workspaceId = await resolveWorkspaceId(config, options.workspace);
         const params = new URLSearchParams();
         if (options.agent)
-            params.set('agent_id', options.agent);
+            params.set('agent_name', options.agent);
         if (options.type)
             params.set('schedule_type', options.type);
         params.set('limit', '100');
@@ -88,18 +88,26 @@ function registerScheduleCommand(program) {
                 chalk_1.default.bold('Type'),
                 chalk_1.default.bold('Schedule'),
                 chalk_1.default.bold('Enabled'),
+                chalk_1.default.bold('Fails'),
                 chalk_1.default.bold('Last Run'),
                 chalk_1.default.bold('Status'),
                 chalk_1.default.bold('Runs'),
             ],
         });
         result.schedules.forEach((s) => {
+            const enabledLabel = s.auto_disabled_at
+                ? chalk_1.default.bgRed.white(' AUTO-DISABLED ')
+                : s.enabled ? chalk_1.default.green('yes') : chalk_1.default.red('no');
+            const failsLabel = s.consecutive_failures > 0
+                ? chalk_1.default.red(String(s.consecutive_failures))
+                : chalk_1.default.gray('0');
             table.push([
                 s.id.slice(0, 8),
                 `${s.agent_name}@${s.agent_version}`,
                 s.schedule_type,
                 s.schedule_type === 'cron' ? (s.cron_expression ?? '-') : 'webhook',
-                s.enabled ? chalk_1.default.green('yes') : chalk_1.default.red('no'),
+                enabledLabel,
+                failsLabel,
                 formatDate(s.last_run_at),
                 statusColor(s.last_run_status),
                 s.run_count.toString(),
@@ -294,4 +302,123 @@ function registerScheduleCommand(program) {
         }
         process.stdout.write('\n');
     });
+    // orch schedule info <schedule-id>
+    schedule
+        .command('info <schedule-id>')
+        .description('Show detailed schedule information with recent runs and events')
+        .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON')
+        .action(async (scheduleId, options) => {
+        const config = await (0, config_1.getResolvedConfig)();
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orch login` first.');
+        }
+        const workspaceId = await resolveWorkspaceId(config, options.workspace);
+        const [scheduleRes, runsRes, eventsRes] = await Promise.all([
+            (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/schedules/${scheduleId}`),
+            (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/schedules/${scheduleId}/runs?limit=5`),
+            (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/schedules/${scheduleId}/events?limit=5`),
+        ]);
+        if (options.json) {
+            (0, output_1.printJson)({ schedule: scheduleRes.schedule, runs: runsRes.runs, events: eventsRes.events });
+            return;
+        }
+        const s = scheduleRes.schedule;
+        process.stdout.write(`\n${chalk_1.default.bold('Schedule Details')}\n\n`);
+        process.stdout.write(`  ID:         ${s.id}\n`);
+        process.stdout.write(`  Agent:      ${s.agent_name}@${s.agent_version}\n`);
+        process.stdout.write(`  Type:       ${s.schedule_type}\n`);
+        if (s.cron_expression) {
+            process.stdout.write(`  Cron:       ${s.cron_expression}\n`);
+            process.stdout.write(`  Timezone:   ${s.timezone}\n`);
+        }
+        process.stdout.write(`  Enabled:    ${s.enabled ? chalk_1.default.green('yes') : chalk_1.default.red('no')}\n`);
+        if (s.auto_disabled_at) {
+            process.stdout.write(`  ${chalk_1.default.bgRed.white(' AUTO-DISABLED ')} at ${formatDate(s.auto_disabled_at)}\n`);
+        }
+        process.stdout.write(`  Runs:       ${s.run_count}\n`);
+        process.stdout.write(`  Failures:   ${s.consecutive_failures > 0 ? chalk_1.default.red(String(s.consecutive_failures)) : '0'} / ${s.max_consecutive_failures}\n`);
+        if (s.next_run_at) {
+            process.stdout.write(`  Next Run:   ${formatDate(s.next_run_at)}\n`);
+        }
+        if (s.alert_webhook_url) {
+            process.stdout.write(`  Alert URL:  ${s.alert_webhook_url.slice(0, 50)}...\n`);
+        }
+        // Recent runs
+        if (runsRes.runs.length > 0) {
+            process.stdout.write(`\n${chalk_1.default.bold('Recent Runs')}\n`);
+            const runsTable = new cli_table3_1.default({
+                head: [chalk_1.default.bold('Status'), chalk_1.default.bold('Duration'), chalk_1.default.bold('Error'), chalk_1.default.bold('Started')],
+            });
+            for (const r of runsRes.runs) {
+                runsTable.push([
+                    statusColor(r.status),
+                    r.duration_ms != null ? `${(r.duration_ms / 1000).toFixed(1)}s` : '-',
+                    r.error_message ? chalk_1.default.red(r.error_message.slice(0, 60)) : '-',
+                    formatDate(r.started_at),
+                ]);
+            }
+            process.stdout.write(`${runsTable.toString()}\n`);
+        }
+        // Recent events
+        if (eventsRes.events.length > 0) {
+            process.stdout.write(`\n${chalk_1.default.bold('Recent Events')}\n`);
+            for (const e of eventsRes.events) {
+                const color = e.event_type.includes('fail') || e.event_type.includes('disabled') ? chalk_1.default.red : chalk_1.default.gray;
+                process.stdout.write(`  ${chalk_1.default.gray(formatDate(e.created_at))} ${color(e.event_type)} ${e.message || ''}\n`);
+            }
+        }
+        process.stdout.write('\n');
+    });
+    // orch schedule runs <schedule-id>
+    schedule
+        .command('runs <schedule-id>')
+        .description('List run history for a schedule')
+        .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--status <status>', 'Filter by status (completed, failed, running, timeout)')
+        .option('--limit <n>', 'Number of runs to show (default: 20)', '20')
+        .option('--json', 'Output as JSON')
+        .action(async (scheduleId, options) => {
+        const config = await (0, config_1.getResolvedConfig)();
+        if (!config.apiKey) {
+            throw new errors_1.CliError('Missing API key. Run `orch login` first.');
+        }
+        const workspaceId = await resolveWorkspaceId(config, options.workspace);
+        const params = new URLSearchParams();
+        params.set('limit', options.limit);
+        if (options.status)
+            params.set('status', options.status);
+        const qs = `?${params.toString()}`;
+        const result = await (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/schedules/${scheduleId}/runs${qs}`);
+        if (options.json) {
+            (0, output_1.printJson)(result);
+            return;
+        }
+        if (!result.runs.length) {
+            process.stdout.write('No runs found.\n');
+            return;
+        }
+        const table = new cli_table3_1.default({
+            head: [
+                chalk_1.default.bold('Run ID'),
+                chalk_1.default.bold('Status'),
+                chalk_1.default.bold('Source'),
+                chalk_1.default.bold('Duration'),
+                chalk_1.default.bold('Error'),
+                chalk_1.default.bold('Started'),
+            ],
+        });
+        for (const r of result.runs) {
+            table.push([
+                r.id.slice(0, 8),
+                statusColor(r.status),
+                r.trigger_source || '-',
+                r.duration_ms != null ? `${(r.duration_ms / 1000).toFixed(1)}s` : '-',
+                r.error_message ? chalk_1.default.red(r.error_message.slice(0, 50)) : '-',
+                formatDate(r.started_at),
+            ]);
+        }
+        process.stdout.write(`${table.toString()}\n`);
+        process.stdout.write(chalk_1.default.gray(`\n${result.total} run${result.total !== 1 ? 's' : ''} total\n`));
+    });
 }