Serialize shared MCP OAuth credential stores by stevenlee-oai · Pull Request #30292 · openai/codex

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

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 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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5c85609830

ℹ️ 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:38Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f1e1c1711a

ℹ️ 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:35Z

@codex review

chatgpt-codex-connector · 2026-06-26T23:01:25Z

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

Reviewed commit: 8f1d2f1ab6

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

anp-oai · 2026-07-06T18:05:00Z


    use codex_keyring_store::tests::MockKeyringStore;

+    #[path = "store_lock_tests.rs"]


This should be done on the store_lock module itself, rather than transitively through this test module.

[from Codex] Addressed in 9b7f3b3. The store-lock tests are now included from the store_lock module itself instead of transitively through oauth.rs.

anp-oai · 2026-07-06T18:05:33Z

 [target.'cfg(any(target_os = "freebsd", target_os = "openbsd"))'.dependencies]
 keyring = { workspace = true, features = ["sync-secret-service"] }

+# This test is compiled through `#[path]` inside the inline `oauth::tests` module. Cargo-shear


This should be removeable if you have the test module included in the right place (see other comment).

[from Codex] Addressed in 9b7f3b3. Moving the test module under store_lock made the cargo-shear ignored-paths exception unnecessary, so I removed it.

anp-oai · 2026-07-06T18:25:11Z

+            match file.try_lock() {
+                Ok(()) => return Ok(Self { _file: file }),
+                Err(std::fs::TryLockError::WouldBlock) if started.elapsed() >= acquire_timeout => {
+                    anyhow::bail!(


Can you use thiserror to define an error enum for this module instead of stringifying the failure mode?

[from Codex] Addressed in 9b7f3b3. OAuthStoreLockFailure is now a thiserror enum with explicit CODEX_HOME, create-dir, open, timeout, and lock variants while preserving the existing anyhow downcast behavior used to prevent Auto fallback on coordination failures.

anp-oai · 2026-07-06T18:25:53Z

+                    if !reported_contention {
+                        tracing::debug!(
+                            target: LOCK_CONTENTION_EVENT_TARGET,
+                            store = store.description(),


nit: should description just be an impl std::fmt::Display for OauthStore?

[from Codex] Addressed in 9b7f3b3. OAuthStore now implements Display and the lock code uses that instead of a separate description() helper.

anp-oai · 2026-07-06T18:29:16Z

+
+impl OAuthStoreLock {
+    pub(super) fn acquire(store: OAuthStore) -> Result<Self> {
+        let codex_home = find_codex_home().context(OAuthStoreLockFailure {


Sorry for not raising this earlier (easier to see it's an issue with a smaller more focused change), but how is this going to work in situations where there's no CODEX_HOME? We're generally working to make that possible for other embedders (can share details on slack) so we need to think through how this lock will work in that environment.

From Codex

“no CODEX_HOME env var” is already supported by defaulting to ~/.codex. “No home / no local filesystem authority at all” is not supported by the current File/Secrets credential stores.
For #30292, the new lock is consistent with the existing local store contract: it puts the lock under the same resolved codex home, e.g. ~/.codex/mcp-oauth-locks/.... That means this PR is not introducing the first dependency on codex-home-like local state for File/Secrets mode; the credential stores already have that dependency.

[from Codex] Added a code comment in 9b7f3b3 documenting the boundary. This lock intentionally follows the existing local File/Secrets credential-store authority: when CODEX_HOME is unset, those stores already resolve to the default home (~/.codex); when an embedder has no local home/filesystem authority at all, those stores already cannot operate as-is. A future provider-backed credential store should provide its own matching lock authority rather than using this local lock path.

stevenlee-oai · 2026-07-06T21:21:06Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9b7f3b3abb

ℹ️ 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-07-06T21:29:31Z

+            .unwrap_or_else(PoisonError::into_inner);
+        let dir = tempdir().expect("create CODEX_HOME temp dir");
+        unsafe {
+            std::env::set_var("CODEX_HOME", dir.path());


Stop mutating CODEX_HOME in this test helper

Because this helper mutates the process-global CODEX_HOME, it only serializes the new store_lock_tests with this module-local lock; under single-process runners such as Bazel/libtest, the existing oauth.rs tests in the same binary use a different TempCodexHome guard and can run concurrently, so either module can read/write the other temp credential store or remove CODEX_HOME mid-test. Share one serialization guard or pass the home path into the helpers instead.

AGENTS.md reference: AGENTS.md:L210-L214

Useful? React with 👍 / 👎.

stevenlee-oai · 2026-07-06T21:42:52Z

@codex review

chatgpt-codex-connector · 2026-07-06T21:47:22Z

Codex Review: Didn't find any major issues. 👍

Reviewed commit: b21923d777

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

…locks

stevenlee-oai · 2026-07-07T00:22:57Z

@codex review

chatgpt-codex-connector · 2026-07-07T00:26:48Z

Codex Review: Didn't find any major issues. Bravo.

Reviewed commit: ceef76befc

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

…locks

stevenlee-oai · 2026-07-07T03:10:40Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d5eb78ec3d

ℹ️ 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-07-07T03:18:46Z

@@ -0,0 +1,181 @@
+//! Cross-process serialization for MCP OAuth stores shared by multiple credentials.


Split the oversized OAuth locking change

This patch is 830 changed lines (git show --numstat: 775 insertions, 55 deletions) and the OAuth locking work is not mechanical, so it crosses the repo's 800-line review-size limit. Please split into a smaller coherent first stage, such as introducing the lock primitive plus File-store serialization and its tests, then follow with Secrets locking and Auto fallback behavior.

AGENTS.md reference: AGENTS.md:L127-L131

Useful? React with 👍 / 👎.

…locks

This was referenced Jun 26, 2026

Resolve and pin MCP OAuth credential stores #30293

Open

Route MCP OAuth recovery through Codex #30294

Open

Serialize MCP OAuth login and logout #30295

Open

Report MCP OAuth Auto store drift #30296

Open

chatgpt-codex-connector Bot reviewed Jun 26, 2026

View reviewed changes

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

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

Serialize shared MCP OAuth stores

f1e1c17

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

chatgpt-codex-connector Bot reviewed Jun 26, 2026

View reviewed changes

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

Reject Auto fallback on OAuth store lock failures

8f1d2f1

github-actions Bot mentioned this pull request Jun 27, 2026

📊 AI CLI 工具社区动态日报 2026-06-27 zx0828/big_model_radar#184

Open

stevenlee-oai added 2 commits June 27, 2026 17:47

Merge current main into MCP OAuth stack

3b82281

Clarify MCP OAuth store lock preconditions

b5f1164

This was referenced Jun 28, 2026

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

Open

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

Open

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

Open

Merge current main into MCP OAuth stack

f9414ca

stevenlee-oai mentioned this pull request Jun 28, 2026

Serialize authoritative MCP OAuth refresh transactions #30416

Open

anp-oai reviewed Jul 6, 2026

View reviewed changes

Address OAuth store lock review comments

9b7f3b3

chatgpt-codex-connector Bot reviewed Jul 6, 2026

View reviewed changes

Share OAuth test CODEX_HOME guard

b21923d

Merge branch 'main' into dev/stevenlee/mcp-oauth-independent-1-store-…

b1cf460

…locks

anp-oai reviewed Jul 6, 2026

View reviewed changes

Comment thread codex-rs/rmcp-client/Cargo.toml Outdated

Comment thread codex-rs/rmcp-client/src/oauth/tests/store_lock_tests.rs

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

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

Address OAuth lock review nits

ceef76b

Merge branch 'main' into dev/stevenlee/mcp-oauth-independent-1-store-…

a6b303c

…locks

github-actions Bot mentioned this pull request Jul 7, 2026

📊 AI CLI 工具社区动态日报 2026-07-07 loxehate/loxehate.github.io#12

Open

anp-oai approved these changes Jul 7, 2026

View reviewed changes

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

Keep OAuth lock impl next to its type

d5eb78e

chatgpt-codex-connector Bot reviewed Jul 7, 2026

View reviewed changes

Merge branch 'main' into dev/stevenlee/mcp-oauth-independent-1-store-…

5cec3d5

…locks

stevenlee-oai enabled auto-merge (squash) July 7, 2026 03:24

stevenlee-oai merged commit 6cf42cf into main Jul 7, 2026
64 of 66 checks passed

stevenlee-oai deleted the dev/stevenlee/mcp-oauth-independent-1-store-locks branch July 7, 2026 04:03

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


		use codex_keyring_store::tests::MockKeyringStore;

		#[path = "store_lock_tests.rs"]

		@@ -0,0 +1,181 @@
		//! Cross-process serialization for MCP OAuth stores shared by multiple credentials.

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

Decisions and non-goals

Safe stopping point

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 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!

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!

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!

Uh oh!

stevenlee-oai commented Jul 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot Jul 6, 2026

Choose a reason for hiding this comment

Uh oh!

stevenlee-oai commented Jul 6, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jul 6, 2026

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!

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!

chatgpt-codex-connector Bot Jul 7, 2026

stevenlee-oai commented Jun 26, 2026 •

edited

Loading