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

Simplify turn context update handling

Browse Source
This commit is contained in:
Eric Traut
2026-05-16 17:23:39 -07:00
parent f5943e0fd9
commit c6fe81d803
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,20 +185,9 @@ pub(super) async fn user_input_or_turn_inner(
personality,
environments,
} => {
let collaboration_mode = if let Some(collab_mode) = collaboration_mode {
Some(collab_mode)
} else {
let state = sess.state.lock().await;
Some(
state
.session_configuration
.collaboration_mode
.with_updates(model, effort, /*developer_instructions*/ None),
)
};
(
items,
SessionSettingsUpdate {
let mut updates = turn_context_settings_update(
sess,
TurnContextOverrides {
cwd,
workspace_roots,
profile_workspace_roots,
@@ -208,17 +197,18 @@ pub(super) async fn user_input_or_turn_inner(
permission_profile,
active_permission_profile,
windows_sandbox_level,
collaboration_mode,
reasoning_summary: summary,
model,
effort,
summary,
service_tier,
final_output_json_schema: Some(final_output_json_schema),
environments,
collaboration_mode,
personality,
app_server_client_name: None,
app_server_client_version: None,
},
responsesapi_client_metadata,
)
.await;
updates.final_output_json_schema = Some(final_output_json_schema);
updates.environments = environments;
(items, updates, responsesapi_client_metadata)
}
Op::UserInput {
items,