Resolve and pin MCP OAuth credential stores by stevenlee-oai · Pull Request #30293 · openai/codex

stevenlee-oai · 2026-06-26T21:18:24Z

Codex Thread 019edd6d-6f14-74e2-853c-345d1803d4a6

Stack

Review and merge in order. Every layer is independently correct and documents its safe stopping point.

openai/codex#30292 — aggregate File/Secrets store locking
openai/codex#30293 — resolve and lifecycle-pin the exact OAuth store
openai/codex#30416 — serialized authoritative refresh transaction
openai/codex#30294 — Codex-owned transport refresh and one-shot 401 recovery
openai/codex#30295 — login/logout transaction serialization
openai/codex#30296 — diagnostic-only Auto store drift reporting

This PR is layer 2.

Why

Auto is keyring-first with a File fallback, but re-evaluating that policy during transport reconstruction or persistence can make one MCP client read from one store and later write to another. With rotating refresh tokens, the second store may contain an older token. This layer makes the source selected at client startup explicit and keeps that authority stable for the client lifecycle.

What this PR does

Keeps resolve_oauth_tokens_from_store_policy as the single configured-policy entry point and returns both credentials and the concrete File or Keyring source that supplied them.
Puts exact load, save, and delete operations on ResolvedOAuthCredentialStore, making “resolve configured policy” and “use the selected authority” distinct at call sites.
Pins the first concrete source in pinned_credential_store in the transport recipe, so initialization retries and session reconstruction cannot re-evaluate Auto and adopt another store.
Gives OAuthPersistor the resolved store and keeps subsequent persistence and removal on that authority.
Uses a typed keyring-load error to distinguish aggregate-store coordination failures from ordinary backend failures; a coordination failure is surfaced instead of triggering File fallback.
Keeps login-time Auto behavior unchanged: prefer Keyring, fall back to File when unavailable, and clean up legacy File state after a successful keyring save.
Adds structured server/backend context when fallback cleanup fails.

Explicit decisions and non-goals

The selection is lifecycle-local and in memory. This PR does not add a durable backend selector, migration, reconciliation registry, or global source of truth outside CODEX_HOME.
Auto may choose File at the start of a later process if keyring availability changes. Once this client resolves, a selected-store failure is returned instead of hot-switching.
Different CODEX_HOME instances remain independent even when they can access the same Direct keyring credential.
Cross-process refresh serialization is intentionally not part of this layer.

Safe stopping point

This PR can merge alone. A single MCP client no longer hot-switches credential stores across transport rebuilds or persistence. Two processes can still refresh the same selected credential concurrently until layer 3.

Review size

The net layer is 9 files, +668/−144. The production change remains focused on store resolution and lifecycle pinning; the largest follow-up is integration coverage that drives real session recovery.

Validation

just test -p codex-rmcp-client (99 passed; 5 expected skips)
Real-client 404 recovery coverage with different Keyring and File tokens; captured bearer headers prove the stale File token is never sent
Mutation check: removing the lifecycle pin makes that integration regression fail by observing the stale File token

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c432fcdffc

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

stevenlee-oai · 2026-06-26T22:39:39Z

@codex review

chatgpt-codex-connector · 2026-06-26T22:44:27Z

Codex Review: Didn't find any major issues. Another round soon, please!

Reviewed commit: c93f2368a5

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

stevenlee-oai · 2026-06-26T22:57:36Z

@codex review

chatgpt-codex-connector · 2026-06-26T23:03:00Z

Codex Review: Didn't find any major issues. Already looking forward to the next diff.

Reviewed commit: 2722bf8ad5

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

stevenlee-oai · 2026-06-28T07:10:59Z

@codex review

— Codex

chatgpt-codex-connector · 2026-06-28T07:14:07Z

Codex Review: Didn't find any major issues. More of your lovely PRs please.

Reviewed commit: fb2c35f05a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[Codex Thread 019edd6d-6f14-74e2-853c-345d1803d4a6](https://codex-thread-link.openai.chatgpt-team.site/thread/019edd6d-6f14-74e2-853c-345d1803d4a6) ## Stack Review and merge in order. Every layer is independently correct and documents its safe stopping point. 1. [#30292](#30292) — aggregate File/Secrets store locking 2. [#30293](#30293) — resolve and lifecycle-pin the exact OAuth store 3. [#30416](#30416) — serialized authoritative refresh transaction 4. [#30294](#30294) — Codex-owned transport refresh and one-shot 401 recovery 5. [#30295](#30295) — login/logout transaction serialization 6. [#30296](#30296) — diagnostic-only Auto store drift reporting **This PR is layer 1.** ## Why MCP OAuth credentials stored in File or Secrets share one aggregate map. Concurrent read-modify-write operations for different MCP servers can both read the same snapshot and let the later write discard the earlier update. That is a correctness problem independent of refresh-token rotation. ## What this PR does - Adds a bounded cross-process lock around aggregate File and Secrets loads, saves, and deletes. - Distinguishes aggregate-lock failures from Secrets backend unavailability, so Auto can fall back only for the latter and cannot bypass serialization by reading or writing File. - Keeps Direct keyring operations outside this lock because they are already per credential. - Releases the Secrets aggregate lock before legacy File cleanup so cross-store cleanup cannot create nested aggregate-lock ordering. - Tests actual contention by waiting for an observed `WouldBlock`, rather than assuming a sleeping worker reached the lock. - Tests load and save with only the Secrets lock path broken while fallback File remains readable and writable. ## Decisions and non-goals - This lock protects aggregate-store read-modify-write integrity only. It does not choose a credential authority or serialize an OAuth refresh transaction. - The lock is scoped to the active `CODEX_HOME`, matching the aggregate files it protects. - Lock waits are bounded, and coordination failures are surfaced rather than treated as evidence that Secrets is unavailable. ## Safe stopping point This PR can merge alone. It prevents lost updates and partial aggregate reads. Auto can still resolve again during a client lifecycle until layer 2, and concurrent refreshes remain possible until layer 3. ## Validation - `just test -p codex-rmcp-client` (96 passed; expected environment skips) - Focused aggregate File/Secrets lock contention and Auto fallback tests

stevenlee-oai · 2026-07-07T04:30:17Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e5dc9f3632

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

stevenlee-oai · 2026-07-07T22:41:24Z

@codex review

— Codex

chatgpt-codex-connector · 2026-07-07T22:45:49Z

Codex Review: Didn't find any major issues. Already looking forward to the next diff.

Reviewed commit: f538e9d731

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

stevenlee-oai · 2026-07-07T23:13:59Z

@codex review

— Codex

chatgpt-codex-connector · 2026-07-07T23:17:26Z

Codex Review: Didn't find any major issues. Hooray!

Reviewed commit: d493019b6d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

stevenlee-oai requested a review from a team as a code owner June 26, 2026 21:18

This was referenced Jun 26, 2026

Serialize shared MCP OAuth credential stores #30292

Merged

Route MCP OAuth recovery through Codex #30294

Closed

Serialize MCP OAuth login and logout #30295

Closed

Report MCP OAuth Auto store drift #30296

Closed

chatgpt-codex-connector Bot reviewed Jun 26, 2026

View reviewed changes

Comment thread codex-rs/rmcp-client/src/oauth/refresh_transaction.rs Outdated

stevenlee-oai force-pushed the dev/stevenlee/mcp-oauth-independent-2-refresh-transaction branch from c432fcd to 38b9e10 Compare June 26, 2026 21:30

stevenlee-oai force-pushed the dev/stevenlee/mcp-oauth-independent-1-store-locks branch 2 times, most recently from c99bdc7 to e4dcca6 Compare June 26, 2026 21:48

stevenlee-oai force-pushed the dev/stevenlee/mcp-oauth-independent-2-refresh-transaction branch 2 times, most recently from c003752 to c93f236 Compare June 26, 2026 22:25

stevenlee-oai force-pushed the dev/stevenlee/mcp-oauth-independent-1-store-locks branch from e4dcca6 to f1e1c17 Compare June 26, 2026 22:25

This was referenced Jun 28, 2026

📊 AI CLI 工具社区动态日报 2026-06-28 96loveslife/big_model_radar#68

Open

📊 AI CLI 工具社区动态日报 2026-06-28 litang9/big_model_radar#134

Open

stevenlee-oai mentioned this pull request Jun 28, 2026

Serialize authoritative MCP OAuth refresh transactions #30416

Closed

stevenlee-oai changed the title ~~Serialize MCP OAuth refresh transactions~~ Resolve and pin MCP OAuth credential stores Jun 28, 2026

Base automatically changed from dev/stevenlee/mcp-oauth-independent-1-store-locks to main July 7, 2026 04:03

Restack OAuth store pinning on merged store locks

e5dc9f3

stevenlee-oai force-pushed the dev/stevenlee/mcp-oauth-independent-2-refresh-transaction branch from fb2c35f to e5dc9f3 Compare July 7, 2026 04:30

chatgpt-codex-connector Bot reviewed Jul 7, 2026

View reviewed changes

Comment thread codex-rs/rmcp-client/src/rmcp_client.rs Outdated

anp-oai reviewed Jul 7, 2026

View reviewed changes

Clarify resolved OAuth store authority

f538e9d

Assert pinned OAuth authority during recovery

d493019

Clarify OAuth store policy and pinning names

0a49007

anp-oai approved these changes Jul 9, 2026

View reviewed changes

stevenlee-oai enabled auto-merge (squash) July 9, 2026 07:00

stevenlee-oai disabled auto-merge July 9, 2026 07:00

stevenlee-oai merged commit cbdee79 into main Jul 9, 2026
64 of 66 checks passed

stevenlee-oai deleted the dev/stevenlee/mcp-oauth-independent-2-refresh-transaction branch July 9, 2026 22:46

github-actions Bot locked and limited conversation to collaborators Jul 9, 2026

Uh oh!

Conversation

stevenlee-oai commented Jun 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Stack

Why

What this PR does

Explicit decisions and non-goals

Safe stopping point

Review size

Validation

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

stevenlee-oai commented Jun 26, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 26, 2026

Uh oh!

stevenlee-oai commented Jun 26, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 26, 2026

Uh oh!

stevenlee-oai commented Jun 28, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 28, 2026

Uh oh!

stevenlee-oai commented Jul 7, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stevenlee-oai commented Jul 7, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 7, 2026

Uh oh!

stevenlee-oai commented Jul 7, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 7, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

stevenlee-oai commented Jun 26, 2026 •

edited

Loading