Skip to content

Commit 71ae120

Browse files
Correct native compaction error fixture
1 parent c3827e1 commit 71ae120

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎packages/codex/patches/0018-native-response-observations.patch‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ index f4663fbfadf7f31e8c2de7407d5e3e640eea70e1..6d8a9a49837f2054019683123a119950
802802
| RolloutItem::SecurityRiskScore(_) => {}
803803
}
804804
diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs
805-
index 8e13dbf102466ef98ce6e04bcd450f1760860c16..9ce407c7064d47e8921d638829e01a72bf34ffe6 100644
805+
index 8e13dbf102466ef98ce6e04bcd450f1760860c16..ff08f5bb6b6c2febf2545ef456f81fabe7584e8c 100644
806806
--- a/codex-rs/core/src/session/tests.rs
807807
+++ b/codex-rs/core/src/session/tests.rs
808808
@@ -3379,6 +3379,7 @@ async fn record_initial_history_seeds_token_info_from_rollout() {
@@ -934,7 +934,7 @@ index 8e13dbf102466ef98ce6e04bcd450f1760860c16..9ce407c7064d47e8921d638829e01a72
934934
Arc::clone(&session),
935935
Arc::clone(&primary),
936936
Arc::clone(&fallback),
937-
@@ -11931,12 +11994,28 @@ async fn remote_compaction_v2_retains_only_the_selected_step(first_attempt: Firs
937+
@@ -11931,12 +11994,29 @@ async fn remote_compaction_v2_retains_only_the_selected_step(first_attempt: Firs
938938
CompactionReason::ModelDownshift,
939939
CompactionPhase::PreTurn,
940940
)
@@ -951,8 +951,9 @@ index 8e13dbf102466ef98ce6e04bcd450f1760860c16..9ce407c7064d47e8921d638829e01a72
951951
+ FirstAttempt::FallbackFails => {
952952
+ let error = result.expect_err("both model attempts fail");
953953
+ assert!(
954-
+ matches!(error.details(), CodexErrorDetails::UnexpectedStatus(response)
955-
+ if response.body.contains("previous model unavailable"))
954+
+ matches!(error.details(), CodexErrorDetails::InvalidRequest(message)
955+
+ if message.contains("previous model unavailable")
956+
+ && !message.contains("replacement model unavailable"))
956957
+ );
957958
+ }
958959
+ }
@@ -967,7 +968,7 @@ index 8e13dbf102466ef98ce6e04bcd450f1760860c16..9ce407c7064d47e8921d638829e01a72
967968
};
968969
assert_eq!(
969970
state
970-
@@ -11965,6 +12044,115 @@ async fn remote_compaction_v2_retains_only_the_selected_step(first_attempt: Firs
971+
@@ -11965,6 +12045,115 @@ async fn remote_compaction_v2_retains_only_the_selected_step(first_attempt: Firs
971972
recv_terminal_event(&events, TerminalEventKind::TurnAborted).await;
972973
}
973974

‎packages/codex/patches/series.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
},
7171
{
7272
"path": "0018-native-response-observations.patch",
73-
"sha256": "6bcbc8561d2d3cac731248ae052afd52de624c4c7068b6e54d55e490aa0fb755"
73+
"sha256": "29d5807441aa038de608eb23714b5733f08e011e99952b194e7fe2ca93b5ecf7"
7474
}
7575
],
76-
"result_tree": "5c65c1b3a7aabd2cc491503f4f9f1be89b10e13b"
76+
"result_tree": "1693bd0225d6ca034cbd47689a8a770fdc07996a"
7777
}

0 commit comments

Comments
 (0)