mirror of
https://github.com/openai/codex.git
synced 2026-11-18 23:02:23 +00:00
Refresh the TUI model picker from the app server (#41467)
## Why The model picker can open from a cached startup catalog that no longer reflects the models available to the current account. ## What changed - Fetch the current model list asynchronously whenever the picker opens, while showing cached choices immediately. - Refresh an open model picker in place, preserving its highlighted model, dismissal behavior, and reasoning submenu. - Apply accepted catalog updates to model-dependent UI, service-tier controls, and new-thread defaults. Ignore stale, failed, empty, unchanged, or account-invalidated responses. ## Testing - Added coverage for catalog refreshes, stale and unusable responses, popup state preservation, empty choices, service tiers, and new-thread defaults. GitOrigin-RevId: 45abe1d309ff7f90701fffe29c6544ca4157f836
This commit is contained in:
1 parent
0b45b171ca
commit
5fc7840cf6
16 files changed
+609
-18
No files matched your search
@@ -3236,6 +3236,286 @@ async fn model_selection_popup_snapshot() {
|
||||
assert_chatwidget_snapshot!("model_selection_popup", popup);
|
||||
}
|
||||
|
||||
fn apply_model_list_response(chat: &mut ChatWidget, presets: Vec<ModelPreset>) {
|
||||
let request_id = chat.model_popup_request_id.expect("pending model request");
|
||||
assert!(chat.on_models_loaded(request_id, Ok(presets)));
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn model_picker_refresh_rejects_obsolete_and_unusable_replies() {
|
||||
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.2")).await;
|
||||
chat.thread_id = Some(ThreadId::new());
|
||||
let initial = chat.model_catalog.try_list_models().unwrap();
|
||||
let mut refreshed = initial.clone();
|
||||
refreshed[0].description = "Updated model details".to_string();
|
||||
chat.open_model_popup();
|
||||
let old_request = chat.model_popup_request_id.unwrap();
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
|
||||
chat.open_model_popup();
|
||||
let current_request = chat.model_popup_request_id.unwrap();
|
||||
assert!(!chat.on_models_loaded(old_request, Ok(refreshed.clone())));
|
||||
assert!(chat.model_popup_request_is_current(current_request));
|
||||
// Identical visible account fields still mark an account boundary.
|
||||
chat.update_account_state(
|
||||
chat.status_account_display.clone(),
|
||||
chat.plan_type,
|
||||
chat.has_chatgpt_account,
|
||||
chat.has_codex_backend_auth,
|
||||
);
|
||||
assert!(!chat.on_models_loaded(current_request, Ok(refreshed.clone())));
|
||||
assert_eq!(chat.model_catalog.try_list_models().unwrap(), initial);
|
||||
|
||||
for result in [
|
||||
Err("unavailable".to_string()),
|
||||
Ok(Vec::new()),
|
||||
Ok(initial.clone()),
|
||||
] {
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
|
||||
chat.open_model_popup();
|
||||
let request_id = chat.model_popup_request_id.unwrap();
|
||||
let before = render_bottom_popup(&chat, /*width*/ 80);
|
||||
assert!(!chat.on_models_loaded(request_id, result));
|
||||
assert!(!chat.model_popup_request_is_current(request_id));
|
||||
assert_eq!(chat.model_catalog.try_list_models().unwrap(), initial);
|
||||
assert_eq!(render_bottom_popup(&chat, /*width*/ 80), before);
|
||||
}
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
|
||||
chat.open_model_popup();
|
||||
apply_model_list_response(&mut chat, refreshed.clone());
|
||||
assert_eq!(chat.model_catalog.try_list_models().unwrap(), refreshed);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn model_picker_refreshes_startup_catalog() {
|
||||
for (explicit_all_models, hidden_startup) in [(false, false), (true, false), (false, true)] {
|
||||
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.2")).await;
|
||||
chat.thread_id = Some(ThreadId::new());
|
||||
let mut startup = vec![get_available_model(&chat, "gpt-5.2")];
|
||||
let mut refreshed = chat.model_catalog.try_list_models().unwrap();
|
||||
let mut auto = startup[0].clone();
|
||||
auto.model = "codex-auto-test".to_string();
|
||||
auto.id = auto.model.clone();
|
||||
auto.description = "Auto model".to_string();
|
||||
refreshed.push(auto);
|
||||
startup[0].show_in_picker = !hidden_startup;
|
||||
chat.model_catalog = Arc::new(ModelCatalog::new(startup.clone()));
|
||||
chat.open_model_popup();
|
||||
assert!(
|
||||
std::iter::from_fn(|| rx.try_recv().ok())
|
||||
.any(|event| matches!(event, AppEvent::FetchModels { .. }))
|
||||
);
|
||||
if explicit_all_models {
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
|
||||
chat.open_all_models_popup();
|
||||
}
|
||||
|
||||
apply_model_list_response(&mut chat, refreshed.clone());
|
||||
if hidden_startup {
|
||||
assert!(chat.no_modal_or_popup_active());
|
||||
chat.open_model_popup();
|
||||
}
|
||||
|
||||
assert_eq!(chat.model_catalog.try_list_models().unwrap(), refreshed);
|
||||
insta::allow_duplicates! {
|
||||
assert_chatwidget_snapshot!(
|
||||
if explicit_all_models {
|
||||
"model_selection_popup"
|
||||
} else {
|
||||
"model_picker_refreshes_auto_models"
|
||||
},
|
||||
render_bottom_popup(&chat, /*width*/ 80)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn model_picker_queued_all_models_uses_refreshed_catalog() {
|
||||
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.2")).await;
|
||||
chat.thread_id = Some(ThreadId::new());
|
||||
let refreshed = chat.model_catalog.try_list_models().unwrap();
|
||||
let preset = get_available_model(&chat, "gpt-5.2");
|
||||
let mut auto = preset.clone();
|
||||
auto.model = "codex-auto-test".to_string();
|
||||
auto.id = auto.model.clone();
|
||||
chat.model_catalog = Arc::new(ModelCatalog::new(vec![auto, preset]));
|
||||
chat.open_model_popup();
|
||||
assert_matches!(rx.try_recv(), Ok(AppEvent::FetchModels { .. }));
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
|
||||
assert_eq!(chat.bottom_pane.active_view_id(), None);
|
||||
// Apply the model/list reply before the queued All models intent is handled.
|
||||
apply_model_list_response(&mut chat, refreshed);
|
||||
assert_matches!(rx.try_recv(), Ok(AppEvent::OpenAllModelsPopup));
|
||||
chat.open_all_models_popup();
|
||||
assert_chatwidget_snapshot!(
|
||||
"model_selection_popup",
|
||||
render_bottom_popup(&chat, /*width*/ 80)
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn model_picker_refresh_preserves_highlight() {
|
||||
for (remove_selected, reasoning_submenu, expected) in [
|
||||
(false, false, "gpt-5.5"),
|
||||
(true, false, "gpt-5.2"),
|
||||
(false, true, "gpt-5.5"),
|
||||
(true, true, "gpt-5.2"),
|
||||
] {
|
||||
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.2")).await;
|
||||
chat.thread_id = Some(ThreadId::new());
|
||||
let mut presets = vec![
|
||||
get_available_model(&chat, "gpt-5.2"),
|
||||
get_available_model(&chat, "gpt-5.5"),
|
||||
];
|
||||
chat.model_catalog = Arc::new(ModelCatalog::new(presets.clone()));
|
||||
chat.open_model_popup();
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Down));
|
||||
if reasoning_submenu {
|
||||
chat.open_reasoning_popup(presets[1].clone());
|
||||
}
|
||||
let before = render_bottom_popup(&chat, /*width*/ 80);
|
||||
presets.reverse();
|
||||
if remove_selected {
|
||||
presets.remove(/*index*/ 0);
|
||||
}
|
||||
apply_model_list_response(&mut chat, presets);
|
||||
if reasoning_submenu {
|
||||
assert_eq!(render_bottom_popup(&chat, /*width*/ 80), before);
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
|
||||
}
|
||||
if !remove_selected {
|
||||
insta::allow_duplicates! {
|
||||
assert_chatwidget_snapshot!(
|
||||
"model_picker_refresh_preserves_highlight",
|
||||
render_bottom_popup(&chat, /*width*/ 80)
|
||||
);
|
||||
}
|
||||
}
|
||||
while rx.try_recv().is_ok() {}
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
|
||||
let selected = assert_matches!(rx.try_recv(), Ok(AppEvent::OpenReasoningPopup { model }) => model.model);
|
||||
assert_eq!(selected, expected);
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn model_picker_refreshes_service_tier_controls() {
|
||||
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.4")).await;
|
||||
chat.thread_id = Some(ThreadId::new());
|
||||
set_fast_mode_test_catalog(&mut chat);
|
||||
chat.set_feature_enabled(Feature::FastMode, /*enabled*/ true);
|
||||
chat.set_service_tier(Some(ServiceTier::Fast.request_value().to_string()));
|
||||
let mut refreshed = chat.model_catalog.try_list_models().unwrap();
|
||||
refreshed
|
||||
.iter_mut()
|
||||
.for_each(|model| model.service_tiers.clear());
|
||||
chat.open_model_popup();
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
|
||||
|
||||
apply_model_list_response(&mut chat, refreshed);
|
||||
|
||||
assert_eq!(chat.current_service_tier(), None);
|
||||
chat.bottom_pane
|
||||
.set_composer_text("/fast".to_string(), Vec::new(), Vec::new());
|
||||
assert_chatwidget_snapshot!(
|
||||
"model_picker_refreshes_service_tier_controls",
|
||||
normalize_snapshot_paths(render_bottom_popup(&chat, /*width*/ 80))
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn model_picker_refresh_preserves_dismissal_and_reasoning_submenu() {
|
||||
for (dismiss, explicit_all_models, accept_reasoning) in [
|
||||
(true, false, false),
|
||||
(false, false, false),
|
||||
(false, true, false),
|
||||
(false, false, true),
|
||||
(false, true, true),
|
||||
] {
|
||||
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.2")).await;
|
||||
chat.thread_id = Some(ThreadId::new());
|
||||
let preset = get_available_model(&chat, "gpt-5.2");
|
||||
let refreshed = chat.model_catalog.try_list_models().unwrap();
|
||||
chat.model_catalog = Arc::new(ModelCatalog::new(vec![preset.clone()]));
|
||||
chat.open_model_popup();
|
||||
assert_matches!(rx.try_recv(), Ok(AppEvent::FetchModels { .. }));
|
||||
if explicit_all_models {
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
|
||||
chat.open_all_models_popup();
|
||||
}
|
||||
if dismiss {
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
|
||||
} else {
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
|
||||
let model =
|
||||
assert_matches!(rx.try_recv(), Ok(AppEvent::OpenReasoningPopup { model }) => model);
|
||||
chat.open_reasoning_popup(model);
|
||||
}
|
||||
let before = render_bottom_popup(&chat, /*width*/ 80);
|
||||
|
||||
apply_model_list_response(&mut chat, refreshed.clone());
|
||||
|
||||
assert_eq!(chat.model_catalog.try_list_models().unwrap(), refreshed);
|
||||
assert_eq!(render_bottom_popup(&chat, /*width*/ 80), before);
|
||||
if !dismiss {
|
||||
chat.handle_key_event(KeyEvent::from(if accept_reasoning {
|
||||
KeyCode::Enter
|
||||
} else {
|
||||
KeyCode::Esc
|
||||
}));
|
||||
}
|
||||
if dismiss || accept_reasoning {
|
||||
assert!(chat.no_modal_or_popup_active());
|
||||
} else {
|
||||
insta::allow_duplicates! {
|
||||
assert_chatwidget_snapshot!(
|
||||
"model_selection_popup",
|
||||
render_bottom_popup(&chat, /*width*/ 80)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn model_picker_refresh_dismisses_empty_choices() {
|
||||
for (explicit_all_models, reasoning_submenu) in
|
||||
[(false, false), (true, false), (false, true), (true, true)]
|
||||
{
|
||||
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.2")).await;
|
||||
chat.thread_id = Some(ThreadId::new());
|
||||
let mut preset = get_available_model(&chat, "gpt-5.2");
|
||||
chat.open_model_popup();
|
||||
if explicit_all_models {
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
|
||||
chat.open_all_models_popup();
|
||||
}
|
||||
if reasoning_submenu {
|
||||
chat.open_reasoning_popup(preset.clone());
|
||||
}
|
||||
let before = render_bottom_popup(&chat, /*width*/ 80);
|
||||
if explicit_all_models {
|
||||
preset.model = "codex-auto-test".to_string();
|
||||
} else {
|
||||
preset.show_in_picker = false;
|
||||
}
|
||||
while rx.try_recv().is_ok() {}
|
||||
apply_model_list_response(&mut chat, vec![preset]);
|
||||
if reasoning_submenu {
|
||||
assert_eq!(render_bottom_popup(&chat, /*width*/ 80), before);
|
||||
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
|
||||
}
|
||||
assert_eq!(chat.bottom_pane.active_view_id(), None);
|
||||
let cell = assert_matches!(rx.try_recv(), Ok(AppEvent::InsertHistoryCell(cell)) => cell);
|
||||
insta::allow_duplicates! {
|
||||
insta::assert_snapshot!(
|
||||
lines_to_single_string(&cell.display_lines(/*width*/ 80)),
|
||||
@"• No additional models are available right now."
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn personality_selection_popup_snapshot() {
|
||||
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(Some("gpt-5.4")).await;
|
||||
|
||||
Reference in new issue
Block a user