fix(auth):_close_backup_restore_review_gaps

Author: ndycode

lib/accounts.ts

@@ -92,7 +92,12 @@ export interface ManagedAccount {
 	expires?: number;
 	addedAt: number;
 	lastUsed: number;
-	lastSwitchReason?: "rate-limit" | "initial" | "rotation" | "best";
+        lastSwitchReason?:
+                | "rate-limit"
+                | "initial"
+                | "rotation"
+                | "best"
+                | "restore";
 	lastRateLimitReason?: RateLimitReason;
 	rateLimitResetTimes: RateLimitStateV3;
 	coolingDownUntil?: number;

lib/codex-manager.ts

@@ -37,6 +37,7 @@ import {
 	summarizeForecast,
 	type ForecastAccountResult,
 } from "./forecast.js";
+import { createLogger } from "./logger.js";
 import { MODEL_FAMILIES, type ModelFamily } from "./prompts/codex.js";
 import {
 	fetchCodexQuotaSnapshot,
@@ -92,6 +93,7 @@ type TokenSuccessWithAccount = TokenSuccess & {
 	accountLabel?: string;
 };
 type PromptTone = "accent" | "success" | "warning" | "danger" | "muted";
+const log = createLogger("codex-manager");
 
 function stylePromptText(text: string, tone: PromptTone): string {
 	if (!output.isTTY) return text;
@@ -4359,7 +4361,10 @@ async function runAuthLogin(): Promise<number> {
 		if (existingCount === 0) {
 			try {
 				namedBackups = await getNamedBackups();
-			} catch {
+			} catch (error) {
+				log.debug("getNamedBackups failed, skipping restore option", {
+					error: error instanceof Error ? error.message : String(error),
+				});
 				namedBackups = [];
 			}
 		}
@@ -4413,7 +4418,7 @@ async function runAuthLogin(): Promise<number> {
 								storage: restoredStorage,
 								targetIndex,
 								parsed: targetIndex + 1,
-								switchReason: "rotation",
+								switchReason: "restore",
 								preserveActiveIndexByFamily: true,
 							});
 							console.log(
@@ -4541,7 +4546,7 @@ async function persistAndSyncSelectedAccount({
 	storage: NonNullable<Awaited<ReturnType<typeof loadAccounts>>>;
 	targetIndex: number;
 	parsed: number;
-	switchReason: "rotation" | "best";
+	switchReason: "rotation" | "best" | "restore";
 	initialSyncIdToken?: string;
 	preserveActiveIndexByFamily?: boolean;
 }): Promise<{ synced: boolean; wasDisabled: boolean }> {

lib/schemas.ts

@@ -82,7 +82,13 @@ export type CooldownReasonFromSchema = z.infer<typeof CooldownReasonSchema>;
 /**
  * Last switch reason for account rotation tracking.
  */
-export const SwitchReasonSchema = z.enum(["rate-limit", "initial", "rotation", "best"]);
+export const SwitchReasonSchema = z.enum([
+        "rate-limit",
+        "initial",
+        "rotation",
+        "best",
+        "restore",
+]);
 
 export type SwitchReasonFromSchema = z.infer<typeof SwitchReasonSchema>;
 

lib/storage.ts

@@ -909,7 +909,19 @@ export async function restoreAccountsFromBackup(
 		throw new Error(`Backup path must stay inside ${resolvedBackupRoot}: ${path}`);
 	}
 
-	const { normalized } = await loadAccountsFromPath(resolvedBackupPath);
+	const { normalized } = await (async () => {
+		try {
+			return await loadAccountsFromPath(resolvedBackupPath);
+		} catch (error) {
+			const code = (error as NodeJS.ErrnoException).code;
+			if (code === "ENOENT") {
+				throw new Error(
+					`Backup file no longer exists: ${resolvedBackupPath}`,
+				);
+			}
+			throw error;
+		}
+	})();
 	if (!normalized || normalized.accounts.length === 0) {
 		throw new Error(`Backup does not contain any accounts: ${resolvedBackupPath}`);
 	}
@@ -2173,7 +2185,8 @@ function normalizeFlaggedStorage(data: unknown): FlaggedAccountStorageV1 {
 			value === "rate-limit" ||
 			value === "initial" ||
 			value === "rotation" ||
-			value === "best";
+			value === "best" ||
+			value === "restore";
 		const isCooldownReason = (
 			value: unknown,
 		): value is AccountMetadataV3["cooldownReason"] =>

lib/storage/migrations.ts

@@ -25,7 +25,12 @@ export interface AccountMetadataV1 {
 	enabled?: boolean;
 	addedAt: number;
 	lastUsed: number;
-	lastSwitchReason?: "rate-limit" | "initial" | "rotation" | "best";
+        lastSwitchReason?:
+                | "rate-limit"
+                | "initial"
+                | "rotation"
+                | "best"
+                | "restore";
 	rateLimitResetTime?: number;
 	coolingDownUntil?: number;
 	cooldownReason?: CooldownReason;
@@ -50,7 +55,12 @@ export interface AccountMetadataV3 {
 	enabled?: boolean;
 	addedAt: number;
 	lastUsed: number;
-	lastSwitchReason?: "rate-limit" | "initial" | "rotation" | "best";
+        lastSwitchReason?:
+                | "rate-limit"
+                | "initial"
+                | "rotation"
+                | "best"
+                | "restore";
 	rateLimitResetTimes?: RateLimitStateV3;
 	coolingDownUntil?: number;
 	cooldownReason?: CooldownReason;

test/codex-manager-cli.test.ts

@@ -30,13 +30,17 @@ const detectOcChatgptMultiAuthTargetMock = vi.fn();
 const normalizeAccountStorageMock = vi.fn((value) => value);
 const withAccountStorageTransactionMock = vi.fn();
 const withAccountAndFlaggedStorageTransactionMock = vi.fn();
+const loggerDebugMock = vi.fn();
+const loggerInfoMock = vi.fn();
+const loggerWarnMock = vi.fn();
+const loggerErrorMock = vi.fn();
 
 vi.mock("../lib/logger.js", () => ({
 	createLogger: vi.fn(() => ({
-		debug: vi.fn(),
-		info: vi.fn(),
-		warn: vi.fn(),
-		error: vi.fn(),
+		debug: loggerDebugMock,
+		info: loggerInfoMock,
+		warn: loggerWarnMock,
+		error: loggerErrorMock,
 	})),
 	logWarn: vi.fn(),
 }));
@@ -3244,6 +3248,10 @@ describe("codex manager cli commands", () => {
 		expect(signInItems.some((item) => item.value === "restore-backup")).toBe(
 			false,
 		);
+		expect(loggerDebugMock).toHaveBeenCalledWith(
+			"getNamedBackups failed, skipping restore option",
+			{ error: "backups directory is locked" },
+		);
 	});
 
 	it("keeps the restored pool when Codex sync returns false", async () => {

test/storage-last-backup.test.ts

@@ -360,6 +360,45 @@ describe("storage last backup restore", () => {
 		}
 	});
 
+	it("throws a clear error when a backup disappears after restore realpath", async () => {
+		const backupPath = buildNamedBackupPath("backup-disappeared-after-realpath");
+		await fs.mkdir(dirname(backupPath), { recursive: true });
+		await fs.writeFile(
+			backupPath,
+			JSON.stringify({
+				version: 3,
+				activeIndex: 0,
+				activeIndexByFamily: { codex: 0 },
+				accounts: [{ refreshToken: "gone-refresh", addedAt: 1, lastUsed: 1 }],
+			}),
+			"utf-8",
+		);
+
+		const originalReadFile = fs.readFile.bind(fs);
+		const readFileSpy = vi.spyOn(fs, "readFile").mockImplementation(async (path, options) => {
+			if (String(path) === backupPath) {
+				await fs.rm(backupPath, { force: true });
+				const error = new Error(
+					`ENOENT: no such file or directory, open '${backupPath}'`,
+				) as NodeJS.ErrnoException;
+				error.code = "ENOENT";
+				throw error;
+			}
+			return originalReadFile(
+				path as Parameters<typeof originalReadFile>[0],
+				options as Parameters<typeof originalReadFile>[1],
+			);
+		});
+
+		try {
+			await expect(restoreAccountsFromBackup(backupPath)).rejects.toThrow(
+				`Backup file no longer exists: ${backupPath}`,
+			);
+		} finally {
+			readFileSpy.mockRestore();
+		}
+	});
+
 	it("rejects restore paths outside the managed named-backup root", async () => {
 		const backupPath = buildNamedBackupPath("backup-inside-root");
 		const escapedBackupPath = join(testRoot, "backup-outside-root.json");