Merge branch 'main' into rhan/surface-updates

2026-04-29 17:06:51 +00:00 · 2026-03-19 11:23:44 -07:00
parent 6bebd3f3fb 267499bed8
commit 09f6d84504
489 changed files with 37167 additions and 8086 deletions
--- a/codex-rs/app-server/tests/suite/v2/thread_resume.rs
+++ b/codex-rs/app-server/tests/suite/v2/thread_resume.rs
@@ -450,6 +450,7 @@ async fn thread_resume_and_read_interrupt_incomplete_rollout_turn_when_thread_is
            "payload": serde_json::to_value(EventMsg::AgentMessage(AgentMessageEvent {
                message: "Still running".to_string(),
                phase: None,
+                memory_citation: None,
            }))?,
        })
        .to_string(),