mirror of
https://github.com/openai/codex.git
synced 2026-10-20 17:38:45 +00:00
Remove the patched zsh shell execution backend (#52160)
## What changed - Use the standard shell executor and remove the zsh fork escalation runtime, `codex-execve-wrapper`, and `shell-escalation` crate. - Ignore `shell_zsh_fork` and `unified_exec_zsh_fork`, emit migration notices for legacy configuration, and warn when ignoring managed requirements for these flags. - Keep the active session's `apply_patch` alias directory readable under restricted filesystem permissions. ## Testing Add coverage for legacy configuration startup and shell execution, migration notice rendering, active alias directory selection, and nested `apply_patch` execution while other files in `CODEX_HOME` remain unreadable. GitOrigin-RevId: 43af461fea32b4980550ee7237effd2bc0646ed8
This commit is contained in:
@@ -664,7 +664,6 @@ fn config_overrides_from_interactive(
|
||||
.flatten(),
|
||||
codex_self_exe: arg0_paths.codex_self_exe.clone(),
|
||||
codex_linux_sandbox_exe: arg0_paths.codex_linux_sandbox_exe.clone(),
|
||||
main_execve_wrapper_exe: arg0_paths.main_execve_wrapper_exe.clone(),
|
||||
show_raw_agent_reasoning: interactive.oss.then_some(true),
|
||||
additional_writable_roots: interactive.add_dir.clone(),
|
||||
..Default::default()
|
||||
@@ -3229,7 +3228,7 @@ mod tests {
|
||||
let arg0_paths = Arg0DispatchPaths {
|
||||
codex_self_exe: Some(PathBuf::from("/bin/codex")),
|
||||
codex_linux_sandbox_exe: Some(PathBuf::from("/bin/codex-linux-sandbox")),
|
||||
main_execve_wrapper_exe: Some(PathBuf::from("/bin/codex-execve-wrapper")),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let overrides = config_overrides_from_interactive(&interactive, &arg0_paths);
|
||||
@@ -3249,10 +3248,6 @@ mod tests {
|
||||
overrides.codex_linux_sandbox_exe,
|
||||
arg0_paths.codex_linux_sandbox_exe
|
||||
);
|
||||
assert_eq!(
|
||||
overrides.main_execve_wrapper_exe,
|
||||
arg0_paths.main_execve_wrapper_exe
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -100,11 +100,6 @@ pub(super) fn sandbox_check(config: &Config, arg0_paths: &Arg0DispatchPaths) ->
|
||||
"codex-linux-sandbox helper",
|
||||
arg0_paths.codex_linux_sandbox_exe.as_deref(),
|
||||
);
|
||||
push_path_detail(
|
||||
&mut details,
|
||||
"execve wrapper helper",
|
||||
arg0_paths.main_execve_wrapper_exe.as_deref(),
|
||||
);
|
||||
|
||||
let mut status = CheckStatus::Ok;
|
||||
let mut summary = "sandbox configuration is readable".to_string();
|
||||
|
||||
@@ -2027,7 +2027,6 @@ async fn run_debug_prompt_input_command(
|
||||
cwd: shared.cwd,
|
||||
codex_self_exe: arg0_paths.codex_self_exe,
|
||||
codex_linux_sandbox_exe: arg0_paths.codex_linux_sandbox_exe,
|
||||
main_execve_wrapper_exe: arg0_paths.main_execve_wrapper_exe,
|
||||
show_raw_agent_reasoning: shared.oss.then_some(true),
|
||||
ephemeral: Some(true),
|
||||
bypass_hook_trust: shared.bypass_hook_trust.then_some(true),
|
||||
|
||||
Reference in New Issue
Block a user