diff --git a/codex-rs/core/src/tools/spec_tests.rs b/codex-rs/core/src/tools/spec_tests.rs
index b5f50ae6ffc5..c11476176104 100644
--- a/codex-rs/core/src/tools/spec_tests.rs
+++ b/codex-rs/core/src/tools/spec_tests.rs
@@ -2030,8 +2030,7 @@ fn search_tool_requires_model_capability_only() {
 fn tool_suggest_is_not_registered_without_feature_flag() {
     let model_info = search_capable_model_info();
     let mut features = Features::with_defaults();
-    features.enable(Feature::Apps);
-    features.enable(Feature::Plugins);
+    features.disable(Feature::ToolSuggest);
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs
index 6128fe43fadf..be98fac69afa 100644
--- a/codex-rs/features/src/lib.rs
+++ b/codex-rs/features/src/lib.rs
@@ -720,8 +720,8 @@ pub const FEATURES: &[FeatureSpec] = &[
     FeatureSpec {
         id: Feature::ToolSuggest,
         key: "tool_suggest",
-        stage: Stage::UnderDevelopment,
-        default_enabled: false,
+        stage: Stage::Stable,
+        default_enabled: true,
     },
     FeatureSpec {
         id: Feature::Plugins,
@@ -778,8 +778,8 @@ pub const FEATURES: &[FeatureSpec] = &[
     FeatureSpec {
         id: Feature::ToolCallMcpElicitation,
         key: "tool_call_mcp_elicitation",
-        stage: Stage::UnderDevelopment,
-        default_enabled: false,
+        stage: Stage::Stable,
+        default_enabled: true,
     },
     FeatureSpec {
         id: Feature::Personality,
diff --git a/codex-rs/features/src/tests.rs b/codex-rs/features/src/tests.rs
index faf02b083e47..7c37ef6175e4 100644
--- a/codex-rs/features/src/tests.rs
+++ b/codex-rs/features/src/tests.rs
@@ -115,9 +115,9 @@ fn request_permissions_tool_is_under_development() {
 }
 
 #[test]
-fn tool_suggest_is_under_development() {
-    assert_eq!(Feature::ToolSuggest.stage(), Stage::UnderDevelopment);
-    assert_eq!(Feature::ToolSuggest.default_enabled(), false);
+fn tool_suggest_is_stable_and_enabled_by_default() {
+    assert_eq!(Feature::ToolSuggest.stage(), Stage::Stable);
+    assert_eq!(Feature::ToolSuggest.default_enabled(), true);
 }
 
 #[test]
@@ -138,6 +138,12 @@ fn image_generation_is_under_development() {
     assert_eq!(Feature::ImageGeneration.default_enabled(), false);
 }
 
+#[test]
+fn tool_call_mcp_elicitation_is_stable_and_enabled_by_default() {
+    assert_eq!(Feature::ToolCallMcpElicitation.stage(), Stage::Stable);
+    assert_eq!(Feature::ToolCallMcpElicitation.default_enabled(), true);
+}
+
 #[test]
 fn image_detail_original_feature_is_under_development() {
     assert_eq!(