badgr-cli 1.1.4 → 1.1.6

package/README.md

@@ -167,17 +167,15 @@ secrets, and runs free static checks as part of a Badgr Smoke Test.
 Nothing runs on a GPU without explicit `--approve`.
 
 ```bash
-# Free Badgr Smoke Test — no login required
+# badgr diagnose IS the Badgr Smoke Test — free, no login, no GPU.
+# Applicable free structural checks run automatically, every time.
 badgr diagnose "https://github.com/org/repo/issues/123"
 badgr diagnose ajayrajtp/vllm_gemma412b:latest
 badgr diagnose ./vllm-error.log
 badgr diagnose "https://github.com/org/repo"
 badgr diagnose workflow.json
 
-# Free mechanical validation of the produced command — still no GPU, no login
-badgr diagnose "https://github.com/org/repo/issues/123" --smoke
-
-# Approve a capped smoke test after diagnosis (login required)
+# Start a real Badgr Run (paid GPU execution) after diagnosis (login required)
 badgr diagnose "https://github.com/org/repo/issues/123" --approve
 
 # Resume an existing case, e.g. one shared via a case link
@@ -190,8 +188,8 @@ badgr diagnose "https://github.com/org/repo/issues/123" --json
 
 | Flag | Description |
 |------|-------------|
-| `--smoke` | Free. Runs real, cheap mechanical validation of the produced command (syntax, CLI-entrypoint corroboration, referenced-file presence, Docker `ENTRYPOINT`/`CMD` consistency, required env vars, plus a client-side check of any local file path you pasted). Never starts a GPU, never requires login. Combine with `--approve` — the smoke checks print first, then the normal approve flow runs. Not the same as `badgr run --smoke`, which launches a real, billable GPU job |
-| `--approve` | Approve the capped smoke test after diagnosis (opens browser sign-in automatically if not logged in) |
+| `--approve` | Start a real Badgr Run after diagnosis — actual GPU execution, capped at a hard maximum spend (opens browser sign-in automatically if not logged in) |
+| `--smoke` | Deprecated, no-op. The free mechanical checks this used to gate (syntax, CLI-entrypoint corroboration, referenced-file presence, Docker `ENTRYPOINT`/`CMD` consistency, required env vars, plus a client-side local-file check) now always run as part of plain `badgr diagnose`. Kept only so existing scripts that pass it don't break. Not the same as `badgr run --smoke`, which launches a real, billable GPU job |
 | `--docker <image>` | Force Docker-image intake (override auto-detect) |
 | `--repo <url>` | Force repository intake (override auto-detect) |
 | `--comfyui <path>` | Force ComfyUI workflow intake (override auto-detect) |
@@ -199,13 +197,13 @@ badgr diagnose "https://github.com/org/repo/issues/123" --json
 | `--json` | Machine-readable JSON output |
 
 Every run prints one status: `NEEDS INFO` (fields still missing) →
-`READY` (complete evidence-backed command, no smoke run) → `SMOKE CHECKED`
-(`--smoke` ran, every applicable check passed or was skipped) / `INVALID`
-(`--smoke` ran and a check actually failed) → `VERIFIED` (reserved for an
-actual successful GPU-provisioned run — never assigned from static
-resolution or `--smoke`). `READY`/`SMOKE CHECKED` results also print the
-canonical `badgr run`/`badgr serve` command `--approve` would run, plus a
-shareable case link — pass that case ID or URL back into `badgr diagnose
+`READY` (complete evidence-backed command, no applicable checks to run) →
+`SMOKE CHECKED` (applicable checks ran, all passed or were skipped) /
+`INVALID` (an applicable check actually failed) → `VERIFIED` (reserved for
+an actual successful Badgr Run — never assigned from diagnosis alone).
+`READY`/`SMOKE CHECKED` results also print the canonical `badgr
+run`/`badgr serve` command `--approve` would run, plus a shareable case
+link — pass that case ID or URL back into `badgr diagnose
 <case_id_or_url> --approve` to resume the same case without re-diagnosing.
 
 `badgr run-issue` is an alias for `badgr diagnose`, matching the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badgr-cli",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Badgr — run or serve GPU workloads from one command",
   "type": "module",
   "bin": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "@inquirer/prompts": "^8.5.2",
     "archiver": "^7.0.1",
-    "badgr-shared": "0.1.1",
+    "badgr-shared": "^0.1.2",
     "chalk": "^5.3.0",
     "js-yaml": "^4.1.0",
     "tar": "^7.4.3"

package/src/api.js

@@ -228,6 +228,34 @@ export async function terminateDeployment(config, deploymentId) {
   throw lastErr;
 }
 
+// ---- Admin (michaelhireitem@gmail.com only) ---------------------------------
+// CLI counterparts to the web admin dashboard's own /admin/api/deployments/*
+// routes (main.py) -- those are gated by a browser session cookie the CLI's
+// Authorization: Bearer <api_key> auth can never satisfy, so
+// deployment_routes.py exposes these two under /v1/admin/deployments/*
+// instead, gated by the same is_admin_email() check via API key. A non-admin
+// caller gets a plain 403 from callApi, same as any other access-denied route.
+
+// Every non-terminal deployment across every user (not just the caller's
+// own), each carrying its owner's user_email/username so a stuck or
+// forgotten GPU can be identified without logging into that customer's
+// account. Backs `badgr status --admin`.
+export function listAllActiveDeploymentsAdmin(config) {
+  return callApi('/admin/deployments/active', { apiKey: config.apiKey, baseUrl: config.baseUrl, timeoutMs: 15_000 });
+}
+
+// Force-terminate any deployment regardless of owner -- bypasses the
+// per-user ownership check DELETE /deployments/{id} enforces. Backs
+// `badgr down <id> --admin`.
+export function adminTerminateDeployment(config, deploymentId) {
+  return callApi(`/admin/deployments/${deploymentId}`, {
+    method: 'DELETE',
+    apiKey: config.apiKey,
+    baseUrl: config.baseUrl,
+    timeoutMs: 20_000,
+  });
+}
+
 export function restartDeployment(config, deploymentId) {
   return callApi(`/deployments/${deploymentId}/restart`, {
     method: 'POST',

package/src/badgr.js

@@ -119,7 +119,7 @@ ${chalk.bold('EXAMPLES')}
   badgr diagnose --docker ajayrajtp/vllm_gemma412b:latest
   badgr diagnose --repo https://github.com/org/repo
   badgr diagnose --comfyui workflow.json
-  badgr diagnose "https://github.com/org/repo/issues/123" --approve ${chalk.dim('# approve a capped smoke test')}
+  badgr diagnose "https://github.com/org/repo/issues/123" --approve ${chalk.dim('# start a real Badgr Run')}
 
   ${chalk.dim('# Local model-fit and workload diagnosis (no network):')}
   badgr doctor

package/src/commands/artifacts.js

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
-import { requireApiKey, CONFIG_DIR } from '../config.js';
+import { CONFIG_DIR } from '../config.js';
+import { ensureLoggedInReady, withReauthRetry } from '../onboarding.js';
 import { downloadAndExtractArtifact } from '../artifactDownload.js';
 
 /**
@@ -37,7 +38,7 @@ export function listFilesRecursive(dir, prefix = '') {
 }
 
 export async function artifactsCommand(config, args, chalk) {
-  requireApiKey(config);
+  config = await ensureLoggedInReady(config, chalk);
   const { deploymentId, flags } = parseArtifactsArgs(args);
   if (!deploymentId) {
     console.error(chalk.red('\n  Usage: badgr artifacts <deployment-id> [--output <dir>]\n'));
@@ -49,7 +50,8 @@ export async function artifactsCommand(config, args, chalk) {
   const destDir = flags.output ? path.resolve(flags.output) : defaultDestDir(deploymentId);
 
   try {
-    await downloadAndExtractArtifact(config, deploymentId, destDir);
+    const refreshed = await withReauthRetry(config, chalk, cfg => downloadAndExtractArtifact(cfg, deploymentId, destDir));
+    config = refreshed.config;
   } catch (err) {
     if (err.httpStatus === 404) {
       console.error(chalk.red(`\n  ✗ No artifact found for ${deploymentId}.\n`));

package/src/commands/batch.js

@@ -17,7 +17,8 @@ import { existsSync, readFileSync, unlinkSync, statSync, readdirSync } from 'fs'
 import { join, resolve } from 'path';
 import os from 'os';
 
-import { requireApiKey, CONFIG_DIR } from '../config.js';
+import { CONFIG_DIR } from '../config.js';
+import { ensureBadgrReady, ensureLoggedInReady } from '../onboarding.js';
 import { parseWorkloadYaml } from '../workloadSpec.js';
 import { addReceipt, updateReceipt, generateReceiptId, loadStore, selectedComputeFromDeployment } from '../store.js';
 import { normalizeTier, callWithFallback } from '../fallback.js';
@@ -392,7 +393,7 @@ async function runSubcommand(config, args, chalk) {
     return;
   }
 
-  requireApiKey(config);
+  config = await ensureBadgrReady(config, chalk);
 
   let spec;
   try {
@@ -593,7 +594,7 @@ async function statusSubcommand(config, args, chalk) {
     process.exitCode = 1;
     return;
   }
-  requireApiKey(config);
+  config = await ensureLoggedInReady(config, chalk);
 
   let dep;
   try {
@@ -628,7 +629,7 @@ async function artifactsSubcommand(config, args, chalk) {
     process.exitCode = 1;
     return;
   }
-  requireApiKey(config);
+  config = await ensureLoggedInReady(config, chalk);
 
   let destDir;
   try {
@@ -676,7 +677,7 @@ async function receiptSubcommand(config, args, chalk) {
     process.exitCode = 1;
     return;
   }
-  requireApiKey(config);
+  config = await ensureLoggedInReady(config, chalk);
 
   const local = findBatchRun(runId);
   let dep = null;

package/src/commands/billing.js

@@ -1,4 +1,4 @@
-import { requireApiKey } from '../config.js';
+import { ensureLoggedInReady } from '../onboarding.js';
 import { callApi } from '../api.js';
 import { openBrowser } from '../browser.js';
 
@@ -17,7 +17,7 @@ EXAMPLES
 `;
 
 async function billingStatus(config, chalk) {
-  requireApiKey(config);
+  config = await ensureLoggedInReady(config, chalk);
   try {
     const apiUrl = config.baseUrl.replace('/v1', '').replace('/api/v1', '');
     const data = await callApi('/api/me', {
@@ -47,7 +47,7 @@ async function billingStatus(config, chalk) {
 }
 
 async function billingAdd(config, amount, chalk) {
-  requireApiKey(config);
+  config = await ensureLoggedInReady(config, chalk);
   const amountInt = parseInt(amount, 10);
   if (!amountInt || amountInt < 5) {
     console.error(chalk.red('  Minimum top-up is $5. Example: badgr billing add 5'));

package/src/commands/capacity.js

@@ -1,4 +1,4 @@
-import { requireApiKey } from '../config.js';
+import { ensureLoggedInReady } from '../onboarding.js';
 import { callApi } from '../api.js';
 
 /**
@@ -19,7 +19,7 @@ function parseCapacityArgs(args) {
 
 export async function capacityCommand(config, args, chalk) {
   const flags = parseCapacityArgs(args);
-  requireApiKey(config);
+  config = await ensureLoggedInReady(config, chalk);
 
   // No --max-price: no cap. Availability browsing shouldn't silently hide
   // real capacity behind an unrequested price ceiling.

package/src/commands/deploy.js

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
 import { findCheapest, findById } from '../router.js';
-import { requireApiKey } from '../config.js';
+import { ensureBadgrReady } from '../onboarding.js';
 
 export function parseDeployArgs(args) {
   const nameFlag = args.indexOf('--name');
@@ -24,7 +24,7 @@ export async function deployCommand(config, args, chalk) {
     return;
   }
 
-  requireApiKey(config);
+  config = await ensureBadgrReady(config, chalk);
 
   const deployId = randomUUID().split('-')[0];
   const name = rawName ?? script.replace(/[^a-z0-9]/gi, '-').replace(/-+/g, '-').toLowerCase();