From cf50fbf2b481f2ea6f38f9020f224ab4a1fbd403 Mon Sep 17 00:00:00 2001 From: Charles Cunningham Date: Sun, 1 Feb 2026 16:18:44 -0800 Subject: [PATCH] Fix TS optional-nullable export and backtrack clippy lint --- codex-rs/protocol/src/protocol.rs | 2 ++ codex-rs/tui/src/app_backtrack.rs | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) 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, } #[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, } 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; - } } _ => {} }