mirror of
https://github.com/openai/codex.git
synced 2026-09-20 12:47:38 +00:00
## Why Model pickers and session details show raw model IDs even when the catalog provides a display name. ## What changed - Use catalog display names in model and reasoning pickers, session headers, status displays, and terminal titles, retaining fallback labels for models absent from the catalog. - Keep model IDs for selection and persistence, and preserve picker highlights by ID when display names change or are shared by multiple models. - Remove the legacy-model instruction from the full model picker. ## Testing Add regression tests and snapshots for custom display names, startup and resumed session headers, fallback labels, terminal titles, and picker refreshes. Verify that selecting a display name still persists the original model ID. GitOrigin-RevId: 101fe82b20f7a8a90ceeff7999bd07ad42ca46db
218 lines
7.9 KiB
Rust
218 lines
7.9 KiB
Rust
//! Exercises daemon startup and excluded resume/fork pickers with Cargo's CLI executable.
|
|
|
|
use anyhow::Context as _;
|
|
use anyhow::Result;
|
|
use anyhow::ensure;
|
|
use std::collections::VecDeque;
|
|
use std::fs;
|
|
use std::process::Command;
|
|
use std::time::Duration;
|
|
|
|
#[tokio::test]
|
|
#[cfg(unix)]
|
|
async fn auto_daemon_start_attaches_to_shared_server() -> Result<()> {
|
|
daemon_startup("start").await
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn daemon_exclusion_survives_resume_picker() -> Result<()> {
|
|
daemon_startup("resume").await
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn daemon_exclusion_survives_fork_picker() -> Result<()> {
|
|
daemon_startup("fork").await
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn daemon_auto_start_preserves_bedrock_onboarding() -> Result<()> {
|
|
daemon_startup("bedrock").await
|
|
}
|
|
|
|
#[tokio::test]
|
|
#[cfg(unix)]
|
|
async fn bedrock_onboarding_leaves_a_running_daemon_untouched() -> Result<()> {
|
|
daemon_startup("bedrock-running").await
|
|
}
|
|
|
|
async fn daemon_startup(command: &str) -> Result<()> {
|
|
let codex = codex_utils_cargo_bin::cargo_bin("codex")?.canonicalize()?;
|
|
let workspace = tempfile::tempdir()?;
|
|
let workspace_path = workspace.path().canonicalize()?;
|
|
#[cfg(unix)]
|
|
let home = tempfile::Builder::new().tempdir_in("/tmp")?;
|
|
#[cfg(not(unix))]
|
|
let home = tempfile::tempdir()?;
|
|
fs::write(
|
|
home.path().join("config.toml"),
|
|
format!(
|
|
"model = \"gpt-5.6-terra\"\nfeatures.daemon_auto_start = true\n\
|
|
features.bedrock_setup_wizard = true\ncli_auth_credentials_store = \"file\"\n\
|
|
suppress_unstable_features_warning = true\nanalytics.enabled = false\n\
|
|
windows.sandbox = \"unelevated\"\n\
|
|
tui.disable_paste_burst = true\n\
|
|
[projects.{}]\ntrust_level = \"trusted\"\n",
|
|
serde_json::to_string(&workspace_path)?,
|
|
),
|
|
)?;
|
|
let bedrock_onboarding = matches!(command, "bedrock" | "bedrock-running");
|
|
if !bedrock_onboarding {
|
|
fs::write(
|
|
home.path().join("auth.json"),
|
|
r#"{"OPENAI_API_KEY":"daemon-startup-test","tokens":null,"last_refresh":null}"#,
|
|
)?;
|
|
}
|
|
let mut env = std::env::vars().collect::<std::collections::HashMap<_, _>>();
|
|
for key in [
|
|
"CODEX_EXEC_SERVER_URL",
|
|
"CODEX_ACCESS_TOKEN",
|
|
"CODEX_API_KEY",
|
|
"CODEX_CLOUD_TASKS_MODE",
|
|
"OPENAI_API_KEY",
|
|
"OPENAI_FEDERATION_RULE_ID",
|
|
"OPENAI_IDENTITY_TOKEN_FILE",
|
|
"OPENAI_WORKLOAD_IDENTITY_CONTEXT",
|
|
] {
|
|
env.remove(key);
|
|
}
|
|
env.insert("CODEX_HOME".into(), home.path().display().to_string());
|
|
env.insert(
|
|
"CODEX_SQLITE_HOME".into(),
|
|
home.path().display().to_string(),
|
|
);
|
|
env.insert("TERM".into(), "xterm-256color".into());
|
|
let mut args = vec!["--no-alt-screen".to_string()];
|
|
let mut steps: VecDeque<(&str, &[u8])> = VecDeque::new();
|
|
if matches!(command, "start" | "bedrock-running") {
|
|
// A selected package with a stopped daemon avoids installing a release.
|
|
let managed = home
|
|
.path()
|
|
.join("packages/app-server-daemon/current/bin/codex");
|
|
fs::create_dir_all(home.path().join("packages/app-server-daemon/current/bin"))?;
|
|
fs::hard_link(&codex, &managed).or_else(|_| fs::copy(&codex, &managed).map(|_| ()))?;
|
|
fs::create_dir(home.path().join("app-server-daemon"))?;
|
|
fs::write(
|
|
home.path().join("app-server-daemon/settings.json"),
|
|
r#"{"shutdownGraceSeconds":0,"updater":{"autoUpdateEnabled":false}}"#,
|
|
)?;
|
|
}
|
|
let pid_file = home.path().join("app-server-daemon/daemon.pid");
|
|
let result = async {
|
|
let existing_daemon = if command == "bedrock-running" {
|
|
let started = Command::new(&codex)
|
|
.env_clear()
|
|
.envs(&env)
|
|
.current_dir(&workspace_path)
|
|
.args(["app-server", "daemon", "start"])
|
|
.output()?;
|
|
ensure!(
|
|
started.status.success(),
|
|
"{}",
|
|
String::from_utf8_lossy(&started.stderr)
|
|
);
|
|
Some(fs::read(&pid_file)?)
|
|
} else {
|
|
None
|
|
};
|
|
let expected = if command == "start" {
|
|
// The draft header is visible before the session's command composer is ready.
|
|
steps.push_back(("GPT-5.6-Terra", b"/status\r"));
|
|
"app-server-control.sock"
|
|
} else if bedrock_onboarding {
|
|
"UseAmazonBedrock"
|
|
} else {
|
|
args.extend([command.into(), "--strict-config".into()]);
|
|
steps.push_back(("Nosessionsyet", b"\x1b"));
|
|
steps.push_back(("GPT-5.6-Terra", b"\x14"));
|
|
"Runningwithoutthesharedbackgroundserver:--strict-config"
|
|
};
|
|
let spawned = codex_utils_pty::spawn_pty_process(
|
|
&codex.to_string_lossy(),
|
|
&args,
|
|
&workspace_path,
|
|
&env,
|
|
/*arg0*/ &None,
|
|
codex_utils_pty::TerminalSize {
|
|
rows: 40,
|
|
cols: 120,
|
|
},
|
|
&[],
|
|
)
|
|
.await?;
|
|
let session = spawned.session;
|
|
let writer = session.writer_sender();
|
|
let mut stdout = spawned.stdout_rx;
|
|
let mut output = String::new();
|
|
let mut screen = vt100::Parser::new(
|
|
/*rows*/ 40, /*cols*/ 120, /*scrollback_len*/ 0,
|
|
);
|
|
let mut queries: Vec<(&str, &[u8])> = vec![
|
|
("\x1b[6n", b"\x1b[1;1R"),
|
|
("\x1b[?u", b"\x1b[?0u\x1b[?1;2c"),
|
|
("\x1b[c", b"\x1b[?1;2c"),
|
|
("\x1b]10;?", b"\x1b]10;rgb:ffff/ffff/ffff\x1b\\"),
|
|
("\x1b]11;?", b"\x1b]11;rgb:0000/0000/0000\x1b\\"),
|
|
];
|
|
let result = tokio::time::timeout(Duration::from_secs(/*secs*/ 45), async {
|
|
while let Some(bytes) = stdout.recv().await {
|
|
output.push_str(&String::from_utf8_lossy(&bytes));
|
|
screen.process(&bytes);
|
|
for (query, reply) in &mut queries {
|
|
if !query.is_empty() && output.contains(*query) {
|
|
writer.send(reply.to_vec()).await?;
|
|
*query = "";
|
|
}
|
|
}
|
|
let text: String = screen
|
|
.screen()
|
|
.contents()
|
|
.chars()
|
|
.filter(|c| !c.is_whitespace())
|
|
.collect();
|
|
if let Some((ready, input)) = steps.front()
|
|
&& text.contains(ready)
|
|
{
|
|
writer.send(input.to_vec()).await?;
|
|
steps.pop_front();
|
|
output.clear();
|
|
} else if steps.is_empty() && text.contains(expected) {
|
|
if command == "start" {
|
|
ensure!(text.contains("unix://"));
|
|
ensure!(home.path().join("app-server-daemon/daemon.pid").exists());
|
|
} else if let Some(existing_daemon) = &existing_daemon {
|
|
ensure!(fs::read(&pid_file)? == *existing_daemon);
|
|
} else if bedrock_onboarding {
|
|
ensure!(!pid_file.exists());
|
|
}
|
|
return Ok::<_, anyhow::Error>(());
|
|
}
|
|
}
|
|
anyhow::bail!(
|
|
"TUI exited before {expected}: {}",
|
|
screen.screen().contents()
|
|
)
|
|
})
|
|
.await;
|
|
Ok::<_, anyhow::Error>((
|
|
session,
|
|
result.with_context(|| format!("{command} timed out: {}", screen.screen().contents())),
|
|
))
|
|
}
|
|
.await;
|
|
// Always stop the detached daemon, including on timeout or failed assertions.
|
|
let stopped = Command::new(&codex)
|
|
.env_clear()
|
|
.envs(&env)
|
|
.args(["app-server", "daemon", "stop"])
|
|
.output()?;
|
|
let (session, result) = result?;
|
|
session.terminate();
|
|
result??;
|
|
ensure!(
|
|
stopped.status.success(),
|
|
"{}",
|
|
String::from_utf8_lossy(&stopped.stderr)
|
|
);
|
|
Ok(())
|
|
}
|