test: cover login-oauth account selection and cancellation predicates - #559

Summary

The phase-4-extracted login machinery (lib/codex-manager/login-oauth.ts) previously had only indirect coverage through the CLI suites. This adds a direct suite (test/login-oauth-selection.test.ts, 10 tests) for its three exported building blocks: resolveAccountSelection, isOAuthCancellation, and isAbortError.

Note: this resolveAccountSelection is distinct from the deps-injected one in lib/runtime/account-selection.ts (already covered by test/account-selection.test.ts). The login-oauth variant runs the real candidate extraction (getAccountIdCandidates / resolveOrgOverride / selectBestAccountCandidate) — only decodeJWT is mocked, via a vi.hoisted token→payload map with an importOriginal spread so the rest of lib/auth/auth.js stays live.

What the tests pin

resolveAccountSelection:

• No candidates → tokens returned unchanged, no workspaces field.
• Single token candidate adopted with accountIdSource: "token" and surfaced as a default-enabled workspace.
• Multi-candidate selection prefers the default non-personal org, and every workspace from the token persists (the issue [feature] Support registering multiple workspaces for the same email (personal + business/team under one Google account) #491/Same email + different workspace login says 'Added account' but overwrites existing saved entry #512 contract that lets workspace <account> switch later).
• Explicit --org matching a candidate → accountIdSource: "manual", candidate label reused, and workspaces still built on the explicit-binding path (Same email + different workspace login says 'Added account' but overwrites existing saved entry #512).
• Unknown --org → bare manual binding, no fabricated label.
• CODEX_AUTH_ACCOUNT_ID env fallback applies when no --org is given; an explicit --org wins over it; a whitespace-only --org falls through to the env override.

Predicates:

• isOAuthCancellation matches cancelled/canceled case-insensitively in either message or reason, and rejects everything else.
• isAbortError accepts AbortError names and ABORT_ERR codes on real Error instances only — plain objects and strings are rejected.

The env override is saved/restored around every test so the suite can't leak CODEX_AUTH_ACCOUNT_ID into other suites.

Validation

• vitest run test/login-oauth-selection.test.ts — 10/10 passing
• npm run typecheck — clean
• npx eslint test/login-oauth-selection.test.ts --max-warnings=0 — clean

https://claude.ai/code/session_01XNtnkLbBiXZxfQQYLMpucB

Generated by Claude Code

note: greptile review for oc-chatgpt-multi-auth. cite files like lib/foo.ts:123. confirm regression tests + windows concurrency/token redaction coverage.

Greptile Summary

adds a direct 10-test vitest suite (test/login-oauth-selection.test.ts) for the three exported building blocks in lib/codex-manager/login-oauth.ts — resolveAccountSelection, isOAuthCancellation, and isAbortError — which previously only had indirect CLI-level coverage.

• resolveAccountSelection tests span the zero-candidate, single-candidate, multi-candidate, explicit --org, unknown --org, env-fallback, and whitespace-override paths, with decodeJWT stubbed via a vi.hoisted token→payload map while the rest of lib/auth/auth.js stays live through importOriginal.
• isOAuthCancellation and isAbortError predicate tests cover positive and negative branches including the reason fallback field, case-insensitive matching, and the instanceof Error guard.
• env isolation uses a module-load-time snapshot of CODEX_AUTH_ACCOUNT_ID with beforeEach/afterEach save-restore; note that this still mutates process.env directly, so running with widened vitest worker parallelism carries the concurrency risk flagged in the existing review thread.

Confidence Score: 5/5

test-only addition; no production code touched, safe to merge.

the change is a new test file with no production code modifications. the happy-path and error-path assertions for all three exported functions are present and correct; the two thin env-override tests are coverage gaps rather than incorrect assertions. no risk of regression to the auth machinery itself.

test/login-oauth-selection.test.ts — the two env-override tests (lines 156-169 and 183-192) could be strengthened, but they do not cause any test to mis-pass.

Important Files Changed

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[resolveAccountSelection] --> B{getAccountIdCandidates}
    B -->|length == 0| C[return tokens unchanged]
    B -->|length > 0| D{resolveOrgOverride}
    D -->|override present| E[find matched candidate]
    E --> F[return manual binding + workspaces]
    D -->|no override| G{length == 1?}
    G -->|yes| H[return single candidate + workspaces]
    G -->|no| I[selectBestAccountCandidate]
    I -->|best found| J[return best + workspaces]
    I -->|no best| C

    subgraph ENV["env-override priority"]
        K["explicit --org arg"] -->|wins| D
        L["CODEX_AUTH_ACCOUNT_ID env"] -->|fallback| D
        M["whitespace-only --org"] -->|treated as absent| D
    end

Fix the following 2 code review issues. Work through them one at a time, proposing concise fixes.

---

### Issue 1 of 2
test/login-oauth-selection.test.ts:183-192
**thin assertions on the whitespace-fallback path**

the test verifies that `accountIdOverride` resolves to the env value, but omits `accountIdSource`, `accountLabel`, and `workspaces`. the whitespace-only `--org` goes through the same `override` branch as every other explicit-binding path (source lines 111-125), so the #512 workspace-persistence contract and the `"manual"` source type are equally in-scope here. a regression that dropped `workspaces` on this path or mis-labelled the source would pass this test unnoticed.

### Issue 2 of 2
test/login-oauth-selection.test.ts:156-169
**missing `accountIdSource` and `workspaces` in the priority test**

the test confirms the winning `accountIdOverride` and `accountLabel`, but neither `accountIdSource` (should be `"manual"`) nor `workspaces` (both `org_env` and `org_cli` should be present) are asserted. since the PR description calls out the #512 contract on the explicit-binding path, and the parallel "binds explicit --org" test at line 110 does check `workspaces`, omitting it here leaves the priority path partially unverified.

_{Reviews (2): Last reviewed commit: "test: strengthen login-oauth assertions ..." | Re-trigger Greptile}