From 5d7983520b9c1d3b5fb076cb0ffb4a58c8bd5655 Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Fri, 24 Oct 2025 11:23:25 -0700
Subject: [PATCH] tests

---
 codex-rs/core/src/conversation_history.rs     |  2 ++
 codex-rs/core/tests/suite/input_validation.rs | 34 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/codex-rs/core/src/conversation_history.rs b/codex-rs/core/src/conversation_history.rs
index 17b7cd7226..1370a5e671 100644
--- a/codex-rs/core/src/conversation_history.rs
+++ b/codex-rs/core/src/conversation_history.rs
@@ -118,6 +118,8 @@ impl ConversationHistory {
         let Some(info) = &self.token_info else {
             return Ok(());
         };
+        // this will intentionally not check the context for the first turn before getting this information.
+        // it's acceptable tradeoff.
         let Some(context_window) = info.model_context_window else {
             return Ok(());
         };
diff --git a/codex-rs/core/tests/suite/input_validation.rs b/codex-rs/core/tests/suite/input_validation.rs
index 3a284f1071..4d09900981 100644
--- a/codex-rs/core/tests/suite/input_validation.rs
+++ b/codex-rs/core/tests/suite/input_validation.rs
@@ -1,11 +1,17 @@
 use codex_core::protocol::EventMsg;
 use codex_core::protocol::Op;
 use codex_protocol::user_input::UserInput;
+use core_test_support::responses;
+use core_test_support::responses::ev_assistant_message;
+use core_test_support::responses::ev_completed;
+use core_test_support::responses::ev_response_created;
+use core_test_support::responses::sse;
 use core_test_support::responses::start_mock_server;
 use core_test_support::test_codex::test_codex;
 use core_test_support::wait_for_event_with_timeout;
 use std::sync::Arc;
 use std::time::Duration;
+use wiremock::matchers::any;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn interrupt_tool_records_history_entries() {
@@ -14,8 +20,34 @@ async fn interrupt_tool_records_history_entries() {
     let fixture = test_codex().build(&server).await.unwrap();
     let codex = Arc::clone(&fixture.codex);
 
-    let wait_timeout = Duration::from_millis(100);
+    // First: normal message with a mocked assistant response
+    let first_response = sse(vec![
+        ev_response_created("resp-1"),
+        ev_assistant_message("msg-1", "ok"),
+        ev_completed("resp-1"),
+    ]);
+    responses::mount_sse_once_match(&server, any(), first_response).await;
 
+    codex
+        .submit(Op::UserInput {
+            items: vec![UserInput::Text {
+                text: "hello world".into(),
+            }],
+        })
+        .await
+        .unwrap();
+
+    // Wait for the normal turn to complete before sending the oversized input
+    let turn_timeout = Duration::from_secs(2);
+    wait_for_event_with_timeout(
+        &codex,
+        |ev| matches!(ev, EventMsg::TaskComplete(_)),
+        turn_timeout,
+    )
+    .await;
+
+    // Then: 300k-token message should trigger validation error
+    let wait_timeout = Duration::from_millis(100);
     let input_300_tokens = "token ".repeat(300_000);
 
     codex