mirror of
https://github.com/openai/codex.git
synced 2026-04-24 14:45:27 +00:00
aa2403e2eb
## Why `codex-core` was re-exporting APIs owned by sibling `codex-*` crates, which made downstream crates depend on `codex-core` as a proxy module instead of the actual owner crate. Removing those forwards makes crate boundaries explicit and lets leaf crates drop unnecessary `codex-core` dependencies. In this PR, this reduces the dependency on `codex-core` to `codex-login` in the following files: ``` codex-rs/backend-client/Cargo.toml codex-rs/mcp-server/tests/common/Cargo.toml ``` ## What - Remove `codex-rs/core/src/lib.rs` re-exports for symbols owned by `codex-login`, `codex-mcp`, `codex-rollout`, `codex-analytics`, `codex-protocol`, `codex-shell-command`, `codex-sandboxing`, `codex-tools`, and `codex-utils-path`. - Delete the `default_client` forwarding shim in `codex-rs/core`. - Update in-crate and downstream callsites to import directly from the owning `codex-*` crate. - Add direct Cargo dependencies where callsites now target the owner crate, and remove `codex-core` from `codex-rs/backend-client`.
55 lines
1.9 KiB
Rust
55 lines
1.9 KiB
Rust
#![cfg(not(target_os = "windows"))]
|
|
#![allow(clippy::expect_used, clippy::unwrap_used)]
|
|
|
|
use codex_login::default_client::CODEX_INTERNAL_ORIGINATOR_OVERRIDE_ENV_VAR;
|
|
use core_test_support::responses;
|
|
use core_test_support::test_codex_exec::test_codex_exec;
|
|
use wiremock::matchers::header;
|
|
|
|
/// Verify that when the server reports an error, `codex-exec` exits with a
|
|
/// non-zero status code so automation can detect failures.
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn send_codex_exec_originator() -> anyhow::Result<()> {
|
|
let test = test_codex_exec();
|
|
|
|
let server = responses::start_mock_server().await;
|
|
let body = responses::sse(vec![
|
|
responses::ev_response_created("response_1"),
|
|
responses::ev_assistant_message("response_1", "Hello, world!"),
|
|
responses::ev_completed("response_1"),
|
|
]);
|
|
responses::mount_sse_once_match(&server, header("Originator", "codex_exec"), body).await;
|
|
|
|
test.cmd_with_server(&server)
|
|
.env_remove(CODEX_INTERNAL_ORIGINATOR_OVERRIDE_ENV_VAR)
|
|
.arg("--skip-git-repo-check")
|
|
.arg("tell me something")
|
|
.assert()
|
|
.code(0);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn supports_originator_override() -> anyhow::Result<()> {
|
|
let test = test_codex_exec();
|
|
|
|
let server = responses::start_mock_server().await;
|
|
let body = responses::sse(vec![
|
|
responses::ev_response_created("response_1"),
|
|
responses::ev_assistant_message("response_1", "Hello, world!"),
|
|
responses::ev_completed("response_1"),
|
|
]);
|
|
responses::mount_sse_once_match(&server, header("Originator", "codex_exec_override"), body)
|
|
.await;
|
|
|
|
test.cmd_with_server(&server)
|
|
.env("CODEX_INTERNAL_ORIGINATOR_OVERRIDE", "codex_exec_override")
|
|
.arg("--skip-git-repo-check")
|
|
.arg("tell me something")
|
|
.assert()
|
|
.code(0);
|
|
|
|
Ok(())
|
|
}
|