From 441c2f818f26708d79a3d438c59048eb8a33a558 Mon Sep 17 00:00:00 2001
From: jif-oai <jif@openai.com>
Date: Wed, 13 May 2026 17:28:37 +0200
Subject: [PATCH] fix: main (#22503)

Fix main due to conflicting merge
---
 codex-rs/core/src/session/mod.rs               | 1 -
 codex-rs/core/src/session/tests.rs             | 5 -----
 codex-rs/ext/extension-api/src/contributors.rs | 1 -
 3 files changed, 7 deletions(-)

diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs
index b40f289dc..3ef946681 100644
--- a/codex-rs/core/src/session/mod.rs
+++ b/codex-rs/core/src/session/mod.rs
@@ -1466,7 +1466,6 @@ impl Session {
             contributor.on_config_changed(
                 &self.services.session_extension_data,
                 &self.services.thread_extension_data,
-                self.conversation_id,
                 previous_config,
                 new_config,
             );
diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs
index 2e9907e95..b4ba56187 100644
--- a/codex-rs/core/src/session/tests.rs
+++ b/codex-rs/core/src/session/tests.rs
@@ -1922,7 +1922,6 @@ async fn config_change_contributor_observes_effective_config_changes() {
 
     #[derive(Debug, PartialEq)]
     struct RecordedConfigChange {
-        thread_id: ThreadId,
         previous_model: Option<String>,
         new_model: Option<String>,
         previous_disabled_tools: Vec<ToolSuggestDisabledTool>,
@@ -1940,7 +1939,6 @@ async fn config_change_contributor_observes_effective_config_changes() {
             &self,
             session_store: &codex_extension_api::ExtensionData,
             thread_store: &codex_extension_api::ExtensionData,
-            thread_id: ThreadId,
             previous_config: &crate::config::Config,
             new_config: &crate::config::Config,
         ) {
@@ -1948,7 +1946,6 @@ async fn config_change_contributor_observes_effective_config_changes() {
                 .lock()
                 .expect("config change records lock")
                 .push(RecordedConfigChange {
-                    thread_id,
                     previous_model: previous_config.model.clone(),
                     new_model: new_config.model.clone(),
                     previous_disabled_tools: previous_config.tool_suggest.disabled_tools.clone(),
@@ -2021,7 +2018,6 @@ disabled_tools = [
     ];
     let expected = vec![
         RecordedConfigChange {
-            thread_id: session.conversation_id,
             previous_model: Some(original_model),
             new_model: Some(next_model.to_string()),
             previous_disabled_tools: original_disabled_tools.clone(),
@@ -2030,7 +2026,6 @@ disabled_tools = [
             saw_thread_store: true,
         },
         RecordedConfigChange {
-            thread_id: session.conversation_id,
             previous_model: Some(next_model.to_string()),
             new_model: Some(next_model.to_string()),
             previous_disabled_tools: original_disabled_tools,
diff --git a/codex-rs/ext/extension-api/src/contributors.rs b/codex-rs/ext/extension-api/src/contributors.rs
index c3297c540..f3d1375ac 100644
--- a/codex-rs/ext/extension-api/src/contributors.rs
+++ b/codex-rs/ext/extension-api/src/contributors.rs
@@ -77,7 +77,6 @@ pub trait ConfigContributor<C>: Send + Sync {
         &self,
         _session_store: &ExtensionData,
         _thread_store: &ExtensionData,
-        _thread_id: ThreadId,
         _previous_config: &C,
         _new_config: &C,
     ) {