mirror of
https://github.com/openai/codex.git
synced 2026-09-11 20:36:49 +00:00
dbe2f6d528
## Why Executor compatibility checks need a build identity that distinguishes commits and compiler targets independently of the package release version. ## What changed - Add optional `providerId` to exec-server environment metadata, cached at startup and returned by initialization and `environment/info`. - Derive the ID as SHA-256 of `git:<lowercase commit>:<target>`. It identifies a standard build configuration, not exact executable bytes, and is omitted when the commit stamp or target is unavailable or invalid. - Embed the compiler target in `BuildInfo`, preserve compatibility with historical metadata without a target, and stamp Cargo release builds with `STABLE_GIT_COMMIT`. - Group Bazel build-script argument files under one `--arg-file` flag to reduce Windows command-line length while preserving file order. ## Testing Add deterministic build-ID vectors across targets, commit normalization and invalid input coverage, and historical metadata compatibility tests. Extend exec-server coverage for metadata caching and ensure runtime environment overrides cannot replace the executor's build identity. GitOrigin-RevId: 125a18c23de7ad006571940ba305836376c983f4
93 lines
3.0 KiB
Rust
93 lines
3.0 KiB
Rust
#![cfg(unix)]
|
|
|
|
mod common;
|
|
|
|
use codex_exec_server::Environment;
|
|
use codex_exec_server::EnvironmentStatus;
|
|
use codex_exec_server::EnvironmentStatusKind;
|
|
use codex_exec_server::InitializeParams;
|
|
use codex_exec_server::InitializeResponse;
|
|
use codex_exec_server_protocol::JSONRPCMessage;
|
|
use codex_exec_server_protocol::JSONRPCResponse;
|
|
use common::exec_server::exec_server;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn exec_server_serves_readyz_alongside_websocket_endpoint() -> anyhow::Result<()> {
|
|
let mut server = exec_server().await?;
|
|
let http_base_url = server
|
|
.websocket_url()
|
|
.strip_prefix("ws://")
|
|
.expect("websocket URL should use ws://");
|
|
|
|
let client = codex_http_client::HttpClientBuilder::new().build_direct()?;
|
|
let response = client
|
|
.get(format!("http://{http_base_url}/readyz"))
|
|
.send()
|
|
.await?;
|
|
assert_eq!(response.status(), http::StatusCode::OK);
|
|
|
|
server.shutdown().await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn remote_environment_fetches_info_from_exec_server() -> anyhow::Result<()> {
|
|
let mut server = exec_server().await?;
|
|
let environment = Environment::create_for_tests(Some(server.websocket_url().to_string()))?;
|
|
assert!(environment.is_remote());
|
|
|
|
let remote_info = environment.info().await?;
|
|
let mut local_info = Environment::default_for_tests().info().await?;
|
|
// Only the remote executor advertises its optional build identity.
|
|
local_info.provider_id = remote_info.provider_id.clone();
|
|
assert_eq!(remote_info, local_info);
|
|
|
|
server.shutdown().await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn exec_server_reports_environment_status_over_websocket() -> anyhow::Result<()> {
|
|
let mut server = exec_server().await?;
|
|
let initialize_id = server
|
|
.send_request(
|
|
"initialize",
|
|
serde_json::to_value(InitializeParams {
|
|
client_name: "exec-server-health-test".to_string(),
|
|
resume_session_id: None,
|
|
})?,
|
|
)
|
|
.await?;
|
|
let JSONRPCMessage::Response(JSONRPCResponse {
|
|
id,
|
|
result: initialize_result,
|
|
}) = server.next_event().await?
|
|
else {
|
|
panic!("expected initialize response");
|
|
};
|
|
assert_eq!(id, initialize_id);
|
|
let _: InitializeResponse = serde_json::from_value(initialize_result)?;
|
|
server
|
|
.send_notification("initialized", serde_json::json!({}))
|
|
.await?;
|
|
|
|
let status_id = server
|
|
.send_request("environment/status", serde_json::json!({}))
|
|
.await?;
|
|
let JSONRPCMessage::Response(JSONRPCResponse { id, result }) = server.next_event().await?
|
|
else {
|
|
panic!("expected environment status response");
|
|
};
|
|
assert_eq!(id, status_id);
|
|
assert_eq!(
|
|
serde_json::from_value::<EnvironmentStatus>(result)?,
|
|
EnvironmentStatus {
|
|
status: EnvironmentStatusKind::Ready,
|
|
}
|
|
);
|
|
|
|
server.shutdown().await?;
|
|
Ok(())
|
|
}
|