Skip to content

Revert "fix: harden plugin feature gating"#15102

Merged
xl-openai merged 1 commit intomainfrom
revert-15020-xl/plugins2
Mar 18, 2026
Merged

Revert "fix: harden plugin feature gating"#15102
xl-openai merged 1 commit intomainfrom
revert-15020-xl/plugins2

Conversation

@xl-openai
Copy link
Collaborator

Reverts #15020

I messed up the commit in my PR and accidentally merged changes that were still under review.

Copy link
Contributor

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

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: c5281d1f5a

ℹ️ 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 on lines +5426 to 5430
plugins: marketplace
.plugins
.into_iter()
.filter(|plugin| {
session_source.matches_product_restriction(&plugin.policy.products)
})
.map(|plugin| PluginSummary {
id: plugin.id,
Copy link
Contributor

Choose a reason for hiding this comment

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

P1 Badge Filter plugin list by product restrictions

plugin/list now maps every marketplace plugin into the response without checking plugin.policy.products. Because plugin/install has no separate product gate, Codex sessions can discover and install plugins marked for other products (e.g. ChatGPT/Atlas-only), violating marketplace policy and exposing unsupported integrations.

Useful? React with 👍 / 👎.

Comment on lines +2388 to +2392
let skills_outcome = Arc::new(
self.services
.skills_manager
.skills_for_config(&per_turn_config),
&session_configuration.session_source,
));
);
Copy link
Contributor

Choose a reason for hiding this comment

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

P1 Badge Reapply skill product gating before turn context build

This constructs skills_outcome directly from skills_for_config and passes it into TurnSkillsContext with no session-source filtering. Skills whose policy.products excludes the current product are now eligible for implicit injection/selection, so product-scoped skills can affect prompts in the wrong client.

Useful? React with 👍 / 👎.

@xl-openai xl-openai merged commit 86982ca into main Mar 18, 2026
32 checks passed
@xl-openai xl-openai deleted the revert-15020-xl/plugins2 branch March 18, 2026 22:19
@github-actions github-actions bot locked and limited conversation to collaborators Mar 18, 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.

2 participants