From 4e4bffce72fd2a69e7912ecdd00d2c3d877356b8 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim Date: Tue, 13 Jan 2026 00:48:36 -0800 Subject: [PATCH] Avoid expect in slash popup path --- codex-rs/tui/src/bottom_pane/chat_composer.rs | 4 +++- codex-rs/tui2/src/bottom_pane/chat_composer.rs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs index e1ad0e7d5c..9b3ad184f8 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs @@ -642,7 +642,9 @@ impl ChatComposer { } => { // Ensure popup filtering/selection reflects the latest composer text // before applying completion. - let ctx = ctx_for_tab.as_ref().expect("tab context must exist"); + let Some(ctx) = ctx_for_tab.as_ref() else { + return (InputResult::None, true); + }; let first_line = ctx.first_line(); popup.on_composer_text_change(ctx.prefix().to_string()); if let Some(sel) = popup.selected_item() { diff --git a/codex-rs/tui2/src/bottom_pane/chat_composer.rs b/codex-rs/tui2/src/bottom_pane/chat_composer.rs index eb3af96fc8..2e119b40ec 100644 --- a/codex-rs/tui2/src/bottom_pane/chat_composer.rs +++ b/codex-rs/tui2/src/bottom_pane/chat_composer.rs @@ -576,7 +576,9 @@ impl ChatComposer { } => { // Ensure popup filtering/selection reflects the latest composer text // before applying completion. - let ctx = ctx_for_tab.as_ref().expect("tab context must exist"); + let Some(ctx) = ctx_for_tab.as_ref() else { + return (InputResult::None, true); + }; let first_line = ctx.first_line(); popup.on_composer_text_change(ctx.prefix().to_string()); if let Some(sel) = popup.selected_item() {