badgr-cli 1.1.3 → 1.1.5

package/src/onboarding.js

@@ -115,17 +115,76 @@ async function ensureFunded(config, chalk) {
   console.log(chalk.green('\n  ✓ Payment confirmed\n'));
 }
 
-export async function ensureBadgrReady(config, chalk) {
+/**
+ * Just-in-time login only, no funding gate — for commands that manage or
+ * inspect an *existing* resource (stop it, read its logs, download its
+ * artifacts, reset its idle timer) rather than provisioning new spend.
+ * Critically, `badgr down` must never be blocked behind "add funds first" —
+ * a $0-balance user with a still-running deployment needs to be able to
+ * stop it without a funding detour. Same browser-login-and-resume flow as
+ * ensureBadgrReady, just without the ensureFunded step.
+ */
+export async function ensureLoggedInReady(config, chalk) {
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
     // No human to click a browser link — fail fast with the existing message.
     requireApiKey(config);
     return config;
   }
+  if (!config.apiKey) {
+    return ensureLoggedIn(config, chalk);
+  }
+  return config;
+}
 
-  let cfg = config;
-  if (!cfg.apiKey) {
-    cfg = await ensureLoggedIn(cfg, chalk);
+/**
+ * Login + funding gate — for commands that provision new spend (run,
+ * serve, comfyui, launch/job, batch run, train, transcribe, embed, deploy,
+ * shell, sbatch, up). Reuses ensureLoggedInReady for the login half so
+ * there is exactly one login flow, not two.
+ */
+export async function ensureBadgrReady(config, chalk) {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    // No human to click a browser link — fail fast with the existing
+    // message, same as ensureLoggedInReady, and skip ensureFunded too:
+    // there's no one to click the billing checkout link either.
+    requireApiKey(config);
+    return config;
   }
+  const cfg = await ensureLoggedInReady(config, chalk);
   await ensureFunded(cfg, chalk);
   return cfg;
 }
+
+/**
+ * Both ensureLoggedInReady and ensureBadgrReady only ever check whether a
+ * key is *configured* -- neither can tell a stored key is stale/expired/
+ * revoked without actually calling the API, so a command with a bad saved
+ * key sailed straight past both checks and only found out from the real
+ * request's own 401, which every command before this helper just printed
+ * ("Invalid API key ... run: badgr login") and exited. That's a dead end
+ * for the exact case ensureLoggedInReady/ensureBadgrReady exist to avoid:
+ * the person is sitting right there at an interactive terminal.
+ *
+ * withReauthRetry(config, chalk, fn) calls fn(config) once; on a 401/403
+ * in an interactive TTY, it opens the same browser login link
+ * ensureLoggedIn always has, waits for it, then retries fn exactly once
+ * with the fresh key. Any other error (including a repeat 401/403 after a
+ * successful re-login, or non-interactive/CI) is re-thrown unchanged for
+ * the caller's own existing error handling.
+ *
+ * Returns { config, result } -- callers should keep using the returned
+ * config (not their original variable) for anything they do afterward, so
+ * a refreshed key from a mid-command reauth is actually used for the rest
+ * of that same run instead of only being picked up by the next command.
+ */
+export async function withReauthRetry(config, chalk, fn) {
+  try {
+    return { config, result: await fn(config) };
+  } catch (err) {
+    if (err.httpStatus !== 401 && err.httpStatus !== 403) throw err;
+    if (!process.stdin.isTTY || !process.stdout.isTTY) throw err;
+    console.log(chalk.yellow('\n  Your saved API key was rejected. Signing in again...'));
+    const freshConfig = await ensureLoggedIn(config, chalk);
+    return { config: freshConfig, result: await fn(freshConfig) };
+  }
+}

package/src/progress.js

@@ -33,11 +33,14 @@ export function clearBlock(lineCount) {
 // `badgr serve` (deployment) and `badgr run` (job): elapsed time, a status
 // word, an *estimated* spend (never presented as confirmed while billing is
 // still live), and the exact commands to inspect logs or stop billing.
-export function renderLiveBlock(chalk, { stageLine, elapsedSec, statusWord, spend, id }) {
+export function renderLiveBlock(chalk, { stageLine, elapsedSec, statusWord, spend, id, maxCost }) {
+  const spendLine = maxCost
+    ? `        Estimated spend: ~$${spend.toFixed(2)} / $${maxCost.toFixed(2)}`
+    : `        Estimated spend: ~$${spend.toFixed(2)}`;
   return [
     chalk.dim(`${stageLine} ${elapsedSec}s elapsed`),
     chalk.dim(`        Status: ${statusWord}`),
-    chalk.dim(`        Estimated spend: ~$${spend.toFixed(2)}`),
+    chalk.dim(spendLine),
     chalk.dim(`        Logs: badgr logs ${id}`),
     chalk.dim(`        Stop billing: badgr down ${id}`),
   ];