From 44f27cd22c188644593b2095b16cb0902ecc83e0 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Mon, 20 Jul 2026 15:48:59 -0700
Subject: [PATCH] fix(codex): keep reauth validation authoritative

---
 src/main/codex-accounts/service.test.ts | 21 +++++++++++----------
 src/main/codex-accounts/service.ts      |  6 +-----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/main/codex-accounts/service.test.ts b/src/main/codex-accounts/service.test.ts
index 6d2c2ca582d..7d52109cfd9 100644
--- a/src/main/codex-accounts/service.test.ts
+++ b/src/main/codex-accounts/service.test.ts
@@ -970,16 +970,6 @@ describe('CodexAccountService config sync', () => {
     })
     const store = createStore(settings)
     const runtimeHome = createRuntimeHome()
-    runtimeHome.syncForCurrentSelection.mockImplementation(() => {
-      const current = store.getSettings()
-      store.updateSettings({
-        activeCodexManagedAccountId: null,
-        activeCodexManagedAccountIdsByRuntime: {
-          ...current.activeCodexManagedAccountIdsByRuntime!,
-          host: null
-        }
-      })
-    })
     const spawnMock = vi.fn(
       (_command: string, _args: string[], options: { env: NodeJS.ProcessEnv }) => {
         const child = new EventEmitter() as EventEmitter & {
@@ -990,6 +980,14 @@ describe('CodexAccountService config sync', () => {
         child.stdout = new PassThrough()
         child.stderr = new PassThrough()
         child.kill = vi.fn()
+        const current = store.getSettings()
+        store.updateSettings({
+          activeCodexManagedAccountId: null,
+          activeCodexManagedAccountIdsByRuntime: {
+            ...current.activeCodexManagedAccountIdsByRuntime!,
+            host: null
+          }
+        })
         writeFileSync(
           join(options.env.CODEX_HOME!, 'auth.json'),
           createCodexAuthJson('reauthenticated@example.com', 'provider-new', 'refresh-new'),
@@ -1028,6 +1026,9 @@ describe('CodexAccountService config sync', () => {
         wsl: { Ubuntu: null }
       }
     })
+    expect(runtimeHome.syncForCurrentSelection).toHaveBeenCalledTimes(1)
+    // One test-simulated clear plus one atomic account/selection update; reauth must not add a redundant persistence write.
+    expect(store.updateSettings).toHaveBeenCalledTimes(2)
   })
 
   it('does not recreate a missing managed home at a different account path', async () => {
diff --git a/src/main/codex-accounts/service.ts b/src/main/codex-accounts/service.ts
index 8b1c36a8cf1..5823099a218 100644
--- a/src/main/codex-accounts/service.ts
+++ b/src/main/codex-accounts/service.ts
@@ -283,6 +283,7 @@ export class CodexAccountService {
         : entry
     )
 
+    // Why: runtime validation can clear selection while login rewrites auth.json; restore it before syncing fresh auth.
     this.store.updateSettings({
       codexManagedAccounts: updatedAccounts,
       activeCodexManagedAccountId: activeSelection.host,
@@ -297,11 +298,6 @@ export class CodexAccountService {
       undefined,
       getCodexSelectionTargetForAccount(account)
     )
-    // Why: runtime-home validation can clear the selection during reauth's credential transition.
-    this.store.updateSettings({
-      activeCodexManagedAccountId: activeSelection.host,
-      activeCodexManagedAccountIdsByRuntime: activeSelection
-    })
     return this.getSnapshot()
   }