clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-06-01 19:02:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'etraut/next-turn-state-input-op-consolidation' into etraut/next-turn-state-remove-override-context

Browse Source 
# Conflicts:
#	codex-rs/core/src/codex_thread.rs
#	codex-rs/core/src/session/tests.rs
#	codex-rs/protocol/src/protocol.rs
This commit is contained in:
Eric Traut
2026-05-18 15:29:58 -07:00
parent 5b41df2613 50435559f4
commit a940c8db7b
78 changed files with 414 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codex-rs/core/tests/suite/websocket_fallback.rs
View File

@@ -160,7 +160,7 @@ async fn websocket_fallback_hides_first_websocket_retry_stream_error() -> Result
environments: None,
final_output_json_schema: None,
responsesapi_client_metadata: None,
turn_context: codex_protocol::protocol::TurnContextOverrides {
thread_settings: codex_protocol::protocol::ThreadSettingsOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
sandbox_policy: Some(sandbox_policy),