mirror of
https://github.com/openai/codex.git
synced 2026-11-13 14:46:14 +00:00
Parse model annotations from skill frontmatter (#38467)
## What changed - Add an optional `model` field to parsed and loaded skill metadata. - Recognize `model: luna` while ignoring unsupported model values without preventing the rest of the skill metadata from loading. ## Testing - Cover supported, absent, unsupported, and repaired frontmatter model values. GitOrigin-RevId: 376b65555e81d29a5eae93cc4c2633aacf7cd7c8
This commit is contained in:
1 parent
c6dee5f49f
commit
3711943d11
17 files changed
+122
-1
No files matched your search
@@ -24,6 +24,7 @@ fn host_interface_metadata_makes_unlisted_workflow_discoverable() {
|
||||
name: "content-tools".to_string(),
|
||||
description: "Prepare visual content.".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: Some(SkillInterface {
|
||||
display_name: Some("Visual Assets".to_string()),
|
||||
short_description: Some("Create illustrated assets.".to_string()),
|
||||
|
||||
@@ -225,6 +225,7 @@ fn expected_skill(path: AbsolutePathBuf, name: &str, scope: SkillScope) -> Skill
|
||||
name: name.to_string(),
|
||||
description: format!("{name} description"),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: None,
|
||||
dependencies: None,
|
||||
policy: None,
|
||||
|
||||
@@ -324,6 +324,7 @@ async fn snapshot_for_config_preserves_host_precedence_for_symlinked_plugin_root
|
||||
name: "sample:search".to_string(),
|
||||
description: "shared skill".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: None,
|
||||
dependencies: None,
|
||||
policy: None,
|
||||
|
||||
@@ -72,6 +72,7 @@ impl ParsedEnvironmentSkill {
|
||||
name: base_name,
|
||||
description,
|
||||
short_description,
|
||||
model: _,
|
||||
} = parse_skill_frontmatter_metadata(&contents, || default_skill_name(&skill.path))
|
||||
.map_err(|err| err.to_string())?;
|
||||
let (dependencies, policy) = match &skill.metadata {
|
||||
@@ -240,6 +241,7 @@ pub fn load_environment_skills_from_discovery(
|
||||
name: base_name,
|
||||
description,
|
||||
short_description,
|
||||
model: _,
|
||||
} = match parse_skill_frontmatter_metadata(&skill.instructions.contents, || {
|
||||
default_skill_name(&skill.instructions.path)
|
||||
}) {
|
||||
|
||||
@@ -356,6 +356,7 @@ async fn parse_skill_file(
|
||||
name,
|
||||
description,
|
||||
short_description,
|
||||
model,
|
||||
} = parse_skill_frontmatter_metadata(&contents, || default_skill_name(path))
|
||||
.map_err(|error| error.to_string())?;
|
||||
let LoadedSkillMetadata {
|
||||
@@ -368,6 +369,7 @@ async fn parse_skill_file(
|
||||
name,
|
||||
description,
|
||||
short_description,
|
||||
model,
|
||||
interface,
|
||||
dependencies,
|
||||
policy,
|
||||
|
||||
@@ -84,6 +84,7 @@ async fn host_loading_reuses_walk_inventory_for_symlinked_skill_pack() {
|
||||
name: "linked:first".to_string(),
|
||||
description: "first skill.".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: None,
|
||||
dependencies: None,
|
||||
policy: Some(SkillPolicy {
|
||||
@@ -99,6 +100,7 @@ async fn host_loading_reuses_walk_inventory_for_symlinked_skill_pack() {
|
||||
name: "linked:second".to_string(),
|
||||
description: "second skill.".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: None,
|
||||
dependencies: None,
|
||||
policy: None,
|
||||
|
||||
@@ -7,6 +7,7 @@ use codex_protocol::protocol::SkillScope;
|
||||
use codex_skills::SkillDependencies;
|
||||
use codex_skills::SkillInterface;
|
||||
use codex_skills::SkillMetadata;
|
||||
use codex_skills::SkillModel;
|
||||
use codex_skills::SkillPolicy;
|
||||
use codex_skills::SkillToolDependency;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
@@ -107,7 +108,7 @@ async fn loads_host_frontmatter_dependencies_and_policy() {
|
||||
let skill_path = write_skill(
|
||||
&root,
|
||||
"demo",
|
||||
"name: demo\ndescription: Demo skill\nmetadata:\n short-description: Short demo",
|
||||
"name: demo\ndescription: Demo skill\nmodel: luna\nmetadata:\n short-description: Short demo",
|
||||
);
|
||||
write_metadata(
|
||||
&root,
|
||||
@@ -134,6 +135,7 @@ policy:
|
||||
name: "demo".to_string(),
|
||||
description: "Demo skill".to_string(),
|
||||
short_description: Some("Short demo".to_string()),
|
||||
model: Some(SkillModel::Luna),
|
||||
interface: None,
|
||||
dependencies: Some(SkillDependencies {
|
||||
tools: vec![SkillToolDependency {
|
||||
@@ -173,6 +175,7 @@ async fn invalid_optional_metadata_fails_open() {
|
||||
name: "demo".to_string(),
|
||||
description: "Demo skill".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: None,
|
||||
dependencies: None,
|
||||
policy: None,
|
||||
@@ -212,6 +215,7 @@ async fn loads_host_interface_metadata_and_local_asset_paths() {
|
||||
name: "demo".to_string(),
|
||||
description: "Demo skill".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: Some(SkillInterface {
|
||||
display_name: Some("Demo".to_string()),
|
||||
short_description: Some("Interface summary".to_string()),
|
||||
@@ -251,6 +255,7 @@ async fn loads_plugin_skill_interface_icons_from_local_and_shared_assets() {
|
||||
name: "plugin:send-message".to_string(),
|
||||
description: "Send messages".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: Some(SkillInterface {
|
||||
display_name: None,
|
||||
short_description: None,
|
||||
@@ -293,6 +298,7 @@ async fn rejects_plugin_skill_interface_icons_outside_shared_assets() {
|
||||
name: "plugin:send-message".to_string(),
|
||||
description: "Send messages".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: Some(SkillInterface {
|
||||
display_name: Some("Send Message".to_string()),
|
||||
short_description: None,
|
||||
@@ -330,6 +336,7 @@ async fn rejects_interface_fields_that_escape_or_fail_validation() {
|
||||
name: "demo".to_string(),
|
||||
description: "Demo skill".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: None,
|
||||
dependencies: None,
|
||||
policy: None,
|
||||
@@ -380,6 +387,7 @@ async fn discovers_nested_plugin_namespace_without_plugin_identity() {
|
||||
name: "plugin-name:demo".to_string(),
|
||||
description: "Demo skill".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: None,
|
||||
dependencies: None,
|
||||
policy: None,
|
||||
@@ -425,6 +433,7 @@ async fn plugin_root_accepts_maximum_length_qualified_skill_name() {
|
||||
name: format!("{plugin_namespace}:{skill_name}"),
|
||||
description: "Search skill".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: None,
|
||||
dependencies: None,
|
||||
policy: None,
|
||||
@@ -519,6 +528,7 @@ async fn recursive_plugin_root_preserves_owner_namespace_and_shared_asset_policy
|
||||
name: "plugin:demo".to_string(),
|
||||
description: "Demo skill".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: Some(SkillInterface {
|
||||
display_name: None,
|
||||
short_description: None,
|
||||
@@ -578,6 +588,7 @@ async fn direct_child_plugin_root_ignores_nested_skills() {
|
||||
name: "plugin:direct".to_string(),
|
||||
description: "Direct skill".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: None,
|
||||
dependencies: None,
|
||||
policy: None,
|
||||
@@ -659,6 +670,7 @@ async fn recursive_plugin_root_preserves_symlinked_skill_discovery_path() {
|
||||
name: "plugin:demo".to_string(),
|
||||
description: "Symlinked skill".to_string(),
|
||||
short_description: None,
|
||||
model: None,
|
||||
interface: None,
|
||||
dependencies: None,
|
||||
policy: None,
|
||||
|
||||
Reference in new issue
Block a user