From 56c456ca838675318a192558f3c38d9beffbe774 Mon Sep 17 00:00:00 2001
From: jif-oai <jif@openai.com>
Date: Fri, 28 Nov 2025 13:03:25 +0000
Subject: [PATCH] fix: flaky tests

---
 .../app-server/tests/common/mcp_process.rs    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/codex-rs/app-server/tests/common/mcp_process.rs b/codex-rs/app-server/tests/common/mcp_process.rs
index e2da40bf2d..ec3b0cb27c 100644
--- a/codex-rs/app-server/tests/common/mcp_process.rs
+++ b/codex-rs/app-server/tests/common/mcp_process.rs
@@ -61,7 +61,7 @@ pub struct McpProcess {
     process: Child,
     stdin: ChildStdin,
     stdout: BufReader<ChildStdout>,
-    pending_user_messages: VecDeque<JSONRPCNotification>,
+    pending_notifications: VecDeque<JSONRPCNotification>,
 }
 
 impl McpProcess {
@@ -132,7 +132,7 @@ impl McpProcess {
             process,
             stdin,
             stdout,
-            pending_user_messages: VecDeque::new(),
+            pending_notifications: VecDeque::new(),
         })
     }
 
@@ -484,6 +484,10 @@ impl McpProcess {
         method: &str,
         params: Option<serde_json::Value>,
     ) -> anyhow::Result<i64> {
+        // Drop any stale notifications from previous requests so callers don't
+        // accidentally consume old events when waiting for the next response.
+        self.pending_notifications.clear();
+
         let request_id = self.next_request_id.fetch_add(1, Ordering::Relaxed);
 
         let message = JSONRPCMessage::Request(JSONRPCRequest {
@@ -546,7 +550,7 @@ impl McpProcess {
             match message {
                 JSONRPCMessage::Notification(notification) => {
                     eprintln!("notification: {notification:?}");
-                    self.enqueue_user_message(notification);
+                    self.enqueue_notification(notification);
                 }
                 JSONRPCMessage::Request(jsonrpc_request) => {
                     return jsonrpc_request.try_into().with_context(
@@ -574,7 +578,7 @@ impl McpProcess {
             match message {
                 JSONRPCMessage::Notification(notification) => {
                     eprintln!("notification: {notification:?}");
-                    self.enqueue_user_message(notification);
+                    self.enqueue_notification(notification);
                 }
                 JSONRPCMessage::Request(_) => {
                     anyhow::bail!("unexpected JSONRPCMessage::Request: {message:?}");
@@ -600,7 +604,7 @@ impl McpProcess {
             match message {
                 JSONRPCMessage::Notification(notification) => {
                     eprintln!("notification: {notification:?}");
-                    self.enqueue_user_message(notification);
+                    self.enqueue_notification(notification);
                 }
                 JSONRPCMessage::Request(_) => {
                     anyhow::bail!("unexpected JSONRPCMessage::Request: {message:?}");
@@ -634,7 +638,7 @@ impl McpProcess {
                     if notification.method == method {
                         return Ok(notification);
                     }
-                    self.enqueue_user_message(notification);
+                    self.enqueue_notification(notification);
                 }
                 JSONRPCMessage::Request(_) => {
                     anyhow::bail!("unexpected JSONRPCMessage::Request: {message:?}");
@@ -651,18 +655,16 @@ impl McpProcess {
 
     fn take_pending_notification_by_method(&mut self, method: &str) -> Option<JSONRPCNotification> {
         if let Some(pos) = self
-            .pending_user_messages
+            .pending_notifications
             .iter()
             .position(|notification| notification.method == method)
         {
-            return self.pending_user_messages.remove(pos);
+            return self.pending_notifications.remove(pos);
         }
         None
     }
 
-    fn enqueue_user_message(&mut self, notification: JSONRPCNotification) {
-        if notification.method == "codex/event/user_message" {
-            self.pending_user_messages.push_back(notification);
-        }
+    fn enqueue_notification(&mut self, notification: JSONRPCNotification) {
+        self.pending_notifications.push_back(notification);
     }
 }