@pleri/olam-cli 0.1.12 → 0.1.13

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

@@ -0,0 +1,199 @@
+/**
+ * Phase 2c — verifies C1 (~/.olam/upgrade.log JSONL writer) + C2 (--history flag).
+ *
+ * Tests:
+ *   - appendUpgradeLog: open-per-write, mkdir defensively
+ *   - readUpgradeLog: ENOENT → empty; corrupt JSON skipped + stderr warn
+ *   - formatHistoryTable / formatHistoryJson: render shape
+ *   - formatDuration: ms / s / m / h
+ *   - parseHistoryOpts: --history -n <N> --json
+ *   - handleHistory wired from upgrade.ts
+ *
+ * Run: `cd packages/cli && npx vitest run src/commands/__tests__/upgrade.history.test.ts`
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { appendUpgradeLog, readUpgradeLog, formatHistoryTable, formatHistoryJson, formatDuration, } from '../upgrade-log.js';
+import { parseHistoryOpts } from '../upgrade-history.js';
+let tmpHome;
+let tmpLogPath;
+beforeEach(() => {
+    tmpHome = fs.mkdtempSync(path.join(os.tmpdir(), 'olam-history-test-'));
+    tmpLogPath = path.join(tmpHome, '.olam', 'upgrade.log');
+});
+afterEach(() => {
+    try {
+        fs.rmSync(tmpHome, { recursive: true, force: true });
+    }
+    catch {
+        /* best effort */
+    }
+});
+function makeRow(overrides = {}) {
+    return {
+        ts: '2026-05-07T10:00:00.000Z',
+        started_at: 1000,
+        ended_at: 2000,
+        sha_target: '1234567890abcdef1234567890abcdef12345678',
+        sha_before: { hostCp: 'aaaaaaaa', authService: 'aaaaaaaa', devbox: 'aaaaaaaa' },
+        sha_after: { hostCp: '12345678', authService: '12345678', devbox: '12345678' },
+        status: 'success',
+        failed_step: null,
+        durations_ms: { 'git pull': 200, 'bash build-host-cp.sh': 800 },
+        ...overrides,
+    };
+}
+describe('appendUpgradeLog', () => {
+    it('creates ~/.olam/ defensively before append', () => {
+        // Note: HOME is set to tmpHome by beforeEach.
+        const expectedPath = path.join(tmpHome, '.olam', 'upgrade.log');
+        expect(fs.existsSync(path.dirname(expectedPath))).toBe(false);
+        appendUpgradeLog(makeRow(), tmpLogPath);
+        expect(fs.existsSync(path.dirname(expectedPath))).toBe(true);
+        expect(fs.existsSync(expectedPath)).toBe(true);
+    });
+    it('appends one JSONL row per call (newline-terminated)', () => {
+        appendUpgradeLog(makeRow({ ts: '2026-05-07T10:00:00.000Z' }), tmpLogPath);
+        appendUpgradeLog(makeRow({ ts: '2026-05-07T10:05:00.000Z' }), tmpLogPath);
+        const logPath = path.join(tmpHome, '.olam', 'upgrade.log');
+        const raw = fs.readFileSync(logPath, 'utf-8');
+        const lines = raw.split('\n').filter((l) => l.length > 0);
+        expect(lines.length).toBe(2);
+        const parsed1 = JSON.parse(lines[0]);
+        const parsed2 = JSON.parse(lines[1]);
+        expect(parsed1.ts).toBe('2026-05-07T10:00:00.000Z');
+        expect(parsed2.ts).toBe('2026-05-07T10:05:00.000Z');
+    });
+    it('failure to append is swallowed (does not throw)', () => {
+        // Make ~/.olam unwritable: replace with a regular file.
+        fs.mkdirSync(tmpHome, { recursive: true });
+        fs.writeFileSync(path.join(tmpHome, '.olam'), 'this-is-a-file-not-a-dir');
+        // Should not throw; logs warning to stderr (we don't assert on stderr here).
+        expect(() => appendUpgradeLog(makeRow(), path.join(tmpHome, '.olam', 'upgrade.log'))).not.toThrow();
+    });
+});
+describe('readUpgradeLog', () => {
+    it('returns empty array when log file is missing', () => {
+        const rows = readUpgradeLog(10, tmpLogPath);
+        expect(rows).toEqual([]);
+    });
+    it('returns empty array when log file is empty', () => {
+        fs.mkdirSync(path.join(tmpHome, '.olam'), { recursive: true });
+        fs.writeFileSync(path.join(tmpHome, '.olam', 'upgrade.log'), '');
+        expect(readUpgradeLog(10, tmpLogPath)).toEqual([]);
+    });
+    it('reads the most-recent N rows (chronological order, last-N)', () => {
+        for (let i = 0; i < 5; i++) {
+            appendUpgradeLog(makeRow({ ts: `2026-05-07T${String(i).padStart(2, '0')}:00:00.000Z` }), tmpLogPath);
+        }
+        const rows = readUpgradeLog(3, tmpLogPath);
+        expect(rows.length).toBe(3);
+        // Should be the LAST three (chronologically — most recent in the file).
+        expect(rows[0].ts).toBe('2026-05-07T02:00:00.000Z');
+        expect(rows[1].ts).toBe('2026-05-07T03:00:00.000Z');
+        expect(rows[2].ts).toBe('2026-05-07T04:00:00.000Z');
+    });
+    it('skips corrupt JSON lines + warns to stderr (does not crash)', () => {
+        fs.mkdirSync(path.join(tmpHome, '.olam'), { recursive: true });
+        const logPath = path.join(tmpHome, '.olam', 'upgrade.log');
+        const goodLine = JSON.stringify(makeRow({ ts: '2026-05-07T10:00:00.000Z' }));
+        const corrupt = '{ this is not valid JSON';
+        fs.writeFileSync(logPath, `${goodLine}\n${corrupt}\n${goodLine}\n`);
+        const stderr = vi.spyOn(process.stderr, 'write').mockReturnValue(true);
+        const rows = readUpgradeLog(10, tmpLogPath);
+        expect(rows.length).toBe(2); // 2 good, 1 skipped corrupt
+        expect(stderr).toHaveBeenCalled();
+        stderr.mockRestore();
+    });
+    it('skips rows that lack required fields (defensive shape check)', () => {
+        fs.mkdirSync(path.join(tmpHome, '.olam'), { recursive: true });
+        const logPath = path.join(tmpHome, '.olam', 'upgrade.log');
+        const badShape = JSON.stringify({ random: 'object', without: 'required fields' });
+        const good = JSON.stringify(makeRow());
+        fs.writeFileSync(logPath, `${badShape}\n${good}\n`);
+        const stderr = vi.spyOn(process.stderr, 'write').mockReturnValue(true);
+        const rows = readUpgradeLog(10, tmpLogPath);
+        expect(rows.length).toBe(1);
+        stderr.mockRestore();
+    });
+});
+describe('formatHistoryTable', () => {
+    it('returns friendly first-run message on empty rows', () => {
+        expect(formatHistoryTable([])).toMatch(/No upgrade history yet/);
+    });
+    it('renders header + rows for a populated log', () => {
+        const out = formatHistoryTable([makeRow()]);
+        expect(out).toMatch(/TIMESTAMP/);
+        expect(out).toMatch(/STATUS/);
+        expect(out).toMatch(/DURATION/);
+        expect(out).toMatch(/12345678/); // first 8 of sha_target
+        expect(out).toMatch(/✓ success/);
+    });
+    it('marks failed rows with ✗ + step label', () => {
+        const out = formatHistoryTable([
+            makeRow({ status: 'failed', failed_step: 'bash build-auth.sh' }),
+        ]);
+        expect(out).toMatch(/✗ failed/);
+        expect(out).toContain('bash build-auth.sh');
+    });
+    it('marks rolled_back rows with ↩', () => {
+        const out = formatHistoryTable([makeRow({ status: 'rolled_back' })]);
+        expect(out).toMatch(/↩ rolled_back/);
+    });
+});
+describe('formatHistoryJson', () => {
+    it('returns JSONL (one JSON object per line, no trailing newline)', () => {
+        const out = formatHistoryJson([makeRow({ ts: '2026-05-07T10:00:00.000Z' }), makeRow({ ts: '2026-05-07T10:05:00.000Z' })]);
+        const lines = out.split('\n');
+        expect(lines.length).toBe(2);
+        const parsed1 = JSON.parse(lines[0]);
+        const parsed2 = JSON.parse(lines[1]);
+        expect(parsed1.ts).toBe('2026-05-07T10:00:00.000Z');
+        expect(parsed2.ts).toBe('2026-05-07T10:05:00.000Z');
+    });
+    it('returns empty string on empty rows', () => {
+        expect(formatHistoryJson([])).toBe('');
+    });
+});
+describe('formatDuration', () => {
+    it('renders ms for sub-second', () => {
+        expect(formatDuration(500)).toBe('500ms');
+    });
+    it('renders s for sub-minute', () => {
+        expect(formatDuration(45_000)).toBe('45s');
+    });
+    it('renders m + s for sub-hour', () => {
+        expect(formatDuration(125_000)).toBe('2m05s');
+    });
+    it('renders h + m for hour-plus', () => {
+        expect(formatDuration(3_780_000)).toBe('1h03m');
+    });
+});
+describe('parseHistoryOpts', () => {
+    it('parses -n string number', () => {
+        expect(parseHistoryOpts({ n: '5' }).limit).toBe(5);
+    });
+    it('parses -n numeric', () => {
+        expect(parseHistoryOpts({ n: 7 }).limit).toBe(7);
+    });
+    it('defaults limit to 10 when -n absent', () => {
+        expect(parseHistoryOpts({}).limit).toBe(10);
+    });
+    it('clamps non-positive -n to default 10', () => {
+        expect(parseHistoryOpts({ n: '0' }).limit).toBe(10);
+        expect(parseHistoryOpts({ n: '-3' }).limit).toBe(10);
+    });
+    it('parses --json flag', () => {
+        expect(parseHistoryOpts({ json: true }).json).toBe(true);
+        expect(parseHistoryOpts({ json: false }).json).toBe(false);
+    });
+});
+describe('Phase 2c — wired in handleUpgrade', () => {
+    it('upgrade.ts dispatches to handleHistory when opts.history', () => {
+        const upgradeTs = fs.readFileSync(path.join(__dirname, '..', 'upgrade.ts'), 'utf-8');
+        expect(upgradeTs).toMatch(/if\s*\(opts\.history\)\s*\{[\s\S]*?handleHistory\(/);
+    });
+});
+//# sourceMappingURL=upgrade.history.test.js.map

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

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

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

@@ -0,0 +1,15 @@
+/**
+ * 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`
+ */
+export {};
+//# sourceMappingURL=upgrade.lock.test.d.ts.map

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

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

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"}