openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-25 18:28:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: make hook regressions portable

Browse Source 
Co-authored-by: Codex noreply@openai.com
This commit is contained in:
viyatb-oai
2026-04-07 12:25:14 -07:00
co-authored by Codex noreply@openai.com
parent 025038925d
commit 2b9e25210f
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/hooks/src/events/pre_tool_use.rs
+19 -4
View File
@@ -488,11 +488,26 @@ mod tests {
async fn higher_precedence_block_skips_lower_precedence_handlers() -> std::io::Result<()> {
let temp = tempfile::tempdir()?;
let marker_path = temp.path().join("project-ran");
let (shell_program, shell_args, blocking_command, project_command) = if cfg!(windows) {
(
"cmd".to_string(),
vec!["/C".to_string()],
"echo blocked by policy 1>&2 && exit /b 2".to_string(),
"type nul > project-ran".to_string(),
)
} else {
(
"/bin/sh".to_string(),
vec!["-c".to_string()],
"printf 'blocked by policy' >&2; exit 2".to_string(),
"touch project-ran".to_string(),
)
};
let handlers = vec![
ConfiguredHandler {
event_name: HookEventName::PreToolUse,
matcher: Some("^Bash$".to_string()),
command: "printf 'blocked by policy' >&2; exit 2".to_string(),
command: blocking_command,
timeout_sec: 5,
status_message: None,
source_path: PathBuf::from("/tmp/home/.codex/hooks.json"),
@@ -502,7 +517,7 @@ mod tests {
ConfiguredHandler {
event_name: HookEventName::PreToolUse,
matcher: Some("^Bash$".to_string()),
command: "touch project-ran".to_string(),
command: project_command,
timeout_sec: 5,
status_message: None,
source_path: PathBuf::from("/tmp/project/.codex/hooks.json"),
@@ -514,8 +529,8 @@ mod tests {
let outcome = super::run(
&handlers,
&CommandShell {
program: "/bin/sh".to_string(),
args: vec!["-c".to_string()],
program: shell_program,
args: shell_args,
},
PreToolUseRequest {
session_id: ThreadId::new(),