badgr-cli 1.1.0 → 1.1.2

package/LICENSE

@@ -0,0 +1,207 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship made available under
+      the License, as indicated by a copyright notice that is included in
+      or attached to the work (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean, as submitted to the Licensor for inclusion
+      in the Work by the copyright owner or by an individual or Legal Entity
+      authorized to submit on behalf of the copyright owner. For the purposes
+      of this definition, "submitted" means any form of electronic, verbal,
+      or written communication sent to the Licensor or its representatives,
+      including but not limited to communication on electronic mailing lists,
+      source code control systems, and issue tracking systems that are managed
+      by, or on behalf of, the Licensor for the purpose of discussing and
+      improving the Work, but excluding communication that is conspicuously
+      marked or designated in writing by the copyright owner as "Not a
+      Contribution."
+
+      "Contributor" shall mean Licensor and any Legal Entity on behalf of
+      whom a Contribution has been received by the Licensor and included
+      within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by the combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a cross-claim
+      or counterclaim in a lawsuit) alleging that the Work or any
+      Contribution embodied within the Work constitutes direct or
+      contributory patent infringement, then any patent licenses granted to
+      You under this License for that Work shall terminate as of the date
+      such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or Derivative
+          Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, You must include a readable copy of the
+          attribution notices contained within such NOTICE file, in
+          at least one of the following places: within a NOTICE text
+          file distributed as part of the Derivative Works; within
+          the Source form or documentation, if provided along with the
+          Derivative Works; or, within a display generated by the
+          Derivative Works, if and wherever such third-party notices
+          normally appear. The contents of the NOTICE file are for
+          informational purposes only and do not modify the License.
+          You may add Your own attribution notices within Derivative
+          Works that You distribute, alongside or as an addendum to
+          the NOTICE text from the Work, provided that such additional
+          attribution notices cannot be construed as modifying the License.
+
+      You may add Your own license statement for Your modifications and
+      may provide additional grant of rights to use, copy, modify, merge,
+      publish, distribute, sublicense, and/or sell copies of the Work,
+      and to permit persons to whom the Work is furnished to do so,
+      subject to the following conditions:
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or reproducing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or exemplary damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or all other
+      commercial damages or losses), even if such Contributor has been
+      advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may offer such
+      conditions only on Your own behalf and on Your sole responsibility,
+      not on behalf of any other Contributor, and only if You agree to
+      indemnify, defend, and hold each Contributor harmless for any
+      liability incurred by, or claims asserted against, such Contributor
+      by reason of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the format in use. Please also include a
+      "NOTICE" file as part of the distribution with the contents:
+
+         Copyright [yyyy] [name of copyright owner]
+
+         Licensed under the Apache License, Version 2.0 (the "License");
+         you may not use this file except in compliance with the License.
+         You may obtain a copy of the License at
+
+             http://www.apache.org/licenses/LICENSE-2.0
+
+         Unless required by applicable law or agreed to in writing, software
+         distributed under the License is distributed on an "AS IS" BASIS,
+         WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+         See the License for the specific language governing permissions and
+         limitations under the License.
+
+   Copyright 2024 AI Badgr
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -1,5 +1,10 @@
 # badgr-cli
 
+[![npm version](https://img.shields.io/npm/v/badgr-cli.svg)](https://www.npmjs.com/package/badgr-cli)
+[![npm downloads](https://img.shields.io/npm/dm/badgr-cli.svg)](https://www.npmjs.com/package/badgr-cli)
+[![license](https://img.shields.io/npm/l/badgr-cli.svg)](https://github.com/michaelmanly/badgr-cli/blob/main/LICENSE)
+[![node](https://img.shields.io/node/v/badgr-cli.svg)](https://www.npmjs.com/package/badgr-cli)
+
 Badgr supports many GPU workloads through two commands: `serve` for persistent endpoints, `run` for jobs.
 
 > **Safety promise:** every run has `--max-cost`, live logs, automatic teardown, and a receipt. Run `badgr down <id>` any time to stop billing immediately.
@@ -8,6 +13,8 @@ Badgr supports many GPU workloads through two commands: `serve` for persistent e
 npm install -g badgr-cli
 ```
 
+**Jump to:** [Quick start](#quick-start) · [Coding agents (`badgr launch`)](#coding--testing-agents-badgr-launch) · [Image generation](#also-try-image-generation) · [`badgr doctor`](#something-not-working-badgr-doctor) · [Commands](#commands) · [`serve` options](#badgr-serve-options) · [`run` options](#badgr-run-options) · [Receipts](#receipts) · [OpenAI compatibility](#openai-compatibility) · [GPU options](#gpu-options) · [Advanced](#advanced) · [Requirements](#requirements)
+
 ---
 
 ## Quick start
@@ -36,6 +43,76 @@ badgr receipts
 
 ---
 
+## Coding & testing agents: `badgr launch`
+
+Run a coding agent or a test suite on a CPU VM with one command — no image, source, or `--max-cost` required for the four built-in workloads. Three separate things are going on here, worth keeping straight: **which agent CLI** runs (`cline`, `claude`, `codex`, `playwright`), **who pays for model usage** (Badgr, or your own Anthropic/OpenAI account), and **who provisions the VM and runs the command** (always Badgr).
+
+```bash
+badgr launch cline "Fix the checkout bug"       # Badgr provides model access — no account to connect
+badgr launch claude "Fix the checkout bug"      # runs Claude Code — connect your Anthropic account
+badgr launch codex "Write tests"                # runs the Codex CLI — connect your OpenAI account
+badgr launch playwright "Test the checkout flow" # no model account involved at all
+```
+
+**Authentication model:**
+
+| Workload | CLI that runs | Who pays for model usage |
+|----------|---------------|---------------------------|
+| `cline` | Cline | Badgr provides and pays for model access |
+| `claude` | Claude Code | Your Anthropic account — Badgr only provides the VM |
+| `codex` | Codex CLI | Your OpenAI/ChatGPT account — Badgr only provides the VM |
+| `playwright` | Playwright | No model account required |
+
+Installing/running the `claude` or `codex` CLI doesn't by itself give a disposable Badgr VM model access — the CLI still needs to authenticate, and a VM's sign-in doesn't inherit from your laptop. `badgr launch claude`/`badgr launch codex` prompt inline the first time to connect your account and store it for next time; `cline` and `playwright` need nothing. Each workload picks its own VM size automatically (`small`, or `browser` for playwright's preinstalled Chromium) — override with `--size small|medium|browser`. A $2 default `--max-cost` applies unless you pass your own.
+
+Today, "connect your account" means securely storing an API key (`ANTHROPIC_API_KEY` / `OPENAI_API_KEY`) — both Claude Code and the Codex CLI also support signing in via a Claude.ai/ChatGPT account, and a future version of `badgr connect` may add that OAuth flow instead of a pasted key; the one-time-connection UX is the same either way.
+
+```bash
+badgr connect anthropic --key sk-ant-...   # connect your Anthropic account ahead of time (optional — badgr launch prompts inline if missing)
+badgr connect                              # list what's already connected
+badgr connect anthropic --remove           # disconnect
+```
+
+Retrieve results after a run finishes:
+
+```bash
+badgr pull <deployment-id>          # pull a code-editing agent's patch as a local git diff/branch
+badgr artifacts <deployment-id>     # download everything else — test reports, screenshots, traces
+```
+
+### Advanced escape hatch — any other command
+
+For anything beyond the four built-in workloads, run an arbitrary command on a CPU VM the same way `badgr run` does for GPU jobs:
+
+```bash
+badgr launch . --max-cost 1 -- npm test
+badgr launch https://github.com/user/repo --max-cost 1 -- python narrgo.py
+```
+
+Everything before `--` is a `badgr launch` flag; everything after `--` is passed to your command verbatim, including anything that looks like a flag (`badgr launch . -- claude --max-cost 1` sends `--max-cost 1` to `claude`, not to Badgr). The default runner image has no Node.js/npm — use `--image <image>` for anything that needs it.
+
+| Flag | Default | Description |
+|------|---------|-------------|
+| `--cmd "<command>"` | — | Quoted command form, equivalent to `-- <command>` |
+| `--image <image>` | CPU runtime default | Custom image instead of the default |
+| `--detach` / `--no-detach` | detach | `launch` detaches by default; `--no-detach` streams logs and waits |
+| `--env KEY=VALUE` | — | Environment variable (repeatable) — Badgr warns if a value looks like a secret |
+| `--artifacts <path>` | — | Extra path to capture and upload (repeatable), e.g. `--artifacts playwright-report`. Retrieve with `badgr artifacts <id>` |
+| `--max-cost <$>` | `$2` | Auto-stop when spend reaches this amount |
+| `--max-runtime <min>` | 60 | Auto-stop after N minutes |
+| `--region US\|EU\|AU` | — | Region preference |
+| `--size small\|medium\|browser` | per-workload default | VM class override |
+
+### `badgr task` — a labeled launch
+
+```bash
+badgr task "Run the Chromium tests and tell me what failed" --max-cost 1 -- npm run test:chromium
+```
+
+A thin wrapper over `badgr launch . -- <command>` — the description is printed for the human and otherwise discarded; the receipt and `badgr status` still key off the deployment ID like any other launch.
+
+---
+
 ## Also try: image generation
 
 ```bash
@@ -78,7 +155,7 @@ badgr doctor --json
 ```
 
 Run `badgr doctor --help` for the full flag list. Details in
-[`docs/gpu-doctor.md`](../../docs/gpu-doctor.md).
+[`docs/gpu-doctor.md`](https://github.com/michaelmanly/gpu-ai/blob/main/docs/gpu-doctor.md).
 
 ---
 
@@ -86,11 +163,16 @@ Run `badgr doctor --help` for the full flag list. Details in
 
 ```text
 login
+connect
 doctor
 run
+launch
+task
 serve
 status
 logs
+pull
+artifacts
 down
 receipts
 test
@@ -99,16 +181,21 @@ test
 | Command | What it does |
 |---------|-------------|
 | `badgr login` | Save API key to `~/.badgr/config.json` |
+| `badgr connect <provider>` | Store a provider credential (`anthropic`, `openai`) for `badgr launch` |
 | `badgr doctor` | Diagnose a GPU workload failure — read-only, no login needed |
 | `badgr run <command>` | Run a one-off GPU job (any container command) |
+| `badgr launch cline\|claude\|codex\|playwright "<task>"` | Run a coding/testing agent on a CPU VM — image + command auto-selected |
+| `badgr task "<desc>" -- <command>` | Label + launch — thin wrapper over `badgr launch . -- <command>` |
 | `badgr serve <model>` | Start a persistent OpenAI-compatible endpoint |
 | `badgr status` | Show what's running and what's billing |
 | `badgr logs <id>` | Fetch log output from a deployment |
+| `badgr pull <id>` | Pull a code-editing agent's patch as a local git diff/branch |
+| `badgr artifacts <id>` | Download non-patch outputs (test reports, screenshots, traces) |
 | `badgr down <id>` | Terminate a deployment — stops billing immediately |
 | `badgr receipts [n]` | Cost, route, and retry receipts (default 10) |
 | `badgr test` | Run an end-to-end test (provision → run → teardown) |
 
-More commands below, under [Advanced](#advanced): `comfyui`, `train`, `transcribe`, `embed`, `workload`, `workspace`, `capacity`, `billing`.
+More commands below, under [Advanced](#advanced): `comfyui`, `train`, `transcribe`, `embed`, `workload`, `workspace`, `batch`, `sbatch`, `capacity`, `billing`.
 
 `badgr serve` — for anything that needs a persistent endpoint: LLM serving, embeddings, image generation APIs, transcription APIs.
 
@@ -304,7 +391,7 @@ Badgr Auto selects the best eligible GPU for your workload. Add `--gpu <type>` o
 | A100 | NVIDIA A100 | 40–80 GB | Training, inference |
 | H100 | NVIDIA H100 | 80 GB | Large model training |
 
-Additional GPU types may be routable depending on current capacity — check with `badgr capacity`. Pricing is confirmed before provisioning; use `--dry-run` to see it first. Full GPU support details: see [NOTES.md](../../NOTES.md#gpu-support) in the repo root.
+Additional GPU types may be routable depending on current capacity — check with `badgr capacity`. Pricing is confirmed before provisioning; use `--dry-run` to see it first. Full GPU support details: see [NOTES.md](https://github.com/michaelmanly/gpu-ai/blob/main/NOTES.md#gpu-support).
 
 ---
 
@@ -407,6 +494,51 @@ badgr workspace list
 badgr workspace delete my-project
 ```
 
+### `badgr batch` — generic containerized batch jobs
+
+```bash
+badgr batch run workload.yml
+badgr batch status dep-abc123
+badgr batch artifacts dep-abc123
+badgr batch receipt dep-abc123
+badgr batch compare dep-abc123 dep-def456
+```
+
+For CV/video/scientific batch, simulation, and physical-AI eval workloads — runs a container from a `workload.yml` spec and captures output artifacts automatically.
+
+**Fan-out** — run the same program once per file in a directory, one deployment per input, in parallel:
+
+```bash
+badgr batch run workload.yml --fan-out ./scenarios
+badgr batch run workload.yml --fan-out ./scenarios --max-concurrency 10
+badgr batch run workload.yml --fan-out ./scenarios --only failed1.json,failed2.json
+```
+
+`workload.yml` must declare exactly one `inputs:` entry (the path that varies per task).
+
+| Flag | Default | Description |
+|------|---------|-------------|
+| `--fan-out <dir>` | — | Run once per file in this directory instead of a single job |
+| `--max-concurrency <n>` | 5 | Cap in-flight fan-out deployments |
+| `--only <f1,f2>` | — | Rerun just the named input files |
+| `--dry-run` | — | Preview the batch/fan-out plan without provisioning |
+
+### `badgr sbatch` — existing Slurm scripts
+
+```bash
+badgr sbatch job.slurm
+badgr sbatch job.slurm --dry-run
+badgr sbatch array_job.slurm              # #SBATCH --array=1-100 fans out into one deployment per task
+badgr sbatch array_job.slurm --max-concurrency 10
+```
+
+Translates `--cpus-per-task`/`--mem`/`--gres`/`--time`/`--export` from a real `.slurm` file. `#SBATCH --array=...` directives fan out into bounded-concurrency deployments the same way `batch run --fan-out` does; unsupported directives (`--partition`, `--qos`, `--account`) print a visible warning but don't block translation of the rest.
+
+| Flag | Default | Description |
+|------|---------|-------------|
+| `--max-concurrency <n>` | 5 | Cap in-flight array tasks |
+| `--dry-run` | — | Preview the translated job without provisioning |
+
 ### Other commands
 
 - `badgr capacity [--gpu <type>]` — check available GPU capacity right now

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badgr-cli",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Badgr — run or serve GPU workloads from one command",
   "type": "module",
   "bin": {
@@ -24,6 +24,14 @@
   "engines": {
     "node": ">=20.10.0"
   },
+  "homepage": "https://aibadgr.com",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/michaelmanly/badgr-cli.git"
+  },
+  "bugs": {
+    "url": "https://github.com/michaelmanly/badgr-cli/issues"
+  },
   "keywords": [
     "gpu",
     "cli",
@@ -31,11 +39,45 @@
     "compute",
     "gateway",
     "openai",
+    "openai-compatible",
     "workload",
     "workspace",
     "llm",
     "inference",
-    "fine-tuning"
+    "fine-tuning",
+    "lora",
+    "vllm",
+    "gpu-cloud",
+    "cloud-gpu",
+    "gpu-rental",
+    "on-demand-gpu",
+    "serverless-gpu",
+    "gpu-provisioning",
+    "machine-learning",
+    "deep-learning",
+    "model-serving",
+    "model-training",
+    "training",
+    "huggingface",
+    "cuda",
+    "h100",
+    "a100",
+    "rtx-4090",
+    "coding-agent",
+    "ai-agent",
+    "claude-code",
+    "codex",
+    "playwright",
+    "comfyui",
+    "stable-diffusion",
+    "image-generation",
+    "transcription",
+    "whisper",
+    "embeddings",
+    "slurm",
+    "batch-jobs",
+    "devops",
+    "mlops"
   ],
   "license": "Apache-2.0"
 }

package/src/api.js

@@ -153,6 +153,22 @@ export function quoteRun(config, body) {
   });
 }
 
+// Live, no-provisioning price/capacity check for a GPU dry-run preview (see
+// backend run_serve_routes.py's GET /v1/capacity/suggestions). Used by every
+// GPU-provisioning command's --dry-run to show a real observed rate instead
+// of just the requested config — callers must treat a failure here as
+// non-fatal (best-effort) and never let it block or delay the dry-run.
+export function getCapacityPreview(config, { gpu, region, maxPrice } = {}) {
+  const params = new URLSearchParams({ gpu: gpu || 'RTX_4090' });
+  if (region) params.set('region', region);
+  if (maxPrice != null) params.set('max_price', String(maxPrice));
+  return callApi(`/capacity/suggestions?${params}`, {
+    apiKey: config.apiKey,
+    baseUrl: config.baseUrl,
+    timeoutMs: 8_000,
+  });
+}
+
 export function serveModel(config, body) {
   return callApi('/serve', {
     method: 'POST',

package/src/badgr.js

@@ -37,7 +37,7 @@ const HELP = `
 ${chalk.bold('badgr')} — run or serve GPU workloads from one command
 
 ${chalk.bold('COMMANDS')}
-  ${chalk.cyan('badgr login')}               Authenticate with your API key
+  ${chalk.cyan('badgr login')}               Open a browser to log in (or: badgr login --key <value>)
   ${chalk.cyan('badgr connect <provider>')}  Credential setup (badgr connect anthropic/openai) — also prompted inline by badgr launch if missing
   ${chalk.cyan('badgr detect <path>')}       Inspect a project and report the GPU job Badgr would run
   ${chalk.cyan('badgr run <command>')}       Run a one-off GPU job
@@ -265,7 +265,7 @@ async function main() {
   }
 
   switch (cmd) {
-    case 'login':    return loginCommand(chalk, saveConfig);
+    case 'login':    return loginCommand(chalk, saveConfig, rest);
     case 'connect':  return connectCommand(rest, chalk);
     case 'detect':   return detectCommand(config, rest, chalk);
     case 'run':      return runCommand(config, rest, chalk);

package/src/commands/batch.js

@@ -25,6 +25,7 @@ import { monitorBatchJob, fmtRuntime } from '../batch.js';
 import { runFanOut, DEFAULT_CONCURRENCY } from '../fanout.js';
 import { uploadBlob } from '../api.js';
 import { downloadAndExtractArtifact } from '../artifactDownload.js';
+import { printCapacityPreview, formatTierLabel } from '../progress.js';
 import { logsCommand } from './logs.js';
 
 // Server-side watchdog / batch.js reason strings, mapped to the vocabulary
@@ -240,17 +241,21 @@ async function runFanOutSubcommand(config, spec, flags, chalk, yamlPath) {
   const [{ containerPath }] = spec.inputs;
   const effectiveTier = normalizeTier(flags.tier);
   const concurrency = flags.maxConcurrency ?? DEFAULT_CONCURRENCY;
+  const resolvedGpu = flags.gpu ? flags.gpu.toUpperCase().replace(/-/g, '_') : 'AUTO';
 
   console.log(chalk.bold(`\n📦 Batch fan-out: ${spec.name}\n`));
   console.log(`  ${chalk.bold('Image:')}        ${spec.image}`);
   console.log(`  ${chalk.bold('Command:')}      ${spec.command.join(' ')}`);
   console.log(`  ${chalk.bold('Inputs dir:')}   ${fanOutDir} (${files.length} task(s), max ${Math.min(concurrency, files.length)} concurrent)`);
+  console.log(`  ${chalk.bold('GPU:')}          ${resolvedGpu}`);
+  console.log(`  ${chalk.bold('Tier:')}         ${formatTierLabel(effectiveTier)}`);
   console.log(`  ${chalk.bold('Max cost:')}     $${spec.maxCost.toFixed(2)} per task`);
   console.log(`  ${chalk.bold('Max runtime:')}  ${spec.maxRuntimeMinutes}min per task`);
   console.log();
 
   if (flags.dryRun) {
     console.log(chalk.bold(`⚡ Dry run — no GPU will be provisioned (${files.length} task(s) would be submitted)\n`));
+    await printCapacityPreview(chalk, config, { gpu: resolvedGpu, region: flags.region?.toUpperCase() });
     return;
   }
 
@@ -402,9 +407,14 @@ async function runSubcommand(config, args, chalk) {
     return runFanOutSubcommand(config, spec, flags, chalk, yamlPath);
   }
 
+  const resolvedGpu = flags.gpu ? flags.gpu.toUpperCase().replace(/-/g, '_') : 'AUTO';
+  const previewTier = normalizeTier(flags.tier);
+
   console.log(chalk.bold(`\n📦 Batch: ${spec.name}\n`));
   console.log(`  ${chalk.bold('Image:')}        ${spec.image}`);
   console.log(`  ${chalk.bold('Command:')}      ${spec.command.join(' ')}`);
+  console.log(`  ${chalk.bold('GPU:')}          ${resolvedGpu}`);
+  console.log(`  ${chalk.bold('Tier:')}         ${formatTierLabel(previewTier)}`);
   console.log(`  ${chalk.bold('Max cost:')}     $${spec.maxCost.toFixed(2)}`);
   console.log(`  ${chalk.bold('Max runtime:')}  ${spec.maxRuntimeMinutes}min`);
   if (spec.inputs.length)  console.log(`  ${chalk.bold('Inputs:')}       ${spec.inputs.length} path(s)`);
@@ -413,6 +423,7 @@ async function runSubcommand(config, args, chalk) {
 
   if (flags.dryRun) {
     console.log(chalk.bold('⚡ Dry run — no GPU will be provisioned\n'));
+    await printCapacityPreview(chalk, config, { gpu: resolvedGpu, region: flags.region?.toUpperCase() });
     return;
   }