openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-01 19:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate watchdog helper completion forwarding

Browse Source
This commit is contained in:
Friel
2026-04-04 00:20:24 +00:00
parent 68b73e5eb9
commit 1c2469ada4
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/agent/control.rs
+5 -17
View File
@@ -1106,23 +1106,11 @@ impl AgentControl {
.owner_for_active_helper(child_thread_id)
.await
{
let helper_sent_input = match control.upgrade() {
Ok(state) => state
.get_thread(child_thread_id)
.await
.ok()
.map(|thread| thread.last_completed_turn_used_agent_send_input())
.unwrap_or(false),
Err(_) => false,
};
if !helper_sent_input {
let fallback_message = watchdog_fallback_message_from_status(&status);
if let Some(message) = fallback_message {
let _ = control
.send_watchdog_wakeup(owner_thread_id, child_thread_id, message)
.await;
}
}
// The watchdog manager owns helper fallback delivery and cleanup.
// Returning here avoids duplicate `agent_inbox` injections for one helper
// completion: the generic child completion watcher and the watchdog manager
// should not both forward the same helper's final assistant message.
let _ = owner_thread_id;
return;
}