fix(storage): fail export when current pool is empty

Author: ndycode

lib/storage.ts

@@ -1432,6 +1432,58 @@ async function loadAccountsInternal(
 	}
 }
 
+async function loadAccountsForExport(): Promise<AccountStorageV3 | null> {
+	const path = getStoragePath();
+	const resetMarkerPath = getIntentionalResetMarkerPath(path);
+	const migratedLegacyStorage =
+		await migrateLegacyProjectStorageIfNeeded(saveAccountsUnlocked);
+
+	if (existsSync(resetMarkerPath)) {
+		return createEmptyStorageWithMetadata(false, "intentional-reset");
+	}
+
+	try {
+		const { normalized, storedVersion, schemaErrors } = await loadAccountsFromPath(
+			path,
+			{
+				normalizeAccountStorage,
+				isRecord,
+			},
+		);
+		if (schemaErrors.length > 0) {
+			log.warn("Account storage schema validation warnings", {
+				errors: schemaErrors.slice(0, 5),
+			});
+		}
+		if (normalized && storedVersion !== normalized.version) {
+			log.info("Migrating account storage to v3", {
+				from: storedVersion,
+				to: normalized.version,
+			});
+			try {
+				await saveAccountsUnlocked(normalized);
+			} catch (saveError) {
+				log.warn("Failed to persist migrated storage", {
+					error: String(saveError),
+				});
+			}
+		}
+		if (existsSync(resetMarkerPath)) {
+			return createEmptyStorageWithMetadata(false, "intentional-reset");
+		}
+		return normalized;
+	} catch (error) {
+		const code = (error as NodeJS.ErrnoException).code;
+		if (existsSync(resetMarkerPath)) {
+			return createEmptyStorageWithMetadata(false, "intentional-reset");
+		}
+		if (code === "ENOENT") {
+			return migratedLegacyStorage;
+		}
+		throw error;
+	}
+}
+
 async function saveAccountsUnlocked(storage: AccountStorageV3): Promise<void> {
 	const path = getStoragePath();
 	const resetMarkerPath = getIntentionalResetMarkerPath(path);
@@ -1788,9 +1840,8 @@ export async function exportAccounts(
 		force,
 		currentStoragePath,
 		transactionState: getTransactionSnapshotState(),
-		loadAccountsInternal: () => loadAccountsInternal(saveAccountsUnlocked),
-		readCurrentStorage: () =>
-			withAccountStorageTransaction((current) => Promise.resolve(current)),
+		readCurrentStorageUnlocked: loadAccountsForExport,
+		readCurrentStorage: () => withStorageLock(loadAccountsForExport),
 		exportAccountsToFile,
 		beforeCommit,
 		logInfo: (message, details) => {

lib/storage/account-port.ts

@@ -11,7 +11,7 @@ export async function exportAccountsSnapshot(params: {
 				snapshot: AccountStorageV3 | null;
 		  }
 		| undefined;
-	loadAccountsInternal: () => Promise<AccountStorageV3 | null>;
+	readCurrentStorageUnlocked: () => Promise<AccountStorageV3 | null>;
 	readCurrentStorage: () => Promise<AccountStorageV3 | null>;
 	exportAccountsToFile: (args: {
 		resolvedPath: string;
@@ -28,7 +28,7 @@ export async function exportAccountsSnapshot(params: {
 		params.transactionState.storagePath === params.currentStoragePath
 			? params.transactionState.snapshot
 			: params.transactionState?.active
-				? await params.loadAccountsInternal()
+				? await params.readCurrentStorageUnlocked()
 				: await params.readCurrentStorage();
 
 	await params.exportAccountsToFile({

test/account-port.test.ts

@@ -5,28 +5,79 @@ import {
 } from "../lib/storage/account-port.js";
 
 describe("account port helpers", () => {
-	it("exports transaction snapshot when active", async () => {
+	it("exports transaction snapshot when active for the current storage path", async () => {
 		const exportAccountsToFile = vi.fn(async () => undefined);
+		const snapshot = {
+			version: 3 as const,
+			accounts: [{ refreshToken: "snapshot-token" }],
+			activeIndex: 0,
+			activeIndexByFamily: {},
+		};
+		const readCurrentStorageUnlocked = vi.fn();
+		const readCurrentStorage = vi.fn();
+
 		await exportAccountsSnapshot({
 			resolvedPath: "/tmp/out.json",
 			force: true,
 			currentStoragePath: "/tmp/accounts.json",
 			transactionState: {
 				active: true,
 				storagePath: "/tmp/accounts.json",
+				snapshot,
+			},
+			readCurrentStorageUnlocked,
+			readCurrentStorage,
+			exportAccountsToFile,
+			logInfo: vi.fn(),
+		});
+		expect(readCurrentStorageUnlocked).not.toHaveBeenCalled();
+		expect(readCurrentStorage).not.toHaveBeenCalled();
+		expect(exportAccountsToFile).toHaveBeenCalledWith(
+			expect.objectContaining({
+				storage: snapshot,
+			}),
+		);
+	});
+
+	it("reads current storage without reusing a stale transaction snapshot from another path", async () => {
+		const exportAccountsToFile = vi.fn(async () => undefined);
+		const readCurrentStorageUnlocked = vi.fn(async () => ({
+			version: 3 as const,
+			accounts: [{ refreshToken: "live-token" }],
+			activeIndex: 0,
+			activeIndexByFamily: {},
+		}));
+		const readCurrentStorage = vi.fn();
+
+		await exportAccountsSnapshot({
+			resolvedPath: "/tmp/out.json",
+			force: true,
+			currentStoragePath: "/tmp/accounts.json",
+			transactionState: {
+				active: true,
+				storagePath: "/tmp/other.json",
 				snapshot: {
 					version: 3,
-					accounts: [],
+					accounts: [{ refreshToken: "stale-token" }],
 					activeIndex: 0,
 					activeIndexByFamily: {},
 				},
 			},
-			loadAccountsInternal: vi.fn(),
-			readCurrentStorage: vi.fn(),
+			readCurrentStorageUnlocked,
+			readCurrentStorage,
 			exportAccountsToFile,
 			logInfo: vi.fn(),
 		});
-		expect(exportAccountsToFile).toHaveBeenCalled();
+
+		expect(readCurrentStorageUnlocked).toHaveBeenCalledTimes(1);
+		expect(readCurrentStorage).not.toHaveBeenCalled();
+		expect(exportAccountsToFile).toHaveBeenCalledWith(
+			expect.objectContaining({
+				storage: expect.objectContaining({
+					accounts: [{ refreshToken: "live-token" }],
+				}),
+			}),
+		);
 	});
 
 	it("imports through transaction helper and logs result", async () => {

test/experimental-sync-target-entry.test.ts

@@ -67,7 +67,7 @@ describe("experimental sync target entry", () => {
 
 		expect(capturedReadJson).toBeDefined();
 		expect(readFileWithRetry).toHaveBeenCalledWith("C:\\state.json", {
-			retryableCodes: new Set(["EBUSY", "EPERM", "EAGAIN", "ENOTEMPTY", "EACCES"]),
+			retryableCodes: new Set(["EBUSY", "EPERM", "EAGAIN"]),
 			maxAttempts: 4,
 			sleep,
 		});