mirror of
https://github.com/openai/codex.git
synced 2026-05-05 05:42:33 +03:00
0c8a36676a
## Why PR #13783 moved the `codex.rs` unit tests into `codex_tests.rs`. This applies the same extraction pattern across the rest of `codex-rs/core` so the production modules stay focused on runtime code instead of large inline test blocks. Keeping the tests in sibling files also makes follow-up edits easier to review because product changes no longer have to share a file with hundreds or thousands of lines of test scaffolding. ## What changed - replaced each inline `mod tests { ... }` in `codex-rs/core/src/**` with a path-based module declaration - moved each extracted unit test module into a sibling `*_tests.rs` file, using `mod_tests.rs` for `mod.rs` modules - preserved the existing `cfg(...)` guards and module-local structure so the refactor remains structural rather than behavioral ## Testing - `cargo test -p codex-core --lib` (`1653 passed; 0 failed; 5 ignored`) - `just fix -p codex-core` - `cargo fmt --check` - `cargo shear`
43 lines
1.4 KiB
Rust
43 lines
1.4 KiB
Rust
use crate::bash::extract_bash_command;
|
|
use crate::bash::parse_shell_lc_plain_commands;
|
|
use crate::powershell::extract_powershell_command;
|
|
|
|
const CANONICAL_BASH_SCRIPT_PREFIX: &str = "__codex_shell_script__";
|
|
const CANONICAL_POWERSHELL_SCRIPT_PREFIX: &str = "__codex_powershell_script__";
|
|
|
|
/// Canonicalize command argv for approval-cache matching.
|
|
///
|
|
/// This keeps approval decisions stable across wrapper-path differences (for
|
|
/// example `/bin/bash -lc` vs `bash -lc`) and across shell wrapper tools while
|
|
/// preserving exact script text for complex scripts where we cannot safely
|
|
/// recover a tokenized command sequence.
|
|
pub(crate) fn canonicalize_command_for_approval(command: &[String]) -> Vec<String> {
|
|
if let Some(commands) = parse_shell_lc_plain_commands(command)
|
|
&& let [single_command] = commands.as_slice()
|
|
{
|
|
return single_command.clone();
|
|
}
|
|
|
|
if let Some((_shell, script)) = extract_bash_command(command) {
|
|
let shell_mode = command.get(1).cloned().unwrap_or_default();
|
|
return vec![
|
|
CANONICAL_BASH_SCRIPT_PREFIX.to_string(),
|
|
shell_mode,
|
|
script.to_string(),
|
|
];
|
|
}
|
|
|
|
if let Some((_shell, script)) = extract_powershell_command(command) {
|
|
return vec![
|
|
CANONICAL_POWERSHELL_SCRIPT_PREFIX.to_string(),
|
|
script.to_string(),
|
|
];
|
|
}
|
|
|
|
command.to_vec()
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "command_canonicalization_tests.rs"]
|
|
mod tests;
|