From 9af7f7b5408580fe320b74b1b7dfe984d51dab7d Mon Sep 17 00:00:00 2001
From: Matthew Zeng <mzeng@openai.com>
Date: Tue, 14 Apr 2026 16:49:04 -0700
Subject: [PATCH] Enable ToolSearch by default

---
 codex-rs/core/tests/suite/search_tool.rs       | 16 ++++++++++------
 codex-rs/features/src/lib.rs                   |  4 ++--
 codex-rs/features/src/tests.rs                 |  6 +++---
 codex-rs/tools/src/tool_registry_plan_tests.rs |  8 ++++----
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/codex-rs/core/tests/suite/search_tool.rs b/codex-rs/core/tests/suite/search_tool.rs
index c52431665013..710e537f4d73 100644
--- a/codex-rs/core/tests/suite/search_tool.rs
+++ b/codex-rs/core/tests/suite/search_tool.rs
@@ -91,7 +91,7 @@ fn tool_search_output_tools(request: &ResponsesRequest, call_id: &str) -> Vec<Va
         .unwrap_or_default()
 }
 
-fn configure_apps_without_tool_search(config: &mut Config, apps_base_url: &str) {
+fn configure_search_capable_apps(config: &mut Config, apps_base_url: &str) {
     config
         .features
         .enable(Feature::Apps)
@@ -110,14 +110,18 @@ fn configure_apps_without_tool_search(config: &mut Config, apps_base_url: &str)
     config.model_catalog = Some(model_catalog);
 }
 
-fn configure_apps(config: &mut Config, apps_base_url: &str) {
-    configure_apps_without_tool_search(config, apps_base_url);
+fn configure_apps_without_tool_search(config: &mut Config, apps_base_url: &str) {
+    configure_search_capable_apps(config, apps_base_url);
     config
         .features
-        .enable(Feature::ToolSearch)
+        .disable(Feature::ToolSearch)
         .expect("test config should allow feature update");
 }
 
+fn configure_apps(config: &mut Config, apps_base_url: &str) {
+    configure_search_capable_apps(config, apps_base_url);
+}
+
 fn configured_builder(apps_base_url: String) -> TestCodexBuilder {
     test_codex()
         .with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing())
@@ -125,7 +129,7 @@ fn configured_builder(apps_base_url: String) -> TestCodexBuilder {
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn search_tool_flag_adds_tool_search() -> Result<()> {
+async fn search_tool_enabled_by_default_adds_tool_search() -> Result<()> {
     skip_if_no_network!(Ok(()));
 
     let server = start_mock_server().await;
@@ -183,7 +187,7 @@ async fn search_tool_flag_adds_tool_search() -> Result<()> {
 }
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn tool_search_disabled_by_default_exposes_apps_tools_directly() -> Result<()> {
+async fn tool_search_disabled_exposes_apps_tools_directly() -> Result<()> {
     skip_if_no_network!(Ok(()));
 
     let server = start_mock_server().await;
diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs
index 6a919485c045..020b2494fe44 100644
--- a/codex-rs/features/src/lib.rs
+++ b/codex-rs/features/src/lib.rs
@@ -780,8 +780,8 @@ pub const FEATURES: &[FeatureSpec] = &[
     FeatureSpec {
         id: Feature::ToolSearch,
         key: "tool_search",
-        stage: Stage::UnderDevelopment,
-        default_enabled: false,
+        stage: Stage::Stable,
+        default_enabled: true,
     },
     FeatureSpec {
         id: Feature::ToolSuggest,
diff --git a/codex-rs/features/src/tests.rs b/codex-rs/features/src/tests.rs
index 367527ba1579..5b47ea1e27c8 100644
--- a/codex-rs/features/src/tests.rs
+++ b/codex-rs/features/src/tests.rs
@@ -128,9 +128,9 @@ fn tool_suggest_is_stable_and_enabled_by_default() {
 }
 
 #[test]
-fn tool_search_is_under_development_and_disabled_by_default() {
-    assert_eq!(Feature::ToolSearch.stage(), Stage::UnderDevelopment);
-    assert_eq!(Feature::ToolSearch.default_enabled(), false);
+fn tool_search_is_stable_and_enabled_by_default() {
+    assert_eq!(Feature::ToolSearch.stage(), Stage::Stable);
+    assert_eq!(Feature::ToolSearch.default_enabled(), true);
 }
 
 #[test]
diff --git a/codex-rs/tools/src/tool_registry_plan_tests.rs b/codex-rs/tools/src/tool_registry_plan_tests.rs
index 69b8b55b5446..1574dc317a7f 100644
--- a/codex-rs/tools/src/tool_registry_plan_tests.rs
+++ b/codex-rs/tools/src/tool_registry_plan_tests.rs
@@ -1294,7 +1294,7 @@ fn search_tool_description_lists_each_mcp_source_once() {
 }
 
 #[test]
-fn search_tool_requires_model_capability_and_feature_flag() {
+fn search_tool_requires_model_capability_and_enabled_feature() {
     let model_info = search_capable_model_info();
     let deferred_mcp_tools = Some(vec![deferred_mcp_tool(
         "_create_event",
@@ -1327,10 +1327,12 @@ fn search_tool_requires_model_capability_and_feature_flag() {
     );
     assert_lacks_tool_name(&tools, TOOL_SEARCH_TOOL_NAME);
 
+    let mut features_without_tool_search = Features::with_defaults();
+    features_without_tool_search.disable(Feature::ToolSearch);
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
         available_models: &available_models,
-        features: &features,
+        features: &features_without_tool_search,
         image_generation_tool_auth_allowed: true,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1345,8 +1347,6 @@ fn search_tool_requires_model_capability_and_feature_flag() {
     );
     assert_lacks_tool_name(&tools, TOOL_SEARCH_TOOL_NAME);
 
-    let mut features = Features::with_defaults();
-    features.enable(Feature::ToolSearch);
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
         available_models: &available_models,