Skip to content

skills: resolve per-turn catalogs from turn input context#26106

Merged
jif-oai merged 3 commits into
mainfrom
jif/skills-2
Jun 3, 2026
Merged

skills: resolve per-turn catalogs from turn input context#26106
jif-oai merged 3 commits into
mainfrom
jif/skills-2

Conversation

@jif-oai

@jif-oai jif-oai commented Jun 3, 2026

Copy link
Copy Markdown
Collaborator

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.

@jif-oai jif-oai changed the title feat: skills 2 skills: resolve per-turn catalogs from turn input context Jun 3, 2026
@jif-oai jif-oai requested a review from a team as a code owner June 3, 2026 10:51
@jif-oai

jif-oai commented Jun 3, 2026

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4484addb9a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread codex-rs/ext/extension-api/Cargo.toml
Comment thread codex-rs/ext/skills/src/extension.rs
@jif-oai jif-oai merged commit 3389fa5 into main Jun 3, 2026
31 checks passed
@jif-oai jif-oai deleted the jif/skills-2 branch June 3, 2026 11:32
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 3, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant