fix(auth): avoid false empty backup messaging

Author: ndycode

lib/codex-manager.ts

@@ -4348,8 +4348,15 @@ function getRedactedFilesystemErrorLabel(error: unknown): string {
 	return "UNKNOWN";
 }
 
+type BackupRestoreManagerAssessmentLoadResult = {
+	assessments: BackupRestoreAssessment[];
+	backupCount: number;
+	readFailed: boolean;
+	assessmentFailures: number;
+};
+
 async function loadBackupRestoreManagerAssessments(): Promise<
-	BackupRestoreAssessment[]
+	BackupRestoreManagerAssessmentLoadResult
 > {
 	let backups: Awaited<ReturnType<typeof listNamedBackups>>;
 	try {
@@ -4361,14 +4368,25 @@ async function loadBackupRestoreManagerAssessments(): Promise<
 				collapseWhitespace(message) || "unknown error"
 			}`,
 		);
-		return [];
+		return {
+			assessments: [],
+			backupCount: 0,
+			readFailed: true,
+			assessmentFailures: 0,
+		};
 	}
 	if (backups.length === 0) {
-		return [];
+		return {
+			assessments: [],
+			backupCount: 0,
+			readFailed: false,
+			assessmentFailures: 0,
+		};
 	}
 
 	const currentStorage = await loadAccounts();
 	const assessments: BackupRestoreAssessment[] = [];
+	let assessmentFailures = 0;
 	for (
 		let index = 0;
 		index < backups.length;
@@ -4395,20 +4413,43 @@ async function loadBackupRestoreManagerAssessments(): Promise<
 					collapseWhitespace(reason) || "unknown error"
 				}`,
 			);
+			assessmentFailures += 1;
 		}
 	}
 
-	return assessments;
+	return {
+		assessments,
+		backupCount: backups.length,
+		readFailed: false,
+		assessmentFailures,
+	};
 }
 
 async function runBackupRestoreManager(
 	displaySettings: DashboardDisplaySettings,
 	assessmentsOverride?: BackupRestoreAssessment[],
 ): Promise<BackupRestoreManagerResult> {
 	const backupDir = getNamedBackupsDirectoryPath();
-	const assessments =
-		assessmentsOverride ?? (await loadBackupRestoreManagerAssessments());
+	const assessmentLoad =
+		assessmentsOverride === undefined
+			? await loadBackupRestoreManagerAssessments()
+			: {
+					assessments: assessmentsOverride,
+					backupCount: assessmentsOverride.length,
+					readFailed: false,
+					assessmentFailures: 0,
+				};
+	const { assessments } = assessmentLoad;
 	if (assessments.length === 0) {
+		if (assessmentLoad.readFailed) {
+			return "dismissed";
+		}
+		if (assessmentLoad.assessmentFailures > 0) {
+			console.warn(
+				"Could not inspect any named backups. Resolve the backup read errors and try again.",
+			);
+			return "dismissed";
+		}
 		console.log(`No named backups found. Place backup files in ${backupDir}.`);
 		return "dismissed";
 	}

test/codex-manager-cli.test.ts

@@ -3497,6 +3497,7 @@ describe("codex manager cli commands", () => {
 			.mockResolvedValueOnce({ mode: "restore-backup" })
 			.mockResolvedValueOnce({ mode: "cancel" });
 		const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+		const logSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
 		try {
 			const { runCodexMultiAuthCli } = await import("../lib/codex-manager.js");
@@ -3512,11 +3513,67 @@ describe("codex manager cli commands", () => {
 					"Could not read backup directory: EPERM: operation not permitted",
 				),
 			);
+			expect(logSpy).not.toHaveBeenCalledWith(
+				expect.stringContaining("No named backups found."),
+			);
 		} finally {
+			logSpy.mockRestore();
 			errorSpy.mockRestore();
 		}
 	});
 
+	it("does not claim backups are missing when every assessment fails", async () => {
+		setInteractiveTTY(true);
+		const now = Date.now();
+		loadAccountsMock.mockResolvedValue(null);
+		listNamedBackupsMock.mockResolvedValue([
+			{
+				name: "busy-backup",
+				path: "/mock/backups/busy-backup.json",
+				createdAt: null,
+				updatedAt: now,
+				sizeBytes: 128,
+				version: 3,
+				accountCount: 1,
+				schemaErrors: [],
+				valid: true,
+				loadError: undefined,
+			},
+		]);
+		assessNamedBackupRestoreMock.mockRejectedValueOnce(
+			makeErrnoError("backup directory busy", "EBUSY"),
+		);
+		promptLoginModeMock
+			.mockResolvedValueOnce({ mode: "restore-backup" })
+			.mockResolvedValueOnce({ mode: "cancel" });
+		const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+		const logSpy = vi.spyOn(console, "log").mockImplementation(() => {});
+
+		try {
+			const { runCodexMultiAuthCli } = await import("../lib/codex-manager.js");
+			const exitCode = await runCodexMultiAuthCli(["auth", "login"]);
+
+			expect(exitCode).toBe(0);
+			expect(promptLoginModeMock).toHaveBeenCalledTimes(2);
+			expect(selectMock).not.toHaveBeenCalled();
+			expect(restoreNamedBackupMock).not.toHaveBeenCalled();
+			expect(warnSpy).toHaveBeenCalledWith(
+				expect.stringContaining(
+					'Skipped backup assessment for "busy-backup": backup directory busy',
+				),
+			);
+			expect(warnSpy).toHaveBeenCalledWith(
+				"Could not inspect any named backups. Resolve the backup read errors and try again.",
+			);
+			expect(logSpy).not.toHaveBeenCalledWith(
+				expect.stringContaining("No named backups found."),
+			);
+		} finally {
+			logSpy.mockRestore();
+			warnSpy.mockRestore();
+		}
+	});
+
 	it("keeps healthy backups selectable when one assessment fails", async () => {
 		setInteractiveTTY(true);
 		loadAccountsMock.mockResolvedValue(null);