Lightweight coding agent that runs in your terminal
Rust
Honor app-server provider defaults in the TUI (#49161)
Eric Traut3226512d470d
diff --git a/codex-rs/tui/src/app/event_dispatch.rs b/codex-rs/tui/src/app/event_dispatch.rsindex a3af86385d..1a508b94a4 100644--- a/codex-rs/tui/src/app/event_dispatch.rs+++ b/codex-rs/tui/src/app/event_dispatch.rs@@ -529,6 +529,7 @@ impl App {&self.chat_widget.config_ref().workspace_roots,);}+ fork_config.model_provider_id.clone_from(&self.chat_widget.config_ref().model_provider_id);fork_config.model = Some(self.chat_widget.current_model().to_string());fork_config.model_reasoning_effort =self.chat_widget.current_reasoning_effort();diff --git a/codex-rs/tui/src/app/reconnect.rs b/codex-rs/tui/src/app/reconnect.rsindex e362bb20a4..a0e8f9b1a5 100644--- a/codex-rs/tui/src/app/reconnect.rs+++ b/codex-rs/tui/src/app/reconnect.rs@@ -254,6 +254,7 @@ impl App {bootstrap,thread,} = connected;+ session.model_provider_override = self.harness_overrides.model_provider.clone();let selected = self.chat_widget.selected_index_for_present_view(agents_overview::AGENTS_OVERVIEW_VIEW_ID)diff --git a/codex-rs/tui/src/app/session_picker.rs b/codex-rs/tui/src/app/session_picker.rsindex de09c62277..9152ac86cd 100644--- a/codex-rs/tui/src/app/session_picker.rs+++ b/codex-rs/tui/src/app/session_picker.rs@@ -33,7 +33,7 @@ impl App {Ok(result) => result,Err(err) => Err(err.into()),};- let picker_app_server = match picker_app_server {+ let mut picker_app_server = match picker_app_server {Ok(app_server) => app_server,Err(err) => {self.add_session_picker_error(format!("Failed to start TUI session picker: {err}"));@@ -41,6 +41,7 @@ impl App {return Ok(AppRunControl::Continue);}};+ picker_app_server.model_provider_override = self.harness_overrides.model_provider.clone();let selection =crate::resume_picker::run_resume_picker_from_existing_session_with_app_server(crate::uses_remote_workspace_or_environment(diff --git a/codex-rs/tui/src/app/startup.rs b/codex-rs/tui/src/app/startup.rsindex 7799eb5664..0cdd4ce30c 100644--- a/codex-rs/tui/src/app/startup.rs+++ b/codex-rs/tui/src/app/startup.rs@@ -24,6 +24,7 @@ fn spawn_startup_thread_start(let thread_params_mode = app_server.thread_params_mode();let remote_cwd_override = app_server.remote_cwd_override().map(Path::to_path_buf);let thread_tool_transport = app_server.thread_tool_transport();+ let model_provider_override = app_server.model_provider_override.clone();tokio::spawn(async move {let result = crate::app_server_session::start_thread_with_request_handle(request_handle,@@ -32,6 +33,7 @@ fn spawn_startup_thread_start(thread_params_mode,remote_cwd_override,thread_tool_transport,+ model_provider_override,).await.and_then(|started| {@@ -230,6 +232,7 @@ impl App {let harness_overrides =normalize_harness_overrides_for_cwd(harness_overrides, &config.cwd)?;+ app_server.model_provider_override = harness_overrides.model_provider.clone();let bootstrap = match startup_bootstrap {Some(bootstrap) => bootstrap,None => match startup_draftdiff --git a/codex-rs/tui/src/app/tests/advanced_reasoning_tests.rs b/codex-rs/tui/src/app/tests/advanced_reasoning_tests.rsindex 2e82c78975..f4cb2064f3 100644--- a/codex-rs/tui/src/app/tests/advanced_reasoning_tests.rs+++ b/codex-rs/tui/src/app/tests/advanced_reasoning_tests.rs@@ -23,6 +23,7 @@ async fn fork_current_session_preserves_conversation_ultra() -> Result<()> {app.chat_widget.handle_thread_session(ThreadSessionState {windows_sandbox_host: crate::app::WindowsSandboxHost::Local,model: "gpt-5.4".to_string(),+ model_provider_id: app.config.model_provider_id.clone(),reasoning_effort: Some(ReasoningEffortConfig::Ultra),..test_thread_session(source_thread_id, test_path_buf("/tmp/project"))});diff --git a/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs b/codex-rs/tui/src/app/tests/background_task_defaults_tests.rsindex 16e4f8d56a..5512cdb0e8 100644--- a/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs+++ b/codex-rs/tui/src/app/tests/background_task_defaults_tests.rs@@ -326,6 +326,7 @@ async fn command_center_new_reads_server_defaults_for_actual_destination() -> Re},).await?;+ server.model_provider_override = app.harness_overrides.model_provider.clone();if launch_override {server = server.with_remote_cwd_override(Some(launch.path().to_path_buf()));}@@ -396,12 +397,10 @@ async fn command_center_new_reads_server_defaults_for_actual_destination() -> Reserde_json::json!(cwd)},&serde_json::json!(expected_model),- &if mode.starts_with("remote") {- serde_json::Value::Null- } else if mode == "local" && !explicit_cwd {- serde_json::json!("ollama")- } else {+ &if mode == "local-cli-provider" || (mode == "local" && explicit_cwd) {serde_json::json!("openai")+ } else {+ serde_json::Value::Null},&serde_json::json!("high"),&serde_json::json!(if mode == "local" && explicit_cwd {diff --git a/codex-rs/tui/src/app/tests/disconnect_tests.rs b/codex-rs/tui/src/app/tests/disconnect_tests.rsindex 4ab60da3c0..b7150740b2 100644--- a/codex-rs/tui/src/app/tests/disconnect_tests.rs+++ b/codex-rs/tui/src/app/tests/disconnect_tests.rs@@ -369,6 +369,7 @@ async fn lost_initial_thread_reply_keeps_startup_draft_offline() -> Result<()> {ThreadParamsMode::Remote,/*remote_cwd_override*/ None,session.thread_tool_transport(),+ /*model_provider_override*/ None,).await;let mut tui = crate::tui::test_support::make_test_tui()?;diff --git a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rsindex f98ff749b9..0fbf795370 100644--- a/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs+++ b/codex-rs/tui/src/app/tests/session_lifecycle_requests.rs@@ -857,6 +857,7 @@ async fn external_transport_registers_dynamic_tools_and_finds_task_mentions() ->crate::app_server_session::ThreadParamsMode::Embedded,/*remote_cwd_override*/ None,app_server.thread_tool_transport(),+ /*model_provider_override*/ None,).await?;assert!(startup.task_tools_available);@@ -1114,6 +1115,7 @@ async fn local_daemon_registers_approval_gated_mcp_tools_for_both_start_paths()crate::app_server_session::ThreadParamsMode::Embedded,/*remote_cwd_override*/ None,app_server.thread_tool_transport(),+ /*model_provider_override*/ None,).await?;assert!(startup.task_tools_available);@@ -1495,6 +1497,7 @@ async fn older_external_server_starts_without_unsupported_dynamic_tools_or_histocrate::app_server_session::ThreadParamsMode::Embedded,/*remote_cwd_override*/ None,app_server.thread_tool_transport(),+ /*model_provider_override*/ None,).await?;assert!(!startup.task_tools_available);@@ -3567,8 +3570,9 @@ terminal_visualization_instructions = trueparams[0]["modelProvider"].as_str(),params[0]["config"]["model_reasoning_effort"].as_str(),],- [Some("gpt-5.2"), Some("ollama"), Some("high")]+ [Some("gpt-5.2"), fork.then_some("ollama"), Some("high")]);+ assert_eq!(app.config.model_provider_id, "ollama");// Injection flushes and materializes a new thread's otherwise lazy rollout.server.thread_inject_items(replacement, vec![serde_json::from_value(serde_json::json!({"type": "message", "role": "assistant", "content": [{"type": "output_text", "text": format!("replacement persistence probe {mode:?}")}]diff --git a/codex-rs/tui/src/app/tests/startup_defaults_tests.rs b/codex-rs/tui/src/app/tests/startup_defaults_tests.rsindex d1f7ee3da8..429265902a 100644--- a/codex-rs/tui/src/app/tests/startup_defaults_tests.rs+++ b/codex-rs/tui/src/app/tests/startup_defaults_tests.rs@@ -269,6 +269,7 @@ async fn fresh_startup_uses_server_defaults_with_explicit_and_managed_precedenceserver.thread_params_mode(),server.remote_cwd_override().map(Path::to_path_buf),server.thread_tool_transport(),+ /*model_provider_override*/ None,).await?;assert_eq!(selected_model, expected_model, "{choice}");@@ -371,6 +372,7 @@ async fn fresh_startup_reads_destination_and_cleared_model_uses_catalog() -> Resserver.thread_params_mode(),server.remote_cwd_override().map(Path::to_path_buf),server.thread_tool_transport(),+ /*model_provider_override*/ None,).await?;assert_eq!(started.session.model, selected_model);diff --git a/codex-rs/tui/src/app_server_session.rs b/codex-rs/tui/src/app_server_session.rsindex 38f5b874e4..f45e2b1264 100644--- a/codex-rs/tui/src/app_server_session.rs+++ b/codex-rs/tui/src/app_server_session.rs@@ -7,6 +7,10 @@ mod external_agent_config;pub(crate) mod fs;mod history;mod models;+pub(crate) mod provider_selection;+#[cfg(test)]+#[path = "app_server_session/provider_selection_tests.rs"]+mod provider_selection_tests;mod realtime;mod rollout_history;mod thread_list;@@ -318,6 +322,8 @@ pub(crate) struct AppServerSession {task_search_generation: Arc<AtomicU64>,remote_cwd_override: Option<PathBuf>,thread_params_mode: ThreadParamsMode,+ /// Explicit CLI provider selection, distinct from resolved configuration defaults.+ pub(crate) model_provider_override: Option<String>,history_support: ThreadHistorySupport,thread_settings_update_supported: bool,default_model: Option<String>,@@ -353,13 +359,6 @@ impl ThreadParamsMode {Self::Remote => None,}}-- fn model_provider_from_config(self, config: &Config) -> Option<String> {- match self {- Self::Embedded => Some(config.model_provider_id.clone()),- Self::Remote => None,- }- }}#[derive(Debug, Clone)]@@ -428,6 +427,7 @@ impl AppServerSession {task_search_generation: Arc::new(AtomicU64::new(0)),remote_cwd_override: None,thread_params_mode,+ model_provider_override: None,history_support: ThreadHistorySupport::Paginated,thread_settings_update_supported: true,default_model: None,@@ -767,6 +767,10 @@ impl AppServerSession {remote_cwd_override.or(self.remote_cwd_override.as_deref()),session_start_source,);+ params.model_provider = self+ .model_provider_override+ .clone()+ .or(params.model_provider);if let Some(selected_profile) = selected_profile {params.runtime_workspace_roots = None;params.permissions = Some(selected_profile.profile_id.clone());@@ -939,6 +943,13 @@ impl AppServerSession {self.remote_cwd_override.as_deref(),)};+ params.model_provider = match config_source {+ ForkConfigSource::Local => self+ .model_provider_override+ .clone()+ .or(params.model_provider),+ ForkConfigSource::Session => Some(config.model_provider_id.clone()),+ };if config_source == ForkConfigSource::Session {// Active-session config has already adopted the server's roots. Fork does// not restore saved roots when omitted, so preserve this explicit selection.@@ -1675,6 +1686,7 @@ pub(crate) async fn start_thread_with_request_handle(thread_params_mode: ThreadParamsMode,remote_cwd_override: Option<PathBuf>,thread_tool_transport: ThreadToolTransport,+ model_provider_override: Option<String>,) -> Result<AppServerStartedThread> {let request_id = RequestId::String(format!("startup-thread-start-{}", Uuid::new_v4()));let mut params = thread_start_params_from_config(@@ -1683,6 +1695,7 @@ pub(crate) async fn start_thread_with_request_handle(remote_cwd_override.as_deref(),/*session_start_source*/ None,);+ params.model_provider = model_provider_override.or(params.model_provider);thread_tool_transport.configure(&mut params);let (response, _history_support, task_tools_available) =request_thread_start_with_history_fallback(&request_handle, request_id, params)@@ -2037,7 +2050,7 @@ pub(crate) fn thread_start_params_from_config(.flatten();ThreadStartParams {model: config.model.clone(),- model_provider: thread_params_mode.model_provider_from_config(config),+ model_provider: provider_selection::explicit_provider(config),service_tier: service_tier_override_from_config(config),cwd: thread_cwd_from_config(config, thread_params_mode, remote_cwd_override),runtime_workspace_roots: thread_params_mode.workspace_roots_from_config(config),@@ -2096,7 +2109,7 @@ fn thread_resume_params_from_config(let (model, model_provider) = match model_settings {ResumeModelSettings::OverrideFromCurrentConfig => (config.model.clone(),- thread_params_mode.model_provider_from_config(&config),+ provider_selection::explicit_provider(&config),),ResumeModelSettings::RestoreFromThread | ResumeModelSettings::PreserveExistingThread => {(None, None)@@ -2155,7 +2168,7 @@ fn thread_fork_params_from_config(ThreadForkParams {thread_id: thread_id.to_string(),model: config.model.clone(),- model_provider: thread_params_mode.model_provider_from_config(&config),+ model_provider: provider_selection::explicit_provider(&config),service_tier: service_tier_override_from_config(&config),cwd: thread_cwd_from_config(&config, thread_params_mode, remote_cwd_override),runtime_workspace_roots: thread_params_mode.workspace_roots_from_config(&config),@@ -2934,7 +2947,7 @@ mod tests {.active_permission_profile().map(permission_profile_id_from_active_profile));- assert_eq!(params.model_provider, Some(config.model_provider_id));+ assert_eq!(params.model_provider, None);assert_eq!(params.thread_source, Some(ThreadSource::User));assert_eq!(params.dynamic_tools, None);}diff --git a/codex-rs/tui/src/app_server_session/prompt_history_tests.rs b/codex-rs/tui/src/app_server_session/prompt_history_tests.rsindex 8ee74ed7e0..28092d3321 100644--- a/codex-rs/tui/src/app_server_session/prompt_history_tests.rs+++ b/codex-rs/tui/src/app_server_session/prompt_history_tests.rs@@ -70,6 +70,7 @@ async fn lifecycle_metadata_uses_local_prompt_history() -> Result<()> {mode,/*remote_cwd_override*/ None,app_server.thread_tool_transport(),+ /*model_provider_override*/ None,).await?;assert_eq!(startup.session.message_history, expected);diff --git a/codex-rs/tui/src/app_server_session/provider_selection.rs b/codex-rs/tui/src/app_server_session/provider_selection.rsnew file mode 100644index 0000000000..1e82c35b94--- /dev/null+++ b/codex-rs/tui/src/app_server_session/provider_selection.rs@@ -0,0 +1,65 @@+//! Provider request overrides honor managed requirements over explicit invocation choices.+//! Omission lets the server resolve the provider for thread creation, forks, and history lookup.++use super::AppServerSession;+use crate::legacy_core::config::Config;+use codex_config::ConfigLayerSource;++pub(crate) fn explicit_provider(config: &Config) -> Option<String> {+ config+ .config_layer_stack+ .layers_high_to_low()+ .find(|layer| layer.config.get("model_provider").is_some())+ .filter(|layer| {+ matches!(+ layer.name,+ ConfigLayerSource::SessionFlags+ | ConfigLayerSource::User {+ profile: Some(_),+ ..+ }+ )+ })+ .map(|_| config.model_provider_id.clone())+}++impl AppServerSession {+ pub(crate) fn explicit_model_provider(&self, config: &Config) -> Option<String> {+ self.model_provider_override+ .as_ref()+ .map(|provider| {+ config+ .config_layer_stack+ .required_model_provider()+ .unwrap_or(provider)+ .to_owned()+ })+ .or_else(|| explicit_provider(config))+ }++ pub(crate) async fn history_model_provider(+ &self,+ config: &Config,+ ) -> color_eyre::Result<Option<String>> {+ if let Some(provider) = self.explicit_model_provider(config) {+ return Ok(Some(provider));+ }+ let Some(cwd) = super::thread_cwd_from_config(+ config,+ self.thread_params_mode(),+ self.remote_cwd_override(),+ ) else {+ return Ok(None);+ };+ Ok(crate::config_update::read_effective_config_if_supported(+ self.request_handle(),+ std::path::Path::new(&cwd),+ )+ .await?+ .map(|config| {+ config+ .model_provider+ .unwrap_or_else(|| "openai".to_string())+ }))+ }+}diff --git a/codex-rs/tui/src/app_server_session/provider_selection_tests.rs b/codex-rs/tui/src/app_server_session/provider_selection_tests.rsnew file mode 100644index 0000000000..5cd0235f83--- /dev/null+++ b/codex-rs/tui/src/app_server_session/provider_selection_tests.rs@@ -0,0 +1,173 @@+//! Exercise provider defaults and explicit choices through real app-server requests.++use super::*;+use crate::legacy_core::config::ConfigBuilder;+use crate::legacy_core::config::ConfigOverrides;+use pretty_assertions::assert_eq;++#[tokio::test]+async fn starts_and_forks_use_server_provider_unless_explicitly_selected() -> Result<()> {+ let home = tempfile::tempdir()?;+ std::fs::write(+ home.path().join("config.toml"),+ r#"+model_provider = "server-provider"+model = "gpt-5.2"+[model_providers.server-provider]+name = "Server provider"+base_url = "http://127.0.0.1:9/v1"+wire_api = "responses"+requires_openai_auth = false+[model_providers.client-provider]+name = "Client provider"+base_url = "http://127.0.0.1:9/v1"+wire_api = "responses"+requires_openai_auth = false+"#,+ )?;+ let server_config = ConfigBuilder::default()+ .codex_home(home.path().to_path_buf())+ .build()+ .await?;+ let client_config = ConfigBuilder::default()+ .codex_home(home.path().to_path_buf())+ .harness_overrides(ConfigOverrides {+ model_provider: Some("client-provider".into()),+ ..Default::default()+ })+ .build()+ .await?;+ let local_settings = LocalSettings::from(&client_config);+ let parent = crate::tests::write_session_rollout(+ home.path(),+ "2025-01-02T10-00-00",+ "2025-01-02T10:00:00Z",+ "Server history",+ "server-provider",+ server_config.cwd.as_path(),+ )?;+ let mut server = crate::start_embedded_app_server_for_picker(&server_config).await?;+ assert_eq!(+ crate::lookup_session_target_with_app_server(&mut server, &client_config, "Server history")+ .await?+ .unwrap()+ .thread_id,+ parent+ );+ let resumed = server+ .resume_thread(+ &local_settings,+ client_config.clone(),+ parent,+ ResumeModelSettings::OverrideFromCurrentConfig,+ )+ .await?;+ assert_eq!(resumed.session.model_provider_id, "server-provider");+ for explicit in [false, true] {+ server.model_provider_override = explicit.then(|| "client-provider".to_string());+ let expected = if explicit {+ "client-provider"+ } else {+ "server-provider"+ };+ let started = server.start_thread(&client_config).await?;+ let forked = server+ .fork_thread(&local_settings, client_config.clone(), parent)+ .await?;+ assert_eq!(+ (+ started.session.model_provider_id.as_str(),+ forked.session.model_provider_id.as_str()+ ),+ (expected, expected)+ );+ }+ server.model_provider_override = None;+ let path = home.path().join("config.toml");+ let updated = std::fs::read_to_string(&path)?.replacen(+ "model_provider = \"server-provider\"",+ "model_provider = \"client-provider\"",+ 1,+ );+ std::fs::write(path, updated)?;+ assert_eq!(+ server.history_model_provider(&client_config).await?,+ Some("client-provider".into())+ );+ assert_eq!(+ server+ .start_thread(&client_config)+ .await?+ .session+ .model_provider_id,+ "client-provider"+ );+ // A fork of the active session preserves its provider even if launch defaults differ.+ server.model_provider_override = Some("client-provider".into());+ let forked = server+ .fork_thread_at(+ &local_settings,+ server_config,+ parent,+ /*last_turn_id*/ None,+ /*before_turn_id*/ None,+ ForkGoalContinuation::StartIfIdle,+ /*selected_profile*/ None,+ )+ .await?;+ assert_eq!(forked.session.model_provider_id, "server-provider");+ server.shutdown().await?;+ Ok(())+}++#[tokio::test]+async fn selected_profile_provider_is_explicit() -> Result<()> {+ let home = tempfile::tempdir()?;+ let profile_path = AbsolutePathBuf::try_from(home.path().join("selected.config.toml"))?;+ std::fs::write(&profile_path, "model_provider = \"openai\"\n")?;+ let config = ConfigBuilder::default()+ .codex_home(home.path().to_path_buf())+ .loader_overrides(codex_config::LoaderOverrides {+ user_config_path: Some(profile_path),+ user_config_profile: Some("selected".parse()?),+ ..codex_config::LoaderOverrides::without_managed_config_for_tests()+ })+ .build()+ .await?;+ assert_eq!(+ provider_selection::explicit_provider(&config),+ Some("openai".into())+ );+ Ok(())+}++#[tokio::test]+async fn required_provider_overrides_oss_history_selection() -> Result<()> {+ let home = tempfile::tempdir()?;+ std::fs::write(+ home.path().join("requirements.toml"),+ "model_provider = 'openai'",+ )?;+ let config = ConfigBuilder::default()+ .codex_home(home.path().to_path_buf())+ .loader_overrides(+ codex_config::LoaderOverrides::with_managed_config_path_for_tests(+ home.path().join("managed_config.toml"),+ ),+ )+ .harness_overrides(ConfigOverrides {+ model_provider: Some("ollama".into()),+ ..Default::default()+ })+ .build()+ .await?;+ let mut server = crate::start_embedded_app_server_for_picker(&config).await?;+ server.model_provider_override = Some("ollama".into());+ assert_eq!(config.model_provider_id, "openai");+ assert_eq!(+ server.history_model_provider(&config).await?,+ Some("openai".into())+ );+ server.shutdown().await?;+ Ok(())+}diff --git a/codex-rs/tui/src/app_server_session/rollout_history.rs b/codex-rs/tui/src/app_server_session/rollout_history.rsindex 597bc152c0..f16428421a 100644--- a/codex-rs/tui/src/app_server_session/rollout_history.rs+++ b/codex-rs/tui/src/app_server_session/rollout_history.rs@@ -172,6 +172,9 @@ impl AppServerSession {model_settings,permission_overrides,);+ if model_settings == ResumeModelSettings::OverrideFromCurrentConfig {+ params.model_provider = self.explicit_model_provider(&config);+ }self.thread_tool_transport().configure_mcp(&mut params.config);let mut rollout_maintenance_guard = None;diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rsindex ea3cd156ab..d1c672d9ac 100644--- a/codex-rs/tui/src/lib.rs+++ b/codex-rs/tui/src/lib.rs@@ -808,15 +808,14 @@ async fn lookup_session_target_with_app_server(};}- let model_provider =- (!app_server.uses_remote_workspace()).then_some(config.model_provider_id.as_str());+ let model_provider = app_server.history_model_provider(config).await?;Ok(named_session_lookup::lookup(app_server,config.codex_home.as_path(),id_or_name,&[named_session_lookup::SessionCollection::Active],&[resume_source_kinds(/*include_non_interactive*/ false)],- model_provider,+ model_provider.as_deref(),).await?.and_then(session_target_from_app_server_thread))@@ -830,6 +829,7 @@ async fn lookup_latest_session_target_with_app_server(include_non_interactive: bool,) -> color_eyre::Result<Option<resume_picker::SessionTarget>> {let uses_remote_workspace = app_server.uses_remote_workspace();+ let model_provider = app_server.history_model_provider(config).await?;for lookup_mode in [LatestSessionLookupMode::StateDbOnly,LatestSessionLookupMode::ScanAndRepair,@@ -837,7 +837,7 @@ async fn lookup_latest_session_target_with_app_server(let response = app_server.thread_list(latest_session_lookup_params(uses_remote_filesystem,- uses_remote_workspace,+ model_provider.clone(),config,cwd_filter,include_non_interactive,@@ -865,7 +865,7 @@ enum LatestSessionLookupMode {fn latest_session_lookup_params(uses_remote_filesystem: bool,- uses_remote_workspace: bool,+ model_provider: Option<String>,config: &Config,cwd_filter: Option<&Path>,include_non_interactive: bool,@@ -877,11 +877,7 @@ fn latest_session_lookup_params(limit: Some(1),sort_key: Some(AppServerThreadSortKey::UpdatedAt),sort_direction: None,- model_providers: if uses_remote_workspace {- None- } else {- Some(vec![config.model_provider_id.clone()])- },+ model_providers: model_provider.map(|provider| vec![provider]),source_kinds: Some(resume_source_kinds(include_non_interactive)),archived: Some(false),section_id: None,@@ -1214,7 +1210,7 @@ async fn run_ratatui_app().await;launch_telemetry.record(&app_server_target, matches!(&startup_app_server, Ok(Ok(_))));- let app_server_session = match startup_app_server {+ let mut app_server_session = match startup_app_server {Ok(Ok(app_server)) => {AppServerSession::new(app_server, app_server_target.thread_params_mode()).with_local_codex_home(&initial_config.codex_home)@@ -1257,6 +1253,7 @@ async fn run_ratatui_app(}}}+ app_server_session.model_provider_override = overrides.model_provider.clone();let mut app_server = Some(app_server_session);// Folder consent runs after the picker resolves the actual destination.let should_show_trust_screen_flag = false;@@ -3207,17 +3204,14 @@ requires_openai_auth = {requires_openai_auth}let params = latest_session_lookup_params(/*uses_remote_filesystem*/ false,- /*uses_remote_workspace*/ false,+ /*model_provider*/ None,&config,Some(cwd.as_path()),/*include_non_interactive*/ false,LatestSessionLookupMode::StateDbOnly,);- assert_eq!(- params.model_providers,- Some(vec![config.model_provider_id.clone()])- );+ assert_eq!(params.model_providers, None);assert_eq!(params.cwd,Some(ThreadListCwdFilter::One(cwd.to_string_lossy().to_string()))@@ -3226,7 +3220,7 @@ requires_openai_auth = {requires_openai_auth}let scan_params = latest_session_lookup_params(/*uses_remote_filesystem*/ false,- /*uses_remote_workspace*/ false,+ /*model_provider*/ None,&config,Some(cwd.as_path()),/*include_non_interactive*/ false,@@ -3237,28 +3231,23 @@ requires_openai_auth = {requires_openai_auth}}#[tokio::test]- async fn latest_session_lookup_params_keep_local_filters_for_local_daemon_sessions()- -> color_eyre::Result<()> {+ async fn latest_session_lookup_params_honor_explicit_provider() -> color_eyre::Result<()> {let temp_dir = TempDir::new()?;let config = build_config(&temp_dir).await?;let cwd = temp_dir.path().join("project");- let target = AppServerTarget::LocalDaemon {- allow_embedded_fallback: true,- endpoint: RemoteAppServerEndpoint::UnixSocket {- socket_path: AbsolutePathBuf::relative_to_current_dir("codex.sock")?,- },- };-let params = latest_session_lookup_params(/*uses_remote_filesystem*/ false,- target.uses_remote_workspace(),+ Some("selected-provider".to_string()),&config,Some(cwd.as_path()),/*include_non_interactive*/ false,LatestSessionLookupMode::StateDbOnly,);- assert_eq!(params.model_providers, Some(vec![config.model_provider_id]));+ assert_eq!(+ params.model_providers,+ Some(vec!["selected-provider".to_string()])+ );assert_eq!(params.cwd,Some(ThreadListCwdFilter::One(cwd.to_string_lossy().to_string()))@@ -3274,7 +3263,7 @@ requires_openai_auth = {requires_openai_auth}let params = latest_session_lookup_params(/*uses_remote_filesystem*/ true,- /*uses_remote_workspace*/ true,+ /*model_provider*/ None,&config,/*cwd_filter*/ None,/*include_non_interactive*/ false,@@ -3294,7 +3283,7 @@ requires_openai_auth = {requires_openai_auth}let params = latest_session_lookup_params(/*uses_remote_filesystem*/ true,- /*uses_remote_workspace*/ true,+ /*model_provider*/ None,&config,/*cwd_filter*/ None,/*include_non_interactive*/ true,@@ -3322,7 +3311,7 @@ requires_openai_auth = {requires_openai_auth}let params = latest_session_lookup_params(/*uses_remote_filesystem*/ true,- /*uses_remote_workspace*/ true,+ /*model_provider*/ None,&config,Some(cwd),/*include_non_interactive*/ false,diff --git a/codex-rs/tui/src/resume_picker.rs b/codex-rs/tui/src/resume_picker.rsindex cc04b6e551..6742919a21 100644--- a/codex-rs/tui/src/resume_picker.rs+++ b/codex-rs/tui/src/resume_picker.rs@@ -442,7 +442,7 @@ async fn run_resume_picker_with_launch_context(app_server.remote_cwd_override(),);let local_filter_cwd = local_picker_cwd_filter(&cwd_filter, uses_remote_filesystem);- let provider_filter = picker_provider_filter(config, uses_remote_workspace);+ let provider_filter = picker_provider_filter(config, &app_server).await?;let runtime_keymap = picker_runtime_keymap(local_settings)?;let options = SessionPickerRunOptions {use_theme_colors: local_settings.tui.status_line_use_colors,@@ -502,7 +502,7 @@ pub async fn run_fork_picker_with_app_server(app_server.remote_cwd_override(),);let local_filter_cwd = local_picker_cwd_filter(&cwd_filter, uses_remote_filesystem);- let provider_filter = picker_provider_filter(config, uses_remote_workspace);+ let provider_filter = picker_provider_filter(config, &app_server).await?;let runtime_keymap = picker_runtime_keymap(local_settings)?;let options = SessionPickerRunOptions {use_theme_colors: local_settings.tui.status_line_use_colors,@@ -658,12 +658,14 @@ fn local_picker_cwd_filter(}}-fn picker_provider_filter(config: &Config, uses_remote_workspace: bool) -> ProviderFilter {- if uses_remote_workspace {- ProviderFilter::Any- } else {- ProviderFilter::MatchDefault(config.model_provider_id.to_string())- }+async fn picker_provider_filter(+ config: &Config,+ app_server: &AppServerSession,+) -> Result<ProviderFilter> {+ Ok(app_server+ .history_model_provider(config)+ .await?+ .map_or(ProviderFilter::Any, ProviderFilter::MatchDefault))}fn picker_runtime_keymap(config: &crate::local_settings::LocalSettings) -> Result<RuntimeKeymap> {@@ -3876,7 +3878,7 @@ mod tests {));let mut local = crate::latest_session_lookup_params(/*uses_remote_filesystem*/ false,- /*uses_remote_workspace*/ false,+ /*model_provider*/ None,&config,Some(&primary),/*include_non_interactive*/ false,@@ -3887,7 +3889,7 @@ mod tests {assert_eq!(crate::latest_session_lookup_params(/*uses_remote_filesystem*/ true,- /*uses_remote_workspace*/ false,+ /*model_provider*/ None,&config,Some(&primary),/*include_non_interactive*/ false,@@ -4306,6 +4308,37 @@ mod tests {assert!(first_index < second_index);}+ #[test]+ fn picker_renders_server_provider_history() {+ let cwd = PathBuf::from("/project");+ let mut row = make_row(+ "/session.jsonl",+ "2025-01-02T11:00:00Z",+ "Other provider session",+ );+ row.cwd = Some(cwd.clone());+ let mut state = PickerState::new(+ FrameRequester::test_dummy(),+ page_only_loader(|_| {}),+ ProviderFilter::MatchDefault("server-provider".to_string()),+ /*show_all*/ false,+ Some(cwd),+ SessionPickerAction::Resume,+ );+ state.ingest_page(page(+ vec![row],+ /*next_cursor*/ None,+ /*num_scanned_files*/ 1,+ /*reached_scan_cap*/ false,+ ));+ state.relative_time_reference = Some(parse_timestamp_str("2025-01-02T12:00:00Z").unwrap());+ state.update_viewport(/*rows*/ 12, /*width*/ 80);+ assert_snapshot!(+ "resume_picker_shared_provider_history",+ render_picker_list(&state, /*width*/ 80, /*height*/ 12)+ );+ }+#[test]fn remote_thread_list_params_omit_provider_filter() {let params = thread_list_params(diff --git a/codex-rs/tui/src/snapshots/codex_tui__resume_picker__tests__resume_picker_shared_provider_history.snap b/codex-rs/tui/src/snapshots/codex_tui__resume_picker__tests__resume_picker_shared_provider_history.snapnew file mode 100644index 0000000000..fd35730b23--- /dev/null+++ b/codex-rs/tui/src/snapshots/codex_tui__resume_picker__tests__resume_picker_shared_provider_history.snap@@ -0,0 +1,6 @@+---+source: tui/src/resume_picker.rs+expression: "render_picker_list(&state, 80, 12)"+---+› Other provider session+ 1h ago no branchdiff --git a/codex-rs/tui/tests/suite/mod.rs b/codex-rs/tui/tests/suite/mod.rsindex e827d70b61..5d88a0be9b 100644--- a/codex-rs/tui/tests/suite/mod.rs+++ b/codex-rs/tui/tests/suite/mod.rs@@ -6,6 +6,8 @@ mod directory_trust;#[cfg(unix)]mod focus_palette;#[cfg(unix)]+mod provider_defaults;+#[cfg(unix)]mod reconnect;mod resize_reflow;#[cfg(unix)]diff --git a/codex-rs/tui/tests/suite/provider_defaults.rs b/codex-rs/tui/tests/suite/provider_defaults.rsnew file mode 100644index 0000000000..3ae9c8532e--- /dev/null+++ b/codex-rs/tui/tests/suite/provider_defaults.rs@@ -0,0 +1,111 @@+//! Resume and fork picker and --last provider defaults through the real CLI and app server.++use super::focus_palette::PtyCodex;+use super::focus_palette::write_test_config;+use anyhow::Result;+use anyhow::ensure;+use app_test_support::create_fake_rollout;+use std::process::Stdio;+use std::time::Duration;++#[tokio::test(flavor = "multi_thread", worker_threads = 2)]+async fn history_lookup_uses_server_provider_with_local_and_embedded_servers() -> Result<()> {+ let codex = codex_utils_cargo_bin::cargo_bin("codex")?;+ let cwd = codex_utils_cargo_bin::repo_root()?;+ for action in ["resume", "fork"] {+ for (embedded, last, explicit) in [+ (false, false, false),+ (true, false, false),+ (false, true, false),+ (true, true, false),+ (false, true, true),+ (false, false, true),+ ] {+ let home = tempfile::tempdir_in("/tmp")?;+ write_test_config(home.path(), &cwd)?;+ let config_path = home.path().join("config.toml");+ let config = std::fs::read_to_string(&config_path)?;+ std::fs::write(+ config_path,+ format!(+ "{config}\n[model_providers.server-provider]\nname = 'Server provider'\nbase_url = 'http://127.0.0.1:9/v1'\nwire_api = 'responses'\nrequires_openai_auth = false\n[projects.'/']\ntrust_level = 'trusted'\n"+ ),+ )?;+ for (hour, provider, preview) in [+ ("10", "openai", "Client provider history"),+ ("11", "server-provider", "Server provider history"),+ ] {+ create_fake_rollout(+ home.path(),+ &format!("2025-01-02T{hour}-00-00"),+ &format!("2025-01-02T{hour}:00:00Z"),+ preview,+ Some(provider),+ /*git_info*/ None,+ )?;+ }+ let mut daemon = tokio::process::Command::new(&codex)+ .args([+ "app-server",+ "--listen",+ "unix://",+ "-c",+ "model_provider=\"server-provider\"",+ ])+ .env("CODEX_HOME", home.path())+ .stdin(Stdio::null())+ .stdout(Stdio::null())+ .stderr(Stdio::inherit())+ .kill_on_drop(true)+ .spawn()?;+ let socket = codex_app_server_client::app_server_control_socket_path(home.path())?;+ tokio::time::timeout(Duration::from_secs(/*secs*/ 30), async {+ loop {+ if tokio::net::UnixStream::connect(socket.as_path())+ .await+ .is_ok()+ {+ return Ok::<(), anyhow::Error>(());+ }+ ensure!(+ daemon.try_wait()?.is_none(),+ "app server exited before opening its socket"+ );+ tokio::time::sleep(Duration::from_millis(/*millis*/ 20)).await;+ }+ })+ .await??;+ let remote_endpoint = format!("unix://{}", socket.as_path().display());+ let mut args = vec![action, "--all"];+ if embedded {+ args.push("--no-daemon");+ }+ if last {+ args.push("--last");+ }+ if explicit {+ args.extend([+ "--remote",+ remote_endpoint.as_str(),+ "-c",+ "model_provider=\"openai\"",+ ]);+ }+ let mut terminal = PtyCodex::start_cli(&cwd, home, &args)?;+ let (expected, excluded) = if embedded || explicit {+ ("Client provider history", "Server provider history")+ } else {+ ("Server provider history", "Client provider history")+ };+ terminal.wait_for_screen(expected)?;+ ensure!(+ !terminal.screen_contains(excluded),+ "{action}: unexpected provider history"+ );+ drop(terminal);+ daemon.kill().await?;+ daemon.wait().await?;+ }+ }+ Ok(())+}