From 591efdc95a2f3563cdeaa374f7d62adf9d02a474 Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Tue, 31 Mar 2026 14:52:38 -0600
Subject: [PATCH] codex: address PR review feedback (#16365)

---
 codex-rs/app-server-client/src/lib.rs    | 19 +++++-----
 codex-rs/app-server-client/src/remote.rs | 44 +++++++++++++++++-------
 2 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/codex-rs/app-server-client/src/lib.rs b/codex-rs/app-server-client/src/lib.rs
index c1d5a9ada9..5ed2df3486 100644
--- a/codex-rs/app-server-client/src/lib.rs
+++ b/codex-rs/app-server-client/src/lib.rs
@@ -605,10 +605,7 @@ impl InProcessAppServerClient {
         result: JsonRpcResult,
     ) -> IoResult<()> {
         self.command_tx
-            .send(ClientCommand::ResolveServerRequest {
-                request_id,
-                result,
-            })
+            .send(ClientCommand::ResolveServerRequest { request_id, result })
             .await
             .map_err(|_| {
                 IoError::new(
@@ -629,10 +626,7 @@ impl InProcessAppServerClient {
         error: JSONRPCErrorError,
     ) -> IoResult<()> {
         self.command_tx
-            .send(ClientCommand::RejectServerRequest {
-                request_id,
-                error,
-            })
+            .send(ClientCommand::RejectServerRequest { request_id, error })
             .await
             .map_err(|_| {
                 IoError::new(
@@ -1272,7 +1266,8 @@ mod tests {
         .expect("resolve should return before timeout")
         .expect("resolve should enqueue successfully");
 
-        let Some(ClientCommand::ResolveServerRequest { request_id, result }) = command_rx.recv().await
+        let Some(ClientCommand::ResolveServerRequest { request_id, result }) =
+            command_rx.recv().await
         else {
             panic!("expected resolve command");
         };
@@ -1303,8 +1298,10 @@ mod tests {
         .expect("reject should return before timeout")
         .expect("reject should enqueue successfully");
 
-        let Some(ClientCommand::RejectServerRequest { request_id, error: queued_error }) =
-            command_rx.recv().await
+        let Some(ClientCommand::RejectServerRequest {
+            request_id,
+            error: queued_error,
+        }) = command_rx.recv().await
         else {
             panic!("expected reject command");
         };
diff --git a/codex-rs/app-server-client/src/remote.rs b/codex-rs/app-server-client/src/remote.rs
index 2b4a090739..efee6d986e 100644
--- a/codex-rs/app-server-client/src/remote.rs
+++ b/codex-rs/app-server-client/src/remote.rs
@@ -264,7 +264,19 @@ impl RemoteAppServerClient {
                                 )
                                 .await
                                 {
-                                    warn!("failed to resolve remote server request: {err}");
+                                    let err_message = err.to_string();
+                                    let _ = deliver_event(
+                                        &event_tx,
+                                        &mut skipped_events,
+                                        AppServerEvent::Disconnected {
+                                            message: format!(
+                                                "remote app server at `{websocket_url}` write failed: {err_message}"
+                                            ),
+                                        },
+                                        &mut stream,
+                                    )
+                                    .await;
+                                    break;
                                 }
                             }
                             RemoteClientCommand::RejectServerRequest {
@@ -281,7 +293,19 @@ impl RemoteAppServerClient {
                                 )
                                 .await
                                 {
-                                    warn!("failed to reject remote server request: {err}");
+                                    let err_message = err.to_string();
+                                    let _ = deliver_event(
+                                        &event_tx,
+                                        &mut skipped_events,
+                                        AppServerEvent::Disconnected {
+                                            message: format!(
+                                                "remote app server at `{websocket_url}` write failed: {err_message}"
+                                            ),
+                                        },
+                                        &mut stream,
+                                    )
+                                    .await;
+                                    break;
                                 }
                             }
                             RemoteClientCommand::Shutdown { response_tx } => {
@@ -541,10 +565,7 @@ impl RemoteAppServerClient {
         result: JsonRpcResult,
     ) -> IoResult<()> {
         self.command_tx
-            .send(RemoteClientCommand::ResolveServerRequest {
-                request_id,
-                result,
-            })
+            .send(RemoteClientCommand::ResolveServerRequest { request_id, result })
             .await
             .map_err(|_| {
                 IoError::new(
@@ -560,10 +581,7 @@ impl RemoteAppServerClient {
         error: JSONRPCErrorError,
     ) -> IoResult<()> {
         self.command_tx
-            .send(RemoteClientCommand::RejectServerRequest {
-                request_id,
-                error,
-            })
+            .send(RemoteClientCommand::RejectServerRequest { request_id, error })
             .await
             .map_err(|_| {
                 IoError::new(
@@ -1019,8 +1037,10 @@ mod tests {
         .expect("reject should return before timeout")
         .expect("reject should enqueue successfully");
 
-        let Some(RemoteClientCommand::RejectServerRequest { request_id, error: queued_error }) =
-            command_rx.recv().await
+        let Some(RemoteClientCommand::RejectServerRequest {
+            request_id,
+            error: queued_error,
+        }) = command_rx.recv().await
         else {
             panic!("expected reject command");
         };