From 27e2227b2b49a541eb799af8f8efb7032b1ef202 Mon Sep 17 00:00:00 2001 From: Alex Kira Date: Sat, 14 Nov 2026 00:15:56 +0000 Subject: [PATCH] Enable incremental tools by default for Amazon Bedrock (#61426) ## What changed Enable `incremental_tools_legacy` by default so both Amazon Bedrock providers publish tool declarations through `additional_tools` input items. Users can still opt out by setting `incremental_tools_legacy = false`. ## Testing Update the incremental tool scenarios to cover the default behavior and explicit opt-out for both Bedrock providers. Adjust the Bedrock multi-agent test to verify collaboration tools in `additional_tools` declarations. GitOrigin-RevId: 7a54aed24039d178f9b7d7f5a3f49fe4d588ffa7 --- .../core/tests/suite/bedrock_multi_agent_tests.rs | 5 ++++- .../core/tests/suite/scenarios_incremental_tools.rs | 12 ++++++------ codex-rs/features/src/lib.rs | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/codex-rs/core/tests/suite/bedrock_multi_agent_tests.rs b/codex-rs/core/tests/suite/bedrock_multi_agent_tests.rs index ddc5ebf1cf..a81e3bba41 100644 --- a/codex-rs/core/tests/suite/bedrock_multi_agent_tests.rs +++ b/codex-rs/core/tests/suite/bedrock_multi_agent_tests.rs @@ -52,9 +52,12 @@ async fn bedrock_catalog_selects_v2_by_default( Some(MultiAgentVersion::V2) ); let request = mock.single_request(); + let declarations = request.inputs_of_type("additional_tools"); for tool in ["spawn_agent", "followup_task"] { assert!( - request.tool_by_name("collaboration", tool).is_some(), + declarations + .iter() + .any(|item| responses::namespace_child_tool(item, "collaboration", tool).is_some()), "default Bedrock catalog should expose collaboration.{tool}", ); } diff --git a/codex-rs/core/tests/suite/scenarios_incremental_tools.rs b/codex-rs/core/tests/suite/scenarios_incremental_tools.rs index 663b320760..f1318c00a7 100644 --- a/codex-rs/core/tests/suite/scenarios_incremental_tools.rs +++ b/codex-rs/core/tests/suite/scenarios_incremental_tools.rs @@ -155,12 +155,12 @@ async fn prediction_fork_keeps_inherited_tools() -> Result<()> { #[test_case(true, None, true, OPENAI_PROVIDER_ID, &[]; "responses_lite")] #[test_case(true, Some(true), true, OPENAI_PROVIDER_ID, &[]; "announcements_suppressed")] #[test_case(false, None, false, OPENAI_PROVIDER_ID, &[]; "responses_api")] -#[test_case(false, None, false, AMAZON_BEDROCK_PROVIDER_ID, &[]; "mantle_default")] -#[test_case(false, None, true, AMAZON_BEDROCK_PROVIDER_ID, - &[(Feature::IncrementalToolsLegacy, true), (Feature::IncrementalToolsLegacyGcp, false)]; "mantle_enabled")] -#[test_case(false, None, false, AMAZON_BEDROCK_RUNTIME_PROVIDER_ID, &[]; "runtime_default")] -#[test_case(false, None, true, AMAZON_BEDROCK_RUNTIME_PROVIDER_ID, - &[(Feature::IncrementalToolsLegacy, true), (Feature::IncrementalToolsLegacyGcp, false)]; "runtime_enabled")] +#[test_case(false, None, true, AMAZON_BEDROCK_PROVIDER_ID, &[]; "mantle_default")] +#[test_case(false, None, false, AMAZON_BEDROCK_PROVIDER_ID, + &[(Feature::IncrementalToolsLegacy, false)]; "mantle_opt_out")] +#[test_case(false, None, true, AMAZON_BEDROCK_RUNTIME_PROVIDER_ID, &[]; "runtime_default")] +#[test_case(false, None, false, AMAZON_BEDROCK_RUNTIME_PROVIDER_ID, + &[(Feature::IncrementalToolsLegacy, false)]; "runtime_opt_out")] #[test_case(false, None, true, GCP_PROVIDER_ID, &[]; "gcp_default")] #[test_case(false, None, false, GCP_PROVIDER_ID, &[(Feature::IncrementalToolsLegacyGcp, false), (Feature::IncrementalToolsLegacy, true)]; "gcp_opt_out")] diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs index bf4742c704..701aa5eb63 100644 --- a/codex-rs/features/src/lib.rs +++ b/codex-rs/features/src/lib.rs @@ -1844,7 +1844,7 @@ pub const FEATURES: &[FeatureSpec] = &[ id: Feature::IncrementalToolsLegacy, key: "incremental_tools_legacy", stage: Stage::Stable, - default_enabled: false, + default_enabled: true, }, FeatureSpec { id: Feature::IncrementalToolsLegacyGcp,