mirror of
https://github.com/openai/codex.git
synced 2026-10-27 18:48:37 +00:00
## What changed - Add the opt-in `code_mode_prewarm` feature to establish the code-mode host session during startup, before the first turn. - Make in-progress host initialization cancellable so a stalled prewarm does not block shutdown. - Share a failed connection attempt with concurrent callers instead of immediately starting another attempt. ## Testing - Verify app-server contacts the configured host before the first turn and can shut down while that connection is stalled. - Exercise shared remote-host behavior with prewarming enabled. GitOrigin-RevId: 3cfde5509be7b4aba80112c36c5616b9a9b632c6
177 lines
6.4 KiB
Rust
177 lines
6.4 KiB
Rust
use std::process::Stdio;
|
|
use std::time::Duration;
|
|
|
|
use anyhow::Context;
|
|
use anyhow::Result;
|
|
use app_test_support::MockResponsesConfig;
|
|
use app_test_support::TestAppServer;
|
|
use codex_app_server_protocol::ThreadStartParams;
|
|
use codex_app_server_protocol::TurnStartParams;
|
|
use codex_app_server_protocol::TurnStatus;
|
|
use codex_app_server_protocol::UserInput;
|
|
use codex_features::Feature;
|
|
use core_test_support::responses;
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::json;
|
|
use tempfile::TempDir;
|
|
use tokio::io::AsyncBufReadExt;
|
|
use tokio::io::BufReader;
|
|
use tokio::process::Command;
|
|
use tokio::time::timeout;
|
|
|
|
#[cfg(any(target_os = "macos", windows))]
|
|
const DEFAULT_READ_TIMEOUT: Duration = Duration::from_secs(/*secs*/ 60);
|
|
#[cfg(not(any(target_os = "macos", windows)))]
|
|
const DEFAULT_READ_TIMEOUT: Duration = Duration::from_secs(/*secs*/ 10);
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn app_server_shares_flag_selected_code_mode_host_across_threads() -> Result<()> {
|
|
assert_shared_remote_code_mode_host("ws://127.0.0.1:0").await
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn app_server_shares_flag_selected_grpc_code_mode_host_across_threads() -> Result<()> {
|
|
assert_shared_remote_code_mode_host("grpc://127.0.0.1:0").await
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn app_server_prewarms_flag_selected_code_mode_host_before_first_turn() -> Result<()> {
|
|
let model_server = responses::start_mock_server().await;
|
|
let codex_home = TempDir::new()?;
|
|
MockResponsesConfig::new(&model_server.uri())
|
|
.enable_feature(Feature::CodeModePrewarm)
|
|
.write(codex_home.path())?;
|
|
|
|
let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await?;
|
|
let host_url = format!("ws://{}", listener.local_addr()?);
|
|
let mut app_server = TestAppServer::builder()
|
|
.with_codex_home(codex_home.path())
|
|
.with_args(&["--code-mode-host", &host_url])
|
|
.build_initialized_with_timeout(DEFAULT_READ_TIMEOUT)
|
|
.await?;
|
|
app_server
|
|
.start_thread(ThreadStartParams::default())
|
|
.await?;
|
|
|
|
let (_stalled_connection, _) = timeout(DEFAULT_READ_TIMEOUT, listener.accept())
|
|
.await
|
|
.context("code-mode host was not contacted before the first turn")??;
|
|
let status = timeout(Duration::from_secs(5), app_server.shutdown_gracefully())
|
|
.await
|
|
.context("stalled code-mode prewarm blocked thread shutdown")??;
|
|
assert!(status.success(), "app-server did not exit successfully");
|
|
Ok(())
|
|
}
|
|
|
|
async fn assert_shared_remote_code_mode_host(listen_url: &str) -> Result<()> {
|
|
let host_program = codex_utils_cargo_bin::cargo_bin("codex-code-mode-host")?;
|
|
let mut code_mode_host = Command::new(host_program)
|
|
.args(["--listen", listen_url])
|
|
.stdin(Stdio::null())
|
|
.stdout(Stdio::piped())
|
|
.stderr(Stdio::inherit())
|
|
.kill_on_drop(true)
|
|
.spawn()
|
|
.context("failed to start remote code-mode host")?;
|
|
let stdout = code_mode_host
|
|
.stdout
|
|
.take()
|
|
.context("remote code-mode host stdout was not captured")?;
|
|
let mut lines = BufReader::new(stdout).lines();
|
|
let host_url = timeout(DEFAULT_READ_TIMEOUT, lines.next_line())
|
|
.await
|
|
.context("timed out waiting for remote code-mode host URL")??
|
|
.context("remote code-mode host exited before publishing its URL")?;
|
|
|
|
let model_server = responses::start_mock_server().await;
|
|
let response_mock = responses::mount_sse_sequence(
|
|
&model_server,
|
|
vec![
|
|
responses::sse(vec![
|
|
responses::ev_response_created("resp-1"),
|
|
responses::ev_custom_tool_call(
|
|
"first-remote-cell",
|
|
"exec",
|
|
"text('remote app-server host')",
|
|
),
|
|
responses::ev_completed("resp-1"),
|
|
]),
|
|
responses::sse(vec![
|
|
responses::ev_assistant_message("msg-1", "Done"),
|
|
responses::ev_completed("resp-2"),
|
|
]),
|
|
responses::sse(vec![
|
|
responses::ev_response_created("resp-3"),
|
|
responses::ev_custom_tool_call(
|
|
"second-remote-cell",
|
|
"exec",
|
|
"text('remote app-server host')",
|
|
),
|
|
responses::ev_completed("resp-3"),
|
|
]),
|
|
responses::sse(vec![
|
|
responses::ev_assistant_message("msg-2", "Done"),
|
|
responses::ev_completed("resp-4"),
|
|
]),
|
|
],
|
|
)
|
|
.await;
|
|
|
|
let codex_home = TempDir::new()?;
|
|
MockResponsesConfig::new(&model_server.uri())
|
|
.enable_feature(Feature::CodeModeOnly)
|
|
.enable_feature(Feature::CodeModePrewarm)
|
|
.write(codex_home.path())?;
|
|
let original_config = std::fs::read_to_string(codex_home.path().join("config.toml"))?;
|
|
let mut app_server = TestAppServer::builder()
|
|
.with_codex_home(codex_home.path())
|
|
.with_args(&["--code-mode-host", &host_url])
|
|
.build_initialized_with_timeout(DEFAULT_READ_TIMEOUT)
|
|
.await?;
|
|
|
|
for prompt in ["run the first remote cell", "run the second remote cell"] {
|
|
let thread = app_server
|
|
.start_thread(ThreadStartParams::default())
|
|
.await?;
|
|
let completed = timeout(
|
|
DEFAULT_READ_TIMEOUT,
|
|
app_server.start_turn_and_wait_for_completion(TurnStartParams {
|
|
thread_id: thread.thread.id,
|
|
input: vec![UserInput::Text {
|
|
text: prompt.to_string(),
|
|
text_elements: Vec::new(),
|
|
}],
|
|
..Default::default()
|
|
}),
|
|
)
|
|
.await??;
|
|
|
|
assert_eq!(completed.turn.status, TurnStatus::Completed);
|
|
}
|
|
|
|
let requests = response_mock.requests();
|
|
assert_eq!(requests.len(), 4);
|
|
for (request, call_id) in [
|
|
(&requests[1], "first-remote-cell"),
|
|
(&requests[3], "second-remote-cell"),
|
|
] {
|
|
let output = request.custom_tool_call_output(call_id);
|
|
assert_eq!(
|
|
output["output"]
|
|
.as_array()
|
|
.and_then(|items| items.last())
|
|
.cloned(),
|
|
Some(json!({
|
|
"type": "input_text",
|
|
"text": "remote app-server host",
|
|
}))
|
|
);
|
|
}
|
|
assert_eq!(
|
|
std::fs::read_to_string(codex_home.path().join("config.toml"))?,
|
|
original_config
|
|
);
|
|
|
|
Ok(())
|
|
}
|