Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Report OAuth authentication failures in MCP status snapshots (#44359)

Andrei Eternald996b4f02a20
diff --git a/codex-rs/codex-mcp/src/connection_manager_tests.rs b/codex-rs/codex-mcp/src/connection_manager_tests.rs
index 62bfbeeb74..f8f8a468a8 100644
--- a/codex-rs/codex-mcp/src/connection_manager_tests.rs
+++ b/codex-rs/codex-mcp/src/connection_manager_tests.rs
@@ -125,7 +125,11 @@ impl McpConnectionSet {
}
}
- fn insert_test_client(&mut self, name: impl Into<String>, client: AsyncManagedClient) {
+ pub(crate) fn insert_test_client(
+ &mut self,
+ name: impl Into<String>,
+ client: AsyncManagedClient,
+ ) {
let name = name.into();
self.servers.insert(
name,
@@ -540,7 +544,7 @@ async fn prepared_call_timeout_includes_trusted_access_lookup() {
assert!(format!("{error:#}").contains("timed out awaiting tools/call after 1s"));
}
-async fn create_ready_async_managed_client(tools: Vec<ToolInfo>) -> AsyncManagedClient {
+pub(crate) async fn create_ready_async_managed_client(tools: Vec<ToolInfo>) -> AsyncManagedClient {
AsyncManagedClient {
client: futures::future::ready::<Result<ManagedClient, StartupOutcomeError>>(Ok(
create_test_managed_client(tools).await,
diff --git a/codex-rs/codex-mcp/src/mcp/mod.rs b/codex-rs/codex-mcp/src/mcp/mod.rs
index a0bec56444..33b47cadde 100644
--- a/codex-rs/codex-mcp/src/mcp/mod.rs
+++ b/codex-rs/codex-mcp/src/mcp/mod.rs
@@ -802,13 +802,22 @@ async fn collect_mcp_server_status_snapshot_from_manager(
.insert(tool_name, tool);
}
+ // Status-only discovery has no event channel. Report OAuth failures from the completed
+ // connection attempt instead of retaining the credential-presence status read beforehand.
+ let mut auth_statuses = auth_statuses_from_entries(&auth_status_entries);
+ for server_name in mcp_connection_manager.authentication_failed_servers().await {
+ if auth_statuses.get(&server_name) == Some(&McpAuthStatus::OAuth) {
+ auth_statuses.insert(server_name, McpAuthStatus::NotLoggedIn);
+ }
+ }
+
McpServerStatusSnapshot {
server_infos,
tools_by_server,
tools_errors,
resources: convert_mcp_resources(resources),
resource_templates: convert_mcp_resource_templates(resource_templates),
- auth_statuses: auth_statuses_from_entries(&auth_status_entries),
+ auth_statuses,
server_names,
}
}
diff --git a/codex-rs/codex-mcp/src/mcp/mod_tests.rs b/codex-rs/codex-mcp/src/mcp/mod_tests.rs
index 8c267d4db7..e6e5313717 100644
--- a/codex-rs/codex-mcp/src/mcp/mod_tests.rs
+++ b/codex-rs/codex-mcp/src/mcp/mod_tests.rs
@@ -1,6 +1,9 @@
use super::*;
use crate::McpPluginAttribution;
use crate::McpServerRegistration;
+use crate::connection_manager::tests::create_ready_async_managed_client;
+use crate::mcp::auth::McpAuthStatusEntry;
+use crate::rmcp_client::StartupOutcomeError;
use codex_config::Constrained;
use codex_config::types::AppToolApproval;
use codex_config::types::AuthKeyringBackendKind;
@@ -12,12 +15,73 @@ use codex_protocol::models::PermissionProfile;
use codex_protocol::permissions::NetworkSandboxPolicy;
use codex_protocol::protocol::AskForApproval;
use codex_protocol::protocol::GranularApprovalConfig;
+use codex_rmcp_client::McpAuthState;
+use futures::FutureExt;
use pretty_assertions::assert_eq;
use std::collections::HashMap;
use std::collections::HashSet;
use std::path::PathBuf;
use std::sync::Arc;
+#[tokio::test]
+async fn status_snapshot_only_downgrades_oauth_authentication_failures() {
+ let auth_failure = StartupOutcomeError::Failed {
+ error: "OAuth refresh token was rejected".to_string(),
+ is_authentication_required: true,
+ };
+ let mut manager = McpConnectionSet::empty(/*prefix_mcp_tool_names*/ true);
+ let mut auth_status_entries = HashMap::new();
+ for (name, auth_state, startup_error) in [
+ (
+ "oauth-failed",
+ McpAuthState::OAuth,
+ Some(auth_failure.clone()),
+ ),
+ ("oauth-ready", McpAuthState::OAuth, None),
+ (
+ "oauth-provider-error",
+ McpAuthState::OAuth,
+ Some(StartupOutcomeError::Failed {
+ error: "provider temporarily unavailable".to_string(),
+ is_authentication_required: false,
+ }),
+ ),
+ ("bearer", McpAuthState::BearerToken, Some(auth_failure)),
+ ] {
+ let mut client = create_ready_async_managed_client(Vec::new()).await;
+ if let Some(error) = startup_error {
+ client.client = futures::future::ready(Err(error)).boxed().shared();
+ }
+ manager.insert_test_client(name, client);
+ auth_status_entries.insert(
+ name.to_string(),
+ McpAuthStatusEntry {
+ config: None,
+ auth_state,
+ },
+ );
+ }
+
+ let server_names = auth_status_entries.keys().cloned().collect();
+ let snapshot = collect_mcp_server_status_snapshot_from_manager(
+ &manager,
+ auth_status_entries,
+ server_names,
+ McpSnapshotDetail::ToolsAndAuthOnly,
+ )
+ .await;
+
+ assert_eq!(
+ snapshot.auth_statuses,
+ HashMap::from([
+ ("oauth-failed".to_string(), McpAuthStatus::NotLoggedIn),
+ ("oauth-ready".to_string(), McpAuthStatus::OAuth),
+ ("oauth-provider-error".to_string(), McpAuthStatus::OAuth),
+ ("bearer".to_string(), McpAuthStatus::BearerToken),
+ ]),
+ );
+}
+
pub(crate) fn test_mcp_config(codex_home: PathBuf) -> McpConfig {
McpConfig {
chatgpt_base_url: "https://chatgpt.com".to_string(),