openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-27 18:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Traut
2026-05-16 17:39:28 -07:00
parent 532a6d07bb 9d5a0e2b5d
commit a5f2e7f68f
40 changed files with 0 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/guardian/review_session.rs
-2
View File
@@ -715,11 +715,9 @@ async fn run_review_on_session(
#[allow(deprecated)]
cwd: Some(params.parent_turn.cwd.to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(legacy_sandbox_policy),
permission_profile: Some(guardian_permission_profile),
summary: Some(params.reasoning_summary),
service_tier: None,
personality: params.personality,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
codex-rs/core/src/session/tests.rs
-2
View File
@@ -5227,9 +5227,7 @@ async fn user_turn_updates_approvals_reviewer() {
approval_policy: Some(config.permissions.approval_policy.value()),
approvals_reviewer: Some(codex_config::types::ApprovalsReviewer::AutoReview),
sandbox_policy: Some(config.legacy_sandbox_policy()),
permission_profile: None,
summary: config.model_reasoning_summary,
service_tier: None,
personality: config.personality,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
codex-rs/core/tests/common/test_codex.rs
-3
View File
@@ -772,12 +772,9 @@ impl TestCodex {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(self.config.cwd.to_path_buf()),
approval_policy: Some(approval_policy),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/apply_patch_cli.rs
-4
View File
@@ -95,12 +95,8 @@ async fn submit_without_wait_with_turn_permissions(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(harness.cwd().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/approvals.rs
-7
View File
@@ -657,10 +657,6 @@ async fn submit_turn(
approval_policy: Some(approval_policy),
approvals_reviewer: Some(ApprovalsReviewer::User),
sandbox_policy: Some(sandbox_policy),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -2601,9 +2597,6 @@ async fn matched_prefix_rule_runs_unsandboxed_under_zsh_fork() -> Result<()> {
approvals_reviewer: Some(ApprovalsReviewer::User),
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/client.rs
-8
View File
@@ -1781,16 +1781,12 @@ async fn user_turn_collaboration_mode_overrides_model_and_effort() -> anyhow::Re
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(config.cwd.to_path_buf()),
approval_policy: Some(config.permissions.approval_policy.value()),
approvals_reviewer: None,
sandbox_policy: Some(config.legacy_sandbox_policy()),
permission_profile: None,
summary: Some(
config
.model_reasoning_summary
.unwrap_or(ReasoningSummary::Auto),
),
service_tier: None,
personality: None,
collaboration_mode: Some(collaboration_mode),
..Default::default()
},
@@ -1906,12 +1902,8 @@ async fn user_turn_explicit_reasoning_summary_overrides_model_catalog_default()
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(config.cwd.to_path_buf()),
approval_policy: Some(config.permissions.approval_policy.value()),
approvals_reviewer: None,
sandbox_policy: Some(config.legacy_sandbox_policy()),
permission_profile: None,
summary: Some(ReasoningSummary::Concise),
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/code_mode.rs
-4
View File
@@ -2599,12 +2599,8 @@ text(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/collaboration_instructions.rs
-12
View File
@@ -179,16 +179,12 @@ async fn collaboration_instructions_added_on_user_turn() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.config.cwd.to_path_buf()),
approval_policy: Some(test.config.permissions.approval_policy.value()),
approvals_reviewer: None,
sandbox_policy: Some(test.config.legacy_sandbox_policy()),
permission_profile: None,
summary: Some(
test.config
.model_reasoning_summary
.unwrap_or(codex_protocol::config_types::ReasoningSummary::Auto),
),
service_tier: None,
personality: None,
collaboration_mode: Some(collaboration_mode),
..Default::default()
},
@@ -233,16 +229,12 @@ async fn collaboration_instructions_omitted_when_disabled() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.config.cwd.to_path_buf()),
approval_policy: Some(test.config.permissions.approval_policy.value()),
approvals_reviewer: None,
sandbox_policy: Some(test.config.legacy_sandbox_policy()),
permission_profile: None,
summary: Some(
test.config
.model_reasoning_summary
.unwrap_or(codex_protocol::config_types::ReasoningSummary::Auto),
),
service_tier: None,
personality: None,
collaboration_mode: Some(collaboration_mode),
..Default::default()
},
@@ -340,16 +332,12 @@ async fn user_turn_overrides_collaboration_instructions_after_override() -> Resu
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.config.cwd.to_path_buf()),
approval_policy: Some(test.config.permissions.approval_policy.value()),
approvals_reviewer: None,
sandbox_policy: Some(test.config.legacy_sandbox_policy()),
permission_profile: None,
summary: Some(
test.config
.model_reasoning_summary
.unwrap_or(codex_protocol::config_types::ReasoningSummary::Auto),
),
service_tier: None,
personality: None,
collaboration_mode: Some(turn_mode),
..Default::default()
},
codex-rs/core/tests/suite/compact.rs
-4
View File
@@ -99,12 +99,8 @@ fn disabled_permission_user_turn(text: impl Into<String>, cwd: PathBuf, model: S
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/exec_policy.rs
-8
View File
@@ -57,12 +57,8 @@ async fn submit_user_turn(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.cwd_path().to_path_buf()),
approval_policy: Some(approval_policy),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: collaboration_mode.or({
Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
@@ -148,12 +144,8 @@ async fn execpolicy_blocks_shell_invocation() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.cwd_path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/image_rollout.rs
-8
View File
@@ -130,12 +130,8 @@ async fn copy_paste_local_image_persists_rollout_request_shape() -> anyhow::Resu
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -230,12 +226,8 @@ async fn drag_drop_image_persists_rollout_request_shape() -> anyhow::Result<()>
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/items.rs
-4
View File
@@ -61,12 +61,8 @@ fn disabled_plan_turn(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(collaboration_mode),
..Default::default()
},
codex-rs/core/tests/suite/json_result.rs
-4
View File
@@ -86,12 +86,8 @@ async fn codex_returns_json_result(model: String) -> anyhow::Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/mcp_turn_metadata.rs
-4
View File
@@ -79,12 +79,8 @@ async fn submit_user_turn(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.cwd.path().to_path_buf()),
approval_policy: Some(approval_policy),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: collaboration_mode.or({
Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
codex-rs/core/tests/suite/model_switching.rs
-4
View File
@@ -50,12 +50,8 @@ fn read_only_user_turn(test: &TestCodex, items: Vec<UserInput>, model: String) -
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.cwd_path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/model_visible_layout.rs
-18
View File
@@ -128,12 +128,8 @@ async fn snapshot_model_visible_layout_turn_overrides() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(first_turn_cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(first_sandbox_policy),
permission_profile: first_permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -167,11 +163,8 @@ async fn snapshot_model_visible_layout_turn_overrides() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(preturn_context_diff_cwd),
approval_policy: Some(AskForApproval::OnRequest),
approvals_reviewer: None,
sandbox_policy: Some(second_sandbox_policy),
permission_profile: second_permission_profile,
summary: None,
service_tier: None,
personality: Some(Personality::Friendly),
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
@@ -259,12 +252,8 @@ async fn snapshot_model_visible_layout_cwd_change_does_not_refresh_agents() -> R
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd_one.clone()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(first_sandbox_policy),
permission_profile: first_permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -296,12 +285,8 @@ async fn snapshot_model_visible_layout_cwd_change_does_not_refresh_agents() -> R
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd_two),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(second_sandbox_policy),
permission_profile: second_permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -424,11 +409,8 @@ async fn snapshot_model_visible_layout_resume_with_personality_change() -> Resul
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(resume_override_cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: Some(Personality::Friendly),
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
codex-rs/core/tests/suite/models_cache_ttl.rs
-4
View File
@@ -103,12 +103,8 @@ async fn renews_cache_ttl_on_matching_models_etag() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.cwd_path().to_path_buf()),
approval_policy: Some(codex_protocol::protocol::AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/models_etag_responses.rs
-4
View File
@@ -115,12 +115,8 @@ async fn refresh_models_on_models_etag_mismatch_and_avoid_duplicate_models_fetch
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd_path),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/pending_input.rs
-4
View File
@@ -124,12 +124,8 @@ async fn submit_danger_full_access_user_turn(test: &TestCodex, text: &str) {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.config.cwd.to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/personality.rs
-3
View File
@@ -71,11 +71,8 @@ fn read_only_text_turn_with_personality(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.cwd_path().to_path_buf()),
approval_policy: Some(approval_policy),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
codex-rs/core/tests/suite/prompt_caching.rs
-18
View File
@@ -724,12 +724,9 @@ async fn per_turn_overrides_keep_cached_prefix_and_key_constant() -> anyhow::Res
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(new_cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: Some(ReasoningSummary::Detailed),
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -847,12 +844,8 @@ async fn send_user_turn_with_no_changes_does_not_send_environment_context() -> a
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(default_cwd.to_path_buf()),
approval_policy: Some(default_approval_policy),
approvals_reviewer: None,
sandbox_policy: Some(default_sandbox_policy.clone()),
permission_profile: None,
summary: Some(default_summary.unwrap_or(ReasoningSummary::Auto)),
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -879,12 +872,8 @@ async fn send_user_turn_with_no_changes_does_not_send_environment_context() -> a
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(default_cwd.to_path_buf()),
approval_policy: Some(default_approval_policy),
approvals_reviewer: None,
sandbox_policy: Some(default_sandbox_policy.clone()),
permission_profile: None,
summary: Some(default_summary.unwrap_or(ReasoningSummary::Auto)),
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -994,12 +983,8 @@ async fn send_user_turn_with_changes_sends_environment_context() -> anyhow::Resu
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(default_cwd.to_path_buf()),
approval_policy: Some(default_approval_policy),
approvals_reviewer: None,
sandbox_policy: Some(default_sandbox_policy.clone()),
permission_profile: None,
summary: Some(default_summary.unwrap_or(ReasoningSummary::Auto)),
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -1028,12 +1013,9 @@ async fn send_user_turn_with_changes_sends_environment_context() -> anyhow::Resu
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(default_cwd.to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: Some(ReasoningSummary::Detailed),
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/remote_env.rs
-4
View File
@@ -80,10 +80,6 @@ async fn submit_turn_with_approval_and_environments(
approval_policy: Some(AskForApproval::OnRequest),
approvals_reviewer: Some(ApprovalsReviewer::User),
sandbox_policy: Some(SandboxPolicy::new_read_only_policy()),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/remote_models.rs
-30
View File
@@ -165,12 +165,7 @@ async fn remote_models_config_context_window_override_clamps_to_max_context_wind
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(config.permissions.approval_policy.value()),
approvals_reviewer: None,
sandbox_policy: Some(config.legacy_sandbox_policy()),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -252,12 +247,7 @@ async fn remote_models_config_override_above_max_uses_max_context_window() -> Re
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(config.permissions.approval_policy.value()),
approvals_reviewer: None,
sandbox_policy: Some(config.legacy_sandbox_policy()),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -338,12 +328,7 @@ async fn remote_models_use_context_window_when_config_override_is_absent() -> Re
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(config.permissions.approval_policy.value()),
approvals_reviewer: None,
sandbox_policy: Some(config.legacy_sandbox_policy()),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -437,12 +422,7 @@ async fn remote_models_long_model_slug_is_sent_with_high_reasoning() -> Result<(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(config.permissions.approval_policy.value()),
approvals_reviewer: None,
sandbox_policy: Some(config.legacy_sandbox_policy()),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -507,16 +487,12 @@ async fn namespaced_model_slug_uses_catalog_metadata_without_fallback_warning()
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(config.permissions.approval_policy.value()),
approvals_reviewer: None,
sandbox_policy: Some(config.legacy_sandbox_policy()),
permission_profile: None,
summary: Some(
config
.model_reasoning_summary
.unwrap_or(ReasoningSummary::Auto),
),
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -679,12 +655,9 @@ async fn remote_models_remote_model_uses_unified_exec() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd_path),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: Some(ReasoningSummary::Auto),
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -910,12 +883,9 @@ async fn remote_models_apply_remote_base_instructions() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd_path),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: Some(ReasoningSummary::Auto),
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/request_permissions.rs
-4
View File
@@ -201,10 +201,6 @@ async fn submit_turn(
approval_policy: Some(approval_policy),
approvals_reviewer: Some(ApprovalsReviewer::User),
sandbox_policy: Some(sandbox_policy),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/request_permissions_tool.rs
-3
View File
@@ -156,9 +156,6 @@ async fn submit_turn(
approvals_reviewer,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/request_user_input.rs
-12
View File
@@ -147,12 +147,8 @@ async fn request_user_input_round_trip_for_mode(mode: ModeKind) -> anyhow::Resul
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(CollaborationMode {
mode,
settings: Settings {
@@ -294,12 +290,8 @@ async fn request_user_input_interrupt_emits_deferred_token_count() -> anyhow::Re
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(CollaborationMode {
mode: ModeKind::Plan,
settings: Settings {
@@ -402,12 +394,8 @@ where
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(collaboration_mode),
..Default::default()
},
codex-rs/core/tests/suite/responses_api_proxy_headers.rs
-4
View File
@@ -141,12 +141,8 @@ async fn submit_turn_with_timeout(test: &TestCodex, prompt: &str) -> Result<()>
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::OnRequest),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/rmcp_client.rs
-4
View File
@@ -116,12 +116,8 @@ fn read_only_user_turn_with_model(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/safety_check_downgrade.rs
-4
View File
@@ -48,12 +48,8 @@ fn disabled_text_turn(test: &TestCodex, text: &str) -> Op {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.cwd_path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/shell_snapshot.rs
-16
View File
@@ -170,12 +170,8 @@ async fn run_snapshot_command_with_options(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -274,12 +270,8 @@ async fn run_shell_command_snapshot_with_options(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -358,12 +350,8 @@ async fn run_tool_turn_on_harness(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -605,12 +593,8 @@ async fn shell_command_snapshot_still_intercepts_apply_patch() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.clone()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/skill_approval.rs
-4
View File
@@ -57,12 +57,8 @@ async fn submit_turn_with_policies(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.cwd_path().to_path_buf()),
approval_policy: Some(approval_policy),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/skills.rs
-4
View File
@@ -91,12 +91,8 @@ async fn user_turn_includes_skill_instructions() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.config.cwd.to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/sqlite_state.rs
-4
View File
@@ -416,12 +416,8 @@ async fn mcp_call_marks_thread_memory_mode_polluted_when_configured() -> Result<
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/tool_harness.rs
-20
View File
@@ -113,12 +113,8 @@ async fn shell_command_tool_executes_command_and_streams_output() -> anyhow::Res
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd_path),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -198,12 +194,8 @@ async fn update_plan_tool_emits_plan_update_event() -> anyhow::Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd_path),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -293,12 +285,8 @@ async fn update_plan_tool_rejects_malformed_payload() -> anyhow::Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd_path),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -398,12 +386,8 @@ async fn apply_patch_tool_executes_and_emits_patch_events() -> anyhow::Result<()
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd_path),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -540,12 +524,8 @@ async fn apply_patch_reports_parse_diagnostics() -> anyhow::Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd_path),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/tool_parallelism.rs
-8
View File
@@ -48,12 +48,8 @@ async fn run_turn(test: &TestCodex, prompt: &str) -> anyhow::Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -378,12 +374,8 @@ async fn shell_tools_start_before_response_completed_when_stream_delayed() -> an
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/truncation.rs
-4
View File
@@ -526,12 +526,8 @@ async fn mcp_image_output_preserves_image_and_no_text_summary() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(fixture.cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile: Some(permission_profile),
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/unified_exec.rs
-35
View File
@@ -201,12 +201,7 @@ async fn submit_unified_exec_turn(
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.config.cwd.to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -294,12 +289,7 @@ async fn unified_exec_intercepts_apply_patch_exec_command() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(SandboxPolicy::DangerFullAccess),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -2145,12 +2135,7 @@ async fn unified_exec_keeps_long_running_session_after_turn_end() -> Result<()>
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(SandboxPolicy::DangerFullAccess),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -2249,12 +2234,7 @@ async fn unified_exec_interrupt_preserves_long_running_session() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(SandboxPolicy::DangerFullAccess),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -2732,12 +2712,7 @@ async fn unified_exec_runs_under_sandbox() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(SandboxPolicy::new_read_only_policy()),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -2856,12 +2831,7 @@ async fn unified_exec_enforces_glob_deny_read_policy() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(read_only_policy),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
@@ -2995,12 +2965,7 @@ async fn unified_exec_python_prompt_under_seatbelt() -> Result<()> {
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(SandboxPolicy::new_read_only_policy()),
permission_profile: None,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/user_shell_cmd.rs
-4
View File
@@ -185,12 +185,8 @@ async fn user_shell_command_does_not_replace_active_turn() -> anyhow::Result<()>
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/view_image.rs
-4
View File
@@ -80,12 +80,8 @@ fn disabled_user_turn(test: &TestCodex, items: Vec<UserInput>, model: String) ->
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(test.config.cwd.to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {
codex-rs/core/tests/suite/websocket_fallback.rs
-4
View File
@@ -163,12 +163,8 @@ async fn websocket_fallback_hides_first_websocket_retry_stream_error() -> Result
turn_context: codex_protocol::protocol::TurnContextOverrides {
cwd: Some(cwd.path().to_path_buf()),
approval_policy: Some(AskForApproval::Never),
approvals_reviewer: None,
sandbox_policy: Some(sandbox_policy),
permission_profile,
summary: None,
service_tier: None,
personality: None,
collaboration_mode: Some(codex_protocol::config_types::CollaborationMode {
mode: codex_protocol::config_types::ModeKind::Default,
settings: codex_protocol::config_types::Settings {