mirror of
https://github.com/openai/codex.git
synced 2026-05-29 23:40:29 +00:00
## Why `--profile-v2 <name>` gives launchers and runtime entry points a named profile config without making each profile duplicate the base user config. The base `$CODEX_HOME/config.toml` still loads first, then `$CODEX_HOME/<name>.config.toml` layers above it and becomes the active writable user config for that session. That keeps shared defaults, plugin/MCP setup, and managed/user constraints in one place while letting a named profile override only the pieces that need to differ. ## What Changed - Added the shared `--profile-v2 <name>` runtime option with validated plain names, now represented by `ProfileV2Name`. - Extended config layer state so the base user config and selected profile config are both `User` layers; APIs expose the active user layer and merged effective user config. - Threaded profile selection through runtime entry points: `codex`, `codex exec`, `codex review`, `codex resume`, `codex fork`, and `codex debug prompt-input`. - Made user-facing config writes go to the selected profile file when active, including TUI/settings persistence, app-server config writes, and MCP/app tool approval persistence. - Made plugin, marketplace, MCP, hooks, and config reload paths read from the merged user config so base and profile layers both participate. - Updated app-server config layer schemas to mark profile-backed user layers. ## Limits `--profile-v2` is still rejected for config-management subcommands such as feature, MCP, and marketplace edits. Those paths remain tied to the base `config.toml` until they have explicit profile-selection semantics. Some adjacent background writes may still update base or global state rather than the selected profile: - marketplace auto-upgrade metadata - automatic MCP dependency installs from skills - remote plugin sync or uninstall config edits - personality migration marker/default writes ## Verification Added targeted coverage for profile name validation, layer ordering/merging, selected-profile writes, app-server config writes, session hot reload, plugin config merging, hooks/config fixture updates, and MCP/app approval persistence. --------- Co-authored-by: Codex <noreply@openai.com>
685 lines
23 KiB
Rust
685 lines
23 KiB
Rust
use super::*;
|
|
use crate::SkillMetadata;
|
|
use crate::config_rules::resolve_disabled_skill_paths;
|
|
use crate::config_rules::skill_config_rules_from_stack;
|
|
use codex_app_server_protocol::ConfigLayerSource;
|
|
use codex_config::CONFIG_TOML_FILE;
|
|
use codex_config::ConfigLayerEntry;
|
|
use codex_config::ConfigLayerStack;
|
|
use codex_config::ConfigRequirementsToml;
|
|
use codex_exec_server::LOCAL_FS;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use codex_utils_absolute_path::test_support::PathBufExt;
|
|
use codex_utils_absolute_path::test_support::PathExt;
|
|
use codex_utils_plugins::PluginSkillRoot;
|
|
use pretty_assertions::assert_eq;
|
|
use std::collections::HashSet;
|
|
use std::fs;
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
use tempfile::TempDir;
|
|
|
|
fn write_user_skill(codex_home: &TempDir, dir: &str, name: &str, description: &str) {
|
|
let skill_dir = codex_home.path().join("skills").join(dir);
|
|
fs::create_dir_all(&skill_dir).unwrap();
|
|
let content = format!("---\nname: {name}\ndescription: {description}\n---\n\n# Body\n");
|
|
fs::write(skill_dir.join("SKILL.md"), content).unwrap();
|
|
}
|
|
|
|
fn write_plugin_skill(
|
|
codex_home: &TempDir,
|
|
marketplace: &str,
|
|
plugin_name: &str,
|
|
dir: &str,
|
|
name: &str,
|
|
description: &str,
|
|
) -> PathBuf {
|
|
let plugin_root = codex_home
|
|
.path()
|
|
.join("plugins/cache")
|
|
.join(marketplace)
|
|
.join(plugin_name)
|
|
.join("local");
|
|
let skill_dir = plugin_root.join("skills").join(dir);
|
|
fs::create_dir_all(plugin_root.join(".codex-plugin")).unwrap();
|
|
fs::create_dir_all(&skill_dir).unwrap();
|
|
fs::write(
|
|
plugin_root.join(".codex-plugin/plugin.json"),
|
|
format!(r#"{{"name":"{plugin_name}"}}"#),
|
|
)
|
|
.unwrap();
|
|
let content = format!("---\nname: {name}\ndescription: {description}\n---\n\n# Body\n");
|
|
let skill_path = skill_dir.join("SKILL.md");
|
|
fs::write(&skill_path, content).unwrap();
|
|
skill_path
|
|
}
|
|
|
|
fn test_skill(name: &str, path: PathBuf) -> SkillMetadata {
|
|
SkillMetadata {
|
|
name: name.to_string(),
|
|
description: "test".to_string(),
|
|
short_description: None,
|
|
interface: None,
|
|
dependencies: None,
|
|
policy: None,
|
|
path_to_skills_md: path
|
|
.abs()
|
|
.canonicalize()
|
|
.expect("skill path should canonicalize"),
|
|
scope: SkillScope::User,
|
|
plugin_id: None,
|
|
}
|
|
}
|
|
|
|
fn write_demo_skill(tempdir: &TempDir) -> PathBuf {
|
|
let skill_path = tempdir.path().join("skills").join("demo").join("SKILL.md");
|
|
fs::create_dir_all(skill_path.parent().expect("skill path should have parent"))
|
|
.expect("create skill dir");
|
|
fs::write(
|
|
&skill_path,
|
|
"---\nname: demo-skill\ndescription: demo description\n---\n\n# Body\n",
|
|
)
|
|
.expect("write skill");
|
|
skill_path
|
|
}
|
|
|
|
fn user_config_layer(codex_home: &TempDir, config_toml: &str) -> ConfigLayerEntry {
|
|
let config_path = AbsolutePathBuf::try_from(codex_home.path().join(CONFIG_TOML_FILE))
|
|
.expect("user config path should be absolute");
|
|
ConfigLayerEntry::new(
|
|
ConfigLayerSource::User {
|
|
file: config_path,
|
|
profile: None,
|
|
},
|
|
toml::from_str(config_toml).expect("user layer toml"),
|
|
)
|
|
}
|
|
|
|
fn config_stack(codex_home: &TempDir, user_config_toml: &str) -> ConfigLayerStack {
|
|
ConfigLayerStack::new(
|
|
vec![user_config_layer(codex_home, user_config_toml)],
|
|
Default::default(),
|
|
ConfigRequirementsToml::default(),
|
|
)
|
|
.expect("valid config layer stack")
|
|
}
|
|
|
|
fn config_stack_with_session_flags(
|
|
codex_home: &TempDir,
|
|
user_config_toml: &str,
|
|
session_flags_toml: &str,
|
|
) -> ConfigLayerStack {
|
|
ConfigLayerStack::new(
|
|
vec![
|
|
user_config_layer(codex_home, user_config_toml),
|
|
ConfigLayerEntry::new(
|
|
ConfigLayerSource::SessionFlags,
|
|
toml::from_str(session_flags_toml).expect("session layer toml"),
|
|
),
|
|
],
|
|
Default::default(),
|
|
ConfigRequirementsToml::default(),
|
|
)
|
|
.expect("valid config layer stack")
|
|
}
|
|
|
|
fn path_toggle_config(path: &std::path::Path, enabled: bool) -> String {
|
|
format!(
|
|
r#"[[skills.config]]
|
|
path = "{}"
|
|
enabled = {enabled}
|
|
"#,
|
|
path.display()
|
|
)
|
|
}
|
|
|
|
fn name_toggle_config(name: &str, enabled: bool) -> String {
|
|
format!(
|
|
r#"[[skills.config]]
|
|
name = "{name}"
|
|
enabled = {enabled}
|
|
"#
|
|
)
|
|
}
|
|
|
|
async fn skills_for_config_with_stack(
|
|
skills_manager: &SkillsManager,
|
|
cwd: &TempDir,
|
|
config_layer_stack: &ConfigLayerStack,
|
|
effective_skill_roots: &[AbsolutePathBuf],
|
|
) -> SkillLoadOutcome {
|
|
let skills_input = SkillsLoadInput::new(
|
|
cwd.path().abs(),
|
|
effective_skill_roots
|
|
.iter()
|
|
.cloned()
|
|
.map(|path| PluginSkillRoot {
|
|
path,
|
|
plugin_id: "test-plugin@test".to_string(),
|
|
})
|
|
.collect(),
|
|
config_layer_stack.clone(),
|
|
bundled_skills_enabled_from_stack(config_layer_stack),
|
|
);
|
|
skills_manager
|
|
.skills_for_config(&skills_input, Some(Arc::clone(&LOCAL_FS)))
|
|
.await
|
|
}
|
|
|
|
#[test]
|
|
fn new_with_disabled_bundled_skills_removes_stale_cached_system_skills() {
|
|
let codex_home = tempfile::tempdir().expect("tempdir");
|
|
let stale_system_skill_dir = codex_home.path().join("skills/.system/stale-skill");
|
|
fs::create_dir_all(&stale_system_skill_dir).expect("create stale system skill dir");
|
|
fs::write(stale_system_skill_dir.join("SKILL.md"), "# stale\n")
|
|
.expect("write stale system skill");
|
|
|
|
let _skills_manager = SkillsManager::new(
|
|
codex_home.path().abs(),
|
|
/*bundled_skills_enabled*/ false,
|
|
);
|
|
|
|
assert!(
|
|
!codex_home.path().join("skills/.system").exists(),
|
|
"expected disabling system skills to remove stale cached bundled skills"
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn skills_for_config_reuses_cache_for_same_effective_config() {
|
|
let codex_home = tempfile::tempdir().expect("tempdir");
|
|
let cwd = tempfile::tempdir().expect("tempdir");
|
|
let config_layer_stack = config_stack(&codex_home, "");
|
|
let skills_manager = SkillsManager::new(
|
|
codex_home.path().abs(),
|
|
/*bundled_skills_enabled*/ true,
|
|
);
|
|
|
|
write_user_skill(&codex_home, "a", "skill-a", "from a");
|
|
let outcome1 =
|
|
skills_for_config_with_stack(&skills_manager, &cwd, &config_layer_stack, &[]).await;
|
|
assert!(
|
|
outcome1.skills.iter().any(|s| s.name == "skill-a"),
|
|
"expected skill-a to be discovered"
|
|
);
|
|
|
|
// Write a new skill after the first call; the second call should reuse the config-aware cache
|
|
// entry because the effective skill config is unchanged.
|
|
write_user_skill(&codex_home, "b", "skill-b", "from b");
|
|
let outcome2 =
|
|
skills_for_config_with_stack(&skills_manager, &cwd, &config_layer_stack, &[]).await;
|
|
assert_eq!(outcome2.errors, outcome1.errors);
|
|
assert_eq!(outcome2.skills, outcome1.skills);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn skills_for_config_disables_plugin_skills_by_name() {
|
|
let codex_home = tempfile::tempdir().expect("tempdir");
|
|
let cwd = tempfile::tempdir().expect("tempdir");
|
|
let skill_path = write_plugin_skill(
|
|
&codex_home,
|
|
"test",
|
|
"sample",
|
|
"sample-search",
|
|
"sample-search",
|
|
"search sample data",
|
|
);
|
|
let config_layer_stack = config_stack(
|
|
&codex_home,
|
|
&name_toggle_config("sample:sample-search", /*enabled*/ false),
|
|
);
|
|
let plugin_skill_root = skill_path
|
|
.parent()
|
|
.and_then(std::path::Path::parent)
|
|
.expect("plugin skill should live under a skills root")
|
|
.abs();
|
|
let skills_manager = SkillsManager::new(
|
|
codex_home.path().abs(),
|
|
/*bundled_skills_enabled*/ true,
|
|
);
|
|
|
|
let outcome = skills_for_config_with_stack(
|
|
&skills_manager,
|
|
&cwd,
|
|
&config_layer_stack,
|
|
&[plugin_skill_root],
|
|
)
|
|
.await;
|
|
let skill = outcome
|
|
.skills
|
|
.iter()
|
|
.find(|skill| skill.name == "sample:sample-search")
|
|
.expect("plugin skill should load");
|
|
let skill_path = dunce::canonicalize(skill_path)
|
|
.expect("skill path should canonicalize")
|
|
.abs();
|
|
|
|
assert_eq!(skill.path_to_skills_md, skill_path);
|
|
assert!(outcome.disabled_paths.contains(&skill.path_to_skills_md));
|
|
assert!(
|
|
!outcome
|
|
.allowed_skills_for_implicit_invocation()
|
|
.iter()
|
|
.any(|allowed_skill| allowed_skill.path_to_skills_md == skill.path_to_skills_md)
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn skills_for_cwd_loads_repo_and_user_roots_with_local_fs() {
|
|
let codex_home = tempfile::tempdir().expect("tempdir");
|
|
let cwd = tempfile::tempdir().expect("tempdir");
|
|
let repo_dot_codex = cwd.path().join(".codex");
|
|
fs::create_dir_all(&repo_dot_codex).expect("create repo config dir");
|
|
|
|
write_user_skill(&codex_home, "user", "user-skill", "from local user root");
|
|
let repo_skill_dir = repo_dot_codex.join("skills/repo");
|
|
fs::create_dir_all(&repo_skill_dir).expect("create repo skill dir");
|
|
fs::write(
|
|
repo_skill_dir.join("SKILL.md"),
|
|
"---\nname: repo-skill\ndescription: from repo root\n---\n\n# Body\n",
|
|
)
|
|
.expect("write repo skill");
|
|
|
|
let config_layer_stack = ConfigLayerStack::new(
|
|
vec![
|
|
user_config_layer(&codex_home, ""),
|
|
ConfigLayerEntry::new(
|
|
ConfigLayerSource::Project {
|
|
dot_codex_folder: repo_dot_codex.abs(),
|
|
},
|
|
toml::Value::Table(toml::map::Map::new()),
|
|
),
|
|
],
|
|
Default::default(),
|
|
ConfigRequirementsToml::default(),
|
|
)
|
|
.expect("valid config layer stack");
|
|
let skills_input = SkillsLoadInput::new(
|
|
cwd.path().abs(),
|
|
Vec::new(),
|
|
config_layer_stack.clone(),
|
|
bundled_skills_enabled_from_stack(&config_layer_stack),
|
|
);
|
|
let skills_manager = SkillsManager::new(
|
|
codex_home.path().abs(),
|
|
/*bundled_skills_enabled*/ true,
|
|
);
|
|
|
|
let outcome = skills_manager
|
|
.skills_for_cwd(
|
|
&skills_input,
|
|
/*force_reload*/ true,
|
|
Some(Arc::clone(&LOCAL_FS)),
|
|
)
|
|
.await;
|
|
|
|
assert!(
|
|
outcome.errors.is_empty(),
|
|
"unexpected errors: {:?}",
|
|
outcome.errors
|
|
);
|
|
let loaded_names = outcome
|
|
.skills
|
|
.iter()
|
|
.map(|skill| skill.name.as_str())
|
|
.collect::<HashSet<_>>();
|
|
assert!(loaded_names.contains("user-skill"));
|
|
assert!(loaded_names.contains("repo-skill"));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn skills_for_cwd_without_fs_skips_repo_roots() {
|
|
let codex_home = tempfile::tempdir().expect("tempdir");
|
|
let cwd = tempfile::tempdir().expect("tempdir");
|
|
let repo_dot_codex = cwd.path().join(".codex");
|
|
fs::create_dir_all(&repo_dot_codex).expect("create repo config dir");
|
|
|
|
write_user_skill(&codex_home, "user", "user-skill", "from local user root");
|
|
let repo_skill_dir = repo_dot_codex.join("skills/repo");
|
|
fs::create_dir_all(&repo_skill_dir).expect("create repo skill dir");
|
|
fs::write(
|
|
repo_skill_dir.join("SKILL.md"),
|
|
"---\nname: repo-skill\ndescription: from repo root\n---\n\n# Body\n",
|
|
)
|
|
.expect("write repo skill");
|
|
|
|
let config_layer_stack = ConfigLayerStack::new(
|
|
vec![
|
|
user_config_layer(&codex_home, ""),
|
|
ConfigLayerEntry::new(
|
|
ConfigLayerSource::Project {
|
|
dot_codex_folder: repo_dot_codex.abs(),
|
|
},
|
|
toml::Value::Table(toml::map::Map::new()),
|
|
),
|
|
],
|
|
Default::default(),
|
|
ConfigRequirementsToml::default(),
|
|
)
|
|
.expect("valid config layer stack");
|
|
let skills_input = SkillsLoadInput::new(
|
|
cwd.path().abs(),
|
|
Vec::new(),
|
|
config_layer_stack.clone(),
|
|
bundled_skills_enabled_from_stack(&config_layer_stack),
|
|
);
|
|
let skills_manager = SkillsManager::new(
|
|
codex_home.path().abs(),
|
|
/*bundled_skills_enabled*/ true,
|
|
);
|
|
|
|
let outcome = skills_manager
|
|
.skills_for_cwd(&skills_input, /*force_reload*/ true, /*fs*/ None)
|
|
.await;
|
|
|
|
assert!(
|
|
outcome.errors.is_empty(),
|
|
"unexpected errors: {:?}",
|
|
outcome.errors
|
|
);
|
|
let loaded_names = outcome
|
|
.skills
|
|
.iter()
|
|
.map(|skill| skill.name.as_str())
|
|
.collect::<HashSet<_>>();
|
|
assert!(loaded_names.contains("user-skill"));
|
|
assert!(!loaded_names.contains("repo-skill"));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn skills_for_config_excludes_bundled_skills_when_disabled_in_config() {
|
|
let codex_home = tempfile::tempdir().expect("tempdir");
|
|
let cwd = tempfile::tempdir().expect("tempdir");
|
|
let bundled_skill_dir = codex_home.path().join("skills/.system/bundled-skill");
|
|
fs::create_dir_all(&bundled_skill_dir).expect("create bundled skill dir");
|
|
fs::write(
|
|
bundled_skill_dir.join("SKILL.md"),
|
|
"---\nname: bundled-skill\ndescription: from bundled root\n---\n\n# Body\n",
|
|
)
|
|
.expect("write bundled skill");
|
|
let config_layer_stack = config_stack(&codex_home, "[skills.bundled]\nenabled = false\n");
|
|
let skills_manager = SkillsManager::new(
|
|
codex_home.path().abs(),
|
|
/*bundled_skills_enabled*/ false,
|
|
);
|
|
|
|
// Recreate the cached bundled skill after startup cleanup so this assertion exercises
|
|
// root selection rather than relying on directory removal succeeding.
|
|
fs::create_dir_all(&bundled_skill_dir).expect("recreate bundled skill dir");
|
|
fs::write(
|
|
bundled_skill_dir.join("SKILL.md"),
|
|
"---\nname: bundled-skill\ndescription: from bundled root\n---\n\n# Body\n",
|
|
)
|
|
.expect("rewrite bundled skill");
|
|
|
|
let outcome =
|
|
skills_for_config_with_stack(&skills_manager, &cwd, &config_layer_stack, &[]).await;
|
|
assert!(
|
|
outcome
|
|
.skills
|
|
.iter()
|
|
.all(|skill| skill.name != "bundled-skill")
|
|
);
|
|
assert!(
|
|
outcome
|
|
.skills
|
|
.iter()
|
|
.all(|skill| skill.scope != SkillScope::System)
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn skills_for_cwd_uses_cached_result_until_force_reload() {
|
|
let codex_home = tempfile::tempdir().expect("tempdir");
|
|
let cwd = tempfile::tempdir().expect("tempdir");
|
|
let config_layer_stack = config_stack(&codex_home, "");
|
|
let skills_manager = SkillsManager::new(
|
|
codex_home.path().abs(),
|
|
/*bundled_skills_enabled*/ true,
|
|
);
|
|
let _ = skills_for_config_with_stack(&skills_manager, &cwd, &config_layer_stack, &[]).await;
|
|
let base_input = SkillsLoadInput::new(
|
|
cwd.path().abs(),
|
|
Vec::new(),
|
|
config_layer_stack.clone(),
|
|
bundled_skills_enabled_from_stack(&config_layer_stack),
|
|
);
|
|
let outcome_a = skills_manager
|
|
.skills_for_cwd(
|
|
&base_input,
|
|
/*force_reload*/ false,
|
|
Some(Arc::clone(&LOCAL_FS)),
|
|
)
|
|
.await;
|
|
assert!(
|
|
outcome_a
|
|
.skills
|
|
.iter()
|
|
.all(|skill| skill.name != "late-skill")
|
|
);
|
|
|
|
write_user_skill(&codex_home, "late", "late-skill", "added after cache");
|
|
|
|
let outcome_b = skills_manager
|
|
.skills_for_cwd(
|
|
&base_input,
|
|
/*force_reload*/ false,
|
|
Some(Arc::clone(&LOCAL_FS)),
|
|
)
|
|
.await;
|
|
assert!(
|
|
outcome_b
|
|
.skills
|
|
.iter()
|
|
.all(|skill| skill.name != "late-skill")
|
|
);
|
|
|
|
let outcome_reloaded = skills_manager
|
|
.skills_for_cwd(
|
|
&base_input,
|
|
/*force_reload*/ true,
|
|
Some(Arc::clone(&LOCAL_FS)),
|
|
)
|
|
.await;
|
|
assert!(
|
|
outcome_reloaded
|
|
.skills
|
|
.iter()
|
|
.any(|skill| skill.name == "late-skill")
|
|
);
|
|
}
|
|
|
|
#[cfg_attr(windows, ignore)]
|
|
#[test]
|
|
fn disabled_paths_for_skills_allows_session_flags_to_override_user_layer() {
|
|
let tempdir = tempfile::tempdir().expect("tempdir");
|
|
let skill_path = write_demo_skill(&tempdir);
|
|
let skill = test_skill("demo-skill", skill_path.clone());
|
|
let user_file = AbsolutePathBuf::try_from(tempdir.path().join("config.toml"))
|
|
.expect("user config path should be absolute");
|
|
let user_layer = ConfigLayerEntry::new(
|
|
ConfigLayerSource::User {
|
|
file: user_file,
|
|
profile: None,
|
|
},
|
|
toml::from_str(&path_toggle_config(&skill_path, /*enabled*/ false))
|
|
.expect("user layer toml"),
|
|
);
|
|
let session_layer = ConfigLayerEntry::new(
|
|
ConfigLayerSource::SessionFlags,
|
|
toml::from_str(&path_toggle_config(&skill_path, /*enabled*/ true))
|
|
.expect("session layer toml"),
|
|
);
|
|
let stack = ConfigLayerStack::new(
|
|
vec![user_layer, session_layer],
|
|
Default::default(),
|
|
ConfigRequirementsToml::default(),
|
|
)
|
|
.expect("valid config layer stack");
|
|
|
|
let skill_config_rules = skill_config_rules_from_stack(&stack);
|
|
assert_eq!(
|
|
resolve_disabled_skill_paths(&[skill], &skill_config_rules),
|
|
HashSet::new()
|
|
);
|
|
}
|
|
|
|
#[cfg_attr(windows, ignore)]
|
|
#[test]
|
|
fn disabled_paths_for_skills_allows_session_flags_to_disable_user_enabled_skill() {
|
|
let tempdir = tempfile::tempdir().expect("tempdir");
|
|
let skill_path = write_demo_skill(&tempdir);
|
|
let skill = test_skill("demo-skill", skill_path.clone());
|
|
let user_file = AbsolutePathBuf::try_from(tempdir.path().join("config.toml"))
|
|
.expect("user config path should be absolute");
|
|
let user_layer = ConfigLayerEntry::new(
|
|
ConfigLayerSource::User {
|
|
file: user_file,
|
|
profile: None,
|
|
},
|
|
toml::from_str(&path_toggle_config(&skill_path, /*enabled*/ true))
|
|
.expect("user layer toml"),
|
|
);
|
|
let session_layer = ConfigLayerEntry::new(
|
|
ConfigLayerSource::SessionFlags,
|
|
toml::from_str(&path_toggle_config(&skill_path, /*enabled*/ false))
|
|
.expect("session layer toml"),
|
|
);
|
|
let stack = ConfigLayerStack::new(
|
|
vec![user_layer, session_layer],
|
|
Default::default(),
|
|
ConfigRequirementsToml::default(),
|
|
)
|
|
.expect("valid config layer stack");
|
|
|
|
let skill_config_rules = skill_config_rules_from_stack(&stack);
|
|
assert_eq!(
|
|
resolve_disabled_skill_paths(&[skill], &skill_config_rules),
|
|
HashSet::from([skill_path
|
|
.abs()
|
|
.canonicalize()
|
|
.expect("skill path should canonicalize")])
|
|
);
|
|
}
|
|
|
|
#[cfg_attr(windows, ignore)]
|
|
#[test]
|
|
fn disabled_paths_for_skills_disables_matching_name_selectors() {
|
|
let tempdir = tempfile::tempdir().expect("tempdir");
|
|
let skill_path = write_demo_skill(&tempdir);
|
|
let skill = test_skill("github:yeet", skill_path.clone());
|
|
let user_file = AbsolutePathBuf::try_from(tempdir.path().join("config.toml"))
|
|
.expect("user config path should be absolute");
|
|
let user_layer = ConfigLayerEntry::new(
|
|
ConfigLayerSource::User {
|
|
file: user_file,
|
|
profile: None,
|
|
},
|
|
toml::from_str(&name_toggle_config("github:yeet", /*enabled*/ false))
|
|
.expect("user layer toml"),
|
|
);
|
|
let stack = ConfigLayerStack::new(
|
|
vec![user_layer],
|
|
Default::default(),
|
|
ConfigRequirementsToml::default(),
|
|
)
|
|
.expect("valid config layer stack");
|
|
|
|
let skill_config_rules = skill_config_rules_from_stack(&stack);
|
|
assert_eq!(
|
|
resolve_disabled_skill_paths(&[skill], &skill_config_rules),
|
|
HashSet::from([skill_path
|
|
.abs()
|
|
.canonicalize()
|
|
.expect("skill path should canonicalize")])
|
|
);
|
|
}
|
|
|
|
#[cfg_attr(windows, ignore)]
|
|
#[test]
|
|
fn disabled_paths_for_skills_allows_name_selector_to_override_path_selector() {
|
|
let tempdir = tempfile::tempdir().expect("tempdir");
|
|
let skill_path = write_demo_skill(&tempdir);
|
|
let skill = test_skill("github:yeet", skill_path.clone());
|
|
let user_file = AbsolutePathBuf::try_from(tempdir.path().join("config.toml"))
|
|
.expect("user config path should be absolute");
|
|
let user_layer = ConfigLayerEntry::new(
|
|
ConfigLayerSource::User {
|
|
file: user_file,
|
|
profile: None,
|
|
},
|
|
toml::from_str(&path_toggle_config(&skill_path, /*enabled*/ false))
|
|
.expect("user layer toml"),
|
|
);
|
|
let session_layer = ConfigLayerEntry::new(
|
|
ConfigLayerSource::SessionFlags,
|
|
toml::from_str(&name_toggle_config("github:yeet", /*enabled*/ true))
|
|
.expect("session layer toml"),
|
|
);
|
|
let stack = ConfigLayerStack::new(
|
|
vec![user_layer, session_layer],
|
|
Default::default(),
|
|
ConfigRequirementsToml::default(),
|
|
)
|
|
.expect("valid config layer stack");
|
|
|
|
let skill_config_rules = skill_config_rules_from_stack(&stack);
|
|
assert_eq!(
|
|
resolve_disabled_skill_paths(&[skill], &skill_config_rules),
|
|
HashSet::new()
|
|
);
|
|
}
|
|
|
|
#[cfg_attr(windows, ignore)]
|
|
#[tokio::test]
|
|
async fn skills_for_config_ignores_cwd_cache_when_session_flags_reenable_skill() {
|
|
let codex_home = tempfile::tempdir().expect("tempdir");
|
|
let cwd = tempfile::tempdir().expect("tempdir");
|
|
let skill_dir = codex_home.path().join("skills").join("demo");
|
|
fs::create_dir_all(&skill_dir).expect("create skill dir");
|
|
let skill_path = skill_dir.join("SKILL.md");
|
|
fs::write(
|
|
&skill_path,
|
|
"---\nname: demo-skill\ndescription: demo description\n---\n\n# Body\n",
|
|
)
|
|
.expect("write skill");
|
|
let disabled_skill_config = path_toggle_config(&skill_path, /*enabled*/ false);
|
|
let enabled_skill_config = path_toggle_config(&skill_path, /*enabled*/ true);
|
|
let parent_stack = config_stack(&codex_home, &disabled_skill_config);
|
|
let child_stack =
|
|
config_stack_with_session_flags(&codex_home, &disabled_skill_config, &enabled_skill_config);
|
|
let skills_manager = SkillsManager::new(
|
|
codex_home.path().abs(),
|
|
/*bundled_skills_enabled*/ true,
|
|
);
|
|
let parent_input = SkillsLoadInput::new(
|
|
cwd.path().abs(),
|
|
Vec::new(),
|
|
parent_stack.clone(),
|
|
bundled_skills_enabled_from_stack(&parent_stack),
|
|
);
|
|
|
|
let parent_outcome = skills_manager
|
|
.skills_for_cwd(
|
|
&parent_input,
|
|
/*force_reload*/ true,
|
|
Some(Arc::clone(&LOCAL_FS)),
|
|
)
|
|
.await;
|
|
let parent_skill = parent_outcome
|
|
.skills
|
|
.iter()
|
|
.find(|skill| skill.name == "demo-skill")
|
|
.expect("demo skill should be discovered");
|
|
assert_eq!(parent_outcome.is_skill_enabled(parent_skill), false);
|
|
|
|
let child_outcome =
|
|
skills_for_config_with_stack(&skills_manager, &cwd, &child_stack, &[]).await;
|
|
let child_skill = child_outcome
|
|
.skills
|
|
.iter()
|
|
.find(|skill| skill.name == "demo-skill")
|
|
.expect("demo skill should be discovered");
|
|
assert_eq!(child_outcome.is_skill_enabled(child_skill), true);
|
|
}
|