badgr-cli 1.0.29 → 1.0.31

package/src/commands/run.js

@@ -1,12 +1,13 @@
-import readline from 'readline';
 import { requireApiKey } from '../config.js';
-import { callApi, terminateDeployment } from '../api.js';
-import { addReceipt, updateReceipt, generateReceiptId } from '../store.js';
+import { callApi } from '../api.js';
+import { addReceipt, generateReceiptId } from '../store.js';
 
 /**
- * badgr run python train.py                    # gpu=auto, attached
- * badgr run python train.py --gpu A100         # specific GPU
+ * badgr run python train.py --gpu A100           # attached (default)
  * badgr run --image my/image:latest --gpu L40S --detach
+ *
+ * Attaches by default: polls status + streams logs until the job finishes,
+ * then exits with the job's exit code. Pass --detach to return immediately.
  */
 export function parseRunArgs(args) {
   const flags = {};
@@ -17,350 +18,88 @@ export function parseRunArgs(args) {
     if (args[i] === '--image')          { flags.image = args[++i]; i++; continue; }
     if (args[i] === '--count')          { flags.count = parseInt(args[++i], 10); i++; continue; }
     if (args[i] === '--region')         { flags.region = args[++i]; i++; continue; }
-    if (args[i] === '--tier')           { flags.tier = args[++i]; i++; continue; }
     if (args[i] === '--max-price')      { flags.maxPrice = parseFloat(args[++i]); i++; continue; }
     if (args[i] === '--name')           { flags.name = args[++i]; i++; continue; }
-    if (args[i] === '--detach')          { flags.detach = true; i++; continue; }
-    if (args[i] === '--fallback')        { flags.fallback = args[++i]; i++; continue; }
-    if (args[i] === '--no-fallback')     { flags.noFallback = true; i++; continue; }
-    if (args[i] === '--max-runtime')     { flags.maxRuntime = parseFloat(args[++i]); i++; continue; }
-    if (args[i] === '--max-cost')        { flags.maxCost = parseFloat(args[++i]); i++; continue; }
+    if (args[i] === '--detach')         { flags.detach = true; i++; continue; }
     positional.push(args[i++]);
   }
   return { flags, positional };
 }
 
-function fmtRuntime(ms) {
-  const s = Math.round(ms / 1000);
-  if (s < 60) return `${s}s`;
-  const m = Math.floor(s / 60);
-  return `${m}m ${s % 60}s`;
-}
-
-const HEARTBEAT_WARN_POLLS  = 3;
-const HEARTBEAT_KILL_POLLS  = 15;
-
-export function classifyFailure(finalStatus, exitCode) {
-  if (finalStatus === 'failed' && (exitCode === null || exitCode === undefined)) return 'infrastructure';
-  if (exitCode !== null && exitCode !== undefined && exitCode !== 0) return 'customer_code';
-  return null;
-}
-
-// Lines the log stream never needs to print — we surface them in the status bar instead.
-const LOG_META_RE = /^\[dep-[^\]]+\] (status|gpu|region|endpoint|cost|receipt|provider_status|uptime)=/;
-
-// Extract structured values from provider status lines so we can show them nicely.
-function parseProviderLine(line) {
-  const gpuUtil  = line.match(/\bgpu_util=([\d.]+)%/);
-  const cpuUtil  = line.match(/\bcpu_util=([\d.]+)%/);
-  const ssh      = line.match(/\bssh=(\S+)/);
-  const provSt   = line.match(/\bprovider_status=(\S+)/);
-  return {
-    gpuUtil:  gpuUtil  ? parseFloat(gpuUtil[1])  : null,
-    cpuUtil:  cpuUtil  ? parseFloat(cpuUtil[1])  : null,
-    ssh:      ssh      ? ssh[1]                  : null,
-    providerStatus: provSt ? provSt[1]           : null,
-  };
-}
-
-function renderStatusBar(chalk, { elapsedMs, ratePerHour, gpuUtil, cpuUtil, maxRuntimeMs, maxCost }) {
-  const spent = ratePerHour * (elapsedMs / 3_600_000);
-  const parts = [`⏱ ${fmtRuntime(elapsedMs)}`];
-  if (ratePerHour > 0) parts.push(`$${spent.toFixed(4)} spent`);
-  if (gpuUtil !== null) parts.push(`GPU ${gpuUtil.toFixed(0)}%`);
-  if (cpuUtil !== null) parts.push(`CPU ${cpuUtil.toFixed(0)}%`);
-  if (maxRuntimeMs) {
-    const left = Math.max(0, maxRuntimeMs - elapsedMs);
-    parts.push(`${fmtRuntime(left)} left`);
-  }
-  if (maxCost && ratePerHour > 0) {
-    const budgetLeft = Math.max(0, maxCost - spent);
-    parts.push(`$${budgetLeft.toFixed(4)} budget left`);
-  }
-  parts.push('Ctrl+C to stop');
-  return chalk.dim('  ' + parts.join('  •  '));
-}
-
-// Wait for status to leave 'starting'/'queued'/'provisioning'.
-// This covers image pull time — runtime limit does NOT start until this returns.
-// Returns the final dep object with status 'running' or 'failed'.
-async function waitForRunning(config, depId, chalk) {
-  const POLL_MS     = 3000;
-  const TIMEOUT_MS  = 5 * 60 * 1000; // 5 min startup grace (image pull + container init)
-  const startMs     = Date.now();
-  const PHASES = [
-    { afterMs:     0, label: '  Starting container'    },
-    { afterMs: 15000, label: '  Pulling image'         },
-    { afterMs: 60000, label: '  Starting container'    },
-    { afterMs: 180000, label: '  Running command'      },
-  ];
-
-  let lastPhaseIdx = -1;
-  const STARTUP_STATES = new Set(['queued', 'provisioning', 'starting']);
+// Poll /v1/deployments/:id until terminal status, streaming new log lines.
+async function attachToJob(config, depId, chalk) {
+  const TERMINAL = new Set(['stopped', 'failed', 'completed']);
+  const POLL_MS  = 4000;
+  let seenLines  = 0;
+  let lastStatus = '';
 
-  const ticker = setInterval(() => {
-    const elapsed = Date.now() - startMs;
-    // Find the latest phase whose afterMs has been passed
-    let phaseIdx = 0;
-    for (let i = 0; i < PHASES.length; i++) {
-      if (elapsed >= PHASES[i].afterMs) phaseIdx = i;
-    }
-    if (phaseIdx !== lastPhaseIdx) {
-      process.stdout.write('\r\x1b[2K');
-      process.stdout.write(chalk.dim(PHASES[phaseIdx].label));
-      lastPhaseIdx = phaseIdx;
-    }
-    process.stdout.write('.');
-  }, 1000);
+  while (true) {
+    await new Promise(r => setTimeout(r, POLL_MS));
 
-  try {
-    while (Date.now() - startMs < TIMEOUT_MS) {
-      await new Promise(r => setTimeout(r, POLL_MS));
-      const dep = await callApi(`/deployments/${depId}`, {
+    // Fetch status
+    let dep;
+    try {
+      dep = await callApi(`/deployments/${depId}`, {
         apiKey: config.apiKey,
         baseUrl: config.baseUrl,
       });
-      if (!STARTUP_STATES.has(dep.status)) {
-        process.stdout.write('\n');
-        return dep;
-      }
+    } catch {
+      // transient network error — keep trying
+      continue;
     }
-  } finally {
-    clearInterval(ticker);
-    process.stdout.write('\n');
-  }
-
-  // Timed out — return last known state
-  return await callApi(`/deployments/${depId}`, { apiKey: config.apiKey, baseUrl: config.baseUrl });
-}
-
-async function attachToJob(config, depId, { chalk, maxRuntimeMs = null, maxCost = null, ratePerHour = 0, onTeardown }) {
-  const TERMINAL = new Set(['stopped', 'failed', 'completed', 'succeeded']);
-  const POLL_MS  = 4000;
-  let seenContent     = new Set();  // track by content, not index, to avoid reprinting stale lines
-  let lastStatus      = '';
-  let consecutiveErrs = 0;
-  let gpuUtil         = null;
-  let cpuUtil         = null;
-  let sshShown        = false;
-  let statusBarActive = false;
-  const startMs       = Date.now();
-
-  // Ticker: update status bar in place every second between polls.
-  let tickerInterval = null;
-  const startTicker = () => {
-    if (tickerInterval) return;
-    statusBarActive = true;
-    tickerInterval = setInterval(() => {
-      const bar = renderStatusBar(chalk, {
-        elapsedMs: Date.now() - startMs, ratePerHour, gpuUtil, cpuUtil, maxRuntimeMs, maxCost,
-      });
-      process.stdout.write(`\r${bar}   `);
-    }, 1000);
-  };
-  const stopTicker = () => {
-    if (tickerInterval) { clearInterval(tickerInterval); tickerInterval = null; }
-    if (statusBarActive) { process.stdout.write('\r\x1b[2K'); statusBarActive = false; } // clear line
-  };
-
-  let tearing = false;
-  const sigintHandler = () => {
-    if (tearing) return;
-    tearing = true;
-    stopTicker();
-    onTeardown('interrupted');
-  };
-  process.once('SIGINT', sigintHandler);
-
-  try {
-    while (true) {
-      await new Promise(r => setTimeout(r, POLL_MS));
-
-      const elapsedMs  = Date.now() - startMs;
-      const spentSoFar = ratePerHour * (elapsedMs / 3_600_000);
-
-      if (maxCost !== null && spentSoFar >= maxCost) {
-        tearing = true;
-        stopTicker();
-        await onTeardown('max-cost');
-        return { status: 'timeout', exitCode: null, runtimeMs: elapsedMs, failureType: null };
-      }
-
-      if (maxRuntimeMs !== null && elapsedMs >= maxRuntimeMs) {
-        tearing = true;
-        stopTicker();
-        await onTeardown('max-runtime');
-        return { status: 'timeout', exitCode: null, runtimeMs: elapsedMs, failureType: null };
-      }
-
-      let dep;
-      try {
-        dep = await callApi(`/deployments/${depId}`, {
-          apiKey: config.apiKey,
-          baseUrl: config.baseUrl,
-        });
-        consecutiveErrs = 0;
-      } catch {
-        consecutiveErrs++;
-        if (lastStatus === 'running') {
-          const lostSec = Math.round((consecutiveErrs * POLL_MS) / 1000);
-          if (consecutiveErrs === HEARTBEAT_WARN_POLLS) {
-            stopTicker();
-            console.log(chalk.yellow(`\n  ⚠ No heartbeat for ${lostSec}s — cloud machine may be unresponsive`));
-            startTicker();
-          } else if (consecutiveErrs >= HEARTBEAT_KILL_POLLS) {
-            tearing = true;
-            stopTicker();
-            await onTeardown('heartbeat-lost');
-            return { status: 'failed', exitCode: null, runtimeMs: elapsedMs, failureType: 'infrastructure' };
-          }
-        }
-        continue;
-      }
 
-      const status = dep.status;
-      if (status !== lastStatus) {
-        if (status === 'running' && lastStatus === 'provisioning') {
-          stopTicker();
-          console.log(chalk.dim('  [running]'));
-        }
-        lastStatus = status;
+    const status = dep.status;
+    if (status !== lastStatus) {
+      if (status === 'running' && lastStatus === 'provisioning') {
+        console.log(chalk.dim('  [running]'));
       }
+      lastStatus = status;
+    }
 
-      try {
-        const logData = await callApi(`/deployments/${depId}/logs`, {
-          apiKey: config.apiKey,
-          baseUrl: config.baseUrl,
-        });
-        const lines = logData?.logs ?? [];
-
-        for (const line of lines) {
-          // Extract structured provider values (gpu_util, ssh, etc.) from any line.
-          const parsed = parseProviderLine(line);
-          if (parsed.gpuUtil  !== null) gpuUtil = parsed.gpuUtil;
-          if (parsed.cpuUtil  !== null) cpuUtil = parsed.cpuUtil;
-
-          // Show SSH address once, prominently.
-          if (parsed.ssh && !sshShown) {
-            stopTicker();
-            console.log(`  ${chalk.bold('SSH:')}      ${chalk.cyan(parsed.ssh)}`);
-            sshShown = true;
-            startTicker();
-          }
-
-          // Skip lines we've already printed and pure metadata lines.
-          if (seenContent.has(line)) continue;
-          seenContent.add(line);
-          if (LOG_META_RE.test(line)) continue;
-          // Skip provider util lines — they're shown in the status bar instead.
-          if (/\b(gpu_util|cpu_util|provider_status|uptime)=/.test(line)) continue;
-
-          const isErrorLine = /^error\b/i.test(line) || /Error response from daemon/i.test(line);
-          stopTicker();
-          console.log(`  ${isErrorLine ? chalk.red(line) : chalk.dim(line)}`);
-          startTicker();
-        }
-      } catch {
-        // logs not ready yet
+    // Stream any new log lines
+    try {
+      const logData = await callApi(`/deployments/${depId}/logs`, {
+        apiKey: config.apiKey,
+        baseUrl: config.baseUrl,
+      });
+      const lines = logData?.logs ?? [];
+      for (let i = seenLines; i < lines.length; i++) {
+        console.log(`  ${chalk.dim(lines[i])}`);
       }
+      seenLines = lines.length;
+    } catch {
+      // logs not ready yet
+    }
 
-      // Start the ticker once the job is confirmed running.
-      if (status === 'running') startTicker();
-
-      if (TERMINAL.has(status)) {
-        stopTicker();
-        process.removeListener('SIGINT', sigintHandler);
-        const exitCode = dep.exit_code ?? null;
-        return {
-          status,
-          exitCode,
-          runtimeMs: Date.now() - startMs,
-          failureType: classifyFailure(status, exitCode),
-        };
-      }
+    if (TERMINAL.has(status)) {
+      return status;
     }
-  } finally {
-    stopTicker();
-    process.removeListener('SIGINT', sigintHandler);
   }
 }
 
-function askConfirm(prompt) {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise(resolve => rl.question(prompt, ans => { rl.close(); resolve(ans.trim()); }));
-}
-
 export async function runCommand(config, args, chalk) {
   const { flags, positional } = parseRunArgs(args);
 
   if (positional.length === 0 && !flags.image) {
-    console.error(chalk.red('Usage: badgr run <command...>'));
-    console.error(chalk.red('       badgr run --image my/image:latest'));
+    console.error(chalk.red('Usage: badgr run <command...> --gpu <type>'));
+    console.error(chalk.red('       badgr run --image my/image:latest --gpu A100'));
     return;
   }
 
   requireApiKey(config);
 
-  const command      = positional.length > 0 ? positional : undefined;
-  // Use alpine for trivial one-liners (7MB vs 50MB — much faster pull)
-  const cmdStr = command ? command.join(' ') : '';
-  const isSmoke = cmdStr.length < 80 && /print\s*\(|['"]hello/i.test(cmdStr);
-  const inferredImage = isSmoke ? 'python:3.11-alpine' : 'python:3.11-slim';
-  const image = flags.image || (command ? inferredImage : undefined);
-  const detach       = flags.detach || false;
-  const fallbackMode = flags.noFallback ? 'none' : (flags.fallback || 'closest');
-  const maxRuntimeMs = flags.maxRuntime ? flags.maxRuntime * 60 * 1000 : null;
-  const maxCost      = flags.maxCost ?? null;
-
-  // Tier 1 = managed routing (default). Tier 2 = marketplace routing, opt-in via --tier 2.
-  const effectiveTier = (flags.tier === '2' || flags.tier === 'tier2' || flags.tier === 'tier-2')
-    ? '2'
-    : (flags.tier || '1');
-
-  // ── Auto GPU selection (no --gpu specified) ────────────────────────────────
-  let gpu = flags.gpu ? flags.gpu.toUpperCase().replace('-', '_') : 'auto';
-
-  if (gpu === 'auto') {
-    console.log(chalk.bold('\n⚡ Running GPU job\n'));
-    if (command) console.log(`  ${chalk.bold('Command:')}  ${command.join(' ')}`);
-    if (image)   console.log(`  ${chalk.bold('Image:')}    ${image}`);
-    if (effectiveTier === '2') console.log(`  ${chalk.dim('(tier 2 — marketplace routing)')}`)
-    console.log();
-  } else {
-    // Specific GPU requested — show header
-    console.log(chalk.bold('\n⚡ Running GPU job\n'));
-    if (command) console.log(`  ${chalk.bold('Command:')}  ${command.join(' ')}`);
-    if (image)   console.log(`  ${chalk.bold('Image:')}    ${image}`);
-    console.log(`  ${chalk.bold('GPU:')}      ${gpu}`);
-    if (flags.maxRuntime) console.log(`  ${chalk.bold('Max runtime:')} ${flags.maxRuntime}min`);
-    if (maxCost)          console.log(`  ${chalk.bold('Max cost:')}    $${maxCost.toFixed(2)}`);
-    if (flags.maxPrice)   console.log(`  ${chalk.bold('Max price:')}   $${flags.maxPrice.toFixed(2)}/hr`);
-    if (detach)           console.log(`  ${chalk.dim('(detached — returns immediately)')}`);
-    console.log();
-
-    if (!detach && !flags.maxRuntime && !maxCost) {
-      console.log(chalk.dim('  Tip: add --max-runtime 60 or --max-cost 5.00 to cap spend automatically'));
-    }
-  }
-
-  console.log(chalk.dim('  Finding reliable capacity...'));
-  if (process.env.BADGR_DEBUG === '1' || process.env.BADGR_DEBUG === 'true') {
-    console.log(chalk.dim(`  API: ${config.baseUrl}`));
-  }
+  const command = positional.length > 0 ? positional : undefined;
+  const gpu     = flags.gpu || 'RTX_4090';
+  const image   = flags.image || (command ? 'python:3.11-slim' : undefined);
+  const detach  = flags.detach || false;
 
-  function buildBody(gpuOverride) {
-    const effectiveRegion = flags.region ? flags.region.toUpperCase() : undefined;
-    return {
-      command,
-      image,
-      gpu: (gpuOverride || gpu),
-      gpu_count: flags.count || 1,
-      ...(effectiveRegion ? { region: effectiveRegion } : {}),
-      max_price_per_hour: flags.maxPrice,
-      name: flags.name,
-      tier: effectiveTier,
-    };
-  }
+  console.log(chalk.bold('\n⚡ Running GPU job\n'));
+  if (command) console.log(`  ${chalk.bold('Command:')}  ${command.join(' ')}`);
+  if (image)   console.log(`  ${chalk.bold('Image:')}    ${image}`);
+  console.log(`  ${chalk.bold('GPU:')}      ${gpu}`);
+  if (detach)  console.log(`  ${chalk.dim('(detached — returns immediately)')}`);
+  console.log();
+  console.log(chalk.dim('  Finding best available GPU capacity...'));
 
   let dep;
   try {
@@ -368,104 +107,34 @@ export async function runCommand(config, args, chalk) {
       method: 'POST',
       apiKey: config.apiKey,
       baseUrl: config.baseUrl,
-      body: buildBody(),
+      body: {
+        command,
+        image,
+        gpu: gpu.toUpperCase().replace('-', '_'),
+        gpu_count: flags.count || 1,
+        region: flags.region || 'US',
+        max_price_per_hour: flags.maxPrice,
+        name: flags.name,
+      },
     });
   } catch (err) {
-    const d = err.errorData;
-    if (d?.code === 'NO_CAPACITY_MATCH') {
-      if (effectiveTier === '2') {
-        console.error(chalk.red('\n  ✗ No GPU capacity available right now on any provider.\n'));
-        console.error(chalk.dim('  Try `badgr capacity` to see what\'s available, or try again shortly.'));
-        process.exit(1);
-      }
-
-      // Tier 1 out of capacity — offer tier 2 marketplace routing.
-      if (process.stdin.isTTY) {
-        const answer = await askConfirm(
-          `\n  No tier 1 capacity available. Try tier 2 marketplace routing? [${chalk.bold('Enter')}/${chalk.bold('q')}]: `
-        );
-        if (answer.toLowerCase() === 'q') {
-          console.log(chalk.dim('\n  Cancelled.\n'));
-          process.exit(0);
-        }
-      } else {
-        console.log(chalk.dim('\n  No tier 1 capacity — trying tier 2 marketplace routing...\n'));
-      }
-
-      console.log(chalk.dim('  Searching tier 2 capacity...'));
-      try {
-        dep = await callApi('/run', {
-          method: 'POST',
-          apiKey: config.apiKey,
-          baseUrl: config.baseUrl,
-          body: { ...buildBody(), tier: '2' },
-        });
-      } catch (err2) {
-        const d2 = err2.errorData;
-        if (d2?.code === 'NO_CAPACITY_MATCH') {
-          console.error(chalk.red('\n  ✗ No GPU capacity available right now on any provider.\n'));
-          console.error(chalk.dim('  Try `badgr capacity` to see what\'s available, or try again shortly.'));
-        } else if (d2?.code === 'PROVISIONING_FAILED' || d2?.code === 'PROVIDER_ADAPTER_ERROR') {
-          console.error(chalk.red(`\n  ✗ Budget provider found capacity but could not start the machine. Please try again.\n`));
-          // (error detail kept below)
-          if (process.env.BADGR_DEBUG === '1' || process.env.BADGR_DEBUG === 'true') {
-            if (d2?.debug_error) console.error(chalk.dim(`  Provider detail: ${d2.debug_error}`));
-          } else {
-            console.error(chalk.dim(`  Run BADGR_DEBUG=1 badgr run … for a full trace.\n`));
-          }
-        } else {
-          console.error(chalk.red(`\n  ✗ Could not start job on tier 2: ${err2.message}\n`));
-          console.error(chalk.dim(`  Run BADGR_DEBUG=1 badgr run … for a full trace.`));
-        }
-        process.exit(1);
-      }
-    } else if (d?.code === 'PROVISIONING_FAILED' || d?.code === 'PROVIDER_ADAPTER_ERROR') {
-      if (d?.low_cost_provider_failed) {
-        console.error(chalk.red(`\n  ✗ Tier 2 unavailable. Tier 1 also unavailable. Try again shortly.\n`));
-      } else {
-        console.error(chalk.red(`\n  ✗ Badgr found ${gpu} capacity but could not start the machine. Please try again.\n`));
-      }
-      if (process.env.BADGR_DEBUG === '1' || process.env.BADGR_DEBUG === 'true') {
-        if (d?.debug_error) console.error(chalk.dim(`  Provider detail: ${d.debug_error}`));
-      } else {
-        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.`));
-      console.error(chalk.dim(`  Check config: badgr config\n`));
-      process.exit(1);
-    }
-  }
-
-  if (dep.provider_fallback_note === 'tier2_failed_using_tier1') {
-    console.log(chalk.yellow('  ℹ Tier 2 unavailable. Running on Tier 1 instead.\n'));
+    console.error(chalk.red(`\n  ✗ Job failed to start: ${err.message}\n`));
+    process.exit(1);
   }
 
   const rcptId = dep.receipt_id || generateReceiptId();
   addReceipt({
-    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(),
+    receiptId:    rcptId,
+    action:       'badgr run',
+    deploymentId: dep.deployment_id,
+    provider:     dep.provider,
+    gpu:          dep.gpu_type,
+    status:       dep.status,
+    createdAt:    new Date().toISOString(),
   });
 
-  console.log();
-  console.log(chalk.bold(`  Job ID:    ${chalk.cyan(dep.deployment_id)}`));
+  console.log(chalk.bold(`\n  Job ID:    ${chalk.cyan(dep.deployment_id)}`));
   console.log(`  ${chalk.bold('GPU:')}      ${dep.gpu_type} × ${dep.gpu_count}`);
-  if (dep.workload_desc) console.log(`  ${chalk.bold('Workload:')} ${dep.workload_desc}`);
-  if (dep.tier) console.log(`  ${chalk.bold('Tier:')}     ${dep.tier}`);
   if (dep.cost_per_hour > 0) console.log(`  ${chalk.bold('Rate:')}     $${dep.cost_per_hour.toFixed(2)}/hr`);
   console.log(`  ${chalk.bold('Receipt:')}  ${chalk.dim(rcptId)}`);
 
@@ -475,92 +144,18 @@ export async function runCommand(config, args, chalk) {
     return;
   }
 
-  // Wait through startup phases (queued → provisioning → starting → running).
-  // The max-runtime clock does NOT start until this returns — image pull time is free.
-  const STARTUP_STATES = new Set(['queued', 'provisioning', 'starting']);
-  if (STARTUP_STATES.has(dep.status)) {
-    console.log();
-    dep = await waitForRunning(config, dep.deployment_id, chalk);
-  }
-
-  if (dep.status === 'failed') {
-    console.error(chalk.red('\n  ✗ Container failed to start (infrastructure error).\n'));
-    console.error(chalk.dim('  The backend retried automatically. All attempts failed.'));
-    console.error(chalk.dim(`  Contact support with receipt ID: ${rcptId}`));
-    console.log();
-    process.exit(1);
-  }
-
-  const ratePerHour = dep.cost_per_hour || 0;
-  console.log(chalk.dim('\n  ── Running command (Ctrl+C to stop) ────────────────────────────\n'));
-
-  async function teardown(reason) {
-    const labels = {
-      'max-runtime':    chalk.yellow('\n  ⏱ Max runtime reached — stopping job...'),
-      'max-cost':       chalk.yellow('\n  💰 Spend cap reached — stopping job...'),
-      'heartbeat-lost': chalk.red('\n  ✗ No response from machine — stopping job...'),
-      'interrupted':    chalk.yellow('\n  Stopping job...'),
-    };
-    console.log(labels[reason] ?? chalk.yellow('\n  Stopping job...'));
-    try {
-      await terminateDeployment(config, dep.deployment_id);
-    } catch {
-      // best-effort
-    }
-    const runtimeMs = Date.now() - attachStart;
-    const finalCost = ratePerHour * (runtimeMs / 3_600_000);
-    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);
-  }
+  // ── Attached mode: stream logs until job completes ───────────────────────
+  console.log(chalk.dim('\n  ── Attaching (Ctrl+C to detach) ──────────────────────────────\n'));
 
-  const attachStart = Date.now();
-  const { status: finalStatus, exitCode, runtimeMs, failureType } = await attachToJob(config, dep.deployment_id, {
-    chalk,
-    maxRuntimeMs,
-    maxCost,
-    ratePerHour,
-    onTeardown: teardown,
-  });
+  const finalStatus = await attachToJob(config, dep.deployment_id, chalk);
 
   console.log();
 
-  const finalCost = ratePerHour * (runtimeMs / 3_600_000);
-  updateReceipt(rcptId, {
-    status:        finalStatus,
-    exitCode,
-    runtimeSeconds: Math.round(runtimeMs / 1000),
-    finalCost,
-    failureType,
-    teardownStatus: (finalStatus === 'completed' || finalStatus === 'succeeded') ? 'terminated' : 'failed',
-  });
-
-  console.log(`  ${chalk.bold('Runtime:')}  ${fmtRuntime(runtimeMs)}`);
-  if (ratePerHour > 0) {
-    console.log(`  ${chalk.bold('Cost:')}     $${finalCost.toFixed(4)}  (${chalk.dim(`$${ratePerHour.toFixed(2)}/hr`)})`);
-  }
-  if (exitCode !== null && exitCode !== undefined) {
-    console.log(`  ${chalk.bold('Exit code:')} ${exitCode !== 0 ? chalk.red(exitCode) : chalk.green(exitCode)}`);
-  }
-  console.log(`  ${chalk.bold('Receipt:')}  ${chalk.dim(rcptId)}`);
-
-  if (finalStatus === 'failed' || (exitCode !== null && exitCode !== 0)) {
-    if (failureType === 'infrastructure') {
-      console.error(chalk.red(`\n  ✗ Machine failure — this is not your code.\n`));
-      console.error(chalk.dim('  Contact support with your receipt ID for a refund.'));
-    } else {
-      console.error(chalk.red(`\n  ✗ Job failed (exit ${exitCode ?? 'unknown'})\n`));
-      console.error(chalk.dim(`  Check logs: badgr logs ${dep.deployment_id}`));
-    }
-    console.log();
-    process.exit(exitCode ?? 1);
-  } else if ((finalStatus === 'completed' || finalStatus === 'succeeded') && (exitCode === 0 || exitCode === null)) {
-    try {
-      await terminateDeployment(config, dep.deployment_id);
-    } catch { /* already stopped */ }
-    console.log(chalk.green(`\n  ✓ Complete`));
-    console.log(chalk.dim(`  Billing ended`));
-    console.log();
+  if (finalStatus === 'failed') {
+    console.error(chalk.red(`\n  ✗ Job failed (${dep.deployment_id})\n`));
+    console.error(chalk.dim(`  Logs: badgr logs ${dep.deployment_id}\n`));
+    process.exit(1);
+  } else {
+    console.log(chalk.green(`\n  ✓ Job complete (${finalStatus})\n`));
   }
 }