mirror of
https://github.com/openai/codex.git
synced 2026-10-29 19:08:43 +00:00
Alex Daley
2edc8dcb0c
## What changed Add the disabled-by-default `omit_skill_descriptions` feature flag to omit descriptions from model-visible host, executor, and cloud skill catalogs while retaining names and locators. Adapt catalog introductions, usage instructions, and alias budget accounting to the selected policy. Persist the description policy in catalog snapshots and refresh usage instructions when it changes. Ignore description-only edits in catalog deltas while descriptions are omitted. ## Testing Add coverage for alias token budgets, policy changes with older snapshots, and suppressed description-only updates. Extend scenario snapshots to cover plugin visibility and catalog deduplication with descriptions omitted. GitOrigin-RevId: 5bf1dcee8c04059c7a78998affc1efcdef8ec883
101 lines
3.4 KiB
Rust
101 lines
3.4 KiB
Rust
use pretty_assertions::assert_eq;
|
|
|
|
use super::*;
|
|
use crate::catalog::SkillAuthority;
|
|
use crate::catalog::SkillCatalog;
|
|
use crate::catalog::SkillCatalogEntry;
|
|
use crate::catalog::SkillPackageId;
|
|
use crate::catalog::SkillResourceId;
|
|
|
|
fn detect_executor_skill(command: &str, environments: &[&str]) -> Option<SkillInvocation> {
|
|
let skill_path = PathUri::parse("file:///skills/demo/SKILL.md").expect("valid skill URI");
|
|
let catalog = SkillCatalog {
|
|
is_partial: false,
|
|
entries: environments
|
|
.iter()
|
|
.map(|environment| {
|
|
SkillCatalogEntry::new(
|
|
SkillPackageId(format!("skill://{environment}/demo")),
|
|
SkillAuthority::new(SkillSourceKind::Executor, *environment),
|
|
format!("{environment}-skill"),
|
|
"test skill",
|
|
SkillResourceId::environment(
|
|
format!("skill://{environment}/demo/SKILL.md"),
|
|
*environment,
|
|
skill_path.clone(),
|
|
),
|
|
)
|
|
})
|
|
.collect(),
|
|
warnings: Vec::new(),
|
|
};
|
|
let turn_store = ExtensionData::new("test-turn");
|
|
let step_catalog = crate::step_state::SkillStepCatalog::new(
|
|
/*cloud*/ None,
|
|
catalog,
|
|
/*discovery_v2*/ false,
|
|
Default::default(),
|
|
);
|
|
let step_store = ExtensionData::new("step");
|
|
step_store.insert(crate::step_state::SkillsStepState {
|
|
discovery_v2: false,
|
|
tools_enabled: true,
|
|
catalog: step_catalog,
|
|
host_catalog: None,
|
|
cloud_status: crate::step_state::CatalogStatus::Unavailable,
|
|
config: crate::SkillsExtensionConfig {
|
|
include_instructions: true,
|
|
catalog_deltas_enabled: false,
|
|
omit_descriptions: false,
|
|
max_context_tokens: None,
|
|
bundled_skills_enabled: false,
|
|
cloud_skill_enabled: false,
|
|
shadow_selection_enabled: false,
|
|
},
|
|
});
|
|
|
|
detect_implicit_skill_invocation(
|
|
&turn_store,
|
|
&step_store,
|
|
"executor-a",
|
|
command,
|
|
&PathUri::parse("file:///skills").expect("valid workdir URI"),
|
|
/*native_workdir*/ None,
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn detects_executor_skill_document_reads() {
|
|
let invocation = detect_executor_skill("cat demo/SKILL.md", &["executor-a"])
|
|
.expect("document read should identify the executor skill");
|
|
|
|
assert_eq!(invocation.skill_name, "executor-a-skill");
|
|
assert!(matches!(
|
|
invocation.location,
|
|
SkillInvocationLocation::Resource { id, .. }
|
|
if id == "skill://executor-a/demo/SKILL.md"
|
|
));
|
|
}
|
|
|
|
#[test]
|
|
fn detects_executor_skill_script_runs() {
|
|
let invocation = detect_executor_skill("python demo/scripts/run.py", &["executor-a"])
|
|
.expect("script execution should identify the executor skill");
|
|
|
|
assert_eq!(invocation.skill_name, "executor-a-skill");
|
|
}
|
|
|
|
#[test]
|
|
fn ignores_matching_paths_from_other_environments() {
|
|
let invocation = detect_executor_skill("cat demo/SKILL.md", &["executor-b", "executor-a"])
|
|
.expect("matching path should resolve to the execution environment");
|
|
|
|
assert_eq!(invocation.skill_name, "executor-a-skill");
|
|
assert!(detect_executor_skill("cat demo/SKILL.md", &["executor-b"]).is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn ignores_commands_without_skill_access() {
|
|
assert!(detect_executor_skill("echo hello", &["executor-a"]).is_none());
|
|
}
|