Align extracted model-switch snapshots with main behavior

Author: charley-oai

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

@@ -1518,8 +1518,8 @@ async fn snapshot_request_shape_remote_pre_turn_compaction_strips_incoming_model
     let compact_request = compact_mock.single_request();
     let compact_body = compact_request.body_json().to_string();
     assert!(
-        compact_body.contains("AFTER_SWITCH_USER"),
-        "pre-turn remote compaction request should include incoming user message"
+        !compact_body.contains("AFTER_SWITCH_USER"),
+        "current behavior excludes incoming user from the pre-turn remote compaction request"
     );
     assert!(
         !compact_body.contains("<model_switch>"),
@@ -1543,7 +1543,7 @@ async fn snapshot_request_shape_remote_pre_turn_compaction_strips_incoming_model
     insta::assert_snapshot!(
         "remote_pre_turn_compaction_strips_incoming_model_switch_shapes",
         format_labeled_requests_snapshot(
-            "Remote pre-turn compaction during model switch strips incoming <model_switch> from the compact request and restores it in the post-compaction follow-up request.",
+            "Remote pre-turn compaction during model switch currently excludes incoming user input, strips incoming <model_switch> from the compact request payload, and restores it in the post-compaction follow-up request.",
             &[
                 ("Initial Request (Previous Model)", &requests[0]),
                 ("Remote Compaction Request", &compact_request),

codex-rs/core/tests/suite/snapshots/all__suite__compact__pre_turn_compaction_strips_incoming_model_switch_shapes.snap

@@ -1,5 +1,6 @@
 ---
 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.
@@ -18,15 +19,14 @@ 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:AFTER_SWITCH_USER
-07:message/user:<SUMMARIZATION_PROMPT>
+06:message/user:<SUMMARIZATION_PROMPT>
 
 ## Local Post-Compaction History Layout
-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....
+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

codex-rs/core/tests/suite/snapshots/all__suite__compact_remote__remote_pre_turn_compaction_strips_incoming_model_switch_shapes.snap

@@ -1,8 +1,9 @@
 ---
 source: core/tests/suite/compact_remote.rs
-expression: "format_labeled_requests_snapshot(\"Remote pre-turn compaction during model switch 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(\"Remote Compaction Request\", &compact_request),\n(\"Remote Post-Compaction History Layout\", &requests[1]),])"
+assertion_line: 1543
+expression: "format_labeled_requests_snapshot(\"Remote pre-turn compaction during model switch currently excludes incoming user input, strips incoming <model_switch> from the compact request payload, and restores it in the post-compaction follow-up request.\",\n&[(\"Initial Request (Previous Model)\", &requests[0]),\n(\"Remote Compaction Request\", &compact_request),\n(\"Remote Post-Compaction History Layout\", &requests[1]),])"
 ---
-Scenario: Remote pre-turn compaction during model switch strips incoming <model_switch> from the compact request and restores it in the post-compaction follow-up request.
+Scenario: Remote pre-turn compaction during model switch currently excludes incoming user input, strips incoming <model_switch> from the compact request payload, and restores it in the post-compaction follow-up request.
 
 ## Initial Request (Previous Model)
 00:message/developer:<PERMISSIONS_INSTRUCTIONS>
@@ -16,14 +17,14 @@ Scenario: Remote pre-turn compaction during model switch strips incoming <model_
 02:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
 03:message/user:BEFORE_SWITCH_USER
 04:message/assistant:BEFORE_SWITCH_REPLY
-05:message/user:AFTER_SWITCH_USER
 
 ## Remote Post-Compaction History Layout
 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
+01:message/user:AFTER_SWITCH_USER
+02:message/developer:<PERMISSIONS_INSTRUCTIONS>
+03:message/developer:<personality_spec> The user has requested a new communication st...
+04:message/user:<AGENTS_MD>
+05:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
 06:message/user:<COMPACTION_SUMMARY>\nREMOTE_SWITCH_SUMMARY
 07:message/developer:<model_switch>\nThe user was previously using a different model....
+08:message/user:AFTER_SWITCH_USER