clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 14:45:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Ahmed Ibrahim
2026-03-25 01:21:46 -07:00
parent 2ce7a19996
commit 6ac900908b
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
codex-rs/core-skills/src/skills/config_rules.rs
View File

@@ -28,9 +28,7 @@ pub struct SkillConfigRules {
pub entries: Vec<SkillConfigRule>,
}
pub fn skill_config_rules_from_stack(
config_layer_stack: &ConfigLayerStack,
) -> SkillConfigRules {
pub fn skill_config_rules_from_stack(config_layer_stack: &ConfigLayerStack) -> SkillConfigRules {
let mut entries = Vec::new();
for layer in config_layer_stack.get_layers(
ConfigLayerStackOrdering::LowestPrecedenceFirst,

16
codex-rs/core/src/codex.rs
View File

@@ -2452,16 +2452,12 @@ impl Session {
.plugins_manager
.plugins_for_config(&per_turn_config);
let effective_skill_roots = plugin_outcome.effective_skill_roots();
let skills_outcome = Arc::new(
self.services
.skills_manager
.skills_for_config(
per_turn_config.cwd.as_path(),
&effective_skill_roots,
&per_turn_config.config_layer_stack,
per_turn_config.bundled_skills_enabled(),
),
);
let skills_outcome = Arc::new(self.services.skills_manager.skills_for_config(
per_turn_config.cwd.as_path(),
&effective_skill_roots,
&per_turn_config.config_layer_stack,
per_turn_config.bundled_skills_enabled(),
));
let mut turn_context: TurnContext = Self::make_turn_context(
self.conversation_id,
Some(Arc::clone(&self.services.auth_manager)),

8
codex-rs/core/src/codex_tests.rs
View File

@@ -2675,7 +2675,9 @@ pub(crate) async fn make_session_and_context() -> (Session, TurnContext) {
config.js_repl_node_module_dirs.clone(),
));
let plugin_outcome = services.plugins_manager.plugins_for_config(&per_turn_config);
let plugin_outcome = services
.plugins_manager
.plugins_for_config(&per_turn_config);
let effective_skill_roots = plugin_outcome.effective_skill_roots();
let skills_outcome = Arc::new(services.skills_manager.skills_for_config(
per_turn_config.cwd.as_path(),
@@ -3514,7 +3516,9 @@ pub(crate) async fn make_session_and_context_with_dynamic_tools_and_rx(
config.js_repl_node_module_dirs.clone(),
));
let plugin_outcome = services.plugins_manager.plugins_for_config(&per_turn_config);
let plugin_outcome = services
.plugins_manager
.plugins_for_config(&per_turn_config);
let effective_skill_roots = plugin_outcome.effective_skill_roots();
let skills_outcome = Arc::new(services.skills_manager.skills_for_config(
per_turn_config.cwd.as_path(),

8
codex-rs/core/src/plugins/manager.rs
View File

@@ -414,12 +414,8 @@ impl PluginsManager {
if !plugins_feature_enabled {
return Vec::new();
}
load_plugins_from_layer_stack(
config_layer_stack,
&self.store,
self.restriction_product,
)
.effective_skill_roots()
load_plugins_from_layer_stack(config_layer_stack, &self.store, self.restriction_product)
.effective_skill_roots()
}
fn cached_enabled_outcome(&self) -> Option<PluginLoadOutcome> {