@orchagent/cli 0.3.82 → 0.3.84

package/dist/commands/billing.js

@@ -4,119 +4,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerBillingCommand = registerBillingCommand;
-const cli_table3_1 = __importDefault(require("cli-table3"));
-const chalk_1 = __importDefault(require("chalk"));
 const open_1 = __importDefault(require("open"));
 const config_1 = require("../lib/config");
 const api_1 = require("../lib/api");
-const errors_1 = require("../lib/errors");
-const output_1 = require("../lib/output");
 function registerBillingCommand(program) {
-    const billing = program
+    program
         .command('billing')
-        .description('Manage platform credits and usage');
-    // orch billing balance
-    billing
-        .command('balance')
-        .description('Show your credit balance and recent transactions')
-        .option('--json', 'Output as JSON')
-        .action(async (options) => {
+        .description('Open billing portal in your browser')
+        .action(async () => {
         const resolved = await (0, config_1.getResolvedConfig)();
-        const data = await (0, api_1.getCreditsBalance)(resolved);
-        if (options.json) {
-            (0, output_1.printJson)(data);
-            return;
+        if (!resolved.apiKey) {
+            process.stderr.write('Not logged in. Run: orch login\n');
+            process.exit(1);
+        }
+        // Get the billing portal URL from the gateway
+        try {
+            const data = await (0, api_1.request)(resolved, 'GET', '/billing/portal');
+            process.stdout.write('Opening billing portal...\n');
+            await (0, open_1.default)(data.url);
+            process.stdout.write(`If browser doesn't open, visit:\n${data.url}\n`);
+        }
+        catch {
+            // Fallback to direct web URL
+            const webUrl = resolved.apiUrl.replace('api.', '').replace('/v1', '');
+            const url = `${webUrl}/settings/billing`;
+            process.stdout.write('Opening billing page...\n');
+            await (0, open_1.default)(url);
+            process.stdout.write(`If browser doesn't open, visit:\n${url}\n`);
         }
-        // Show balance
-        const balance = data.balance_cents / 100;
-        process.stdout.write(chalk_1.default.bold(`\nBalance: ${chalk_1.default.green(`$${balance.toFixed(2)} USD`)}\n\n`));
-        // Show recent transactions
-        if (data.recent_transactions && data.recent_transactions.length > 0) {
-            process.stdout.write(chalk_1.default.bold('Recent Transactions:\n'));
-            const table = new cli_table3_1.default({
-                head: [
-                    chalk_1.default.bold('Date'),
-                    chalk_1.default.bold('Type'),
-                    chalk_1.default.bold('Amount'),
-                    chalk_1.default.bold('Balance'),
-                ],
-            });
-            data.recent_transactions.forEach((tx) => {
-                const date = new Date(tx.created_at).toLocaleDateString();
-                const amount = (tx.amount_cents / 100).toFixed(2);
-                const balance = (tx.balance_after_cents / 100).toFixed(2);
-                const amountColor = tx.amount_cents >= 0 ? chalk_1.default.green : chalk_1.default.red;
-                table.push([date, tx.transaction_type, amountColor(`$${amount}`), `$${balance}`]);
-            });
-            process.stdout.write(`${table.toString()}\n\n`);
-        }
-        else {
-            process.stdout.write('No recent transactions\n\n');
-        }
-        process.stdout.write(chalk_1.default.gray('Add credits: orch billing add 5\n'));
-    });
-    // orch billing add <amount>
-    billing
-        .command('add [amount]')
-        .description('Add credits via Stripe checkout (minimum $5.00 USD)')
-        .action(async (amount) => {
-        const resolved = await (0, config_1.getResolvedConfig)();
-        // Parse and validate amount
-        let amountNum;
-        if (!amount) {
-            amountNum = 5.00; // Default to $5
-        }
-        else {
-            amountNum = parseFloat(amount);
-            if (isNaN(amountNum) || amountNum < 5.00) {
-                throw new errors_1.CliError('Amount must be at least $5.00 USD', errors_1.ExitCodes.INVALID_INPUT);
-            }
-        }
-        const amountCents = Math.round(amountNum * 100);
-        // Create checkout session
-        const checkout = await (0, api_1.createCreditCheckout)(resolved, amountCents);
-        // Open in browser
-        process.stdout.write(`\nOpening checkout page...\n`);
-        process.stdout.write(`Amount: $${amountNum.toFixed(2)} USD\n\n`);
-        await (0, open_1.default)(checkout.checkout_url);
-        process.stdout.write(chalk_1.default.gray(`If browser doesn't open, visit:\n${checkout.checkout_url}\n`));
-    });
-    // orch billing history (alias)
-    billing
-        .command('history')
-        .description('Show transaction history (alias for balance)')
-        .option('--json', 'Output as JSON')
-        .action(async (options) => {
-        // Just call balance command
-        const resolved = await (0, config_1.getResolvedConfig)();
-        const data = await (0, api_1.getCreditsBalance)(resolved);
-        if (options.json) {
-            (0, output_1.printJson)(data);
-            return;
-        }
-        // Simplified view - just show transactions
-        if (data.recent_transactions && data.recent_transactions.length > 0) {
-            const table = new cli_table3_1.default({
-                head: [
-                    chalk_1.default.bold('Date'),
-                    chalk_1.default.bold('Type'),
-                    chalk_1.default.bold('Amount'),
-                    chalk_1.default.bold('Balance'),
-                ],
-            });
-            data.recent_transactions.forEach((tx) => {
-                const date = new Date(tx.created_at).toLocaleDateString();
-                const amount = (tx.amount_cents / 100).toFixed(2);
-                const balance = (tx.balance_after_cents / 100).toFixed(2);
-                const amountColor = tx.amount_cents >= 0 ? chalk_1.default.green : chalk_1.default.red;
-                table.push([date, tx.transaction_type, amountColor(`$${amount}`), `$${balance}`]);
-            });
-            process.stdout.write(`\n${table.toString()}\n\n`);
-        }
-        else {
-            process.stdout.write('\nNo transactions found\n\n');
-        }
-        const balance = data.balance_cents / 100;
-        process.stdout.write(chalk_1.default.gray(`Current balance: $${balance.toFixed(2)} USD\n`));
     });
 }

package/dist/commands/github.js

@@ -147,7 +147,7 @@ async function getGitHubStatus(config, json) {
     }
     process.stdout.write(`GitHub Status:\n\n`);
     process.stdout.write(`  Connected: ${chalk_1.default.green('Yes')}\n`);
-    process.stdout.write(`  Account:   ${chalk_1.default.bold(connection.github_account_login)}\n`);
+    process.stdout.write(`  Account:   ${chalk_1.default.bold(connection.github_account_login || 'Unknown')}\n`);
     if (connection.github_account_type) {
         process.stdout.write(`  Type:      ${connection.github_account_type === 'User' ? 'User' : 'Organization'}\n`);
     }

package/dist/commands/info.js

@@ -8,7 +8,6 @@ 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 pricing_1 = require("../lib/pricing");
 function formatSchema(schema, indent = '  ') {
     const lines = [];
     const props = schema.properties || {};
@@ -66,8 +65,6 @@ async function getAgentInfo(config, org, agent, version, workspaceId) {
             source_url: meta.source_url,
             run_command: meta.run_command,
             url: meta.url,
-            pricing_mode: publicMeta.pricing_mode,
-            price_per_call_cents: publicMeta.price_per_call_cents,
         };
     }
     catch (err) {
@@ -111,14 +108,12 @@ async function getAgentInfo(config, org, agent, version, workspaceId) {
         source_url: targetAgent.source_url,
         run_command: targetAgent.run_command,
         url: targetAgent.url,
-        pricing_mode: targetAgent.pricing_mode,
-        price_per_call_cents: targetAgent.price_per_call_cents,
     };
 }
 function registerInfoCommand(program) {
     program
         .command('info <agent>')
-        .description('Show agent details including pricing, inputs, and outputs')
+        .description('Show agent details including inputs and outputs')
         .option('--json', 'Output as JSON')
         .action(async (agentArg, options) => {
         const config = await (0, config_1.getResolvedConfig)();
@@ -148,15 +143,6 @@ function registerInfoCommand(program) {
             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);
-        const color = (0, pricing_1.isPaidAgent)(agentData) ? chalk_1.default.yellow : chalk_1.default.green;
-        process.stdout.write(`Price: ${color(priceStr)}\n`);
-        // If paid, show server-only message for non-owners
-        if ((0, pricing_1.isPaidAgent)(agentData)) {
-            process.stdout.write(chalk_1.default.gray('Note: Paid agents run on server only (use orch run)\n'));
-            process.stdout.write(chalk_1.default.gray('      Owners can still download for development/testing\n'));
-        }
         if (agentData.type === 'tool') {
             // Don't show internal routing URLs - they confuse users
             if (agentData.url && !agentData.url.includes('.internal')) {

package/dist/commands/install.js

@@ -15,7 +15,6 @@ const adapters_1 = require("../adapters");
 const skill_resolve_1 = require("../lib/skill-resolve");
 const installed_1 = require("../lib/installed");
 const agents_md_utils_1 = require("../lib/agents-md-utils");
-const pricing_1 = require("../lib/pricing");
 const DEFAULT_VERSION = 'latest';
 function parseAgentRef(value) {
     const [ref, versionPart] = value.split('@');
@@ -44,48 +43,6 @@ async function downloadAgentWithFallback(config, org, name, version, workspaceId
             throw err;
         }
     }
-    // Check if paid agent
-    if (publicMeta && (0, pricing_1.isPaidAgent)(publicMeta)) {
-        // Paid agent - check if owner
-        if (config.apiKey) {
-            const callerOrg = await (0, api_1.getOrg)(config, workspaceId);
-            const isOwner = (publicMeta.org_id && callerOrg.id === publicMeta.org_id) ||
-                (publicMeta.org_slug && callerOrg.slug === publicMeta.org_slug);
-            if (isOwner) {
-                // Owner - fetch from authenticated endpoint with full prompt
-                const myAgents = await (0, api_1.listMyAgents)(config, workspaceId);
-                const matching = myAgents.filter(a => a.name === name);
-                if (matching.length > 0) {
-                    let targetAgent;
-                    if (version === 'latest') {
-                        targetAgent = matching.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())[0];
-                    }
-                    else {
-                        const found = matching.find(a => a.version === version);
-                        if (!found) {
-                            throw new api_1.ApiError(`Agent '${org}/${name}@${version}' not found`, 404);
-                        }
-                        targetAgent = found;
-                    }
-                    // Fetch full agent data with prompt from authenticated endpoint
-                    const agentData = await (0, api_1.request)(config, 'GET', `/agents/${targetAgent.id}`);
-                    return { ...agentData, org_slug: org };
-                }
-            }
-            else {
-                // Non-owner - block with helpful message
-                const price = (0, pricing_1.formatPrice)(publicMeta);
-                throw new errors_1.CliError(`This agent is paid (${price}) and runs on server only.\n\n` +
-                    `Use: orch run ${org}/${name}@${version} --data '{...}'`);
-            }
-        }
-        else {
-            // Not authenticated - block
-            const price = (0, pricing_1.formatPrice)(publicMeta);
-            throw new errors_1.CliError(`This agent is paid (${price}) and runs on server only.\n\n` +
-                `Use: orch run ${org}/${name}@${version} --data '{...}'`);
-        }
-    }
     // Check if download is disabled (server-only agent)
     if (publicMeta && publicMeta.allow_local_download === false) {
         // Check if owner (can bypass)
@@ -114,7 +71,8 @@ async function downloadAgentWithFallback(config, org, name, version, workspaceId
                 }
             }
         }
-        throw new errors_1.CliError(`This agent is server-only and cannot be downloaded.\n\n` +
+        const typeLabel = publicMeta.type || 'agent';
+        throw new errors_1.CliError(`This ${typeLabel} is server-only and cannot be downloaded.\n\n` +
             `Use: orch run ${org}/${name}@${version} --data '{...}'`);
     }
     // Free agent - proceed normally with public data
@@ -159,10 +117,6 @@ function registerInstallCommand(program) {
         .option('--global', 'Install to home directory (alias for --scope user)')
         .option('--dry-run', 'Show what would be installed without making changes')
         .option('--json', 'Output result as JSON (for automation/tooling)')
-        .addHelpText('after', `
-Note: Paid agents cannot be installed locally - they run on server only.
-      Use 'orchagent run' to execute paid agents.
-`)
         .action(async (agentArg, options) => {
         const jsonMode = options.json === true;
         const log = (msg) => { if (!jsonMode)

package/dist/commands/login.js

@@ -62,6 +62,8 @@ async function keyBasedLogin(apiKey) {
         api_url: resolved.apiUrl,
         default_org: existing.default_org ?? org.slug,
     };
+    // Clear workspace from previous account — workspaces are account-specific
+    delete nextConfig.workspace;
     await (0, config_1.saveConfig)(nextConfig);
     await (0, analytics_1.track)('cli_login', { method: 'key' });
     process.stdout.write(`✓ Logged in to ${org.slug}\n`);
@@ -81,6 +83,8 @@ async function browserBasedLogin(port) {
             api_url: resolved.apiUrl,
             default_org: existing.default_org ?? result.orgSlug,
         };
+        // Clear workspace from previous account — workspaces are account-specific
+        delete nextConfig.workspace;
         await (0, config_1.saveConfig)(nextConfig);
         await (0, analytics_1.track)('cli_login', { method: 'browser' });
         process.stdout.write(`\n✓ Logged in to ${result.orgSlug}\n`);

package/dist/commands/publish.js

@@ -495,7 +495,7 @@ function registerPublishCommand(program) {
                 const skillVersion = skillResult.agent?.version || 'v1';
                 const skillAgentId = skillResult.agent?.id;
                 await (0, analytics_1.track)('cli_publish', { agent_type: 'skill', multi_file: hasMultipleFiles });
-                process.stdout.write(`\nPublished skill: ${org.slug}/${skillData.frontmatter.name}@${skillVersion}\n`);
+                process.stdout.write(`\n${chalk_1.default.green('✔')} Published ${org.slug}/${skillData.frontmatter.name}@${skillVersion} successfully!\n\n`);
                 if (hasMultipleFiles) {
                     process.stdout.write(`Files: ${skillFiles.length} files included\n`);
                 }
@@ -706,6 +706,7 @@ function registerPublishCommand(program) {
         }
         let agentUrl = options.url;
         let shouldUploadBundle = false;
+        let servicesUpdated = 0;
         let runtimeConfig;
         let bundleEntrypoint = manifest.entrypoint;
         if (executionEngine === 'code_runtime') {
@@ -1045,9 +1046,9 @@ function registerPublishCommand(program) {
                         process.stdout.write(`  ${chalk_1.default.cyan('Using workspace default environment')}\n`);
                     }
                 }
-                // Show service auto-update info
+                // Store service update count for success message
                 if (uploadResult.services_updated && uploadResult.services_updated > 0) {
-                    process.stdout.write(`  ${chalk_1.default.green(`Updated ${uploadResult.services_updated} service(s) to ${assignedVersion}`)}\n`);
+                    servicesUpdated = uploadResult.services_updated;
                 }
             }
             finally {
@@ -1062,7 +1063,11 @@ function registerPublishCommand(program) {
             callable,
             hosted: shouldUploadBundle,
         });
-        process.stdout.write(`\nPublished agent: ${org.slug}/${manifest.name}@${assignedVersion}\n`);
+        process.stdout.write(`\n${chalk_1.default.green('✔')} Published ${org.slug}/${manifest.name}@${assignedVersion} successfully!\n`);
+        if (servicesUpdated > 0) {
+            process.stdout.write(`${chalk_1.default.green('✔')} Updated ${servicesUpdated} running service(s) to ${assignedVersion} successfully!\n`);
+        }
+        process.stdout.write(`\n`);
         process.stdout.write(`Type: ${canonicalType}\n`);
         process.stdout.write(`Run mode: ${runMode}\n`);
         process.stdout.write(`Execution engine: ${executionEngine}${shouldUploadBundle ? ' (hosted)' : ''}\n`);

package/dist/commands/run.js

@@ -55,7 +55,6 @@ 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 pricing_1 = require("../lib/pricing");
 const package_json_1 = __importDefault(require("../../package.json"));
 const DEFAULT_VERSION = 'latest';
 const AGENTS_DIR = path_1.default.join(os_1.default.homedir(), '.orchagent', 'agents');
@@ -462,16 +461,10 @@ async function downloadAgent(config, org, agent, version, workspaceId) {
                     }
                 }
                 // Non-owner - block with helpful message
-                if (errorCode === 'PAID_AGENT_SERVER_ONLY') {
-                    const price = payload.error.price_per_call_cents || 0;
-                    const priceStr = price ? `$${(price / 100).toFixed(2)}/call` : 'PAID';
-                    throw new errors_1.CliError(`This agent is paid (${priceStr}) and runs on server only.\n\n` +
-                        `Run without --local: orch run ${org}/${agent}@${version} --data '{...}'`);
-                }
-                else {
-                    throw new errors_1.CliError(`This agent is server-only and cannot be downloaded.\n\n` +
-                        `Run without --local: orch run ${org}/${agent}@${version} --data '{...}'`);
-                }
+                // Use the gateway message which has the correct type label (agent/tool/skill/prompt)
+                const serverMsg = payload?.error?.message || 'This agent is server-only.';
+                throw new errors_1.CliError(`${serverMsg}\n\n` +
+                    `Run without --local: orch run ${org}/${agent}@${version} --data '{...}'`);
             }
         }
         if (!(err instanceof api_1.ApiError) || err.status !== 404)
@@ -1703,58 +1696,6 @@ async function executeCloud(agentRef, file, options) {
             }
         }
     }
-    // Pre-call balance check for paid agents
-    let pricingInfo;
-    if ((0, pricing_1.isPaidAgent)(agentMeta)) {
-        let isOwner = false;
-        try {
-            const callerOrg = await (0, api_1.getOrg)(resolved, workspaceId);
-            const agentOrgId = agentMeta.org_id;
-            const agentOrgSlug = agentMeta.org_slug;
-            if (agentOrgId && callerOrg.id === agentOrgId) {
-                isOwner = true;
-            }
-            else if (agentOrgSlug && callerOrg.slug === agentOrgSlug) {
-                isOwner = true;
-            }
-        }
-        catch {
-            isOwner = false;
-        }
-        if (isOwner) {
-            if (!options.json)
-                process.stderr.write(`Cost: FREE (author)\n\n`);
-        }
-        else {
-            const price = agentMeta.price_per_call_cents;
-            pricingInfo = { price_cents: price ?? null };
-            if (!price || price <= 0) {
-                if (!options.json)
-                    process.stderr.write(`Warning: Pricing data unavailable. The server will verify payment.\n\n`);
-            }
-            else {
-                try {
-                    const balanceData = await (0, api_1.getCreditsBalance)(resolved);
-                    const balance = balanceData.balance_cents;
-                    if (balance < price) {
-                        process.stderr.write(`Insufficient credits:\n` +
-                            `  Balance:  $${(balance / 100).toFixed(2)}\n` +
-                            `  Required: $${(price / 100).toFixed(2)}\n\n` +
-                            `Add credits:\n` +
-                            `  orch billing add 5\n` +
-                            `  orch billing balance  # check current balance\n`);
-                        process.exit(errors_1.ExitCodes.PERMISSION_DENIED);
-                    }
-                    if (!options.json)
-                        process.stderr.write(`Cost: $${(price / 100).toFixed(2)}/call\n\n`);
-                }
-                catch (err) {
-                    if (!options.json)
-                        process.stderr.write(`Warning: Could not verify balance. The server will check payment.\n\n`);
-                }
-            }
-        }
-    }
     const endpoint = options.endpoint?.trim() || agentMeta.default_endpoint || 'analyze';
     const headers = {
         Authorization: `Bearer ${resolved.apiKey}`,
@@ -2033,7 +1974,7 @@ async function executeCloud(agentRef, file, options) {
         });
     }
     catch (err) {
-        spinner?.fail(`Run failed: ${err instanceof Error ? err.message : 'Unknown error'}`);
+        spinner?.stop();
         throw err;
     }
     if (!response.ok) {
@@ -2048,20 +1989,8 @@ async function executeCloud(agentRef, file, options) {
         const errorCode = typeof payload === 'object' && payload
             ? payload.error?.code
             : undefined;
-        if (response.status === 402 || errorCode === 'INSUFFICIENT_CREDITS') {
-            spinner?.fail('Insufficient credits');
-            let errorMessage = 'Insufficient credits to run this agent.\n\n';
-            if (pricingInfo?.price_cents) {
-                errorMessage += `This agent costs $${(pricingInfo.price_cents / 100).toFixed(2)} per call.\n\n`;
-            }
-            errorMessage +=
-                'Add credits:\n' +
-                    '  orch billing add 5\n' +
-                    '  orch billing balance  # check current balance\n';
-            throw new errors_1.CliError(errorMessage, errors_1.ExitCodes.PERMISSION_DENIED);
-        }
         if (errorCode === 'CLI_VERSION_TOO_OLD') {
-            spinner?.fail('CLI version too old');
+            spinner?.stop();
             const minVersion = typeof payload === 'object' && payload
                 ? payload.error?.min_version
                 : undefined;
@@ -2070,7 +1999,7 @@ async function executeCloud(agentRef, file, options) {
                 'Update with: npm update -g @orchagent/cli');
         }
         if (errorCode === 'LLM_KEY_REQUIRED') {
-            spinner?.fail('LLM key required');
+            spinner?.stop();
             throw new errors_1.CliError('This public agent requires you to provide an LLM key.\n' +
                 'Use --key <key> --provider <provider> or set OPENAI_API_KEY/ANTHROPIC_API_KEY env var.');
         }
@@ -2078,7 +2007,7 @@ async function executeCloud(agentRef, file, options) {
             const rateLimitMsg = typeof payload === 'object' && payload
                 ? payload.error?.message || 'Rate limit exceeded'
                 : 'Rate limit exceeded';
-            spinner?.fail('Rate limited by LLM provider');
+            spinner?.stop();
             throw new errors_1.CliError(rateLimitMsg + '\n\n' +
                 'This is the LLM provider\'s rate limit on your API key, not an OrchAgent limit.\n' +
                 'To switch providers: orch run <agent> --provider <gemini|anthropic|openai>', errors_1.ExitCodes.RATE_LIMITED);
@@ -2094,7 +2023,7 @@ async function executeCloud(agentRef, file, options) {
             : undefined;
         const refSuffix = requestId ? `\n\nref: ${requestId}` : '';
         if (errorCode === 'SANDBOX_ERROR') {
-            spinner?.fail('Agent execution failed');
+            spinner?.stop();
             const hint = typeof payload === 'object' && payload
                 ? payload.error?.hint
                 : undefined;
@@ -2105,7 +2034,7 @@ async function executeCloud(agentRef, file, options) {
                 refSuffix);
         }
         if (errorCode === 'SANDBOX_TIMEOUT') {
-            spinner?.fail('Agent timed out');
+            spinner?.stop();
             throw new errors_1.CliError(`${message}\n\n` +
                 `The agent did not complete in time. Try:\n` +
                 `  - Simplifying the input\n` +
@@ -2114,7 +2043,7 @@ async function executeCloud(agentRef, file, options) {
                 refSuffix);
         }
         if (errorCode === 'MISSING_SECRETS') {
-            spinner?.fail('Missing workspace secrets');
+            spinner?.stop();
             // Extract secret names from gateway message:
             // "Agent requires secret(s) not found in workspace: NAME1, NAME2. Add them in Settings > Secrets."
             const secretNames = [];
@@ -2145,13 +2074,13 @@ async function executeCloud(agentRef, file, options) {
             throw new errors_1.CliError(hint + refSuffix);
         }
         if (response.status >= 500) {
-            spinner?.fail(`Server error (${response.status})`);
+            spinner?.stop();
             throw new errors_1.CliError(`${message}\n\n` +
                 `This is a platform error — try again in a moment.\n` +
                 `If it persists, contact support.` +
                 refSuffix);
         }
-        spinner?.fail(`Run failed: ${message}`);
+        spinner?.stop();
         throw new errors_1.CliError(message + refSuffix);
     }
     // Handle SSE streaming response
@@ -2235,9 +2164,6 @@ async function executeCloud(agentRef, file, options) {
         return;
     }
     spinner?.succeed(`Ran ${org}/${parsed.agent}@${parsed.version}`);
-    if (!options.json && (0, pricing_1.isPaidAgent)(agentMeta) && pricingInfo?.price_cents && pricingInfo.price_cents > 0) {
-        process.stderr.write(`\nCost: $${(pricingInfo.price_cents / 100).toFixed(2)} USD\n`);
-    }
     const inputType = hasInjection
         ? 'file_injection'
         : unkeyedFileArgs.length > 0
@@ -2606,13 +2532,6 @@ Examples:
     orch run joe/summarizer --local --data '{"text": "Hello world"}'
     orch run orchagent/leak-finder --local --download-only
 
-Paid Agents:
-  Paid agents charge per call and deduct from your prepaid credits.
-  Check your balance: orch billing balance
-  Add credits: orch billing add 5
-
-  Same-author calls are FREE - you won't be charged for calling your own agents.
-
 File handling (cloud):
   For prompt agents, file content is read and sent as JSON mapped to the agent's
   input schema. Use --file-field to specify the field name (auto-detected by default).

package/dist/commands/security.js

@@ -222,7 +222,7 @@ Examples:
             });
         }
         catch (err) {
-            spinner.fail(`Scan failed: ${err instanceof Error ? err.message : 'Unknown error'}`);
+            spinner.stop();
             throw err;
         }
         if (!response.ok) {
@@ -239,7 +239,7 @@ Examples:
                     payload.message ||
                     response.statusText
                 : response.statusText;
-            spinner.fail(`Scan failed: ${message}`);
+            spinner.stop();
             throw new errors_1.CliError(message);
         }
         spinner.succeed(`Scan completed for ${agentId}`);

package/dist/commands/service.js

@@ -135,7 +135,7 @@ function registerServiceCommand(program) {
                 match = agentsList.find(a => a.name === agentName && a.version === agentVersion);
             }
             if (!match) {
-                spinner.fail('Agent not found');
+                spinner.stop();
                 throw new errors_1.CliError(`Agent '${agentName}' (version ${agentVersion}) not found in workspace`);
             }
             agentId = match.id;
@@ -144,7 +144,7 @@ function registerServiceCommand(program) {
         catch (e) {
             if (e instanceof errors_1.CliError)
                 throw e;
-            spinner.fail('Failed to resolve agent');
+            spinner.stop();
             throw e;
         }
         // C-2: Show deprecation notice when --secret is used
@@ -311,7 +311,7 @@ function registerServiceCommand(program) {
             process.stdout.write(`${chalk_1.default.green('\u2713')} Service '${result.service.service_name}' restarted (restarts: ${result.service.restart_count})\n`);
         }
         catch (e) {
-            spinner.fail('Restart failed');
+            spinner.stop();
             throw e;
         }
     });
@@ -414,7 +414,7 @@ function registerServiceCommand(program) {
             process.stdout.write(`${chalk_1.default.green('\u2713')} Service '${result.service.service_name}' deleted\n`);
         }
         catch (e) {
-            spinner.fail('Delete failed');
+            spinner.stop();
             throw e;
         }
     });
@@ -468,7 +468,7 @@ function registerServiceCommand(program) {
             }
         }
         catch (e) {
-            spinner.fail('Failed to update environment');
+            spinner.stop();
             throw e;
         }
     });
@@ -517,7 +517,7 @@ function registerServiceCommand(program) {
             }
         }
         catch (e) {
-            spinner.fail('Failed to update environment');
+            spinner.stop();
             throw e;
         }
     });
@@ -594,7 +594,7 @@ function registerServiceCommand(program) {
             }
         }
         catch (e) {
-            spinner.fail('Failed to attach secrets');
+            spinner.stop();
             throw e;
         }
     });
@@ -638,7 +638,7 @@ function registerServiceCommand(program) {
             }
         }
         catch (e) {
-            spinner.fail('Failed to detach secrets');
+            spinner.stop();
             throw e;
         }
     });

package/dist/commands/skill.js

@@ -45,7 +45,6 @@ const api_1 = require("../lib/api");
 const errors_1 = require("../lib/errors");
 const analytics_1 = require("../lib/analytics");
 const installed_1 = require("../lib/installed");
-const pricing_1 = require("../lib/pricing");
 const package_json_1 = __importDefault(require("../../package.json"));
 const DEFAULT_VERSION = 'latest';
 function stripFrontmatter(content) {
@@ -110,55 +109,6 @@ async function downloadSkillWithFallback(config, org, skill, version, workspaceI
             throw new errors_1.CliError(`${org}/${skill} is not a skill (type: ${skillType || 'prompt'})`);
         }
     }
-    // Check if paid skill BEFORE attempting download
-    if (skillMeta && (0, pricing_1.isPaidAgent)(skillMeta)) {
-        // Paid skill - check ownership
-        if (config.apiKey) {
-            const callerOrg = await (0, api_1.getOrg)(config, workspaceId);
-            const isOwner = (skillMeta.org_id && callerOrg.id === skillMeta.org_id) ||
-                (skillMeta.org_slug && callerOrg.slug === skillMeta.org_slug);
-            if (isOwner) {
-                // Owner - fetch from authenticated endpoint with full content
-                const myAgents = await (0, api_1.listMyAgents)(config, workspaceId);
-                const matching = myAgents.filter(a => a.name === skill && a.type === 'skill');
-                if (matching.length > 0) {
-                    let targetAgent;
-                    if (version === 'latest') {
-                        targetAgent = matching.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())[0];
-                    }
-                    else {
-                        const found = matching.find(a => a.version === version);
-                        if (!found) {
-                            throw new api_1.ApiError(`Skill '${org}/${skill}@${version}' not found`, 404);
-                        }
-                        targetAgent = found;
-                    }
-                    // Fetch full skill data with prompt from authenticated endpoint
-                    const skillData = await (0, api_1.request)(config, 'GET', `/agents/${targetAgent.id}`);
-                    // Convert Agent to SkillDownload format
-                    return {
-                        type: skillData.type,
-                        name: skillData.name,
-                        version: skillData.version,
-                        description: skillData.description,
-                        prompt: skillData.prompt,
-                    };
-                }
-            }
-            else {
-                // Non-owner - block with helpful message
-                const price = (0, pricing_1.formatPrice)(skillMeta);
-                throw new errors_1.CliError(`This skill is paid (${price}) and can only be used on the server.\n\n` +
-                    `Paid skills are loaded automatically during server execution.`);
-            }
-        }
-        else {
-            // Not authenticated - block
-            const price = (0, pricing_1.formatPrice)(skillMeta);
-            throw new errors_1.CliError(`This skill is paid (${price}) and can only be used on the server.\n\n` +
-                `Paid skills are loaded automatically during server execution.`);
-        }
-    }
     // Check if download is disabled (server-only skill)
     if (skillMeta && skillMeta.allow_local_download === false) {
         if (config.apiKey) {
@@ -204,11 +154,6 @@ async function downloadSkillWithFallback(config, org, skill, version, workspaceI
             // If download fails but metadata exists, it might be a 403 for other reasons
             if (err instanceof api_1.ApiError && err.status === 403) {
                 const payload = err.payload;
-                if (payload?.error?.code === 'PAID_AGENT_SERVER_ONLY') {
-                    const price = payload.error.price_per_call_cents || 0;
-                    throw new errors_1.CliError(`This skill costs $${(price / 100).toFixed(2)}/call and runs on server only.\n\n` +
-                        `Use: orchagent run ${org}/${skill}@${version} --data '{...}'`);
-                }
                 if (payload?.error?.code === 'DOWNLOAD_DISABLED') {
                     throw new errors_1.CliError(`This skill is server-only and cannot be downloaded.\n\n` +
                         `Skills are loaded automatically during server execution via 'orchagent run'.`);

package/dist/commands/whoami.js

@@ -31,13 +31,5 @@ function registerWhoamiCommand(program) {
                 process.stdout.write(`Active workspace: ${configFile.workspace}\n`);
             }
         }
-        // Show balance after org info
-        try {
-            const balance = await (0, api_1.getCreditsBalance)(config);
-            process.stdout.write(`Credits: $${(balance.balance_cents / 100).toFixed(2)} USD\n`);
-        }
-        catch {
-            // Ignore errors - don't let balance check break whoami
-        }
     });
 }

package/dist/lib/api.js

@@ -65,8 +65,6 @@ exports.getEnvironment = getEnvironment;
 exports.createEnvironment = createEnvironment;
 exports.deleteEnvironment = deleteEnvironment;
 exports.setWorkspaceDefaultEnvironment = setWorkspaceDefaultEnvironment;
-exports.getCreditsBalance = getCreditsBalance;
-exports.createCreditCheckout = createCreditCheckout;
 exports.listAgentKeys = listAgentKeys;
 exports.createAgentKey = createAgentKey;
 exports.deleteAgentKey = deleteAgentKey;
@@ -531,16 +529,6 @@ async function setWorkspaceDefaultEnvironment(config, workspaceId, environmentId
         headers: { 'Content-Type': 'application/json' },
     });
 }
-// Billing API functions
-async function getCreditsBalance(config) {
-    return request(config, 'GET', '/billing/credits');
-}
-async function createCreditCheckout(config, amountCents) {
-    return request(config, 'POST', '/billing/add-credits', {
-        body: JSON.stringify({ amount_cents: amountCents }),
-        headers: { 'Content-Type': 'application/json' },
-    });
-}
 async function listAgentKeys(config, agentId) {
     return request(config, 'GET', `/agents/${agentId}/keys`);
 }

package/dist/lib/errors.js

@@ -45,6 +45,8 @@ class CliError extends Error {
     exitCode;
     cause;
     responseBody;
+    /** When true, exitWithError skips printing — the message was already shown (e.g. via spinner.fail). */
+    displayed;
     constructor(message, exitCode = 1) {
         super(message);
         this.exitCode = exitCode;
@@ -78,7 +80,12 @@ async function exitWithError(err) {
     }
     // Flush PostHog before exiting
     await (0, analytics_1.shutdownPostHog)();
-    process.stderr.write(`${message}\n`);
+    // Skip printing if the error was already shown (e.g. by spinner.fail)
+    const alreadyDisplayed = (err instanceof CliError && err.displayed) ||
+        (err instanceof Error && err._displayed);
+    if (!alreadyDisplayed) {
+        process.stderr.write(`${message}\n`);
+    }
     if (err instanceof CliError) {
         process.exit(err.exitCode);
     }

package/dist/lib/spinner.js

@@ -96,6 +96,11 @@ async function withSpinner(text, fn, options) {
             ? options.failText(err)
             : options?.failText || (err instanceof Error ? err.message : 'Failed');
         spinner.fail(failMsg);
+        // Mark as already displayed so exitWithError doesn't print again
+        if (err instanceof Error) {
+            ;
+            err._displayed = true;
+        }
         throw err;
     }
 }

package/package.json

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

package/dist/lib/pricing.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPaidAgent = isPaidAgent;
-exports.formatPrice = formatPrice;
-function isPaidAgent(agent) {
-    // Fail-closed: per_call mode with missing or >0 price is paid
-    if (agent.pricing_mode === 'per_call') {
-        const price = agent.price_per_call_cents;
-        return price === null || price === undefined || price > 0;
-    }
-    return false;
-}
-function formatPrice(agent) {
-    if (!isPaidAgent(agent)) {
-        return 'FREE';
-    }
-    const price = agent.price_per_call_cents;
-    if (!price) {
-        return 'PAID (server-only)'; // Fail-closed message
-    }
-    return `$${(price / 100).toFixed(2)}/call`;
-}