From ed7215b552c54215e13aba8547822ef885f021fd Mon Sep 17 00:00:00 2001 From: xli-oai Date: Sat, 16 May 2026 04:11:33 -0700 Subject: [PATCH] codex: remove remote installed fetch wrapper --- codex-rs/core-plugins/src/manager.rs | 2 +- codex-rs/core-plugins/src/manager_tests.rs | 32 ---------------------- codex-rs/core-plugins/src/remote.rs | 8 ------ 3 files changed, 1 insertion(+), 41 deletions(-) diff --git a/codex-rs/core-plugins/src/manager.rs b/codex-rs/core-plugins/src/manager.rs index 02d8c5b38a..365fcfc1b2 100644 --- a/codex-rs/core-plugins/src/manager.rs +++ b/codex-rs/core-plugins/src/manager.rs @@ -640,7 +640,7 @@ impl PluginsManager { if scopes.is_empty() { return Ok(Vec::new()); } - let plugins = crate::remote::fetch_remote_installed_plugins_for_scopes( + let plugins = crate::remote::fetch_remote_installed_plugins( &remote_plugin_service_config(config), auth, scopes, diff --git a/codex-rs/core-plugins/src/manager_tests.rs b/codex-rs/core-plugins/src/manager_tests.rs index 88564720b1..0bff1726a5 100644 --- a/codex-rs/core-plugins/src/manager_tests.rs +++ b/codex-rs/core-plugins/src/manager_tests.rs @@ -334,38 +334,6 @@ approval_mode = "approve" ); } -#[tokio::test] -async fn remote_installed_cache_ignores_global_plugins_without_remote_plugin_flag() { - let codex_home = TempDir::new().unwrap(); - let plugin_base = codex_home - .path() - .join("plugins/cache/chatgpt-global/linear"); - write_plugin(&plugin_base, "local", "linear"); - write_file( - &codex_home.path().join(CONFIG_TOML_FILE), - r#"[features] -plugins = true -"#, - ); - - let config = load_config(codex_home.path(), codex_home.path()).await; - let manager = PluginsManager::new(codex_home.path().to_path_buf()); - manager.write_remote_installed_plugins_cache(vec![RemoteInstalledPlugin { - marketplace_name: "chatgpt-global".to_string(), - id: "plugins~Plugin_linear".to_string(), - name: "linear".to_string(), - enabled: true, - install_policy: codex_app_server_protocol::PluginInstallPolicy::Available, - auth_policy: codex_app_server_protocol::PluginAuthPolicy::OnUse, - availability: codex_app_server_protocol::PluginAvailability::Available, - interface: None, - keywords: Vec::new(), - }]); - - let outcome = manager.plugins_for_config(&config).await; - assert_eq!(outcome, PluginLoadOutcome::default()); -} - #[tokio::test] async fn remote_installed_cache_ignores_plugins_missing_local_cache() { let codex_home = TempDir::new().unwrap(); diff --git a/codex-rs/core-plugins/src/remote.rs b/codex-rs/core-plugins/src/remote.rs index b452d0ecf3..004b01c556 100644 --- a/codex-rs/core-plugins/src/remote.rs +++ b/codex-rs/core-plugins/src/remote.rs @@ -655,14 +655,6 @@ pub(crate) async fn fetch_remote_installed_plugins( config: &RemotePluginServiceConfig, auth: Option<&CodexAuth>, scopes: &[RemotePluginScope], -) -> Result, RemotePluginCatalogError> { - fetch_remote_installed_plugins_for_scopes(config, auth, scopes).await -} - -pub(crate) async fn fetch_remote_installed_plugins_for_scopes( - config: &RemotePluginServiceConfig, - auth: Option<&CodexAuth>, - scopes: &[RemotePluginScope], ) -> Result, RemotePluginCatalogError> { if scopes.is_empty() { return Ok(Vec::new());