Merge origin/main into rhan/surface-updates (resolve #14374 conflicts)

This commit is contained in:
Roy Han
2026-03-13 18:36:03 -07:00
541 changed files with 26801 additions and 24881 deletions

View File

@@ -271,6 +271,28 @@ async fn remote_compact_replaces_history_for_followups() -> Result<()> {
compact_body.get("model").and_then(|v| v.as_str()),
Some(harness.test().session_configured.model.as_str())
);
let response_requests = responses_mock.requests();
let first_response_request = response_requests.first().expect("initial request missing");
assert_eq!(
compact_body["tools"],
first_response_request.body_json()["tools"],
"compact requests should send the same tools payload as /v1/responses"
);
assert_eq!(
compact_body["parallel_tool_calls"],
first_response_request.body_json()["parallel_tool_calls"],
"compact requests should match /v1/responses parallel_tool_calls"
);
assert_eq!(
compact_body["reasoning"],
first_response_request.body_json()["reasoning"],
"compact requests should match /v1/responses reasoning"
);
assert_eq!(
compact_body["text"],
first_response_request.body_json()["text"],
"compact requests should match /v1/responses text controls"
);
let compact_body_text = compact_body.to_string();
assert!(
compact_body_text.contains("hello remote compact"),
@@ -1990,6 +2012,7 @@ async fn snapshot_request_shape_remote_pre_turn_compaction_including_incoming_us
.submit(Op::OverrideTurnContext {
cwd: Some(PathBuf::from(PRETURN_CONTEXT_DIFF_CWD)),
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
windows_sandbox_level: None,
model: None,
@@ -2100,6 +2123,7 @@ async fn snapshot_request_shape_remote_pre_turn_compaction_strips_incoming_model
.submit(Op::OverrideTurnContext {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
windows_sandbox_level: None,
model: Some(next_model.to_string()),