From 9bc43db67d076969375d67f56af73701311a596c Mon Sep 17 00:00:00 2001
From: pakrym-oai <pakrym@openai.com>
Date: Tue, 12 May 2026 16:27:38 -0700
Subject: [PATCH] Keep extension bundle registration simple

---
 codex-rs/core/src/tools/registry.rs  | 8 ++------
 codex-rs/core/src/tools/spec_plan.rs | 8 +-------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/codex-rs/core/src/tools/registry.rs b/codex-rs/core/src/tools/registry.rs
index b067467f2e..95e7d17ce5 100644
--- a/codex-rs/core/src/tools/registry.rs
+++ b/codex-rs/core/src/tools/registry.rs
@@ -590,11 +590,7 @@ impl ToolRegistryBuilder {
         self.handlers.insert(name, handler);
     }
 
-    pub fn register_tool_bundle(
-        &mut self,
-        bundle: ExtensionToolBundle,
-        transform_spec: impl FnOnce(ToolSpec) -> ToolSpec,
-    ) {
+    pub fn register_tool_bundle(&mut self, bundle: ExtensionToolBundle) {
         let tool_name = ToolName::plain(bundle.tool_name());
         if self.handlers.contains_key(&tool_name) {
             warn!("Skipping extension tool `{tool_name}`: handler already registered");
@@ -610,7 +606,7 @@ impl ToolRegistryBuilder {
                 return;
             }
         };
-        self.push_spec(transform_spec(spec.clone()));
+        self.push_spec(spec.clone());
 
         let handler: Arc<dyn AnyToolHandler> = Arc::new(BundledToolHandler::new(bundle, spec));
         self.handlers.insert(tool_name, handler);
diff --git a/codex-rs/core/src/tools/spec_plan.rs b/codex-rs/core/src/tools/spec_plan.rs
index abcb2d3aba..7232dddd85 100644
--- a/codex-rs/core/src/tools/spec_plan.rs
+++ b/codex-rs/core/src/tools/spec_plan.rs
@@ -190,13 +190,7 @@ pub fn build_tool_registry_builder(
     }
 
     for bundle in params.extension_tool_bundles.iter().cloned() {
-        builder.register_tool_bundle(bundle, |spec| {
-            if config.code_mode_enabled {
-                codex_tools::augment_tool_spec_for_code_mode(spec)
-            } else {
-                spec
-            }
-        });
+        builder.register_tool_bundle(bundle);
     }
 
     builder