Files
codex/codex-rs/tui/src/chatwidget/model_popup_state.rs
T
Brian Lee c03bbff483 Constrain API-key model access programs to server support (#53689)
## Why

Servers can advertise cyber access programs without accepting them for API-key accounts. The TUI must account for server support before exposing those programs.

## What changed

- Check `features.api_key_cyber_access_programs` at startup and when loading models for API-key accounts, clearing `available_access_programs` when forwarding is unavailable.
- Use thread-scoped feature settings after thread creation and honor feature requirements and CLI overrides at startup.
- Refresh account-scoped models when switching to or from API-key authentication or changing API-key thread context, clearing cached access programs while the refresh is pending.

## Testing

Extend session tests to cover enabled and disabled server settings, CLI overrides, and catalog filtering before and after thread creation. Update account-change tests to handle the model refresh.

GitOrigin-RevId: c80de30a0063b84949098d137715d8678bd70587
2026-10-13 15:03:34 +00:00

91 lines
3.4 KiB
Rust

//! Accept current account-scoped model replies and refresh present pickers without reopening them.
//! Preserve highlighted models by wire slug, independent of their display names.
use super::model_popups::ALL_MODELS_SELECTION_VIEW_ID;
use super::model_popups::MODEL_SELECTION_VIEW_ID;
use super::*;
impl ChatWidget {
pub(super) fn refresh_account_scoped_models(&mut self) {
if self.status_account_display == Some(StatusAccountDisplay::ApiKey) {
for model in &mut Arc::make_mut(&mut self.model_catalog).models {
model.available_access_programs = None;
}
}
let request_id = uuid::Uuid::new_v4();
self.model_popup_request_id = Some(request_id);
self.app_event_tx.send(AppEvent::FetchModels { request_id });
}
fn model_popup_view_id(&self) -> Option<&'static str> {
[MODEL_SELECTION_VIEW_ID, ALL_MODELS_SELECTION_VIEW_ID]
.into_iter()
.find(|view_id| {
self.bottom_pane
.selected_index_for_present_view(view_id)
.is_some()
})
}
pub(crate) fn model_popup_request_is_current(&self, request_id: uuid::Uuid) -> bool {
self.model_popup_request_id == Some(request_id)
}
pub(crate) fn on_models_loaded(
&mut self,
request_id: uuid::Uuid,
result: Result<Vec<ModelPreset>, String>,
) -> bool {
if !self.model_popup_request_is_current(request_id) {
return false;
}
self.model_popup_request_id = None;
let Ok(presets) = result else {
return false;
};
if presets.is_empty()
|| self.model_catalog.try_list_models().ok().as_ref() == Some(&presets)
{
return false;
}
Arc::make_mut(&mut self.model_catalog).models = presets;
self.set_daybreak_enabled(self.daybreak_enabled);
self.refresh_effective_service_tier();
self.refresh_model_dependent_surfaces();
true
}
/// Keep a present model picker aligned with the active task, including Reserve entry/exit.
pub(super) fn refresh_open_model_picker(&mut self) {
// Refresh an existing parent without reopening it or interrupting its reasoning child.
match self.model_popup_view_id() {
Some(MODEL_SELECTION_VIEW_ID) => self.open_model_popup_with_presets(
self.model_catalog.try_list_models().unwrap_or_default(),
),
Some(ALL_MODELS_SELECTION_VIEW_ID) => self.open_all_models_popup(),
_ => {}
}
}
pub(super) fn show_model_selection_view(
&mut self,
model_ids: Vec<String>,
mut params: SelectionViewParams,
) {
let selected_index = params
.view_id
.and_then(|view_id| self.bottom_pane.selected_index_for_present_view(view_id));
let selected_model = selected_index.and_then(|index| self.model_popup_model_ids.get(index));
params.initial_selected_idx = model_ids
.iter()
.position(|model| Some(model) == selected_model);
self.model_popup_model_ids = model_ids;
if let Some(view_id) = params.view_id.filter(|_| selected_index.is_some()) {
self.bottom_pane
.replace_selection_view_if_present(view_id, params);
} else {
self.bottom_pane.show_selection_view(params);
}
}
}