Inline installed plugin preconditions

This commit is contained in:
xli-oai
2026-05-15 02:18:12 -07:00
parent bf710069f3
commit 94eb16aea4

View File

@@ -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<Option<(Config, Option<CodexAuth>)>, 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<codex_core_plugins::PluginsManager>,