protocol: make user-turn sandbox policy optional

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

@@ -703,17 +703,6 @@ async fn run_review_on_session(
         .unwrap_or_default();
 
     let permission_profile = PermissionProfile::read_only();
-    let sandbox_policy =
-        match permission_profile.to_legacy_sandbox_policy(params.parent_turn.cwd.as_path()) {
-            Ok(sandbox_policy) => sandbox_policy,
-            Err(err) => {
-                return (
-                    GuardianReviewSessionOutcome::SessionFailed(err.into()),
-                    false,
-                    analytics_result,
-                );
-            }
-        };
 
     let submit_result = run_before_review_deadline(
         deadline,
@@ -724,7 +713,7 @@ async fn run_review_on_session(
             cwd: params.parent_turn.cwd.to_path_buf(),
             approval_policy: AskForApproval::Never,
             approvals_reviewer: None,
-            sandbox_policy,
+            sandbox_policy: None,
             permission_profile: Some(permission_profile),
             model: params.model.clone(),
             effort: params.reasoning_effort,

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

@@ -156,10 +156,11 @@ pub(super) async fn user_input_or_turn_inner(
                     },
                 })
             });
-            let clear_active_permission_profile = permission_profile.is_none();
+            let clear_active_permission_profile =
+                permission_profile.is_none() && sandbox_policy.is_some();
             let permission_profile = permission_profile_with_legacy_fallback(
                 sess,
-                Some(&sandbox_policy),
+                sandbox_policy.as_ref(),
                 permission_profile,
                 Some(cwd.as_path()),
             )

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

@@ -4257,8 +4257,8 @@ async fn user_turn_updates_approvals_reviewer() {
             cwd: config.cwd.to_path_buf(),
             approval_policy: config.permissions.approval_policy.value(),
             approvals_reviewer: Some(codex_config::types::ApprovalsReviewer::AutoReview),
-            sandbox_policy: config.legacy_sandbox_policy(),
-            permission_profile: None,
+            sandbox_policy: None,
+            permission_profile: Some(config.permissions.permission_profile()),
             model: turn_context.model_info.slug.clone(),
             effort: config.model_reasoning_effort,
             summary: config.model_reasoning_summary,

codex-rs/core/tests/common/test_codex.rs

@@ -34,12 +34,10 @@ use codex_protocol::protocol::AskForApproval;
 use codex_protocol::protocol::EventMsg;
 use codex_protocol::protocol::Op;
 use codex_protocol::protocol::RealtimeConversationVersion as RealtimeWsVersion;
-use codex_protocol::protocol::SandboxPolicy;
 use codex_protocol::protocol::SessionConfiguredEvent;
 use codex_protocol::protocol::SessionSource;
 use codex_protocol::protocol::TurnEnvironmentSelection;
 use codex_protocol::user_input::UserInput;
-use codex_sandboxing::compatibility_sandbox_policy_for_permission_profile;
 use codex_utils_absolute_path::AbsolutePathBuf;
 use futures::future::BoxFuture;
 use serde_json::Value;
@@ -208,16 +206,12 @@ pub enum ShellModelOutput {
 /// construct the op directly.
 pub fn turn_permission_fields(
     permission_profile: PermissionProfile,
-    cwd: &Path,
-) -> (SandboxPolicy, Option<PermissionProfile>) {
-    let file_system_sandbox_policy = permission_profile.file_system_sandbox_policy();
-    let sandbox_policy = compatibility_sandbox_policy_for_permission_profile(
-        &permission_profile,
-        &file_system_sandbox_policy,
-        permission_profile.network_sandbox_policy(),
-        cwd,
-    );
-    (sandbox_policy, Some(permission_profile))
+    _cwd: &Path,
+) -> (
+    Option<codex_protocol::protocol::SandboxPolicy>,
+    Option<PermissionProfile>,
+) {
+    (None, Some(permission_profile))
 }
 
 pub struct TestCodexBuilder {

codex-rs/core/tests/suite/prompt_caching.rs

@@ -446,7 +446,7 @@ async fn overrides_turn_context_but_keeps_cached_prefix_and_key_constant() -> an
             cwd: None,
             approval_policy: Some(AskForApproval::Never),
             approvals_reviewer: None,
-            sandbox_policy: Some(sandbox_policy),
+            sandbox_policy,
             permission_profile,
             windows_sandbox_level: None,
             model: None,

codex-rs/protocol/src/protocol.rs

@@ -529,7 +529,7 @@ pub enum Op {
         /// User input items, see `InputItem`
         items: Vec<UserInput>,
 
-        /// `cwd` to use with the [`SandboxPolicy`] and potentially tool calls
+        /// `cwd` to use with the permissions profile and potentially tool calls
         /// such as `local_shell`.
         cwd: PathBuf,
 
@@ -541,8 +541,13 @@ pub enum Op {
         /// When omitted, the session keeps the current setting
         approvals_reviewer: Option<ApprovalsReviewer>,
 
-        /// Policy to use for tool calls such as `local_shell`.
-        sandbox_policy: SandboxPolicy,
+        /// Legacy sandbox policy to use for tool calls such as `local_shell`.
+        ///
+        /// When omitted, `permission_profile` is used as the canonical source
+        /// of permissions. This field is kept only as a compatibility fallback
+        /// for older callers that have not migrated to `permission_profile`.
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        sandbox_policy: Option<SandboxPolicy>,
 
         /// Full permissions profile to use for tool calls such as `local_shell`.
         ///

codex-rs/tui/src/app_command.rs

@@ -370,26 +370,22 @@ impl AppCommand {
                 final_output_json_schema,
                 collaboration_mode,
                 personality,
-            } => {
-                let sandbox_policy =
-                    legacy_compatible_sandbox_policy(&permission_profile, cwd.as_path());
-                Op::UserTurn {
-                    items,
-                    environments: None,
-                    cwd,
-                    approval_policy,
-                    approvals_reviewer,
-                    sandbox_policy,
-                    permission_profile: Some(permission_profile),
-                    model,
-                    effort,
-                    summary,
-                    service_tier,
-                    final_output_json_schema,
-                    collaboration_mode,
-                    personality,
-                }
-            }
+            } => Op::UserTurn {
+                items,
+                environments: None,
+                cwd,
+                approval_policy,
+                approvals_reviewer,
+                sandbox_policy: None,
+                permission_profile: Some(permission_profile),
+                model,
+                effort,
+                summary,
+                service_tier,
+                final_output_json_schema,
+                collaboration_mode,
+                personality,
+            },
             Self::OverrideTurnContext {
                 cwd,
                 approval_policy,
@@ -606,8 +602,10 @@ impl From<Op> for AppCommand {
                 personality,
             } => {
                 if environments.is_none()
-                    && legacy_compatible_sandbox_policy(&permission_profile, cwd.as_path())
-                        == sandbox_policy
+                    && sandbox_policy.as_ref().is_none_or(|sandbox_policy| {
+                        legacy_compatible_sandbox_policy(&permission_profile, cwd.as_path())
+                            == *sandbox_policy
+                    })
                 {
                     Self::UserTurn {
                         items,