Lightweight coding agent that runs in your terminal
Rust
Allow dynamic tool calls to execute in parallel (#54654)
Steve Coffeybeae473be856
diff --git a/codex-rs/core/src/tools/handlers/dynamic.rs b/codex-rs/core/src/tools/handlers/dynamic.rsindex 9e78325058..0eac846e05 100644--- a/codex-rs/core/src/tools/handlers/dynamic.rs+++ b/codex-rs/core/src/tools/handlers/dynamic.rs@@ -85,6 +85,10 @@ impl DynamicToolHandler {}impl ToolExecutor<ToolInvocation> for DynamicToolHandler {+ fn supports_parallel_tool_calls(&self) -> bool {+ true+ }+fn tool_name(&self) -> ToolName {self.tool_name.clone()}diff --git a/codex-rs/core/tests/suite/code_mode.rs b/codex-rs/core/tests/suite/code_mode.rsindex 3bb15e2e63..8548898446 100644--- a/codex-rs/core/tests/suite/code_mode.rs+++ b/codex-rs/core/tests/suite/code_mode.rs@@ -1,5 +1,8 @@#![allow(clippy::unwrap_used)]+#[path = "code_mode_dynamic_tools_tests.rs"]+mod dynamic_tools;+use anyhow::Context;use anyhow::Result;use base64::Engine;diff --git a/codex-rs/core/tests/suite/code_mode_dynamic_tools_tests.rs b/codex-rs/core/tests/suite/code_mode_dynamic_tools_tests.rsnew file mode 100644index 0000000000..cc7d9cbbee--- /dev/null+++ b/codex-rs/core/tests/suite/code_mode_dynamic_tools_tests.rs@@ -0,0 +1,115 @@+//! Dynamic tool calls remain independent while waiting for client responses.++use super::*;+use pretty_assertions::assert_eq;++#[tokio::test(flavor = "multi_thread", worker_threads = 2)]+async fn code_mode_dynamic_tool_calls_pending_together_resolve_in_reverse_order() -> Result<()> {+ skip_if_no_network!(Ok(()));++ let server = responses::start_mock_server().await;+ let mut builder = test_codex()+ .with_model_info_override("gpt-5.5", |model_info| {+ model_info.use_responses_lite = true;+ model_info.tool_mode = Some(ToolMode::CodeMode);+ })+ .with_config(|config| {+ config.features.enable(Feature::CodeMode).unwrap();+ });+ let mut test = builder.build_with_auto_env(&server).await?;+ let new_thread = test+ .thread_manager+ .start_thread(StartThreadOptions {+ dynamic_tools: vec![DynamicToolSpec::Function(DynamicToolFunctionSpec {+ name: "lookup".to_string(),+ description: "Look up a value by key.".to_string(),+ input_schema: serde_json::json!({+ "type": "object",+ "properties": { "key": { "type": "string" } },+ "required": ["key"],+ "additionalProperties": false,+ }),+ defer_loading: false,+ })],+ ..StartThreadOptions::new(test.config.clone())+ })+ .await?;+ test.codex = new_thread.thread;+ test.session_configured = new_thread.session_configured;++ responses::mount_sse_once(+ &server,+ sse(vec![+ ev_response_created("resp-1"),+ ev_custom_tool_call(+ "call-1",+ "exec",+ r#"+const results = await Promise.all([+ tools.lookup({ key: "A" }),+ tools.lookup({ key: "B" }),+]);+text(JSON.stringify(results));+"#,+ ),+ ev_completed("resp-1"),+ ]),+ )+ .await;+ let second_mock = responses::mount_sse_once(+ &server,+ sse(vec![+ ev_assistant_message("msg-1", "done"),+ ev_completed("resp-2"),+ ]),+ )+ .await;++ test.codex+ .start_or_steer_turn(TurnInputRequest::user_input(vec![UserInput::Text {+ text: "Look up A and B concurrently.".to_string(),+ text_elements: Vec::new(),+ }]))+ .await?;++ // Neither response is submitted until both calls are waiting for the client.+ let mut pending = Vec::new();+ for _ in 0..2 {+ pending.push(+ wait_for_event_match(&test.codex, |event| match event {+ EventMsg::DynamicToolCallRequest(request) => Some(request.clone()),+ _ => None,+ })+ .await,+ );+ }+ assert_ne!(pending[0].call_id, pending[1].call_id);++ for request in pending.into_iter().rev() {+ let key = request.arguments["key"].as_str().unwrap();+ test.codex+ .submit(Op::DynamicToolResponse {+ id: request.call_id,+ response: DynamicToolResponse {+ content_items: vec![DynamicToolCallOutputContentItem::InputText {+ text: format!("value-{key}"),+ }],+ success: true,+ },+ })+ .await?;+ }+ wait_for_event(&test.codex, |event| {+ matches!(event, EventMsg::TurnComplete(_))+ })+ .await;++ let request = second_mock.single_request();+ let output = custom_tool_output_last_non_empty_text(&request, "call-1")+ .expect("the completed program should emit its results");+ assert_eq!(+ serde_json::from_str::<Value>(&output)?,+ serde_json::json!(["value-A", "value-B"])+ );+ Ok(())+}