fix(storage): pin snapshot retention to resolved path

Author: ndycode

lib/destructive-actions.ts

@@ -7,7 +7,6 @@ import {
 	clearFlaggedAccounts,
 	findMatchingAccountIndex,
 	type FlaggedAccountStorageV1,
-	getStoragePath,
 	loadFlaggedAccounts,
 	snapshotAccountStorage,
 	snapshotAndClearAccounts,

lib/storage.ts

@@ -1187,10 +1187,6 @@ export function getFlaggedAccountsPath(): string {
 	return join(dirname(getStoragePath()), FLAGGED_ACCOUNTS_FILE_NAME);
 }
 
-function getFlaggedAccountsPathForStoragePath(storagePath: string): string {
-	return join(dirname(storagePath), FLAGGED_ACCOUNTS_FILE_NAME);
-}
-
 function getLegacyFlaggedAccountsPath(): string {
 	return join(dirname(getStoragePath()), LEGACY_FLAGGED_ACCOUNTS_FILE_NAME);
 }
@@ -2618,7 +2614,7 @@ export async function snapshotAccountStorage(
 	}
 
 	try {
-		await enforceSnapshotRetention(storagePath);
+		await enforceSnapshotRetention(resolvedStoragePath);
 	} catch (error) {
 		log.warn("Failed to enforce account snapshot retention", {
 			reason,
@@ -2919,7 +2915,7 @@ function assessNamedBackupRestoreCandidate(
 
 export async function restoreNamedBackup(
 	name: string,
-	options: { assessment?: BackupRestoreAssessment } = {},
+	_options: { assessment?: BackupRestoreAssessment } = {},
 ): Promise<{ imported: number; total: number; skipped: number }> {
 	const backupPath = await resolveNamedBackupRestorePath(name);
 	const candidate = await loadImportableBackupCandidate(backupPath);

test/storage-recovery-paths.test.ts

@@ -18,6 +18,7 @@ import {
 	snapshotAndClearAccounts,
 	clearAccounts,
 	getRestoreAssessment,
+	withAccountAndFlaggedStorageTransaction,
 } from "../lib/storage.js";
 import {
 	__resetSyncHistoryForTests,
@@ -989,11 +990,22 @@ describe("storage recovery paths", () => {
 			});
 		}
 
-		const backupsDir = getNamedBackupsDirectoryPath();
-		const secondSnapshotName =
+		const keptNames = (await listAccountSnapshots()).map((entry) => entry.name).sort();
+		const expectedKeptNames = [
+			firstSnapshot.name,
+			"accounts-codex-cli-sync-snapshot-2026-03-16_00-00-02_000",
+			"accounts-codex-cli-sync-snapshot-2026-03-16_00-00-03_000",
+			"accounts-codex-cli-sync-snapshot-2026-03-16_00-00-04_000",
+		].sort();
+		const expectedPrunedName =
 			"accounts-codex-cli-sync-snapshot-2026-03-16_00-00-01_000";
-		expect(existsSync(firstSnapshot.path)).toBe(true);
-		expect(existsSync(join(backupsDir, `${secondSnapshotName}.json`))).toBe(false);
+		const backupsDir = getNamedBackupsDirectoryPath();
+
+		expect(keptNames).toEqual(expectedKeptNames);
+		for (const name of expectedKeptNames) {
+			expect(existsSync(join(backupsDir, `${name}.json`))).toBe(true);
+		}
+		expect(existsSync(join(backupsDir, `${expectedPrunedName}.json`))).toBe(false);
 	});
 
 	it("retains rollback-referenced snapshots when a newer manual sync has no checkpoint", async () => {
@@ -1071,12 +1083,78 @@ describe("storage recovery paths", () => {
 
 		const result = await pruneAutoGeneratedSnapshots();
 		const backupsDir = getNamedBackupsDirectoryPath();
-		const secondSnapshotName =
-			"accounts-codex-cli-sync-snapshot-2026-03-16_01-00-01_000";
+		const expectedKeptNames = [
+			firstSnapshot.name,
+			"accounts-codex-cli-sync-snapshot-2026-03-16_01-00-02_000",
+			"accounts-codex-cli-sync-snapshot-2026-03-16_01-00-03_000",
+			"accounts-codex-cli-sync-snapshot-2026-03-16_01-00-04_000",
+		].sort();
+		const expectedAlreadyPrunedNames = [
+			"accounts-codex-cli-sync-snapshot-2026-03-16_01-00-01_000",
+		];
+
+		expect(result.kept.map((entry) => entry.name).sort()).toEqual(expectedKeptNames);
+		expect(result.pruned).toEqual([]);
+		for (const name of expectedKeptNames) {
+			expect(existsSync(join(backupsDir, `${name}.json`))).toBe(true);
+		}
+		for (const name of expectedAlreadyPrunedNames) {
+			expect(existsSync(join(backupsDir, `${name}.json`))).toBe(false);
+		}
+	});
+
+	it("enforces snapshot retention against the transaction-pinned storage path", async () => {
+		const primaryDir = join(workDir, "primary");
+		const alternateDir = join(workDir, "alternate");
+		const primaryStoragePath = join(primaryDir, "openai-codex-accounts.json");
+		const alternateStoragePath = join(alternateDir, "openai-codex-accounts.json");
+		await fs.mkdir(primaryDir, { recursive: true });
+		await fs.mkdir(alternateDir, { recursive: true });
+		setStoragePathDirect(primaryStoragePath);
+		await saveAccounts({
+			version: 3,
+			activeIndex: 0,
+			accounts: [
+				{
+					refreshToken: "tx-retention-refresh",
+					accountId: "tx-retention-account",
+					addedAt: 1,
+					lastUsed: 1,
+				},
+			],
+		});
+
+		const baseTime = Date.UTC(2026, 2, 16, 3, 0, 0, 0);
+		for (let index = 0; index < 3; index += 1) {
+			await snapshotAccountStorage({
+				reason: "codex-cli-sync",
+				now: baseTime + index * 1_000,
+			});
+		}
+
+		const primaryBackupsDir = getNamedBackupsDirectoryPath();
+		await withAccountAndFlaggedStorageTransaction(async (current) => {
+			setStoragePathDirect(alternateStoragePath);
+			await snapshotAccountStorage({
+				reason: "codex-cli-sync",
+				now: baseTime + 3_000,
+				storage: current,
+			});
+		});
 
-		expect(result.kept.map((entry) => entry.name)).toContain(firstSnapshot.name);
-		expect(existsSync(firstSnapshot.path)).toBe(true);
-		expect(existsSync(join(backupsDir, `${secondSnapshotName}.json`))).toBe(false);
+		const primarySnapshotNames = (await fs.readdir(primaryBackupsDir))
+			.filter((entry) => entry.endsWith(".json"))
+			.map((entry) => entry.slice(0, -".json".length))
+			.sort();
+		const expectedPrimaryNames = [
+			"accounts-codex-cli-sync-snapshot-2026-03-16_03-00-01_000",
+			"accounts-codex-cli-sync-snapshot-2026-03-16_03-00-02_000",
+			"accounts-codex-cli-sync-snapshot-2026-03-16_03-00-03_000",
+		].sort();
+
+		expect(primarySnapshotNames).toEqual(expectedPrimaryNames);
+		expect(existsSync(primaryStoragePath)).toBe(true);
+		expect(existsSync(alternateStoragePath)).toBe(false);
 	});
 
 	it("falls back to the newest live rollback snapshot when a newer recorded checkpoint file is missing", async () => {