clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-28 08:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex: stabilize queued message timer ordering (#17380)

Browse Source
This commit is contained in:
Eric Traut
2026-04-10 17:58:22 -07:00
parent b19709c649
commit b4f738def9
4 changed files with 88 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
codex-rs/core/tests/suite/timers.rs
View File

@@ -326,11 +326,6 @@ async fn queued_message_runs_after_idle_recurring_timer() -> Result<()> {
ev_assistant_message("msg-2", "queued turn"),
ev_completed("resp-2"),
]),
sse(vec![
ev_response_created("resp-3"),
ev_assistant_message("msg-3", "next timer turn"),
ev_completed("resp-3"),
]),
],
)
.await;
@@ -351,19 +346,8 @@ async fn queued_message_runs_after_idle_recurring_timer() -> Result<()> {
});
let test = builder.build(&server).await?;
let db = test.codex.state_db().expect("state db enabled");
let thread_id = test.session_configured.session_id.to_string();
db.create_thread_message(&codex_state::ThreadMessageCreateParams::new(
thread_id,
"external".to_string(),
"queued hello".to_string(),
/*instructions*/ None,
"{}".to_string(),
TimerDelivery::AfterTurn.as_str().to_string(),
Utc::now().timestamp(),
))
.await?;
test.codex
let timer = test
.codex
.create_timer(
ThreadTimerTrigger::Delay {
seconds: 0,
@@ -378,6 +362,26 @@ async fn queued_message_runs_after_idle_recurring_timer() -> Result<()> {
)
.await
.map_err(|err| anyhow!("{err}"))?;
wait_for_event_with_timeout(
&test.codex,
|event| match event {
EventMsg::InjectedMessage(event) => event.source == format!("timer {}", timer.id),
_ => false,
},
Duration::from_secs(20),
)
.await;
let thread_id = test.session_configured.session_id.to_string();
db.create_thread_message(&codex_state::ThreadMessageCreateParams::new(
thread_id,
"external".to_string(),
"queued hello".to_string(),
/*instructions*/ None,
"{}".to_string(),
TimerDelivery::AfterTurn.as_str().to_string(),
Utc::now().timestamp(),
))
.await?;
wait_for_event_with_timeout(
&test.codex,
@@ -385,6 +389,22 @@ async fn queued_message_runs_after_idle_recurring_timer() -> Result<()> {
Duration::from_secs(20),
)
.await;
assert!(
test.codex
.delete_timer(&timer.id)
.await
.map_err(|err| anyhow!("{err}"))?,
"test should delete the idle recurring timer before it can schedule another turn"
);
wait_for_event_with_timeout(
&test.codex,
|event| match event {
EventMsg::InjectedMessage(event) => event.source == "external",
_ => false,
},
Duration::from_secs(20),
)
.await;
wait_for_event_with_timeout(
&test.codex,
|event| matches!(event, EventMsg::TurnComplete(_)),