@orchagent/cli 0.3.62 → 0.3.64

package/dist/commands/github.js

@@ -226,13 +226,10 @@ async function importFromGitHub(config, repo, options) {
             selectedPath = selection.path;
         }
     }
-    // Determine visibility (default to public)
-    const isPublic = options.private ? false : true;
     const importResult = await (0, api_1.request)(config, 'POST', '/github/import', {
         body: JSON.stringify({
             repo,
             path: selectedPath,
-            is_public: isPublic,
             name: options.name,
         }),
         headers: { 'Content-Type': 'application/json' },
@@ -240,7 +237,6 @@ async function importFromGitHub(config, repo, options) {
     await (0, analytics_1.track)('cli_github_import', {
         repo,
         path: selectedPath,
-        is_public: isPublic,
         type: importResult.agent.type,
     });
     if (options.json) {
@@ -253,7 +249,6 @@ async function importFromGitHub(config, repo, options) {
     process.stdout.write(`  Agent:   ${importResult.agent.name}\n`);
     process.stdout.write(`  Version: ${importResult.agent.version}\n`);
     process.stdout.write(`  Type:    ${importResult.agent.type}\n`);
-    process.stdout.write(`  Public:  ${isPublic ? chalk_1.default.green('Yes') : chalk_1.default.yellow('No')}\n`);
     process.stdout.write('\n');
 }
 async function getSyncConfig(config, agentId, options) {
@@ -335,8 +330,6 @@ function registerGitHubCommand(program) {
         .command('import <repo>')
         .description('Import an agent or skill from GitHub')
         .option('--path <path>', 'Path to manifest within repo (scans if not specified)')
-        .option('--public', 'Make the agent public (default)')
-        .option('--private', 'Make the agent private')
         .option('--name <name>', 'Override agent name')
         .option('--json', 'Output raw JSON')
         .action(async (repo, options) => {

package/dist/commands/index.js

@@ -33,6 +33,7 @@ const schedule_1 = require("./schedule");
 const service_1 = require("./service");
 const transfer_1 = require("./transfer");
 const pull_1 = require("./pull");
+const logs_1 = require("./logs");
 function registerCommands(program) {
     (0, login_1.registerLoginCommand)(program);
     (0, whoami_1.registerWhoamiCommand)(program);
@@ -66,4 +67,5 @@ function registerCommands(program) {
     (0, service_1.registerServiceCommand)(program);
     (0, transfer_1.registerTransferCommand)(program);
     (0, pull_1.registerPullCommand)(program);
+    (0, logs_1.registerLogsCommand)(program);
 }

package/dist/commands/info.js

@@ -60,6 +60,7 @@ async function getAgentInfo(config, org, agent, version) {
             version: publicMeta.version,
             description: (publicMeta.description ?? undefined),
             supported_providers: publicMeta.supported_providers || ['any'],
+            callable: publicMeta.callable ?? false,
             input_schema: publicMeta.input_schema,
             output_schema: publicMeta.output_schema,
             source_url: meta.source_url,
@@ -103,6 +104,7 @@ async function getAgentInfo(config, org, agent, version) {
         version: targetAgent.version,
         description: targetAgent.description,
         prompt: targetAgent.prompt,
+        callable: targetAgent.callable ?? false,
         input_schema: targetAgent.input_schema,
         output_schema: targetAgent.output_schema,
         supported_providers: targetAgent.supported_providers || ['any'],
@@ -140,6 +142,9 @@ function registerInfoCommand(program) {
             process.stdout.write(`${agentData.description}\n\n`);
         }
         process.stdout.write(`Type: ${agentData.type}\n`);
+        if (agentData.callable) {
+            process.stdout.write(`Callable: ${chalk_1.default.green('yes')} — other agents can invoke this via the orchagent SDK\n`);
+        }
         process.stdout.write(`Providers: ${agentData.supported_providers.join(', ')}\n`);
         // Display pricing information
         const priceStr = (0, pricing_1.formatPrice)(agentData);

package/dist/commands/init.js

@@ -72,6 +72,9 @@ def main():
     user_input = data.get("input", "")
 
     # --- Your logic here ---
+    # To use workspace secrets, add them to "required_secrets" in orchagent.json:
+    #   "required_secrets": ["MY_API_KEY"]
+    # Then access via: os.environ["MY_API_KEY"]
     result = f"Received: {user_input}"
     # --- End your logic ---
 
@@ -83,15 +86,15 @@ if __name__ == "__main__":
     main()
 `;
 function readmeTemplate(agentName, flavor) {
-    const inputField = flavor === 'managed_loop' ? 'task' : 'input';
-    const inputDescription = flavor === 'managed_loop' ? 'The task to perform' : 'The input to process';
+    const inputField = flavor === 'managed_loop' || flavor === 'orchestrator' ? 'task' : 'input';
+    const inputDescription = flavor === 'managed_loop' || flavor === 'orchestrator' ? 'The task to perform' : 'The input to process';
     const cloudExample = flavor === 'code_runtime'
         ? `orchagent run ${agentName} --data '{"input": "Hello world"}'`
         : `orchagent run ${agentName} --data '{"${inputField}": "Hello world"}'`;
     const localExample = flavor === 'code_runtime'
         ? `orchagent run ${agentName} --local --data '{"input": "Hello world"}'`
         : `orchagent run ${agentName} --local --data '{"${inputField}": "Hello world"}'`;
-    return `# ${agentName}
+    let readme = `# ${agentName}
 
 A brief description of what this agent does.
 
@@ -121,6 +124,20 @@ ${localExample}
 |-------|------|-------------|
 | \`result\` | string | The agent's response |
 `;
+    if (flavor === 'orchestrator') {
+        readme += `
+## Dependencies
+
+This orchestrator calls other agents. Update \`manifest.dependencies\` in \`orchagent.json\` with your actual dependencies.
+
+**Publish order:** Publish dependency agents first, then this orchestrator.
+
+| Dependency | Version | Description |
+|------------|---------|-------------|
+| \`org/agent-name\` | v1 | TODO: describe what this agent does |
+`;
+    }
+    return readme;
 }
 const AGENT_PROMPT_TEMPLATE = `You are a helpful AI agent.
 
@@ -154,6 +171,65 @@ const AGENT_SCHEMA_TEMPLATE = `{
   }
 }
 `;
+const ORCHESTRATOR_MAIN_PY = `"""
+orchagent orchestrator entrypoint.
+
+Reads JSON input from stdin, calls dependency agents via the orchagent SDK,
+and writes JSON output to stdout.
+
+Usage:
+  echo '{"task": "do something"}' | python main.py
+"""
+
+import asyncio
+import json
+import sys
+
+from orchagent import AgentClient
+
+
+def main():
+    # Read JSON input from stdin
+    raw = sys.stdin.read()
+    try:
+        data = json.loads(raw) if raw.strip() else {}
+    except json.JSONDecodeError:
+        print(json.dumps({"error": "Invalid JSON input"}))
+        sys.exit(1)
+
+    task = data.get("task", "")
+
+    # --- Your orchestration logic here ---
+    # The AgentClient reads ORCHAGENT_SERVICE_KEY from the environment automatically.
+    # Do NOT add ORCHAGENT_SERVICE_KEY to required_secrets — the gateway injects it.
+    client = AgentClient()
+
+    # Call a dependency agent (must be listed in manifest.dependencies)
+    result = asyncio.run(
+        client.call("org/agent-name@v1", {"input": task})
+    )
+
+    # You can chain multiple calls, run them in parallel, or add conditional logic:
+    #
+    # Sequential:
+    #   result2 = asyncio.run(client.call("org/another-agent@v1", {"input": result}))
+    #
+    # Parallel:
+    #   r1, r2 = asyncio.run(asyncio.gather(
+    #       client.call("org/agent-a@v1", {"input": task}),
+    #       client.call("org/agent-b@v1", {"input": task}),
+    #   ))
+    # --- End orchestration logic ---
+
+    # Write JSON output to stdout
+    print(json.dumps({"result": result, "success": True}))
+
+
+if __name__ == "__main__":
+    main()
+`;
+const ORCHESTRATOR_REQUIREMENTS = `orchagent-sdk>=0.1.0
+`;
 const SKILL_TEMPLATE = `---
 name: my-skill
 description: When to use this skill
@@ -186,6 +262,7 @@ function registerInitCommand(program) {
         .description('Initialize a new agent project')
         .argument('[name]', 'Agent name (default: current directory name)')
         .option('--type <type>', 'Type: prompt, tool, agent, or skill (legacy aliases: agentic, code)', 'prompt')
+        .option('--orchestrator', 'Create an orchestrator agent with dependency scaffolding and SDK boilerplate')
         .option('--run-mode <mode>', 'Run mode for agents: on_demand or always_on', 'on_demand')
         .action(async (name, options) => {
         const cwd = process.cwd();
@@ -193,7 +270,13 @@ function registerInitCommand(program) {
         if (!['on_demand', 'always_on'].includes(runMode)) {
             throw new errors_1.CliError("Invalid --run-mode. Use 'on_demand' or 'always_on'.");
         }
-        const initMode = resolveInitFlavor(options.type);
+        let initMode = resolveInitFlavor(options.type);
+        if (options.orchestrator) {
+            if (initMode.type === 'skill') {
+                throw new errors_1.CliError('Cannot use --orchestrator with --type skill. Orchestrators are agent-type agents that call other agents.');
+            }
+            initMode = { type: 'agent', flavor: 'orchestrator' };
+        }
         // When a name is provided, create a subdirectory for the project
         const targetDir = name ? path_1.default.join(cwd, name) : cwd;
         const agentName = name || path_1.default.basename(cwd);
@@ -244,7 +327,7 @@ function registerInitCommand(program) {
                 throw err;
             }
         }
-        if (initMode.flavor !== 'code_runtime' && runMode === 'always_on') {
+        if (initMode.flavor !== 'code_runtime' && initMode.flavor !== 'orchestrator' && runMode === 'always_on') {
             throw new errors_1.CliError("run_mode=always_on requires runtime.command in orchagent.json (e.g. \"runtime\": { \"command\": \"python main.py\" }). Use --type tool for code-runtime agents.");
         }
         // Create manifest and type-specific files
@@ -252,17 +335,38 @@ function registerInitCommand(program) {
         manifest.name = agentName;
         manifest.type = initMode.type;
         manifest.run_mode = runMode;
-        if (initMode.flavor === 'managed_loop') {
+        if (initMode.flavor === 'orchestrator') {
+            manifest.description = 'An orchestrator agent that coordinates other agents';
+            manifest.runtime = { command: 'python main.py' };
+            manifest.manifest = {
+                manifest_version: 1,
+                dependencies: [{ id: 'org/agent-name', version: 'v1' }],
+                max_hops: 3,
+                timeout_ms: 120000,
+                per_call_downstream_cap: 50,
+            };
+            manifest.required_secrets = [];
+        }
+        else if (initMode.flavor === 'managed_loop') {
             manifest.description = 'An AI agent with tool use';
             manifest.supported_providers = ['anthropic'];
             manifest.loop = { max_turns: 25 };
+            manifest.required_secrets = [];
         }
         else if (initMode.flavor === 'code_runtime') {
             manifest.description = 'A code-runtime agent';
             manifest.runtime = { command: 'python main.py' };
+            manifest.required_secrets = [];
         }
         await promises_1.default.writeFile(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
-        if (initMode.flavor === 'code_runtime') {
+        if (initMode.flavor === 'orchestrator') {
+            const entrypointPath = path_1.default.join(targetDir, 'main.py');
+            const requirementsPath = path_1.default.join(targetDir, 'requirements.txt');
+            await promises_1.default.writeFile(entrypointPath, ORCHESTRATOR_MAIN_PY);
+            await promises_1.default.writeFile(requirementsPath, ORCHESTRATOR_REQUIREMENTS);
+            await promises_1.default.writeFile(schemaPath, AGENT_SCHEMA_TEMPLATE);
+        }
+        else if (initMode.flavor === 'code_runtime') {
             const entrypointPath = path_1.default.join(targetDir, 'main.py');
             await promises_1.default.writeFile(entrypointPath, CODE_TEMPLATE_PY);
             await promises_1.default.writeFile(schemaPath, SCHEMA_TEMPLATE);
@@ -281,19 +385,32 @@ function registerInitCommand(program) {
         process.stdout.write(`Initialized agent "${agentName}" in ${targetDir}\n`);
         process.stdout.write(`\nFiles created:\n`);
         const prefix = name ? name + '/' : '';
-        process.stdout.write(`  ${prefix}orchagent.json - Agent configuration\n`);
-        if (initMode.flavor === 'code_runtime') {
-            process.stdout.write(`  ${prefix}main.py        - Agent entrypoint (stdin/stdout JSON)\n`);
+        process.stdout.write(`  ${prefix}orchagent.json    - Agent configuration\n`);
+        if (initMode.flavor === 'orchestrator') {
+            process.stdout.write(`  ${prefix}main.py           - Orchestrator entrypoint (SDK calls)\n`);
+            process.stdout.write(`  ${prefix}requirements.txt  - Python dependencies (orchagent-sdk)\n`);
+        }
+        else if (initMode.flavor === 'code_runtime') {
+            process.stdout.write(`  ${prefix}main.py           - Agent entrypoint (stdin/stdout JSON)\n`);
         }
         else {
-            process.stdout.write(`  ${prefix}prompt.md      - Prompt template\n`);
+            process.stdout.write(`  ${prefix}prompt.md         - Prompt template\n`);
         }
-        process.stdout.write(`  ${prefix}schema.json    - Input/output schemas\n`);
-        process.stdout.write(`  ${prefix}README.md      - Agent documentation\n`);
+        process.stdout.write(`  ${prefix}schema.json       - Input/output schemas\n`);
+        process.stdout.write(`  ${prefix}README.md         - Agent documentation\n`);
         process.stdout.write(`  Run mode: ${runMode}\n`);
-        process.stdout.write(`  Execution: ${initMode.flavor}\n`);
+        process.stdout.write(`  Execution: ${initMode.flavor === 'orchestrator' ? 'code_runtime (orchestrator)' : initMode.flavor}\n`);
         process.stdout.write(`\nNext steps:\n`);
-        if (initMode.flavor === 'code_runtime') {
+        if (initMode.flavor === 'orchestrator') {
+            const stepNum = name ? 2 : 1;
+            if (name) {
+                process.stdout.write(`  1. cd ${name}\n`);
+            }
+            process.stdout.write(`  ${stepNum}. Update manifest.dependencies in orchagent.json with your actual agents\n`);
+            process.stdout.write(`  ${stepNum + 1}. Edit main.py with your orchestration logic\n`);
+            process.stdout.write(`  ${stepNum + 2}. Publish dependency agents first, then: orchagent publish\n`);
+        }
+        else if (initMode.flavor === 'code_runtime') {
             const stepNum = name ? 2 : 1;
             if (name) {
                 process.stdout.write(`  1. cd ${name}\n`);

package/dist/commands/logs.js

@@ -0,0 +1,182 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerLogsCommand = registerLogsCommand;
+const cli_table3_1 = __importDefault(require("cli-table3"));
+const chalk_1 = __importDefault(require("chalk"));
+const config_1 = require("../lib/config");
+const api_1 = require("../lib/api");
+const errors_1 = require("../lib/errors");
+const output_1 = require("../lib/output");
+// ============================================
+// HELPERS
+// ============================================
+async function resolveWorkspaceId(config, slug) {
+    const configFile = await (0, config_1.loadConfig)();
+    const targetSlug = slug ?? configFile.workspace;
+    if (!targetSlug) {
+        throw new errors_1.CliError('No workspace specified. Use --workspace <slug> or run `orch workspace use <slug>` first.');
+    }
+    const response = await (0, api_1.request)(config, 'GET', '/workspaces');
+    const workspace = response.workspaces.find((w) => w.slug === targetSlug);
+    if (!workspace) {
+        throw new errors_1.CliError(`Workspace '${targetSlug}' not found.`);
+    }
+    return workspace.id;
+}
+function formatDate(iso) {
+    if (!iso)
+        return '-';
+    return new Date(iso).toLocaleString();
+}
+function statusColor(status) {
+    if (!status)
+        return '-';
+    switch (status) {
+        case 'completed':
+            return chalk_1.default.green(status);
+        case 'failed':
+            return chalk_1.default.red(status);
+        case 'running':
+            return chalk_1.default.yellow(status);
+        case 'timeout':
+            return chalk_1.default.red(status);
+        default:
+            return status;
+    }
+}
+function formatDuration(ms) {
+    if (ms == null)
+        return '-';
+    if (ms < 1000)
+        return `${ms}ms`;
+    if (ms < 60000)
+        return `${(ms / 1000).toFixed(1)}s`;
+    return `${(ms / 60000).toFixed(1)}m`;
+}
+/** Detect if a string looks like a UUID (run ID) */
+function isUuid(value) {
+    return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
+}
+// ============================================
+// COMMAND REGISTRATION
+// ============================================
+function registerLogsCommand(program) {
+    program
+        .command('logs [target]')
+        .description('View execution logs. Use with no args to list recent runs, an agent name to filter, or a run ID for full detail.')
+        .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--status <status>', 'Filter by status: running, completed, failed, timeout')
+        .option('--limit <n>', 'Number of runs to show (default: 20)', '20')
+        .option('--json', 'Output as JSON')
+        .action(async (target, 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);
+        // If target looks like a UUID, show detailed logs for that run
+        if (target && isUuid(target)) {
+            await showRunLogs(config, workspaceId, target, options.json);
+            return;
+        }
+        // Otherwise list runs, optionally filtered by agent name
+        await listRuns(config, workspaceId, target, options);
+    });
+}
+// ============================================
+// LIST RUNS
+// ============================================
+async function listRuns(config, workspaceId, agentName, options) {
+    const params = new URLSearchParams();
+    if (agentName)
+        params.set('agent_name', agentName);
+    if (options.status)
+        params.set('status', options.status);
+    const limit = parseInt(options.limit ?? '20', 10);
+    params.set('limit', String(Math.min(Math.max(1, limit), 200)));
+    const qs = params.toString() ? `?${params.toString()}` : '';
+    const result = await (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/runs${qs}`);
+    if (options.json) {
+        (0, output_1.printJson)(result);
+        return;
+    }
+    if (result.runs.length === 0) {
+        if (agentName) {
+            process.stdout.write(`No runs found for agent '${agentName}'.\n`);
+        }
+        else {
+            process.stdout.write('No runs found in this workspace.\n');
+        }
+        return;
+    }
+    const table = new cli_table3_1.default({
+        head: [
+            chalk_1.default.bold('Run ID'),
+            chalk_1.default.bold('Agent'),
+            chalk_1.default.bold('Status'),
+            chalk_1.default.bold('Duration'),
+            chalk_1.default.bold('Source'),
+            chalk_1.default.bold('Started'),
+            chalk_1.default.bold('Error'),
+        ],
+    });
+    result.runs.forEach((r) => {
+        const errorPreview = r.error_message
+            ? chalk_1.default.red(r.error_message.length > 50 ? r.error_message.slice(0, 50) + '...' : r.error_message)
+            : chalk_1.default.gray('-');
+        table.push([
+            r.id.slice(0, 8),
+            `${r.agent_name}@${r.agent_version}`,
+            statusColor(r.status),
+            formatDuration(r.duration_ms),
+            r.trigger_source ?? '-',
+            formatDate(r.started_at || r.created_at),
+            errorPreview,
+        ]);
+    });
+    process.stdout.write(table.toString() + '\n');
+    if (result.total > result.runs.length) {
+        process.stdout.write(chalk_1.default.gray(`\nShowing ${result.runs.length} of ${result.total} runs. Use --limit to see more.\n`));
+    }
+    process.stdout.write(chalk_1.default.gray('\nView detailed logs for a run: orch logs <run-id>\n'));
+}
+// ============================================
+// SHOW RUN LOGS
+// ============================================
+async function showRunLogs(config, workspaceId, runId, json) {
+    const result = await (0, api_1.request)(config, 'GET', `/workspaces/${workspaceId}/runs/${runId}/logs`);
+    if (json) {
+        (0, output_1.printJson)(result);
+        return;
+    }
+    // Header
+    process.stdout.write(chalk_1.default.bold(`\nRun ${runId}\n`) +
+        `Agent:    ${result.agent_name ?? '-'}@${result.agent_version ?? '-'}\n` +
+        `Status:   ${statusColor(result.run_status)}\n` +
+        `Duration: ${formatDuration(result.execution_time_ms)}\n`);
+    if (result.exit_code != null) {
+        const exitLabel = result.exit_code === 0 ? chalk_1.default.green(String(result.exit_code)) : chalk_1.default.red(String(result.exit_code));
+        process.stdout.write(`Exit code: ${exitLabel}\n`);
+    }
+    // Error message
+    if (result.error_message) {
+        process.stdout.write('\n' + chalk_1.default.red.bold('Error:\n') + chalk_1.default.red(result.error_message) + '\n');
+    }
+    // Stdout
+    if (result.stdout) {
+        process.stdout.write('\n' + chalk_1.default.bold.cyan('--- stdout ---') + '\n' + result.stdout + '\n');
+    }
+    // Stderr
+    if (result.stderr) {
+        process.stdout.write('\n' + chalk_1.default.bold.yellow('--- stderr ---') + '\n' + result.stderr + '\n');
+    }
+    // No execution log available
+    if (!result.has_execution_log && !result.error_message) {
+        process.stdout.write(chalk_1.default.gray('\nNo sandbox output available for this run. ' +
+            'Execution logs are captured for agents with a code runtime (tool/agent types with runtime.command).\n'));
+    }
+    process.stdout.write('\n');
+}