fix: cover remaining review regressions

Author: ndycode

scripts/codex.js

@@ -28,6 +28,10 @@ let shadowHomeCleanupBusyFailuresRemaining = Number.parseInt(
 	process.env.CODEX_MULTI_AUTH_TEST_SHADOW_CLEANUP_BUSY_FAILURES ?? "0",
 	10,
 );
+let shadowHomeCleanupPreflightReadBusyFailuresRemaining = Number.parseInt(
+	process.env.CODEX_MULTI_AUTH_TEST_SHADOW_PREFLIGHT_READ_BUSY_FAILURES ?? "0",
+	10,
+);
 
 function isRetryableShadowHomeCleanupError(error) {
 	const code = error && typeof error === "object" && "code" in error ? error.code : undefined;
@@ -233,11 +237,22 @@ function maybeThrowSimulatedShadowHomeBusyError() {
 	}
 }
 
+function maybeThrowSimulatedShadowHomePreflightReadBusyError() {
+	if (shadowHomeCleanupPreflightReadBusyFailuresRemaining > 0) {
+		shadowHomeCleanupPreflightReadBusyFailuresRemaining -= 1;
+		const error = new Error("simulated busy shadow-home preflight read");
+		error.code = "EBUSY";
+		throw error;
+	}
+}
+
 function ensureShadowHomeDestinationMatchesSnapshot(destinationPath, expectedState) {
 	if (!expectedState) {
 		return;
 	}
-	const currentState = captureShadowHomeState(destinationPath);
+	const currentState = captureShadowHomeState(destinationPath, {
+		rethrowRetryableReadErrors: true,
+	});
 	if (!shadowHomeStateMatches(currentState, expectedState)) {
 		const error = new Error("shadow-home destination changed during sync-back retry");
 		error.code = "EEXIST";
@@ -526,16 +541,22 @@ function ensureTrailingNewline(value) {
 	return value.endsWith("\n") ? value : `${value}\n`;
 }
 
-function captureShadowHomeState(filePath) {
+function captureShadowHomeState(filePath, options = {}) {
 	try {
 		if (!existsSync(filePath)) {
 			return { exists: false, content: null };
 		}
+		if (options.rethrowRetryableReadErrors) {
+			maybeThrowSimulatedShadowHomePreflightReadBusyError();
+		}
 		return {
 			exists: true,
 			content: readFileSync(filePath, "utf8"),
 		};
-	} catch {
+	} catch (error) {
+		if (options.rethrowRetryableReadErrors && isRetryableShadowHomeCleanupError(error)) {
+			throw error;
+		}
 		return { exists: true, content: null, unreadable: true };
 	}
 }

test/codex-bin-wrapper.test.ts

@@ -94,6 +94,16 @@ function injectShadowCleanupBusyFailures(
 	};
 }
 
+function injectShadowPreflightReadBusyFailures(
+	failuresBeforeSuccess = 2,
+): NodeJS.ProcessEnv {
+	return {
+		CODEX_MULTI_AUTH_TEST_SHADOW_PREFLIGHT_READ_BUSY_FAILURES: String(
+			failuresBeforeSuccess,
+		),
+	};
+}
+
 function createFakeGlobalCodexInstall(rootDir: string): string {
 	const fakeBin = join(rootDir, "@openai", "codex", "bin", "codex.js");
 	mkdirSync(dirname(fakeBin), { recursive: true });
@@ -600,6 +610,47 @@ describe("codex bin wrapper", () => {
 		).toBe('{"last":"external-during-retry"}');
 	});
 
+	it("retries preflight destination reads when the sync-back target is transiently locked", () => {
+		const fixtureRoot = createWrapperFixture();
+		const fakeBin = createCustomFakeCodexBin(fixtureRoot, [
+			"#!/usr/bin/env node",
+			'const fs = require("node:fs");',
+			'const path = require("node:path");',
+			'const home = process.env.CODEX_HOME ?? "";',
+			'fs.writeFileSync(path.join(home, "auth.json"), \'{"token":"shadow"}\\n\', "utf8");',
+			'fs.writeFileSync(path.join(home, "accounts.json"), \'{"accounts":["shadow"]}\\n\', "utf8");',
+			'fs.writeFileSync(path.join(home, ".codex-global-state.json"), \'{"last":"shadow"}\\n\', "utf8");',
+			"process.exit(0);",
+		]);
+		const originalHome = join(fixtureRoot, "codex-home");
+		const controlledTmp = join(fixtureRoot, "tmp");
+		mkdirSync(originalHome, { recursive: true });
+		mkdirSync(controlledTmp, { recursive: true });
+		writeFileSync(join(originalHome, "auth.json"), '{"token":"original"}\n', "utf8");
+		writeFileSync(join(originalHome, "accounts.json"), '{"accounts":["original"]}\n', "utf8");
+		writeFileSync(join(originalHome, ".codex-global-state.json"), '{"last":"original"}\n', "utf8");
+		writeFileSync(join(originalHome, "config.toml"), 'model_reasoning_effort = "xhigh"\n', "utf8");
+
+		const result = runWrapper(
+			fixtureRoot,
+			["exec", "status", "--model", "gpt-5.1"],
+			{
+				CODEX_MULTI_AUTH_REAL_CODEX_BIN: fakeBin,
+				CODEX_HOME: originalHome,
+				TMP: controlledTmp,
+				TEMP: controlledTmp,
+				TMPDIR: controlledTmp,
+				...injectShadowCleanupBusyFailures(1),
+				...injectShadowPreflightReadBusyFailures(2),
+			},
+		);
+
+		expect(result.status).toBe(0);
+		expect(readFileSync(join(originalHome, "auth.json"), "utf8").trim()).toBe('{"token":"shadow"}');
+		expect(readFileSync(join(originalHome, "accounts.json"), "utf8").trim()).toBe('{"accounts":["shadow"]}');
+		expect(readFileSync(join(originalHome, ".codex-global-state.json"), "utf8").trim()).toBe('{"last":"shadow"}');
+	});
+
 	it("rewrites unquoted config reasoning effort values for mini compatibility models", () => {
 		const fixtureRoot = createWrapperFixture();
 		const fakeBin = createCustomFakeCodexBin(fixtureRoot, [

test/unified-settings.test.ts

@@ -426,6 +426,32 @@ describe("unified settings", () => {
 		});
 	});
 
+	it("overwrites invalid primary settings with sync plugin saves when no usable backup exists", async () => {
+		const {
+			getUnifiedSettingsPath,
+			saveUnifiedPluginConfigSync,
+			loadUnifiedPluginConfigSync,
+		} = await import("../lib/unified-settings.js");
+
+		await fs.writeFile(getUnifiedSettingsPath(), "{ invalid json", "utf8");
+
+		saveUnifiedPluginConfigSync({ codexMode: true, fetchTimeoutMs: 45_000 });
+
+		expect(loadUnifiedPluginConfigSync()).toEqual({
+			codexMode: true,
+			fetchTimeoutMs: 45_000,
+		});
+		const parsed = JSON.parse(
+			await fs.readFile(getUnifiedSettingsPath(), "utf8"),
+		) as {
+			pluginConfig?: Record<string, unknown>;
+		};
+		expect(parsed.pluginConfig).toEqual({
+			codexMode: true,
+			fetchTimeoutMs: 45_000,
+		});
+	});
+
 	it("returns null for missing pluginConfig section", async () => {
 		const { getUnifiedSettingsPath, loadUnifiedPluginConfigSync } =
 			await import("../lib/unified-settings.js");