From a655ad87a504cd212565aa87e1ca34ed2c5c57f4 Mon Sep 17 00:00:00 2001
From: Abhinav Vedmala <abhinav@openai.com>
Date: Thu, 21 May 2026 21:31:25 -0700
Subject: [PATCH] Simplify extension tool payload check

---
 codex-rs/core/src/tools/handlers/extension_tools.rs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/codex-rs/core/src/tools/handlers/extension_tools.rs b/codex-rs/core/src/tools/handlers/extension_tools.rs
index ac130eced7..8c9f55c460 100644
--- a/codex-rs/core/src/tools/handlers/extension_tools.rs
+++ b/codex-rs/core/src/tools/handlers/extension_tools.rs
@@ -18,13 +18,6 @@ impl ExtensionToolAdapter {
     pub(crate) fn new(executor: Arc<dyn codex_tools::ToolExecutor<ExtensionToolCall>>) -> Self {
         Self(executor)
     }
-
-    fn arguments_from_payload<'a>(&self, payload: &'a ToolPayload) -> Option<&'a str> {
-        let ToolPayload::Function { arguments } = payload else {
-            return None;
-        };
-        Some(arguments)
-    }
 }
 
 #[async_trait::async_trait]
@@ -55,7 +48,7 @@ impl ToolExecutor<ToolInvocation> for ExtensionToolAdapter {
 
 impl CoreToolRuntime for ExtensionToolAdapter {
     fn matches_kind(&self, payload: &ToolPayload) -> bool {
-        self.arguments_from_payload(payload).is_some()
+        matches!(payload, ToolPayload::Function { .. })
     }
 }