mirror of
https://github.com/openai/codex.git
synced 2026-04-30 11:21:34 +03:00
1af2a37ada
## 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`
48 lines
1.4 KiB
Rust
48 lines
1.4 KiB
Rust
//! Standard type to use with the `--sandbox` (`-s`) CLI option.
|
|
//!
|
|
//! This mirrors the variants of [`codex_protocol::protocol::SandboxPolicy`], but
|
|
//! without any of the associated data so it can be expressed as a simple flag
|
|
//! on the command-line. Users that need to tweak the advanced options for
|
|
//! `workspace-write` can continue to do so via `-c` overrides or their
|
|
//! `config.toml`.
|
|
|
|
use clap::ValueEnum;
|
|
use codex_protocol::config_types::SandboxMode;
|
|
|
|
#[derive(Clone, Copy, Debug, ValueEnum)]
|
|
#[value(rename_all = "kebab-case")]
|
|
pub enum SandboxModeCliArg {
|
|
ReadOnly,
|
|
WorkspaceWrite,
|
|
DangerFullAccess,
|
|
}
|
|
|
|
impl From<SandboxModeCliArg> for SandboxMode {
|
|
fn from(value: SandboxModeCliArg) -> Self {
|
|
match value {
|
|
SandboxModeCliArg::ReadOnly => SandboxMode::ReadOnly,
|
|
SandboxModeCliArg::WorkspaceWrite => SandboxMode::WorkspaceWrite,
|
|
SandboxModeCliArg::DangerFullAccess => SandboxMode::DangerFullAccess,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
#[test]
|
|
fn maps_cli_args_to_protocol_modes() {
|
|
assert_eq!(SandboxMode::ReadOnly, SandboxModeCliArg::ReadOnly.into());
|
|
assert_eq!(
|
|
SandboxMode::WorkspaceWrite,
|
|
SandboxModeCliArg::WorkspaceWrite.into()
|
|
);
|
|
assert_eq!(
|
|
SandboxMode::DangerFullAccess,
|
|
SandboxModeCliArg::DangerFullAccess.into()
|
|
);
|
|
}
|
|
}
|