This commit is contained in:
Ahmed Ibrahim
2026-03-25 01:46:26 -07:00
parent af4c07b59e
commit 83bd182dbd
4 changed files with 34 additions and 25 deletions
@@ -5504,7 +5504,7 @@ impl CodexMessageProcessor {
}
};
let config_layer_stack = match load_config_layers_state(
&self.codex_home,
&self.config.codex_home,
Some(cwd_abs),
cli_overrides,
LoaderOverrides::default(),
@@ -5529,14 +5529,14 @@ impl CodexMessageProcessor {
&config_layer_stack,
config.features.enabled(Feature::Plugins),
);
let skills_input = codex_core::skills::SkillsLoadInput::new(
cwd.clone(),
effective_skill_roots,
config_layer_stack,
config.bundled_skills_enabled(),
);
let outcome = skills_manager
.skills_for_cwd_with_extra_user_roots(
&cwd,
&effective_skill_roots,
force_reload,
extra_roots,
&config_layer_stack,
)
.skills_for_cwd_with_extra_user_roots(&skills_input, force_reload, extra_roots)
.await;
let errors = errors_to_info(&outcome.errors);
let skills = skills_to_info(&outcome.skills, &outcome.disabled_paths);
+6 -1
View File
@@ -264,6 +264,8 @@ fn config_write_error(code: ConfigWriteErrorCode, message: impl Into<String>) ->
mod tests {
use super::*;
use codex_core::AnalyticsEventsClient;
use codex_core::AuthManager;
use codex_core::CodexAuth;
use codex_core::config_loader::NetworkRequirementsToml as CoreNetworkRequirementsToml;
use codex_protocol::protocol::AskForApproval as CoreAskForApproval;
use pretty_assertions::assert_eq;
@@ -404,6 +406,9 @@ mod tests {
.await
.expect("load analytics config"),
);
let auth_manager = Arc::new(AuthManager::from_auth_for_testing(CodexAuth::from_api_key(
"test",
)));
let config_api = ConfigApi::new(
codex_home.path().to_path_buf(),
Vec::new(),
@@ -411,7 +416,7 @@ mod tests {
Arc::new(RwLock::new(CloudRequirementsLoader::default())),
reloader.clone(),
AnalyticsEventsClient::new(
Arc::clone(&analytics_config.auth_manager),
auth_manager,
analytics_config
.chatgpt_base_url
.trim_end_matches('/')