badgr-cli 1.0.27 → 1.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badgr-cli",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "description": "Badgr, run or serve GPU workloads from one command",
   "type": "module",
   "bin": {

package/src/api.js

@@ -59,6 +59,24 @@ export async function callApi(path, { method = 'GET', apiKey, baseUrl, body } =
       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' :

package/src/badgr.js

@@ -12,6 +12,7 @@ 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
@@ -26,6 +27,7 @@ ${chalk.bold('COMMANDS')}
   ${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('EXAMPLES')}
   ${chalk.dim('# Verify the stack works end-to-end:')}
@@ -104,6 +106,7 @@ async function main() {
     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/billing.js

@@ -0,0 +1,93 @@
+import { execSync } from 'child_process';
+import { requireApiKey } from '../config.js';
+import { callApi } from '../api.js';
+
+const BILLING_HELP = `
+badgr billing — manage your AI Badgr balance
+
+COMMANDS
+  badgr billing status         Show current balance
+  badgr billing add <amount>   Open checkout to add balance (minimum $10)
+
+EXAMPLES
+  badgr billing status
+  badgr billing add 10
+  badgr billing add 20
+  badgr billing add 50
+`;
+
+function openBrowser(url) {
+  const platform = process.platform;
+  try {
+    if (platform === 'darwin') execSync(`open "${url}"`);
+    else if (platform === 'win32') execSync(`start "" "${url}"`);
+    else execSync(`xdg-open "${url}"`);
+  } catch {
+    // Silently ignore — we print the URL anyway
+  }
+}
+
+async function billingStatus(config, chalk) {
+  requireApiKey(config);
+  try {
+    const apiUrl = config.baseUrl.replace('/v1', '').replace('/api/v1', '');
+    const data = await callApi('/api/me', {
+      apiKey: config.apiKey,
+      baseUrl: apiUrl,
+    });
+    const credits = data.credits ?? 0;
+    const balanceUsd = (credits / 10000).toFixed(2);
+    console.log();
+    console.log(chalk.bold('  Balance'));
+    console.log(`  ${chalk.bold(chalk.blue(`$${balanceUsd}`))}`);
+    console.log();
+    if (credits === 0) {
+      console.log(chalk.yellow('  Balance is $0.00. Add balance before making API calls or running GPU jobs.'));
+      console.log(chalk.dim('  Add balance: badgr billing add 10'));
+      console.log(chalk.dim('  Or visit:    https://aibadgr.com/billing/top-up'));
+    }
+    console.log();
+  } catch (err) {
+    if (err.isPaymentRequired) {
+      console.error(err.message);
+      process.exit(1);
+    }
+    console.error(chalk.red('  Could not fetch balance: ' + err.message));
+    process.exit(1);
+  }
+}
+
+async function billingAdd(config, amount, chalk) {
+  requireApiKey(config);
+  const amountInt = parseInt(amount, 10);
+  if (!amountInt || amountInt < 10) {
+    console.error(chalk.red('  Minimum top-up is $10. Example: badgr billing add 10'));
+    process.exit(1);
+  }
+
+  const url = `https://aibadgr.com/dashboard#billing`;
+  console.log();
+  console.log(chalk.bold(`  Opening dashboard billing to add $${amountInt}...`));
+  console.log();
+  console.log(`  ${chalk.dim(url)}`);
+  console.log();
+  openBrowser(url);
+  console.log(chalk.dim('  Complete payment in your browser, then rerun your command.'));
+  console.log();
+}
+
+export async function billingCommand(config, args, chalk) {
+  const [sub, ...rest] = args;
+
+  if (!sub || sub === '--help' || sub === '-h') {
+    console.log(BILLING_HELP);
+    return;
+  }
+
+  if (sub === 'status') return billingStatus(config, chalk);
+  if (sub === 'add') return billingAdd(config, rest[0], chalk);
+
+  console.error(chalk.red(`  Unknown billing command: ${sub}`));
+  console.log(chalk.dim('  Run: badgr billing --help'));
+  process.exit(1);
+}

package/src/commands/logs.js

@@ -1,6 +1,12 @@
 import { findDeployment, listDeployments } from '../store.js';
 import { requireApiKey } from '../config.js';
-import { getDeploymentLogs } from '../api.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)=/;
 
 export async function logsCommand(config, args, chalk) {
   const idOrName = args.find(a => !a.startsWith('--'));
@@ -26,13 +32,18 @@ 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) {
+    if (lines.length === 0 && !follow) {
       console.log(chalk.dim('  No log lines available yet.\n'));
     } else {
-      lines.forEach(l => console.log(`  ${chalk.dim(l)}`));
+      for (const line of lines) {
+        seen.add(line);
+        if (!LOG_META_RE.test(line)) console.log(`  ${chalk.dim(line)}`);
+      }
     }
   } catch (err) {
     console.log(chalk.yellow(`  Could not fetch logs: ${err.message}`));
@@ -40,10 +51,51 @@ 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(chalk.yellow('\n  --follow: live log streaming not yet supported. Poll with `badgr logs`.\n'));
+  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;
+    }
   }
+
   console.log();
 }

package/src/commands/run.js

@@ -431,6 +431,11 @@ export async function runCommand(config, args, chalk) {
         console.error(chalk.dim(`  Run BADGR_DEBUG=1 badgr run … for a full trace.\n`));
       }
       process.exit(1);
+    } else if (err.isPaymentRequired) {
+      console.error(chalk.yellow(err.message));
+      const rerun = ['badgr run', ...args].join(' ');
+      console.error(chalk.dim(`After payment, rerun:\n  ${rerun}\n`));
+      process.exit(1);
     } else {
       console.error(chalk.red(`\n  ✗ Could not start job: ${err.message}\n`));
       console.error(chalk.dim(`  Run BADGR_DEBUG=1 badgr run … for a full trace.`));
@@ -445,12 +450,15 @@ export async function runCommand(config, args, chalk) {
 
   const rcptId = dep.receipt_id || generateReceiptId();
   addReceipt({
-    receiptId:    rcptId,
-    action:       'badgr run',
-    deploymentId: dep.deployment_id,
-    gpu:          dep.gpu_type,
-    status:       dep.status,
-    createdAt:    new Date().toISOString(),
+    receiptId:     rcptId,
+    action:        'badgr run',
+    deploymentId:  dep.deployment_id,
+    gpu:           dep.gpu_type,
+    providerRoute: dep.provider ?? null,
+    maxCost:       maxCost ?? null,
+    maxRuntime:    flags.maxRuntime ?? null,
+    status:        dep.status,
+    createdAt:     new Date().toISOString(),
   });
 
   console.log();
@@ -501,7 +509,7 @@ export async function runCommand(config, args, chalk) {
     }
     const runtimeMs = Date.now() - attachStart;
     const finalCost = ratePerHour * (runtimeMs / 3_600_000);
-    updateReceipt(rcptId, { status: reason, runtimeSeconds: Math.round(runtimeMs / 1000), finalCost });
+    updateReceipt(rcptId, { status: reason, teardownStatus: 'terminated', runtimeSeconds: Math.round(runtimeMs / 1000), finalCost });
     console.log(chalk.dim(`  Runtime: ${fmtRuntime(runtimeMs)}  •  Est. cost: $${finalCost.toFixed(4)}`));
     console.log(chalk.dim('  Job stopped. Billing ended.\n'));
     process.exit(reason === 'interrupted' ? 0 : 1);
@@ -520,11 +528,12 @@ export async function runCommand(config, args, chalk) {
 
   const finalCost = ratePerHour * (runtimeMs / 3_600_000);
   updateReceipt(rcptId, {
-    status: finalStatus,
+    status:        finalStatus,
     exitCode,
     runtimeSeconds: Math.round(runtimeMs / 1000),
     finalCost,
     failureType,
+    teardownStatus: (finalStatus === 'completed' || finalStatus === 'succeeded') ? 'terminated' : 'failed',
   });
 
   console.log(`  ${chalk.bold('Runtime:')}  ${fmtRuntime(runtimeMs)}`);

package/src/commands/serve.js

@@ -171,6 +171,12 @@ export async function serveCommand(config, args, chalk) {
         failureType: 'infrastructure',
         createdAt:   new Date().toISOString(),
       });
+      if (err.isPaymentRequired) {
+        console.error(chalk.yellow(err.message));
+        const rerun = `badgr serve ${args.join(' ')}`;
+        console.error(chalk.dim(`After payment, rerun:\n  ${rerun}\n`));
+        return;
+      }
       console.error(chalk.red(`\n  ✗ Could not start endpoint: ${err.message}`));
       console.error(chalk.dim(`\n  Receipt: ${failRcptId}`));
       console.error(chalk.dim(`  Run BADGR_DEBUG=1 badgr serve … for a full trace.\n`));

package/src/commands/test-run.js

@@ -175,7 +175,8 @@ export async function testCommand(config, args, chalk) {
   process.stdout.write(chalk.dim('  Waiting for container to start...'));
   const started = await pollStatus(
     config, depId,
-    new Set(['running', 'failed', 'stopped', 'completed']),
+    // Modal serverless jobs may skip straight to succeeded when the callback fires.
+    new Set(['running', 'starting', 'succeeded', 'failed', 'stopped', 'completed']),
     TEST_MAX_RUNTIME_MS,
   );
   process.stdout.write('\n');