@pleri/olam-cli 0.1.11 → 0.1.13

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

@@ -0,0 +1,253 @@
+/**
+ * Unit tests for `olam upgrade` CLI lock (Phase 2a — A1).
+ *
+ * Verifies the contract from `packages/cli/src/commands/upgrade-lock.ts`:
+ *   - Atomic create-or-fail via fs.openSync 'wx'
+ *   - Stale-lock recovery (empty / parse-error / dead-pid / >30min timeout)
+ *   - PID liveness check via process.kill(pid, 0)
+ *   - Command-name check via `ps -p <pid> -o comm=`
+ *   - Idempotent release
+ *   - Concurrent-acquisition refusal
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.lock.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 { acquireLock, releaseLock, readLockFile, isStaleLock, isPidAlive, isOlamUpgradeCommand, formatRefusalMessage, STALE_LOCK_TIMEOUT_MS, PS_UNAVAILABLE, } from '../upgrade-lock.js';
+let tmpDir;
+let tmpLockPath;
+beforeEach(() => {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'olam-lock-test-'));
+    tmpLockPath = path.join(tmpDir, 'upgrade.lock');
+});
+afterEach(() => {
+    try {
+        fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+    catch {
+        // best effort
+    }
+});
+describe('acquireLock — happy path', () => {
+    it('acquires a lock when none exists', () => {
+        const r = acquireLock(tmpLockPath);
+        expect(r.acquired).toBe(true);
+        if (r.acquired) {
+            expect(r.lockPath).toBe(tmpLockPath);
+        }
+        expect(fs.existsSync(tmpLockPath)).toBe(true);
+    });
+    it('writes pid + startTs to the lock file', () => {
+        const before = Date.now();
+        const r = acquireLock(tmpLockPath);
+        const after = Date.now();
+        expect(r.acquired).toBe(true);
+        const content = readLockFile(tmpLockPath);
+        expect(content).not.toBeNull();
+        expect(content.pid).toBe(process.pid);
+        expect(content.startTs).toBeGreaterThanOrEqual(before);
+        expect(content.startTs).toBeLessThanOrEqual(after);
+    });
+    it('creates the parent directory if missing', () => {
+        const nestedDir = path.join(tmpDir, 'nested', 'deeper');
+        const nestedLock = path.join(nestedDir, 'upgrade.lock');
+        expect(fs.existsSync(nestedDir)).toBe(false);
+        const r = acquireLock(nestedLock);
+        expect(r.acquired).toBe(true);
+        expect(fs.existsSync(nestedLock)).toBe(true);
+    });
+});
+describe('acquireLock — stale recovery', () => {
+    it('treats empty file as stale and retries', () => {
+        fs.writeFileSync(tmpLockPath, '');
+        const r = acquireLock(tmpLockPath);
+        expect(r.acquired).toBe(true);
+        const content = readLockFile(tmpLockPath);
+        expect(content.pid).toBe(process.pid);
+    });
+    it('treats parse-error file as stale and retries', () => {
+        fs.writeFileSync(tmpLockPath, 'not valid json {{{ broken');
+        const r = acquireLock(tmpLockPath);
+        expect(r.acquired).toBe(true);
+    });
+    it('treats shape-mismatch file as stale and retries', () => {
+        fs.writeFileSync(tmpLockPath, JSON.stringify({ wrong: 'shape' }));
+        const r = acquireLock(tmpLockPath);
+        expect(r.acquired).toBe(true);
+    });
+    it('treats dead-pid lock as stale and retries', () => {
+        const deadPid = 99999999;
+        fs.writeFileSync(tmpLockPath, JSON.stringify({ pid: deadPid, startTs: Date.now() }));
+        const r = acquireLock(tmpLockPath);
+        expect(r.acquired).toBe(true);
+    });
+    it('treats lock older than STALE_LOCK_TIMEOUT_MS as stale', () => {
+        const oldTs = Date.now() - STALE_LOCK_TIMEOUT_MS - 1000;
+        fs.writeFileSync(tmpLockPath, JSON.stringify({ pid: process.pid, startTs: oldTs }));
+        const r = acquireLock(tmpLockPath);
+        expect(r.acquired).toBe(true);
+    });
+});
+describe('acquireLock — refusal on live lock', () => {
+    it('refuses when an alive olam-process holds the lock', () => {
+        fs.writeFileSync(tmpLockPath, JSON.stringify({ pid: process.pid, startTs: Date.now() }));
+        const r = acquireLock(tmpLockPath);
+        expect(r.acquired).toBe(false);
+        if (!r.acquired) {
+            expect(r.reason).toBe('live');
+            expect(r.existingPid).toBe(process.pid);
+        }
+    });
+});
+describe('releaseLock', () => {
+    it('removes an existing lock', () => {
+        fs.writeFileSync(tmpLockPath, JSON.stringify({ pid: process.pid, startTs: Date.now() }));
+        releaseLock(tmpLockPath);
+        expect(fs.existsSync(tmpLockPath)).toBe(false);
+    });
+    it('is idempotent (no error on missing lock)', () => {
+        expect(() => releaseLock(tmpLockPath)).not.toThrow();
+    });
+});
+describe('isStaleLock', () => {
+    it('null content → stale', () => {
+        expect(isStaleLock(null)).toBe(true);
+    });
+    it('content older than 30 min → stale', () => {
+        const old = Date.now() - STALE_LOCK_TIMEOUT_MS - 1;
+        expect(isStaleLock({ pid: process.pid, startTs: old })).toBe(true);
+    });
+    it('content with dead pid → stale', () => {
+        expect(isStaleLock({ pid: 99999999, startTs: Date.now() })).toBe(true);
+    });
+    it('fresh content with own pid → live (not stale)', () => {
+        expect(isStaleLock({ pid: process.pid, startTs: Date.now() })).toBe(false);
+    });
+});
+describe('isPidAlive', () => {
+    it('returns true for own pid', () => {
+        expect(isPidAlive(process.pid)).toBe(true);
+    });
+    it('returns false for unused high pid', () => {
+        expect(isPidAlive(99999999)).toBe(false);
+    });
+});
+describe('isOlamUpgradeCommand', () => {
+    it('accepts node', () => {
+        expect(isOlamUpgradeCommand('node')).toBe(true);
+    });
+    it('accepts /usr/local/bin/node (path-prefixed)', () => {
+        expect(isOlamUpgradeCommand('/usr/local/bin/node')).toBe(true);
+    });
+    it('accepts olam', () => {
+        expect(isOlamUpgradeCommand('olam')).toBe(true);
+    });
+    it('accepts olam-cli', () => {
+        expect(isOlamUpgradeCommand('olam-cli')).toBe(true);
+    });
+    it('accepts node with worker-pool suffix (e.g. vitest)', () => {
+        expect(isOlamUpgradeCommand('node (vitest 1)')).toBe(true);
+        expect(isOlamUpgradeCommand('node (vitest pool 3)')).toBe(true);
+    });
+    it('rejects unrelated commands', () => {
+        expect(isOlamUpgradeCommand('bash')).toBe(false);
+        expect(isOlamUpgradeCommand('zsh')).toBe(false);
+        expect(isOlamUpgradeCommand('python3')).toBe(false);
+    });
+    it('rejects null', () => {
+        expect(isOlamUpgradeCommand(null)).toBe(false);
+    });
+    it('rejects empty string', () => {
+        expect(isOlamUpgradeCommand('')).toBe(false);
+    });
+});
+describe('formatRefusalMessage', () => {
+    it('includes pid when known', () => {
+        const msg = formatRefusalMessage({
+            acquired: false,
+            reason: 'live',
+            existingPid: 12345,
+            existingStartTs: Date.now(),
+        }, '/tmp/test.lock');
+        expect(msg).toContain('12345');
+    });
+    it('mentions --history hint and rm path', () => {
+        const msg = formatRefusalMessage({
+            acquired: false,
+            reason: 'live',
+            existingPid: 12345,
+            existingStartTs: Date.now(),
+        }, '/tmp/test.lock');
+        expect(msg).toContain('--history');
+        expect(msg).toContain('rm /tmp/test.lock');
+    });
+    it('omits pid string when not known', () => {
+        const msg = formatRefusalMessage({
+            acquired: false,
+            reason: 'race',
+        }, '/tmp/test.lock');
+        expect(msg).toContain('Upgrade in progress.');
+        expect(msg).not.toContain('pid');
+    });
+});
+describe('parallel acquisition (live-lock refusal)', () => {
+    it('first acquires; second refuses with existingPid populated', () => {
+        const r1 = acquireLock(tmpLockPath);
+        expect(r1.acquired).toBe(true);
+        const r2 = acquireLock(tmpLockPath);
+        expect(r2.acquired).toBe(false);
+        if (!r2.acquired) {
+            expect(r2.reason).toBe('live');
+            expect(r2.existingPid).toBe(process.pid);
+        }
+        releaseLock(tmpLockPath);
+    });
+    it('after release, a new acquire succeeds', () => {
+        const r1 = acquireLock(tmpLockPath);
+        expect(r1.acquired).toBe(true);
+        releaseLock(tmpLockPath);
+        const r2 = acquireLock(tmpLockPath);
+        expect(r2.acquired).toBe(true);
+    });
+});
+describe('isStaleLock — ps-unavailable fail-live (audit A1-003)', () => {
+    it('treats PS_UNAVAILABLE comm as live (NOT stale) when pid is alive', () => {
+        // Simulate: process is alive but `ps` couldn't tell us its name (binary missing,
+        // container without procfs, fork pressure). Per audit A1-003, the safe default
+        // is "assume live, refuse to recover" — better than silently deleting a live lock.
+        const liveAlivePid = process.pid;
+        // We can't easily mock getPidCommand here without DI; verify isOlamUpgradeCommand
+        // returns false for PS_UNAVAILABLE so callers branching on it work correctly.
+        expect(isOlamUpgradeCommand(PS_UNAVAILABLE)).toBe(false);
+    });
+    it('exposes PS_UNAVAILABLE sentinel as a string constant', () => {
+        expect(typeof PS_UNAVAILABLE).toBe('string');
+        expect(PS_UNAVAILABLE.length).toBeGreaterThan(0);
+    });
+});
+describe('STALE_LOCK_TIMEOUT_MS — bounds false-refusal blast-radius (audit A1-004)', () => {
+    it('is set to 5 minutes (shortened from 30 min per audit recommendation)', () => {
+        expect(STALE_LOCK_TIMEOUT_MS).toBe(5 * 60 * 1000);
+    });
+});
+describe('readLockFile', () => {
+    it('returns null on missing file', () => {
+        expect(readLockFile(tmpLockPath)).toBeNull();
+    });
+    it('returns null on empty file', () => {
+        fs.writeFileSync(tmpLockPath, '');
+        expect(readLockFile(tmpLockPath)).toBeNull();
+    });
+    it('returns null on invalid JSON', () => {
+        fs.writeFileSync(tmpLockPath, 'not json');
+        expect(readLockFile(tmpLockPath)).toBeNull();
+    });
+    it('returns parsed content on valid file', () => {
+        const content = { pid: 12345, startTs: 1700000000000 };
+        fs.writeFileSync(tmpLockPath, JSON.stringify(content));
+        expect(readLockFile(tmpLockPath)).toEqual(content);
+    });
+});
+//# sourceMappingURL=upgrade.lock.test.js.map

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

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

package/dist/commands/__tests__/upgrade.olam-tag.test.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Verifies that build-{host-cp,auth,devbox}.sh accept an OLAM_TAG env var
+ * that retags the freshly-built image with an additional alias (Phase 2a — A3).
+ *
+ * The CLI's atomic-swap workflow (A6) needs all three scripts to produce
+ * `<image>:olam-next` tags during the staged-build window so canonical tags
+ * (`:latest` for host-cp/devbox, `:local` for auth) stay untouched until the
+ * final 6-tag swap.
+ *
+ * Default unset → no retag → backward-compat with manual `bash build-*.sh`
+ * invocation.
+ *
+ * This test reads each script as TEXT and asserts the retag block is present
+ * + correctly placed (after the docker build). A real docker integration test
+ * lives at tests/integration/build-scripts-olam-tag.sh (manual smoke; not run
+ * in CI without a docker daemon).
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.olam-tag.test.ts`
+ */
+export {};
+//# sourceMappingURL=upgrade.olam-tag.test.d.ts.map

package/dist/commands/__tests__/upgrade.olam-tag.test.d.ts.map

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

package/dist/commands/__tests__/upgrade.olam-tag.test.js

@@ -0,0 +1,127 @@
+/**
+ * Verifies that build-{host-cp,auth,devbox}.sh accept an OLAM_TAG env var
+ * that retags the freshly-built image with an additional alias (Phase 2a — A3).
+ *
+ * The CLI's atomic-swap workflow (A6) needs all three scripts to produce
+ * `<image>:olam-next` tags during the staged-build window so canonical tags
+ * (`:latest` for host-cp/devbox, `:local` for auth) stay untouched until the
+ * final 6-tag swap.
+ *
+ * Default unset → no retag → backward-compat with manual `bash build-*.sh`
+ * invocation.
+ *
+ * This test reads each script as TEXT and asserts the retag block is present
+ * + correctly placed (after the docker build). A real docker integration test
+ * lives at tests/integration/build-scripts-olam-tag.sh (manual smoke; not run
+ * in CI without a docker daemon).
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.olam-tag.test.ts`
+ */
+import { describe, it, expect } from 'vitest';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+// Resolve to the repo root regardless of which workspace cwd vitest runs from.
+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 SCRIPTS_DIR = path.join(REPO_ROOT, 'packages', 'adapters', 'src', 'docker');
+const SCRIPTS = [
+    {
+        name: 'build-host-cp.sh',
+        path: path.join(SCRIPTS_DIR, 'build-host-cp.sh'),
+        canonicalTagPattern: /olam-host-cp:latest/,
+        retagSourceVar: 'olam-host-cp:latest',
+    },
+    {
+        name: 'build-auth.sh',
+        path: path.join(SCRIPTS_DIR, 'build-auth.sh'),
+        canonicalTagPattern: /olam-auth:local/,
+        retagSourceVar: 'olam-auth:local',
+    },
+    {
+        name: 'build-devbox.sh',
+        path: path.join(SCRIPTS_DIR, 'build-devbox.sh'),
+        canonicalTagPattern: /IMAGE_TAG="olam-devbox:latest"/,
+        retagSourceVar: '$IMAGE_TAG',
+    },
+];
+describe('build-*.sh — OLAM_TAG opt-in retag (Phase 2a A3)', () => {
+    for (const script of SCRIPTS) {
+        describe(script.name, () => {
+            let body;
+            it('script file exists', () => {
+                expect(fs.existsSync(script.path)).toBe(true);
+                body = fs.readFileSync(script.path, 'utf-8');
+                expect(body.length).toBeGreaterThan(100);
+            });
+            it('preserves the canonical (default) tag for backward-compat', () => {
+                body ??= fs.readFileSync(script.path, 'utf-8');
+                expect(body).toMatch(script.canonicalTagPattern);
+            });
+            it('contains the OLAM_TAG conditional block', () => {
+                body ??= fs.readFileSync(script.path, 'utf-8');
+                // The block guards on `if [ -n "${OLAM_TAG:-}" ]; then`
+                expect(body).toMatch(/if\s*\[\s*-n\s+"\$\{OLAM_TAG:-\}"\s*\]\s*;\s*then/);
+            });
+            it('issues a docker tag command inside (or after the start of) the OLAM_TAG block', () => {
+                body ??= fs.readFileSync(script.path, 'utf-8');
+                // Find the OLAM_TAG block opening; assert `docker tag` appears
+                // somewhere after that (could be inside a nested-conditional fi
+                // for the devbox 2-axis case, so we don't try to extract the
+                // exact closing fi — that's regex-fragile).
+                const blockStart = body.search(/if\s*\[\s*-n\s+"\$\{OLAM_TAG:-\}"\s*\]/);
+                expect(blockStart).toBeGreaterThan(0);
+                const after = body.slice(blockStart);
+                expect(after).toMatch(/docker\s+tag\b/);
+            });
+            it('OLAM_TAG block appears AFTER the docker build invocation', () => {
+                body ??= fs.readFileSync(script.path, 'utf-8');
+                const buildIdx = body.search(/docker\s+(?:compose\s+(?:-f\s+\S+\s+)?)?build\b/);
+                const olamTagIdx = body.search(/if\s*\[\s*-n\s+"\$\{OLAM_TAG:-\}"\s*\]/);
+                expect(buildIdx).toBeGreaterThan(0);
+                expect(olamTagIdx).toBeGreaterThan(0);
+                expect(olamTagIdx).toBeGreaterThan(buildIdx);
+            });
+            it('retag source uses the canonical tag (backward-compat invariant)', () => {
+                body ??= fs.readFileSync(script.path, 'utf-8');
+                const blockStart = body.search(/if\s*\[\s*-n\s+"\$\{OLAM_TAG:-\}"\s*\]/);
+                expect(blockStart).toBeGreaterThan(0);
+                const after = body.slice(blockStart);
+                // Source of `docker tag <source> <dest>` must reference the canonical
+                // tag (or its variable, for build-devbox.sh).
+                if (script.name === 'build-devbox.sh') {
+                    expect(after).toMatch(/docker tag\s+"\$IMAGE_TAG"/);
+                }
+                else {
+                    expect(after).toContain(script.retagSourceVar);
+                }
+            });
+        });
+    }
+});
+describe('build-devbox.sh — OLAM_TAG × OLAM_DEVBOX_PLATFORM 2-axis composition', () => {
+    let body;
+    it('reads the file', () => {
+        body = fs.readFileSync(path.join(SCRIPTS_DIR, 'build-devbox.sh'), 'utf-8');
+    });
+    it('handles the latest case (no platform suffix → flat OLAM_TAG)', () => {
+        body ??= fs.readFileSync(path.join(SCRIPTS_DIR, 'build-devbox.sh'), 'utf-8');
+        expect(body).toMatch(/if\s*\[\s*"\$IMAGE_PLATFORM_SUFFIX"\s*=\s*"latest"\s*\]/);
+    });
+    it('composes <repo>:<platform>-<olam-tag> for non-latest platforms', () => {
+        body ??= fs.readFileSync(path.join(SCRIPTS_DIR, 'build-devbox.sh'), 'utf-8');
+        // Should include ${IMAGE_PLATFORM_SUFFIX}-${OLAM_TAG} in the else branch.
+        expect(body).toMatch(/\$\{IMAGE_PLATFORM_SUFFIX\}-\$\{OLAM_TAG\}/);
+    });
+});
+//# sourceMappingURL=upgrade.olam-tag.test.js.map

package/dist/commands/__tests__/upgrade.olam-tag.test.js.map

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

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

@@ -0,0 +1,14 @@
+/**
+ * Phase 2a A8 — verifies waitForVersionMatch + formatVersionMismatch.
+ *
+ * Uses vi.spyOn(global, 'fetch') to mock /api/version/status responses
+ * and assert the polling loop:
+ *   - Returns matched=true when all three SHAs equal target.
+ *   - Returns matched=false on timeout when SHAs never converge.
+ *   - Tolerates transient fetch failures (host-cp restart blackout).
+ *   - Returns the LAST snapshot received for diagnostic display.
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.poll.test.ts`
+ */
+export {};
+//# sourceMappingURL=upgrade.poll.test.d.ts.map

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

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

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

@@ -0,0 +1,136 @@
+/**
+ * Phase 2a A8 — verifies waitForVersionMatch + formatVersionMismatch.
+ *
+ * Uses vi.spyOn(global, 'fetch') to mock /api/version/status responses
+ * and assert the polling loop:
+ *   - Returns matched=true when all three SHAs equal target.
+ *   - Returns matched=false on timeout when SHAs never converge.
+ *   - Tolerates transient fetch failures (host-cp restart blackout).
+ *   - Returns the LAST snapshot received for diagnostic display.
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.poll.test.ts`
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { waitForVersionMatch, formatVersionMismatch } from '../upgrade.js';
+const TARGET_SHA = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+const OTHER_SHA = 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb';
+function makeSnapshot(hostCp, authService, devbox) {
+    return {
+        hostCp: { running: hostCp, latest: TARGET_SHA, upgradeAvailable: hostCp !== TARGET_SHA },
+        authService: { running: authService, latest: TARGET_SHA, upgradeAvailable: authService !== TARGET_SHA },
+        devbox: { running: devbox, latest: TARGET_SHA, upgradeAvailable: devbox !== TARGET_SHA },
+        operatorHead: TARGET_SHA,
+        checkedAt: '2026-05-07T00:00:00.000Z',
+    };
+}
+function mockFetchResponse(snapshot) {
+    return new Response(JSON.stringify(snapshot), {
+        status: 200,
+        headers: { 'content-type': 'application/json' },
+    });
+}
+describe('waitForVersionMatch — happy path', () => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let fetchSpy;
+    beforeEach(() => {
+        fetchSpy = vi.spyOn(global, 'fetch');
+    });
+    afterEach(() => {
+        fetchSpy.mockRestore();
+    });
+    it('returns matched=true when all three SHAs already equal target on first poll', async () => {
+        const snapshot = makeSnapshot(TARGET_SHA, TARGET_SHA, TARGET_SHA);
+        fetchSpy.mockResolvedValue(mockFetchResponse(snapshot));
+        const result = await waitForVersionMatch(TARGET_SHA, 5_000, 100);
+        expect(result.matched).toBe(true);
+        expect(result.snapshot).toEqual(snapshot);
+    });
+    it('returns matched=true after SHA propagation completes mid-poll', async () => {
+        const stale = makeSnapshot(OTHER_SHA, OTHER_SHA, OTHER_SHA);
+        const partial = makeSnapshot(TARGET_SHA, OTHER_SHA, OTHER_SHA);
+        const fresh = makeSnapshot(TARGET_SHA, TARGET_SHA, TARGET_SHA);
+        fetchSpy
+            .mockResolvedValueOnce(mockFetchResponse(stale))
+            .mockResolvedValueOnce(mockFetchResponse(partial))
+            .mockResolvedValueOnce(mockFetchResponse(fresh));
+        const result = await waitForVersionMatch(TARGET_SHA, 10_000, 50);
+        expect(result.matched).toBe(true);
+        expect(result.snapshot).toEqual(fresh);
+    });
+});
+describe('waitForVersionMatch — failure paths', () => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let fetchSpy;
+    beforeEach(() => {
+        fetchSpy = vi.spyOn(global, 'fetch');
+    });
+    afterEach(() => {
+        fetchSpy.mockRestore();
+    });
+    it('returns matched=false on timeout when SHAs never converge', async () => {
+        const stale = makeSnapshot(OTHER_SHA, OTHER_SHA, OTHER_SHA);
+        fetchSpy.mockResolvedValue(mockFetchResponse(stale));
+        const result = await waitForVersionMatch(TARGET_SHA, 300, 50);
+        expect(result.matched).toBe(false);
+        expect(result.snapshot).toEqual(stale);
+    });
+    it('tolerates transient fetch errors (host-cp restart blackout)', async () => {
+        const fresh = makeSnapshot(TARGET_SHA, TARGET_SHA, TARGET_SHA);
+        fetchSpy
+            .mockRejectedValueOnce(new Error('ECONNREFUSED'))
+            .mockRejectedValueOnce(new Error('ECONNREFUSED'))
+            .mockResolvedValueOnce(mockFetchResponse(fresh));
+        const result = await waitForVersionMatch(TARGET_SHA, 5_000, 50);
+        expect(result.matched).toBe(true);
+        expect(result.snapshot).toEqual(fresh);
+    });
+    it('returns matched=false with snapshot=null when /api/version/status is never reachable', async () => {
+        fetchSpy.mockRejectedValue(new Error('ECONNREFUSED'));
+        const result = await waitForVersionMatch(TARGET_SHA, 200, 50);
+        expect(result.matched).toBe(false);
+        expect(result.snapshot).toBeNull();
+    });
+    it('returns matched=false when /api/version/status returns non-200', async () => {
+        fetchSpy.mockResolvedValue(new Response('Internal Server Error', { status: 500 }));
+        const result = await waitForVersionMatch(TARGET_SHA, 200, 50);
+        expect(result.matched).toBe(false);
+        expect(result.snapshot).toBeNull();
+    });
+});
+describe('formatVersionMismatch', () => {
+    it('renders 3-line per-component diff with ✓ / ✗ markers', () => {
+        const partial = makeSnapshot(TARGET_SHA, OTHER_SHA, OTHER_SHA);
+        const out = formatVersionMismatch(TARGET_SHA, partial);
+        expect(out).toMatch(/✓ host-cp/);
+        expect(out).toMatch(/✗ auth-service/);
+        expect(out).toMatch(/✗ devbox/);
+        expect(out).toContain(TARGET_SHA.slice(0, 8));
+        expect(out).toContain(OTHER_SHA.slice(0, 8));
+    });
+    it('handles null snapshot gracefully', () => {
+        expect(formatVersionMismatch(TARGET_SHA, null)).toMatch(/No \/api\/version\/status response/);
+    });
+    it('marks all components ✗ when none match target', () => {
+        const stale = makeSnapshot(OTHER_SHA, OTHER_SHA, OTHER_SHA);
+        const out = formatVersionMismatch(TARGET_SHA, stale);
+        expect((out.match(/✗/g) ?? []).length).toBe(3);
+        expect(out.match(/✓/g)).toBeNull();
+    });
+    it('marks all components ✓ when all match target', () => {
+        const fresh = makeSnapshot(TARGET_SHA, TARGET_SHA, TARGET_SHA);
+        const out = formatVersionMismatch(TARGET_SHA, fresh);
+        expect((out.match(/✓/g) ?? []).length).toBe(3);
+        expect(out.match(/✗/g)).toBeNull();
+    });
+});
+describe('VersionSnapshot type contract', () => {
+    it('exports a usable snapshot shape with three components + operatorHead + checkedAt', () => {
+        const sample = makeSnapshot(TARGET_SHA, TARGET_SHA, TARGET_SHA);
+        expect(sample.hostCp.running).toBe(TARGET_SHA);
+        expect(sample.authService.running).toBe(TARGET_SHA);
+        expect(sample.devbox.running).toBe(TARGET_SHA);
+        expect(sample.operatorHead).toBe(TARGET_SHA);
+        expect(sample.checkedAt).toBeTruthy();
+    });
+});
+//# sourceMappingURL=upgrade.poll.test.js.map

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

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

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

@@ -0,0 +1,17 @@
+/**
+ * Phase 2a A7 — verifies auth-service recreate via AuthContainerController.
+ *
+ * Source-text invariants (no docker required):
+ *   - upgrade.ts imports AuthContainerController from @olam/core
+ *   - recreateAuthService is invoked AFTER the compose recreate succeeds
+ *   - auth-recreate-fail branch surfaces --rollback hint (per audit A6-002)
+ *   - waitForAuthHealthLocal mirrors auth-upgrade.ts contract
+ *
+ * Running the actual recreateAuthService against a real auth-service
+ * container is covered by the manual smoke at tests/integration/upgrade-all-three.sh
+ * — too heavy for unit tests (requires the full olam-auth image + secret env).
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.recreate.test.ts`
+ */
+export {};
+//# sourceMappingURL=upgrade.recreate.test.d.ts.map

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

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