openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-03 19:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add queued core turn context op

Browse Source
This commit is contained in:
Eric Traut
2026-05-16 15:49:05 -07:00
parent 875b846721
commit 9393c2647b
26 changed files with 263 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/app-server/src/request_processors/thread_processor_tests.rs
+12
View File
@@ -62,6 +62,9 @@ mod thread_processor_behavior_tests {
use codex_model_provider_info::ModelProviderInfo;
use codex_model_provider_info::WireApi;
use codex_protocol::ThreadId;
use codex_protocol::config_types::CollaborationMode;
use codex_protocol::config_types::ModeKind;
use codex_protocol::config_types::Settings;
use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS;
use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_READ_ONLY;
use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_WORKSPACE;
@@ -662,7 +665,16 @@ mod thread_processor_behavior_tests {
profile_workspace_roots: Vec::new(),
ephemeral: false,
reasoning_effort: None,
reasoning_summary: None,
personality: None,
collaboration_mode: CollaborationMode {
mode: ModeKind::Default,
settings: Settings {
model: "gpt-5".to_string(),
reasoning_effort: None,
developer_instructions: None,
},
},
session_source: SessionSource::Cli,
thread_source: None,
};
codex-rs/core/src/codex_thread.rs
+34 -4
View File
@@ -63,7 +63,9 @@ pub struct ThreadConfigSnapshot {
pub profile_workspace_roots: Vec<AbsolutePathBuf>,
pub ephemeral: bool,
pub reasoning_effort: Option<ReasoningEffort>,
pub reasoning_summary: Option<ReasoningSummary>,
pub personality: Option<Personality>,
pub collaboration_mode: CollaborationMode,
pub session_source: SessionSource,
pub thread_source: Option<ThreadSource>,
}
@@ -255,11 +257,40 @@ impl CodexThread {
.await
}
/// Validate persistent turn context overrides without committing them.
/// Preview persistent turn context overrides without committing them.
pub async fn preview_turn_context_overrides(
&self,
overrides: CodexThreadTurnContextOverrides,
) -> ConstraintResult<ThreadConfigSnapshot> {
let updates = self.turn_context_settings_update(overrides).await;
self.codex.session.preview_settings(&updates).await
}
pub async fn validate_turn_context_overrides(
&self,
overrides: CodexThreadTurnContextOverrides,
) -> ConstraintResult<()> {
self.preview_turn_context_overrides(overrides).await?;
Ok(())
}
/// Apply persistent turn context overrides directly and return the effective state.
///
/// This bypasses the submission queue; callers that need ordering relative
/// to turns should submit `Op::TurnContext`.
pub async fn update_turn_context_overrides(
&self,
overrides: CodexThreadTurnContextOverrides,
) -> ConstraintResult<ThreadConfigSnapshot> {
let updates = self.turn_context_settings_update(overrides).await;
self.codex.session.update_settings(updates).await?;
Ok(self.config_snapshot().await)
}
async fn turn_context_settings_update(
&self,
overrides: CodexThreadTurnContextOverrides,
) -> SessionSettingsUpdate {
let CodexThreadTurnContextOverrides {
cwd,
workspace_roots,
@@ -287,7 +318,7 @@ impl CodexThread {
.with_updates(model, effort, /*developer_instructions*/ None)
};
let updates = SessionSettingsUpdate {
SessionSettingsUpdate {
cwd,
workspace_roots,
profile_workspace_roots,
@@ -302,8 +333,7 @@ impl CodexThread {
service_tier,
personality,
..Default::default()
};
self.codex.session.validate_settings(&updates).await
}
}
/// Use sparingly: this is intended to be removed soon.
codex-rs/core/src/session/handlers.rs
+111 -53
View File
@@ -43,7 +43,9 @@ use codex_protocol::protocol::RolloutItem;
use codex_protocol::protocol::ThreadMemoryMode;
use codex_protocol::protocol::ThreadRolledBackEvent;
use codex_protocol::protocol::TurnAbortReason;
use codex_protocol::protocol::TurnContextAppliedEvent;
use codex_protocol::protocol::TurnContextOverrides;
use codex_protocol::protocol::TurnContextSnapshot;
use codex_protocol::protocol::WarningEvent;
use codex_protocol::request_permissions::RequestPermissionsResponse;
use codex_protocol::request_user_input::RequestUserInputResponse;
@@ -91,13 +93,100 @@ pub async fn user_input_or_turn(sess: &Arc<Session>, sub_id: String, op: Op) {
.await;
}
pub async fn update_turn_context(sess: &Arc<Session>, sub_id: String, op: Op) {
let Op::TurnContext { turn_context } = op else {
unreachable!();
};
let updates = turn_context_settings_update(sess, turn_context).await;
let msg = match sess.update_settings(updates).await {
Ok(()) => turn_context_applied_event(sess).await,
Err(err) => EventMsg::Error(ErrorEvent {
message: format!("invalid turn context override: {err}"),
codex_error_info: Some(CodexErrorInfo::Other),
}),
};
sess.send_event_raw(Event { id: sub_id, msg }).await;
}
async fn turn_context_settings_update(
sess: &Session,
turn_context: TurnContextOverrides,
) -> SessionSettingsUpdate {
let TurnContextOverrides {
cwd,
workspace_roots,
profile_workspace_roots,
approval_policy,
approvals_reviewer,
sandbox_policy,
permission_profile,
active_permission_profile,
windows_sandbox_level,
model,
effort,
summary,
service_tier,
collaboration_mode,
personality,
} = turn_context;
let collaboration_mode = match collaboration_mode {
Some(collaboration_mode) => collaboration_mode,
None => {
let state = sess.state.lock().await;
state
.session_configuration
.collaboration_mode
.with_updates(model, effort, /*developer_instructions*/ None)
}
};
SessionSettingsUpdate {
cwd,
workspace_roots,
profile_workspace_roots,
approval_policy,
approvals_reviewer,
sandbox_policy,
permission_profile,
active_permission_profile,
windows_sandbox_level,
collaboration_mode: Some(collaboration_mode),
reasoning_summary: summary,
service_tier,
personality,
..Default::default()
}
}
async fn turn_context_applied_event(sess: &Session) -> EventMsg {
let snapshot = {
let state = sess.state.lock().await;
state.session_configuration.thread_config_snapshot()
};
EventMsg::TurnContextApplied(TurnContextAppliedEvent {
turn_context: TurnContextSnapshot {
model: snapshot.model,
model_provider_id: snapshot.model_provider_id,
service_tier: snapshot.service_tier,
approval_policy: snapshot.approval_policy,
approvals_reviewer: snapshot.approvals_reviewer,
permission_profile: snapshot.permission_profile,
active_permission_profile: snapshot.active_permission_profile,
cwd: snapshot.cwd,
reasoning_effort: snapshot.reasoning_effort,
reasoning_summary: snapshot.reasoning_summary,
personality: snapshot.personality,
collaboration_mode: snapshot.collaboration_mode,
},
})
}
pub(super) async fn user_input_or_turn_inner(
sess: &Arc<Session>,
sub_id: String,
op: Op,
mirror_user_text_to_realtime: Option<()>,
) {
let (items, updates, responsesapi_client_metadata) = match op {
let (items, updates, responsesapi_client_metadata, emit_turn_context_applied) = match op {
Op::UserInput {
items,
environments,
@@ -105,14 +194,20 @@ pub(super) async fn user_input_or_turn_inner(
responsesapi_client_metadata,
turn_context,
} => {
let mut updates = if turn_context == TurnContextOverrides::default() {
SessionSettingsUpdate::default()
} else {
let emit_turn_context_applied = turn_context != TurnContextOverrides::default();
let mut updates = if emit_turn_context_applied {
turn_context_settings_update(sess, turn_context).await
} else {
SessionSettingsUpdate::default()
};
updates.final_output_json_schema = Some(final_output_json_schema);
updates.environments = environments;
(items, updates, responsesapi_client_metadata)
(
items,
updates,
responsesapi_client_metadata,
emit_turn_context_applied,
)
}
_ => unreachable!(),
};
@@ -121,6 +216,13 @@ pub(super) async fn user_input_or_turn_inner(
// new_turn_with_sub_id already emits the error event.
return;
};
if emit_turn_context_applied {
sess.send_event_raw(Event {
id: sub_id.clone(),
msg: turn_context_applied_event(sess).await,
})
.await;
}
sess.maybe_emit_unknown_model_warning_for_turn(current_context.as_ref())
.await;
let accepted_items = match sess
@@ -170,54 +272,6 @@ pub(super) async fn user_input_or_turn_inner(
}
}
async fn turn_context_settings_update(
sess: &Session,
turn_context: TurnContextOverrides,
) -> SessionSettingsUpdate {
let TurnContextOverrides {
cwd,
workspace_roots,
profile_workspace_roots,
approval_policy,
approvals_reviewer,
sandbox_policy,
permission_profile,
active_permission_profile,
windows_sandbox_level,
model,
effort,
summary,
service_tier,
collaboration_mode,
personality,
} = turn_context;
let collaboration_mode = if let Some(collaboration_mode) = collaboration_mode {
collaboration_mode
} else {
let state = sess.state.lock().await;
state
.session_configuration
.collaboration_mode
.with_updates(model, effort, /*developer_instructions*/ None)
};
SessionSettingsUpdate {
cwd,
workspace_roots,
profile_workspace_roots,
approval_policy,
approvals_reviewer,
sandbox_policy,
permission_profile,
active_permission_profile,
windows_sandbox_level,
collaboration_mode: Some(collaboration_mode),
reasoning_summary: summary,
service_tier,
personality,
..Default::default()
}
}
async fn mirror_user_text_to_realtime(sess: &Arc<Session>, items: &[UserInput]) {
let text = UserMessageItem::new(items).message();
if text.is_empty() {
@@ -714,6 +768,10 @@ pub(super) async fn submission_loop(
user_input_or_turn(&sess, sub.id.clone(), sub.op).await;
false
}
Op::TurnContext { .. } => {
update_turn_context(&sess, sub.id.clone(), sub.op).await;
false
}
Op::InterAgentCommunication { communication } => {
inter_agent_communication(&sess, sub.id.clone(), communication).await;
false
codex-rs/core/src/session/mod.rs
+6 -3
View File
@@ -1386,12 +1386,15 @@ impl Session {
Ok(())
}
pub(crate) async fn validate_settings(
pub(crate) async fn preview_settings(
&self,
updates: &SessionSettingsUpdate,
) -> ConstraintResult<()> {
) -> ConstraintResult<ThreadConfigSnapshot> {
let state = self.state.lock().await;
state.session_configuration.apply(updates).map(|_| ())
state
.session_configuration
.apply(updates)
.map(|configuration| configuration.thread_config_snapshot())
}
pub(crate) async fn set_session_startup_prewarm(
codex-rs/core/src/session/session.rs
+2
View File
@@ -178,7 +178,9 @@ impl SessionConfiguration {
profile_workspace_roots: self.profile_workspace_roots().to_vec(),
ephemeral: self.original_config_do_not_use.ephemeral,
reasoning_effort: self.collaboration_mode.reasoning_effort(),
reasoning_summary: self.model_reasoning_summary,
personality: self.personality,
collaboration_mode: self.collaboration_mode.clone(),
session_source: self.session_source.clone(),
thread_source: self.thread_source,
}
codex-rs/core/src/session/tests.rs
+8
View File
@@ -123,6 +123,7 @@ 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;
@@ -5203,6 +5204,13 @@ fn op_kind_for_input_and_context_ops() {
.kind(),
"user_input"
);
assert_eq!(
Op::TurnContext {
turn_context: TurnContextOverrides::default(),
}
.kind(),
"turn_context"
);
}
#[tokio::test]
codex-rs/core/src/session/turn.rs
+1
View File
@@ -1463,6 +1463,7 @@ pub(super) fn realtime_text_for_event(msg: &EventMsg) -> Option<String> {
| EventMsg::ContextCompacted(_)
| EventMsg::ThreadRolledBack(_)
| EventMsg::TurnStarted(_)
| EventMsg::TurnContextApplied(_)
| EventMsg::TurnComplete(_)
| EventMsg::TokenCount(_)
| EventMsg::UserMessage(_)
codex-rs/core/tests/suite/collaboration_instructions.rs
+13 -156
View File
@@ -125,19 +125,8 @@ async fn user_input_includes_collaboration_instructions_after_override() -> Resu
let collaboration_mode = collab_mode_with_instructions(Some(collab_text));
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collaboration_mode),
personality: None,
..Default::default()
})
.await?;
@@ -288,19 +277,8 @@ async fn override_then_next_turn_uses_updated_collaboration_instructions() -> Re
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collaboration_mode),
personality: None,
..Default::default()
})
.await?;
@@ -345,19 +323,8 @@ async fn user_turn_overrides_collaboration_instructions_after_override() -> Resu
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(base_mode),
personality: None,
..Default::default()
})
.await?;
@@ -422,19 +389,8 @@ async fn collaboration_mode_update_emits_new_instruction_message() -> Result<()>
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collab_mode_with_instructions(Some(first_text))),
personality: None,
..Default::default()
})
.await?;
@@ -454,19 +410,8 @@ async fn collaboration_mode_update_emits_new_instruction_message() -> Result<()>
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collab_mode_with_instructions(Some(second_text))),
personality: None,
..Default::default()
})
.await?;
@@ -515,19 +460,8 @@ async fn collaboration_mode_update_noop_does_not_append() -> Result<()> {
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collab_mode_with_instructions(Some(collab_text))),
personality: None,
..Default::default()
})
.await?;
@@ -547,19 +481,8 @@ async fn collaboration_mode_update_noop_does_not_append() -> Result<()> {
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collab_mode_with_instructions(Some(collab_text))),
personality: None,
..Default::default()
})
.await?;
@@ -607,22 +530,11 @@ async fn collaboration_mode_update_emits_new_instruction_message_when_mode_chang
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collab_mode_with_mode_and_instructions(
ModeKind::Default,
Some(default_text),
)),
personality: None,
..Default::default()
})
.await?;
@@ -642,22 +554,11 @@ async fn collaboration_mode_update_emits_new_instruction_message_when_mode_chang
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collab_mode_with_mode_and_instructions(
ModeKind::Plan,
Some(plan_text),
)),
personality: None,
..Default::default()
})
.await?;
@@ -706,22 +607,11 @@ async fn collaboration_mode_update_noop_does_not_append_when_mode_is_unchanged()
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collab_mode_with_mode_and_instructions(
ModeKind::Default,
Some(collab_text),
)),
personality: None,
..Default::default()
})
.await?;
@@ -741,22 +631,11 @@ async fn collaboration_mode_update_noop_does_not_append_when_mode_is_unchanged()
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collab_mode_with_mode_and_instructions(
ModeKind::Default,
Some(collab_text),
)),
personality: None,
..Default::default()
})
.await?;
@@ -811,19 +690,8 @@ async fn resume_replays_collaboration_instructions() -> Result<()> {
initial
.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collab_mode_with_instructions(Some(collab_text))),
personality: None,
..Default::default()
})
.await?;
@@ -882,17 +750,6 @@ async fn empty_collaboration_instructions_are_ignored() -> Result<()> {
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(CollaborationMode {
mode: ModeKind::Default,
settings: Settings {
@@ -901,7 +758,7 @@ async fn empty_collaboration_instructions_are_ignored() -> Result<()> {
developer_instructions: Some("".to_string()),
},
}),
personality: None,
..Default::default()
})
.await?;
codex-rs/core/tests/suite/compact.rs
+1 -12
View File
@@ -3286,18 +3286,7 @@ async fn snapshot_request_shape_pre_turn_compaction_including_incoming_user_mess
codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: Some(PathBuf::from(PRETURN_CONTEXT_DIFF_CWD)),
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await
.expect("override turn context");
codex-rs/core/tests/suite/compact_remote.rs
+2 -24
View File
@@ -2776,18 +2776,7 @@ async fn snapshot_request_shape_remote_pre_turn_compaction_including_incoming_us
codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: Some(PathBuf::from(PRETURN_CONTEXT_DIFF_CWD)),
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
}
@@ -2894,19 +2883,8 @@ async fn snapshot_request_shape_remote_pre_turn_compaction_strips_incoming_model
codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some(next_model.to_string()),
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
codex
codex-rs/core/tests/suite/compact_resume_fork.rs
+1 -11
View File
@@ -551,16 +551,6 @@ async fn snapshot_rollback_followup_turn_trims_context_updates() -> Result<()> {
conversation
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: Some(override_cwd.to_path_buf()),
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(CollaborationMode {
mode: ModeKind::Default,
settings: Settings {
@@ -569,7 +559,7 @@ async fn snapshot_rollback_followup_turn_trims_context_updates() -> Result<()> {
developer_instructions: Some(ROLLED_BACK_DEV_INSTRUCTIONS.to_string()),
},
}),
personality: None,
..Default::default()
})
.await?;
codex-rs/core/tests/suite/model_overrides.rs
+2 -22
View File
@@ -26,19 +26,9 @@ async fn turn_context_update_does_not_persist_when_config_exists() {
codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some("o3".to_string()),
effort: Some(Some(ReasoningEffort::High)),
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await
.expect("submit override");
@@ -66,19 +56,9 @@ async fn turn_context_update_does_not_create_config_file() {
codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some("o3".to_string()),
effort: Some(Some(ReasoningEffort::Medium)),
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await
.expect("submit override");
codex-rs/core/tests/suite/model_switching.rs
+3 -35
View File
@@ -167,19 +167,8 @@ async fn model_change_appends_model_instructions_developer_message() -> Result<(
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some(next_model.to_string()),
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
@@ -248,19 +237,9 @@ async fn model_and_personality_change_only_appends_model_instructions() -> Resul
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some(next_model.to_string()),
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: Some(Personality::Pragmatic),
..Default::default()
})
.await?;
@@ -996,19 +975,8 @@ async fn model_switch_to_smaller_model_updates_token_context_window() -> Result<
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some(smaller_model_slug.to_string()),
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
codex-rs/core/tests/suite/model_visible_layout.rs
+1 -11
View File
@@ -523,18 +523,8 @@ async fn snapshot_model_visible_layout_resume_override_matches_rollout_model() -
.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: Some(resume_override_cwd),
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some("gpt-5.2".to_string()),
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
resumed
codex-rs/core/tests/suite/override_updates.rs
+3 -36
View File
@@ -35,19 +35,8 @@ async fn turn_context_update_without_user_turn_does_not_record_permissions_updat
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
@@ -74,18 +63,7 @@ async fn turn_context_update_without_user_turn_does_not_record_environment_updat
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: Some(new_cwd.path().to_path_buf()),
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
@@ -113,19 +91,8 @@ async fn turn_context_update_without_user_turn_does_not_record_collaboration_upd
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: Some(collaboration_mode),
personality: None,
..Default::default()
})
.await?;
codex-rs/core/tests/suite/permissions_messages.rs
+4 -48
View File
@@ -105,19 +105,8 @@ async fn permissions_message_added_on_override_change() -> Result<()> {
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
@@ -243,19 +232,8 @@ async fn permissions_message_omitted_when_disabled() -> Result<()> {
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
@@ -335,19 +313,8 @@ async fn resume_replays_permissions_messages() -> Result<()> {
initial
.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
@@ -445,19 +412,8 @@ async fn resume_and_fork_append_permissions_messages() -> Result<()> {
initial
.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
codex-rs/core/tests/suite/personality.rs
+4 -48
View File
@@ -338,19 +338,8 @@ async fn user_turn_personality_some_adds_update_message() -> anyhow::Result<()>
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: Some(Personality::Friendly),
..Default::default()
})
.await?;
@@ -423,19 +412,8 @@ async fn user_turn_personality_same_value_does_not_add_update_message() -> anyho
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: Some(Personality::Pragmatic),
..Default::default()
})
.await?;
@@ -521,19 +499,8 @@ async fn user_turn_personality_skips_if_feature_disabled() -> anyhow::Result<()>
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: Some(Personality::Pragmatic),
..Default::default()
})
.await?;
@@ -771,19 +738,8 @@ async fn user_turn_personality_remote_model_template_includes_update_message() -
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: Some(Personality::Friendly),
..Default::default()
})
.await?;
codex-rs/core/tests/suite/prompt_caching.rs
+2 -17
View File
@@ -444,19 +444,12 @@ async fn overrides_turn_context_but_keeps_cached_prefix_and_key_constant() -> an
.expect("workspace profile should have legacy projection");
codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile: Some(permission_profile),
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: Some(Some(ReasoningEffort::High)),
summary: Some(ReasoningSummary::Detailed),
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
@@ -532,19 +525,11 @@ async fn override_before_first_turn_emits_environment_context() -> anyhow::Resul
codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some("gpt-5.4".to_string()),
effort: Some(Some(ReasoningEffort::Low)),
summary: None,
service_tier: None,
collaboration_mode: Some(collaboration_mode),
personality: None,
..Default::default()
})
.await?;
codex-rs/core/tests/suite/remote_models.rs
+2 -24
View File
@@ -640,19 +640,8 @@ async fn remote_models_remote_model_uses_unified_exec() -> Result<()> {
codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some(REMOTE_MODEL_SLUG.to_string()),
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
@@ -901,19 +890,8 @@ async fn remote_models_apply_remote_base_instructions() -> Result<()> {
codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some(model.to_string()),
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
codex-rs/core/tests/suite/resume.rs
+1 -12
View File
@@ -426,19 +426,8 @@ async fn resume_model_switch_is_not_duplicated_after_pre_turn_override() -> Resu
resumed
.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: Some("gpt-5.4".to_string()),
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
resumed
codex-rs/core/tests/suite/review.rs
+1 -12
View File
@@ -792,18 +792,7 @@ async fn review_uses_overridden_cwd_for_base_branch_merge_base() {
codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: Some(repo_path.to_path_buf()),
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
..Default::default()
})
.await
.unwrap();
codex-rs/mcp-server/src/codex_tool_runner.rs
+1
View File
@@ -333,6 +333,7 @@ async fn run_codex_tool_session_inner(
}
EventMsg::AgentReasoningRawContent(_)
| EventMsg::TurnStarted(_)
| EventMsg::TurnContextApplied(_)
| EventMsg::TokenCount(_)
| EventMsg::AgentReasoning(_)
| EventMsg::AgentReasoningSectionBreak(_)
codex-rs/memories/write/src/startup_tests.rs
+1 -12
View File
@@ -244,19 +244,8 @@ async fn memories_startup_phase1_uses_live_thread_service_tier() -> anyhow::Resu
test.codex
.update_turn_context_overrides(codex_core::CodexThreadTurnContextOverrides {
cwd: None,
approval_policy: None,
approvals_reviewer: None,
sandbox_policy: None,
permission_profile: None,
active_permission_profile: None,
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: Some(Some(ServiceTier::Fast.request_value().to_string())),
collaboration_mode: None,
personality: None,
..Default::default()
})
.await?;
codex-rs/protocol/src/protocol.rs
+44 -1
View File
@@ -396,7 +396,8 @@ pub struct ConversationTextParams {
pub text: String,
}
/// Persistent turn-context overrides that can be applied before user input.
/// Persistent turn-context overrides that can be applied before user input or
/// on their own.
#[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq, JsonSchema)]
pub struct TurnContextOverrides {
/// Updated `cwd` for sandbox/tool calls.
@@ -518,6 +519,16 @@ pub enum Op {
turn_context: TurnContextOverrides,
},
/// Apply persistent turn-context overrides without starting a turn.
///
/// This uses the same submission queue as turn starts so app-server can
/// preserve caller order between both kinds of mutation.
TurnContext {
/// Persistent turn-context overrides to apply.
#[serde(flatten)]
turn_context: TurnContextOverrides,
},
/// Inter-agent communication that should be recorded as assistant history
/// while still using the normal thread submission lifecycle.
InterAgentCommunication {
@@ -711,6 +722,7 @@ impl Op {
Self::RealtimeConversationClose => "realtime_conversation_close",
Self::RealtimeConversationListVoices => "realtime_conversation_list_voices",
Self::UserInput { .. } => "user_input",
Self::TurnContext { .. } => "turn_context",
Self::InterAgentCommunication { .. } => "inter_agent_communication",
Self::ExecApproval { .. } => "exec_approval",
Self::PatchApproval { .. } => "patch_approval",
@@ -1162,6 +1174,10 @@ pub enum EventMsg {
#[serde(rename = "task_started", alias = "turn_started")]
TurnStarted(TurnStartedEvent),
/// Persistent turn-context overrides from the correlated submission have
/// been applied to the session configuration.
TurnContextApplied(TurnContextAppliedEvent),
/// Agent has completed all actions.
/// v1 wire format uses `task_complete`; accept `turn_complete` for v2 interop.
#[serde(rename = "task_complete", alias = "turn_complete")]
@@ -1842,6 +1858,33 @@ pub struct TurnStartedEvent {
pub collaboration_mode_kind: ModeKind,
}
#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)]
pub struct TurnContextAppliedEvent {
pub turn_context: TurnContextSnapshot,
}
#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)]
pub struct TurnContextSnapshot {
pub model: String,
pub model_provider_id: String,
#[serde(skip_serializing_if = "Option::is_none")]
pub service_tier: Option<String>,
pub approval_policy: AskForApproval,
pub approvals_reviewer: ApprovalsReviewer,
pub permission_profile: PermissionProfile,
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
pub active_permission_profile: Option<ActivePermissionProfile>,
pub cwd: AbsolutePathBuf,
#[serde(skip_serializing_if = "Option::is_none")]
pub reasoning_effort: Option<ReasoningEffortConfig>,
#[serde(skip_serializing_if = "Option::is_none")]
pub reasoning_summary: Option<ReasoningSummaryConfig>,
#[serde(skip_serializing_if = "Option::is_none")]
pub personality: Option<Personality>,
pub collaboration_mode: CollaborationMode,
}
#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq, Eq, JsonSchema, TS)]
pub struct TokenUsage {
#[ts(type = "number")]
codex-rs/rollout-trace/src/protocol_event.rs
+2
View File
@@ -228,6 +228,7 @@ pub(crate) fn tool_runtime_trace_event(event: &EventMsg) -> Option<ToolRuntimeTr
| EventMsg::ThreadRolledBack(_)
| EventMsg::ThreadGoalUpdated(_)
| EventMsg::TurnStarted(_)
| EventMsg::TurnContextApplied(_)
| EventMsg::TurnComplete(_)
| EventMsg::TokenCount(_)
| EventMsg::AgentMessage(_)
@@ -297,6 +298,7 @@ pub(crate) fn wrapped_protocol_event_type(event: &EventMsg) -> Option<&'static s
| EventMsg::ModelReroute(_)
| EventMsg::ModelVerification(_)
| EventMsg::ContextCompacted(_)
| EventMsg::TurnContextApplied(_)
| EventMsg::TokenCount(_)
| EventMsg::AgentMessage(_)
| EventMsg::UserMessage(_)
codex-rs/rollout/src/policy.rs
+1
View File
@@ -183,6 +183,7 @@ fn event_msg_persistence_mode(ev: &EventMsg) -> Option<EventPersistenceMode> {
| EventMsg::AgentReasoningSectionBreak(_)
| EventMsg::RawResponseItem(_)
| EventMsg::SessionConfigured(_)
| EventMsg::TurnContextApplied(_)
| EventMsg::McpToolCallBegin(_)
| EventMsg::ExecCommandBegin(_)
| EventMsg::TerminalInteraction(_)