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-app-server' into etraut/next-turn-state-tui

Browse Source
This commit is contained in:
Eric Traut
2026-05-18 17:43:58 -07:00
parent 1d67ea0e0c 0f422dd875
commit 0d62edd2de
2 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
codex-rs/core/src/codex_thread.rs
View File

@@ -266,14 +266,6 @@ impl CodexThread {
self.codex.session.preview_settings(&updates).await
}
pub async fn validate_thread_settings_overrides(
&self,
overrides: CodexThreadSettingsOverrides,
) -> ConstraintResult<()> {
self.preview_thread_settings_overrides(overrides).await?;
Ok(())
}
async fn thread_settings_update(
&self,
overrides: CodexThreadSettingsOverrides,

42
codex-rs/core/src/session/handlers.rs
View File

@@ -189,32 +189,24 @@ pub(super) async fn user_input_or_turn_inner(
op: Op,
mirror_user_text_to_realtime: Option<()>,
) {
let (items, updates, responsesapi_client_metadata, emit_thread_settings_applied) = match op {
Op::UserInput {
items,
environments,
final_output_json_schema,
responsesapi_client_metadata,
thread_settings,
} => {
let emit_thread_settings_applied =
thread_settings != ThreadSettingsOverrides::default();
let mut updates = if emit_thread_settings_applied {
thread_settings_update(sess, thread_settings).await
} else {
SessionSettingsUpdate::default()
};
updates.final_output_json_schema = Some(final_output_json_schema);
updates.environments = environments;
(
items,
updates,
responsesapi_client_metadata,
emit_thread_settings_applied,
)
}
_ => unreachable!(),
let Op::UserInput {
items,
environments,
final_output_json_schema,
responsesapi_client_metadata,
thread_settings,
} = op
else {
unreachable!();
};
let emit_thread_settings_applied = thread_settings != ThreadSettingsOverrides::default();
let mut updates = if emit_thread_settings_applied {
thread_settings_update(sess, thread_settings).await
} else {
SessionSettingsUpdate::default()
};
updates.final_output_json_schema = Some(final_output_json_schema);
updates.environments = environments;
let Ok(current_context) = sess.new_turn_with_sub_id(sub_id.clone(), updates).await else {
// new_turn_with_sub_id already emits the error event.