From 657fe01851ce859d64563ba1515abddfac06f8f4 Mon Sep 17 00:00:00 2001
From: viyatb-oai <viyatb@openai.com>
Date: Wed, 3 Jun 2026 14:00:36 -0700
Subject: [PATCH] refactor: defer relay helpers to their callers

Co-authored-by: Codex noreply@openai.com
---
 codex-rs/exec-server/src/relay.rs       | 28 -------------------------
 codex-rs/exec-server/src/relay_proto.rs |  2 --
 2 files changed, 30 deletions(-)

diff --git a/codex-rs/exec-server/src/relay.rs b/codex-rs/exec-server/src/relay.rs
index 3eea4fbfc9..5835e5ee2f 100644
--- a/codex-rs/exec-server/src/relay.rs
+++ b/codex-rs/exec-server/src/relay.rs
@@ -22,7 +22,6 @@ use crate::connection::JsonRpcConnection;
 use crate::connection::JsonRpcConnectionEvent;
 use crate::connection::JsonRpcTransport;
 use crate::relay_proto::RelayData;
-use crate::relay_proto::RelayHandshake;
 use crate::relay_proto::RelayMessageFrame;
 use crate::relay_proto::RelayResume;
 use crate::relay_proto::relay_message_frame;
@@ -70,18 +69,6 @@ impl RelayMessageFrame {
         }
     }
 
-    pub(crate) fn handshake(stream_id: String, payload: Vec<u8>) -> Self {
-        Self {
-            version: RELAY_MESSAGE_FRAME_VERSION,
-            stream_id,
-            ack: 0,
-            ack_bits: 0,
-            body: Some(relay_message_frame::Body::Handshake(RelayHandshake {
-                payload,
-            })),
-        }
-    }
-
     /// Validate cleartext routing metadata before a frame reaches either the
     /// direct JSON-RPC parser or the Noise relay state machine.
     ///
@@ -163,21 +150,6 @@ impl RelayMessageFrame {
         serde_json::from_slice(&payload).map_err(ExecServerError::Json)
     }
 
-    pub(crate) fn into_handshake_payload(self) -> Result<Vec<u8>, ExecServerError> {
-        let kind = self.validate()?;
-        if kind != RelayFrameBodyKind::Handshake {
-            return Err(ExecServerError::Protocol(
-                "expected relay handshake message frame".to_string(),
-            ));
-        }
-        match self.body {
-            Some(relay_message_frame::Body::Handshake(handshake)) => Ok(handshake.payload),
-            _ => Err(ExecServerError::Protocol(
-                "expected relay handshake message frame".to_string(),
-            )),
-        }
-    }
-
     pub(crate) fn into_reset_reason(self) -> Option<String> {
         match self.body {
             Some(relay_message_frame::Body::Reset(reset)) if !reset.reason.is_empty() => {
diff --git a/codex-rs/exec-server/src/relay_proto.rs b/codex-rs/exec-server/src/relay_proto.rs
index da7cb5296d..b8a938b8c7 100644
--- a/codex-rs/exec-server/src/relay_proto.rs
+++ b/codex-rs/exec-server/src/relay_proto.rs
@@ -2,8 +2,6 @@
 mod generated;
 
 pub(crate) use generated::RelayData;
-pub(crate) use generated::RelayHandshake;
 pub(crate) use generated::RelayMessageFrame;
-pub(crate) use generated::RelayReset;
 pub(crate) use generated::RelayResume;
 pub(crate) use generated::relay_message_frame;