Merge origin/main into rhan/surface-updates and resolve guardian tests conflict

codex-rs/core/tests/suite/compact_remote.rs

@@ -61,6 +61,7 @@ fn summary_with_prefix(summary: &str) -> String {
 
 fn context_snapshot_options() -> ContextSnapshotOptions {
     ContextSnapshotOptions::default()
+        .strip_capability_instructions()
         .render_mode(ContextSnapshotRenderMode::KindWithTextPrefix { max_chars: 64 })
 }