Merge remote-tracking branch 'origin/main' into pakrym/core-cwd-absolutepathbuf

# Conflicts:
#	codex-rs/core/src/tools/runtimes/apply_patch.rs
#	codex-rs/core/src/tools/runtimes/apply_patch_tests.rs
#	codex-rs/core/tests/common/lib.rs
#	codex-rs/tui/src/test_support.rs
This commit is contained in:
pakrym-oai
2026-04-07 14:34:21 -07:00
71 changed files with 1449 additions and 621 deletions
@@ -482,6 +482,7 @@ fn mcp_tool_call_begin_and_end_emit_item_events() {
result: Some(McpToolCallResult {
content: Vec::new(),
structured_content: None,
meta: None,
}),
error: None,
duration_ms: Some(1_000),
@@ -613,6 +614,7 @@ fn mcp_tool_call_defaults_arguments_and_preserves_structured_content() {
"text": "done",
})],
structured_content: Some(json!({ "status": "ok" })),
meta: None,
}),
error: None,
duration_ms: Some(10),