From 1a2a9299c1ae0965ef9303e30a7fa7c4b00ed886 Mon Sep 17 00:00:00 2001 From: Eric Traut Date: Sun, 15 Nov 2026 20:53:13 +0000 Subject: [PATCH] Discard unsaved experimental feature edits on cancel (#61694) ## What changed Close the experimental features popup without saving pending edits when the user presses `Esc`, `Ctrl+C`, or a remapped cancel key. Keep saving on the accept action (`Enter` by default), and update the footer from `esc save/close` to `esc cancel`. ## Testing Update tests to assert that cancellation discards toggles without emitting save events, including after a failed write and with a remapped cancel key. Refresh popup snapshots for the new hint. GitOrigin-RevId: d7640edaeca1db371a7087312179a001d7528b9a --- .../bottom_pane/experimental_features_view.rs | 9 +------- .../experimental_features_view_tests.rs | 7 ++---- ...ental_features_analytics_plan_history.snap | 2 +- ...experimental_features_changed_default.snap | 2 +- ...w__tests__experimental_features_empty.snap | 2 +- ...eep_following_choice_at_wrap_boundary.snap | 10 ++++---- ...tal_features_login_shell_package_path.snap | 2 +- ...imental_features_respect_system_proxy.snap | 2 +- ...xperimental_features_server_discovery.snap | 2 +- ...ts__experimental_features_unavailable.snap | 2 +- ...experimental_features_available_popup.snap | 2 +- ..._tests__experimental_features_loading.snap | 2 +- ...t__tests__experimental_features_popup.snap | 2 +- ..._features_popup_configured_key_chords.snap | 2 +- .../chatwidget/tests/popups_and_settings.rs | 23 +++---------------- 15 files changed, 22 insertions(+), 49 deletions(-) diff --git a/codex-rs/tui/src/bottom_pane/experimental_features_view.rs b/codex-rs/tui/src/bottom_pane/experimental_features_view.rs index 681698d984..7bf3a800ce 100644 --- a/codex-rs/tui/src/bottom_pane/experimental_features_view.rs +++ b/codex-rs/tui/src/bottom_pane/experimental_features_view.rs @@ -366,13 +366,6 @@ impl BottomPaneView for ExperimentalFeaturesView { } fn on_ctrl_c(&mut self) -> CancellationEvent { - // After an attempted save, cancellation must remain possible even if the - // server rejects retries immediately. Explicit accept retries dirty keys. - if !self.unconfirmed.is_empty() { - self.save_special_controls(); - } else { - self.save_changes(); - } self.complete = true; CancellationEvent::Handled } @@ -457,7 +450,7 @@ fn experimental_popup_hint_line(keymap: &ListKeymap) -> Line<'static> { if let Some(cancel) = keymap.primary_hint(ListAction::Cancel) { spans.push(" · ".into()); spans.extend(cancel.spans()); - spans.push(" save/close".into()); + spans.push(" cancel".into()); } Line::from(spans) } diff --git a/codex-rs/tui/src/bottom_pane/experimental_features_view_tests.rs b/codex-rs/tui/src/bottom_pane/experimental_features_view_tests.rs index c3a0ff6a92..c90e919ffd 100644 --- a/codex-rs/tui/src/bottom_pane/experimental_features_view_tests.rs +++ b/codex-rs/tui/src/bottom_pane/experimental_features_view_tests.rs @@ -191,14 +191,10 @@ fn experimental_features_discovery_preserves_server_order_and_accepts_new_keys() .send(Err("Persistent write rejection".to_string())) .unwrap(); view.pre_draw_tick(Instant::now()); - // Cancel saves new special edits without retrying the failed generic write. + // Cancel discards new edits without retrying the failed write. view.features[2].enabled = true; view.handle_key_event(KeyEvent::from(KeyCode::Esc)); assert!(view.is_complete()); - assert!( - matches!(app_rx.try_recv().unwrap(), AppEvent::UpdateFeatureFlags { updates } - if updates == vec![(Feature::PreventIdleSleep, true)]) - ); assert!(app_rx.try_recv().is_err()); } @@ -239,6 +235,7 @@ fn experimental_features_empty_error_and_cancel_remain_usable() { let mut buffer = Buffer::empty(area); view.render(area, &mut buffer); insta::assert_snapshot!(snapshot, buffer_text(&buffer)); + view.toggle_selected(); view.on_ctrl_c(); assert!(view.is_complete()); assert!(app_rx.try_recv().is_err()); diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_analytics_plan_history.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_analytics_plan_history.snap index 2ac57b83a8..03a6b91fa6 100644 --- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_analytics_plan_history.snap +++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_analytics_plan_history.snap @@ -12,4 +12,4 @@ expression: buffer_text(&buffer) consumer accounts in /analytics. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_changed_default.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_changed_default.snap index 4ad81a1304..15d64c08dd 100644 --- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_changed_default.snap +++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_changed_default.snap @@ -11,4 +11,4 @@ expression: buffer_text(&buffer) › [x] Server network_proxy Description supplied by the server. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_empty.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_empty.snap index e0a9047c4a..b1c7c57930 100644 --- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_empty.snap +++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_empty.snap @@ -12,4 +12,4 @@ expression: buffer_text(&buffer) No experimental features available for now - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_keep_following_choice_at_wrap_boundary.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_keep_following_choice_at_wrap_boundary.snap index 9bf7859783..1e60af8040 100644 --- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_keep_following_choice_at_wrap_boundary.snap +++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_keep_following_choice_at_wrap_boundary.snap @@ -15,7 +15,7 @@ width=68 [ ] Last feature Keep this choice visible. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel width=69 @@ -30,7 +30,7 @@ width=69 [ ] Last feature Keep this choice visible. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel width=70 @@ -44,7 +44,7 @@ width=70 [ ] Last feature Keep this choice visible. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel width=71 @@ -57,7 +57,7 @@ width=71 [ ] Last feature Keep this choice visible. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel width=72 @@ -70,4 +70,4 @@ width=72 [ ] Last feature Keep this choice visible. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_login_shell_package_path.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_login_shell_package_path.snap index 3cb14de549..0dfa3f461b 100644 --- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_login_shell_package_path.snap +++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_login_shell_package_path.snap @@ -13,4 +13,4 @@ expression: buffer_text(&buffer) PATH. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_respect_system_proxy.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_respect_system_proxy.snap index 76a1cf000c..19865d33a2 100644 --- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_respect_system_proxy.snap +++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_respect_system_proxy.snap @@ -12,4 +12,4 @@ expression: buffer_text(&buffer) requests. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_server_discovery.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_server_discovery.snap index 1c0a7e3799..cd45b544a5 100644 --- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_server_discovery.snap +++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_server_discovery.snap @@ -13,4 +13,4 @@ expression: buffer_text(&buffer) [x] Server prevent_idle_sleep Description supplied by the server. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_unavailable.snap b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_unavailable.snap index 1bd7296b47..d97e311acf 100644 --- a/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_unavailable.snap +++ b/codex-rs/tui/src/bottom_pane/snapshots/codex_tui__bottom_pane__experimental_features_view__tests__experimental_features_unavailable.snap @@ -13,4 +13,4 @@ expression: buffer_text(&buffer) No experimental features available for now - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_available_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_available_popup.snap index 5c260d762e..e7d624389c 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_available_popup.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_available_popup.snap @@ -14,4 +14,4 @@ expression: popup running a thread. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_loading.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_loading.snap index 693ea0c7e5..b5d06455b1 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_loading.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_loading.snap @@ -12,4 +12,4 @@ expression: "render_bottom_popup(&chat, 80)" - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_popup.snap index 2b435d7570..772a303848 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_popup.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_popup.snap @@ -14,4 +14,4 @@ expression: popup [ ] Voice conversations Talk with Codex using /voice. - space toggle · enter save · esc save/close + space toggle · enter save · esc cancel diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_popup_configured_key_chords.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_popup_configured_key_chords.snap index 1ae34036a2..36ad3c9182 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_popup_configured_key_chords.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__experimental_features_popup_configured_key_chords.snap @@ -10,4 +10,4 @@ expression: popup › [x] Shell tool Allow the model to run shell commands. - space toggle · ⌃x enter save · esc save/close + space toggle · ⌃x enter save · esc cancel diff --git a/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs b/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs index 28238ca8dd..9bf9748768 100644 --- a/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs +++ b/codex-rs/tui/src/chatwidget/tests/popups_and_settings.rs @@ -3150,7 +3150,7 @@ async fn experimental_features_popup_snapshot() { } #[tokio::test] -async fn experimental_features_toggle_saves_on_exit() { +async fn experimental_features_cancel_discards_toggle() { let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await; let mut keymap = crate::keymap::RuntimeKeymap::defaults().list; @@ -3179,25 +3179,8 @@ async fn experimental_features_toggle_saves_on_exit() { ); chat.handle_key_event(KeyEvent::new(KeyCode::F(2), KeyModifiers::NONE)); - assert!( - !chat.has_active_view(), - "remapped cancel must save and close" - ); - - let mut updates = None; - while let Ok(event) = rx.try_recv() { - if let AppEvent::SaveExperimentalFeatures { - updates: event_updates, - .. - } = event - { - updates = Some(event_updates); - break; - } - } - - let updates = updates.expect("expected SaveExperimentalFeatures event"); - assert_eq!(updates, vec![(expected_feature.key().to_string(), true)]); + assert!(!chat.has_active_view(), "remapped cancel must close"); + assert!(rx.try_recv().is_err(), "cancel must discard the toggle"); } #[tokio::test]