openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-18 17:18:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable parallel tool calls for all model prompts (#38499)

Browse Source 
## What changed

- Set `parallel_tool_calls` for regular and remote compaction prompts without consulting model metadata.
- Remove `supports_parallel_tool_calls` from `ModelInfo`, the bundled model catalog, and related fixtures.
- Preserve the existing Responses Lite behavior that disables parallel tool calls at request construction.

GitOrigin-RevId: 49552bdf97e71fa57325abb49f8adc0c88f1401a
This commit is contained in:
rka-oai
2026-08-14 05:49:33 +00:00
committed by copyberry
parent 636e505c5c
commit 86b1123ff6
26 changed files with 3 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/app-server/tests/common/models_cache.rs
-1
View File
@@ -53,7 +53,6 @@ fn preset_to_info(preset: &ModelPreset, priority: i32) -> ModelInfo {
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
codex-rs/app-server/tests/suite/v2/model_list.rs
-1
View File
@@ -188,7 +188,6 @@ async fn list_models_uses_chatgpt_remote_catalog_as_source_of_truth() -> Result<
"default_verbosity": null,
"apply_patch_tool_type": null,
"truncation_policy": {"mode": "bytes", "limit": 10_000},
"supports_parallel_tool_calls": false,
"supports_image_detail_original": false,
"multi_agent_version": "v2",
"context_window": 272_000,
codex-rs/codex-api/src/endpoint/models.rs
-1
View File
@@ -212,7 +212,6 @@ mod tests {
"default_verbosity": null,
"apply_patch_tool_type": null,
"truncation_policy": {"mode": "bytes", "limit": 10_000},
"supports_parallel_tool_calls": false,
"supports_image_detail_original": false,
"context_window": 272_000,
"experimental_supported_tools": [],
codex-rs/codex-api/tests/models_integration.rs
-1
View File
@@ -91,7 +91,6 @@ async fn models_client_hits_models_endpoint() {
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
codex-rs/core/src/client_tests.rs
-1
View File
@@ -264,7 +264,6 @@ fn test_model_info() -> ModelInfo {
"default_verbosity": null,
"apply_patch_tool_type": null,
"truncation_policy": {"mode": "bytes", "limit": 10000},
"supports_parallel_tool_calls": false,
"supports_image_detail_original": false,
"context_window": 272000,
"auto_compact_token_limit": null,
codex-rs/core/src/compact_remote_request.rs
+1 -1
View File
@@ -63,7 +63,7 @@ pub(super) async fn run_remote_compact_attempt(
let prompt = Prompt {
input: prompt_input,
tools: tool_router.model_visible_specs(),
parallel_tool_calls: turn_context.model_info.supports_parallel_tool_calls,
parallel_tool_calls: true,
base_instructions,
output_schema: None,
output_schema_strict: true,
codex-rs/core/src/compact_remote_v2_attempt.rs
+1 -1
View File
@@ -78,7 +78,7 @@ pub(super) async fn run_remote_compact_v2_attempt(
let prompt = Prompt {
input,
tools: tool_router.model_visible_specs(),
parallel_tool_calls: turn_context.model_info.supports_parallel_tool_calls,
parallel_tool_calls: true,
base_instructions,
output_schema: None,
output_schema_strict: true,
codex-rs/core/src/session/turn.rs
+1 -1
View File
@@ -1300,7 +1300,7 @@ pub(crate) fn build_prompt(
Prompt {
input,
tools: router.model_visible_specs(),
parallel_tool_calls: turn_context.model_info.supports_parallel_tool_calls,
parallel_tool_calls: true,
base_instructions,
output_schema: turn_context.final_output_json_schema.clone(),
output_schema_strict: !crate::guardian::is_guardian_reviewer_source(
codex-rs/core/tests/suite/auto_review.rs
-1
View File
@@ -282,7 +282,6 @@ fn remote_model_with_auto_review_override(slug: &str, review_model: &str) -> Mod
apply_patch_tool_type: Some(ApplyPatchToolType::Freeform),
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
codex-rs/core/tests/suite/client.rs
-1
View File
@@ -2499,7 +2499,6 @@ async fn responses_lite_sets_all_turns_context_and_disables_parallel_tool_calls(
let TestCodex { codex, .. } = test_codex()
.with_model_info_override("gpt-5.4", |model_info| {
model_info.use_responses_lite = true;
model_info.supports_parallel_tool_calls = true;
})
.build(&server)
.await?;
codex-rs/core/tests/suite/model_switching.rs
-2
View File
@@ -135,7 +135,6 @@ fn test_model_info(
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
@@ -1207,7 +1206,6 @@ async fn model_switch_to_smaller_model_updates_token_context_window() -> Result<
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(large_context_window),
max_context_window: None,
codex-rs/core/tests/suite/models_cache_ttl.rs
-1
View File
@@ -523,7 +523,6 @@ fn test_remote_model(slug: &str, priority: i32) -> ModelInfo {
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
codex-rs/core/tests/suite/personality.rs
-2
View File
@@ -656,7 +656,6 @@ async fn remote_model_friendly_personality_instructions_with_feature() -> anyhow
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(128_000),
max_context_window: None,
@@ -781,7 +780,6 @@ async fn user_turn_personality_remote_model_template_includes_update_message() -
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(128_000),
max_context_window: None,
codex-rs/core/tests/suite/remote_models.rs
-3
View File
@@ -521,7 +521,6 @@ async fn remote_models_remote_model_uses_unified_exec() -> Result<()> {
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
@@ -784,7 +783,6 @@ async fn remote_models_apply_legacy_instructions() -> Result<()> {
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
@@ -1357,7 +1355,6 @@ fn test_remote_model_with_policy(
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy,
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
codex-rs/core/tests/suite/responses_lite.rs
-1
View File
@@ -532,7 +532,6 @@ async fn responses_lite_compact_request_uses_lite_transport_contract() -> Result
let mut builder = test_codex()
.with_model_info_override("gpt-5.4", |model_info| {
model_info.use_responses_lite = true;
model_info.supports_parallel_tool_calls = true;
})
.with_config(|config| {
let _ = config.features.disable(Feature::RemoteCompactionV2);
codex-rs/core/tests/suite/rmcp_client.rs
-1
View File
@@ -2281,7 +2281,6 @@ async fn stdio_image_responses_are_sanitized_for_text_only_model() -> anyhow::Re
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
codex-rs/core/tests/suite/spawn_agent_description.rs
-1
View File
@@ -97,7 +97,6 @@ fn test_model_info(
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
codex-rs/core/tests/suite/view_image.rs
-1
View File
@@ -1641,7 +1641,6 @@ async fn view_image_tool_returns_unsupported_message_for_text_only_model() -> an
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: None,
codex-rs/model-provider/src/provider.rs
-1
View File
@@ -547,7 +547,6 @@ mod tests {
"default_verbosity": null,
"apply_patch_tool_type": null,
"truncation_policy": {"mode": "bytes", "limit": 10_000},
"supports_parallel_tool_calls": false,
"supports_image_detail_original": false,
"context_window": 272_000,
"max_context_window": 272_000,
codex-rs/models-manager/models.json
-8
View File
@@ -16,7 +16,6 @@
"mode": "tokens",
"limit": 10000
},
"supports_parallel_tool_calls": true,
"tool_mode": "code_mode_only",
"multi_agent_version": "v2",
"use_responses_lite": true,
@@ -131,7 +130,6 @@
"mode": "tokens",
"limit": 10000
},
"supports_parallel_tool_calls": true,
"tool_mode": "code_mode_only",
"multi_agent_version": "v2",
"use_responses_lite": true,
@@ -244,7 +242,6 @@
"mode": "tokens",
"limit": 10000
},
"supports_parallel_tool_calls": true,
"tool_mode": "code_mode_only",
"multi_agent_version": "v1",
"use_responses_lite": true,
@@ -353,7 +350,6 @@
"mode": "tokens",
"limit": 10000
},
"supports_parallel_tool_calls": true,
"tool_mode": null,
"multi_agent_version": null,
"use_responses_lite": false,
@@ -460,7 +456,6 @@
"mode": "tokens",
"limit": 10000
},
"supports_parallel_tool_calls": true,
"tool_mode": null,
"multi_agent_version": null,
"use_responses_lite": false,
@@ -565,7 +560,6 @@
"mode": "tokens",
"limit": 10000
},
"supports_parallel_tool_calls": true,
"tool_mode": null,
"multi_agent_version": null,
"use_responses_lite": false,
@@ -665,7 +659,6 @@
"mode": "bytes",
"limit": 10000
},
"supports_parallel_tool_calls": true,
"tool_mode": null,
"multi_agent_version": null,
"use_responses_lite": false,
@@ -762,7 +755,6 @@
"mode": "tokens",
"limit": 10000
},
"supports_parallel_tool_calls": true,
"tool_mode": null,
"multi_agent_version": null,
"use_responses_lite": false,
codex-rs/models-manager/src/manager_tests.rs
-2
View File
@@ -66,7 +66,6 @@ fn remote_model_with_visibility(
"default_verbosity": null,
"apply_patch_tool_type": null,
"truncation_policy": {"mode": "bytes", "limit": 10_000},
"supports_parallel_tool_calls": false,
"supports_image_detail_original": false,
"context_window": 272_000,
"max_context_window": 272_000,
@@ -746,7 +745,6 @@ async fn get_model_info_uses_custom_catalog() {
assert_eq!(model_info.display_name, "Overlay");
assert_eq!(model_info.context_window, Some(272_000));
assert!(model_info.supports_image_detail_original);
assert!(!model_info.supports_parallel_tool_calls);
assert!(!model_info.used_fallback_model_metadata);
}
codex-rs/models-manager/src/model_info.rs
-1
View File
@@ -163,7 +163,6 @@ pub fn model_info_from_slug(slug: &str) -> ModelInfo {
apply_patch_tool_type: None,
web_search_tool_type: WebSearchToolType::Text,
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: Some(272_000),
max_context_window: Some(272_000),
codex-rs/protocol/src/openai_models.rs
-3
View File
@@ -420,7 +420,6 @@ pub struct ModelInfo {
#[serde(default)]
pub web_search_tool_type: WebSearchToolType,
pub truncation_policy: TruncationPolicyConfig,
pub supports_parallel_tool_calls: bool,
#[serde(default)]
pub supports_image_detail_original: bool,
#[serde(default, skip_serializing_if = "Option::is_none")]
@@ -883,7 +882,6 @@ mod tests {
apply_patch_tool_type: None,
web_search_tool_type: WebSearchToolType::Text,
truncation_policy: TruncationPolicyConfig::bytes(/*limit*/ 10_000),
supports_parallel_tool_calls: false,
supports_image_detail_original: false,
context_window: None,
max_context_window: None,
@@ -1455,7 +1453,6 @@ mod tests {
"mode": "bytes",
"limit": 10000
},
"supports_parallel_tool_calls": false,
"supports_image_detail_original": false,
"context_window": null,
"auto_compact_token_limit": null,
codex-rs/tools/src/image_detail_tests.rs
-1
View File
@@ -27,7 +27,6 @@ fn model_info() -> ModelInfo {
"mode": "bytes",
"limit": 10000
},
"supports_parallel_tool_calls": false,
"supports_image_detail_original": true,
"context_window": null,
"auto_compact_token_limit": null,
codex-rs/tools/src/tool_config_tests.rs
-1
View File
@@ -36,7 +36,6 @@ fn model_with_shell_type(shell_type: ConfigShellToolType) -> ModelInfo {
apply_patch_tool_type: None,
web_search_tool_type: Default::default(),
truncation_policy: TruncationPolicyConfig::tokens(/*limit*/ 1024),
supports_parallel_tool_calls: true,
supports_image_detail_original: false,
context_window: None,
max_context_window: None,
codex-rs/tui/src/chatwidget/tests/helpers.rs
-1
View File
@@ -282,7 +282,6 @@ fn test_model_info(slug: &str, priority: i32, supports_fast_mode: bool) -> Model
"default_verbosity": null,
"apply_patch_tool_type": null,
"truncation_policy": {"mode": "bytes", "limit": 10_000},
"supports_parallel_tool_calls": false,
"supports_image_detail_original": false,
"context_window": 272_000,
"experimental_supported_tools": [],