@orchagent/cli 0.3.102 → 0.3.104

package/dist/commands/dag.js

@@ -193,6 +193,10 @@ function registerDagCommand(program) {
             throw new errors_1.CliError('Missing API key. Run `orch login` first.');
         }
         const workspaceId = await resolveWorkspaceId(config, options.workspace);
+        // Accept req_xxx format (gateway request_id shown in run output)
+        if (/^req_[0-9a-f]+$/i.test(runId)) {
+            runId = runId.slice(4);
+        }
         // Resolve short run IDs
         let resolvedRunId = runId;
         if (isUuid(runId)) {

package/dist/commands/health.js

@@ -9,6 +9,7 @@ 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 json_input_1 = require("../lib/json-input");
 const spinner_1 = require("../lib/spinner");
 const output_1 = require("../lib/output");
 const package_json_1 = __importDefault(require("../../package.json"));
@@ -194,13 +195,7 @@ function registerHealthCommand(program) {
         const inputSchema = agentMeta.input_schema;
         let body;
         if (options.data) {
-            try {
-                JSON.parse(options.data);
-                body = options.data;
-            }
-            catch {
-                throw new errors_1.CliError('Invalid JSON in --data option.');
-            }
+            body = await (0, json_input_1.resolveJsonBody)(options.data);
         }
         else {
             const sample = generateSampleInput(inputSchema);

package/dist/commands/init.js

@@ -2242,6 +2242,10 @@ function registerInitCommand(program) {
             process.stdout.write(`  ${stepNum + 1}. Edit schema.json with your input/output schemas\n`);
             process.stdout.write(`  ${stepNum + 2}. Run: orchagent publish\n`);
         }
+        if (initMode.flavor === 'managed_loop') {
+            process.stdout.write(`\n  Note: supported_providers: ["any"] means anthropic, openai, or gemini\n`);
+            process.stdout.write(`        Your vault key determines which is used (set with: orch secrets set)\n`);
+        }
         process.stdout.write(AGENT_BUILDER_HINT);
     });
 }

package/dist/commands/publish.js

@@ -548,11 +548,21 @@ async function batchPublish(rootDir, options) {
     catch {
         // Non-critical — just won't show org prefix
     }
-    const plan = (0, batch_publish_1.formatPublishPlan)(sorted, orgSlug);
-    process.stderr.write(plan);
+    // Dry-run: show ordering preview and exit (no subprocesses)
     if (options.dryRun) {
-        process.stderr.write(chalk_1.default.cyan('DRY RUN — running orch publish --dry-run in each directory:\n\n'));
+        const summary = (0, batch_publish_1.formatDryRunSummary)(sorted, orgSlug);
+        process.stderr.write(summary);
+        await (0, analytics_1.track)('cli_publish_all', {
+            total: sorted.length,
+            succeeded: 0,
+            failed: 0,
+            skipped: sorted.length,
+            dry_run: true,
+        });
+        return;
     }
+    const plan = (0, batch_publish_1.formatPublishPlan)(sorted, orgSlug);
+    process.stderr.write(plan);
     // Build the CLI args to forward (exclude --all)
     const forwardArgs = [];
     if (options.profile)

package/dist/commands/pull.js

@@ -50,7 +50,7 @@ function commandForEntrypoint(entrypoint) {
         || entrypoint.endsWith('.ts')) {
         return `node ${entrypoint}`;
     }
-    return `python ${entrypoint}`;
+    return `python3 ${entrypoint}`;
 }
 // ─── Agent Resolution ───────────────────────────────────────────────────────
 async function resolveAgent(config, org, agent, version, workspaceId) {
@@ -128,13 +128,21 @@ async function resolveAgent(config, org, agent, version, workspaceId) {
 async function tryOwnerFallback(config, org, agent, version, workspaceId) {
     try {
         let match = findOwnerMatch(await (0, api_1.listMyAgents)(config, workspaceId), agent, version, org);
+        let effectiveWorkspaceId = workspaceId;
         // Retry without workspace restriction to find agents in personal org
         if (!match && workspaceId) {
             match = findOwnerMatch(await (0, api_1.listMyAgents)(config, undefined), agent, version, org);
+            effectiveWorkspaceId = undefined;
         }
         if (!match)
             return null;
-        const agentData = await (0, api_1.request)(config, 'GET', `/agents/${match.id}`);
+        // Pass workspace context so GET /agents/{id} uses the correct org scope.
+        // Without this header, the gateway scopes to the caller's personal org,
+        // which 404s when the agent lives in a team workspace.
+        const headers = {};
+        if (effectiveWorkspaceId)
+            headers['X-Workspace-Id'] = effectiveWorkspaceId;
+        const agentData = await (0, api_1.request)(config, 'GET', `/agents/${match.id}`, { headers });
         return mapAgentToPullData(agentData);
     }
     catch {
@@ -164,7 +172,13 @@ async function resolveFromMyAgents(config, agent, version, org, workspaceId) {
             return null;
         target = found;
     }
-    const agentData = await (0, api_1.request)(config, 'GET', `/agents/${target.id}`);
+    // Pass workspace context so GET /agents/{id} uses the correct org scope.
+    // Without this header, the gateway scopes to the caller's personal org,
+    // which 404s when the agent lives in a team workspace.
+    const headers = {};
+    if (workspaceId)
+        headers['X-Workspace-Id'] = workspaceId;
+    const agentData = await (0, api_1.request)(config, 'GET', `/agents/${target.id}`, { headers });
     return mapAgentToPullData(agentData);
 }
 function mapAgentToPullData(agent) {

package/dist/commands/run.js

@@ -57,6 +57,7 @@ const config_1 = require("../lib/config");
 const resolve_agent_1 = require("../lib/resolve-agent");
 const api_1 = require("../lib/api");
 const errors_1 = require("../lib/errors");
+const json_input_1 = require("../lib/json-input");
 const output_1 = require("../lib/output");
 const spinner_1 = require("../lib/spinner");
 const llm_1 = require("../lib/llm");
@@ -360,32 +361,6 @@ async function buildMultipartBody(filePaths, metadata) {
         sourceLabel: filePaths.length === 1 ? filePaths[0] : `${filePaths.length} files`,
     };
 }
-async function resolveJsonBody(input) {
-    let raw = input;
-    if (input.startsWith('@')) {
-        const source = input.slice(1);
-        if (!source) {
-            throw new errors_1.CliError('Invalid JSON input. Use a JSON string or @file.');
-        }
-        if (source === '-') {
-            const stdinData = await readStdin();
-            if (!stdinData) {
-                throw new errors_1.CliError('No stdin provided for JSON input.');
-            }
-            raw = stdinData.toString('utf8');
-        }
-        else {
-            await validateFilePath(source);
-            raw = await promises_1.default.readFile(source, 'utf8');
-        }
-    }
-    try {
-        return JSON.stringify(JSON.parse(raw));
-    }
-    catch {
-        throw (0, errors_1.jsonInputError)('data');
-    }
-}
 // ─── Keyed file & mount helpers ──────────────────────────────────────────────
 const KEYED_FILE_KEY_RE = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 function isKeyedFileArg(arg) {
@@ -494,7 +469,7 @@ async function buildInjectedPayload(options) {
     let merged = {};
     // 1. Start with --data
     if (options.dataOption) {
-        const resolved = await resolveJsonBody(options.dataOption);
+        const resolved = await (0, json_input_1.resolveJsonBody)(options.dataOption);
         merged = JSON.parse(resolved);
     }
     let totalBytes = 0;
@@ -1912,7 +1887,7 @@ async function executeCloud(agentRef, file, options) {
     // --estimate-only: show cost estimate and exit without running
     if (options.estimate || options.estimateOnly) {
         try {
-            const est = await (0, api_1.getAgentCostEstimate)(resolved, org, agentName, version);
+            const est = await (0, api_1.getAgentCostEstimate)(resolved, org, agentName, version, workspaceId);
             const e = est.estimate;
             if (e.sample_size === 0) {
                 process.stderr.write(chalk_1.default.yellow('\nNo run history available for cost estimation.\n'));
@@ -1952,12 +1927,19 @@ async function executeCloud(agentRef, file, options) {
                 return;
             }
         }
-        catch {
-            // Non-fatal: if estimate fails, proceed with the run (or exit if --estimate-only)
+        catch (err) {
+            // Provide specific error messages based on failure type
+            const detail = err instanceof api_1.ApiError && err.status === 404
+                ? 'Agent not found.'
+                : err instanceof api_1.ApiError && err.status === 429
+                    ? 'Rate limited — try again shortly.'
+                    : err instanceof api_1.ApiError
+                        ? `API error (${err.status}).`
+                        : 'Network error — check your connection.';
             if (options.estimateOnly) {
-                throw new errors_1.CliError('Could not fetch cost estimate.');
+                throw new errors_1.CliError(`Could not fetch cost estimate: ${detail}`);
             }
-            process.stderr.write(chalk_1.default.gray('Could not fetch cost estimate. Proceeding...\n\n'));
+            process.stderr.write(chalk_1.default.gray(`Could not fetch cost estimate: ${detail} Proceeding with run...\n\n`));
         }
     }
     const endpoint = options.endpoint?.trim() || agentMeta.default_endpoint || 'analyze';
@@ -2069,7 +2051,7 @@ async function executeCloud(agentRef, file, options) {
         }
         if (options.data && filePaths.length > 0) {
             // Merge file content into --data
-            const resolvedBody = await resolveJsonBody(options.data);
+            const resolvedBody = await (0, json_input_1.resolveJsonBody)(options.data);
             const bodyObj = JSON.parse(resolvedBody);
             if (cloudEngine !== 'code_runtime') {
                 const fieldName = resolveFileField(options.fileField, agentMeta.input_schema);
@@ -2117,7 +2099,7 @@ async function executeCloud(agentRef, file, options) {
             }
         }
         else if (options.data) {
-            const resolvedBody = await resolveJsonBody(options.data);
+            const resolvedBody = await (0, json_input_1.resolveJsonBody)(options.data);
             warnIfLocalPathReference(resolvedBody);
             const parsedBody = JSON.parse(resolvedBody);
             warnInputSchemaErrors(parsedBody, agentMeta.input_schema);
@@ -2573,7 +2555,22 @@ async function executeCloud(agentRef, file, options) {
         process.stdout.write(`${payload}\n`);
         return;
     }
-    (0, output_1.printJson)(payload);
+    // In verbose mode, strip stdout/stderr from the JSON payload since they'll
+    // be displayed in dedicated colored sections below (avoids duplication)
+    if (options.verbose && typeof payload === 'object' && payload !== null && 'metadata' in payload) {
+        const payloadObj = payload;
+        const meta = payloadObj.metadata;
+        if (meta && (meta.stdout || meta.stderr)) {
+            const { stdout: _s, stderr: _e, ...cleanMeta } = meta;
+            (0, output_1.printJson)({ ...payloadObj, metadata: cleanMeta });
+        }
+        else {
+            (0, output_1.printJson)(payload);
+        }
+    }
+    else {
+        (0, output_1.printJson)(payload);
+    }
     // Display timing metadata on stderr (non-json mode only)
     if (typeof payload === 'object' && payload !== null && 'metadata' in payload) {
         const meta = payload.metadata;
@@ -2585,7 +2582,14 @@ async function executeCloud(agentRef, file, options) {
                 if (stderr) {
                     process.stderr.write(chalk_1.default.bold.yellow('\n--- stderr ---') + '\n' + stderr + '\n');
                 }
-                if (stdout) {
+                // For code_runtime agents, stdout IS the data — skip if it would
+                // duplicate what's already visible in the JSON data field
+                const dataStr = typeof payload.data === 'string'
+                    ? payload.data
+                    : JSON.stringify(payload.data);
+                const stdoutDuplicatesData = isCodeRuntimeAgent && stdout && dataStr &&
+                    stdout.trim() === dataStr.trim();
+                if (stdout && !stdoutDuplicatesData) {
                     process.stderr.write(chalk_1.default.bold.cyan('\n--- stdout ---') + '\n' + stdout + '\n');
                 }
                 if (!stderr && !stdout) {
@@ -2685,7 +2689,7 @@ async function executeLocal(agentRef, args, options) {
             return;
         }
         // Resolve @file.json / @- stdin syntax before parsing
-        const resolvedInput = await resolveJsonBody(options.input);
+        const resolvedInput = await (0, json_input_1.resolveJsonBody)(options.input);
         let agentInputData;
         try {
             agentInputData = JSON.parse(resolvedInput);
@@ -2871,7 +2875,7 @@ function registerRunCommand(program) {
         // Local-only options
         .option('--download-only', 'Just download the agent, do not execute (local only)')
         .option('--with-deps', 'Automatically download all dependencies (local only)')
-        .option('--here', 'Scan current directory (local only)')
+        .option('--here', 'Send current directory as path input, for tool agents with a path field (local only)')
         .option('--path <dir>', 'Shorthand for --data \'{"path": "<dir>"}\' (local only)')
         .addHelpText('after', `
 Examples:

package/dist/commands/schedule.js

@@ -11,6 +11,7 @@ const promises_1 = __importDefault(require("readline/promises"));
 const config_1 = require("../lib/config");
 const api_1 = require("../lib/api");
 const errors_1 = require("../lib/errors");
+const json_input_1 = require("../lib/json-input");
 const output_1 = require("../lib/output");
 const agent_ref_1 = require("../lib/agent-ref");
 const api_2 = require("../lib/api");
@@ -187,12 +188,8 @@ function registerScheduleCommand(program) {
         const rawInput = options.data ?? options.input;
         let inputData;
         if (rawInput) {
-            try {
-                inputData = JSON.parse(rawInput);
-            }
-            catch {
-                throw new errors_1.CliError('Invalid JSON in --data. Use single quotes: --data \'{"key": "value"}\'');
-            }
+            const resolved = await (0, json_input_1.resolveJsonBody)(rawInput);
+            inputData = JSON.parse(resolved);
         }
         const scheduleType = options.webhook ? 'webhook' : 'cron';
         const body = {

package/dist/commands/trace.js

@@ -105,6 +105,10 @@ function registerTraceCommand(program) {
             throw new errors_1.CliError('Missing API key. Run `orch login` first.');
         }
         const workspaceId = await resolveWorkspaceId(config, options.workspace);
+        // Accept req_xxx format (gateway request_id shown in run output)
+        if (/^req_[0-9a-f]+$/i.test(runId)) {
+            runId = runId.slice(4);
+        }
         // Resolve short run IDs
         let resolvedRunId = runId;
         if (isUuid(runId)) {

package/dist/lib/api.js

@@ -286,10 +286,11 @@ async function getPublicAgent(config, org, agent, version) {
 }
 async function getAgentCostEstimate(config, org, agent, version, workspaceId) {
     const path = `/public/agents/${org}/${agent}/${version}/cost-estimate`;
-    if (workspaceId && config.apiKey) {
-        return request(config, 'GET', path, {
-            headers: { 'X-Workspace-Id': workspaceId },
-        });
+    if (config.apiKey) {
+        const headers = {};
+        if (workspaceId)
+            headers['X-Workspace-Id'] = workspaceId;
+        return request(config, 'GET', path, { headers });
     }
     return publicRequest(config, path);
 }
@@ -380,15 +381,18 @@ async function getAgentWithFallback(config, org, agentName, version, workspaceId
     if (!config.apiKey) {
         throw new ApiError(`Agent '${org}/${agentName}@${version}' not found`, 404);
     }
-    const userOrg = await getOrg(config, workspaceId);
-    if (userOrg.slug !== org) {
-        throw new ApiError(`Agent '${org}/${agentName}@${version}' not found`, 404);
-    }
+    // Try authenticated lookup in the resolved workspace context
     const myAgent = await getMyAgent(config, agentName, version, workspaceId);
-    if (!myAgent) {
-        throw new ApiError(`Agent '${org}/${agentName}@${version}' not found`, 404);
+    if (myAgent)
+        return myAgent;
+    // Fallback: if workspace was specified, also check personal org —
+    // handles cross-workspace lookups (e.g., team context looking up personal agent)
+    if (workspaceId) {
+        const personalAgent = await getMyAgent(config, agentName, version);
+        if (personalAgent)
+            return personalAgent;
     }
-    return myAgent;
+    throw new ApiError(`Agent '${org}/${agentName}@${version}' not found`, 404);
 }
 /**
  * Resolve a workspace ID from an org slug.

package/dist/lib/batch-publish.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.discoverAgents = discoverAgents;
 exports.topoSort = topoSort;
 exports.formatPublishPlan = formatPublishPlan;
+exports.formatDryRunSummary = formatDryRunSummary;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
@@ -221,3 +222,75 @@ function formatPublishPlan(sorted, orgSlug) {
     lines.push('');
     return lines.join('\n');
 }
+/**
+ * Format an enhanced dry-run summary for --all --dry-run.
+ * Shows publish ordering, local/external dependencies, and graph health.
+ */
+function formatDryRunSummary(sorted, orgSlug) {
+    const lines = [];
+    const localNames = new Set(sorted.map(a => a.name));
+    // Collect external deps (referenced but not in the project)
+    const externalDeps = new Map(); // ref → [agent names that reference it]
+    for (const agent of sorted) {
+        for (const ref of agent.dependencyRefs) {
+            const depName = ref.includes('/') ? ref.split('/')[1] : ref;
+            if (!localNames.has(depName)) {
+                const consumers = externalDeps.get(ref) || [];
+                consumers.push(agent.name);
+                externalDeps.set(ref, consumers);
+            }
+        }
+    }
+    // Publish order table
+    lines.push('');
+    lines.push(chalk_1.default.bold(`  Publish order (${sorted.length} agent${sorted.length === 1 ? '' : 's'}):`));
+    lines.push('');
+    for (let i = 0; i < sorted.length; i++) {
+        const agent = sorted[i];
+        const type = agent.isSkill ? 'skill' : 'agent';
+        const prefix = orgSlug ? `${orgSlug}/` : '';
+        // Separate local and external deps for clarity
+        const localDeps = [];
+        const extDeps = [];
+        for (const ref of agent.dependencyRefs) {
+            const depName = ref.includes('/') ? ref.split('/')[1] : ref;
+            if (localNames.has(depName)) {
+                localDeps.push(depName);
+            }
+            else {
+                extDeps.push(ref);
+            }
+        }
+        let depInfo = '';
+        if (localDeps.length > 0 || extDeps.length > 0) {
+            const parts = [];
+            if (localDeps.length > 0)
+                parts.push(localDeps.join(', '));
+            if (extDeps.length > 0)
+                parts.push(extDeps.map(d => `${d} ${chalk_1.default.yellow('(external)')}`).join(', '));
+            depInfo = ` ${chalk_1.default.gray('→')} ${parts.join(', ')}`;
+        }
+        lines.push(`  ${chalk_1.default.bold(`${i + 1}.`)} ${prefix}${agent.name} ${chalk_1.default.gray(`[${type}]`)}${depInfo}`);
+        lines.push(`     ${chalk_1.default.gray(agent.dirName + '/')}`);
+    }
+    // External dependencies section
+    if (externalDeps.size > 0) {
+        lines.push('');
+        lines.push(chalk_1.default.yellow(`  External dependencies (must already be published):`));
+        for (const [ref, consumers] of externalDeps) {
+            lines.push(`    ${ref} ${chalk_1.default.gray(`← ${consumers.join(', ')}`)}`);
+        }
+    }
+    // Summary
+    lines.push('');
+    const skillCount = sorted.filter(a => a.isSkill).length;
+    const agentCount = sorted.length - skillCount;
+    const parts = [];
+    if (agentCount > 0)
+        parts.push(`${agentCount} agent${agentCount === 1 ? '' : 's'}`);
+    if (skillCount > 0)
+        parts.push(`${skillCount} skill${skillCount === 1 ? '' : 's'}`);
+    lines.push(chalk_1.default.green(`  ✓ ${parts.join(', ')} ready to publish (no circular dependencies)`));
+    lines.push('');
+    return lines.join('\n');
+}

package/dist/lib/json-input.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveJsonBody = resolveJsonBody;
+const promises_1 = __importDefault(require("fs/promises"));
+const errors_1 = require("./errors");
+async function readStdin() {
+    if (process.stdin.isTTY)
+        return null;
+    const chunks = [];
+    for await (const chunk of process.stdin) {
+        chunks.push(Buffer.from(chunk));
+    }
+    if (!chunks.length)
+        return null;
+    return Buffer.concat(chunks);
+}
+async function validateFilePath(filePath) {
+    const stat = await promises_1.default.stat(filePath);
+    if (stat.isDirectory()) {
+        throw new errors_1.CliError(`Expected a file but got a directory: ${filePath}\n\n` +
+            `Provide a JSON file path, e.g. --data @input.json`);
+    }
+}
+/**
+ * Resolve a --data value to a validated JSON string.
+ *
+ * Supports three input forms:
+ *   - Plain JSON string:  '{"key":"value"}'
+ *   - File reference:     @input.json
+ *   - Stdin pipe:         @-
+ */
+async function resolveJsonBody(input) {
+    let raw = input;
+    if (input.startsWith('@')) {
+        const source = input.slice(1);
+        if (!source) {
+            throw new errors_1.CliError('Invalid JSON input. Use a JSON string or @file.');
+        }
+        if (source === '-') {
+            const stdinData = await readStdin();
+            if (!stdinData) {
+                throw new errors_1.CliError('No stdin provided for JSON input.');
+            }
+            raw = stdinData.toString('utf8');
+        }
+        else {
+            await validateFilePath(source);
+            raw = await promises_1.default.readFile(source, 'utf8');
+        }
+    }
+    try {
+        return JSON.stringify(JSON.parse(raw));
+    }
+    catch {
+        throw (0, errors_1.jsonInputError)('data');
+    }
+}

package/package.json

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