From f792c7ab13feb306c0b52f9c7e3d44149c624e2f Mon Sep 17 00:00:00 2001
From: starr-openai <starr@openai.com>
Date: Tue, 19 May 2026 21:18:44 -0700
Subject: [PATCH] Stabilize compact remote parity skills normalization

---
 codex-rs/core/tests/suite/compact_remote_parity.rs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/codex-rs/core/tests/suite/compact_remote_parity.rs b/codex-rs/core/tests/suite/compact_remote_parity.rs
index ccbd427b1f5c..234160a7ccea 100644
--- a/codex-rs/core/tests/suite/compact_remote_parity.rs
+++ b/codex-rs/core/tests/suite/compact_remote_parity.rs
@@ -933,6 +933,10 @@ fn normalize_string(value: &str) -> String {
         return "<UUID>".to_string();
     }
 
+    if value.starts_with("<skills_instructions>\n") && value.ends_with("\n</skills_instructions>") {
+        return "<skills_instructions>\n...\n</skills_instructions>".to_string();
+    }
+
     let mut text = value.to_string();
     normalize_tmp_prefix_before_marker(&mut text, "/skills/");
     normalize_tmp_prefix_before_marker(&mut text, "\\skills\\");
@@ -1028,6 +1032,15 @@ fn normalize_string_rewrites_windows_temp_skill_paths() {
     );
 }
 
+#[test]
+fn normalize_string_rewrites_skills_instructions_body() {
+    let text = normalize_string(
+        "<skills_instructions>\n## Skills\n- imagegen: ...\n</skills_instructions>",
+    );
+
+    assert_eq!(text, "<skills_instructions>\n...\n</skills_instructions>");
+}
+
 #[test]
 fn normalize_string_rewrites_shell_wall_times() {
     let text = normalize_string(