mirror of
https://github.com/openai/codex.git
synced 2026-11-22 15:15:18 +00:00
Read plugin authentication state from AuthManager (#39087)
## What changed - Give `PluginsManager` a shared `AuthManager` instead of a separately mutable authentication-mode snapshot. - Read the current authentication mode and credentials from that shared manager for plugin discovery, startup tasks, CLI commands, MCP setup, and external-agent migration. - Update test helpers and coverage to exercise plugin projections and curated marketplace selection as authentication changes. GitOrigin-RevId: 600c94de5130eda2da5727e1a0b4d39083fefc56
This commit is contained in:
1 parent
2013e04354
commit
fc6268ad38
37 files changed
+448
-320
No files matched your search
@@ -73,6 +73,7 @@ use codex_config::types::WindowsToml;
|
||||
use codex_exec_server::LOCAL_FS;
|
||||
use codex_features::Feature;
|
||||
use codex_features::FeaturesToml;
|
||||
use codex_login::test_support::auth_manager_from_optional_auth;
|
||||
use codex_model_provider::ProviderCapabilities;
|
||||
use codex_model_provider_info::LMSTUDIO_OSS_PROVIDER_ID;
|
||||
use codex_model_provider_info::OLLAMA_OSS_PROVIDER_ID;
|
||||
@@ -529,7 +530,8 @@ async fn load_config_resolves_non_prefixed_mcp_tool_servers() -> std::io::Result
|
||||
|
||||
assert_eq!(config.non_prefixed_mcp_tool_servers, expected_servers);
|
||||
assert_eq!(config.prefix_mcp_tool_names(), expected_prefix);
|
||||
let plugins_manager = plugins_manager_for_config(&config, /*auth_mode*/ None);
|
||||
let plugins_manager =
|
||||
plugins_manager_for_config(&config, auth_manager_from_optional_auth(/*auth*/ None));
|
||||
let mcp_config = config.to_mcp_config(&plugins_manager).await;
|
||||
assert_eq!(mcp_config.prefix_mcp_tool_names, expected_prefix);
|
||||
assert_eq!(
|
||||
@@ -5243,7 +5245,8 @@ async fn rebuild_preserving_session_layers_refreshes_plugin_derived_mcp_config()
|
||||
let config = thread_config
|
||||
.rebuild_preserving_session_layers(&refreshed_config)
|
||||
.await?;
|
||||
let plugins_manager = plugins_manager_for_config(&config, /*auth_mode*/ None);
|
||||
let plugins_manager =
|
||||
plugins_manager_for_config(&config, auth_manager_from_optional_auth(/*auth*/ None));
|
||||
let mcp_config = config.to_mcp_config(&plugins_manager).await;
|
||||
let configured_servers = mcp_config.mcp_server_catalog.configured_servers();
|
||||
|
||||
@@ -5305,7 +5308,8 @@ enabled = true
|
||||
.codex_home(codex_home.path().to_path_buf())
|
||||
.build()
|
||||
.await?;
|
||||
let plugins_manager = plugins_manager_for_config(&config, /*auth_mode*/ None);
|
||||
let plugins_manager =
|
||||
plugins_manager_for_config(&config, auth_manager_from_optional_auth(/*auth*/ None));
|
||||
let mcp_config = config.to_mcp_config(&plugins_manager).await;
|
||||
let configured_servers = mcp_config.mcp_server_catalog.configured_servers();
|
||||
|
||||
@@ -5373,7 +5377,8 @@ url = "https://sample.example/mcp"
|
||||
)
|
||||
.build()
|
||||
.await?;
|
||||
let plugins_manager = plugins_manager_for_config(&config, /*auth_mode*/ None);
|
||||
let plugins_manager =
|
||||
plugins_manager_for_config(&config, auth_manager_from_optional_auth(/*auth*/ None));
|
||||
let mcp_config = config.to_mcp_config(&plugins_manager).await;
|
||||
let configured_servers = mcp_config.mcp_server_catalog.configured_servers();
|
||||
|
||||
@@ -5475,7 +5480,8 @@ enabled = true
|
||||
)
|
||||
.build()
|
||||
.await?;
|
||||
let plugins_manager = plugins_manager_for_config(&config, /*auth_mode*/ None);
|
||||
let plugins_manager =
|
||||
plugins_manager_for_config(&config, auth_manager_from_optional_auth(/*auth*/ None));
|
||||
let mcp_config = config.to_mcp_config(&plugins_manager).await;
|
||||
let configured_servers = mcp_config.mcp_server_catalog.configured_servers();
|
||||
|
||||
@@ -6539,7 +6545,8 @@ async fn to_mcp_config_preserves_apps_feature_from_config() -> std::io::Result<(
|
||||
codex_home.abs(),
|
||||
)
|
||||
.await?;
|
||||
let plugins_manager = plugins_manager_for_config(&config, /*auth_mode*/ None);
|
||||
let plugins_manager =
|
||||
plugins_manager_for_config(&config, auth_manager_from_optional_auth(/*auth*/ None));
|
||||
|
||||
config.apps_mcp_product_sku = Some("tpp".to_string());
|
||||
let mcp_config = config.to_mcp_config(&plugins_manager).await;
|
||||
@@ -6566,7 +6573,8 @@ async fn to_mcp_config_flows_mcp_tool_prefix_from_feature() -> std::io::Result<(
|
||||
codex_home.abs(),
|
||||
)
|
||||
.await?;
|
||||
let plugins_manager = plugins_manager_for_config(&config, /*auth_mode*/ None);
|
||||
let plugins_manager =
|
||||
plugins_manager_for_config(&config, auth_manager_from_optional_auth(/*auth*/ None));
|
||||
|
||||
let mcp_config = config.to_mcp_config(&plugins_manager).await;
|
||||
assert!(mcp_config.prefix_mcp_tool_names);
|
||||
@@ -6602,7 +6610,8 @@ async fn to_mcp_config_flows_mcp_2026_feature_from_config() -> std::io::Result<(
|
||||
codex_home.abs(),
|
||||
)
|
||||
.await?;
|
||||
let plugins_manager = plugins_manager_for_config(&config, /*auth_mode*/ None);
|
||||
let plugins_manager =
|
||||
plugins_manager_for_config(&config, auth_manager_from_optional_auth(/*auth*/ None));
|
||||
|
||||
let mcp_config = config.to_mcp_config(&plugins_manager).await;
|
||||
assert_eq!(mcp_config.protocol_mode, codex_mcp::McpProtocolMode::Legacy);
|
||||
@@ -6626,7 +6635,8 @@ async fn to_mcp_config_preserves_auth_elicitation_feature_from_config() -> std::
|
||||
codex_home.abs(),
|
||||
)
|
||||
.await?;
|
||||
let plugins_manager = plugins_manager_for_config(&config, /*auth_mode*/ None);
|
||||
let plugins_manager =
|
||||
plugins_manager_for_config(&config, auth_manager_from_optional_auth(/*auth*/ None));
|
||||
|
||||
let mcp_config = config.to_mcp_config(&plugins_manager).await;
|
||||
assert_eq!(
|
||||
|
||||
Reference in new issue
Block a user