fix: patch post-merge review regressions for v1.2.4

ndycode · ndycode · commit fb63443e2163 · 2026-04-05T13:31:37.000+08:00
diff --git a/README.md b/README.md
@@ -308,7 +308,7 @@ codex auth doctor --json
 
 ## Release Notes
 
-- Current stable: [docs/releases/v1.2.3.md](docs/releases/v1.2.3.md)
+- Current stable: [docs/releases/v1.2.4.md](docs/releases/v1.2.4.md)
 - Previous stable: [docs/releases/v1.2.2.md](docs/releases/v1.2.2.md)
 - Earlier stable: [docs/releases/v1.2.1.md](docs/releases/v1.2.1.md)
 - Archived prerelease: [docs/releases/v0.1.0-beta.0.md](docs/releases/v0.1.0-beta.0.md)
diff --git a/docs/README.md b/docs/README.md
@@ -23,7 +23,7 @@ Public documentation for `codex-multi-auth`.
 | [configuration.md](configuration.md) | Stable defaults, precedence, and environment overrides |
 | [architecture.md](architecture.md) | Public system overview of the wrapper, storage, and optional plugin runtime |
 | [privacy.md](privacy.md) | Data handling and local storage behavior |
-| [releases/v1.2.3.md](releases/v1.2.3.md) | Stable release notes |
+| [releases/v1.2.4.md](releases/v1.2.4.md) | Stable release notes |
 | [releases/v1.2.2.md](releases/v1.2.2.md) | Previous stable release notes |
 | [releases/v1.2.1.md](releases/v1.2.1.md) | Earlier stable release notes |
 | [releases/v1.2.0.md](releases/v1.2.0.md) | Archived stable release notes |
@@ -52,7 +52,7 @@ Public documentation for `codex-multi-auth`.
 | [reference/storage-paths.md](reference/storage-paths.md) | Canonical and compatibility storage paths |
 | [reference/public-api.md](reference/public-api.md) | Public API stability and semver contract |
 | [reference/error-contracts.md](reference/error-contracts.md) | CLI, JSON, and helper error semantics |
-| [releases/v1.2.3.md](releases/v1.2.3.md) | Current stable release notes |
+| [releases/v1.2.4.md](releases/v1.2.4.md) | Current stable release notes |
 | [releases/v0.1.0-beta.0.md](releases/v0.1.0-beta.0.md) | Archived prerelease reference |
 | [Daily Use release notes](#daily-use) | Stable, previous, and archived release notes |
 | [releases/legacy-pre-0.1-history.md](releases/legacy-pre-0.1-history.md) | Archived pre-0.1 changelog history |
diff --git a/docs/releases/v1.2.4.md b/docs/releases/v1.2.4.md
@@ -0,0 +1,35 @@
+# Release v1.2.4
+
+Release line: `stable`
+
+This patch release follows the already-published `v1.2.3` rebuild and lands the post-merge review fixes that were raised afterward.
+
+## Scope
+
+- Current package version in `package.json` is `1.2.4`.
+- Canonical command family remains `codex auth ...`.
+- Canonical package name remains `codex-multi-auth`.
+- This patch is prepared from `main` after merge commit `c1da059852d698fd53014b9b529eeeeb2db1d39d`.
+
+## What Changed
+
+- preserved standalone `config.json` values when unified settings are malformed, and hardened unified-settings writes so invalid primaries can be rebuilt safely without masking real unreadable-file errors
+- retried flagged-account primary, backup, and legacy reads before fallback so transient Windows file locks do not trigger unnecessary recovery paths
+- avoided capability-policy failure penalties on fallback stream-failover `429` responses
+- retried shadow-home sync-back renames in the Codex wrapper so transient `EBUSY` and `EPERM` locks do not drop auth-state sync
+- removed scheduler-fragile midpoint assertions from quota-refresh CLI tests and tightened dashboard/unified-settings regressions around the real legacy/unified read paths
+
+## Validation
+
+- `npm run lint`
+- `npm run typecheck`
+- `npm run build`
+- `npm test`
+- Full suite passed: `222/222` files, `3303/3303` tests
+
+## Related
+
+- [v1.2.3.md](v1.2.3.md)
+- [../getting-started.md](../getting-started.md)
+- [../upgrade.md](../upgrade.md)
+- [../reference/commands.md](../reference/commands.md)
diff --git a/index.ts b/index.ts
@@ -2192,11 +2192,11 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 																			modelFamily,
 																			model,
 																		);
+																		capabilityPolicyStore.recordFailure(
+																			fallbackEntitlementAccountKey,
+																			capabilityModelKey,
+																		);
 																	}
-																	capabilityPolicyStore.recordFailure(
-																		fallbackEntitlementAccountKey,
-																		capabilityModelKey,
-																	);
 																	continue;
 																}
 
diff --git a/lib/config.ts b/lib/config.ts
@@ -647,10 +647,7 @@ export async function savePluginConfig(
 				: loadUnifiedPluginConfigSync();
 		const unifiedConfig = sanitizeStoredPluginConfigRecord(unifiedConfigRecord);
 		const legacyPath =
-			unifiedConfigState.status === "missing" ||
-			(unifiedConfigState.status === "ok" && !unifiedConfig)
-				? resolvePluginConfigPath()
-				: null;
+			unifiedConfig === null ? resolvePluginConfigPath() : null;
 		const legacyConfigState = legacyPath
 			? await readConfigRecordForSave(legacyPath)
 			: null;
diff --git a/lib/storage/flagged-storage-file.ts b/lib/storage/flagged-storage-file.ts
@@ -8,7 +8,7 @@ function isRetryableReadError(error: unknown): boolean {
 	return typeof code === "string" && RETRYABLE_READ_CODES.has(code);
 }
 
-async function readFileWithRetry(
+export async function readFileWithRetry(
 	path: string,
 	deps: {
 		readFile: typeof import("node:fs").promises.readFile;
diff --git a/lib/storage/flagged-storage-io.ts b/lib/storage/flagged-storage-io.ts
@@ -1,6 +1,7 @@
 import { existsSync, promises as fs } from "node:fs";
 import { dirname } from "node:path";
 import type { FlaggedAccountStorageV1 } from "../storage.js";
+import { readFileWithRetry } from "./flagged-storage-file.js";
 
 const RETRYABLE_UNLINK_CODES = new Set(["EBUSY", "EAGAIN", "EPERM"]);
 
@@ -75,7 +76,9 @@ export async function loadFlaggedAccountsState(params: {
 				continue;
 			}
 			try {
-				const backupContent = await fs.readFile(backupPath, "utf-8");
+				const backupContent = await readFileWithRetry(backupPath, {
+					readFile: fs.readFile,
+				});
 				const backupData = JSON.parse(backupContent) as unknown;
 				const recovered = params.normalizeFlaggedStorage(backupData);
 				if (!isValidFlaggedStorageCandidate(backupData, recovered)) {
@@ -123,7 +126,9 @@ export async function loadFlaggedAccountsState(params: {
 	};
 
 	try {
-		const content = await fs.readFile(params.path, "utf-8");
+		const content = await readFileWithRetry(params.path, {
+			readFile: fs.readFile,
+		});
 		const data = JSON.parse(content) as unknown;
 		const loaded = params.normalizeFlaggedStorage(data);
 		if (!isValidFlaggedStorageCandidate(data, loaded)) {
@@ -154,7 +159,9 @@ export async function loadFlaggedAccountsState(params: {
 	}
 
 	try {
-		const legacyContent = await fs.readFile(params.legacyPath, "utf-8");
+		const legacyContent = await readFileWithRetry(params.legacyPath, {
+			readFile: fs.readFile,
+		});
 		const legacyData = JSON.parse(legacyContent) as unknown;
 		const migrated = params.normalizeFlaggedStorage(legacyData);
 		if (migrated.accounts.length > 0) {
diff --git a/lib/unified-settings.ts b/lib/unified-settings.ts
@@ -143,6 +143,16 @@ function shouldFallbackToSettingsBackup(
 	return true;
 }
 
+function isInvalidSettingsRecordError(error: unknown): boolean {
+	if (error instanceof SyntaxError) {
+		return true;
+	}
+	return (
+		error instanceof Error &&
+		error.message === "Unified settings must contain a JSON object at the root."
+	);
+}
+
 /**
  * Snapshot the primary settings file into `settings.json.bak` for sync writes.
  *
@@ -221,6 +231,9 @@ function readSettingsRecordSyncInternal(): SettingsReadResult {
 		if (backupRecord) {
 			return { record: backupRecord, usedBackup: true };
 		}
+		if (isInvalidSettingsRecordError(error)) {
+			return { record: null, usedBackup: false };
+		}
 		throw error;
 	}
 
@@ -255,6 +268,9 @@ async function readSettingsRecordAsyncInternal(): Promise<SettingsReadResult> {
 		if (backupRecord) {
 			return { record: backupRecord, usedBackup: true };
 		}
+		if (isInvalidSettingsRecordError(error)) {
+			return { record: null, usedBackup: false };
+		}
 		throw error;
 	}
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "codex-multi-auth",
-	"version": "1.2.3",
+	"version": "1.2.4",
 	"description": "Multi-account OAuth manager and codex auth wrapper for the official @openai/codex CLI, with switching, health checks, and recovery tools",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
diff --git a/scripts/codex.js b/scripts/codex.js
@@ -44,12 +44,7 @@ function sleepSync(ms) {
 function removeDirectoryWithRetry(targetPath) {
 	for (let attempt = 0; attempt <= SHADOW_HOME_CLEANUP_BACKOFF_MS.length; attempt += 1) {
 		try {
-			if (shadowHomeCleanupBusyFailuresRemaining > 0) {
-				shadowHomeCleanupBusyFailuresRemaining -= 1;
-				const error = new Error("simulated busy cleanup");
-				error.code = "EBUSY";
-				throw error;
-			}
+			maybeThrowSimulatedShadowHomeBusyError();
 			rmSync(targetPath, { recursive: true, force: true });
 			return;
 		} catch (error) {
@@ -229,6 +224,33 @@ function addRequestedModelReasoningAliases(alias, normalizedModel) {
 	}
 }
 
+function maybeThrowSimulatedShadowHomeBusyError() {
+	if (shadowHomeCleanupBusyFailuresRemaining > 0) {
+		shadowHomeCleanupBusyFailuresRemaining -= 1;
+		const error = new Error("simulated busy shadow-home operation");
+		error.code = "EBUSY";
+		throw error;
+	}
+}
+
+function renameFileWithRetry(sourcePath, destinationPath) {
+	for (let attempt = 0; attempt <= SHADOW_HOME_CLEANUP_BACKOFF_MS.length; attempt += 1) {
+		try {
+			maybeThrowSimulatedShadowHomeBusyError();
+			renameSync(sourcePath, destinationPath);
+			return;
+		} catch (error) {
+			if (
+				!isRetryableShadowHomeCleanupError(error) ||
+				attempt === SHADOW_HOME_CLEANUP_BACKOFF_MS.length
+			) {
+				throw error;
+			}
+			sleepSync(SHADOW_HOME_CLEANUP_BACKOFF_MS[attempt]);
+		}
+	}
+}
+
 function seedRequestedModelAliases() {
 	addRequestedModelReasoningAliases("gpt-5.4", "gpt-5.4");
 	addRequestedModelReasoningAliases("gpt-5.4-pro", "gpt-5.4-pro");
@@ -518,7 +540,7 @@ function syncShadowHomeStateFile(sourcePath, destinationPath) {
 	try {
 		mkdirSync(dirname(destinationPath), { recursive: true });
 		copyFileSync(sourcePath, tempPath);
-		renameSync(tempPath, destinationPath);
+		renameFileWithRetry(tempPath, destinationPath);
 	} catch (error) {
 		try {
 			rmSync(tempPath, { force: true });
diff --git a/test/codex-bin-wrapper.test.ts b/test/codex-bin-wrapper.test.ts
@@ -526,6 +526,7 @@ describe("codex bin wrapper", () => {
 				TMP: controlledTmp,
 				TEMP: controlledTmp,
 				TMPDIR: controlledTmp,
+				...injectShadowCleanupBusyFailures(),
 			},
 		);
 
diff --git a/test/codex-manager-cli.test.ts b/test/codex-manager-cli.test.ts
@@ -7561,7 +7561,6 @@ describe("codex manager cli commands", () => {
 					"becomes-degraded@example.com",
 				]);
 				expect(typeof options?.statusMessage?.()).toBe("string");
-				expect(fetchCodexQuotaSnapshotMock).toHaveBeenCalledTimes(3);
 
 				releaseSecondRefresh.resolve();
 				await vi.waitFor(() => {
@@ -7731,7 +7730,6 @@ describe("codex manager cli commands", () => {
 				promptCallCount += 1;
 				expect(promptCallCount).toBe(2);
 				expect(typeof options?.statusMessage?.()).toBe("string");
-				expect(fetchCodexQuotaSnapshotMock).toHaveBeenCalledTimes(3);
 
 				releaseSecondRefresh.resolve();
 				await vi.waitFor(() => {
diff --git a/test/config-save.test.ts b/test/config-save.test.ts
@@ -296,6 +296,30 @@ describe("plugin config save paths", () => {
     expect(parsed.dashboardDisplaySettings).toEqual({ uiThemePreset: "green" });
   });
 
+  it("falls back to standalone config when unified settings are invalid", async () => {
+    delete process.env.CODEX_MULTI_AUTH_CONFIG_PATH;
+    const unifiedPath = join(tempDir, "settings.json");
+    const standalonePath = join(tempDir, "config.json");
+    await fs.writeFile(unifiedPath, "{ invalid json", "utf8");
+    await fs.writeFile(
+      standalonePath,
+      JSON.stringify({ codexMode: true, preserved: 1 }),
+      "utf8",
+    );
+
+    const { savePluginConfig } = await import("../lib/config.js");
+    await savePluginConfig({ fastSession: true });
+
+    const parsed = JSON.parse(await fs.readFile(unifiedPath, "utf8")) as {
+      pluginConfig?: Record<string, unknown>;
+    };
+    expect(parsed.pluginConfig).toEqual({
+      codexMode: true,
+      preserved: 1,
+      fastSession: true,
+    });
+  });
+
   it("resolves parallel probing settings and clamps concurrency", async () => {
     const { getParallelProbing, getParallelProbingMaxConcurrency } =
       await import("../lib/config.js");
diff --git a/test/dashboard-settings.test.ts b/test/dashboard-settings.test.ts
diff --git a/test/index.test.ts b/test/index.test.ts
diff --git a/test/storage-flagged.test.ts b/test/storage-flagged.test.ts
diff --git a/test/unified-settings.test.ts b/test/unified-settings.test.ts

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ function isRetryableReadError(error: unknown): boolean {`
`8`	`8`	`return typeof code === "string" && RETRYABLE_READ_CODES.has(code);`
`9`	`9`	`}`
`10`	`10`
`11`		`-async function readFileWithRetry(`
	`11`	`+export async function readFileWithRetry(`
`12`	`12`	`path: string,`
`13`	`13`	`deps: {`
`14`	`14`	`readFile: typeof import("node:fs").promises.readFile;`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,16 @@ function shouldFallbackToSettingsBackup(`
`143`	`143`	`return true;`
`144`	`144`	`}`
`145`	`145`
	`146`	`+function isInvalidSettingsRecordError(error: unknown): boolean {`
	`147`	`+ if (error instanceof SyntaxError) {`
	`148`	`+ return true;`
	`149`	`+ }`
	`150`	`+ return (`
	`151`	`+ error instanceof Error &&`
	`152`	`+ error.message === "Unified settings must contain a JSON object at the root."`
	`153`	`+ );`
	`154`	`+}`
	`155`	`+`
`146`	`156`	`/**`
`147`	`157`	* Snapshot the primary settings file into `settings.json.bak` for sync writes.
`148`	`158`	`*`
`@@ -221,6 +231,9 @@ function readSettingsRecordSyncInternal(): SettingsReadResult {`
`221`	`231`	`if (backupRecord) {`
`222`	`232`	`return { record: backupRecord, usedBackup: true };`
`223`	`233`	`}`
	`234`	`+ if (isInvalidSettingsRecordError(error)) {`
	`235`	`+ return { record: null, usedBackup: false };`
	`236`	`+ }`
`224`	`237`	`throw error;`
`225`	`238`	`}`
`226`	`239`
`@@ -255,6 +268,9 @@ async function readSettingsRecordAsyncInternal(): Promise<SettingsReadResult> {`
`255`	`268`	`if (backupRecord) {`
`256`	`269`	`return { record: backupRecord, usedBackup: true };`
`257`	`270`	`}`
	`271`	`+ if (isInvalidSettingsRecordError(error)) {`
	`272`	`+ return { record: null, usedBackup: false };`
	`273`	`+ }`
`258`	`274`	`throw error;`
`259`	`275`	`}`
`260`	`276`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "codex-multi-auth",`
`3`		`- "version": "1.2.3",`
	`3`	`+ "version": "1.2.4",`
`4`	`4`	`"description": "Multi-account OAuth manager and codex auth wrapper for the official @openai/codex CLI, with switching, health checks, and recovery tools",`
`5`	`5`	`"main": "./dist/index.js",`
`6`	`6`	`"types": "./dist/index.d.ts",`