Skip to content

feat: catalog multi-agent v2 config#26254

Merged
jif-oai merged 2 commits into
mainfrom
jif/catalog-ma-config
Jun 3, 2026
Merged

feat: catalog multi-agent v2 config#26254
jif-oai merged 2 commits into
mainfrom
jif/catalog-ma-config

Conversation

@jif-oai

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

Copy link
Copy Markdown
Collaborator

Why

Model metadata can now select multi-agent v2 even when a user has not enabled features.multi_agent_v2 in their config. Some existing configs still set the legacy agents.max_threads knob for v1 multi-agent behavior, so treating every v2 runtime as incompatible with agents.max_threads would break users whose only v2 signal came from the model catalog.

The incompatible configuration is specifically enabling features.multi_agent_v2 while also setting agents.max_threads. Catalog-forced v2 should use the v2 concurrency setting and ignore the legacy v1 cap instead of rejecting the config.

What changed

  • Split config validation from runtime concurrency calculation: effective_agent_max_threads now just returns the effective cap for the resolved multi-agent runtime.
  • Added explicit validation for features.multi_agent_v2 + agents.max_threads at session startup.
  • Preserved catalog-selected v2 behavior when features.multi_agent_v2 is disabled, so existing configs with agents.max_threads keep starting.
  • Updated model-runtime selector coverage so a catalog v2 model still exposes v2 tools even when agents.max_threads is set and the config flag is disabled.

Validation

  • cargo check -p codex-core --lib
  • just test -p codex-core --lib -E "test(multi_agent_v2_feature_rejects_agents_max_threads) | test(catalog_v2_allows_agents_max_threads_when_feature_disabled)"

@jif-oai jif-oai requested a review from a team as a code owner June 3, 2026 21:36

@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: c677bf1f9c

ℹ️ 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/core/src/session/mod.rs Outdated
@jif-oai

jif-oai commented Jun 3, 2026

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown
Contributor

Codex Review: Didn't find any major issues. What shall we delve into next?

ℹ️ 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".

@jif-oai jif-oai merged commit 11bceb8 into main Jun 3, 2026
31 checks passed
@jif-oai jif-oai deleted the jif/catalog-ma-config branch June 3, 2026 22:24
@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.

2 participants