diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs
index 992299832a..77af7d27a2 100644
--- a/codex-rs/protocol/src/protocol.rs
+++ b/codex-rs/protocol/src/protocol.rs
@@ -1984,12 +1984,14 @@ pub struct ThreadRolledBackEvent {
     /// This lets clients synchronize UI mode/model indicators with core after history rewind.
     /// Optional for backward compatibility with older persisted events.
     #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[ts(optional)]
     pub model_visible_state: Option<ModelVisibleState>,
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Eq, JsonSchema, TS)]
 pub struct ModelVisibleState {
     #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[ts(optional)]
     pub collaboration_mode: Option<CollaborationMode>,
 }
 
diff --git a/codex-rs/tui/src/app_backtrack.rs b/codex-rs/tui/src/app_backtrack.rs
index c6a27f6159..f80ff882fa 100644
--- a/codex-rs/tui/src/app_backtrack.rs
+++ b/codex-rs/tui/src/app_backtrack.rs
@@ -459,12 +459,9 @@ impl App {
                 codex_error_info: Some(CodexErrorInfo::ThreadRollbackFailed),
                 ..
             }) => {
-                let Some(pending) = self.backtrack.pending_rollback.take() else {
+                let Some(_pending) = self.backtrack.pending_rollback.take() else {
                     return;
                 };
-                if pending.thread_id != self.chat_widget.thread_id() {
-                    return;
-                }
             }
             _ => {}
         }