mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
640d61b121
## Context Turn state is scoped to one logical turn, but the WebSocket path currently exchanges it through upgrade headers, which are scoped to the physical connection. A connection may be reused across turns, so its handshake cannot represent the turn lifecycle reliably. ## Change Exchange turn state on each WebSocket response request instead: - send an established value in `response.create.client_metadata` - read the returned value from the existing `response.metadata` event - retain the first value in the turn-scoped `ModelClientSession` `OnceLock` - start the next logical turn without state, even when it reuses the same WebSocket connection This gives WebSocket requests the same first-value-wins contract as the existing HTTP path. ## Test plan Integration coverage verifies that: - WebSocket replays returned state on same-turn follow-ups - later response metadata does not replace the first value - state resets at the logical turn boundary without requiring a reconnect CI validates the full change. ## Stack This is 1/2. #28002 builds on this request-scoped transport to carry established state through compact requests.
204 lines
7.4 KiB
Rust
204 lines
7.4 KiB
Rust
#![allow(clippy::expect_used, clippy::unwrap_used)]
|
|
|
|
use anyhow::Result;
|
|
use core_test_support::responses::WebSocketConnectionConfig;
|
|
use core_test_support::responses::ev_assistant_message;
|
|
use core_test_support::responses::ev_completed;
|
|
use core_test_support::responses::ev_reasoning_item;
|
|
use core_test_support::responses::ev_response_created;
|
|
use core_test_support::responses::ev_shell_command_call;
|
|
use core_test_support::responses::mount_response_sequence;
|
|
use core_test_support::responses::sse;
|
|
use core_test_support::responses::sse_response;
|
|
use core_test_support::responses::start_mock_server;
|
|
use core_test_support::responses::start_websocket_server_with_headers;
|
|
use core_test_support::skip_if_no_network;
|
|
use core_test_support::test_codex::test_codex;
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::Value;
|
|
use serde_json::json;
|
|
|
|
const TURN_STATE_HEADER: &str = "x-codex-turn-state";
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn responses_turn_state_persists_within_turn_and_resets_after() -> Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let server = start_mock_server().await;
|
|
let call_id = "shell-turn-state";
|
|
|
|
let first_response = sse(vec![
|
|
ev_response_created("resp-1"),
|
|
ev_reasoning_item("rsn-1", &["thinking"], &[]),
|
|
ev_shell_command_call(call_id, "echo turn-state"),
|
|
ev_completed("resp-1"),
|
|
]);
|
|
let second_response = sse(vec![
|
|
ev_response_created("resp-2"),
|
|
ev_assistant_message("msg-1", "done"),
|
|
ev_completed("resp-2"),
|
|
]);
|
|
let third_response = sse(vec![
|
|
ev_response_created("resp-3"),
|
|
ev_assistant_message("msg-2", "done"),
|
|
ev_completed("resp-3"),
|
|
]);
|
|
|
|
// First response sets turn_state; follow-up request in the same turn should echo it.
|
|
let responses = vec![
|
|
sse_response(first_response).insert_header(TURN_STATE_HEADER, "ts-1"),
|
|
sse_response(second_response),
|
|
sse_response(third_response),
|
|
];
|
|
let request_log = mount_response_sequence(&server, responses).await;
|
|
|
|
let test = test_codex().build(&server).await?;
|
|
test.submit_turn("run a shell command").await?;
|
|
test.submit_turn("second turn").await?;
|
|
|
|
let requests = request_log.requests();
|
|
assert_eq!(requests.len(), 3);
|
|
// Initial turn request has no header; follow-up has it; next turn clears it.
|
|
assert_eq!(requests[0].header(TURN_STATE_HEADER), None);
|
|
assert_eq!(
|
|
requests[1].header(TURN_STATE_HEADER),
|
|
Some("ts-1".to_string())
|
|
);
|
|
assert_eq!(requests[2].header(TURN_STATE_HEADER), None);
|
|
|
|
let parse_turn_id = |header: Option<String>| {
|
|
let value = header?;
|
|
let parsed: Value = serde_json::from_str(&value).ok()?;
|
|
parsed
|
|
.get("turn_id")
|
|
.and_then(Value::as_str)
|
|
.map(str::to_string)
|
|
};
|
|
|
|
let first_turn_id = parse_turn_id(requests[0].header("x-codex-turn-metadata"))
|
|
.expect("first request should include turn metadata turn_id");
|
|
let second_turn_id = parse_turn_id(requests[1].header("x-codex-turn-metadata"))
|
|
.expect("follow-up request should include turn metadata turn_id");
|
|
let third_turn_id = parse_turn_id(requests[2].header("x-codex-turn-metadata"))
|
|
.expect("new turn request should include turn metadata turn_id");
|
|
|
|
assert_eq!(first_turn_id, second_turn_id);
|
|
assert_ne!(second_turn_id, third_turn_id);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn websocket_turn_state_persists_within_turn_and_resets_after() -> Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let server = start_websocket_server_with_headers(vec![WebSocketConnectionConfig {
|
|
requests: vec![
|
|
vec![
|
|
json!({
|
|
"type": "response.metadata",
|
|
"headers": {(TURN_STATE_HEADER): "ts-1"},
|
|
}),
|
|
ev_response_created("resp-1"),
|
|
ev_reasoning_item("rsn-1", &["thinking"], &[]),
|
|
ev_shell_command_call("ws-shell-turn-state", "echo websocket"),
|
|
ev_completed("resp-1"),
|
|
],
|
|
vec![
|
|
ev_response_created("resp-2"),
|
|
ev_assistant_message("msg-1", "done"),
|
|
ev_completed("resp-2"),
|
|
],
|
|
vec![
|
|
ev_response_created("resp-3"),
|
|
ev_assistant_message("msg-2", "done"),
|
|
ev_completed("resp-3"),
|
|
],
|
|
],
|
|
response_headers: Vec::new(),
|
|
accept_delay: None,
|
|
close_after_requests: false,
|
|
}])
|
|
.await;
|
|
|
|
let mut builder = test_codex();
|
|
let test = builder.build_with_websocket_server(&server).await?;
|
|
// Phase 1: the first response mints state for its same-turn tool follow-up.
|
|
test.submit_turn("run the echo command").await?;
|
|
// Phase 2: the follow-up replays that state on the same physical connection.
|
|
// Phase 3: the next logical turn reuses the connection but starts with empty state.
|
|
test.submit_turn("start another turn").await?;
|
|
|
|
assert_eq!(server.handshakes().len(), 1);
|
|
let requests = server.single_connection();
|
|
assert_eq!(requests.len(), 3);
|
|
assert_eq!(
|
|
requests
|
|
.iter()
|
|
.map(|request| request.body_json()["client_metadata"][TURN_STATE_HEADER].clone())
|
|
.collect::<Vec<_>>(),
|
|
vec![json!(null), json!("ts-1"), json!(null)]
|
|
);
|
|
|
|
server.shutdown().await;
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn websocket_turn_state_is_stable_within_turn() -> Result<()> {
|
|
skip_if_no_network!(Ok(()));
|
|
|
|
let server = start_websocket_server_with_headers(vec![WebSocketConnectionConfig {
|
|
requests: vec![
|
|
vec![
|
|
json!({
|
|
"type": "response.metadata",
|
|
"headers": {(TURN_STATE_HEADER): "ts-1"},
|
|
}),
|
|
ev_response_created("resp-1"),
|
|
ev_shell_command_call("ws-shell-1", "echo one"),
|
|
ev_completed("resp-1"),
|
|
],
|
|
vec![
|
|
json!({
|
|
"type": "response.metadata",
|
|
"headers": {(TURN_STATE_HEADER): "ts-2"},
|
|
}),
|
|
ev_response_created("resp-2"),
|
|
ev_shell_command_call("ws-shell-2", "echo two"),
|
|
ev_completed("resp-2"),
|
|
],
|
|
vec![
|
|
ev_response_created("resp-3"),
|
|
ev_assistant_message("msg-1", "done"),
|
|
ev_completed("resp-3"),
|
|
],
|
|
],
|
|
response_headers: Vec::new(),
|
|
accept_delay: None,
|
|
close_after_requests: false,
|
|
}])
|
|
.await;
|
|
let mut builder = test_codex();
|
|
let test = builder.build_with_websocket_server(&server).await?;
|
|
|
|
// Phase 1: the initial request starts empty and receives the first metadata value.
|
|
// Phase 2: the first tool follow-up replays it and ignores a later value.
|
|
// Phase 3: the second follow-up sends the original value on the same connection.
|
|
test.submit_turn("run two echo commands").await?;
|
|
|
|
assert_eq!(server.handshakes().len(), 1);
|
|
let requests = server.single_connection();
|
|
assert_eq!(requests.len(), 3);
|
|
assert_eq!(
|
|
requests
|
|
.iter()
|
|
.map(|request| request.body_json()["client_metadata"][TURN_STATE_HEADER].clone())
|
|
.collect::<Vec<_>>(),
|
|
vec![json!(null), json!("ts-1"), json!("ts-1")]
|
|
);
|
|
|
|
server.shutdown().await;
|
|
Ok(())
|
|
}
|