mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
jifandGitHub
3389fa554e
## Why The skills extension needs the resolved turn environments to build a real per-turn `SkillListQuery`. The previous `TurnLifecycleContributor` hook only had a turn id, so it could only seed a placeholder query and never carry the executor authorities that executor-scoped skill routing will need. Moving catalog resolution onto `TurnInputContributor` puts the skills extension on the same turn-preparation path that already has the environment ids and working directories for the submitted turn, while keeping the actual prompt injection work for follow-up changes. ## What changed - switch `ext/skills` from `TurnLifecycleContributor` to `TurnInputContributor` - build `executor_authorities` from `TurnInputContext.environments` and pass them through `SkillListQuery` - keep storing the resolved catalog in `SkillsTurnState`, but drop the placeholder query helper that no longer matches the real data flow - update the extension TODOs to reflect that per-turn catalog resolution now happens in the turn-input contributor, and that prompt/context injection still needs to move later ## Testing - Not run locally.
42 lines
941 B
Rust
42 lines
941 B
Rust
use codex_context_fragments::ContextualUserFragment;
|
|
|
|
use crate::injection::SkillInjection;
|
|
|
|
#[derive(Debug, Clone, PartialEq)]
|
|
pub struct SkillInstructions {
|
|
name: String,
|
|
path: String,
|
|
contents: String,
|
|
}
|
|
|
|
impl From<&SkillInjection> for SkillInstructions {
|
|
fn from(skill: &SkillInjection) -> Self {
|
|
Self {
|
|
name: skill.name.clone(),
|
|
path: skill.path.clone(),
|
|
contents: skill.contents.clone(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ContextualUserFragment for SkillInstructions {
|
|
fn role(&self) -> &'static str {
|
|
"user"
|
|
}
|
|
|
|
fn markers(&self) -> (&'static str, &'static str) {
|
|
Self::type_markers()
|
|
}
|
|
|
|
fn type_markers() -> (&'static str, &'static str) {
|
|
("<skill>", "</skill>")
|
|
}
|
|
|
|
fn body(&self) -> String {
|
|
format!(
|
|
"\n<name>{}</name>\n<path>{}</path>\n{}\n",
|
|
self.name, self.path, self.contents
|
|
)
|
|
}
|
|
}
|