Merge origin/main into rhan/surface-updates (resolve #14374 conflicts)

2026-04-30 01:16:54 +00:00 · 2026-03-13 18:36:03 -07:00
parent e9bf09ba09 b859a98e0f
commit 66c0851437
541 changed files with 26801 additions and 24881 deletions
--- a/codex-rs/core/tests/suite/compact.rs
+++ b/codex-rs/core/tests/suite/compact.rs
@@ -3015,6 +3015,7 @@ async fn snapshot_request_shape_pre_turn_compaction_including_incoming_user_mess
        .submit(Op::OverrideTurnContext {
            cwd: Some(PathBuf::from(PRETURN_CONTEXT_DIFF_CWD)),
            approval_policy: None,
+            approvals_reviewer: None,
            sandbox_policy: None,
            windows_sandbox_level: None,
            model: None,