mirror of
https://github.com/openai/codex.git
synced 2026-10-18 17:18:52 +00:00
## Why Large nested-tool callbacks can occupy a WebSocket and delay unrelated session operations on the same code-mode connection. ## What changed - Negotiate the optional `dual-websocket-v1` capability and pair a second, token-scoped WebSocket with the control connection. - Route nested-tool callbacks and their results over the bulk socket while keeping session operations, notifications, and execution responses on the control socket. Reject messages sent on the wrong lane. - Preserve the single-connection transport when the capability is unavailable, and bound pairing, queued callbacks, and deferred cross-socket messages. - Defer callbacks that arrive before their execution-started response, and return delegate errors without disconnecting the connection. ## Testing Add protocol, transport, driver, and WebSocket integration coverage for capability negotiation, lane routing, pairing failures, out-of-order messages, and progress during large concurrent tool results. GitOrigin-RevId: fa4504653e7cbf3c4ec930ae57aa0a41345bad66
324 lines
9.6 KiB
Rust
324 lines
9.6 KiB
Rust
use std::fmt;
|
|
|
|
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
use serde_json::Value as JsonValue;
|
|
|
|
use super::Capability;
|
|
use super::CapabilitySet;
|
|
use super::DelegateRequestId;
|
|
use super::HandshakeRejectReason;
|
|
use super::ProtocolVersion;
|
|
use super::RequestId;
|
|
use super::SessionId;
|
|
use super::SupportedProtocolVersions;
|
|
use super::TransportLane;
|
|
use super::WireCellId;
|
|
use super::WireExecuteRequest;
|
|
use super::WireNestedToolCall;
|
|
use super::WireRuntimeResponse;
|
|
use super::WireWaitOutcome;
|
|
use super::WireWaitRequest;
|
|
|
|
#[derive(Clone, Debug, PartialEq, Serialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct ClientHello {
|
|
supported_versions: SupportedProtocolVersions,
|
|
required_capabilities: CapabilitySet,
|
|
optional_capabilities: CapabilitySet,
|
|
}
|
|
|
|
impl ClientHello {
|
|
pub fn new(
|
|
supported_versions: SupportedProtocolVersions,
|
|
required_capabilities: CapabilitySet,
|
|
optional_capabilities: CapabilitySet,
|
|
) -> Result<Self, ClientHelloError> {
|
|
if let Some(capability) = required_capabilities
|
|
.iter()
|
|
.find(|capability| optional_capabilities.contains(capability))
|
|
{
|
|
return Err(ClientHelloError::OverlappingCapability(capability.clone()));
|
|
}
|
|
Ok(Self {
|
|
supported_versions,
|
|
required_capabilities,
|
|
optional_capabilities,
|
|
})
|
|
}
|
|
|
|
pub fn supported_versions(&self) -> &SupportedProtocolVersions {
|
|
&self.supported_versions
|
|
}
|
|
|
|
pub fn required_capabilities(&self) -> &CapabilitySet {
|
|
&self.required_capabilities
|
|
}
|
|
|
|
pub fn optional_capabilities(&self) -> &CapabilitySet {
|
|
&self.optional_capabilities
|
|
}
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
#[serde(deny_unknown_fields, rename_all = "camelCase")]
|
|
struct ClientHelloWire {
|
|
supported_versions: SupportedProtocolVersions,
|
|
required_capabilities: CapabilitySet,
|
|
optional_capabilities: CapabilitySet,
|
|
}
|
|
|
|
impl<'de> Deserialize<'de> for ClientHello {
|
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
|
where
|
|
D: serde::Deserializer<'de>,
|
|
{
|
|
let wire = ClientHelloWire::deserialize(deserializer)?;
|
|
Self::new(
|
|
wire.supported_versions,
|
|
wire.required_capabilities,
|
|
wire.optional_capabilities,
|
|
)
|
|
.map_err(serde::de::Error::custom)
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
|
pub enum ClientHelloError {
|
|
OverlappingCapability(Capability),
|
|
}
|
|
|
|
impl fmt::Display for ClientHelloError {
|
|
fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
match self {
|
|
Self::OverlappingCapability(capability) => write!(
|
|
formatter,
|
|
"capability `{capability}` cannot be both required and optional"
|
|
),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl std::error::Error for ClientHelloError {}
|
|
|
|
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
|
|
#[serde(deny_unknown_fields, rename_all = "camelCase")]
|
|
pub struct HostHello {
|
|
selected_version: ProtocolVersion,
|
|
capabilities: CapabilitySet,
|
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
|
bulk_connection_token: Option<String>,
|
|
}
|
|
|
|
impl HostHello {
|
|
pub fn new(selected_version: ProtocolVersion, capabilities: CapabilitySet) -> Self {
|
|
Self {
|
|
selected_version,
|
|
capabilities,
|
|
bulk_connection_token: None,
|
|
}
|
|
}
|
|
|
|
pub fn with_bulk_connection_token(mut self, token: String) -> Self {
|
|
self.bulk_connection_token = Some(token);
|
|
self
|
|
}
|
|
|
|
pub fn selected_version(&self) -> ProtocolVersion {
|
|
self.selected_version
|
|
}
|
|
|
|
pub fn capabilities(&self) -> &CapabilitySet {
|
|
&self.capabilities
|
|
}
|
|
|
|
pub fn bulk_connection_token(&self) -> Option<&str> {
|
|
self.bulk_connection_token.as_deref()
|
|
}
|
|
}
|
|
|
|
/// Messages sent from a client to the code-mode host.
|
|
#[derive(Debug, Deserialize, PartialEq, Serialize)]
|
|
#[serde(deny_unknown_fields, tag = "type", rename_all_fields = "camelCase")]
|
|
pub enum ClientToHost {
|
|
#[serde(rename = "connection/hello")]
|
|
ClientHello(ClientHello),
|
|
#[serde(rename = "operation/request")]
|
|
Request { id: RequestId, request: HostRequest },
|
|
#[serde(rename = "operation/cancel")]
|
|
CancelRequest { id: RequestId },
|
|
#[serde(rename = "delegate/response")]
|
|
DelegateResponse {
|
|
id: DelegateRequestId,
|
|
result: WireResult<DelegateResponse>,
|
|
},
|
|
}
|
|
|
|
impl ClientToHost {
|
|
/// Keeps notification acknowledgments with control traffic and tool results on the bulk lane.
|
|
pub fn transport_lane(&self) -> TransportLane {
|
|
match self {
|
|
Self::DelegateResponse {
|
|
result:
|
|
WireResult::Ok {
|
|
value: DelegateResponse::NotificationDelivered,
|
|
},
|
|
..
|
|
}
|
|
| Self::ClientHello(_)
|
|
| Self::Request { .. }
|
|
| Self::CancelRequest { .. } => TransportLane::Control,
|
|
Self::DelegateResponse { .. } => TransportLane::Bulk,
|
|
}
|
|
}
|
|
|
|
/// Validates the message families accepted by each paired socket.
|
|
pub fn allows_transport_lane(&self, lane: TransportLane) -> bool {
|
|
self.transport_lane() == lane
|
|
}
|
|
}
|
|
|
|
/// Messages sent from the code-mode host to a client.
|
|
#[derive(Debug, Deserialize, PartialEq, Serialize)]
|
|
#[serde(deny_unknown_fields, tag = "type", rename_all_fields = "camelCase")]
|
|
pub enum HostToClient {
|
|
#[serde(rename = "connection/ready")]
|
|
HostHello(HostHello),
|
|
#[serde(rename = "connection/rejected")]
|
|
HandshakeRejected { reason: HandshakeRejectReason },
|
|
#[serde(rename = "operation/response")]
|
|
Response {
|
|
id: RequestId,
|
|
result: WireResult<HostResponse>,
|
|
},
|
|
#[serde(rename = "execute/initialResponse")]
|
|
InitialResponse {
|
|
id: RequestId,
|
|
result: WireResult<WireRuntimeResponse>,
|
|
},
|
|
#[serde(rename = "delegate/request")]
|
|
DelegateRequest {
|
|
id: DelegateRequestId,
|
|
session_id: SessionId,
|
|
request: DelegateRequest,
|
|
},
|
|
#[serde(rename = "delegate/cancel")]
|
|
CancelDelegateRequest { id: DelegateRequestId },
|
|
#[serde(rename = "cell/closed")]
|
|
CellClosed {
|
|
session_id: SessionId,
|
|
cell_id: WireCellId,
|
|
},
|
|
}
|
|
|
|
impl HostToClient {
|
|
/// Keeps notifications with control traffic and nested-tool callbacks on the bulk lane.
|
|
pub fn transport_lane(&self) -> TransportLane {
|
|
match self {
|
|
Self::DelegateRequest {
|
|
request: DelegateRequest::InvokeTool { .. },
|
|
..
|
|
}
|
|
| Self::CancelDelegateRequest { .. } => TransportLane::Bulk,
|
|
Self::DelegateRequest {
|
|
request: DelegateRequest::Notify { .. },
|
|
..
|
|
}
|
|
| Self::HostHello(_)
|
|
| Self::HandshakeRejected { .. }
|
|
| Self::Response { .. }
|
|
| Self::InitialResponse { .. }
|
|
| Self::CellClosed { .. } => TransportLane::Control,
|
|
}
|
|
}
|
|
|
|
/// Rejects messages received on the wrong paired socket.
|
|
pub fn allows_transport_lane(&self, lane: TransportLane) -> bool {
|
|
self.transport_lane() == lane
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
|
|
#[serde(deny_unknown_fields, tag = "method", rename_all_fields = "camelCase")]
|
|
pub enum HostRequest {
|
|
#[serde(rename = "session/open")]
|
|
OpenSession { session_id: SessionId },
|
|
#[serde(rename = "session/execute")]
|
|
Execute {
|
|
session_id: SessionId,
|
|
request: WireExecuteRequest,
|
|
},
|
|
#[serde(rename = "session/wait")]
|
|
Wait {
|
|
session_id: SessionId,
|
|
request: WireWaitRequest,
|
|
},
|
|
#[serde(rename = "session/terminate")]
|
|
Terminate {
|
|
session_id: SessionId,
|
|
cell_id: WireCellId,
|
|
},
|
|
#[serde(rename = "session/shutdown")]
|
|
ShutdownSession { session_id: SessionId },
|
|
}
|
|
|
|
#[derive(Debug, Deserialize, PartialEq, Serialize)]
|
|
#[serde(deny_unknown_fields, tag = "type", rename_all_fields = "camelCase")]
|
|
pub enum HostResponse {
|
|
#[serde(rename = "session/ready")]
|
|
SessionReady { session_id: SessionId },
|
|
#[serde(rename = "execution/started")]
|
|
ExecutionStarted { cell_id: WireCellId },
|
|
#[serde(rename = "wait/completed")]
|
|
WaitCompleted { outcome: WireWaitOutcome },
|
|
#[serde(rename = "session/closed")]
|
|
SessionClosed { session_id: SessionId },
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
|
|
#[serde(deny_unknown_fields, tag = "type", rename_all_fields = "camelCase")]
|
|
pub enum DelegateRequest {
|
|
#[serde(rename = "tool/invoke")]
|
|
InvokeTool { invocation: WireNestedToolCall },
|
|
#[serde(rename = "notification/send")]
|
|
Notify {
|
|
call_id: String,
|
|
cell_id: WireCellId,
|
|
text: String,
|
|
},
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
|
|
#[serde(deny_unknown_fields, tag = "type", rename_all_fields = "camelCase")]
|
|
pub enum DelegateResponse {
|
|
#[serde(rename = "tool/result")]
|
|
ToolResult { result: JsonValue },
|
|
#[serde(rename = "notification/delivered")]
|
|
NotificationDelivered,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize, PartialEq, Serialize)]
|
|
#[serde(deny_unknown_fields, tag = "status", rename_all_fields = "camelCase")]
|
|
pub enum WireResult<T> {
|
|
#[serde(rename = "ok")]
|
|
Ok { value: T },
|
|
#[serde(rename = "error")]
|
|
Err { message: String },
|
|
}
|
|
|
|
impl<T> WireResult<T> {
|
|
pub fn from_result(result: Result<T, String>) -> Self {
|
|
match result {
|
|
Ok(value) => Self::Ok { value },
|
|
Err(message) => Self::Err { message },
|
|
}
|
|
}
|
|
|
|
pub fn into_result(self) -> Result<T, String> {
|
|
match self {
|
|
Self::Ok { value } => Ok(value),
|
|
Self::Err { message } => Err(message),
|
|
}
|
|
}
|
|
}
|