mirror of
https://github.com/openai/codex.git
synced 2026-05-02 18:37:01 +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`
156 lines
5.2 KiB
Rust
156 lines
5.2 KiB
Rust
#![cfg(not(target_os = "windows"))]
|
|
|
|
use anyhow::Ok;
|
|
use codex_app_server_protocol::ConfigLayerSource;
|
|
use codex_core::config_loader::ConfigLayerEntry;
|
|
use codex_core::config_loader::ConfigLayerStack;
|
|
use codex_core::config_loader::ConfigRequirements;
|
|
use codex_core::config_loader::ConfigRequirementsToml;
|
|
use codex_core::features::Feature;
|
|
use codex_protocol::protocol::DeprecationNoticeEvent;
|
|
use codex_protocol::protocol::EventMsg;
|
|
use core_test_support::responses::start_mock_server;
|
|
use core_test_support::skip_if_no_network;
|
|
use core_test_support::test_absolute_path;
|
|
use core_test_support::test_codex::TestCodex;
|
|
use core_test_support::test_codex::test_codex;
|
|
use core_test_support::wait_for_event_match;
|
|
use pretty_assertions::assert_eq;
|
|
use std::collections::BTreeMap;
|
|
use toml::Value as TomlValue;
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn emits_deprecation_notice_for_legacy_feature_flag() -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let server = start_mock_server().await;
|
|
|
|
let mut builder = test_codex().with_config(|config| {
|
|
config.features.enable(Feature::UnifiedExec);
|
|
config
|
|
.features
|
|
.record_legacy_usage_force("use_experimental_unified_exec_tool", Feature::UnifiedExec);
|
|
config.use_experimental_unified_exec_tool = true;
|
|
});
|
|
|
|
let TestCodex { codex, .. } = builder.build(&server).await?;
|
|
|
|
let notice = wait_for_event_match(&codex, |event| match event {
|
|
EventMsg::DeprecationNotice(ev) => Some(ev.clone()),
|
|
_ => None,
|
|
})
|
|
.await;
|
|
|
|
let DeprecationNoticeEvent { summary, details } = notice;
|
|
assert_eq!(
|
|
summary,
|
|
"`use_experimental_unified_exec_tool` is deprecated. Use `[features].unified_exec` instead."
|
|
.to_string(),
|
|
);
|
|
assert_eq!(
|
|
details.as_deref(),
|
|
Some(
|
|
"Enable it with `--enable unified_exec` or `[features].unified_exec` in config.toml. See https://developers.openai.com/codex/config-basic#feature-flags for details."
|
|
),
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn emits_deprecation_notice_for_experimental_instructions_file() -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let server = start_mock_server().await;
|
|
|
|
let mut builder = test_codex().with_config(|config| {
|
|
let mut table = toml::map::Map::new();
|
|
table.insert(
|
|
"experimental_instructions_file".to_string(),
|
|
TomlValue::String("legacy.md".to_string()),
|
|
);
|
|
let config_layer = ConfigLayerEntry::new(
|
|
ConfigLayerSource::User {
|
|
file: test_absolute_path("/tmp/config.toml"),
|
|
},
|
|
TomlValue::Table(table),
|
|
);
|
|
let config_layer_stack = ConfigLayerStack::new(
|
|
vec![config_layer],
|
|
ConfigRequirements::default(),
|
|
ConfigRequirementsToml::default(),
|
|
)
|
|
.expect("build config layer stack");
|
|
config.config_layer_stack = config_layer_stack;
|
|
});
|
|
|
|
let TestCodex { codex, .. } = builder.build(&server).await?;
|
|
|
|
let notice = wait_for_event_match(&codex, |event| match event {
|
|
EventMsg::DeprecationNotice(ev)
|
|
if ev.summary.contains("experimental_instructions_file") =>
|
|
{
|
|
Some(ev.clone())
|
|
}
|
|
_ => None,
|
|
})
|
|
.await;
|
|
|
|
let DeprecationNoticeEvent { summary, details } = notice;
|
|
assert_eq!(
|
|
summary,
|
|
"`experimental_instructions_file` is deprecated and ignored. Use `model_instructions_file` instead."
|
|
.to_string(),
|
|
);
|
|
assert_eq!(
|
|
details.as_deref(),
|
|
Some(
|
|
"Move the setting to `model_instructions_file` in config.toml (or under a profile) to load instructions from a file."
|
|
),
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn emits_deprecation_notice_for_web_search_feature_flag_values() -> anyhow::Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
for enabled in [true, false] {
|
|
let server = start_mock_server().await;
|
|
|
|
let mut builder = test_codex().with_config(move |config| {
|
|
let mut entries = BTreeMap::new();
|
|
entries.insert("web_search_request".to_string(), enabled);
|
|
config.features.apply_map(&entries);
|
|
});
|
|
|
|
let TestCodex { codex, .. } = builder.build(&server).await?;
|
|
|
|
let notice = wait_for_event_match(&codex, |event| match event {
|
|
EventMsg::DeprecationNotice(ev)
|
|
if ev.summary.contains("[features].web_search_request") =>
|
|
{
|
|
Some(ev.clone())
|
|
}
|
|
_ => None,
|
|
})
|
|
.await;
|
|
|
|
let DeprecationNoticeEvent { summary, details } = notice;
|
|
assert_eq!(
|
|
summary,
|
|
"`[features].web_search_request` is deprecated because web search is enabled by default."
|
|
.to_string(),
|
|
);
|
|
assert_eq!(
|
|
details.as_deref(),
|
|
Some(
|
|
"Set `web_search` to `\"live\"`, `\"cached\"`, or `\"disabled\"` at the top level (or under a profile) in config.toml if you want to override it."
|
|
),
|
|
);
|
|
}
|
|
|
|
Ok(())
|
|
}
|