@orchagent/cli 0.3.83 → 0.3.85

package/dist/commands/service.js

@@ -60,6 +60,13 @@ function healthColor(health) {
             return chalk_1.default.gray(health);
     }
 }
+function formatServiceUrl(svc) {
+    const url = svc.provider_url || svc.cloud_run_url || '-';
+    if (url !== '-' && svc.infrastructure_provider === 'flyio') {
+        return `${url} ${chalk_1.default.gray('(internal — not a public endpoint)')}`;
+    }
+    return url;
+}
 function severityColor(severity, message) {
     switch (severity.toUpperCase()) {
         case 'ERROR':
@@ -135,7 +142,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 +151,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
@@ -184,7 +191,7 @@ function registerServiceCommand(program) {
             process.stdout.write(`  ${chalk_1.default.bold('Name:')}     ${svc.service_name}\n`);
             process.stdout.write(`  ${chalk_1.default.bold('Agent:')}    ${svc.agent_name}@${svc.agent_version}\n`);
             process.stdout.write(`  ${chalk_1.default.bold('State:')}    ${stateColor(svc.current_state)}\n`);
-            process.stdout.write(`  ${chalk_1.default.bold('URL:')}      ${svc.provider_url || svc.cloud_run_url || '-'}\n`);
+            process.stdout.write(`  ${chalk_1.default.bold('URL:')}      ${formatServiceUrl(svc)}\n`);
             if (options.pin) {
                 process.stdout.write(`  ${chalk_1.default.bold('Pinned:')}   ${chalk_1.default.yellow(`yes (won't auto-update on publish)`)}\n`);
             }
@@ -192,7 +199,7 @@ function registerServiceCommand(program) {
             process.stdout.write(chalk_1.default.gray(`View logs: orch service logs ${svc.id}\n`));
         }
         catch (e) {
-            deploySpinner.fail('Deploy failed');
+            deploySpinner.stop();
             throw e;
         }
     });
@@ -311,7 +318,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;
         }
     });
@@ -348,7 +355,7 @@ function registerServiceCommand(program) {
         }
         process.stdout.write(`  Instances:    ${svc.min_instances}-${svc.max_instances}\n`);
         process.stdout.write(`  Service ID:   ${svc.provider_service_id || svc.cloud_run_service || '-'}\n`);
-        process.stdout.write(`  URL:          ${svc.provider_url || svc.cloud_run_url || '-'}\n`);
+        process.stdout.write(`  URL:          ${formatServiceUrl(svc)}\n`);
         process.stdout.write(`  Deployed:     ${formatDate(svc.last_deployed_at)}\n`);
         process.stdout.write(`  Last Restart: ${formatDate(svc.last_restart_at)}\n`);
         if (svc.last_error) {
@@ -414,7 +421,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 +475,7 @@ function registerServiceCommand(program) {
             }
         }
         catch (e) {
-            spinner.fail('Failed to update environment');
+            spinner.stop();
             throw e;
         }
     });
@@ -517,7 +524,7 @@ function registerServiceCommand(program) {
             }
         }
         catch (e) {
-            spinner.fail('Failed to update environment');
+            spinner.stop();
             throw e;
         }
     });
@@ -594,7 +601,7 @@ function registerServiceCommand(program) {
             }
         }
         catch (e) {
-            spinner.fail('Failed to attach secrets');
+            spinner.stop();
             throw e;
         }
     });
@@ -638,7 +645,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'.`);
@@ -259,18 +204,18 @@ async function downloadSkillWithFallback(config, org, skill, version, workspaceI
 }
 function registerSkillCommand(program) {
     const skill = program.command('skill').description('Manage and install skills');
-    // orch skill list (deprecated)
+    skill.action(() => { skill.help(); });
+    // orch skill list
     skill
         .command('list')
-        .description('(Deprecated) Use "orchagent search --type skills" instead')
+        .description('Browse available skills')
         .option('--json', 'Output raw JSON')
         .action(async () => {
-        process.stdout.write('The "skill list" command has been replaced by "search".\n\n' +
-            'Usage:\n' +
-            '  orchagent search <query> --type skills   Search skills by keyword\n' +
-            '  orchagent search --popular --type skills Top skills by stars\n' +
-            '  orchagent search --recent --type skills  Most recently published\n\n' +
-            'View all skills at: https://orchagent.io/explore\n');
+        process.stdout.write('Browse and discover skills at: https://orchagent.io/explore\n\n' +
+            'Install a skill:\n' +
+            '  orch skill install <org>/<skill-name>\n\n' +
+            'View installed skills:\n' +
+            '  orch update --check\n');
         process.exit(0);
     });
     // orch skill create [name]

package/dist/commands/test.js

@@ -514,7 +514,7 @@ async function runPromptFixtureTests(agentDir, fixtures, verbose, config) {
     const detected = await (0, llm_1.detectLlmKey)(['any'], config);
     if (!detected) {
         throw new errors_1.CliError('No LLM key found for fixture tests.\n' +
-            'Set an environment variable (e.g., OPENAI_API_KEY) or run `orchagent keys add <provider>`');
+            'Set an environment variable (e.g., OPENAI_API_KEY) or run `orch secrets set <PROVIDER>_API_KEY <key>`');
     }
     const { provider, key, model: serverModel } = detected;
     const model = serverModel ?? (0, llm_1.getDefaultModel)(provider);

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/doctor/checks/environment.js

@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkNodeVersion = checkNodeVersion;
 exports.checkCliVersion = checkCliVersion;
 exports.checkGitAvailable = checkGitAvailable;
+exports.checkDualInstallation = checkDualInstallation;
 exports.runEnvironmentChecks = runEnvironmentChecks;
 const child_process_1 = require("child_process");
+const fs_1 = require("fs");
 const package_json_1 = __importDefault(require("../../../../package.json"));
 const update_notifier_1 = require("../../update-notifier");
 const REQUIRED_NODE_MAJOR = 18;
@@ -142,6 +144,148 @@ async function checkGitAvailable() {
         };
     }
 }
+/**
+ * Find all binary paths for a given command name using `which -a`.
+ * Returns an empty array if the command is not found.
+ * Note: Uses execSync with a hardcoded binary name — no user input, safe from injection.
+ */
+function findAllBinaryPaths(binaryName) {
+    try {
+        const output = (0, child_process_1.execSync)(`which -a ${binaryName}`, {
+            encoding: 'utf-8',
+            timeout: 5000,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return output.trim().split('\n').filter(Boolean);
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * Get the CLI version from a binary path by running it with --version.
+ * Uses execFileSync (no shell) to avoid injection via path characters.
+ */
+function getVersionFromBinary(binPath) {
+    try {
+        const output = (0, child_process_1.execFileSync)(binPath, ['--version'], {
+            encoding: 'utf-8',
+            timeout: 5000,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        const match = output.match(/(\d+\.\d+\.\d+)/);
+        return match ? match[1] : null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Resolve a path through symlinks. Returns the original path if resolution fails.
+ */
+function safeRealpathSync(p) {
+    try {
+        return (0, fs_1.realpathSync)(p);
+    }
+    catch {
+        return p;
+    }
+}
+/**
+ * Detect multiple CLI installations at different paths/versions (BUG-008).
+ *
+ * System-level (/usr/local/bin/orchagent) and user-level (~/.npm-global/bin/orch)
+ * installs can coexist silently. `npm update -g` updates one but not the other,
+ * leaving the user running an outdated version without knowing it.
+ */
+async function checkDualInstallation() {
+    // Skip on Windows (which -a not available)
+    if (process.platform === 'win32') {
+        return {
+            category: 'environment',
+            name: 'dual_installation',
+            status: 'info',
+            message: 'Installation path check skipped (Windows)',
+            details: { skipped: true, reason: 'Windows not supported' },
+        };
+    }
+    try {
+        const binaryNames = ['orch', 'orchagent'];
+        const installations = new Map();
+        for (const binary of binaryNames) {
+            const paths = findAllBinaryPaths(binary);
+            for (const binPath of paths) {
+                const realPath = safeRealpathSync(binPath);
+                // Deduplicate by resolved real path
+                if (installations.has(realPath))
+                    continue;
+                const version = getVersionFromBinary(binPath) || 'unknown';
+                installations.set(realPath, {
+                    path: binPath,
+                    realPath,
+                    version,
+                    binary,
+                });
+            }
+        }
+        if (installations.size <= 1) {
+            return {
+                category: 'environment',
+                name: 'dual_installation',
+                status: 'success',
+                message: 'Single CLI installation',
+                details: {
+                    installationCount: installations.size,
+                    installations: [...installations.values()],
+                },
+            };
+        }
+        // Multiple installations found
+        const allInstalls = [...installations.values()];
+        const versions = new Set(allInstalls.map((i) => i.version));
+        const versionsDiffer = versions.size > 1;
+        const pathList = allInstalls
+            .map((i) => `${i.path} (v${i.version})`)
+            .join(', ');
+        if (versionsDiffer) {
+            return {
+                category: 'environment',
+                name: 'dual_installation',
+                status: 'warning',
+                message: `Multiple CLI versions found: ${pathList}`,
+                fix: 'Remove the outdated installation. Run `which -a orch orchagent` to see all paths, then remove the older binary',
+                details: {
+                    installationCount: installations.size,
+                    versionMismatch: true,
+                    installations: allInstalls,
+                },
+            };
+        }
+        // Same version at multiple paths — informational only
+        return {
+            category: 'environment',
+            name: 'dual_installation',
+            status: 'info',
+            message: `Multiple CLI paths (same version v${allInstalls[0].version}): ${pathList}`,
+            details: {
+                installationCount: installations.size,
+                versionMismatch: false,
+                installations: allInstalls,
+            },
+        };
+    }
+    catch (err) {
+        return {
+            category: 'environment',
+            name: 'dual_installation',
+            status: 'info',
+            message: 'Could not check for duplicate installations',
+            details: {
+                error: err instanceof Error ? err.message : 'unknown error',
+            },
+        };
+    }
+}
 /**
  * Run all environment checks.
  */
@@ -150,6 +294,7 @@ async function runEnvironmentChecks() {
         checkNodeVersion(),
         checkCliVersion(),
         checkGitAvailable(),
+        checkDualInstallation(),
     ]);
     return results;
 }

package/dist/lib/doctor/output.js

@@ -54,7 +54,7 @@ function renderLlmSection(checks, verbose) {
         // Build location text
         let location;
         if (serverVal === null) {
-            location = localVal ? 'Server unknown, local configured' : 'Server unknown, not local';
+            location = localVal ? 'Local configured (vault keys not checked)' : 'Not configured locally (vault keys used for cloud runs)';
         }
         else if (serverVal && localVal) {
             location = 'Configured (server + local)';

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.83",
+  "version": "0.3.85",
   "description": "Command-line interface for orchagent — deploy and run AI agents for your team",
   "license": "MIT",
   "author": "orchagent <hello@orchagent.io>",
@@ -25,7 +25,8 @@
     "node": ">=18"
   },
   "bin": {
-    "orch": "dist/index.js"
+    "orch": "dist/index.js",
+    "orchagent": "dist/index.js"
   },
   "files": [
     "dist",

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`;
-}