From bddd53bae5d987653bdd3a3d4c071edaa2f30676 Mon Sep 17 00:00:00 2001
From: Charles Cunningham <ccunningham@openai.com>
Date: Sat, 14 Feb 2026 13:28:59 -0800
Subject: [PATCH] Rebase: align compaction snapshots and imports

---
 codex-rs/core/src/compact_remote.rs                           | 2 +-
 ...ompact__pre_turn_compaction_including_incoming_shapes.snap | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/codex-rs/core/src/compact_remote.rs b/codex-rs/core/src/compact_remote.rs
index 1039e24401..b338686ea0 100644
--- a/codex-rs/core/src/compact_remote.rs
+++ b/codex-rs/core/src/compact_remote.rs
@@ -3,9 +3,9 @@ use std::sync::Arc;
 use crate::Prompt;
 use crate::codex::Session;
 use crate::codex::TurnContext;
-use crate::compact::extract_trailing_model_switch_update_for_compaction_request;
 use crate::compact::AutoCompactCallsite;
 use crate::compact::TurnContextReinjection;
+use crate::compact::extract_trailing_model_switch_update_for_compaction_request;
 use crate::context_manager::ContextManager;
 use crate::context_manager::TotalTokenUsageBreakdown;
 use crate::context_manager::estimate_item_token_count;
diff --git a/codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_including_incoming_shapes.snap b/codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_including_incoming_shapes.snap
index 57d461c026..bd4eb41236 100644
--- a/codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_including_incoming_shapes.snap
+++ b/codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_including_incoming_shapes.snap
@@ -13,7 +13,7 @@ Scenario: Pre-turn auto-compaction with a context override includes incoming use
 05:message/user:USER_TWO
 06:message/assistant:SECOND_REPLY
 07:message/user:<ENVIRONMENT_CONTEXT:cwd=PRETURN_CONTEXT_DIFF_CWD>
-08:message/user:<image> | </image> | USER_THREE
+08:message/user:<image> | <input_image:image_url> | </image> | USER_THREE
 09:message/user:<SUMMARIZATION_PROMPT>
 
 ## Local Post-Compaction History Layout
@@ -22,5 +22,5 @@ Scenario: Pre-turn auto-compaction with a context override includes incoming use
 02:message/developer:<PERMISSIONS_INSTRUCTIONS>
 03:message/user:<AGENTS_MD>
 04:message/user:<ENVIRONMENT_CONTEXT:cwd=PRETURN_CONTEXT_DIFF_CWD>
-05:message/user:<image> | </image> | USER_THREE
+05:message/user:<image> | <input_image:image_url> | </image> | USER_THREE
 06:message/user:<COMPACTION_SUMMARY>\nPRE_TURN_SUMMARY