diff --git a/codex-rs/app-server/src/request_processors/plugins.rs b/codex-rs/app-server/src/request_processors/plugins.rs index 5ba38d2fb7..e84a3200e2 100644 --- a/codex-rs/app-server/src/request_processors/plugins.rs +++ b/codex-rs/app-server/src/request_processors/plugins.rs @@ -717,9 +717,17 @@ impl PluginRequestProcessor { marketplaces: Vec::new(), marketplace_load_errors: Vec::new(), }; - let Some((config, auth)) = self.check_plugin_installed_preconditions().await? else { + let config = self.load_latest_config(/*fallback_cwd*/ None).await?; + if !config.features.enabled(Feature::Plugins) { return Ok(empty_response()); - }; + } + let auth = self.auth_manager.auth().await; + if !self + .workspace_codex_plugins_enabled(&config, auth.as_ref()) + .await + { + return Ok(empty_response()); + } let plugins_input = config.plugins_config_input(); @@ -759,25 +767,6 @@ impl PluginRequestProcessor { }) } - async fn check_plugin_installed_preconditions( - &self, - ) -> Result)>, JSONRPCErrorError> { - let config = self.load_latest_config(/*fallback_cwd*/ None).await?; - if !config.features.enabled(Feature::Plugins) { - return Ok(None); - } - - let auth = self.auth_manager.auth().await; - if !self - .workspace_codex_plugins_enabled(&config, auth.as_ref()) - .await - { - return Ok(None); - } - - Ok(Some((config, auth))) - } - async fn load_local_installed_plugins( &self, plugins_manager: Arc,