From 18bda76b99397b5a0cbdb7980daaad30037d78ff Mon Sep 17 00:00:00 2001 From: Charles Cunningham Date: Mon, 2 Feb 2026 11:09:27 -0800 Subject: [PATCH] Keep custom base when applying rollback mode --- codex-rs/tui/src/chatwidget.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index 4d54267c34..9d782617ab 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -5524,8 +5524,13 @@ impl ChatWidget { let Some(collaboration_mode) = state.collaboration_mode.clone() else { return; }; - self.current_collaboration_mode = collaboration_mode.clone(); - if self.collaboration_modes_enabled() { + if collaboration_mode.mode == ModeKind::Custom { + self.current_collaboration_mode = collaboration_mode; + if self.collaboration_modes_enabled() { + self.active_collaboration_mask = None; + self.update_collaboration_mode_indicator(); + } + } else if self.collaboration_modes_enabled() { self.active_collaboration_mask = self.collaboration_mask_from_mode(&collaboration_mode); self.update_collaboration_mode_indicator(); }