Merge 976d8bc18a into sapling-pr-archive-bolinfest

codex-rs/Cargo.lock

@@ -4161,7 +4161,6 @@ dependencies = [
  "codex-model-provider-info",
  "codex-models-manager",
  "codex-protocol",
- "codex-sandboxing",
  "codex-utils-absolute-path",
  "codex-utils-cargo-bin",
  "ctor 0.6.3",

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

@@ -526,7 +526,7 @@ impl Session {
                 model: session_configuration.collaboration_mode.model().to_string(),
                 provider_name: config.model_provider_id.clone(),
                 approval_policy: session_configuration.approval_policy.value().to_string(),
-                sandbox_policy: format!("{:?}", session_configuration.sandbox_policy()),
+                permission_profile: format!("{:?}", session_configuration.permission_profile()),
             };
             let rollout_thread_trace = if matches!(
                 session_configuration.session_source,

codex-rs/core/src/tools/tool_dispatch_trace_tests.rs

@@ -286,7 +286,7 @@ fn attach_test_trace(session: &mut Session, turn: &TurnContext, root: &Path) ->
                 model: "gpt-test".to_string(),
                 provider_name: "test-provider".to_string(),
                 approval_policy: "never".to_string(),
-                sandbox_policy: "danger-full-access".to_string(),
+                permission_profile: "Disabled".to_string(),
             },
         )?;
     rollout_thread_trace.record_codex_turn_started(turn.sub_id.as_str());

codex-rs/core/tests/common/Cargo.toml

@@ -23,7 +23,6 @@ codex-login = { workspace = true }
 codex-model-provider-info = { workspace = true }
 codex-models-manager = { workspace = true }
 codex-protocol = { workspace = true }
-codex-sandboxing = { workspace = true }
 codex-utils-absolute-path = { workspace = true }
 codex-utils-cargo-bin = { workspace = true }
 ctor = { workspace = true }

codex-rs/rollout-trace/src/thread.rs

@@ -58,7 +58,7 @@ pub struct ThreadStartedTraceMetadata {
     pub model: String,
     pub provider_name: String,
     pub approval_policy: String,
-    pub sandbox_policy: String,
+    pub permission_profile: String,
 }
 
 /// Trace-only payload for a child completion notification delivered to its parent.

codex-rs/rollout-trace/src/thread_tests.rs

@@ -37,7 +37,7 @@ fn create_in_root_writes_replayable_lifecycle_events() -> anyhow::Result<()> {
             model: "gpt-test".to_string(),
             provider_name: "test-provider".to_string(),
             approval_policy: "never".to_string(),
-            sandbox_policy: "DangerFullAccess".to_string(),
+            permission_profile: "Disabled".to_string(),
         },
     )?;
 
@@ -84,7 +84,7 @@ fn spawned_thread_start_appends_to_root_bundle() -> anyhow::Result<()> {
         model: "gpt-test".to_string(),
         provider_name: "test-provider".to_string(),
         approval_policy: "never".to_string(),
-        sandbox_policy: "DangerFullAccess".to_string(),
+        permission_profile: "Disabled".to_string(),
     });
     child_trace.record_ended(RolloutStatus::Completed);
     let bundle_dir = single_bundle_dir(temp.path())?;
@@ -201,7 +201,7 @@ fn minimal_metadata(thread_id: ThreadId) -> ThreadStartedTraceMetadata {
         model: "gpt-test".to_string(),
         provider_name: "test-provider".to_string(),
         approval_policy: "never".to_string(),
-        sandbox_policy: "danger-full-access".to_string(),
+        permission_profile: "Disabled".to_string(),
     }
 }