clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-29 17:06:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: races in end of turn (#16566)

Browse Source
This commit is contained in:
jif-oai
2026-04-02 15:55:55 +02:00
committed by GitHub
parent bd50496411
commit e47ed5e57f
5 changed files with 72 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
codex-rs/core/src/codex.rs
View File

@@ -293,6 +293,7 @@ use crate::shell_snapshot::ShellSnapshot;
use crate::skills_watcher::SkillsWatcher;
use crate::skills_watcher::SkillsWatcherEvent;
use crate::state::ActiveTurn;
use crate::state::MailboxDeliveryPhase;
use crate::state::SessionServices;
use crate::state::SessionState;
use crate::tasks::GhostSnapshotTask;
@@ -4046,6 +4047,16 @@ impl Session {
}
pub(crate) async fn defer_mailbox_delivery_to_next_turn(&self, sub_id: &str) {
self.set_mailbox_delivery_phase(sub_id, MailboxDeliveryPhase::NextTurn)
.await;
}
pub(crate) async fn accept_mailbox_delivery_for_current_turn(&self, sub_id: &str) {
self.set_mailbox_delivery_phase(sub_id, MailboxDeliveryPhase::CurrentTurn)
.await;
}
async fn set_mailbox_delivery_phase(&self, sub_id: &str, phase: MailboxDeliveryPhase) {
let turn_state = {
let active = self.active_turn.lock().await;
active.as_ref().and_then(|active_turn| {
@@ -4058,10 +4069,7 @@ impl Session {
let Some(turn_state) = turn_state else {
return;
};
turn_state
.lock()
.await
.defer_mailbox_delivery_to_next_turn();
turn_state.lock().await.set_mailbox_delivery_phase(phase);
}
pub(crate) fn subscribe_mailbox_seq(&self) -> watch::Receiver<u64> {