From 72cf2819be62b21f9995caa847eccf40e63c528a Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Sat, 7 Mar 2026 01:18:23 -0800
Subject: [PATCH] codex: normalize schema fixture TS paths (#13593)

---
 codex-rs/app-server-protocol/src/export.rs          | 2 +-
 codex-rs/app-server-protocol/src/schema_fixtures.rs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/codex-rs/app-server-protocol/src/export.rs b/codex-rs/app-server-protocol/src/export.rs
index 8c2b2d9745..e530c4edc4 100644
--- a/codex-rs/app-server-protocol/src/export.rs
+++ b/codex-rs/app-server-protocol/src/export.rs
@@ -1994,7 +1994,7 @@ pub(crate) fn generate_index_ts_tree(tree: &mut BTreeMap<PathBuf, String>) {
         .collect::<Vec<_>>();
     if !v2_entries.is_empty() {
         tree.insert(
-            PathBuf::from("v2/index.ts"),
+            PathBuf::from("v2").join("index.ts"),
             index_ts_entries(&v2_entries, false),
         );
     }
diff --git a/codex-rs/app-server-protocol/src/schema_fixtures.rs b/codex-rs/app-server-protocol/src/schema_fixtures.rs
index ad70b47719..2af015b684 100644
--- a/codex-rs/app-server-protocol/src/schema_fixtures.rs
+++ b/codex-rs/app-server-protocol/src/schema_fixtures.rs
@@ -277,6 +277,7 @@ fn collect_typescript_fixture_file<T: TS + 'static + ?Sized>(
     }
 
     let contents = T::export_to_string().context("export TypeScript fixture content")?;
+    let output_path = normalize_relative_fixture_path(&output_path);
     files.insert(
         output_path,
         contents.replace("\r\n", "\n").replace('\r', "\n"),
@@ -295,6 +296,10 @@ fn collect_typescript_fixture_file<T: TS + 'static + ?Sized>(
     Ok(())
 }
 
+fn normalize_relative_fixture_path(path: &Path) -> PathBuf {
+    path.components().collect()
+}
+
 fn visit_typescript_fixture_dependencies(
     files: &mut BTreeMap<PathBuf, String>,
     seen: &mut HashSet<TypeId>,