From 9d34abf9542d8cd471976c2e42b9bc1ffa69fd79 Mon Sep 17 00:00:00 2001
From: Charles Cunningham <ccunningham@openai.com>
Date: Mon, 16 Feb 2026 11:10:50 -0800
Subject: [PATCH] core: snapshot pre-turn model-switch compaction strip
 behavior

---
 codex-rs/core/tests/suite/compact.rs          |  5 ++---
 ...n_strips_incoming_model_switch_shapes.snap | 20 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/codex-rs/core/tests/suite/compact.rs b/codex-rs/core/tests/suite/compact.rs
index b29ba0184a..f33d676246 100644
--- a/codex-rs/core/tests/suite/compact.rs
+++ b/codex-rs/core/tests/suite/compact.rs
@@ -5,6 +5,7 @@ use codex_core::built_in_model_providers;
 use codex_core::compact::SUMMARIZATION_PROMPT;
 use codex_core::compact::SUMMARY_PREFIX;
 use codex_core::config::Config;
+use codex_core::features::Feature;
 use codex_core::protocol::AskForApproval;
 use codex_core::protocol::EventMsg;
 use codex_core::protocol::ItemCompletedEvent;
@@ -3210,9 +3211,7 @@ async fn snapshot_request_shape_pre_turn_compaction_strips_incoming_model_switch
         .with_config(move |config| {
             config.model_provider = model_provider;
             set_test_compact_prompt(config);
-            config
-                .features
-                .enable(codex_core::features::Feature::RemoteModels);
+            config.features.enable(Feature::RemoteModels);
             config.model_auto_compact_token_limit = Some(200);
         })
         .build(&server)
diff --git a/codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_strips_incoming_model_switch_shapes.snap b/codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_strips_incoming_model_switch_shapes.snap
index 4d67af911d..48b721f2c2 100644
--- a/codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_strips_incoming_model_switch_shapes.snap
+++ b/codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_strips_incoming_model_switch_shapes.snap
@@ -1,6 +1,5 @@
 ---
 source: core/tests/suite/compact.rs
-assertion_line: 3152
 expression: "format_labeled_requests_snapshot(\"Pre-turn compaction during model switch (without pre-sampling model-switch compaction): current behavior strips incoming <model_switch> from the compact request and restores it in the post-compaction follow-up request.\",\n&[(\"Initial Request (Previous Model)\", &requests[0]),\n(\"Local Compaction Request\", &requests[1]),\n(\"Local Post-Compaction History Layout\", &requests[2]),])"
 ---
 Scenario: Pre-turn compaction during model switch (without pre-sampling model-switch compaction): current behavior strips incoming <model_switch> from the compact request and restores it in the post-compaction follow-up request.
@@ -19,14 +18,15 @@ Scenario: Pre-turn compaction during model switch (without pre-sampling model-sw
 03:message/developer:<PERMISSIONS_INSTRUCTIONS>
 04:message/user:BEFORE_SWITCH_USER
 05:message/assistant:BEFORE_SWITCH_REPLY
-06:message/user:<SUMMARIZATION_PROMPT>
+06:message/user:AFTER_SWITCH_USER
+07:message/user:<SUMMARIZATION_PROMPT>
 
 ## Local Post-Compaction History Layout
-00:message/developer:<PERMISSIONS_INSTRUCTIONS>
-01:message/developer:<personality_spec> The user has requested a new communication st...
-02:message/user:<AGENTS_MD>
-03:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
-04:message/user:BEFORE_SWITCH_USER
-05:message/user:<COMPACTION_SUMMARY>\nPRETURN_SWITCH_SUMMARY
-06:message/developer:<model_switch>\nThe user was previously using a different model....
-07:message/user:AFTER_SWITCH_USER
+00:message/user:BEFORE_SWITCH_USER
+01:message/developer:<PERMISSIONS_INSTRUCTIONS>
+02:message/developer:<personality_spec> The user has requested a new communication st...
+03:message/user:<AGENTS_MD>
+04:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
+05:message/user:AFTER_SWITCH_USER
+06:message/user:<COMPACTION_SUMMARY>\nPRETURN_SWITCH_SUMMARY
+07:message/developer:<model_switch>\nThe user was previously using a different model....