badgr-cli 1.0.28 → 1.0.29

package/package.json

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

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

@@ -450,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();
@@ -506,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);
@@ -525,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)}`);