badgr-cli 1.0.29 → 1.0.31

package/HOW_IT_WORKS.md

@@ -11,7 +11,7 @@ npm install -g badgr-cli
 badgr login
 ```
 
-`badgr login` prompts for your API key and base URL, then writes them to `~/.badgr/config.json`. Every subsequent command reads that file — no env vars required.
+`badgr login` prompts for your API key and base URL, then writes them to `~/.gpu/config.json`. Every subsequent command reads that file — no env vars required.
 
 ---
 
@@ -142,7 +142,7 @@ badgr receipts [n]        # default: last 10
 
 Shows two sets of receipts:
 
-1. **CLI action receipts** — every `badgr serve` / `badgr down` recorded locally in `~/.badgr/deployments.json`, with provider, retries, latency, and cost.
+1. **CLI action receipts** — every `badgr serve` / `badgr down` recorded locally in `~/.gpu/deployments.json`, with provider, retries, latency, and cost.
 2. **Inference receipts** — per-request records fetched from `GET /v1/receipts` on the API (requires `badgr login`).
 
 Every action — including failures — generates a receipt. Receipt IDs are printed on every command output so you can look them up later.
@@ -202,10 +202,10 @@ GPU type aliases are normalized automatically: `rtx-4090`, `rtx4090`, `4090`, `R
 
 ## Local State
 
-All CLI state lives in `~/.badgr/`:
+All CLI state lives in `~/.gpu/`:
 
 ```
-~/.badgr/
+~/.gpu/
   config.json          API key + base URL
   deployments.json     Active deployments + receipt log (last 200)
 ```

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "badgr-cli",
-  "version": "1.0.29",
-  "description": "Badgr, run or serve GPU workloads from one command",
+  "version": "1.0.31",
+  "description": "Badgr — run or serve GPU workloads from one command",
   "type": "module",
   "bin": {
-    "badgr": "src/badgr.js"
+    "badgr": "./src/badgr.js"
   },
   "scripts": {
     "start": "node src/badgr.js",
@@ -21,14 +21,6 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "keywords": [
-    "gpu",
-    "cli",
-    "ai",
-    "compute",
-    "modal",
-    "gateway",
-    "openai"
-  ],
+  "keywords": ["gpu", "cli", "ai", "compute", "modal", "gateway", "openai"],
   "license": "MIT"
 }

package/src/api.js

@@ -1,93 +1,16 @@
-const DEBUG = process.env.BADGR_DEBUG === '1' || process.env.BADGR_DEBUG === 'true';
-
-function dbg(...args) {
-  if (DEBUG) console.error('[badgr:debug]', ...args);
-}
-
 export async function callApi(path, { method = 'GET', apiKey, baseUrl, body } = {}) {
   const url = `${baseUrl}${path}`;
-  const keyPreview = apiKey ? `${apiKey.slice(0, 8)}…` : '(not set)';
-
-  dbg(`${method} ${url}`);
-  dbg(`API key: ${keyPreview}`);
-  if (body !== undefined) dbg('Request body:', JSON.stringify(body));
-
-  let res;
-  const startMs = Date.now();
-  try {
-    res = await fetch(url, {
-      method,
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${apiKey}`,
-      },
-      body: body !== undefined ? JSON.stringify(body) : undefined,
-    });
-  } catch (cause) {
-    const elapsed = Date.now() - startMs;
-    dbg(`Fetch threw after ${elapsed}ms:`, cause);
-    // Network-level failure: DNS, connection refused, timeout, etc.
-    const msg = cause?.message ?? String(cause);
-    const code = cause?.cause?.code ?? cause?.code ?? '';
-    const hint =
-      (code === 'ECONNREFUSED' || msg.includes('ECONNREFUSED'))
-        ? `\n  Hint: Connection refused — is the server running at ${baseUrl}?` :
-      (code === 'ENOTFOUND' || msg.includes('ENOTFOUND'))
-        ? `\n  Hint: DNS lookup failed for ${baseUrl}\n  Check your internet or set BADGR_API_URL to the correct host` :
-      (code === 'ETIMEDOUT' || msg.includes('ETIMEDOUT'))
-        ? `\n  Hint: Request timed out — server may be overloaded` :
-      (msg.includes('fetch failed') || msg === 'fetch failed')
-        ? `\n  Hint: Network error reaching ${url}\n  • Check internet connection\n  • Run: badgr config  (verify baseUrl)\n  • Try: BADGR_DEBUG=1 badgr run … for full details\n  • Test: curl -v ${baseUrl}/models` :
-        `\n  Hint: Check your network and that BADGR_API_URL is correct (${baseUrl})`;
-    throw new Error(`Cannot reach ${url} (${msg})${hint}`);
-  }
-
-  const elapsed = Date.now() - startMs;
-  dbg(`Response: HTTP ${res.status} in ${elapsed}ms`);
-
+  const res = await fetch(url, {
+    method,
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': `Bearer ${apiKey}`,
+    },
+    body: body !== undefined ? JSON.stringify(body) : undefined,
+  });
   if (!res.ok) {
-    let detail = '';
-    let rawBody = '';
-    let errorData = null;
-    try {
-      rawBody = await res.text();
-      dbg('Error response body:', rawBody);
-      const json = JSON.parse(rawBody);
-      errorData = json;
-      detail = json?.detail ?? json?.message ?? json?.error ?? rawBody;
-    } catch {
-      detail = rawBody || res.statusText || '';
-    }
-    const isCapacityError = errorData?.code === 'NO_CAPACITY_MATCH';
-    if (res.status === 402) {
-      // Payment required — format a clear, actionable error
-      const d = errorData?.detail ?? errorData ?? {};
-      const detailObj = typeof d === 'object' ? d : {};
-      const balanceUsd = typeof detailObj.balance_usd === 'number' ? detailObj.balance_usd : null;
-      const requiredUsd = typeof detailObj.required_usd === 'number' ? detailObj.required_usd : null;
-      const topupUrl = detailObj.topup_url || 'https://aibadgr.com/dashboard#billing';
-
-      let msg = '\nPayment required.\n';
-      if (balanceUsd !== null) msg += `Your balance is $${balanceUsd.toFixed(2)}.`;
-      if (requiredUsd !== null) msg += ` This job needs a $${requiredUsd.toFixed(2)} reserve.`;
-      msg += '\n\nAdd balance:\n  ' + topupUrl + '\n';
-      const err = new Error(msg);
-      err.errorData = errorData;
-      err.httpStatus = 402;
-      err.isPaymentRequired = true;
-      throw err;
-    }
-    const hint =
-      res.status === 401 ? '\n  Hint: Invalid or missing API key — run: badgr login' :
-      res.status === 403 ? '\n  Hint: Access denied — check your API key permissions' :
-      res.status === 404 ? `\n  Hint: Endpoint not found — check BADGR_API_URL (currently: ${baseUrl})` :
-      (res.status === 502 || res.status === 503) && !isCapacityError
-        ? '\n  Hint: Server error — no GPU capacity available or backend is down' :
-      '';
-    const err = new Error(`${method} ${path} → HTTP ${res.status}: ${detail}${hint}`);
-    err.errorData = errorData;
-    err.httpStatus = res.status;
-    throw err;
+    const text = await res.text().catch(() => '');
+    throw new Error(`${method} ${path} → ${res.status}: ${text}`);
   }
   return res.json();
 }

package/src/badgr.js

@@ -10,80 +10,53 @@ import { receiptsCommand } from './commands/receipts.js';
 import { runCommand }      from './commands/run.js';
 import { serveCommand }    from './commands/serve.js';
 import { modelsCommand }   from './commands/models.js';
-import { capacityCommand } from './commands/capacity.js';
-import { testCommand }     from './commands/test-run.js';
-import { billingCommand }  from './commands/billing.js';
 
 const HELP = `
 ${chalk.bold('badgr')} — run or serve GPU workloads from one command
 
-${chalk.bold('COMMANDS')}
-  ${chalk.cyan('badgr login')}               Authenticate with your API key
-  ${chalk.cyan('badgr run <command>')}       Run a one-off GPU job
-  ${chalk.cyan('badgr serve <model>')}       Serve a model with an OpenAI-compatible endpoint
-  ${chalk.cyan('badgr status')}              Show what's running and what's billing
-  ${chalk.cyan('badgr logs <id>')}           Stream logs for a running job or endpoint
-  ${chalk.cyan('badgr down <id>')}           Stop a deployment and end billing
-  ${chalk.cyan('badgr receipts')}            Show cost history
-  ${chalk.cyan('badgr test')}               Run an end-to-end test (provision → run → teardown)
-  ${chalk.cyan('badgr capacity')}            Check what GPU capacity is available right now
-  ${chalk.cyan('badgr billing')}             Show balance and add funds
+${chalk.bold('CORE COMMANDS')}
+  ${chalk.cyan('badgr login')}                         Authenticate (save API key to ~/.badgr/config.json)
+  ${chalk.cyan('badgr run <cmd...> --gpu <type>')}     Run a one-off GPU job
+  ${chalk.cyan('badgr serve <model> --gpu <type>')}    Serve a model (OpenAI-compatible endpoint)
+  ${chalk.cyan('badgr status')}                        Show active deployments + endpoint URLs
+  ${chalk.cyan('badgr logs <id>')}                     Stream logs for a deployment
+  ${chalk.cyan('badgr down <id>')}                     Terminate a deployment (stop billing)
+  ${chalk.cyan('badgr receipts [<id>|<n>]')}           Show receipts — pass ID for single, number for list
 
-${chalk.bold('EXAMPLES')}
-  ${chalk.dim('# Verify the stack works end-to-end:')}
-  badgr test
-
-  ${chalk.dim('# Tier 1 — managed provider routing (default):')}
-  badgr run python train.py
-  badgr serve meta-llama/Llama-3.1-8B-Instruct
+${chalk.bold('badgr run OPTIONS')}
+  --gpu <type>        GPU: RTX_4090, A100, L40S, H100  (default: RTX_4090)
+  --image <image>     Docker image (default: python:3.11-slim)
+  --count <n>         GPU count (default: 1)
+  --region US|EU|AU   Region preference (default: US)
+  --max-price <$/hr>  Hard spend cap per GPU-hour
+  --name <name>       Job name (auto-generated if omitted)
 
-  ${chalk.dim('# Tier 2 — marketplace routing, lower-cost options:')}
-  badgr run python train.py --tier 2
-  badgr serve meta-llama/Llama-3.1-8B-Instruct --tier 2
+${chalk.bold('badgr serve OPTIONS')}
+  --gpu <type>        GPU: L40S, A100, H100, RTX_4090  (default: L40S)
+  --count <n>         GPU count (default: 1)
+  --region US|EU|AU   Region preference (default: US)
+  --max-price <$/hr>  Hard spend cap per GPU-hour
+  --name <name>       Deployment name (auto-generated if omitted)
 
-  ${chalk.dim('# Pin a specific GPU:')}
+${chalk.bold('EXAMPLES')}
+  badgr login
   badgr run python train.py --gpu A100
+  badgr run --image my/image:latest --gpu L40S
   badgr serve meta-llama/Llama-3.1-8B-Instruct --gpu L40S
-
-  ${chalk.dim('# Add safety caps:')}
-  badgr run python train.py --max-runtime 60 --max-cost 5
-
-  ${chalk.dim('# Manage a running deployment:')}
+  badgr serve mistralai/Mistral-7B-v0.1 --gpu RTX_4090
   badgr status
-  badgr logs dep-abc123
-  badgr down dep-abc123
-  badgr receipts dep-abc123
-
-${chalk.bold('badgr run OPTIONS')}
-  --gpu <type>           GPU type (default: auto — Badgr picks best available)
-  --tier 1               Managed provider routing (default)
-  --tier 2               Marketplace provider routing, lower-cost options
-  --image <image>        Docker image (default: python:3.11-slim)
-  --count <n>            Number of GPUs (default: 1)
-  --region US|EU|AU      Region preference
-  --max-price <$/hr>     Hard spend cap per GPU-hour
-  --max-runtime <min>    Auto-stop after N minutes (recommended)
-  --max-cost <$>         Auto-stop when spend reaches this amount
-  --detach               Return immediately, don't stream logs
-
-${chalk.bold('badgr serve OPTIONS')}
-  --gpu <type>           GPU type (default: auto — inferred from model size)
-  --tier 1               Managed provider routing (default)
-  --tier 2               Marketplace provider routing, lower-cost options
-  --count <n>            Number of GPUs (default: 1)
-  --region US|EU|AU      Region preference
-  --max-price <$/hr>     Hard spend cap per GPU-hour
-  --no-wait              Skip endpoint health check
-
-${chalk.bold('AFTER SERVING')}
-  ${chalk.dim('Point any OpenAI client at the returned URL:')}
-  ${chalk.dim('  from openai import OpenAI')}
-  ${chalk.dim('  client = OpenAI(base_url="<endpoint url>", api_key="<your key>")')}
-  ${chalk.dim('  client.chat.completions.create(model="<model>", messages=[...])')}
-
-${chalk.bold('DEBUG')}
-  ${chalk.dim('BADGR_DEBUG=1 badgr run python train.py   # full request/response trace')}
-  ${chalk.dim('badgr config                              # show current API config')}
+  badgr logs dep_abc123
+  badgr down dep_abc123
+  badgr receipts
+  badgr receipts dep_abc123
+
+${chalk.bold('OPENAI-COMPATIBLE SERVING')}
+  ${chalk.dim('After `badgr serve`, point any OpenAI client at the returned URL:')}
+  ${chalk.dim('  client = OpenAI(api_key="sk-...", base_url="https://api.badgr.ai/v1")')}
+  ${chalk.dim('  client.chat.completions.create(model="dep_xxx", messages=[...])')}
+
+${chalk.bold('ROUTING')}
+  ${chalk.dim('Badgr automatically selects best available GPU capacity for your request.')}
 `;
 
 async function main() {
@@ -104,9 +77,6 @@ async function main() {
     case 'down':     return downCommand(config, rest, chalk);
     case 'receipts': return receiptsCommand(config, rest, chalk);
     case 'models':   return modelsCommand(config, chalk);
-    case 'capacity': return capacityCommand(config, rest, chalk);
-    case 'test':     return testCommand(config, rest, chalk);
-    case 'billing':  return billingCommand(config, rest, chalk);
     // legacy aliases kept for compatibility
     case 'up':       return upCommand(config, rest, chalk);
     case 'config': {

package/src/commands/down.js

@@ -12,46 +12,43 @@ export async function downCommand(config, args, chalk) {
 
   requireApiKey(config);
 
-  const localDep     = findDeployment(idOrName);
+  const localDep = findDeployment(idOrName);
+
+  // Resolve the deployment ID to send to the backend
   const deploymentId = localDep?.id ?? idOrName;
 
-  process.stdout.write(chalk.dim(`  Stopping ${deploymentId}...`));
+  console.log(chalk.dim(`  Terminating ${deploymentId}...`));
 
   let dep;
   try {
     dep = await terminateDeployment(config, deploymentId);
   } catch (err) {
-    process.stdout.write('\n');
-    console.error(chalk.red(`\n  ✗ Could not stop deployment: ${err.message}\n`));
+    console.error(chalk.red(`\n  ✗ Terminate failed: ${err.message}\n`));
     return;
   }
 
-  process.stdout.write('\n');
-
-  // Compute final cost from the deployment timestamps
-  const stoppedAt   = dep.stopped_at  ?? (Date.now() / 1000);
-  const startedAt   = dep.started_at  ?? stoppedAt;
-  const runtimeMin  = Math.round((stoppedAt - startedAt) / 60);
-  const runtimeHr   = (stoppedAt - startedAt) / 3600;
-  const finalCost   = (dep.cost_per_hour || 0) * runtimeHr;
-
   const rcptId = generateReceiptId();
   addReceipt({
-    receiptId:      rcptId,
-    action:         'badgr down',
-    deploymentId:   dep.deployment_id,
-    gpu:            dep.gpu_type,
-    runtimeSeconds: Math.round(stoppedAt - startedAt),
-    finalCost,
-    status:         'terminated',
-    createdAt:      new Date().toISOString(),
+    receiptId:    rcptId,
+    action:       'badgr down',
+    deploymentId: dep.deployment_id,
+    name:         dep.name,
+    provider:     dep.provider,
+    gpu:          dep.gpu_type,
+    latencyMs:    0,
+    status:       'terminated',
+    createdAt:    new Date().toISOString(),
   });
 
+  // Remove from local store
   removeDeployment(idOrName);
 
-  console.log(chalk.green('\n✓ Stopped'));
-  console.log(chalk.green('  Billing ended\n'));
-  console.log(`  ${chalk.bold('Runtime:')}    ${runtimeMin}m`);
-  if (finalCost > 0) console.log(`  ${chalk.bold('Final cost:')} $${finalCost.toFixed(4)}`);
-  console.log(`  ${chalk.bold('Receipt:')}    ${chalk.dim(rcptId)}\n`);
+  console.log(chalk.green(`\n✓ Deployment stopped: ${dep.name}\n`));
+  console.log(`  ${chalk.bold('ID:')}        ${dep.deployment_id}`);
+  console.log(`  ${chalk.bold('GPU:')}       ${dep.gpu_type} × ${dep.gpu_count}`);
+  if (dep.started_at) {
+    const uptime = Math.round((Date.now() / 1000 - dep.started_at) / 60);
+    console.log(`  ${chalk.bold('Uptime:')}    ${uptime} min`);
+  }
+  console.log(`\n  ${chalk.bold('Receipt ID:')} ${chalk.dim(rcptId)}\n`);
 }

package/src/commands/login.js

@@ -1,36 +1,20 @@
 import { input } from '@inquirer/prompts';
-import { DEFAULTS } from '../config.js';
-import { callApi } from '../api.js';
 
 export async function loginCommand(chalk, saveConfigFn) {
-  console.log(chalk.bold('\nBadgr Login\n'));
+  console.log(chalk.bold('\n🔑  Badgr Login\n'));
 
   const apiKey = await input({
     message: 'Enter your Badgr API key:',
     validate: v => v.trim() ? true : 'API key is required',
   });
 
-  const config = saveConfigFn({
-    apiKey: apiKey.trim(),
-    baseUrl: DEFAULTS.baseUrl,
+  const baseUrl = await input({
+    message: 'API base URL:',
+    default: 'https://api.badgr.ai/v1',
   });
 
-  console.log(chalk.green('\n✓ Logged in'));
-  console.log(chalk.dim(`  Config saved to ~/.badgr/config.json`));
-
-  // Verify the key works against the live API
-  try {
-    await callApi('/models', { apiKey: config.apiKey, baseUrl: config.baseUrl });
-    console.log(chalk.green('✓ API reachable'));
-    console.log(chalk.green('✓ API key valid\n'));
-  } catch (err) {
-    if (err.httpStatus === 401 || err.httpStatus === 403) {
-      console.log(chalk.yellow('⚠ API key may be invalid — double-check and run badgr login again\n'));
-    } else {
-      console.log(chalk.yellow('⚠ Could not reach the API right now — check your internet connection\n'));
-    }
-  }
-
-  console.log(chalk.dim(`  Run ${chalk.cyan('badgr run python train.py')} to launch your first job.\n`));
+  const config = saveConfigFn({ apiKey: apiKey.trim(), baseUrl: baseUrl.trim() });
+  console.log(chalk.green('\n✓ Logged in — config saved to ~/.badgr/config.json\n'));
+  console.log(chalk.dim(`  Base URL: ${config.baseUrl}\n`));
   return config;
 }

package/src/commands/logs.js

@@ -1,12 +1,6 @@
 import { findDeployment, listDeployments } from '../store.js';
 import { requireApiKey } from '../config.js';
-import { getDeploymentLogs, callApi } from '../api.js';
-
-const TERMINAL_STATUSES = new Set(['succeeded', 'completed', 'failed', 'stopped', 'terminated']);
-const FOLLOW_POLL_MS = 3000;
-
-// Lines that carry structured metadata shown elsewhere (status bar in `badgr run`).
-const LOG_META_RE = /^\[dep-[^\]]+\] (status|gpu|region|endpoint|cost|receipt|provider_status|uptime)=/;
+import { getDeploymentLogs } from '../api.js';
 
 export async function logsCommand(config, args, chalk) {
   const idOrName = args.find(a => !a.startsWith('--'));
@@ -32,18 +26,13 @@ export async function logsCommand(config, args, chalk) {
 
   console.log(chalk.bold(`\n📋 Logs: ${localDep?.name ?? deploymentId}\n`));
 
-  // Fetch and print initial batch of logs.
-  const seen = new Set();
   try {
     const data = await getDeploymentLogs(config, deploymentId);
     const lines = data?.logs ?? [];
-    if (lines.length === 0 && !follow) {
+    if (lines.length === 0) {
       console.log(chalk.dim('  No log lines available yet.\n'));
     } else {
-      for (const line of lines) {
-        seen.add(line);
-        if (!LOG_META_RE.test(line)) console.log(`  ${chalk.dim(line)}`);
-      }
+      lines.forEach(l => console.log(`  ${chalk.dim(l)}`));
     }
   } catch (err) {
     console.log(chalk.yellow(`  Could not fetch logs: ${err.message}`));
@@ -51,51 +40,10 @@ export async function logsCommand(config, args, chalk) {
       console.log(chalk.dim(`\n  GPU: ${localDep.gpu}  Type: ${localDep.type}`));
       console.log(chalk.dim(`  Endpoint: ${localDep.endpointUrl}`));
     }
-    if (!follow) { console.log(); return; }
   }
 
-  if (!follow) { console.log(); return; }
-
-  // --follow: poll until the deployment reaches a terminal state.
-  console.log(chalk.dim('  (following — Ctrl+C to stop)\n'));
-
-  let stopping = false;
-  process.once('SIGINT', () => { stopping = true; });
-
-  while (!stopping) {
-    await new Promise(r => setTimeout(r, FOLLOW_POLL_MS));
-    if (stopping) break;
-
-    let status = null;
-    try {
-      const dep = await callApi(`/deployments/${deploymentId}`, {
-        apiKey: config.apiKey,
-        baseUrl: config.baseUrl,
-      });
-      status = dep?.status ?? null;
-    } catch {
-      // network blip — keep following
-    }
-
-    try {
-      const data = await getDeploymentLogs(config, deploymentId);
-      for (const line of (data?.logs ?? [])) {
-        if (seen.has(line)) continue;
-        seen.add(line);
-        if (!LOG_META_RE.test(line)) {
-          const isErr = /^error\b/i.test(line) || /Error response from daemon/i.test(line);
-          console.log(`  ${isErr ? chalk.red(line) : chalk.dim(line)}`);
-        }
-      }
-    } catch {
-      // logs endpoint temporarily unavailable
-    }
-
-    if (status && TERMINAL_STATUSES.has(status)) {
-      console.log(chalk.dim(`\n  Job ${status}. No more logs.\n`));
-      break;
-    }
+  if (follow) {
+    console.log(chalk.yellow('\n  --follow: live log streaming not yet supported. Poll with `badgr logs`.\n'));
   }
-
   console.log();
 }

package/src/commands/models.js

@@ -1,38 +1,19 @@
-import { listModels, callApi } from '../api.js';
+import { listModels } from '../api.js';
 import { listAll } from '../router.js';
 
 export async function modelsCommand(config, chalk) {
-  console.log(chalk.bold('\n📦 GPU Options (cheapest first)\n'));
-
-  let gpus = null;
-  if (config.apiKey) {
-    try {
-      const data = await callApi('/gpus', { apiKey: config.apiKey, baseUrl: config.baseUrl });
-      if (data?.gpus?.length) {
-        gpus = data.gpus.map(g => ({
-          id:          g.id,
-          name:        g.name,
-          vramGb:      g.vram_gb,
-          ratePerHour: g.rate_per_hour,
-        })).sort((a, b) => a.ratePerHour - b.ratePerHour);
-      }
-    } catch {
-      // fallback to local catalog on error
-    }
-  }
-
-  if (!gpus) gpus = listAll();
+  const gpus = listAll();
 
+  console.log(chalk.bold('\n📦 GPU Options (cheapest first)\n'));
   console.log(
-    `  ${'ID'.padEnd(14)}  ${'Name'.padEnd(24)}  ${'VRAM'.padEnd(8)}  Rate/hr (indicative)`
+    `  ${'ID'.padEnd(14)}  ${'Name'.padEnd(24)}  ${'VRAM'.padEnd(8)}  Rate/hr`
   );
-  console.log(`  ${'─'.repeat(68)}`);
+  console.log(`  ${'─'.repeat(58)}`);
   gpus.forEach(g => {
     console.log(
-      `  ${chalk.cyan(g.id.padEnd(14))}  ${g.name.padEnd(24)}  ${`${g.vramGb}GB`.padEnd(8)}  ~$${g.ratePerHour.toFixed(2)}`
+      `  ${chalk.cyan(g.id.padEnd(14))}  ${g.name.padEnd(24)}  ${`${g.vramGb}GB`.padEnd(8)}  $${g.ratePerHour.toFixed(2)}`
     );
   });
-  console.log(chalk.dim('  Actual billing is set at job start — use `badgr run` to see live rates.'));
 
   console.log(chalk.bold('\n🤖 LLM Models\n'));
   if (!config.apiKey) {

package/src/commands/receipts.js

@@ -5,34 +5,19 @@ function fmtMs(ms) {
   return ms >= 1000 ? `${(ms / 1000).toFixed(1)}s` : `${ms}ms`;
 }
 
-function fmtRuntime(s) {
-  if (s < 60) return `${s}s`;
-  return `${Math.floor(s / 60)}m ${s % 60}s`;
-}
-
 function printReceipt(r, chalk) {
   const id     = r.receiptId ?? r.request_id ?? r.id ?? '—';
   const ts     = r.createdAt ?? r.created_at ?? '—';
-  const action = r.action ?? r.endpoint ?? '—';
+  const cost   = r.route?.ratePerHour ?? r.cost_usd ?? 0;
+  const prov   = r.route?.provider ?? r.provider ?? r.model_provider ?? '—';
   const lat    = r.latencyMs ?? r.latency_ms;
+  const action = r.action ?? r.endpoint ?? '—';
 
   console.log(`  ${chalk.cyan(id)}`);
   console.log(`    ${chalk.bold('action:')}   ${action}`);
-
-  // GPU job fields (from badgr run / badgr down)
-  if (r.gpu)            console.log(`    ${chalk.bold('gpu:')}      ${r.gpu}`);
-  if (r.runtimeSeconds) console.log(`    ${chalk.bold('runtime:')}  ${fmtRuntime(r.runtimeSeconds)}`);
-  if (r.finalCost)      console.log(`    ${chalk.bold('cost:')}     $${r.finalCost.toFixed(4)}`);
-  else if (r.cost_usd)  console.log(`    ${chalk.bold('cost:')}     $${r.cost_usd.toFixed(4)}`);
-  if (r.exitCode !== undefined && r.exitCode !== null) {
-    console.log(`    ${chalk.bold('exit:')}     ${r.exitCode !== 0 ? chalk.red(r.exitCode) : chalk.green(r.exitCode)}`);
-  }
-
-  // API inference receipt fields
   if (lat !== undefined) console.log(`    ${chalk.bold('latency:')}  ${fmtMs(lat)}`);
+  if (cost) console.log(`    ${chalk.bold('cost:')}     $${typeof cost === 'number' ? cost.toFixed(4) : cost}/hr`);
   if (r.retries !== undefined) console.log(`    ${chalk.bold('retries:')}  ${r.retries}`);
-  if (r.route?.ratePerHour) console.log(`    ${chalk.bold('rate:')}     $${r.route.ratePerHour.toFixed(4)}/hr`);
-
   if (r.status) console.log(`    ${chalk.bold('status:')}   ${r.status}`);
   console.log(`    ${chalk.dim(ts)}`);
   console.log();