Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Skip plugin hook loading when hooks are disabled (#39047)

Charlie Marsh0c901fd14187
diff --git a/codex-rs/app-server/src/request_processors/catalog_processor.rs b/codex-rs/app-server/src/request_processors/catalog_processor.rs
index 7b11a30789..1a20b35187 100644
--- a/codex-rs/app-server/src/request_processors/catalog_processor.rs
+++ b/codex-rs/app-server/src/request_processors/catalog_processor.rs
@@ -608,7 +608,8 @@ impl CatalogRequestProcessor {
continue;
}
};
- let plugin_hooks = if config.features.enabled(Feature::Plugins) {
+ let hooks_enabled = config.features.enabled(Feature::CodexHooks);
+ let plugin_hooks = if hooks_enabled && config.features.enabled(Feature::Plugins) {
let plugins_input = config.plugins_config_input();
let plugin_outcome = plugins_manager.plugins_for_config(&plugins_input).await;
codex_core_plugins::PluginHookLoadOutcome {
@@ -619,7 +620,7 @@ impl CatalogRequestProcessor {
codex_core_plugins::PluginHookLoadOutcome::default()
};
let hooks = codex_hooks::list_hooks(codex_hooks::HooksConfig {
- feature_enabled: config.features.enabled(Feature::CodexHooks),
+ feature_enabled: hooks_enabled,
bypass_hook_trust: config.bypass_hook_trust,
config_layer_stack: Some(config.config_layer_stack),
plugin_hook_sources: plugin_hooks.hook_sources,