From 105faa426ebda9ea20b7cc236749877822e5b091 Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Mon, 6 Jul 2026 21:00:51 -0700
Subject: [PATCH] codex: fix CI failure on PR #31347

---
 codex-rs/tui/src/ide_context/ipc.rs | 33 +++++++++++++++--------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/codex-rs/tui/src/ide_context/ipc.rs b/codex-rs/tui/src/ide_context/ipc.rs
index 2d81c3542f..bcccd7e9fd 100644
--- a/codex-rs/tui/src/ide_context/ipc.rs
+++ b/codex-rs/tui/src/ide_context/ipc.rs
@@ -889,12 +889,16 @@ mod tests {
         active_selection_content: &'static str,
     ) -> std::thread::JoinHandle<()> {
         std::thread::spawn(move || {
-            let (mut stream, _) = listener.accept().expect("accept");
-            let request = read_frame(&mut stream, test_deadline()).expect("read ide-context");
-            let request_id = request
-                .get("requestId")
-                .and_then(Value::as_str)
-                .expect("ide-context request id");
+            let Ok((mut stream, _)) = listener.accept() else {
+                panic!("accept failed");
+            };
+            let request = match read_frame(&mut stream, test_deadline()) {
+                Ok(request) => request,
+                Err(err) => panic!("read ide-context failed: {err}"),
+            };
+            let Some(request_id) = request.get("requestId").and_then(Value::as_str) else {
+                panic!("ide-context request did not include a request id");
+            };
             write_ide_context_response(&mut stream, request_id, active_selection_content);
         })
     }
@@ -912,16 +916,13 @@ mod tests {
     }
 
     fn assert_listener_unused(listener: &std::os::unix::net::UnixListener) {
-        listener
-            .set_nonblocking(true)
-            .expect("set listener nonblocking");
-        assert_eq!(
-            listener
-                .accept()
-                .expect_err("listener should not receive a connection")
-                .kind(),
-            std::io::ErrorKind::WouldBlock
-        );
+        if let Err(err) = listener.set_nonblocking(true) {
+            panic!("set listener nonblocking failed: {err}");
+        }
+        match listener.accept() {
+            Err(err) => assert_eq!(err.kind(), std::io::ErrorKind::WouldBlock),
+            Ok(_) => panic!("listener should not receive a connection"),
+        }
     }
 
     #[test]