From 32a95a970289a294bdf1e166a9652ec6436bf0fa Mon Sep 17 00:00:00 2001 From: Zyy Date: Wed, 18 Nov 2026 20:49:26 +0800 Subject: [PATCH] refactor(openai): forward turn state from the current request Keep the client responsible for echoing turn state across requests. Scope WebSocket opening state to the first request and retain account isolation when moving a request to another account. Co-authored-by: Codex --- .../src/openai/responses/websocket/mod.rs | 4 +- .../openai/responses/websocket/forward.rs | 20 +++- .../tests/openai/responses/websocket/mod.rs | 9 ++ .../openai/src/provider/execution.rs | 22 ----- .../providers/openai/src/provider/mod.rs | 17 +--- .../openai/src/provider/observation.rs | 1 - .../providers/openai/src/transport/client.rs | 3 - .../src/transport/protocol/responses.rs | 3 - .../providers/openai/src/transport/request.rs | 33 ++----- .../openai/tests/provider/contract/mod.rs | 99 +++++-------------- .../openai/tests/transport/catalog.rs | 1 - .../openai/tests/transport/client.rs | 1 - .../openai/tests/transport/headers.rs | 3 - .../openai/tests/transport/http_client.rs | 3 - .../providers/openai/tests/transport/mod.rs | 1 - .../openai/tests/transport/request.rs | 60 +++++------ .../providers/openai/tests/transport/usage.rs | 2 - .../openai/tests/transport/websocket/mod.rs | 1 - docs/api.md | 6 +- docs/architecture.md | 5 +- 20 files changed, 94 insertions(+), 200 deletions(-) diff --git a/backend/crates/gateway-api/src/openai/responses/websocket/mod.rs b/backend/crates/gateway-api/src/openai/responses/websocket/mod.rs index 2ccfd61b6..4a91704ee 100644 --- a/backend/crates/gateway-api/src/openai/responses/websocket/mod.rs +++ b/backend/crates/gateway-api/src/openai/responses/websocket/mod.rs @@ -165,7 +165,7 @@ async fn serve_responses_websocket(socket: Socket, session: ResponsesWebSocketSe client_ip, user_agent, request_headers, - raw_headers, + mut raw_headers, lifecycle, connection_guard, middleware, @@ -336,6 +336,8 @@ async fn serve_responses_websocket(socket: Socket, session: ResponsesWebSocketSe headers: encode_headers(&raw_headers), body: Bytes::from(payload), }; + // 握手的轮次状态仅属于首次执行,复用连接时由各 response.create 自行携带 + raw_headers.remove("x-codex-turn-state"); let service_for_terminal = service.clone(); let replay_for_terminal = replay.clone(); let connection_id_for_terminal = connection.id().to_owned(); diff --git a/backend/crates/gateway-api/tests/openai/responses/websocket/forward.rs b/backend/crates/gateway-api/tests/openai/responses/websocket/forward.rs index 869af4837..e231461e0 100644 --- a/backend/crates/gateway-api/tests/openai/responses/websocket/forward.rs +++ b/backend/crates/gateway-api/tests/openai/responses/websocket/forward.rs @@ -45,6 +45,14 @@ impl Drop for TestServer { async fn connect( trace: Arc, response_headers: Vec, +) -> (TestSocket, TestServer) { + connect_with_headers(trace, response_headers, axum::http::HeaderMap::new()).await +} + +async fn connect_with_headers( + trace: Arc, + response_headers: Vec, + opening_headers: axum::http::HeaderMap, ) -> (TestSocket, TestServer) { let execution = Arc::new(AtomicFailureExecution { client: authenticated_client("sk_ws_atomic"), @@ -66,6 +74,7 @@ async fn connect( request .headers_mut() .insert(AUTHORIZATION, "Bearer sk_ws_atomic".parse().unwrap()); + request.headers_mut().extend(opening_headers); let (socket, response) = connect_async(request).await.expect("upgrade WebSocket"); assert_eq!(response.status(), StatusCode::SWITCHING_PROTOCOLS); (socket, server) @@ -518,13 +527,22 @@ async fn errors_on_a_reused_connection_keep_their_own_upstream_ids() { initial_errors: Mutex::new(VecDeque::from(errors)), ..AtomicFailureTrace::default() }); - let (mut socket, _server) = connect(trace, Vec::new()).await; + let mut opening = axum::http::HeaderMap::new(); + opening.insert( + "x-codex-turn-state", + axum::http::HeaderValue::from_static("opening"), + ); + let (mut socket, _server) = connect_with_headers(Arc::clone(&trace), Vec::new(), opening).await; for request_id in ["req_first", "req_second"] { send_request(&mut socket).await; let error = next_error(&mut socket).await; assert_eq!(error["headers"]["x-request-id"], request_id); assert_eq!(error["headers"]["x-gateway-request-id"], "req_ws_atomic"); } + assert_eq!( + *trace.request_turn_states.lock().unwrap(), + [Some("opening".to_owned()), None] + ); assert_no_duplicate_failure(&mut socket).await; socket.close(None).await.unwrap(); } diff --git a/backend/crates/gateway-api/tests/openai/responses/websocket/mod.rs b/backend/crates/gateway-api/tests/openai/responses/websocket/mod.rs index 56a1a7d62..becd915f3 100644 --- a/backend/crates/gateway-api/tests/openai/responses/websocket/mod.rs +++ b/backend/crates/gateway-api/tests/openai/responses/websocket/mod.rs @@ -308,6 +308,7 @@ struct AtomicFailureTrace { committed: AtomicBool, finalized: AtomicBool, downstream_websocket_connection_ids: Mutex>, + request_turn_states: Mutex>>, initial_errors: Mutex>, first_batch: Mutex>, session_drops: Arc, @@ -437,6 +438,14 @@ impl ExecutionService for AtomicFailureExecution { .get("downstream_websocket_connection_id") .and_then(Value::as_str) { + self.trace.request_turn_states.lock().unwrap().push( + generate + .protocol_payload() + .context() + .get("turn_state") + .and_then(Value::as_str) + .map(str::to_owned), + ); self.trace .downstream_websocket_connection_ids .lock() diff --git a/backend/crates/providers/openai/src/provider/execution.rs b/backend/crates/providers/openai/src/provider/execution.rs index 516b7f54d..0ae472996 100644 --- a/backend/crates/providers/openai/src/provider/execution.rs +++ b/backend/crates/providers/openai/src/provider/execution.rs @@ -434,10 +434,6 @@ pub(super) struct OpenAiSessionState { #[serde(default, skip_serializing_if = "Option::is_none")] pub(super) oauth_identity: Option, pub(super) conversation_id: Option, - #[serde(default)] - pub(super) turn_state: Option, - #[serde(default)] - pub(super) client_turn_id: Option, #[serde(skip_serializing_if = "Option::is_none")] pub(super) reasoning_effort_override: Option, pub(super) continuation_scope: OpenAiContinuationScope, @@ -456,20 +452,12 @@ pub(super) struct OpenAiSessionCapture { pub(super) credential_revision: Option, pub(super) oauth_identity: Option, pub(super) conversation_id: Option, - pub(super) turn_state: Option, - pub(super) client_turn_id: Option, pub(super) reasoning_effort_override: Option, pub(super) response_store: bool, pub(super) oversized_http: bool, pub(super) continuation_scope: Option, } -pub(super) fn same_client_turn(previous: Option<&str>, current: Option<&str>) -> bool { - previous - .zip(current) - .is_some_and(|(previous, current)| !previous.is_empty() && previous == current) -} - pub(super) fn decode_openai_session_state(request: &GenerateRequest) -> Option { request .provider_session_state(PROVIDER_NAME) @@ -505,8 +493,6 @@ fn encode_openai_session_capture( credential_revision: capture.credential_revision, oauth_identity: capture.oauth_identity.clone(), conversation_id: capture.conversation_id.clone(), - turn_state: capture.turn_state.clone(), - client_turn_id: capture.client_turn_id.clone(), reasoning_effort_override: capture.reasoning_effort_override.clone(), continuation_scope, }) @@ -938,7 +924,6 @@ pub(super) fn cold_response_stream(response: ColdResponse) -> EventStream { } else { OpenAiContinuationScope::ReplayRequired }); - capture.turn_state = response.turn_state.clone().or(capture.turn_state.clone()); } let mut observation_state = OpenAiResponseObservationState::from_backend_response( &response, @@ -1070,7 +1055,6 @@ pub(super) fn cold_response_stream(response: ColdResponse) -> EventStream { }; let metadata_merge = merge_response_metadata_updates( response_metadata_updates.as_ref(), - &mut session_capture, &mut observation_state, ) .await; @@ -1148,7 +1132,6 @@ pub(super) fn cold_response_stream(response: ColdResponse) -> EventStream { }; let metadata_merge = merge_response_metadata_updates( response_metadata_updates.as_ref(), - &mut session_capture, &mut observation_state, ) .await; @@ -1354,7 +1337,6 @@ pub(super) fn cold_response_stream(response: ColdResponse) -> EventStream { } let metadata_changed = merge_response_metadata_updates( response_metadata_updates.as_ref(), - &mut session_capture, &mut observation_state, ) .await @@ -1417,12 +1399,8 @@ pub(super) fn cold_response_stream(response: ColdResponse) -> EventStream { async fn merge_response_metadata_updates( updates: Option<&CodexResponseMetadataUpdates>, - session_capture: &mut Option, observation_state: &mut OpenAiResponseObservationState, ) -> Option { let turn_state = updates?.lock().await.turn_state.take()?; - if let Some(capture) = session_capture.as_mut() { - capture.turn_state = Some(turn_state.clone()); - } Some(observation_state.merge_client_header("x-codex-turn-state", &turn_state)) } diff --git a/backend/crates/providers/openai/src/provider/mod.rs b/backend/crates/providers/openai/src/provider/mod.rs index bc79ae4ce..62c34c711 100644 --- a/backend/crates/providers/openai/src/provider/mod.rs +++ b/backend/crates/providers/openai/src/provider/mod.rs @@ -86,7 +86,7 @@ use crate::transport::protocol::responses::{ }; use crate::transport::request::{ CodexRequestEncodeError, RequestAccountScope, align_structured_location_fields, - clear_request_turn_state, encode_generate_request, scope_request_to_account, + encode_generate_request, scope_request_to_account, }; use crate::transport::session::CodexSessionIdentity; use crate::transport::usage::normalize_service_tier; @@ -240,19 +240,6 @@ impl CodexProvider { if let Some(identity) = &self.session_identity { identity.prepare_local_conversation(&mut upstream); } - if let Some(previous_session) = previous_session.as_ref() { - if same_client_turn( - previous_session.client_turn_id.as_deref(), - upstream.client_turn_id.as_deref(), - ) { - upstream.turn_state = upstream - .turn_state - .take() - .or_else(|| previous_session.turn_state.clone()); - } else { - clear_request_turn_state(&mut upstream); - } - } let session_affinity = derive_codex_session_affinity(&upstream, context.client_api_key_ref()); let cyber_policy_session_key = @@ -1144,8 +1131,6 @@ impl CodexProvider { ) .then_some(lease.account().revision().get()), conversation_id: upstream_request.local_conversation_id.clone(), - turn_state: upstream_request.turn_state.clone(), - client_turn_id: upstream_request.client_turn_id.clone(), reasoning_effort_override: upstream_request .semantics( previous_session diff --git a/backend/crates/providers/openai/src/provider/observation.rs b/backend/crates/providers/openai/src/provider/observation.rs index 0507d5c27..009f667ee 100644 --- a/backend/crates/providers/openai/src/provider/observation.rs +++ b/backend/crates/providers/openai/src/provider/observation.rs @@ -711,7 +711,6 @@ pub(super) fn codex_request_context<'a>( session_id: request.client_session_id.as_deref(), thread_id: request.client_thread_id.as_deref(), client_request_id: request.client_request_id.as_deref(), - turn_id: request.client_turn_id.as_deref(), account_selection, } } diff --git a/backend/crates/providers/openai/src/transport/client.rs b/backend/crates/providers/openai/src/transport/client.rs index 65246f067..54bb02336 100644 --- a/backend/crates/providers/openai/src/transport/client.rs +++ b/backend/crates/providers/openai/src/transport/client.rs @@ -492,8 +492,6 @@ pub struct CodexRequestContext<'a> { pub thread_id: Option<&'a str>, /// 客户端逻辑 request ID;缺失时使用代理请求 ID pub client_request_id: Option<&'a str>, - /// 客户端 turn ID - pub turn_id: Option<&'a str>, /// 账号亲和选择结果;仅用于结构化遥测,不参与 transport 决策 pub account_selection: CodexAccountSelectionTelemetry<'a>, } @@ -524,7 +522,6 @@ impl<'a> CodexRequestContext<'a> { session_id: None, thread_id: None, client_request_id: None, - turn_id: None, account_selection: CodexAccountSelectionTelemetry::NONE, } } diff --git a/backend/crates/providers/openai/src/transport/protocol/responses.rs b/backend/crates/providers/openai/src/transport/protocol/responses.rs index 5bacd2a86..0aa36622d 100644 --- a/backend/crates/providers/openai/src/transport/protocol/responses.rs +++ b/backend/crates/providers/openai/src/transport/protocol/responses.rs @@ -50,8 +50,6 @@ pub struct CodexResponsesRequest { pub client_thread_id: Option, /// 客户端 request ID,仅保留在受控本地上下文 pub client_request_id: Option, - /// 客户端 turn ID,仅保留在受控本地上下文 - pub client_turn_id: Option, /// 连接池和 affinity 使用的本地会话身份,不发送上游 pub local_conversation_id: Option, /// 变体身份键 @@ -605,7 +603,6 @@ impl CodexResponsesRequest { client_account_follow_only: false, client_thread_id: None, client_request_id: None, - client_turn_id: None, local_conversation_id: None, variant_identity: None, client_ip: None, diff --git a/backend/crates/providers/openai/src/transport/request.rs b/backend/crates/providers/openai/src/transport/request.rs index b69464d69..545a44baa 100644 --- a/backend/crates/providers/openai/src/transport/request.rs +++ b/backend/crates/providers/openai/src/transport/request.rs @@ -22,7 +22,6 @@ use crate::transport::protocol::responses::{ }; pub(crate) const PASSTHROUGH_HEADERS_CONTEXT_KEY: &str = "opaque_request_headers"; -const TURN_ID_CLIENT_METADATA_KEY: &str = "turn_id"; const THREAD_SPAWN_SUBAGENT_KIND: &str = "thread_spawn"; const THREAD_SPAWN_CONVERSATION_PREFIX: &str = "thread-spawn:"; const ENVIRONMENT_CONTEXT_CONTENT_KIND: &str = "environments.environment_context"; @@ -263,7 +262,6 @@ fn extract_request_context(request: &mut CodexResponsesRequest) { request.parent_thread_id = context.parent_thread_id; request.client_conversation_id = context.conversation_id; request.client_request_id = context.client_request_id; - request.client_turn_id = context.turn_id; request.responses_lite = context.responses_lite; request.memgen_request = context.memgen_request; } @@ -278,7 +276,6 @@ struct ExtractedRequestContext { parent_thread_id: Option, conversation_id: Option, client_request_id: Option, - turn_id: Option, responses_lite: Option, memgen_request: Option, } @@ -287,9 +284,7 @@ impl ExtractedRequestContext { fn from_body(body: &Map) -> Self { let client_metadata = body.get("client_metadata").and_then(Value::as_object); Self { - // 官方 downstream WebSocket 无法逐帧更新 HTTP header,因此把 - // response.metadata 返回的 turn state 放回下一帧 client_metadata - // Provider 仍会在账号/turn 归属确定后决定是否允许复用该状态 + // 下游 WS 在每个 response.create 的 client_metadata 回传本轮路由状态 turn_state: body_string(body, "turnState").or_else(|| { client_metadata.and_then(|metadata| { string_value(metadata.get(X_CODEX_TURN_STATE_CLIENT_METADATA_KEY)) @@ -303,10 +298,6 @@ impl ExtractedRequestContext { parent_thread_id: body_string(body, "parentThreadId"), conversation_id: body_string(body, "conversation_id"), client_request_id: body_string(body, "x-client-request-id"), - turn_id: body_string(body, "turn_id").or_else(|| { - client_metadata - .and_then(|metadata| string_value(metadata.get(TURN_ID_CLIENT_METADATA_KEY))) - }), // Responses Lite 在 WebSocket body 中的这个键是官方 header 投影, // 不是普通上下文字段的 metadata 回退 responses_lite: client_metadata.and_then(|metadata| { @@ -452,8 +443,8 @@ fn normalize_conversation_anchor_text(text: &str) -> String { rest.to_owned() } -/// 已确认换轮或换号时,各 wire 入口同步清理原有路由 token -pub(crate) fn clear_request_turn_state(request: &mut CodexResponsesRequest) { +/// 明确换号时,同步清除请求头与正文中的原账号路由 token +fn clear_request_turn_state(request: &mut CodexResponsesRequest) { request.turn_state = None; request.passthrough_headers.remove("x-codex-turn-state"); for key in TURN_STATE_KEYS { @@ -745,8 +736,6 @@ fn replace_metadata_field(metadata: &mut Map, key: &str, value: O // 请求头的场景) fn apply_protocol_context(request: &mut CodexResponsesRequest, context: &Map) { request.passthrough_headers = decode_passthrough_headers(context); - request.turn_state = - context_string(context, "turn_state").or_else(|| request.turn_state.take()); request.turn_metadata = context_string(context, "turn_metadata").or_else(|| request.turn_metadata.take()); request.beta_features = @@ -759,6 +748,12 @@ fn apply_protocol_context(request: &mut CodexResponsesRequest, context: &Map, current_turn_id: Option<&str>, client_turn_state: Option<&str>, ) -> wiremock::Request { @@ -2072,15 +2070,13 @@ async fn capture_turn_state_request( .expect(1) .mount(&server) .await; - let mut session_state = Map::from_iter([ + let session_state = Map::from_iter([ ("account_id".to_owned(), json!(account_id)), ("conversation_id".to_owned(), json!("conversation")), ("turn_state".to_owned(), json!("previous-turn-state")), + ("client_turn_id".to_owned(), json!("turn-same")), ("continuation_scope".to_owned(), json!("persisted")), ]); - if let Some(previous_turn_id) = previous_turn_id { - session_state.insert("client_turn_id".to_owned(), json!(previous_turn_id)); - } 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( @@ -2123,7 +2119,7 @@ async fn capture_turn_state_request( let mut stream = provider_with_base_url(&store, server.uri()) .execute( planned_request("openai", operation), - context(request_id, CancellationToken::new()), + context("req_client_turn_state", CancellationToken::new()), ) .await .expect("prepare turn-state provider stream"); @@ -7097,78 +7093,29 @@ async fn missing_affinity_full_request_should_preserve_client_turn_state() { } #[tokio::test] -async fn matching_turn_id_should_restore_previous_turn_state() { - let request = capture_turn_state_request( - "req_restore_same_turn_state", - Some("turn-same"), - Some("turn-same"), - None, - ) - .await; - - assert_eq!( - captured_header_values(&request, "x-codex-turn-state"), - vec![b"previous-turn-state".to_vec()] - ); -} - -#[tokio::test] -async fn matching_turn_id_should_prefer_an_explicit_client_echo_over_saved_provider_state() { - let request = capture_turn_state_request( - "req_use_client_turn_state", - Some("turn-same"), - Some("turn-same"), - Some("client-turn-state"), - ) - .await; - - assert_eq!( - captured_header_values(&request, "x-codex-turn-state"), - vec![b"client-turn-state".to_vec()] - ); - let body = captured_request_body(&request); - for key in ["turnState", "turn_state", "x-codex-turn-state"] { - assert_eq!(body[key], "client-turn-state"); - assert_eq!(body["client_metadata"][key], "client-turn-state"); - } -} - -#[tokio::test] -async fn new_or_unidentified_turn_should_not_restore_previous_turn_state() { - for (request_id, previous_turn_id, current_turn_id, client_turn_state) in [ - ( - "req_new_turn_state", - Some("turn-old"), - Some("turn-new"), - Some("stale-client-turn-state"), - ), - ( - "req_unidentified_turn_state", - None, - Some("turn-new"), - Some("stale-client-turn-state"), - ), - ( - "req_missing_current_turn_state", - Some("turn-old"), - None, - Some("stale-client-turn-state"), - ), +async fn same_account_continuation_forwards_only_the_current_request_turn_state() { + // 旧版会话中可能仍有保存的轮次和 token + for (turn, supplied) in [ + (Some("turn-same"), None), + (Some("turn-same"), Some("client-turn-state")), + (Some("turn-new"), Some("client-turn-state")), + (None, Some("client-turn-state")), ] { - let request = capture_turn_state_request( - request_id, - previous_turn_id, - current_turn_id, - client_turn_state, - ) - .await; - assert!(captured_header_values(&request, "x-codex-turn-state").is_empty()); + let request = capture_turn_state_request(turn, supplied).await; + let headers = captured_header_values(&request, "x-codex-turn-state"); + assert_eq!( + headers, + supplied + .map(|value| value.as_bytes()) + .into_iter() + .collect::>() + ); let body = captured_request_body(&request); for key in ["turnState", "turn_state", "x-codex-turn-state"] { - assert!(body.get(key).is_none(), "stale body state: {key}"); - assert!( - body["client_metadata"].get(key).is_none(), - "stale metadata state: {key}" + assert_eq!(body.get(key).and_then(Value::as_str), supplied); + assert_eq!( + body["client_metadata"].get(key).and_then(Value::as_str), + supplied ); } assert_eq!(body["input"][0]["content"][0]["text"], "current input"); diff --git a/backend/crates/providers/openai/tests/transport/catalog.rs b/backend/crates/providers/openai/tests/transport/catalog.rs index 5cb10ca78..d0f8c2949 100644 --- a/backend/crates/providers/openai/tests/transport/catalog.rs +++ b/backend/crates/providers/openai/tests/transport/catalog.rs @@ -441,7 +441,6 @@ fn context() -> CodexRequestContext<'static> { session_id: None, thread_id: None, client_request_id: None, - turn_id: None, account_selection: Default::default(), } } diff --git a/backend/crates/providers/openai/tests/transport/client.rs b/backend/crates/providers/openai/tests/transport/client.rs index 722408c0e..8c3864898 100644 --- a/backend/crates/providers/openai/tests/transport/client.rs +++ b/backend/crates/providers/openai/tests/transport/client.rs @@ -44,7 +44,6 @@ fn request_context_debug_should_redact_all_identity_material() { session_id: None, thread_id: None, client_request_id: None, - turn_id: None, account_selection: Default::default(), }; let debug = format!("{context:?}"); diff --git a/backend/crates/providers/openai/tests/transport/headers.rs b/backend/crates/providers/openai/tests/transport/headers.rs index 2e7ca7145..d0b135cb8 100644 --- a/backend/crates/providers/openai/tests/transport/headers.rs +++ b/backend/crates/providers/openai/tests/transport/headers.rs @@ -189,7 +189,6 @@ async fn backend_websocket_should_forward_context_headers_and_preserve_payload_f session_id: Some("cp_derived"), thread_id: None, client_request_id: None, - turn_id: None, account_selection: Default::default(), }, ) @@ -307,7 +306,6 @@ async fn backend_http_should_send_codex_context_without_browser_headers() { session_id: Some("session-1"), thread_id: None, client_request_id: None, - turn_id: None, account_selection: Default::default(), }, ) @@ -429,7 +427,6 @@ async fn backend_http_should_ignore_unrepresentable_protocol_headers_without_blo client_request_id: Some("opaque\nclient-request-id"), session_id: Some("opaque\nsession"), thread_id: Some("opaque\nthread"), - turn_id: Some("opaque\nturn"), codex_window_id: Some("opaque\nwindow"), parent_thread_id: Some("opaque\nparent"), beta_features: Some("opaque\nbeta"), diff --git a/backend/crates/providers/openai/tests/transport/http_client.rs b/backend/crates/providers/openai/tests/transport/http_client.rs index eea8e4149..44d9b2dc2 100644 --- a/backend/crates/providers/openai/tests/transport/http_client.rs +++ b/backend/crates/providers/openai/tests/transport/http_client.rs @@ -140,7 +140,6 @@ async fn codex_backend_client_should_preserve_oversized_error_response() { session_id: None, thread_id: None, client_request_id: None, - turn_id: None, account_selection: Default::default(), }, ) @@ -241,7 +240,6 @@ async fn codex_backend_client_should_parse_retry_after_from_rate_limit_error_bod session_id: None, thread_id: None, client_request_id: None, - turn_id: None, account_selection: Default::default(), }, ) @@ -427,7 +425,6 @@ async fn codex_backend_client_should_capture_forwardable_response_metadata() { session_id: None, thread_id: None, client_request_id: None, - turn_id: None, account_selection: Default::default(), }, ) diff --git a/backend/crates/providers/openai/tests/transport/mod.rs b/backend/crates/providers/openai/tests/transport/mod.rs index 04b5e5997..76ede9e72 100644 --- a/backend/crates/providers/openai/tests/transport/mod.rs +++ b/backend/crates/providers/openai/tests/transport/mod.rs @@ -167,7 +167,6 @@ pub(crate) fn request_context<'a>( session_id: None, thread_id: None, client_request_id: None, - turn_id: None, account_selection: Default::default(), } } diff --git a/backend/crates/providers/openai/tests/transport/request.rs b/backend/crates/providers/openai/tests/transport/request.rs index 83c344f5b..7c232f69a 100644 --- a/backend/crates/providers/openai/tests/transport/request.rs +++ b/backend/crates/providers/openai/tests/transport/request.rs @@ -542,42 +542,37 @@ fn encoder_should_extract_websocket_context_from_client_metadata() { ); assert_eq!(encoded.client_thread_id.as_deref(), Some("metadata-thread")); assert_eq!(encoded.turn_state.as_deref(), Some("metadata-turn-state")); - assert_eq!(encoded.client_turn_id.as_deref(), Some("metadata-turn-id")); 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 [ +fn websocket_frame_turn_state_overrides_the_opening_header() { + let payload = ProtocolPayload::json_object( + "openai", + Map::from_iter([ + ("model".to_owned(), json!("client-model")), + ("input".to_owned(), json!("prompt")), + ( + "client_metadata".to_owned(), + json!({"x-codex-turn-state": "frame"}), + ), + ]), + ) + .unwrap() + .with_context(Map::from_iter([ ( - json!({"x-codex-turn-metadata": r#"{"turn_id":"frame-turn"}"#}), - Some("frame-turn"), + "downstream_websocket_connection_id".to_owned(), + json!("ws_test"), ), - (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); - } + ("turn_state".to_owned(), json!("opening")), + ])); + let encoded = encode_generate_request( + &GenerateRequest::from_protocol_payload(payload), + "gpt-test", + None, + ) + .unwrap(); + assert_eq!(encoded.turn_state.as_deref(), Some("frame")); } #[test] @@ -608,10 +603,6 @@ fn header_context_should_win_over_body_topline_aliases() { "turn_metadata".to_owned(), Value::String("header-turn-metadata".to_owned()), ), - ( - "turn_id".to_owned(), - Value::String("header-turn-id".to_owned()), - ), ])); let request = GenerateRequest::from_protocol_payload(payload); @@ -622,7 +613,6 @@ fn header_context_should_win_over_body_topline_aliases() { encoded.turn_metadata.as_deref(), Some("header-turn-metadata") ); - assert_eq!(encoded.client_turn_id.as_deref(), Some("header-turn-id")); } #[test] diff --git a/backend/crates/providers/openai/tests/transport/usage.rs b/backend/crates/providers/openai/tests/transport/usage.rs index d44ae490e..511a2a9b4 100644 --- a/backend/crates/providers/openai/tests/transport/usage.rs +++ b/backend/crates/providers/openai/tests/transport/usage.rs @@ -552,7 +552,6 @@ async fn fetch_should_use_wham_usage_headers_only() { session_id: Some("session-1"), thread_id: Some("thread-1"), client_request_id: Some("client-request-1"), - turn_id: Some("turn-1"), account_selection: Default::default(), }) .await @@ -953,7 +952,6 @@ fn context() -> CodexRequestContext<'static> { session_id: None, thread_id: None, client_request_id: None, - turn_id: None, account_selection: Default::default(), } } diff --git a/backend/crates/providers/openai/tests/transport/websocket/mod.rs b/backend/crates/providers/openai/tests/transport/websocket/mod.rs index 1727210f9..0485a3310 100644 --- a/backend/crates/providers/openai/tests/transport/websocket/mod.rs +++ b/backend/crates/providers/openai/tests/transport/websocket/mod.rs @@ -2298,7 +2298,6 @@ async fn codex_backend_client_should_use_websocket_when_previous_response_id_is_ session_id: None, thread_id: None, client_request_id: None, - turn_id: None, account_selection: Default::default(), }, ) diff --git a/docs/api.md b/docs/api.md index fa7e5b874..93bdd2a91 100644 --- a/docs/api.md +++ b/docs/api.md @@ -542,9 +542,9 @@ Images 的 `x-codex-image-turn-id` 和 Desktop 自动 Git 上下文的 `clientUs 续接 response ID、历史 item/call ID、业务正文和未知扩展不参与映射, 该处理减少显式追踪标识的跨账号复用,不保证会话内容或业务 metadata 无法关联 -`x-codex-turn-state` 是上游返回的轮次路由 token,同一轮内应原样回传,开始新轮次时清除。 -全量请求没有 `previous_response_id` 或缺少本地归属记录时,代理原样保留客户端回传值; -明确换账号或可信续接状态表明不属于同一轮时清除。该 token 不使其他账号状态字段或未知 `previous_response_id` 成为可信续接上下文 +`x-codex-turn-state` 是上游签发的轮次路由 token。客户端在同一轮原样回传,新轮次省略。 +网关转发当前请求提供的值,明确换账号时清除。WS 握手携带的值只用于首次请求,当前帧提供的值优先。 +续接 response ID 及其他账号状态的归属独立校验 #### 正文兼容 diff --git a/docs/architecture.md b/docs/architecture.md index 65718be47..3491e81ef 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -546,9 +546,8 @@ OpenAI Provider 按 Client Key、所选 OAuth 账号和父响应 ID 关联 WS 连接池按快照身份隔离审查连接;复用父连接不会重新计算 Cookie 有效期,Cookie 到期不强制关闭已建立的审查连接 OpenAI OAuth 的连接、续接状态、Guardian 路由 Cookie 和头像缓存按本地账号、上游用户与工作区隔离,同号令牌续期不改变归属。 -OpenAI Provider 统一处理 Responses 的账号归属与 turn state 隔离,HTTP 与 WS 消费同一出站请求。 -全量请求缺少本地归属记录时保留客户端回传的路由 token,明确换号或可信续接状态不属于同一轮时清除; -turn state 不参与选号,也不授权其他账号状态或 response ID 的复用 +Responses 的轮次路由 token 由客户端回传,OpenAI Provider 只在明确换号时清除。 +选号和 response ID 的归属校验独立于该 token ### 账号协议与字段适配