Skip to content

Set multi-agent v2 dogfood defaults#25266

Merged
jif-oai merged 4 commits into
mainfrom
jif/ma-default-values
Jun 1, 2026
Merged

Set multi-agent v2 dogfood defaults#25266
jif-oai merged 4 commits into
mainfrom
jif/ma-default-values

Conversation

@jif-oai
Copy link
Copy Markdown
Collaborator

@jif-oai jif-oai commented May 30, 2026

Summary

  • default multi-agent v2 to direct-model-only tools so code mode does not wrap subagent tools
  • add default root/subagent team prompts aligned with dogfood training assumptions
  • tighten spawn-agent model override wording to prefer the inherited model by default

Tests

  • just fmt
  • just test -p codex-core spawn_agent_description_lists_visible_models_and_reasoning_efforts
  • just test -p codex-core multi_agent_v2_default_session_thread_cap_counts_root
  • just test -p codex-rollout-trace
  • just fix -p codex-core
  • just fix -p codex-rollout-trace

Note: a broad just test -p codex-core run was attempted locally, but this sandbox produced unrelated environment failures around sandbox-exec, missing test_stdio_server, and realtime timeouts.

@jif-oai jif-oai requested a review from a team as a code owner May 30, 2026 12:00
@jif-oai
Copy link
Copy Markdown
Collaborator Author

jif-oai commented May 30, 2026

@codex review

Copy link
Copy Markdown
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: 560dc334b1

ℹ️ 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/config/mod.rs Outdated
Comment thread codex-rs/core/src/config/mod.rs
Comment thread codex-rs/core/src/config/mod.rs
Base automatically changed from jif/ma-assign-task to main May 30, 2026 12:13
@jif-oai
Copy link
Copy Markdown
Collaborator Author

jif-oai commented May 30, 2026

@codex review

Copy link
Copy Markdown
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: 7f0324ed1b

ℹ️ 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 +1063 to +1065
subagent_usage_hint_text: Some(
DEFAULT_MULTI_AGENT_V2_SUBAGENT_USAGE_HINT_TEXT.to_string(),
),
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.

P2 Badge Honor disabled hints for full-history subagents

When a user sets [features.multi_agent_v2] usage_hint_enabled = false, the initial context now suppresses these hints, but spawn_agent still defaults fork_turns to all, and the full-history fork path in agent/control.rs appends config.multi_agent_v2.subagent_usage_hint_text whenever it is Some without checking usage_hint_enabled. Since this change makes the subagent hint Some by default, disabled multi-agent hints will still be injected into every default full-history subagent unless the user also knows to clear subagent_usage_hint_text = "".

Useful? React with 👍 / 👎.

Comment thread codex-rs/core/src/tools/handlers/multi_agents_spec.rs
Comment thread codex-rs/core/src/config/mod.rs
@jif-oai jif-oai merged commit 8d49394 into main Jun 1, 2026
31 checks passed
@jif-oai jif-oai deleted the jif/ma-default-values branch June 1, 2026 08:24
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 1, 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