mirror of
https://github.com/openai/codex.git
synced 2026-04-29 08:56:38 +00:00
## Why
`codex-rs/core/src/lib.rs` re-exported a broad set of types and modules
from `codex-protocol` and `codex-shell-command`. That made it easy for
workspace crates to import those APIs through `codex-core`, which in
turn hides dependency edges and makes it harder to reduce compile-time
coupling over time.
This change removes those public re-exports so call sites must import
from the source crates directly. Even when a crate still depends on
`codex-core` today, this makes dependency boundaries explicit and
unblocks future work to drop `codex-core` dependencies where possible.
## What Changed
- Removed public re-exports from `codex-rs/core/src/lib.rs` for:
- `codex_protocol::protocol` and related protocol/model types (including
`InitialHistory`)
- `codex_protocol::config_types` (`protocol_config_types`)
- `codex_shell_command::{bash, is_dangerous_command, is_safe_command,
parse_command, powershell}`
- Migrated workspace Rust call sites to import directly from:
- `codex_protocol::protocol`
- `codex_protocol::config_types`
- `codex_protocol::models`
- `codex_shell_command`
- Added explicit `Cargo.toml` dependencies (`codex-protocol` /
`codex-shell-command`) in crates that now import those crates directly.
- Kept `codex-core` internal modules compiling by using `pub(crate)`
aliases in `core/src/lib.rs` (internal-only, not part of the public
API).
- Updated the two utility crates that can already drop a `codex-core`
dependency edge entirely:
- `codex-utils-approval-presets`
- `codex-utils-cli`
## Verification
- `cargo test -p codex-utils-approval-presets`
- `cargo test -p codex-utils-cli`
- `cargo check --workspace --all-targets`
- `just clippy`
81 lines
2.9 KiB
Rust
81 lines
2.9 KiB
Rust
#![cfg(not(target_os = "windows"))]
|
||
|
||
use std::os::unix::fs::PermissionsExt;
|
||
|
||
use codex_protocol::protocol::EventMsg;
|
||
use codex_protocol::protocol::Op;
|
||
use codex_protocol::user_input::UserInput;
|
||
use core_test_support::fs_wait;
|
||
use core_test_support::responses;
|
||
use core_test_support::skip_if_no_network;
|
||
use core_test_support::test_codex::TestCodex;
|
||
use core_test_support::test_codex::test_codex;
|
||
use core_test_support::wait_for_event;
|
||
use pretty_assertions::assert_eq;
|
||
use serde_json::Value;
|
||
use serde_json::json;
|
||
use tempfile::TempDir;
|
||
|
||
use responses::ev_assistant_message;
|
||
use responses::ev_completed;
|
||
use responses::sse;
|
||
use responses::start_mock_server;
|
||
use std::time::Duration;
|
||
|
||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||
#[ignore = "flaky on ubuntu-24.04-arm - aarch64-unknown-linux-gnu"]
|
||
// The notify script gets far enough to create (and therefore surface) the file,
|
||
// but hasn’t flushed the JSON yet. Reading an empty file produces EOF while parsing
|
||
// a value at line 1 column 0. May be caused by a slow runner.
|
||
async fn summarize_context_three_requests_and_instructions() -> anyhow::Result<()> {
|
||
skip_if_no_network!(Ok(()));
|
||
|
||
let server = start_mock_server().await;
|
||
|
||
let sse1 = sse(vec![ev_assistant_message("m1", "Done"), ev_completed("r1")]);
|
||
|
||
responses::mount_sse_once(&server, sse1).await;
|
||
|
||
let notify_dir = TempDir::new()?;
|
||
// write a script to the notify that touches a file next to it
|
||
let notify_script = notify_dir.path().join("notify.sh");
|
||
std::fs::write(
|
||
¬ify_script,
|
||
r#"#!/bin/bash
|
||
set -e
|
||
echo -n "${@: -1}" > $(dirname "${0}")/notify.txt"#,
|
||
)?;
|
||
std::fs::set_permissions(¬ify_script, std::fs::Permissions::from_mode(0o755))?;
|
||
|
||
let notify_file = notify_dir.path().join("notify.txt");
|
||
let notify_script_str = notify_script.to_str().unwrap().to_string();
|
||
|
||
let TestCodex { codex, .. } = test_codex()
|
||
.with_config(move |cfg| cfg.notify = Some(vec![notify_script_str]))
|
||
.build(&server)
|
||
.await?;
|
||
|
||
// 1) Normal user input – should hit server once.
|
||
codex
|
||
.submit(Op::UserInput {
|
||
items: vec![UserInput::Text {
|
||
text: "hello world".into(),
|
||
text_elements: Vec::new(),
|
||
}],
|
||
final_output_json_schema: None,
|
||
})
|
||
.await?;
|
||
wait_for_event(&codex, |ev| matches!(ev, EventMsg::TurnComplete(_))).await;
|
||
|
||
// We fork the notify script, so we need to wait for it to write to the file.
|
||
fs_wait::wait_for_path_exists(¬ify_file, Duration::from_secs(5)).await?;
|
||
let notify_payload_raw = tokio::fs::read_to_string(¬ify_file).await?;
|
||
let payload: Value = serde_json::from_str(¬ify_payload_raw)?;
|
||
|
||
assert_eq!(payload["type"], json!("agent-turn-complete"));
|
||
assert_eq!(payload["input-messages"], json!(["hello world"]));
|
||
assert_eq!(payload["last-assistant-message"], json!("Done"));
|
||
|
||
Ok(())
|
||
}
|