Fix MCP OAuth refresh-token races across Codex processes by etraut-openai · Pull Request #12815 · openai/codex

etraut-openai · 2026-02-25T20:40:39Z

Addresses #12755

Token refresh for MCP OAuth suffered from the same problem that our main Codex ChatGPT auth had until recently. This PR updates the MCP logic to mirror the solution in place for ChatGPT auth token refresh.

MCP OAuth credentials are shared across processes via keyring or
CODEX_HOME/.credentials.json, but each process kept its own in-memory
snapshot and refreshed from that local copy. That meant one process could
rotate the refresh token while another still tried to use the stale token,
causing refresh_token_reused failures.

This changes the MCP refresh path to use a guarded reload flow modeled on
the main ChatGPT auth fix:

reload shared MCP OAuth credentials before any refresh attempt
compare persisted credentials to the in-memory cached snapshot with
refresh-specific equality
if persisted credentials changed, adopt them into the live RMCP auth runtime
and skip the local refresh
if persisted credentials are unchanged, perform the refresh and persist the
rotated credentials
if persisted credentials are missing, treat that as logged out and clear the
live runtime auth instead of using a stale refresh token

To keep the running RMCP auth stack in sync without reconnecting, the client
now owns the AuthorizationManager credential store and can update the live
runtime in place when reloaded credentials win.

Also adds:

unit tests for guarded reload decision logic in codex-rs/rmcp-client/src/oauth.rs
an end-to-end two-client integration test in
codex-rs/core/tests/suite/rmcp_client.rs
refresh-token support in the streamable HTTP MCP test server fixture

etraut-openai · 2026-02-25T20:41:38Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c47fd545dd

ℹ️ 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-rs/rmcp-client/src/oauth.rs

etraut-openai · 2026-02-25T21:58:00Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 78249f7fce

ℹ️ 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-rs/rmcp-client/src/oauth.rs

etraut-openai · 2026-02-25T22:41:50Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e7479ee1cc

ℹ️ 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".

chatgpt-codex-connector · 2026-02-25T22:49:56Z

codex-rs/rmcp-client/src/oauth.rs

+                self.persist_if_needed().await
+            }
+            GuardedRefreshOutcome::MissingOrInvalid => self.apply_runtime_credentials(None).await,
+            GuardedRefreshOutcome::ReloadFailed => Ok(()),


Refresh tokens when guarded reload fails

refresh_if_needed returns Ok(()) on ReloadFailed, even though this branch is reached only after token_needs_refresh(...) is true. If keyring/file reload fails transiently, the runtime keeps near-expired credentials and skips both refresh and logout, so subsequent MCP calls can keep sending stale bearer tokens and fail with 401s.

Useful? React with 👍 / 👎.

Maybe at least log?

etraut-openai · 2026-02-25T23:03:05Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e7479ee1cc

ℹ️ 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-rs/rmcp-client/src/oauth.rs

pakrym-oai · 2026-02-28T02:29:18Z

codex-rs/rmcp-client/src/rmcp_client.rs

@@ -595,22 +604,20 @@ async fn create_oauth_transport_and_runtime(
 )> {
    let http_client =


would've been very nice to reuse default_client we use elsewhere, it sets all the right headers.

unrelated, sorry

pakrym-oai · 2026-02-28T02:32:20Z

codex-rs/rmcp-client/src/rmcp_client.rs

            }
        };

+        if let Some(runtime) = &oauth_persistor


nit: oauth_persistor is a bad name for this type at this point. McpAuthManager maybe

pakrym-oai · 2026-02-28T02:34:57Z

codex-rs/rmcp-client/src/oauth.rs

+                            token_response: Some(credentials.token_response.0.clone()),
+                        })
+                        .await?;
+                    guard


Does client id ever change on refresh?

pakrym-oai · 2026-02-28T02:39:08Z

codex-rs/rmcp-client/src/oauth.rs

+    }
+}
+
+fn load_oauth_tokens_for_guarded_refresh_with_keyring_fallback<K: KeyringStore>(


can we avoid a separate set of reading method for guarded refresh and reuse existing read methods?

pakrym-oai · 2026-02-28T02:40:13Z

codex-rs/rmcp-client/src/oauth.rs

+    }
+}
+
+fn oauth_tokens_equal_for_refresh(


do we need this much logic? can we just compare the access token?

pakrym-oai · 2026-02-28T02:49:46Z

codex-rs/rmcp-client/src/oauth.rs

+}
+
+#[derive(Debug, PartialEq)]
+enum GuardedRefreshPersistedCredentials {


can this be Option<StoredOAuthTokens> ?

pakrym-oai · 2026-02-28T02:50:30Z

codex-rs/rmcp-client/src/oauth.rs

    server_name: String,
    url: String,
    authorization_manager: Arc<Mutex<AuthorizationManager>>,
+    runtime_credentials: InMemoryCredentialStore,


unfortunate that we have multiple creadential storages to keep in sync. Any chance we can reuse runtime_credentials as last_credentials?

pakrym-oai

The core logic looks good but I wonder if we can collapse reader methods.

github-actions · 2026-03-26T06:27:45Z

Closing this pull request because it has had no updates for more than 14 days. If you plan to continue working on it, feel free to reopen or open a new PR.

Add guarded MCP OAuth refresh flow

c47fd54

etraut-openai changed the title ~~Add guarded reload for MCP OAuth refresh~~ Fix token refresh issue with MCP OAuth Feb 25, 2026

etraut-openai changed the title ~~Fix token refresh issue with MCP OAuth~~ Fix MCP OAuth refresh-token races across Codex processes Feb 25, 2026

chatgpt-codex-connector bot reviewed Feb 25, 2026

View reviewed changes

codex-rs/rmcp-client/src/oauth.rs Show resolved Hide resolved

codex: address PR review feedback (#12815)

78249f7

chatgpt-codex-connector bot reviewed Feb 25, 2026

View reviewed changes

codex-rs/rmcp-client/src/oauth.rs Show resolved Hide resolved

codex: address PR review feedback (#12815)

e7479ee

chatgpt-codex-connector bot reviewed Feb 25, 2026

View reviewed changes

codex-rs/rmcp-client/src/oauth.rs Show resolved Hide resolved

codex: address PR review feedback (#12815)

6feecbf

github-actions bot mentioned this pull request Feb 26, 2026

📊 AI CLI 工具社区动态日报 2026-02-26 duanyytop/agents-radar#11

Open

pakrym-oai reviewed Feb 28, 2026

View reviewed changes

github-actions bot mentioned this pull request Feb 28, 2026

📊 AI CLI 工具社区动态日报 2026-02-28 duanyytop/agents-radar#27

Open

github-actions bot closed this Mar 26, 2026

		@@ -595,22 +604,20 @@ async fn create_oauth_transport_and_runtime(
		)> {
		let http_client =

Conversation

etraut-openai commented Feb 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

etraut-openai commented Feb 25, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

etraut-openai commented Feb 25, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

etraut-openai commented Feb 25, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

etraut-openai commented Feb 25, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pakrym-oai left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Mar 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

etraut-openai commented Feb 25, 2026 •

edited

Loading