@orchagent/cli 0.3.100 → 0.3.102

package/dist/commands/schedule.js

@@ -162,6 +162,7 @@ function registerScheduleCommand(program) {
         .option('--alert-webhook <url>', 'Webhook URL to POST on failure (HTTPS required)')
         .option('--alert-on-failure-count <n>', 'Number of consecutive failures before alerting (default: 3)', parseInt)
         .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON')
         .action(async (agentArg, options) => {
         const config = await (0, config_1.getResolvedConfig)();
         if (!config.apiKey) {
@@ -217,6 +218,10 @@ function registerScheduleCommand(program) {
             body: JSON.stringify(body),
             headers: { 'Content-Type': 'application/json' },
         });
+        if (options.json) {
+            (0, output_1.printJson)(result);
+            return;
+        }
         const s = result.schedule;
         process.stdout.write(chalk_1.default.green('\u2713') + ` Schedule created\n\n`);
         process.stdout.write(`  ID:          ${s.id}\n`);
@@ -264,6 +269,7 @@ function registerScheduleCommand(program) {
         .option('--alert-on-failure-count <n>', 'Number of consecutive failures before alerting', parseInt)
         .option('--clear-alert-webhook', 'Remove the alert webhook URL')
         .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON')
         .action(async (partialScheduleId, options) => {
         const config = await (0, config_1.getResolvedConfig)();
         if (!config.apiKey) {
@@ -322,6 +328,10 @@ function registerScheduleCommand(program) {
             body: JSON.stringify(updates),
             headers: { 'Content-Type': 'application/json' },
         });
+        if (options.json) {
+            (0, output_1.printJson)(result);
+            return;
+        }
         const s = result.schedule;
         process.stdout.write(chalk_1.default.green('\u2713') + ` Schedule updated\n\n`);
         process.stdout.write(`  ID:      ${s.id}\n`);
@@ -349,6 +359,7 @@ function registerScheduleCommand(program) {
         .description('Delete a schedule')
         .option('-y, --yes', 'Skip confirmation prompt')
         .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON (implies --yes)')
         .action(async (partialScheduleId, options) => {
         const config = await (0, config_1.getResolvedConfig)();
         if (!config.apiKey) {
@@ -356,7 +367,7 @@ function registerScheduleCommand(program) {
         }
         const workspaceId = await resolveWorkspaceId(config, options.workspace);
         const scheduleId = await resolveScheduleId(config, partialScheduleId, workspaceId);
-        if (!options.yes) {
+        if (!options.yes && !options.json) {
             const rl = promises_1.default.createInterface({
                 input: process.stdin,
                 output: process.stdout,
@@ -368,7 +379,11 @@ function registerScheduleCommand(program) {
                 return;
             }
         }
-        await (0, api_1.request)(config, 'DELETE', `/workspaces/${workspaceId}/schedules/${scheduleId}`);
+        const result = await (0, api_1.request)(config, 'DELETE', `/workspaces/${workspaceId}/schedules/${scheduleId}`);
+        if (options.json) {
+            (0, output_1.printJson)({ ...result, id: scheduleId });
+            return;
+        }
         process.stdout.write(chalk_1.default.green('\u2713') + ` Schedule ${scheduleId} deleted\n`);
     });
     // orch schedule trigger <schedule-id>
@@ -378,6 +393,7 @@ function registerScheduleCommand(program) {
         .option('--data <json>', 'Override input data as JSON')
         .addOption(new commander_1.Option('--input <json>').hideHelp())
         .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON')
         .action(async (partialScheduleId, options) => {
         const config = await (0, config_1.getResolvedConfig)();
         if (!config.apiKey) {
@@ -396,11 +412,17 @@ function registerScheduleCommand(program) {
                 throw new errors_1.CliError('Invalid JSON in --data');
             }
         }
-        process.stdout.write('Triggering schedule...\n');
+        if (!options.json) {
+            process.stdout.write('Triggering schedule...\n');
+        }
         const result = await (0, api_1.request)(config, 'POST', `/workspaces/${workspaceId}/schedules/${scheduleId}/trigger`, body ? {
             body,
             headers: { 'Content-Type': 'application/json' },
         } : {});
+        if (options.json) {
+            (0, output_1.printJson)(result);
+            return;
+        }
         // Status-aware header message
         const isAsync = result.status === 'queued' || result.status === 'deduplicated';
         if (isAsync) {
@@ -565,6 +587,7 @@ function registerScheduleCommand(program) {
         .command('test-alert <schedule-id>')
         .description('Send a test alert to the schedule\'s configured webhook URL')
         .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
+        .option('--json', 'Output as JSON')
         .action(async (partialScheduleId, options) => {
         const config = await (0, config_1.getResolvedConfig)();
         if (!config.apiKey) {
@@ -572,8 +595,14 @@ function registerScheduleCommand(program) {
         }
         const workspaceId = await resolveWorkspaceId(config, options.workspace);
         const scheduleId = await resolveScheduleId(config, partialScheduleId, workspaceId);
-        process.stdout.write('Sending test alert...\n');
+        if (!options.json) {
+            process.stdout.write('Sending test alert...\n');
+        }
         const result = await (0, api_1.request)(config, 'POST', `/workspaces/${workspaceId}/schedules/${scheduleId}/test-alert`);
+        if (options.json) {
+            (0, output_1.printJson)({ ...result, schedule_id: scheduleId });
+            return;
+        }
         if (result.success) {
             process.stdout.write(chalk_1.default.green('\u2713') + ' Test alert delivered successfully\n');
         }
@@ -587,6 +616,7 @@ function registerScheduleCommand(program) {
         .description('Regenerate the webhook secret (invalidates old URL)')
         .option('--workspace <slug>', 'Workspace slug (default: current workspace)')
         .option('-y, --yes', 'Skip confirmation prompt')
+        .option('--json', 'Output as JSON (implies --yes)')
         .action(async (partialScheduleId, options) => {
         const config = await (0, config_1.getResolvedConfig)();
         if (!config.apiKey) {
@@ -594,7 +624,7 @@ function registerScheduleCommand(program) {
         }
         const workspaceId = await resolveWorkspaceId(config, options.workspace);
         const scheduleId = await resolveScheduleId(config, partialScheduleId, workspaceId);
-        if (!options.yes) {
+        if (!options.yes && !options.json) {
             const rl = promises_1.default.createInterface({
                 input: process.stdin,
                 output: process.stdout,
@@ -609,6 +639,10 @@ function registerScheduleCommand(program) {
             }
         }
         const result = await (0, api_1.request)(config, 'POST', `/workspaces/${workspaceId}/schedules/${scheduleId}/regenerate-webhook`);
+        if (options.json) {
+            (0, output_1.printJson)({ ...result, schedule_id: scheduleId });
+            return;
+        }
         process.stdout.write(chalk_1.default.green('\u2713') + ' Webhook secret regenerated\n\n');
         process.stdout.write(`  ${chalk_1.default.bold('New Webhook URL')} (save this — retrieve later with ${chalk_1.default.cyan('orch schedule info --reveal')}):\n`);
         process.stdout.write(`  ${result.webhook_url}\n\n`);

package/dist/commands/security.js

@@ -11,26 +11,11 @@ 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 resolve_agent_1 = require("../lib/resolve-agent");
 const output_1 = require("../lib/output");
 const spinner_1 = require("../lib/spinner");
 const llm_1 = require("../lib/llm");
 const analytics_1 = require("../lib/analytics");
-const DEFAULT_VERSION = 'latest';
-function parseAgentRef(value) {
-    const [ref, versionPart] = value.split('@');
-    const version = versionPart?.trim() || DEFAULT_VERSION;
-    const segments = ref.split('/');
-    if (segments.length === 1) {
-        return { agent: segments[0], version };
-    }
-    if (segments.length === 2) {
-        return { org: segments[0], agent: segments[1], version };
-    }
-    if (segments.length === 3) {
-        return { org: segments[0], agent: segments[1], version: segments[2] };
-    }
-    throw new errors_1.CliError('Invalid agent reference. Use org/agent/version or org/agent@version format.');
-}
 // Severity color mapping
 function severityColor(severity) {
     switch (severity.toLowerCase()) {
@@ -189,15 +174,8 @@ Examples:
         if (!resolved.apiKey) {
             throw new errors_1.CliError('Missing API key. Run `orchagent login` first.');
         }
-        const parsed = parseAgentRef(agentRef);
-        const configFile = await (0, config_1.loadConfig)();
-        const org = parsed.org ?? configFile.workspace ?? resolved.defaultOrg;
-        if (!org) {
-            throw new errors_1.CliError('Missing org. Use org/agent or set default org.');
-        }
-        const agentId = `${org}/${parsed.agent}/${parsed.version}`;
-        // Resolve workspace context for the target org
-        const workspaceId = await (0, api_1.resolveWorkspaceIdForOrg)(resolved, org);
+        const { org, agent: agentName, version, workspaceId } = await (0, resolve_agent_1.resolveAgentContext)(agentRef, resolved);
+        const agentId = `${org}/${agentName}/${version}`;
         // Detect LLM key for the scan
         let llmKey;
         let llmProvider;
@@ -235,6 +213,12 @@ Examples:
         if (options.maxAttacks) {
             requestBody.max_attacks = options.maxAttacks;
         }
+        // Send provider preference so gateway can narrow vault key search
+        // (even when no local key is found, the gateway resolves from vault)
+        const effectiveProvider = llmProvider || options.provider;
+        if (effectiveProvider) {
+            requestBody.llm_provider = effectiveProvider;
+        }
         const url = `${resolved.apiUrl.replace(/\/$/, '')}/security/test`;
         // Make the API call with a spinner
         const spinner = (0, spinner_1.createSpinner)(`Scanning ${agentId} for vulnerabilities...`);

package/dist/commands/templates/cron-job.js

@@ -22,7 +22,7 @@ Schedule examples:
   orch schedule create org/my-job --cron "0 */6 * * *"  # Every 6 hours
 
 Local test:
-  echo '{}' | python main.py
+  echo '{}' | python3 main.py
 """
 
 import json

package/dist/commands/templates/github-weekly-summary.js

@@ -14,7 +14,7 @@ exports.TEMPLATE_MANIFEST = `{
   "type": "agent",
   "description": "Weekly GitHub activity summary delivered to Discord. Uses Claude to analyse commits, PRs, and issues — surfaces patterns, risks, and trends.",
   "runtime": {
-    "command": "python main.py"
+    "command": "python3 main.py"
   },
   "required_secrets": [
     "ORCHAGENT_API_KEY",

package/dist/commands/test.js

@@ -640,7 +640,7 @@ function runEntrypointWithInput(agentDir, entrypoint, stdinData, verbose) {
 /**
  * Run fixture tests for code_runtime agents by executing the entrypoint
  * with fixture input as stdin and validating the JSON output.
- * Same interface as E2B: python main.py < input.json
+ * Same interface as E2B: python3 main.py < input.json
  */
 async function runCodeRuntimeFixtureTests(agentDir, fixtures, entrypoint, verbose) {
     process.stderr.write(chalk_1.default.blue('\nRunning fixture tests (code runtime)...\n\n'));
@@ -660,7 +660,7 @@ async function runCodeRuntimeFixtureTests(agentDir, fixtures, entrypoint, verbos
                 throw new errors_1.CliError(`Invalid JSON in ${fixtureName}: ${e.message}`);
             }
             const fixture = validateFixture(parsed, fixturePath);
-            // Run entrypoint with fixture input as stdin (same as E2B: python main.py < input.json)
+            // Run entrypoint with fixture input as stdin (same as E2B: python3 main.py < input.json)
             const inputJson = JSON.stringify(fixture.input);
             const result = await runEntrypointWithInput(agentDir, entrypoint, inputJson, verbose);
             if (result.code !== 0) {

package/dist/commands/transfer.js

@@ -8,6 +8,7 @@ const promises_1 = __importDefault(require("readline/promises"));
 const chalk_1 = __importDefault(require("chalk"));
 const config_1 = require("../lib/config");
 const api_1 = require("../lib/api");
+const agent_ref_1 = require("../lib/agent-ref");
 const errors_1 = require("../lib/errors");
 const analytics_1 = require("../lib/analytics");
 const output_1 = require("../lib/output");
@@ -34,7 +35,7 @@ async function promptText(message) {
 }
 function registerTransferCommand(program) {
     program
-        .command('transfer <agent-name>')
+        .command('transfer <agent>')
         .description('Transfer an agent to another workspace')
         .requiredOption('--to <workspace-slug>', 'Target workspace slug')
         .option('-w, --workspace <workspace-slug>', 'Source workspace slug (defaults to active workspace)')
@@ -43,12 +44,13 @@ function registerTransferCommand(program) {
         .option('--json', 'Output result as JSON')
         .addHelpText('after', `
 Examples:
-  orch transfer my-agent --to team-workspace           # Transfer agent to another workspace
+  orch transfer my-agent --to team-workspace           # Transfer by name
+  orch transfer my-org/my-agent --to team-workspace    # Transfer using org/agent format
   orch transfer my-agent --to team-workspace --workspace my-team
   orch transfer my-agent --to team-workspace --dry-run  # Preview transfer
   orch transfer my-agent --to team-workspace --yes      # Skip confirmation
 `)
-        .action(async (agentName, options) => {
+        .action(async (agentArg, options) => {
         const write = (message) => {
             if (!options.json)
                 process.stdout.write(message);
@@ -58,6 +60,14 @@ Examples:
         if (!config.apiKey) {
             throw new errors_1.CliError('Not logged in. Run `orchagent login` first.');
         }
+        // Parse org/agent[@version] or bare agent name
+        const parsed = (0, agent_ref_1.parseAgentRef)(agentArg);
+        const agentName = parsed.agent;
+        // If org was provided via org/agent format, use it as source workspace
+        // --workspace flag takes precedence if both are given
+        if (parsed.org && options.workspace && parsed.org !== options.workspace) {
+            throw new errors_1.CliError(`Conflicting source workspace: '${parsed.org}' (from agent ref) vs '${options.workspace}' (from --workspace flag).`);
+        }
         write('Finding agent and workspaces...\n');
         // Fetch workspace list first (needed to resolve source/target IDs).
         const workspacesResponse = await (0, api_1.request)(config, 'GET', '/workspaces');
@@ -66,8 +76,8 @@ Examples:
         if (!targetWorkspace) {
             throw new errors_1.CliError(`Workspace '${options.to}' not found. Run \`orchagent workspace list\` to see available workspaces.`);
         }
-        // Resolve source workspace (optional). If set, list agents from that workspace.
-        const sourceWorkspaceSlug = options.workspace ?? configFile.workspace;
+        // Resolve source workspace: --workspace flag > org from ref > config workspace
+        const sourceWorkspaceSlug = options.workspace ?? parsed.org ?? configFile.workspace;
         const sourceWorkspace = sourceWorkspaceSlug
             ? workspacesResponse.workspaces.find((w) => w.slug === sourceWorkspaceSlug)
             : null;

package/dist/commands/tree.js

@@ -27,9 +27,21 @@ function registerTreeCommand(program) {
             throw new errors_1.CliError('Missing org. Use org/agent format or set default org.');
         }
         const { agent, version } = parsed;
-        // Resolve workspace context for team workspaces
-        const workspaceId = await (0, api_1.resolveWorkspaceIdForOrg)(config, org);
-        const tree = await (0, api_1.request)(config, 'GET', `/agents/${org}/${agent}/${version}/tree`, ...(workspaceId ? [{ headers: { 'X-Workspace-Id': workspaceId } }] : []));
+        // Public-first fallback: try public tree endpoint (works for any public
+        // agent regardless of caller context), then fall back to authenticated
+        // endpoint with workspace header for private agents. Matches the pattern
+        // used by info/fork/estimate commands. (T12-04)
+        let tree;
+        try {
+            tree = await (0, api_1.publicRequest)(config, `/public/agents/${org}/${agent}/${version}/tree`);
+        }
+        catch (err) {
+            if (!(err instanceof api_1.ApiError) || err.status !== 404)
+                throw err;
+            // Public endpoint returned 404 — try authenticated endpoint for private agents
+            const workspaceId = await (0, api_1.resolveWorkspaceIdForOrg)(config, org);
+            tree = await (0, api_1.request)(config, 'GET', `/agents/${org}/${agent}/${version}/tree`, workspaceId ? { headers: { 'X-Workspace-Id': workspaceId } } : undefined);
+        }
         if (options.json) {
             console.log(JSON.stringify(tree, null, 2));
             return;

package/dist/commands/validate.js

@@ -172,6 +172,7 @@ Options:
                             const org = await (0, api_1.getOrg)(config, workspaceId);
                             const depResults = await (0, publish_1.checkDependencies)(config, deps, org.slug, workspaceId);
                             const notFound = depResults.filter(r => r.status === 'not_found');
+                            const notFoundCrossOrg = depResults.filter(r => r.status === 'not_found_cross_org');
                             const notCallable = depResults.filter(r => r.status === 'found_not_callable');
                             if (notFound.length > 0) {
                                 for (const dep of notFound) {
@@ -181,6 +182,14 @@ Options:
                                     });
                                 }
                             }
+                            if (notFoundCrossOrg.length > 0) {
+                                for (const dep of notFoundCrossOrg) {
+                                    serverIssues.push({
+                                        level: 'warning',
+                                        message: `Dependency not found (unpublished or not accessible from this workspace): ${dep.ref}`,
+                                    });
+                                }
+                            }
                             if (notCallable.length > 0) {
                                 for (const dep of notCallable) {
                                     serverIssues.push({

package/dist/lib/bundle.js

@@ -137,18 +137,23 @@ async function createCodeBundle(sourceDir, outputPath, options = {}) {
         const output = (0, fs_1.createWriteStream)(outputPath);
         const archive = (0, archiver_1.default)('zip', { zlib: { level: 9 } });
         let fileCount = 0;
+        const files = [];
         output.on('close', () => {
             resolve({
                 path: outputPath,
                 sizeBytes: archive.pointer(),
                 fileCount,
+                files,
             });
         });
         archive.on('error', (err) => {
             reject(err);
         });
-        archive.on('entry', () => {
+        archive.on('entry', (entry) => {
             fileCount++;
+            if (entry.name) {
+                files.push(entry.name);
+            }
         });
         archive.pipe(output);
         // Add directory contents with exclusions
@@ -235,6 +240,7 @@ async function previewBundle(sourceDir, options = {}) {
         totalSizeBytes,
         entrypoint,
         excludePatterns,
+        files,
     };
 }
 /**

package/dist/lib/llm.js

@@ -6,7 +6,7 @@
  * Used by run, call, and skill commands.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_MODELS = exports.PROVIDER_ENV_VARS = exports.LlmError = void 0;
+exports.MODEL_PROVIDER_PATTERNS = exports.DEFAULT_MODELS = exports.PROVIDER_ENV_VARS = exports.LlmError = void 0;
 exports.isRateLimitError = isRateLimitError;
 exports.detectLlmKeyFromEnv = detectLlmKeyFromEnv;
 exports.detectLlmKey = detectLlmKey;
@@ -15,6 +15,8 @@ exports.buildPrompt = buildPrompt;
 exports.callLlm = callLlm;
 exports.callLlmWithFallback = callLlmWithFallback;
 exports.validateProvider = validateProvider;
+exports.detectProviderFromModel = detectProviderFromModel;
+exports.warnProviderModelMismatch = warnProviderModelMismatch;
 const errors_1 = require("./errors");
 const llm_errors_1 = require("./llm-errors");
 class LlmError extends errors_1.CliError {
@@ -265,3 +267,37 @@ function validateProvider(provider) {
         throw new errors_1.CliError(`Invalid provider: ${provider}. Valid: ${validProviders.join(', ')}`);
     }
 }
+/**
+ * Model-name patterns for auto-detecting the LLM provider.
+ * Tested against the lowercased model string.
+ */
+exports.MODEL_PROVIDER_PATTERNS = {
+    openai: /^(gpt-|o1-|o3-|o4-|davinci|text-)/,
+    anthropic: /^claude-/,
+    gemini: /^gemini-/,
+    ollama: /^(llama|mistral|deepseek|phi|qwen)/,
+};
+/**
+ * Auto-detect the LLM provider from a model name using prefix patterns.
+ * Returns the provider string if a match is found, or null if ambiguous/unknown.
+ */
+function detectProviderFromModel(model) {
+    const modelLower = model.toLowerCase();
+    for (const [provider, pattern] of Object.entries(exports.MODEL_PROVIDER_PATTERNS)) {
+        if (pattern.test(modelLower)) {
+            return provider;
+        }
+    }
+    return null;
+}
+/**
+ * Warn if a model name doesn't match the expected provider's pattern.
+ * Used when both --model and --provider are explicitly specified.
+ */
+function warnProviderModelMismatch(model, provider) {
+    const modelLower = model.toLowerCase();
+    const expectedPattern = exports.MODEL_PROVIDER_PATTERNS[provider];
+    if (expectedPattern && !expectedPattern.test(modelLower)) {
+        process.stderr.write(`Warning: Model '${model}' may not be a ${provider} model.\n\n`);
+    }
+}

package/dist/lib/resolve-agent.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveOrg = resolveOrg;
+exports.resolveAgentContext = resolveAgentContext;
+const agent_ref_1 = require("./agent-ref");
+const config_1 = require("./config");
+const api_1 = require("./api");
+const errors_1 = require("./errors");
+/**
+ * Resolve the org from a parsed AgentRef using the standard fallback chain:
+ *   1. Explicit org from ref (org/agent@version)
+ *   2. Workspace from config file
+ *   3. defaultOrg from resolved config
+ *
+ * Throws CliError if no org can be determined.
+ */
+async function resolveOrg(parsed, config, options) {
+    if (parsed.org)
+        return parsed.org;
+    const configFile = await (0, config_1.loadConfig)();
+    const org = configFile.workspace ?? config.defaultOrg;
+    if (!org) {
+        throw new errors_1.CliError(options?.missingOrgMessage ??
+            'Missing org. Use org/agent format or set default org.');
+    }
+    return org;
+}
+/**
+ * Central agent-reference resolution pipeline used by all commands.
+ *
+ * Takes a raw agent reference string (e.g., "org/agent@v2", "agent", "agent@latest")
+ * and resolves it to a full context with org, agent name, version, and workspace ID.
+ *
+ * Resolution steps:
+ *   1. Parse the ref string into { org?, agent, version }
+ *   2. Resolve org via fallback chain: ref → config workspace → defaultOrg
+ *   3. Resolve workspace ID for team workspace context (optional)
+ *
+ * @example
+ *   const ctx = await resolveAgentContext('acme/my-agent@v2', config)
+ *   // ctx = { org: 'acme', agent: 'my-agent', version: 'v2', workspaceId: 'ws-123' }
+ *
+ * @example
+ *   const ctx = await resolveAgentContext('my-agent', config)
+ *   // ctx = { org: 'default-org', agent: 'my-agent', version: 'latest', workspaceId: undefined }
+ */
+async function resolveAgentContext(agentRefString, config, options) {
+    const parsed = (0, agent_ref_1.parseAgentRef)(agentRefString);
+    const org = await resolveOrg(parsed, config, {
+        missingOrgMessage: options?.missingOrgMessage,
+    });
+    let workspaceId;
+    if (!options?.skipWorkspaceResolution) {
+        workspaceId = await (0, api_1.resolveWorkspaceIdForOrg)(config, org);
+    }
+    return {
+        org,
+        agent: parsed.agent,
+        version: parsed.version,
+        workspaceId,
+    };
+}

package/package.json

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