Skip to content

Fix: ignore Codex hook events from subagent threads #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aayank13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: ignore Codex hook events from subagent threads #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 32 additions & 10 deletions crates/trodden/src/harness/codex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,14 @@ impl Agent for Codex {
fn event(&self, payload: &str, redactor: &Redactor) -> Result<Option<HookEvent>> {
let input: CodexHookInput =
serde_json::from_str(payload).context("parse the hook payload")?;
let subagent = input.agent_id.is_some();
if input.agent_id.is_some() {
return Ok(None);
}
let moment = match input.hook_event_name.as_str() {
"SessionStart" => Moment::SessionStart,
"UserPromptSubmit" => match &input.prompt {
Some(prompt) if !subagent => Moment::Prompt(prompt.clone()),
_ => return Ok(None),
Some(prompt) => Moment::Prompt(prompt.clone()),
None => return Ok(None),
},
"PostToolUse" => match input.failure(redactor) {
Some(output) => Moment::CommandFailed(output),
Expand Down Expand Up @@ -393,13 +395,33 @@ mod tests {
}

#[test]
fn subagent_prompts_and_odd_payloads_are_ignored() {
assert_eq!(
Payload::moment(
json!({"hook_event_name": "UserPromptSubmit", "prompt": "Review the diff", "agent_id": "a1", "agent_type": "reviewer"})
),
None
);
fn subagent_events_are_left_to_the_parent_session() {
let failing =
"error[E0425]: cannot find value `total` in this scope\n --> src/lib.rs:3:5\n";
let subagent = json!({"session_id": "019f0c00-0000-7000-8000-00000000c41d",
"agent_id": "019f0c00-0000-7000-8000-00000000c41d", "agent_type": "worker"});
let events = [
json!({"hook_event_name": "UserPromptSubmit", "prompt": "Review the diff"}),
json!({"hook_event_name": "PostToolUse", "tool_name": "Bash",
"tool_input": {"command": "cargo test"}, "tool_response": failing}),
json!({"hook_event_name": "Stop", "stop_hook_active": false}),
json!({"hook_event_name": "PreCompact", "trigger": "auto"}),
json!({"hook_event_name": "SessionStart", "source": "startup"}),
json!({"hook_event_name": "SessionEnd", "reason": "other"}),
];

for mut event in events {
assert!(Payload::moment(event.clone()).is_some(), "{event}");
event
.as_object_mut()
.expect("object")
.extend(subagent.as_object().expect("object").clone());
assert_eq!(Payload::moment(event.clone()), None, "{event}");
}
}

#[test]
fn odd_payloads_are_ignored() {
assert_eq!(
Payload::moment(json!({"hook_event_name": "Stop", "cwd": "shop"})),
None
Expand Down
Loading