openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-11 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex: address PR review feedback (#16365)

Browse Source
This commit is contained in:
Eric Traut
2026-03-31 14:52:38 -06:00
parent 0e4c922344
commit 591efdc95a
2 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
codex-rs/app-server-client/src/lib.rs
View File

@@ -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");
};

44
codex-rs/app-server-client/src/remote.rs
View File

@@ -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");
};