badgr-cli 1.1.0 → 1.1.2

package/tests/productized-dry-run.test.js

@@ -1,141 +0,0 @@
-/**
- * --dry-run for the productized runner commands (badgr train lora, badgr comfyui batch).
- *
- * Both must preview the request (preset/workflow, GPU, cost) without calling the API,
- * uploading files, or requiring an API key — mirroring the existing `badgr run --dry-run`
- * and `badgr up --dry-run` behavior.
- */
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { trainLoraCommand, parseTrainLoraArgs } from '../src/commands/train.js';
-import { comfyBatchCommand, parseComfyBatchArgs } from '../src/commands/comfyui.js';
-
-vi.mock('../src/api.js', () => ({
-  callApi: vi.fn(),
-}));
-
-vi.mock('../src/store.js', () => ({
-  addReceipt:        vi.fn(),
-  generateReceiptId: vi.fn(() => 'rcpt-dry-001'),
-}));
-
-vi.mock('fs', async (importOriginal) => {
-  const actual = await importOriginal();
-  return {
-    ...actual,
-    readFileSync: vi.fn(),
-    existsSync:   vi.fn(),
-  };
-});
-
-import * as api   from '../src/api.js';
-import * as store from '../src/store.js';
-import * as fs    from 'fs';
-
-const chalk = {
-  bold: s => s, dim: s => s, red: s => s, yellow: s => s, green: s => s, cyan: s => s,
-};
-
-const config = { apiKey: 'sk-test', baseUrl: 'https://api.test/v1' };
-
-beforeEach(() => {
-  process.exitCode = undefined;
-  vi.spyOn(console, 'log').mockImplementation(() => {});
-  vi.spyOn(console, 'error').mockImplementation(() => {});
-  vi.clearAllMocks();
-});
-
-afterEach(() => {
-  vi.restoreAllMocks();
-  process.exitCode = undefined;
-});
-
-describe('parseTrainLoraArgs', () => {
-  it('parses --dry-run', () => {
-    const flags = parseTrainLoraArgs(['--base-model', 'x', '--dry-run']);
-    expect(flags.dryRun).toBe(true);
-  });
-});
-
-describe('trainLoraCommand --dry-run', () => {
-  it('previews the job without calling the API or requiring an API key', async () => {
-    await trainLoraCommand({ apiKey: null, baseUrl: 'https://api.test/v1' }, [
-      '--base-model', 'mistralai/Mistral-7B-v0.1',
-      '--dataset', 'https://example.com/data.jsonl',
-      '--dry-run',
-    ], chalk);
-
-    expect(api.callApi).not.toHaveBeenCalled();
-    expect(store.addReceipt).not.toHaveBeenCalled();
-    expect(process.exitCode).toBeFalsy();
-    const logged = console.log.mock.calls.flat().join('\n');
-    expect(logged).toContain('Dry run');
-    expect(logged).toContain('mistralai/Mistral-7B-v0.1');
-    expect(logged).toContain('RTX_4090'); // default 'small' preset GPU
-  });
-
-  it('does not upload a local dataset file during --dry-run', async () => {
-    fs.existsSync.mockReturnValue(true);
-    fs.readFileSync.mockReturnValue('dummy');
-    const fetchSpy = vi.spyOn(globalThis, 'fetch').mockResolvedValue({ ok: true, json: async () => ({ upload_id: 'up_x' }) });
-
-    await trainLoraCommand(config, [
-      '--base-model', 'mistralai/Mistral-7B-v0.1',
-      '--dataset', './local.jsonl',
-      '--dry-run',
-    ], chalk);
-
-    expect(fetchSpy).not.toHaveBeenCalled();
-    fetchSpy.mockRestore();
-  });
-
-  it('still requires --base-model even with --dry-run', async () => {
-    await trainLoraCommand(config, ['--dry-run'], chalk);
-    expect(process.exitCode).toBe(1);
-  });
-
-  it('flags an unknown preset instead of silently accepting it', async () => {
-    await trainLoraCommand(config, [
-      '--base-model', 'mistralai/Mistral-7B-v0.1',
-      '--preset', 'huge',
-      '--dry-run',
-    ], chalk);
-    const logged = console.log.mock.calls.flat().join('\n');
-    expect(logged).toContain('unknown');
-  });
-});
-
-describe('parseComfyBatchArgs', () => {
-  it('parses --dry-run', () => {
-    const flags = parseComfyBatchArgs(['--workflow', 'sdxl-basic', '--dry-run']);
-    expect(flags.dryRun).toBe(true);
-  });
-});
-
-describe('comfyBatchCommand --dry-run', () => {
-  it('previews the batch without calling the API or requiring an API key', async () => {
-    await comfyBatchCommand({ apiKey: null, baseUrl: 'https://api.test/v1' }, [
-      '--workflow', 'sdxl-basic',
-      '--prompt', 'a cat on a beach',
-      '--dry-run',
-    ], chalk);
-
-    expect(api.callApi).not.toHaveBeenCalled();
-    expect(store.addReceipt).not.toHaveBeenCalled();
-    expect(process.exitCode).toBeFalsy();
-    const logged = console.log.mock.calls.flat().join('\n');
-    expect(logged).toContain('Dry run');
-    expect(logged).toContain('sdxl-basic');
-    expect(logged).toContain('RTX_4090');
-  });
-
-  it('warns when the prompt count exceeds the 20-prompt cap', async () => {
-    const flags = { workflow: 'sdxl-basic', inlinePrompts: Array(21).fill('x') };
-    await comfyBatchCommand({ apiKey: null, baseUrl: 'https://api.test/v1' }, [
-      '--workflow', 'sdxl-basic',
-      ...Array(21).fill(['--prompt', 'x']).flat(),
-      '--dry-run',
-    ], chalk);
-    const logged = console.log.mock.calls.flat().join('\n');
-    expect(logged).toContain('exceeds the 20-prompt limit');
-  });
-});

package/tests/productized-runners.test.js

@@ -1,237 +0,0 @@
-/**
- * Productized runner tests
- *
- * Covers:
- *   - Blessed vLLM aliases expand to full model ID + correct GPU
- *   - serveCommand sends full model ID to API when alias is given
- *   - BLESSED_VLLM_MODELS has required fields
- *   - BLESSED_COMFY_WORKFLOWS has required fields
- */
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { parseServeArgs, serveCommand } from '../src/commands/serve.js';
-import { BLESSED_VLLM_MODELS, BLESSED_COMFY_WORKFLOWS } from '../src/catalog.js';
-
-// ── Module mocks ──────────────────────────────────────────────────────────────
-
-vi.mock('../src/api.js', () => ({
-  callApi:             vi.fn(),
-  terminateDeployment: vi.fn().mockResolvedValue({}),
-  listDeployments:     vi.fn().mockResolvedValue({ deployments: [], count: 0 }),
-}));
-
-vi.mock('../src/store.js', () => ({
-  addDeployment:        vi.fn(),
-  addReceipt:           vi.fn(),
-  updateReceipt:        vi.fn(),
-  generateReceiptId:    vi.fn(() => 'rcpt-prod-001'),
-  generateDeploymentId: vi.fn(() => 'dep-prod-001'),
-  listDeployments:      vi.fn(() => []),
-  listReceipts:         vi.fn(() => []),
-  findDeployment:       vi.fn(() => null),
-  updateDeployment:     vi.fn(),
-  removeDeployment:     vi.fn(),
-}));
-
-vi.mock('../src/fallback.js', () => ({
-  normalizeTier:         vi.fn(t => t || null),
-  callWithFallback:      vi.fn(),
-  HIGH_RATE_THRESHOLD:   2.0,
-}));
-
-vi.mock('../src/config.js', () => ({
-  requireApiKey: vi.fn(),
-}));
-
-vi.mock('../src/errors.js', () => ({
-  formatCliError: vi.fn((code, ctx) => `Error: ${code}`),
-}));
-
-import * as fallback from '../src/fallback.js';
-
-// ── Helpers ───────────────────────────────────────────────────────────────────
-
-const config = { apiKey: 'sk-test', baseUrl: 'https://api.test/v1' };
-
-const chalk = {
-  bold:   s => s,
-  dim:    s => s,
-  red:    s => s,
-  yellow: s => s,
-  green:  s => s,
-  cyan:   s => s,
-};
-
-function makeServeDep(overrides = {}) {
-  return {
-    deployment_id: 'dep-prod-001',
-    status:        'running',
-    gpu_type:      'RTX_4090',
-    gpu_count:     1,
-    cost_per_hour: 1.20,
-    provider:      'runpod',
-    receipt_id:    'rcpt-prod-001',
-    tier:          '1',
-    endpoint_url:  'https://dep-prod-001.aibadgr.com/v1',
-    ...overrides,
-  };
-}
-
-beforeEach(() => {
-  vi.clearAllMocks();
-  process.exitCode = undefined;
-  vi.spyOn(console, 'log').mockImplementation(() => {});
-  vi.spyOn(console, 'error').mockImplementation(() => {});
-  vi.spyOn(process.stdout, 'write').mockImplementation(() => {});
-});
-
-// ── Catalog shape tests ───────────────────────────────────────────────────────
-
-describe('BLESSED_VLLM_MODELS catalog', () => {
-  it('has qwen-7b, llama-8b, qwen-coder-7b', () => {
-    expect(Object.keys(BLESSED_VLLM_MODELS)).toEqual(
-      expect.arrayContaining(['qwen-7b', 'llama-8b', 'qwen-coder-7b'])
-    );
-  });
-
-  it('each entry has model_id, gpu_type, image, health_path', () => {
-    for (const [alias, spec] of Object.entries(BLESSED_VLLM_MODELS)) {
-      expect(spec.model_id, `${alias}.model_id`).toBeTruthy();
-      expect(spec.gpu_type, `${alias}.gpu_type`).toBeTruthy();
-      expect(spec.image,    `${alias}.image`).toBeTruthy();
-      expect(spec.health_path, `${alias}.health_path`).toBeTruthy();
-    }
-  });
-
-  it('qwen-7b resolves to Qwen2.5-7B-Instruct on RTX_4090', () => {
-    const spec = BLESSED_VLLM_MODELS['qwen-7b'];
-    expect(spec.model_id).toBe('Qwen/Qwen2.5-7B-Instruct');
-    expect(spec.gpu_type).toBe('RTX_4090');
-  });
-
-  it('llama-8b resolves to Llama-3.1-8B-Instruct on RTX_4090', () => {
-    const spec = BLESSED_VLLM_MODELS['llama-8b'];
-    expect(spec.model_id).toBe('meta-llama/Llama-3.1-8B-Instruct');
-    expect(spec.gpu_type).toBe('RTX_4090');
-  });
-
-  it('qwen-coder-7b resolves to Qwen2.5-Coder-7B-Instruct on RTX_4090', () => {
-    const spec = BLESSED_VLLM_MODELS['qwen-coder-7b'];
-    expect(spec.model_id).toBe('Qwen/Qwen2.5-Coder-7B-Instruct');
-    expect(spec.gpu_type).toBe('RTX_4090');
-  });
-});
-
-describe('BLESSED_COMFY_WORKFLOWS catalog', () => {
-  it('has sdxl-basic', () => {
-    expect(BLESSED_COMFY_WORKFLOWS['sdxl-basic']).toBeDefined();
-  });
-
-  it('sdxl-basic has gpu_type and output_type', () => {
-    const wf = BLESSED_COMFY_WORKFLOWS['sdxl-basic'];
-    expect(wf.gpu_type).toBe('RTX_4090');
-    expect(wf.output_type).toBe('images');
-  });
-
-  it('has flux-basic with gpu_type and output_type', () => {
-    const wf = BLESSED_COMFY_WORKFLOWS['flux-basic'];
-    expect(wf).toBeDefined();
-    expect(wf.gpu_type).toBe('RTX_4090');
-    expect(wf.output_type).toBe('images');
-  });
-});
-
-// ── parseServeArgs alias recognition ─────────────────────────────────────────
-
-describe('parseServeArgs — alias handling', () => {
-  it('passes alias through as positional model', () => {
-    const { model } = parseServeArgs(['qwen-7b', '--max-cost', '10']);
-    expect(model).toBe('qwen-7b');
-  });
-
-  it('alias is distinct from full model ID in parseServeArgs', () => {
-    const { model: alias } = parseServeArgs(['qwen-7b']);
-    const { model: full }  = parseServeArgs(['Qwen/Qwen2.5-7B-Instruct']);
-    expect(alias).toBe('qwen-7b');
-    expect(full).toBe('Qwen/Qwen2.5-7B-Instruct');
-  });
-});
-
-// ── serveCommand alias expansion ──────────────────────────────────────────────
-
-describe('serveCommand — alias expansion', () => {
-  it('sends full model_id to API when alias qwen-7b is used', async () => {
-    fallback.callWithFallback.mockResolvedValue(makeServeDep({
-      model: 'Qwen/Qwen2.5-7B-Instruct',
-    }));
-    // Mock fetch for health check (immediate pass)
-    global.fetch = vi.fn().mockResolvedValue({ ok: true });
-
-    await serveCommand(config, ['qwen-7b', '--max-cost', '10', '--no-wait'], chalk);
-
-    expect(fallback.callWithFallback).toHaveBeenCalled();
-    const bodyFn = fallback.callWithFallback.mock.calls[0][2];
-    const body = bodyFn(null);
-    expect(body.model).toBe('Qwen/Qwen2.5-7B-Instruct');
-    expect(body.gpu).toBe('RTX_4090');
-  });
-
-  it('sends full model_id to API when alias llama-8b is used', async () => {
-    fallback.callWithFallback.mockResolvedValue(makeServeDep({
-      model: 'meta-llama/Llama-3.1-8B-Instruct',
-    }));
-    global.fetch = vi.fn().mockResolvedValue({ ok: true });
-
-    await serveCommand(config, ['llama-8b', '--max-cost', '10', '--no-wait'], chalk);
-
-    const bodyFn = fallback.callWithFallback.mock.calls[0][2];
-    const body = bodyFn(null);
-    expect(body.model).toBe('meta-llama/Llama-3.1-8B-Instruct');
-    expect(body.gpu).toBe('RTX_4090');
-  });
-
-  it('sends full model_id to API when alias qwen-coder-7b is used', async () => {
-    fallback.callWithFallback.mockResolvedValue(makeServeDep({
-      model: 'Qwen/Qwen2.5-Coder-7B-Instruct',
-    }));
-    global.fetch = vi.fn().mockResolvedValue({ ok: true });
-
-    await serveCommand(config, ['qwen-coder-7b', '--max-cost', '5', '--no-wait'], chalk);
-
-    const bodyFn = fallback.callWithFallback.mock.calls[0][2];
-    const body = bodyFn(null);
-    expect(body.model).toBe('Qwen/Qwen2.5-Coder-7B-Instruct');
-    expect(body.gpu).toBe('RTX_4090');
-  });
-
-  it('passes full model ID unchanged (no alias lookup)', async () => {
-    fallback.callWithFallback.mockResolvedValue(makeServeDep({
-      model: 'meta-llama/Llama-3.1-70B-Instruct',
-      gpu_type: 'H100',
-    }));
-    global.fetch = vi.fn().mockResolvedValue({ ok: true });
-
-    await serveCommand(config, ['meta-llama/Llama-3.1-70B-Instruct', '--max-cost', '20', '--gpu', 'H100', '--no-wait'], chalk);
-
-    const bodyFn = fallback.callWithFallback.mock.calls[0][2];
-    const body = bodyFn(null);
-    expect(body.model).toBe('meta-llama/Llama-3.1-70B-Instruct');
-    expect(body.gpu).toBe('H100');
-  });
-
-  it('rejects --max-cost missing for alias (same as non-alias)', async () => {
-    await serveCommand(config, ['qwen-7b'], chalk);
-    expect(process.exitCode).toBe(1);
-    expect(fallback.callWithFallback).not.toHaveBeenCalled();
-  });
-
-  it('alias auto-sets RTX_4090 but --gpu flag overrides it', async () => {
-    fallback.callWithFallback.mockResolvedValue(makeServeDep({ gpu_type: 'L40S' }));
-    global.fetch = vi.fn().mockResolvedValue({ ok: true });
-
-    await serveCommand(config, ['qwen-7b', '--max-cost', '10', '--gpu', 'L40S', '--no-wait'], chalk);
-
-    const bodyFn = fallback.callWithFallback.mock.calls[0][2];
-    const body = bodyFn(null);
-    expect(body.gpu).toBe('L40S');
-  });
-});

package/tests/pull.test.js

@@ -1,266 +0,0 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import fs from 'fs';
-import { changedFilesFromPatch, intersectFiles, parsePullArgs, localChangedFiles } from '../src/commands/pull.js';
-
-describe('localChangedFiles', () => {
-  function fakeGit(stdout) {
-    return () => ({ status: 0, stdout, stderr: '' });
-  }
-
-  it('parses an unstaged modification (leading-space status code)', () => {
-    // Regression: a naive .trim() on the line eats this leading status
-    // space and shifts the fixed-width slice, corrupting the filename.
-    expect(localChangedFiles(fakeGit(' M src/checkout.ts\n'))).toEqual(['src/checkout.ts']);
-  });
-
-  it('parses a staged modification (trailing-space status code)', () => {
-    expect(localChangedFiles(fakeGit('M  src/checkout.ts\n'))).toEqual(['src/checkout.ts']);
-  });
-
-  it('parses an untracked file', () => {
-    expect(localChangedFiles(fakeGit('?? new-file.txt\n'))).toEqual(['new-file.txt']);
-  });
-
-  it('parses a rename, keeping only the destination path', () => {
-    expect(localChangedFiles(fakeGit('R  old-name.txt -> new-name.txt\n'))).toEqual(['new-name.txt']);
-  });
-
-  it('parses multiple changed files, sorted', () => {
-    expect(localChangedFiles(fakeGit(' M b.txt\n?? a.txt\n'))).toEqual(['a.txt', 'b.txt']);
-  });
-
-  it('returns an empty array for a clean worktree', () => {
-    expect(localChangedFiles(fakeGit(''))).toEqual([]);
-  });
-
-  it('throws when git status fails', () => {
-    const failing = () => ({ status: 1, stdout: '', stderr: 'not a git repository' });
-    expect(() => localChangedFiles(failing)).toThrow('not a git repository');
-  });
-});
-
-describe('badgr pull helpers', () => {
-  it('parses deployment id and safety flags', () => {
-    expect(parsePullArgs(['dep-123', '--branch'])).toEqual({ deploymentId: 'dep-123', flags: { branch: true, diffOnly: false, yes: false } });
-    expect(parsePullArgs(['dep-123', '--diff-only'])).toEqual({ deploymentId: 'dep-123', flags: { branch: false, diffOnly: true, yes: false } });
-  });
-
-  it('parses --yes and -y as the same flag', () => {
-    expect(parsePullArgs(['dep-123', '--yes']).flags.yes).toBe(true);
-    expect(parsePullArgs(['dep-123', '-y']).flags.yes).toBe(true);
-  });
-
-  it('defaults all safety flags to false when only the id is given', () => {
-    expect(parsePullArgs(['dep-123'])).toEqual({ deploymentId: 'dep-123', flags: { branch: false, diffOnly: false, yes: false } });
-  });
-
-  it('returns undefined deploymentId when no positional arg is given', () => {
-    expect(parsePullArgs(['--branch']).deploymentId).toBeUndefined();
-  });
-
-  it('extracts changed files from a git patch and detects conflicts', () => {
-    const patch = ['diff --git a/src/a.js b/src/a.js', '--- a/src/a.js', '+++ b/src/a.js', 'diff --git a/new.txt b/new.txt', '--- /dev/null', '+++ b/new.txt'].join('\n');
-    expect(changedFilesFromPatch(patch)).toEqual(['new.txt', 'src/a.js']);
-    expect(intersectFiles(['new.txt', 'src/a.js'], ['src/a.js', 'README.md'])).toEqual(['src/a.js']);
-  });
-
-  it('extracts changed files from a patch that only adds new files', () => {
-    const patch = ['diff --git a/new.txt b/new.txt', '--- /dev/null', '+++ b/new.txt'].join('\n');
-    expect(changedFilesFromPatch(patch)).toEqual(['new.txt']);
-  });
-
-  it('returns an empty conflict list when nothing overlaps', () => {
-    expect(intersectFiles(['a.js', 'b.js'], ['c.js'])).toEqual([]);
-  });
-});
-
-// Configurable per-test behavior — set inside each test before calling
-// pullCommand, since vi.mock factories are hoisted and evaluated once.
-let gitBehavior = {};
-let tarWriteBehavior = () => {};
-
-function resetGitBehavior() {
-  gitBehavior = {
-    revParse: () => ({ status: 0, stdout: 'true\n', stderr: '' }),
-    status: () => ({ status: 0, stdout: '', stderr: '' }),
-    checkout: () => ({ status: 0, stdout: '', stderr: '' }),
-    applyCheck: () => ({ status: 0, stdout: '', stderr: '' }),
-    apply: () => ({ status: 0, stdout: '', stderr: '' }),
-  };
-}
-
-vi.mock('child_process', () => ({
-  spawnSync: vi.fn((cmd, args) => {
-    if (args[0] === 'rev-parse') return gitBehavior.revParse();
-    if (args[0] === 'status') return gitBehavior.status();
-    if (args[0] === 'checkout') return gitBehavior.checkout(args);
-    if (args[0] === 'apply' && args[1] === '--check') return gitBehavior.applyCheck(args);
-    if (args[0] === 'apply') return gitBehavior.apply(args);
-    return { status: 0, stdout: '', stderr: '' };
-  }),
-}));
-
-vi.mock('tar', () => {
-  const x = vi.fn(async opts => tarWriteBehavior(opts));
-  return { default: { x }, x };
-});
-
-function writeNonPatchArtifact({ cwd }) {
-  fs.mkdirSync(`${cwd}/test-results`, { recursive: true });
-  fs.writeFileSync(`${cwd}/test-results/output.txt`, 'ok');
-}
-
-function writePatchArtifact(patchText) {
-  return ({ cwd }) => {
-    fs.writeFileSync(`${cwd}/badgr-agent.patch`, patchText);
-  };
-}
-
-const CLEAN_PATCH = [
-  'diff --git a/src/checkout.ts b/src/checkout.ts',
-  '--- a/src/checkout.ts',
-  '+++ b/src/checkout.ts',
-  '@@ -1 +1 @@',
-  '-old',
-  '+new',
-].join('\n');
-
-describe('pullCommand', () => {
-  const config = { apiKey: 'test-key', baseUrl: 'https://example.test/v1' };
-  const chalk = { red: s => s, dim: s => s, green: s => s, yellow: s => s };
-
-  beforeEach(() => {
-    process.exitCode = undefined;
-    resetGitBehavior();
-    tarWriteBehavior = writeNonPatchArtifact;
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
-    vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
-    global.fetch = vi.fn().mockResolvedValue({
-      ok: true,
-      arrayBuffer: async () => new ArrayBuffer(8),
-    });
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-    process.exitCode = undefined;
-    delete global.fetch;
-  });
-
-  it('prints a usage error and exits 1 when no deployment id is given', async () => {
-    const { pullCommand } = await import('../src/commands/pull.js');
-    await pullCommand(config, [], chalk);
-    expect(process.exitCode).toBe(1);
-    expect(console.error).toHaveBeenCalled();
-  });
-
-  it('errors when not run inside a git worktree', async () => {
-    gitBehavior.revParse = () => ({ status: 0, stdout: 'false\n', stderr: '' });
-    const { pullCommand } = await import('../src/commands/pull.js');
-    await pullCommand(config, ['dep-abc'], chalk);
-    expect(process.exitCode).toBe(1);
-    const logged = console.error.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(logged).toContain('git worktree');
-  });
-
-  it('reports a download failure clearly', async () => {
-    global.fetch = vi.fn().mockResolvedValue({ ok: false, status: 404, statusText: 'Not Found', text: async () => '' });
-    const { pullCommand } = await import('../src/commands/pull.js');
-    await pullCommand(config, ['dep-missing'], chalk);
-    expect(process.exitCode).toBe(1);
-    const logged = console.error.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(logged).toContain('Could not pull dep-missing');
-  });
-
-  it('points to `badgr artifacts <id>` instead of erroring when there is no code patch', async () => {
-    const { pullCommand } = await import('../src/commands/pull.js');
-    await pullCommand(config, ['dep-test-001'], chalk);
-
-    expect(process.exitCode).toBeUndefined();
-    const logged = console.log.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(logged).toContain('badgr artifacts dep-test-001');
-    expect(logged).toContain('nothing to apply');
-  });
-
-  it('applies cleanly when there are no local conflicts', async () => {
-    tarWriteBehavior = writePatchArtifact(CLEAN_PATCH);
-    gitBehavior.status = () => ({ status: 0, stdout: '', stderr: '' }); // no local changes at all
-
-    const { pullCommand } = await import('../src/commands/pull.js');
-    await pullCommand(config, ['dep-clean-001'], chalk);
-
-    expect(process.exitCode).toBeUndefined();
-    const logged = console.log.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(logged).toContain('Applied cloud changes from dep-clean-001');
-    expect(logged).toContain('src/checkout.ts');
-  });
-
-  it('refuses to overwrite when local edits conflict, without --branch', async () => {
-    tarWriteBehavior = writePatchArtifact(CLEAN_PATCH);
-    gitBehavior.status = () => ({ status: 0, stdout: ' M src/checkout.ts\n', stderr: '' });
-
-    const { pullCommand } = await import('../src/commands/pull.js');
-    await pullCommand(config, ['dep-conflict-001'], chalk);
-
-    expect(process.exitCode).toBe(1);
-    const logged = console.error.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(logged).toContain('conflict with local edits');
-    expect(logged).toContain('src/checkout.ts');
-    expect(logged).toContain('--branch');
-  });
-
-  it('applies on a new branch when --branch is passed despite conflicts', async () => {
-    tarWriteBehavior = writePatchArtifact(CLEAN_PATCH);
-    gitBehavior.status = () => ({ status: 0, stdout: ' M src/checkout.ts\n', stderr: '' });
-    const checkoutSpy = vi.fn(() => ({ status: 0, stdout: '', stderr: '' }));
-    gitBehavior.checkout = checkoutSpy;
-
-    const { pullCommand } = await import('../src/commands/pull.js');
-    await pullCommand(config, ['dep-conflict-002', '--branch'], chalk);
-
-    expect(process.exitCode).toBeUndefined();
-    expect(checkoutSpy).toHaveBeenCalledWith(['checkout', '-b', 'badgr/dep-conflict-002']);
-    const logged = console.log.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(logged).toContain('Created branch badgr/dep-conflict-002');
-    expect(logged).toContain('Applied cloud changes from dep-conflict-002');
-  });
-
-  it('--diff-only prints the raw patch and does not apply anything', async () => {
-    tarWriteBehavior = writePatchArtifact(CLEAN_PATCH);
-    gitBehavior.status = () => ({ status: 0, stdout: ' M src/checkout.ts\n', stderr: '' });
-
-    const { pullCommand } = await import('../src/commands/pull.js');
-    await pullCommand(config, ['dep-diff-001', '--diff-only'], chalk);
-
-    expect(process.exitCode).toBeUndefined();
-    expect(process.stdout.write).toHaveBeenCalledWith(CLEAN_PATCH);
-    const logged = console.log.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(logged).not.toContain('Applied cloud changes');
-  });
-
-  it('surfaces a clear error when the patch does not apply cleanly', async () => {
-    tarWriteBehavior = writePatchArtifact(CLEAN_PATCH);
-    gitBehavior.status = () => ({ status: 0, stdout: '', stderr: '' });
-    gitBehavior.applyCheck = () => ({ status: 1, stdout: '', stderr: 'patch does not apply' });
-
-    const { pullCommand } = await import('../src/commands/pull.js');
-    await pullCommand(config, ['dep-bad-patch'], chalk);
-
-    expect(process.exitCode).toBe(1);
-    const logged = console.error.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(logged).toContain('patch does not apply');
-  });
-
-  it('accepts --yes alongside --branch without changing the outcome', async () => {
-    tarWriteBehavior = writePatchArtifact(CLEAN_PATCH);
-    gitBehavior.status = () => ({ status: 0, stdout: ' M src/checkout.ts\n', stderr: '' });
-
-    const { pullCommand } = await import('../src/commands/pull.js');
-    await pullCommand(config, ['dep-conflict-003', '--branch', '--yes'], chalk);
-
-    expect(process.exitCode).toBeUndefined();
-    const logged = console.log.mock.calls.map(c => c.join(' ')).join('\n');
-    expect(logged).toContain('Applied cloud changes from dep-conflict-003');
-  });
-});