fix(openai): preserve same-turn routing state from Codex turn metadata

Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
Zyy
2026-11-18 19:56:08 +08:00
co-authored by Codex
parent 8cc6b50d85
commit cc80401d5e
3 changed files with 49 additions and 3 deletions
@@ -773,8 +773,16 @@ fn apply_protocol_context(request: &mut CodexResponsesRequest, context: &Map<Str
request.client_thread_id = gateway_protocol::openai::codex_thread_id(request.body(), context);
request.client_request_id =
context_string(context, "client_request_id").or_else(|| request.client_request_id.take());
request.client_turn_id =
context_string(context, "turn_id").or_else(|| request.client_turn_id.take());
request.client_turn_id = context_string(context, "turn_id")
.or_else(|| request.client_turn_id.take())
.or_else(|| {
// 复用 WS 时握手头可能属于上一轮,只从当前帧的元数据补全轮次
let metadata = context
.get("turn_metadata")
.filter(|_| request.downstream_websocket_connection_id.is_none())
.or_else(|| request.client_metadata()?.get("x-codex-turn-metadata"))?;
gateway_protocol::openai::turn_metadata_turn_id(metadata.as_str()?)
});
request.responses_lite =
context_string(context, "responses_lite").or_else(|| request.responses_lite.take());
request.memgen_request =
@@ -2083,7 +2083,10 @@ async fn capture_turn_state_request(
}
let mut protocol_context = Map::from_iter([("use_websocket".to_owned(), json!(false))]);
if let Some(current_turn_id) = current_turn_id {
protocol_context.insert("turn_id".to_owned(), json!(current_turn_id));
protocol_context.insert(
"turn_metadata".to_owned(),
Value::String(json!({"turn_id": current_turn_id}).to_string()),
);
}
if let Some(client_turn_state) = client_turn_state {
protocol_context.insert("turn_state".to_owned(), json!(client_turn_state));
@@ -2095,6 +2098,7 @@ async fn capture_turn_state_request(
let mut body = Map::from_iter([
("model".to_owned(), json!("gpt-5.4")),
("input".to_owned(), json!("current input")),
("previous_response_id".to_owned(), json!("resp_previous")),
("client_metadata".to_owned(), json!({"custom":"preserved"})),
]);
if let Some(state) = client_turn_state {
@@ -546,6 +546,40 @@ fn encoder_should_extract_websocket_context_from_client_metadata() {
assert_eq!(encoded.body().get("client_metadata"), Some(&metadata));
}
#[test]
fn websocket_turn_id_uses_current_frame_metadata_on_a_reused_connection() {
for (metadata, expected) in [
(
json!({"x-codex-turn-metadata": r#"{"turn_id":"frame-turn"}"#}),
Some("frame-turn"),
),
(json!({}), None),
] {
let payload = ProtocolPayload::json_object(
"openai",
Map::from_iter([
("model".to_owned(), json!("client-model")),
("input".to_owned(), json!("prompt")),
("client_metadata".to_owned(), metadata),
]),
)
.unwrap()
.with_context(Map::from_iter([
(
"downstream_websocket_connection_id".to_owned(),
json!("connection"),
),
(
"turn_metadata".to_owned(),
json!(r#"{"turn_id":"opening-turn"}"#),
),
]));
let request = GenerateRequest::from_protocol_payload(payload);
let encoded = encode_generate_request(&request, "gpt-test", None).unwrap();
assert_eq!(encoded.client_turn_id.as_deref(), expected);
}
}
#[test]
fn header_context_should_win_over_body_topline_aliases() {
let payload = ProtocolPayload::json_object(