From f94384e81a6736b0790cba71d2ca7aca7154a178 Mon Sep 17 00:00:00 2001 From: viyatb-oai Date: Thu, 26 Mar 2026 18:32:43 -0700 Subject: [PATCH] refactor: inline project layer detection in hook discovery --- codex-rs/config/src/state.rs | 4 ---- codex-rs/hooks/src/engine/discovery.rs | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/codex-rs/config/src/state.rs b/codex-rs/config/src/state.rs index 7f6916ad0a..a34ccc6cdb 100644 --- a/codex-rs/config/src/state.rs +++ b/codex-rs/config/src/state.rs @@ -99,10 +99,6 @@ impl ConfigLayerEntry { self.disabled_reason.is_some() } - pub fn is_project_layer(&self) -> bool { - matches!(self.name, ConfigLayerSource::Project { .. }) - } - pub fn raw_toml(&self) -> Option<&str> { self.raw_toml.as_deref() } diff --git a/codex-rs/hooks/src/engine/discovery.rs b/codex-rs/hooks/src/engine/discovery.rs index 9434287be9..2d8d266689 100644 --- a/codex-rs/hooks/src/engine/discovery.rs +++ b/codex-rs/hooks/src/engine/discovery.rs @@ -1,6 +1,7 @@ use std::fs; use std::path::Path; +use codex_app_server_protocol::ConfigLayerSource; use codex_config::ConfigLayerStack; use codex_config::ConfigLayerStackOrdering; @@ -94,7 +95,7 @@ pub(crate) fn discover_handlers(config_layer_stack: Option<&ConfigLayerStack>) - &mut warnings, &mut display_order, source_path.as_path(), - layer.is_project_layer(), + matches!(layer.name, ConfigLayerSource::Project { .. }), event_name, groups, );