From 441c015f171303a268415ee90c386a29100438b0 Mon Sep 17 00:00:00 2001
From: won <won@openai.com>
Date: Mon, 1 Jun 2026 11:44:44 -0700
Subject: [PATCH] Restore thread ids in extension tool call fixtures

---
 codex-rs/ext/goal/tests/goal_extension_backend.rs | 1 +
 codex-rs/ext/memories/src/tests.rs                | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/codex-rs/ext/goal/tests/goal_extension_backend.rs b/codex-rs/ext/goal/tests/goal_extension_backend.rs
index 16b8cf261b..75cfa3c615 100644
--- a/codex-rs/ext/goal/tests/goal_extension_backend.rs
+++ b/codex-rs/ext/goal/tests/goal_extension_backend.rs
@@ -1211,6 +1211,7 @@ fn tool_by_name<'a>(
 
 fn tool_call(tool_name: &str, call_id: &str, arguments: serde_json::Value) -> ToolCall {
     ToolCall {
+        thread_id: "thread-1".to_string(),
         turn_id: "turn-1".to_string(),
         call_id: call_id.to_string(),
         tool_name: codex_extension_api::ToolName::plain(tool_name),
diff --git a/codex-rs/ext/memories/src/tests.rs b/codex-rs/ext/memories/src/tests.rs
index ce03d74965..71ca8f082b 100644
--- a/codex-rs/ext/memories/src/tests.rs
+++ b/codex-rs/ext/memories/src/tests.rs
@@ -208,6 +208,7 @@ async fn add_ad_hoc_note_tool_creates_note_file() {
 
     let output = tool
         .handle(ToolCall {
+            thread_id: "thread-1".to_string(),
             turn_id: "turn-1".to_string(),
             call_id: "call-1".to_string(),
             tool_name: memory_tool_name(crate::ADD_AD_HOC_NOTE_TOOL_NAME),
@@ -251,6 +252,7 @@ async fn add_ad_hoc_note_tool_rejects_paths_as_filenames() {
 
     let result = tool
         .handle(ToolCall {
+            thread_id: "thread-1".to_string(),
             turn_id: "turn-1".to_string(),
             call_id: "call-1".to_string(),
             tool_name: memory_tool_name(crate::ADD_AD_HOC_NOTE_TOOL_NAME),
@@ -295,6 +297,7 @@ async fn read_tool_reads_memory_file() {
 
     let output = tool
         .handle(ToolCall {
+            thread_id: "thread-1".to_string(),
             turn_id: "turn-1".to_string(),
             call_id: "call-1".to_string(),
             tool_name: memory_tool_name(crate::READ_TOOL_NAME),
@@ -342,6 +345,7 @@ async fn search_tool_accepts_multiple_queries() {
 
     let output = tool
         .handle(ToolCall {
+            thread_id: "thread-1".to_string(),
             turn_id: "turn-1".to_string(),
             call_id: "call-1".to_string(),
             tool_name: memory_tool_name(crate::SEARCH_TOOL_NAME),
@@ -415,6 +419,7 @@ async fn search_tool_accepts_windowed_all_match_mode() {
 
     let output = tool
         .handle(ToolCall {
+            thread_id: "thread-1".to_string(),
             turn_id: "turn-1".to_string(),
             call_id: "call-1".to_string(),
             tool_name: memory_tool_name(crate::SEARCH_TOOL_NAME),
@@ -468,6 +473,7 @@ async fn search_tool_rejects_legacy_single_query() {
 
     let result = tool
         .handle(ToolCall {
+            thread_id: "thread-1".to_string(),
             turn_id: "turn-1".to_string(),
             call_id: "call-1".to_string(),
             tool_name: memory_tool_name(crate::SEARCH_TOOL_NAME),