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

# Conflicts:
#	codex-rs/core/src/codex_thread.rs
#	codex-rs/core/src/session/tests.rs
#	codex-rs/protocol/src/protocol.rs

codex-rs/core/src/agent/control_tests.rs

@@ -442,7 +442,7 @@ async fn send_input_submits_user_message() {
             }],
             final_output_json_schema: None,
             responsesapi_client_metadata: None,
-            turn_context: Default::default(),
+            thread_settings: Default::default(),
         },
     );
     let captured = harness
@@ -590,7 +590,7 @@ async fn spawn_agent_creates_thread_and_sends_prompt() {
             }],
             final_output_json_schema: None,
             responsesapi_client_metadata: None,
-            turn_context: Default::default(),
+            thread_settings: Default::default(),
         },
     );
     let captured = harness
@@ -739,7 +739,7 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() {
             }],
             final_output_json_schema: None,
             responsesapi_client_metadata: None,
-            turn_context: Default::default(),
+            thread_settings: Default::default(),
         },
     );
     let captured = harness

codex-rs/core/src/codex_delegate.rs

@@ -192,7 +192,7 @@ pub(crate) async fn run_codex_thread_one_shot(
         items: input,
         final_output_json_schema,
         responsesapi_client_metadata: None,
-        turn_context: Default::default(),
+        thread_settings: Default::default(),
     })
     .await?;
 

codex-rs/core/src/codex_thread.rs

@@ -80,9 +80,9 @@ impl ThreadConfigSnapshot {
     }
 }
 
-/// Turn context overrides that app-server validates before starting a turn.
+/// Thread settings overrides that app-server validates before starting a turn.
 #[derive(Clone, Default)]
-pub struct CodexThreadTurnContextOverrides {
+pub struct CodexThreadSettingsOverrides {
     pub cwd: Option<PathBuf>,
     pub workspace_roots: Option<Vec<AbsolutePathBuf>>,
     pub profile_workspace_roots: Option<Vec<AbsolutePathBuf>>,
@@ -255,32 +255,32 @@ impl CodexThread {
             .await
     }
 
-    /// Validate persistent turn context overrides without committing them.
-    pub async fn validate_turn_context_overrides(
+    /// Validate persistent thread settings overrides without committing them.
+    pub async fn validate_thread_settings_overrides(
         &self,
-        overrides: CodexThreadTurnContextOverrides,
+        overrides: CodexThreadSettingsOverrides,
     ) -> ConstraintResult<()> {
-        let updates = self.turn_context_settings_update(overrides).await;
+        let updates = self.thread_settings_update(overrides).await;
         self.codex.session.validate_settings(&updates).await
     }
 
-    /// Apply persistent turn context overrides directly.
+    /// Apply persistent thread settings overrides directly.
     ///
     /// This bypasses the submission queue; callers that need ordering relative
-    /// to turns should use the queued turn-context op.
-    pub async fn update_turn_context_overrides(
+    /// to turns should use the queued thread-settings op.
+    pub async fn update_thread_settings_overrides(
         &self,
-        overrides: CodexThreadTurnContextOverrides,
+        overrides: CodexThreadSettingsOverrides,
     ) -> ConstraintResult<()> {
-        let updates = self.turn_context_settings_update(overrides).await;
+        let updates = self.thread_settings_update(overrides).await;
         self.codex.session.update_settings(updates).await
     }
 
-    async fn turn_context_settings_update(
+    async fn thread_settings_update(
         &self,
-        overrides: CodexThreadTurnContextOverrides,
+        overrides: CodexThreadSettingsOverrides,
     ) -> SessionSettingsUpdate {
-        let CodexThreadTurnContextOverrides {
+        let CodexThreadSettingsOverrides {
             cwd,
             workspace_roots,
             profile_workspace_roots,

codex-rs/core/src/guardian/review_session.rs

@@ -711,7 +711,7 @@ async fn run_review_on_session(
             environments: None,
             final_output_json_schema: Some(params.schema.clone()),
             responsesapi_client_metadata: None,
-            turn_context: codex_protocol::protocol::TurnContextOverrides {
+            thread_settings: codex_protocol::protocol::ThreadSettingsOverrides {
                 #[allow(deprecated)]
                 cwd: Some(params.parent_turn.cwd.to_path_buf()),
                 approval_policy: Some(AskForApproval::Never),

codex-rs/core/src/lib.rs

@@ -20,7 +20,7 @@ mod compact_remote;
 mod compact_remote_v2;
 mod config_lock;
 pub use codex_thread::CodexThread;
-pub use codex_thread::CodexThreadTurnContextOverrides;
+pub use codex_thread::CodexThreadSettingsOverrides;
 pub use codex_thread::ThreadConfigSnapshot;
 pub use session::turn_context::TurnContext;
 mod agent;

codex-rs/core/src/session/handlers.rs

@@ -42,8 +42,8 @@ use codex_protocol::protocol::ReviewRequest;
 use codex_protocol::protocol::RolloutItem;
 use codex_protocol::protocol::ThreadMemoryMode;
 use codex_protocol::protocol::ThreadRolledBackEvent;
+use codex_protocol::protocol::ThreadSettingsOverrides;
 use codex_protocol::protocol::TurnAbortReason;
-use codex_protocol::protocol::TurnContextOverrides;
 use codex_protocol::protocol::WarningEvent;
 use codex_protocol::request_permissions::RequestPermissionsResponse;
 use codex_protocol::request_user_input::RequestUserInputResponse;
@@ -103,12 +103,12 @@ pub(super) async fn user_input_or_turn_inner(
             environments,
             final_output_json_schema,
             responsesapi_client_metadata,
-            turn_context,
+            thread_settings,
         } => {
-            let mut updates = if turn_context == TurnContextOverrides::default() {
+            let mut updates = if thread_settings == ThreadSettingsOverrides::default() {
                 SessionSettingsUpdate::default()
             } else {
-                turn_context_settings_update(sess, turn_context).await
+                thread_settings_update(sess, thread_settings).await
             };
             updates.final_output_json_schema = Some(final_output_json_schema);
             updates.environments = environments;
@@ -170,11 +170,11 @@ pub(super) async fn user_input_or_turn_inner(
     }
 }
 
-async fn turn_context_settings_update(
+async fn thread_settings_update(
     sess: &Session,
-    turn_context: TurnContextOverrides,
+    thread_settings: ThreadSettingsOverrides,
 ) -> SessionSettingsUpdate {
-    let TurnContextOverrides {
+    let ThreadSettingsOverrides {
         cwd,
         workspace_roots,
         profile_workspace_roots,
@@ -190,7 +190,7 @@ async fn turn_context_settings_update(
         service_tier,
         collaboration_mode,
         personality,
-    } = turn_context;
+    } = thread_settings;
     let collaboration_mode = if let Some(collaboration_mode) = collaboration_mode {
         collaboration_mode
     } else {

codex-rs/core/src/session/mod.rs

@@ -1096,7 +1096,7 @@ impl Session {
                 }],
                 final_output_json_schema: None,
                 responsesapi_client_metadata: None,
-                turn_context: Default::default(),
+                thread_settings: Default::default(),
             },
             /*mirror_user_text_to_realtime*/ None,
         )

codex-rs/core/src/session/tests.rs

@@ -118,12 +118,12 @@ use codex_protocol::protocol::SkillScope;
 use codex_protocol::protocol::Submission;
 use codex_protocol::protocol::ThreadGoalStatus;
 use codex_protocol::protocol::ThreadRolledBackEvent;
+use codex_protocol::protocol::ThreadSettingsOverrides;
 use codex_protocol::protocol::TokenCountEvent;
 use codex_protocol::protocol::TokenUsage;
 use codex_protocol::protocol::TokenUsageInfo;
 use codex_protocol::protocol::TurnAbortedEvent;
 use codex_protocol::protocol::TurnCompleteEvent;
-use codex_protocol::protocol::TurnContextOverrides;
 use codex_protocol::protocol::TurnStartedEvent;
 use codex_protocol::protocol::UserMessageEvent;
 use codex_protocol::protocol::W3cTraceContext;
@@ -2221,7 +2221,7 @@ async fn fork_startup_context_then_first_turn_diff_snapshot() -> anyhow::Result<
             }],
             final_output_json_schema: None,
             responsesapi_client_metadata: None,
-            turn_context: Default::default(),
+            thread_settings: Default::default(),
         })
         .await?;
     wait_for_event(&initial.codex, |ev| matches!(ev, EventMsg::TurnComplete(_))).await;
@@ -2267,7 +2267,7 @@ async fn fork_startup_context_then_first_turn_diff_snapshot() -> anyhow::Result<
             }],
             final_output_json_schema: None,
             responsesapi_client_metadata: None,
-            turn_context: TurnContextOverrides {
+            thread_settings: ThreadSettingsOverrides {
                 approval_policy: Some(AskForApproval::Never),
                 collaboration_mode: Some(collaboration_mode),
                 ..Default::default()
@@ -5199,7 +5199,7 @@ fn op_kind_for_input_and_context_ops() {
             items: vec![],
             final_output_json_schema: None,
             responsesapi_client_metadata: None,
-            turn_context: Default::default(),
+            thread_settings: Default::default(),
         }
         .kind(),
         "user_input"
@@ -5222,7 +5222,7 @@ async fn user_turn_updates_approvals_reviewer() {
             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(config.cwd.to_path_buf()),
                 approval_policy: Some(config.permissions.approval_policy.value()),
                 approvals_reviewer: Some(codex_config::types::ApprovalsReviewer::AutoReview),
@@ -8289,7 +8289,7 @@ async fn active_goal_continuation_runs_again_after_no_tool_turn() -> anyhow::Res
             }],
             final_output_json_schema: None,
             responsesapi_client_metadata: None,
-            turn_context: Default::default(),
+            thread_settings: Default::default(),
         })
         .await?;
 
@@ -8394,7 +8394,7 @@ async fn pending_request_user_input_does_not_spawn_extra_goal_continuation() ->
             }],
             final_output_json_schema: None,
             responsesapi_client_metadata: None,
-            turn_context: Default::default(),
+            thread_settings: Default::default(),
         })
         .await?;
 
@@ -8819,7 +8819,7 @@ async fn completed_goal_accounts_current_turn_tokens_before_tool_response() -> a
             }],
             final_output_json_schema: None,
             responsesapi_client_metadata: None,
-            turn_context: Default::default(),
+            thread_settings: Default::default(),
         })
         .await?;
 

codex-rs/core/src/tools/handlers/multi_agents_tests.rs

@@ -2470,7 +2470,7 @@ async fn send_input_accepts_structured_items() {
         ],
         final_output_json_schema: None,
         responsesapi_client_metadata: None,
-        turn_context: Default::default(),
+        thread_settings: Default::default(),
     };
     let captured = manager
         .captured_ops()