@pleri/olam-cli 0.1.12 → 0.1.14

package/dist/commands/__tests__/upgrade.rollback.test.js

@@ -0,0 +1,275 @@
+/**
+ * Phase 2b — verifies B1 (--rollback) + B2 (--force) + B3 (--no-cache) + B4 (drift refusal).
+ *
+ * Mix of:
+ *   - vi.spyOn unit tests for the parseUpgradeOpts shape (B1/B2/B3 flags).
+ *   - Real docker integration tests for performRollbackSwap + checkRollbackSetExists.
+ *   - Source-text invariants for the drift refusal at swap boundary (B4).
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.rollback.test.ts`
+ */
+import { describe, it, expect, beforeAll, afterAll, beforeEach } from 'vitest';
+import { spawnSync } from 'node:child_process';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { parseUpgradeOpts, performRollbackSwap, checkRollbackSetExists, imageExists, } from '../upgrade.js';
+function dockerAvailable() {
+    const result = spawnSync('docker', ['version', '--format', '{{.Server.Version}}'], {
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+    });
+    return result.status === 0;
+}
+const HAS_DOCKER = dockerAvailable();
+function findRepoRoot(start) {
+    let dir = start;
+    for (let i = 0; i < 10; i++) {
+        if (fs.existsSync(path.join(dir, 'packages', 'host-cp', 'compose.yaml')))
+            return dir;
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    throw new Error(`Could not find repo root from ${start}`);
+}
+const REPO_ROOT = findRepoRoot(process.cwd());
+const FIXTURE_DIR = path.join(REPO_ROOT, 'tests', 'fixtures', 'atomic-swap');
+const UPGRADE_TS = path.join(REPO_ROOT, 'packages', 'cli', 'src', 'commands', 'upgrade.ts');
+const TAG_PREFIX = `olam-test-rollback-${process.pid}`;
+const TEST_PLAN = [
+    {
+        transient: `${TAG_PREFIX}-a:olam-next`,
+        canonical: `${TAG_PREFIX}-a:local`,
+        rollback: `${TAG_PREFIX}-a:olam-rollback`,
+    },
+    {
+        transient: `${TAG_PREFIX}-b:olam-next`,
+        canonical: `${TAG_PREFIX}-b:latest`,
+        rollback: `${TAG_PREFIX}-b:olam-rollback`,
+    },
+    {
+        transient: `${TAG_PREFIX}-c:olam-next`,
+        canonical: `${TAG_PREFIX}-c:latest`,
+        rollback: `${TAG_PREFIX}-c:olam-rollback`,
+    },
+];
+const ALL_TEST_TAGS = TEST_PLAN.flatMap((p) => [p.transient, p.canonical, p.rollback]);
+function buildFixtureImage(tag, labelValue) {
+    const result = spawnSync('docker', [
+        'build',
+        '--quiet',
+        '--build-arg', `LABEL_VAL=${labelValue}`,
+        '--tag', tag,
+        '--file', path.join(FIXTURE_DIR, 'Dockerfile.template'),
+        FIXTURE_DIR,
+    ], { stdio: ['ignore', 'pipe', 'pipe'], encoding: 'utf-8' });
+    return result.status === 0;
+}
+function bakedSha(tag) {
+    const result = spawnSync('docker', ['inspect', '--format', '{{index .Config.Labels "olam_build_sha"}}', tag], { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] });
+    if (result.status !== 0)
+        return null;
+    return (result.stdout ?? '').trim();
+}
+function cleanupTestImages() {
+    for (const tag of ALL_TEST_TAGS) {
+        spawnSync('docker', ['rmi', '-f', tag], { stdio: ['ignore', 'ignore', 'ignore'] });
+    }
+}
+beforeAll(() => {
+    if (!HAS_DOCKER)
+        return;
+    cleanupTestImages();
+}, 30_000);
+afterAll(() => {
+    if (!HAS_DOCKER)
+        return;
+    cleanupTestImages();
+}, 30_000);
+beforeEach(() => {
+    if (!HAS_DOCKER)
+        return;
+    cleanupTestImages();
+});
+// ── B1 — parseUpgradeOpts surface ──────────────────────────────────
+describe('parseUpgradeOpts — Phase 2b flags', () => {
+    it('parses --rollback / --force / --no-cache correctly', () => {
+        const opts = parseUpgradeOpts({
+            yes: true,
+            rollback: true,
+            force: true,
+            noCache: true,
+        });
+        expect(opts.rollback).toBe(true);
+        expect(opts.force).toBe(true);
+        expect(opts.noCache).toBe(true);
+        expect(opts.yes).toBe(true);
+    });
+    it('defaults Phase 2b flags to false when absent', () => {
+        const opts = parseUpgradeOpts({ yes: true });
+        expect(opts.rollback).toBe(false);
+        expect(opts.force).toBe(false);
+        expect(opts.noCache).toBe(false);
+    });
+});
+// ── B1 — checkRollbackSetExists pre-flight ──────────────────────────
+describe('checkRollbackSetExists — pre-flight (real docker)', () => {
+    it.skipIf(!HAS_DOCKER)('returns null when ALL three :olam-rollback tags exist', () => {
+        const SHA = '1111111111111111111111111111111111111111';
+        for (const p of TEST_PLAN) {
+            expect(buildFixtureImage(p.rollback, SHA)).toBe(true);
+        }
+        expect(checkRollbackSetExists(TEST_PLAN)).toBeNull();
+    }, 60_000);
+    it.skipIf(!HAS_DOCKER)('returns missing tag list when any :olam-rollback is absent', () => {
+        const SHA = '2222222222222222222222222222222222222222';
+        // Build only first 2 rollback tags; third is missing.
+        expect(buildFixtureImage(TEST_PLAN[0].rollback, SHA)).toBe(true);
+        expect(buildFixtureImage(TEST_PLAN[1].rollback, SHA)).toBe(true);
+        const missing = checkRollbackSetExists(TEST_PLAN);
+        expect(missing).not.toBeNull();
+        expect(missing).toContain(TEST_PLAN[2].rollback);
+    }, 60_000);
+    it.skipIf(!HAS_DOCKER)('returns ALL three when no :olam-rollback exists (first-upgrade case)', () => {
+        const missing = checkRollbackSetExists(TEST_PLAN);
+        expect(missing).not.toBeNull();
+        for (const p of TEST_PLAN) {
+            expect(missing).toContain(p.rollback);
+        }
+    });
+});
+describe('imageExists', () => {
+    it.skipIf(!HAS_DOCKER)('returns true for an existing image', () => {
+        const SHA = '3333333333333333333333333333333333333333';
+        expect(buildFixtureImage(TEST_PLAN[0].canonical, SHA)).toBe(true);
+        expect(imageExists(TEST_PLAN[0].canonical)).toBe(true);
+    }, 60_000);
+    it.skipIf(!HAS_DOCKER)('returns false for a non-existent image', () => {
+        expect(imageExists(`${TAG_PREFIX}-does-not-exist:nope`)).toBe(false);
+    });
+});
+// ── B1 — performRollbackSwap (the inverse swap) ───────────────────
+describe('performRollbackSwap — inverse atomic 3-tag swap (real docker)', () => {
+    it.skipIf(!HAS_DOCKER)('restores canonical from :olam-rollback for all three images', () => {
+        const PRIOR_SHA = '4444444444444444444444444444444444444444';
+        const BROKEN_SHA = '5555555555555555555555555555555555555555';
+        // Setup: canonical at BROKEN_SHA (current broken state); :olam-rollback
+        // at PRIOR_SHA (last-good captured by previous successful upgrade).
+        for (const p of TEST_PLAN) {
+            expect(buildFixtureImage(p.canonical, BROKEN_SHA)).toBe(true);
+            expect(buildFixtureImage(p.rollback, PRIOR_SHA)).toBe(true);
+        }
+        const result = performRollbackSwap(TEST_PLAN);
+        expect(result.ok).toBe(true);
+        expect(result.results.length).toBe(3);
+        for (const r of result.results) {
+            expect(r.ok).toBe(true);
+        }
+        expect(result.summary).toContain('Rolled back');
+        // Post-state: canonical now at PRIOR_SHA (from :olam-rollback).
+        for (const p of TEST_PLAN) {
+            expect(bakedSha(p.canonical)).toBe(PRIOR_SHA);
+            // :olam-rollback unchanged (rollback is non-destructive on the source).
+            expect(bakedSha(p.rollback)).toBe(PRIOR_SHA);
+        }
+    }, 60_000);
+    it.skipIf(!HAS_DOCKER)('partial-failure: returns ok=false when any :olam-rollback is missing', () => {
+        const PRIOR_SHA = '6666666666666666666666666666666666666666';
+        // Setup: only first :olam-rollback exists.
+        expect(buildFixtureImage(TEST_PLAN[0].rollback, PRIOR_SHA)).toBe(true);
+        const result = performRollbackSwap(TEST_PLAN);
+        expect(result.ok).toBe(false);
+        expect(result.summary).toContain('PARTIAL rollback');
+        expect(result.results[0].ok).toBe(true); // first succeeded
+        expect(result.results[1].ok).toBe(false); // second failed (no source)
+        expect(result.results[2].ok).toBe(false);
+    }, 60_000);
+});
+// ── B4 — drift refusal at swap boundary (source-text) ──────────────
+describe('Phase 2b — drift refusal at swap boundary (B4)', () => {
+    let body;
+    it('reads upgrade.ts source', () => {
+        body = fs.readFileSync(UPGRADE_TS, 'utf-8');
+    });
+    it('captures HEAD SHA at swap boundary AFTER the build loop', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        // The drift check must call captureHeadSha AFTER the build loop completes.
+        const buildLoopIdx = body.indexOf('for (const step of buildScripts');
+        const driftCheckIdx = body.indexOf('swapBoundarySha = captureHeadSha');
+        expect(buildLoopIdx).toBeGreaterThan(0);
+        expect(driftCheckIdx).toBeGreaterThan(buildLoopIdx);
+    });
+    it('refuses with exit 1 when HEAD drifted and --force is NOT set', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        const driftMatch = body.match(/HEAD drifted during build window:[\s\S]*?process\.exitCode\s*=\s*1/);
+        expect(driftMatch).not.toBeNull();
+        expect(driftMatch[0]).toContain('--force');
+    });
+    it('drift check guarded by !opts.force (B2 bypass)', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        expect(body).toMatch(/swapBoundarySha\s*!==\s*_targetSha\s*&&\s*!opts\.force/);
+    });
+});
+// ── B3 — --no-cache passthrough (source-text) ──────────────────────
+describe('Phase 2b — --no-cache passthrough (B3)', () => {
+    let body;
+    it('reads upgrade.ts source', () => {
+        body = fs.readFileSync(UPGRADE_TS, 'utf-8');
+    });
+    it('forwards DOCKER_BUILD_NO_CACHE=1 to build script env when opts.noCache', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        expect(body).toMatch(/if\s*\(opts\.noCache\)\s*\{\s*olamTagEnv\.DOCKER_BUILD_NO_CACHE\s*=\s*['"]1['"]/);
+    });
+});
+// ── handleRollback wired into commander (source-text) ──────────────
+describe('Phase 2b — handleRollback wired in handleUpgrade dispatch', () => {
+    let body;
+    it('reads upgrade.ts source', () => {
+        body = fs.readFileSync(UPGRADE_TS, 'utf-8');
+    });
+    it('handleUpgrade early-returns to handleRollback when opts.rollback', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        // Look for the dispatch in handleUpgrade.
+        const handleUpgradeStart = body.indexOf('async function handleUpgrade(');
+        const dispatchMatch = body.slice(handleUpgradeStart).match(/if\s*\(opts\.rollback\)\s*\{\s*return\s+await\s+handleRollback\(\);?\s*\}/);
+        expect(dispatchMatch).not.toBeNull();
+    });
+    it('handleRollback acquires the same upgrade lock as the upgrade path', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        const fnStart = body.indexOf('async function handleRollback');
+        expect(fnStart).toBeGreaterThan(0);
+        const fnBody = body.slice(fnStart, fnStart + 3000); // 3KB window covers the function
+        expect(fnBody).toMatch(/acquireLock\(/);
+        expect(fnBody).toMatch(/releaseLock\(/);
+    });
+    it('handleRollback pre-flights checkRollbackSetExists before any retag', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        const fnStart = body.indexOf('async function handleRollback');
+        const fnBody = body.slice(fnStart, fnStart + 3000);
+        const preflightIdx = fnBody.indexOf('checkRollbackSetExists');
+        const swapIdx = fnBody.indexOf('performRollbackSwap');
+        expect(preflightIdx).toBeGreaterThan(0);
+        expect(swapIdx).toBeGreaterThan(preflightIdx);
+    });
+});
+// ── commander registration (source-text) ───────────────────────────
+describe('registerUpgrade — Phase 2b flags exposed', () => {
+    let body;
+    it('reads upgrade.ts source', () => {
+        body = fs.readFileSync(UPGRADE_TS, 'utf-8');
+    });
+    it('declares --rollback option', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        expect(body).toMatch(/\.option\(\s*['"]--rollback['"]/);
+    });
+    it('declares --force option', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        expect(body).toMatch(/\.option\(\s*['"]--force['"]/);
+    });
+    it('declares --no-cache option', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        expect(body).toMatch(/\.option\(\s*['"]--no-cache['"]/);
+    });
+});
+//# sourceMappingURL=upgrade.rollback.test.js.map

package/dist/commands/__tests__/upgrade.rollback.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade.rollback.test.js","sourceRoot":"","sources":["../../../src/commands/__tests__/upgrade.rollback.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/__tests__/upgrade.sha-capture.test.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Unit tests for `olam upgrade` HEAD SHA capture (Phase 2a — A2).
+ *
+ * Verifies:
+ *   - captureHeadSha returns a 40-char lowercase-hex SHA for a real git repo.
+ *   - captureHeadSha returns null when `git rev-parse HEAD` fails (non-repo cwd).
+ *   - abbreviateSha returns the first 8 chars.
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.sha-capture.test.ts`
+ */
+export {};
+//# sourceMappingURL=upgrade.sha-capture.test.d.ts.map

package/dist/commands/__tests__/upgrade.sha-capture.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade.sha-capture.test.d.ts","sourceRoot":"","sources":["../../../src/commands/__tests__/upgrade.sha-capture.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}

package/dist/commands/__tests__/upgrade.sha-capture.test.js

@@ -0,0 +1,63 @@
+/**
+ * Unit tests for `olam upgrade` HEAD SHA capture (Phase 2a — A2).
+ *
+ * Verifies:
+ *   - captureHeadSha returns a 40-char lowercase-hex SHA for a real git repo.
+ *   - captureHeadSha returns null when `git rev-parse HEAD` fails (non-repo cwd).
+ *   - abbreviateSha returns the first 8 chars.
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.sha-capture.test.ts`
+ */
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { spawnSync } from 'node:child_process';
+import { captureHeadSha, abbreviateSha } from '../upgrade.js';
+let tmpDir;
+beforeEach(() => {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'olam-sha-test-'));
+});
+afterEach(() => {
+    try {
+        fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+    catch {
+        // best effort
+    }
+});
+describe('captureHeadSha — happy path', () => {
+    it('returns a 40-char lowercase-hex SHA for a fresh git repo with a commit', () => {
+        spawnSync('git', ['init', '--initial-branch=main', '-q'], { cwd: tmpDir });
+        spawnSync('git', ['config', 'user.email', 'test@example.com'], { cwd: tmpDir });
+        spawnSync('git', ['config', 'user.name', 'Test'], { cwd: tmpDir });
+        fs.writeFileSync(path.join(tmpDir, 'README.md'), 'test');
+        spawnSync('git', ['add', '.'], { cwd: tmpDir });
+        spawnSync('git', ['commit', '-m', 'init', '-q', '--no-gpg-sign'], { cwd: tmpDir });
+        const sha = captureHeadSha(tmpDir);
+        expect(sha).not.toBeNull();
+        expect(sha).toMatch(/^[0-9a-f]{40}$/);
+    });
+});
+describe('captureHeadSha — failure modes', () => {
+    it('returns null in a non-git directory', () => {
+        expect(captureHeadSha(tmpDir)).toBeNull();
+    });
+    it('returns null when cwd does not exist', () => {
+        const ghost = path.join(tmpDir, 'does-not-exist');
+        expect(captureHeadSha(ghost)).toBeNull();
+    });
+    it('returns null in a git repo with no commits', () => {
+        spawnSync('git', ['init', '--initial-branch=main', '-q'], { cwd: tmpDir });
+        expect(captureHeadSha(tmpDir)).toBeNull();
+    });
+});
+describe('abbreviateSha', () => {
+    it('returns the first 8 chars of a 40-char SHA', () => {
+        expect(abbreviateSha('1234567890abcdef1234567890abcdef12345678')).toBe('12345678');
+    });
+    it('returns the input unchanged when shorter than 8 chars', () => {
+        expect(abbreviateSha('abc')).toBe('abc');
+    });
+});
+//# sourceMappingURL=upgrade.sha-capture.test.js.map

package/dist/commands/__tests__/upgrade.sha-capture.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade.sha-capture.test.js","sourceRoot":"","sources":["../../../src/commands/__tests__/upgrade.sha-capture.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/__tests__/upgrade.smoke.test.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Phase 2a A5 — verifies smokeImage logic.
+ *
+ * Two layers:
+ *   1. Source-text invariant: smokeImage helper is invoked from
+ *      handleUpgrade with the correct image-tag list + target SHA.
+ *   2. Real docker integration: smokeImage against a non-existent image
+ *      returns ok=false with a meaningful error (validates the docker
+ *      create + inspect failure path).
+ *
+ * Fixture-built images (FROM scratch + label) are deferred to manual smoke
+ * via tests/integration/upgrade-smoke.sh — building from macOS /var/folders
+ * tmpdir hits xattr permission errors on Docker Desktop and isn't reliable
+ * for CI.
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.smoke.test.ts`
+ */
+export {};
+//# sourceMappingURL=upgrade.smoke.test.d.ts.map

package/dist/commands/__tests__/upgrade.smoke.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade.smoke.test.d.ts","sourceRoot":"","sources":["../../../src/commands/__tests__/upgrade.smoke.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG"}

package/dist/commands/__tests__/upgrade.smoke.test.js

@@ -0,0 +1,101 @@
+/**
+ * Phase 2a A5 — verifies smokeImage logic.
+ *
+ * Two layers:
+ *   1. Source-text invariant: smokeImage helper is invoked from
+ *      handleUpgrade with the correct image-tag list + target SHA.
+ *   2. Real docker integration: smokeImage against a non-existent image
+ *      returns ok=false with a meaningful error (validates the docker
+ *      create + inspect failure path).
+ *
+ * Fixture-built images (FROM scratch + label) are deferred to manual smoke
+ * via tests/integration/upgrade-smoke.sh — building from macOS /var/folders
+ * tmpdir hits xattr permission errors on Docker Desktop and isn't reliable
+ * for CI.
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.smoke.test.ts`
+ */
+import { describe, it, expect } from 'vitest';
+import { spawnSync } from 'node:child_process';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { smokeImage } from '../upgrade.js';
+function dockerAvailable() {
+    const result = spawnSync('docker', ['version', '--format', '{{.Server.Version}}'], {
+        encoding: 'utf-8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+    });
+    return result.status === 0;
+}
+const HAS_DOCKER = dockerAvailable();
+function findRepoRoot(start) {
+    let dir = start;
+    for (let i = 0; i < 10; i++) {
+        if (fs.existsSync(path.join(dir, 'packages', 'host-cp', 'compose.yaml')))
+            return dir;
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    throw new Error(`Could not find repo root from ${start}`);
+}
+const REPO_ROOT = findRepoRoot(process.cwd());
+const UPGRADE_TS = path.join(REPO_ROOT, 'packages', 'cli', 'src', 'commands', 'upgrade.ts');
+describe('smokeImage — failure-path integration (real docker)', () => {
+    it.skipIf(!HAS_DOCKER)('returns ok=false for a non-existent image', () => {
+        const result = smokeImage('olam-smoke-does-not-exist:nope', '1234567890abcdef1234567890abcdef12345678');
+        expect(result.ok).toBe(false);
+        expect(result.error).toBeTruthy();
+        // Error should reference the docker daemon's response.
+        expect(result.error?.toLowerCase()).toMatch(/docker (create|inspect) failed|no such image|repository|pull access denied/);
+    });
+    it('exposes the image name in the result for downstream UX', () => {
+        const result = smokeImage('olam-smoke-does-not-exist:nope', '0'.repeat(40));
+        expect(result.image).toBe('olam-smoke-does-not-exist:nope');
+    });
+});
+describe('Phase 2a A5 — smoke wired into handleUpgrade', () => {
+    let body;
+    it('reads upgrade.ts source', () => {
+        body = fs.readFileSync(UPGRADE_TS, 'utf-8');
+        expect(body.length).toBeGreaterThan(1000);
+    });
+    it('declares the three :olam-next image tags for smoking', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        expect(body).toContain('olam-auth:olam-next');
+        expect(body).toContain('olam-devbox:olam-next');
+        expect(body).toContain('olam-host-cp:olam-next');
+    });
+    it('runs smoke after the build loop (smoke must come AFTER buildScripts)', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        const buildLoopIdx = body.indexOf('for (const step of buildScripts');
+        const smokeIdx = body.indexOf('smokeImages');
+        expect(buildLoopIdx).toBeGreaterThan(0);
+        expect(smokeIdx).toBeGreaterThan(buildLoopIdx);
+    });
+    it('aborts with exit 1 on smoke failure (canonical tags untouched)', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        // Expect "Canonical tags … untouched" message + process.exitCode = 1
+        // co-located in the smoke-failure branch.
+        const match = body.match(/Smoke failed[\s\S]*?process\.exitCode\s*=\s*1/);
+        expect(match).not.toBeNull();
+        expect(match[0]).toContain('Canonical tags');
+    });
+    it('passes _targetSha to smokeImage (sticky-after-pull capture from A2)', () => {
+        body ??= fs.readFileSync(UPGRADE_TS, 'utf-8');
+        expect(body).toMatch(/smokeImage\(\s*\w+\s*,\s*_targetSha\s*\)/);
+    });
+});
+describe('SmokeResult shape', () => {
+    it('returns the SmokeResult contract for non-existent images', () => {
+        const result = smokeImage('olam-smoke-does-not-exist:nope', '0'.repeat(40));
+        // Result MUST have image, ok, bakedSha keys; error is optional but present
+        // on failure.
+        expect(result).toHaveProperty('image');
+        expect(result).toHaveProperty('ok');
+        expect(result).toHaveProperty('bakedSha');
+        expect(result.ok).toBe(false);
+    });
+});
+//# sourceMappingURL=upgrade.smoke.test.js.map

package/dist/commands/__tests__/upgrade.smoke.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade.smoke.test.js","sourceRoot":"","sources":["../../../src/commands/__tests__/upgrade.smoke.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/__tests__/upgrade.swap.test.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Phase 2a A6 — atomic 6-tag swap integration tests (real docker).
+ *
+ * Validates the load-bearing rollback contract:
+ *   1. Happy path: swap leaves canonical pointing at :olam-next images;
+ *      :olam-rollback preserves the previous canonical SHAs.
+ *   2. First-upgrade tolerance: missing canonical → rollback-save fails
+ *      non-fatally; canonical-advance still succeeds.
+ *   3. Canonical-advance fatality: missing :olam-next → fatal abort;
+ *      partialAdvance flag set; summary references --rollback recovery.
+ *   4. SIGKILL-recovery checkpoint: :olam-rollback is fully populated
+ *      BEFORE any canonical-advance touches the canonical tags.
+ *
+ * Skipped automatically when docker is unavailable (e.g. CI without daemon).
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.swap.test.ts`
+ */
+export {};
+//# sourceMappingURL=upgrade.swap.test.d.ts.map

package/dist/commands/__tests__/upgrade.swap.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upgrade.swap.test.d.ts","sourceRoot":"","sources":["../../../src/commands/__tests__/upgrade.swap.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG"}