Skip to content

Honor server model defaults when starting fresh TUI threads #50013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copyberry merged 1 commit into from
Oct 1, 2026
Merged

Honor server model defaults when starting fresh TUI threads #50013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions codex-rs/tui/src/app/startup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ fn spawn_startup_thread_start(
app_server: &AppServerSession,
local_settings: crate::local_settings::LocalSettings,
config: Config,
launch_choices: crate::app_server_session::StartupLaunchChoices,
app_event_tx: AppEventSender,
worktree: Option<crate::ManagedTuiWorktree>,
) {
let request_handle = app_server.request_handle();
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,
Expand All @@ -34,7 +34,7 @@ fn spawn_startup_thread_start(
thread_params_mode,
remote_cwd_override,
thread_tool_transport,
model_provider_override,
launch_choices,
)
.await
.and_then(|started| {
Expand Down Expand Up @@ -331,6 +331,11 @@ impl App {
&harness_overrides,
);
}
let mut launch_choices = crate::app_server_session::StartupLaunchChoices::from_launch(
&cli_kv_overrides,
&harness_overrides,
&loader_overrides,
);
let mut model = startup_model(&config, &bootstrap, startup_defaults.server_defaults_read);
let available_models = bootstrap.available_models;
let remote_connection = crate::status::remote_connection::remote_connection_status_value(
Expand Down Expand Up @@ -361,6 +366,7 @@ impl App {
tui,
&mut config,
&local_settings,
&mut launch_choices,
model.as_str(),
&app_event_tx,
&available_models,
Expand Down Expand Up @@ -461,6 +467,7 @@ impl App {
&app_server,
local_settings.clone(),
config.clone(),
launch_choices,
app_event_tx.clone(),
managed_worktree.clone(),
);
Expand Down
5 changes: 5 additions & 0 deletions codex-rs/tui/src/app/startup_prompts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ pub(super) fn target_preset_for_upgrade<'a>(

pub(super) fn apply_accepted_model_migration(
config: &mut Config,
launch_choices: &mut crate::app_server_session::StartupLaunchChoices,
app_event_tx: &AppEventSender,
from_model: String,
target_model: String,
Expand All @@ -227,6 +228,8 @@ pub(super) fn apply_accepted_model_migration(
to_model: target_model.clone(),
});

launch_choices.model = Some(target_model.clone());
launch_choices.effort = Some(serde_json::json!(target_default_effort));
config.model = Some(target_model.clone());
config.model_reasoning_effort = Some(target_default_effort.clone());
app_event_tx.send(AppEvent::UpdateModel(target_model.clone()));
Expand Down Expand Up @@ -310,6 +313,7 @@ pub(super) async fn handle_model_migration_prompt_if_needed(
tui: &mut tui::Tui,
config: &mut Config,
local_settings: &crate::local_settings::LocalSettings,
launch_choices: &mut crate::app_server_session::StartupLaunchChoices,
model: &str,
app_event_tx: &AppEventSender,
available_models: &[ModelPreset],
Expand Down Expand Up @@ -367,6 +371,7 @@ pub(super) async fn handle_model_migration_prompt_if_needed(
ModelMigrationOutcome::Accepted => {
apply_accepted_model_migration(
config,
launch_choices,
app_event_tx,
model.to_string(),
target_model.clone(),
Expand Down
2 changes: 1 addition & 1 deletion codex-rs/tui/src/app/tests/disconnect_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,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,
crate::app_server_session::StartupLaunchChoices::default(),
)
.await;
let mut tui = crate::tui::test_support::make_test_tui()?;
Expand Down
1 change: 1 addition & 0 deletions codex-rs/tui/src/app/tests/model_catalog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ async fn accepted_model_migration_persists_target_default_reasoning_effort() ->
let app_event_tx = AppEventSender::new(tx_raw);
apply_accepted_model_migration(
&mut config,
&mut crate::app_server_session::StartupLaunchChoices::default(),
&app_event_tx,
current_model,
upgrade.id,
Expand Down
8 changes: 4 additions & 4 deletions codex-rs/tui/src/app/tests/session_lifecycle_requests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async fn daybreak_command_persists_and_confirms_each_selection() -> Result<()> {
crate::app_server_session::ThreadParamsMode::Embedded,
/*remote_cwd_override*/ None,
server.thread_tool_transport(),
/*model_provider_override*/ None,
crate::app_server_session::StartupLaunchChoices::default(),
)
.await?;
assert!(startup.session.daybreak_enabled);
Expand Down Expand Up @@ -1024,7 +1024,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,
crate::app_server_session::StartupLaunchChoices::default(),
)
.await?;
assert!(startup.task_tools_available);
Expand Down Expand Up @@ -1305,7 +1305,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,
crate::app_server_session::StartupLaunchChoices::default(),
)
.await?;
assert!(startup.task_tools_available);
Expand Down Expand Up @@ -1696,7 +1696,7 @@ async fn older_external_server_starts_without_unsupported_dynamic_tools_or_histo
crate::app_server_session::ThreadParamsMode::Embedded,
/*remote_cwd_override*/ None,
app_server.thread_tool_transport(),
/*model_provider_override*/ None,
crate::app_server_session::StartupLaunchChoices::default(),
)
.await?;
assert!(!startup.task_tools_available);
Expand Down
105 changes: 75 additions & 30 deletions codex-rs/tui/src/app/tests/startup_defaults_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,21 +175,50 @@ async fn run_until_thread_start(

#[tokio::test]
async fn fresh_startup_uses_server_defaults_with_explicit_and_managed_precedence() -> Result<()> {
for (choice, managed, expected_model, expected_effort) in [
("saved", false, "server-model", "high"),
("cli_model", true, "cli-model", "high"),
("cli_effort", true, "server-model", "low"),
("profile_model", false, "profile-model", "high"),
("profile_effort", false, "server-model", "low"),
("profile_model", true, "profile-model", "high"),
("profile_effort", true, "server-model", "low"),
("managed", true, "managed-model", "medium"),
for (choice, managed, expected_model, expected_effort, expected_provider) in [
("saved", false, None, None, None),
("cli_model", true, Some("cli-model"), None, None),
("kv_model", false, Some("kv-model"), None, None),
(
"migration",
false,
Some("upgraded-model"),
Some("high"),
None,
),
("cli_effort", true, None, Some("low"), None),
("cli_provider", false, None, None, Some("openai")),
("kv_provider", false, None, None, Some("openai")),
(
"profile_model",
false,
Some("profile-model"),
Some("high"),
None,
),
(
"profile_effort",
false,
Some("server-model"),
Some("low"),
None,
),
("managed", true, None, None, None),
] {
let client_home = tempdir()?;
let server_home = tempdir()?;
std::fs::write(
client_home.path().join("config.toml"),
"model = \"client-model\"\nmodel_reasoning_effort = \"low\"\n",
r#"
model = "client-model"
model_reasoning_effort = "low"
model_provider = "client-provider"
[model_providers.client-provider]
name = "Client provider"
base_url = "http://127.0.0.1:9/v1"
wire_api = "responses"
requires_openai_auth = false
"#,
)?;
std::fs::write(
server_home.path().join("config.toml"),
Expand All @@ -206,6 +235,13 @@ async fn fresh_startup_uses_server_defaults_with_explicit_and_managed_precedence
let mut loader_overrides = LoaderOverrides::without_managed_config_for_tests();
match choice {
"cli_model" => harness_overrides.model = Some("cli-model".to_string()),
"kv_model" => cli_kv_overrides.extend([
("model".into(), "earlier-model".into()),
("model".into(), "kv-model".into()),
]),
"migration" => harness_overrides.model = Some("old-model".into()),
"cli_provider" => harness_overrides.model_provider = Some("openai".into()),
"kv_provider" => cli_kv_overrides.push(("model_provider".into(), "openai".into())),
"cli_effort" => cli_kv_overrides.push((
"model_reasoning_effort".to_string(),
TomlValue::String("low".to_string()),
Expand All @@ -225,6 +261,11 @@ async fn fresh_startup_uses_server_defaults_with_explicit_and_managed_precedence
}
_ => {}
}
let mut launch_choices = crate::app_server_session::StartupLaunchChoices::from_launch(
&cli_kv_overrides,
&harness_overrides,
&loader_overrides,
);
let mut config = ConfigBuilder::default()
.codex_home(client_home.path().to_path_buf())
.loader_overrides(loader_overrides)
Expand All @@ -249,7 +290,7 @@ async fn fresh_startup_uses_server_defaults_with_explicit_and_managed_precedence
)
.await?;
server = server.with_remote_cwd_override(Some(server_config.cwd.to_path_buf()));
let bootstrap = server.bootstrap(&config).await?;
server.bootstrap(&config).await?;
assert!(
prepare_fresh_startup_config(
&mut config,
Expand All @@ -261,32 +302,42 @@ async fn fresh_startup_uses_server_defaults_with_explicit_and_managed_precedence
.await?
.server_defaults_read
);
let selected_model = startup_model(&config, &bootstrap, /*server_defaults_read*/ true);
let started = crate::app_server_session::start_thread_with_request_handle(
if choice == "migration" {
let (tx, _rx) = tokio::sync::mpsc::unbounded_channel();
apply_accepted_model_migration(
&mut config,
&mut launch_choices,
&AppEventSender::new(tx),
"old-model".into(),
"upgraded-model".into(),
ReasoningEffortConfig::High,
);
}
crate::app_server_session::start_thread_with_request_handle(
server.request_handle(),
&crate::local_settings::LocalSettings::from(&config),
config,
server.thread_params_mode(),
server.remote_cwd_override().map(Path::to_path_buf),
server.thread_tool_transport(),
/*model_provider_override*/ None,
launch_choices,
)
.await?;
assert_eq!(selected_model, expected_model, "{choice}");
let starts = recorded_params(&requests, "thread/start");
assert_eq!(starts.len(), 1, "{choice}");
assert_eq!(
(
&starts[0]["model"],
&starts[0]["config"]["model_reasoning_effort"]
starts[0]["model"].clone(),
starts[0]["config"].get("model_reasoning_effort").cloned(),
starts[0]["modelProvider"].clone()
),
(
&serde_json::json!(expected_model),
&serde_json::json!(expected_effort)
serde_json::json!(expected_model),
expected_effort.map(serde_json::Value::from),
serde_json::json!(expected_provider),
),
"{choice}"
);
assert_eq!(started.session.model, expected_model, "{choice}");
assert_eq!(
recorded_params(&requests, "config/read")
.into_iter()
Expand Down Expand Up @@ -372,7 +423,7 @@ async fn fresh_startup_reads_destination_and_cleared_model_uses_catalog() -> Res
server.thread_params_mode(),
server.remote_cwd_override().map(Path::to_path_buf),
server.thread_tool_transport(),
/*model_provider_override*/ None,
crate::app_server_session::StartupLaunchChoices::default(),
)
.await?;
assert_eq!(started.session.model, selected_model);
Expand All @@ -389,7 +440,7 @@ async fn fresh_startup_reads_destination_and_cleared_model_uses_catalog() -> Res
let starts = recorded_params(&requests, "thread/start");
assert_eq!(starts.len(), 1);
assert_eq!(starts[0]["model"], serde_json::Value::Null);
assert_eq!(starts[0]["config"]["model_reasoning_effort"], "high");
assert!(starts[0]["config"].get("model_reasoning_effort").is_none());
let (mut app, _, _) = make_test_app_with_channels().await;
app.chat_widget.handle_thread_session_quiet(started.session);
if !remote {
Expand Down Expand Up @@ -457,10 +508,7 @@ async fn fresh_startup_falls_back_only_for_unsupported_config_read() -> Result<(
&starts[0]["model"],
&starts[0]["config"]["model_reasoning_effort"]
),
(
&serde_json::json!("client-model"),
&serde_json::json!("low")
)
(&serde_json::Value::Null, &serde_json::Value::Null)
);
tokio::time::timeout(Duration::from_secs(/*secs*/ 15), proxy).await???;
}
Expand Down Expand Up @@ -520,10 +568,7 @@ async fn startup_reads_server_defaults_before_starting_thread() -> Result<()> {
&starts[0]["model"],
&starts[0]["config"]["model_reasoning_effort"]
),
(
&serde_json::json!("server-model"),
&serde_json::json!("high")
),
(&serde_json::Value::Null, &serde_json::Value::Null),
);
tokio::time::timeout(Duration::from_secs(/*secs*/ 15), proxy).await???;
Ok(())
Expand Down
6 changes: 4 additions & 2 deletions codex-rs/tui/src/app_server_session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pub(crate) mod provider_selection;
mod provider_selection_tests;
mod realtime;
mod rollout_history;
mod startup_launch;
mod thread_list;
mod web_search;

Expand All @@ -25,6 +26,7 @@ pub(crate) use history::HISTORY_ITEM_SCAN_LIMIT;
pub(crate) use history::HistoryHydrationScope;
pub(crate) use history::INITIAL_HISTORY_TURN_LIMIT;
pub(crate) use history::thread_items_page_params;
pub(crate) use startup_launch::StartupLaunchChoices;

use crate::app_event::PermissionProfileSelection;
use crate::app_event_sender::AppEventSender;
Expand Down Expand Up @@ -1729,7 +1731,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>,
launch_choices: StartupLaunchChoices,
) -> Result<AppServerStartedThread> {
let request_id = RequestId::String(format!("startup-thread-start-{}", Uuid::new_v4()));
let mut params = thread_start_params_from_config(
Expand All @@ -1738,7 +1740,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);
launch_choices.configure(&mut params);
params.daybreak_enabled = (config.daybreak_enabled && !config.ephemeral).then_some(true);
thread_tool_transport.configure(&mut params);
let (response, _history_support, task_tools_available) =
Expand Down
2 changes: 1 addition & 1 deletion codex-rs/tui/src/app_server_session/prompt_history_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +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,
crate::app_server_session::StartupLaunchChoices::default(),
)
.await?;
assert_eq!(startup.session.message_history, expected);
Expand Down
Loading
Loading