From 311bc6660d4d2284e7684c139b64482dcaa0c31b Mon Sep 17 00:00:00 2001 From: Roy Han Date: Thu, 26 Feb 2026 20:41:16 -0800 Subject: [PATCH] cleanup --- codex-rs/tui/src/chatwidget.rs | 11 ----------- codex-rs/tui/src/chatwidget/session_header.rs | 16 ---------------- codex-rs/tui/src/chatwidget/tests.rs | 1 - 3 files changed, 28 deletions(-) delete mode 100644 codex-rs/tui/src/chatwidget/session_header.rs diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index e0ad0d0d46..6902201502 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -252,8 +252,6 @@ mod agent; use self::agent::spawn_agent; use self::agent::spawn_agent_from_existing; pub(crate) use self::agent::spawn_op_forwarder; -mod session_header; -use self::session_header::SessionHeader; mod skills; use self::skills::collect_tool_mentions; use self::skills::find_app_mentions; @@ -542,7 +540,6 @@ pub(crate) struct ChatWidget { auth_manager: Arc, models_manager: Arc, otel_manager: OtelManager, - session_header: SessionHeader, initial_user_message: Option, token_info: Option, rate_limit_snapshots_by_limit_id: BTreeMap, @@ -1127,7 +1124,6 @@ impl ChatWidget { self.last_copyable_output = None; let forked_from_id = event.forked_from_id; let model_for_header = event.model.clone(); - self.session_header.set_model(&model_for_header); self.current_collaboration_mode = self.current_collaboration_mode.with_updates( Some(model_for_header.clone()), Some(event.reasoning_effort), @@ -2807,7 +2803,6 @@ impl ChatWidget { auth_manager, models_manager, otel_manager, - session_header: SessionHeader::new(DEFAULT_MODEL_DISPLAY_NAME.to_string()), initial_user_message, token_info: None, rate_limit_snapshots_by_limit_id: BTreeMap::new(), @@ -2984,7 +2979,6 @@ impl ChatWidget { auth_manager, models_manager, otel_manager, - session_header: SessionHeader::new(DEFAULT_MODEL_DISPLAY_NAME.to_string()), initial_user_message, token_info: None, rate_limit_snapshots_by_limit_id: BTreeMap::new(), @@ -3150,7 +3144,6 @@ impl ChatWidget { auth_manager, models_manager, otel_manager, - session_header: SessionHeader::new(header_model), initial_user_message, token_info: None, rate_limit_snapshots_by_limit_id: BTreeMap::new(), @@ -6750,10 +6743,6 @@ impl ChatWidget { } fn refresh_model_display(&mut self) { - let effective = self.effective_collaboration_mode(); - if self.is_session_configured() { - self.session_header.set_model(effective.model()); - } // Keep composer paste affordances aligned with the currently effective model. self.sync_image_paste_enabled(); } diff --git a/codex-rs/tui/src/chatwidget/session_header.rs b/codex-rs/tui/src/chatwidget/session_header.rs deleted file mode 100644 index 32e31b6682..0000000000 --- a/codex-rs/tui/src/chatwidget/session_header.rs +++ /dev/null @@ -1,16 +0,0 @@ -pub(crate) struct SessionHeader { - model: String, -} - -impl SessionHeader { - pub(crate) fn new(model: String) -> Self { - Self { model } - } - - /// Updates the header's model text. - pub(crate) fn set_model(&mut self, model: &str) { - if self.model != model { - self.model = model.to_string(); - } - } -} diff --git a/codex-rs/tui/src/chatwidget/tests.rs b/codex-rs/tui/src/chatwidget/tests.rs index 1e938e2d4b..b2ad0cab3c 100644 --- a/codex-rs/tui/src/chatwidget/tests.rs +++ b/codex-rs/tui/src/chatwidget/tests.rs @@ -1657,7 +1657,6 @@ async fn make_chatwidget_manual( auth_manager, models_manager, otel_manager, - session_header: SessionHeader::new(resolved_model.clone()), initial_user_message: None, token_info: None, rate_limit_snapshots_by_limit_id: BTreeMap::new(),