Recover MCP servers after OAuth reauthentication (#37337)

## Why

An OAuth-backed Streamable HTTP MCP server can fail startup when its stored credentials are rejected. If a client then completes OAuth sign-in and replaces those credentials, the failed server needs to become available without restarting the Codex session.

## What changed

- Track the credential store and OAuth tokens used for each MCP connection, and detect replacements after authentication failures.
- Refresh affected MCP servers before the next turn and include their recovered tools in the model request.
- Classify HTTP authentication challenges and rejected refresh tokens as requiring reauthentication, with sign-in guidance appropriate to local and client-managed environments.

## Testing

- Cover recovery from expired credentials through an externally written replacement token.
- Cover authentication-error classification, startup messaging, and `Auto` store migration from file credentials to the keyring.

GitOrigin-RevId: 9b090089d4e7a44ffc182f4e25da20a18e97b70f
This commit is contained in:
jif authored and copyberry committed 2026-08-07 00:17:46 +00:00
1 parent 7257826ab2
commit b3ffe3d001
14 files changed
+408 -57

No files matched your search

@@ -177,6 +177,18 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
}
}),
)
.route(
"/oauth/token",
post(|| async {
(
StatusCode::BAD_REQUEST,
Json(json!({
"error": "invalid_grant",
"error_description": "refresh token expired or revoked",
})),
)
}),
)
.nest_service(
"/mcp",
StreamableHttpService::new(
@@ -386,7 +398,7 @@ async fn require_bearer(
request: Request<Body>,
next: Next,
) -> Result<Response, StatusCode> {
if request.uri().path().contains("/.well-known/") {
if request.uri().path().contains("/.well-known/") || request.uri().path() == "/oauth/token" {
return Ok(next.run(request).await);
}
if request