clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-26 05:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'etraut/next-turn-state-app-server' into etraut/next-turn-state-tui

Browse Source 
# Conflicts:
#	codex-rs/tui/src/chatwidget/protocol.rs
This commit is contained in:
Eric Traut
2026-05-18 18:33:10 -07:00
parent 08fe94c092 654586eda6
commit 0fafab08ef
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
codex-rs/app-server/src/request_processors/turn_processor.rs
View File

@@ -839,17 +839,12 @@ impl TurnRequestProcessor {
"failed to update thread settings: {err}"
)));
}
match tokio::time::timeout(THREAD_SETTINGS_ACK_TIMEOUT, thread_settings_applied).await {
Ok(Ok(Ok(payload))) => thread_settings_from_applied_event(&payload),
Ok(Ok(Err(err))) => return Err(invalid_request(err)),
Ok(Err(_)) => {
return Err(internal_error(
"thread settings override waiter was cancelled".to_string(),
));
}
match thread_settings_applied.await {
Ok(Ok(payload)) => thread_settings_from_applied_event(&payload),
Ok(Err(err)) => return Err(invalid_request(err)),
Err(_) => {
return Err(internal_error(
"timed out waiting for thread settings overrides to apply".to_string(),
"thread settings override waiter was cancelled".to_string(),
));
}
}