@trading-boy/cli 2.0.1 → 2.1.1

package/README.md

@@ -2,7 +2,7 @@
 
 Remote trading intelligence for traders and AI agents. Real-time market data, on-chain analytics, DeFi risk scoring, and adaptive learning outcomes — all from the command line.
 
-**Website:** [cabal.ventures](https://cabal.ventures) | **Docs:** [cabal.ventures/docs](https://cabal.ventures/docs)
+**Website:** [tradingboy.ai](https://tradingboy.ai) | **Docs:** [tradingboy.ai/docs](https://tradingboy.ai/docs)
 
 ## Install
 
@@ -118,7 +118,7 @@ All plans include every feature. Limits apply to traded tokens and logged trades
 Trading Boy exposes an MCP server for AI agent integration and a REST API for programmatic access.
 
 ```bash
-# REST API is hosted at https://api.cabal.ventures
+# REST API is hosted at https://api.tradingboy.ai
 # MCP server: npx @trading-boy/mcp-server
 # CLI onboarding and first-agent setup: see docs/getting-started.md
 ```

package/dist/api-client.d.ts

@@ -1,4 +1,4 @@
-import { redactApiKey } from './credentials.js';
+import { redactApiKey, type StoredCredentials } from './credentials.js';
 export interface ApiResponse<T> {
     data: T;
     status: number;
@@ -8,11 +8,25 @@ export declare class ApiError extends Error {
     readonly body?: unknown | undefined;
     constructor(message: string, status: number, body?: unknown | undefined);
 }
+export declare class ApiCredentialMissingError extends Error {
+    constructor();
+}
+export declare class ApiCredentialConflictError extends Error {
+    readonly sources: string[];
+    constructor(sources: string[]);
+}
 /**
  * Dev mode: TRADING_BOY_API_URL points to localhost AND NODE_ENV=development.
  * In dev mode, auth is optional for a local API server.
  */
 export declare function isDevMode(): boolean;
+export type ApiKeySourceName = 'TRADING_BOY_API_KEY env var' | '--api-key flag' | 'stored credentials';
+export interface ResolvedApiKey {
+    apiKey: string;
+    source: ApiKeySourceName;
+    storedCredentials?: StoredCredentials;
+}
+export declare function resolveApiKeyWithSource(flagKey?: string): Promise<ResolvedApiKey>;
 export declare function resolveApiKey(flagKey?: string): Promise<string>;
 export declare function getApiBase(): string;
 export declare function apiRequest<T>(path: string, options?: {

package/dist/api-client.js

@@ -2,7 +2,7 @@ import { createLogger } from './logger.js';
 import { loadCredentials, redactApiKey } from './credentials.js';
 const logger = createLogger('cli-api-client');
 // ─── Constants ───
-const DEFAULT_API_BASE = 'https://api.cabal.ventures';
+const DEFAULT_API_BASE = 'https://api.tradingboy.ai';
 export class ApiError extends Error {
     status;
     body;
@@ -13,6 +13,21 @@ export class ApiError extends Error {
         this.name = 'ApiError';
     }
 }
+export class ApiCredentialMissingError extends Error {
+    constructor() {
+        super('Not authenticated. Run `trading-boy login` to set up your API key.');
+        this.name = 'ApiCredentialMissingError';
+    }
+}
+export class ApiCredentialConflictError extends Error {
+    sources;
+    constructor(sources) {
+        super(`Conflicting API credentials found in ${sources.join(', ')}. ` +
+            'Unset one credential source or make them match before running this command.');
+        this.sources = sources;
+        this.name = 'ApiCredentialConflictError';
+    }
+}
 // ─── Dev Mode Detection ───
 /**
  * Dev mode: TRADING_BOY_API_URL points to localhost AND NODE_ENV=development.
@@ -32,24 +47,52 @@ export function isDevMode() {
         return false;
     }
 }
-// ─── API Key Resolution ───
-export async function resolveApiKey(flagKey) {
-    // Priority: env var > flag > stored key
-    const envKey = process.env.TRADING_BOY_API_KEY;
+function normalizeCandidateKey(value) {
+    const trimmed = value?.trim();
+    return trimmed ? trimmed : null;
+}
+function assertNoCredentialConflicts(candidates) {
+    if (candidates.length <= 1)
+        return;
+    const first = candidates[0].apiKey;
+    const conflictingSources = candidates
+        .filter((candidate) => candidate.apiKey !== first)
+        .map((candidate) => candidate.source);
+    if (conflictingSources.length === 0)
+        return;
+    throw new ApiCredentialConflictError([
+        candidates[0].source,
+        ...conflictingSources,
+    ]);
+}
+export async function resolveApiKeyWithSource(flagKey) {
+    const candidates = [];
+    const envKey = normalizeCandidateKey(process.env.TRADING_BOY_API_KEY);
     if (envKey) {
-        logger.debug('Using API key from TRADING_BOY_API_KEY env var');
-        return envKey;
+        candidates.push({ apiKey: envKey, source: 'TRADING_BOY_API_KEY env var' });
     }
-    if (flagKey) {
-        logger.debug('Using API key from --api-key flag');
-        return flagKey;
+    const normalizedFlagKey = normalizeCandidateKey(flagKey);
+    if (normalizedFlagKey) {
+        candidates.push({ apiKey: normalizedFlagKey, source: '--api-key flag' });
     }
     const stored = await loadCredentials();
     if (stored?.apiKey) {
-        logger.debug('Using stored API key');
-        return stored.apiKey;
+        candidates.push({
+            apiKey: stored.apiKey,
+            source: 'stored credentials',
+            storedCredentials: stored,
+        });
+    }
+    assertNoCredentialConflicts(candidates);
+    const resolved = candidates[0];
+    if (!resolved) {
+        throw new ApiCredentialMissingError();
     }
-    throw new Error('Not authenticated. Run `trading-boy login` to set up your API key.');
+    logger.debug({ source: resolved.source }, 'Using API key');
+    return resolved;
+}
+export async function resolveApiKey(flagKey) {
+    return (await resolveApiKeyWithSource(flagKey)).apiKey;
 }
 // ─── HTTPS Enforcement ───
 function enforceHttps(url) {
@@ -77,7 +120,7 @@ export function getApiBase() {
 // ─── API Request ───
 export async function apiRequest(path, options = {}) {
     const dev = isDevMode();
-    const apiKey = dev ? undefined : (options.apiKey ?? (await resolveApiKey()));
+    const apiKey = dev ? undefined : await resolveApiKey(options.apiKey);
     const apiBase = getApiBase();
     const url = `${apiBase}${path}`;
     const headers = {