diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index 0af621faa6..bd74d83ad6 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -2284,7 +2284,6 @@ version = "0.0.0" dependencies = [ "anyhow", "chrono", - "codex-app-server-protocol", "codex-config", "codex-protocol", "codex-utils-absolute-path", diff --git a/codex-rs/app-server/src/message_processor.rs b/codex-rs/app-server/src/message_processor.rs index 5a443c6820..6221cebee5 100644 --- a/codex-rs/app-server/src/message_processor.rs +++ b/codex-rs/app-server/src/message_processor.rs @@ -752,7 +752,7 @@ impl MessageProcessor { | ClientRequest::TurnSteer { request_id, .. } = &codex_request { self.analytics_events_client.track_request( - connection_request_id.connection_id.0, + connection_id.0, request_id.clone(), codex_request.clone(), ); diff --git a/codex-rs/hooks/Cargo.toml b/codex-rs/hooks/Cargo.toml index fb25c15e39..d4d2f9cbc7 100644 --- a/codex-rs/hooks/Cargo.toml +++ b/codex-rs/hooks/Cargo.toml @@ -15,7 +15,6 @@ workspace = true [dependencies] anyhow = { workspace = true } chrono = { workspace = true, features = ["serde"] } -codex-app-server-protocol = { workspace = true } codex-config = { workspace = true } codex-protocol = { workspace = true } codex-utils-absolute-path = { workspace = true } diff --git a/codex-rs/hooks/src/events/session_start.rs b/codex-rs/hooks/src/events/session_start.rs index 5b1bf7c08e..ad6a17f66e 100644 --- a/codex-rs/hooks/src/events/session_start.rs +++ b/codex-rs/hooks/src/events/session_start.rs @@ -397,15 +397,15 @@ mod tests { ( "cmd.exe".to_string(), vec!["/D".to_string(), "/C".to_string()], - r#"echo {^"continue^":false,^"stopReason^":^"pause^",^"hookSpecificOutput^":{^"hookEventName^":^"SessionStart^",^"additionalContext^":^"trusted context^"}}"#.to_string(), - "type nul > project-ran && echo project context".to_string(), + r#"more > nul && echo {^"continue^":false,^"stopReason^":^"pause^",^"hookSpecificOutput^":{^"hookEventName^":^"SessionStart^",^"additionalContext^":^"trusted context^"}}"#.to_string(), + "more > nul && type nul > project-ran && echo project context".to_string(), ) } else { ( "/bin/sh".to_string(), vec!["-c".to_string()], - "printf '%s' '{\"continue\":false,\"stopReason\":\"pause\",\"hookSpecificOutput\":{\"hookEventName\":\"SessionStart\",\"additionalContext\":\"trusted context\"}}'".to_string(), - "touch project-ran && printf 'project context'".to_string(), + "cat >/dev/null; printf '%s' '{\"continue\":false,\"stopReason\":\"pause\",\"hookSpecificOutput\":{\"hookEventName\":\"SessionStart\",\"additionalContext\":\"trusted context\"}}'".to_string(), + "cat >/dev/null; touch project-ran && printf 'project context'".to_string(), ) }; let handlers = vec![ diff --git a/codex-rs/hooks/src/events/user_prompt_submit.rs b/codex-rs/hooks/src/events/user_prompt_submit.rs index 8795d931a2..74901e6474 100644 --- a/codex-rs/hooks/src/events/user_prompt_submit.rs +++ b/codex-rs/hooks/src/events/user_prompt_submit.rs @@ -454,15 +454,15 @@ mod tests { ( "cmd.exe".to_string(), vec!["/D".to_string(), "/C".to_string()], - r#"echo {^"decision^":^"block^",^"reason^":^"slow down^",^"hookSpecificOutput^":{^"hookEventName^":^"UserPromptSubmit^",^"additionalContext^":^"trusted context^"}}"#.to_string(), - "type nul > project-ran && echo project context".to_string(), + r#"more > nul && echo {^"decision^":^"block^",^"reason^":^"slow down^",^"hookSpecificOutput^":{^"hookEventName^":^"UserPromptSubmit^",^"additionalContext^":^"trusted context^"}}"#.to_string(), + "more > nul && type nul > project-ran && echo project context".to_string(), ) } else { ( "/bin/sh".to_string(), vec!["-c".to_string()], - "printf '%s' '{\"decision\":\"block\",\"reason\":\"slow down\",\"hookSpecificOutput\":{\"hookEventName\":\"UserPromptSubmit\",\"additionalContext\":\"trusted context\"}}'".to_string(), - "touch project-ran && printf 'project context'".to_string(), + "cat >/dev/null; printf '%s' '{\"decision\":\"block\",\"reason\":\"slow down\",\"hookSpecificOutput\":{\"hookEventName\":\"UserPromptSubmit\",\"additionalContext\":\"trusted context\"}}'".to_string(), + "cat >/dev/null; touch project-ran && printf 'project context'".to_string(), ) }; let handlers = vec![