From 1588963deb4fd260f888244081053527e1d23221 Mon Sep 17 00:00:00 2001 From: Michael Bolin Date: Mon, 27 Apr 2026 16:59:45 -0700 Subject: [PATCH 1/3] permissions: make SessionConfigured profile-only --- .../app-server/src/codex_message_processor.rs | 16 +-- codex-rs/core/src/session/session.rs | 4 +- codex-rs/core/src/session/tests.rs | 7 +- codex-rs/exec/src/lib.rs | 5 +- .../tests/event_processor_with_json_output.rs | 5 +- codex-rs/mcp-server/src/outgoing_message.rs | 19 +--- codex-rs/protocol/src/protocol.rs | 103 +++++++++++++++--- codex-rs/tui/src/app/config_persistence.rs | 4 +- codex-rs/tui/src/app/tests.rs | 18 +-- codex-rs/tui/src/chatwidget.rs | 35 +----- .../chatwidget/tests/composer_submission.rs | 29 ++--- .../tui/src/chatwidget/tests/exec_flow.rs | 3 +- .../src/chatwidget/tests/history_replay.rs | 30 ++--- .../tui/src/chatwidget/tests/permissions.rs | 23 ++-- .../tui/src/chatwidget/tests/plan_mode.rs | 6 +- .../src/chatwidget/tests/status_and_layout.rs | 3 +- codex-rs/tui/src/history_cell.rs | 43 ++++++-- 17 files changed, 192 insertions(+), 161 deletions(-) diff --git a/codex-rs/app-server/src/codex_message_processor.rs b/codex-rs/app-server/src/codex_message_processor.rs index 6a1e6fbae8..c625e4c594 100644 --- a/codex-rs/app-server/src/codex_message_processor.rs +++ b/codex-rs/app-server/src/codex_message_processor.rs @@ -4235,9 +4235,9 @@ impl CodexMessageProcessor { thread_status, /*has_live_in_progress_turn*/ false, ); - let permission_profile = thread_response_permission_profile( - codex_thread.config_snapshot().await.permission_profile, - ); + let config_snapshot = codex_thread.config_snapshot().await; + let permission_profile = + thread_response_permission_profile(config_snapshot.permission_profile.clone()); let response = ThreadResumeResponse { thread, @@ -4248,7 +4248,7 @@ impl CodexMessageProcessor { instruction_sources, approval_policy: session_configured.approval_policy.into(), approvals_reviewer: session_configured.approvals_reviewer.into(), - sandbox: session_configured.sandbox_policy.into(), + sandbox: config_snapshot.sandbox_policy.into(), permission_profile, reasoning_effort: session_configured.reasoning_effort, }; @@ -4831,9 +4831,9 @@ impl CodexMessageProcessor { .await, /*has_in_progress_turn*/ false, ); - let permission_profile = thread_response_permission_profile( - forked_thread.config_snapshot().await.permission_profile, - ); + let config_snapshot = forked_thread.config_snapshot().await; + let permission_profile = + thread_response_permission_profile(config_snapshot.permission_profile.clone()); let response = ThreadForkResponse { thread: thread.clone(), @@ -4844,7 +4844,7 @@ impl CodexMessageProcessor { instruction_sources, approval_policy: session_configured.approval_policy.into(), approvals_reviewer: session_configured.approvals_reviewer.into(), - sandbox: session_configured.sandbox_policy.into(), + sandbox: config_snapshot.sandbox_policy.into(), permission_profile, reasoning_effort: session_configured.reasoning_effort, }; diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rs index d4c0d337cf..176865ee6c 100644 --- a/codex-rs/core/src/session/session.rs +++ b/codex-rs/core/src/session/session.rs @@ -867,7 +867,6 @@ impl Session { // Dispatch the SessionConfiguredEvent first and then report any errors. // If resuming, include converted initial messages in the payload so UIs can render them immediately. let initial_messages = initial_history.get_event_msgs(); - let session_sandbox_policy = session_configuration.sandbox_policy(); let events = std::iter::once(Event { id: INITIAL_SUBMIT_ID.to_owned(), msg: EventMsg::SessionConfigured(SessionConfiguredEvent { @@ -879,8 +878,7 @@ impl Session { service_tier: session_configuration.service_tier, approval_policy: session_configuration.approval_policy.value(), approvals_reviewer: session_configuration.approvals_reviewer, - sandbox_policy: session_sandbox_policy.clone(), - permission_profile: Some(session_configuration.permission_profile()), + permission_profile: session_configuration.permission_profile(), cwd: session_configuration.cwd.clone(), reasoning_effort: session_configuration.collaboration_mode.reasoning_effort(), history_log_id, diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs index 283220e8fa..c9416ac2b4 100644 --- a/codex-rs/core/src/session/tests.rs +++ b/codex-rs/core/src/session/tests.rs @@ -1527,17 +1527,12 @@ async fn session_configured_reports_permission_profile_for_external_sandbox() -> let test = builder.build(&server).await?; - assert_eq!( - test.session_configured.sandbox_policy, - expected_sandbox_policy - ); let expected_permission_profile = codex_protocol::models::PermissionProfile::from_legacy_sandbox_policy( &expected_sandbox_policy, ); assert_eq!( - test.session_configured.permission_profile, - Some(expected_permission_profile), + test.session_configured.permission_profile, expected_permission_profile, "ExternalSandbox is represented explicitly instead of as a lossy root-write profile" ); Ok(()) diff --git a/codex-rs/exec/src/lib.rs b/codex-rs/exec/src/lib.rs index 9e9d9bc148..fc3392db2f 100644 --- a/codex-rs/exec/src/lib.rs +++ b/codex-rs/exec/src/lib.rs @@ -1046,8 +1046,9 @@ fn session_configured_from_thread_response( service_tier, approval_policy, approvals_reviewer, - sandbox_policy, - permission_profile, + permission_profile: permission_profile.unwrap_or_else(|| { + PermissionProfile::from_legacy_sandbox_policy_for_cwd(&sandbox_policy, cwd.as_path()) + }), cwd, reasoning_effort, history_log_id: 0, diff --git a/codex-rs/exec/tests/event_processor_with_json_output.rs b/codex-rs/exec/tests/event_processor_with_json_output.rs index 3a7b5d0fcc..23dcd6733a 100644 --- a/codex-rs/exec/tests/event_processor_with_json_output.rs +++ b/codex-rs/exec/tests/event_processor_with_json_output.rs @@ -28,9 +28,9 @@ use codex_app_server_protocol::TurnStartedNotification; use codex_app_server_protocol::TurnStatus; use codex_app_server_protocol::WebSearchAction as ApiWebSearchAction; use codex_protocol::ThreadId; +use codex_protocol::models::PermissionProfile; use codex_protocol::models::WebSearchAction; use codex_protocol::protocol::AskForApproval; -use codex_protocol::protocol::SandboxPolicy; use codex_protocol::protocol::SessionConfiguredEvent; use codex_utils_absolute_path::test_support::PathBufExt; use codex_utils_absolute_path::test_support::test_path_buf; @@ -114,8 +114,7 @@ fn session_configured_produces_thread_started_event() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/tmp/project").abs(), reasoning_effort: None, history_log_id: 0, diff --git a/codex-rs/mcp-server/src/outgoing_message.rs b/codex-rs/mcp-server/src/outgoing_message.rs index 67ceb91dd8..78ef4cacff 100644 --- a/codex-rs/mcp-server/src/outgoing_message.rs +++ b/codex-rs/mcp-server/src/outgoing_message.rs @@ -231,10 +231,10 @@ mod tests { use anyhow::Result; use codex_protocol::ThreadId; + use codex_protocol::models::PermissionProfile; use codex_protocol::openai_models::ReasoningEffort; use codex_protocol::protocol::AskForApproval; use codex_protocol::protocol::EventMsg; - use codex_protocol::protocol::SandboxPolicy; use codex_protocol::protocol::SessionConfiguredEvent; use codex_utils_absolute_path::test_support::PathBufExt; use codex_utils_absolute_path::test_support::test_path_buf; @@ -304,8 +304,7 @@ mod tests { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffort::default()), history_log_id: 1, @@ -349,8 +348,7 @@ mod tests { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffort::default()), history_log_id: 1, @@ -389,9 +387,7 @@ mod tests { "model_provider_id": "test-provider", "approval_policy": "never", "approvals_reviewer": "user", - "sandbox_policy": { - "type": "read-only" - }, + "permission_profile": session_configured_event.permission_profile, "cwd": test_path_buf("/home/user/project"), "reasoning_effort": session_configured_event.reasoning_effort, "history_log_id": session_configured_event.history_log_id, @@ -419,8 +415,7 @@ mod tests { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffort::default()), history_log_id: 1, @@ -460,9 +455,7 @@ mod tests { "model_provider_id": "test-provider", "approval_policy": "never", "approvals_reviewer": "user", - "sandbox_policy": { - "type": "read-only" - }, + "permission_profile": session_configured_event.permission_profile, "cwd": test_path_buf("/home/user/project"), "reasoning_effort": session_configured_event.reasoning_effort, "history_log_id": session_configured_event.history_log_id, diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs index 0e46b97b9f..b7960123aa 100644 --- a/codex-rs/protocol/src/protocol.rs +++ b/codex-rs/protocol/src/protocol.rs @@ -3538,7 +3538,7 @@ pub struct SessionNetworkProxyRuntime { pub socks_addr: String, } -#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)] +#[derive(Debug, Clone, Serialize, JsonSchema, TS)] pub struct SessionConfiguredEvent { pub session_id: ThreadId, #[serde(skip_serializing_if = "Option::is_none")] @@ -3566,16 +3566,8 @@ pub struct SessionConfiguredEvent { #[serde(default)] pub approvals_reviewer: ApprovalsReviewer, - /// Legacy sandbox projection for commands executed in the system. - /// - /// Consumers should prefer `permission_profile` when it is present. This - /// field remains available as a compatibility fallback for older emitters - /// and sessions that only expose legacy sandbox state. - pub sandbox_policy: SandboxPolicy, - /// Canonical effective permissions for commands executed in the session. - #[serde(default, skip_serializing_if = "Option::is_none")] - pub permission_profile: Option, + pub permission_profile: PermissionProfile, /// Working directory that should be treated as the *root* of the /// session. @@ -3606,6 +3598,67 @@ pub struct SessionConfiguredEvent { pub rollout_path: Option, } +impl<'de> Deserialize<'de> for SessionConfiguredEvent { + fn deserialize(deserializer: D) -> Result + where + D: serde::Deserializer<'de>, + { + #[derive(Deserialize)] + struct Wire { + session_id: ThreadId, + forked_from_id: Option, + #[serde(default)] + thread_name: Option, + model: String, + model_provider_id: String, + service_tier: Option, + approval_policy: AskForApproval, + #[serde(default)] + approvals_reviewer: ApprovalsReviewer, + sandbox_policy: Option, + permission_profile: Option, + cwd: AbsolutePathBuf, + reasoning_effort: Option, + history_log_id: u64, + history_entry_count: usize, + initial_messages: Option>, + network_proxy: Option, + rollout_path: Option, + } + + let wire = Wire::deserialize(deserializer)?; + let permission_profile = match (wire.permission_profile, wire.sandbox_policy) { + (Some(permission_profile), _) => permission_profile, + (None, Some(sandbox_policy)) => PermissionProfile::from_legacy_sandbox_policy_for_cwd( + &sandbox_policy, + wire.cwd.as_path(), + ), + (None, None) => { + return Err(serde::de::Error::missing_field("permission_profile")); + } + }; + + Ok(Self { + session_id: wire.session_id, + forked_from_id: wire.forked_from_id, + thread_name: wire.thread_name, + model: wire.model, + model_provider_id: wire.model_provider_id, + service_tier: wire.service_tier, + approval_policy: wire.approval_policy, + approvals_reviewer: wire.approvals_reviewer, + permission_profile, + cwd: wire.cwd, + reasoning_effort: wire.reasoning_effort, + history_log_id: wire.history_log_id, + history_entry_count: wire.history_entry_count, + initial_messages: wire.initial_messages, + network_proxy: wire.network_proxy, + rollout_path: wire.rollout_path, + }) + } +} + #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, TS)] pub struct ThreadNameUpdatedEvent { pub thread_id: ThreadId, @@ -5085,6 +5138,7 @@ mod tests { fn serialize_event() -> Result<()> { let conversation_id = ThreadId::from_string("67e55044-10b1-426f-9247-bb680e5fe0c8")?; let rollout_file = NamedTempFile::new()?; + let permission_profile = PermissionProfile::read_only(); let event = Event { id: "1234".to_string(), msg: EventMsg::SessionConfigured(SessionConfiguredEvent { @@ -5096,8 +5150,7 @@ mod tests { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: permission_profile.clone(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -5117,9 +5170,7 @@ mod tests { "model_provider_id": "openai", "approval_policy": "never", "approvals_reviewer": "user", - "sandbox_policy": { - "type": "read-only" - }, + "permission_profile": permission_profile, "cwd": test_path_buf("/home/user/project"), "reasoning_effort": "medium", "history_log_id": 0, @@ -5131,6 +5182,28 @@ mod tests { Ok(()) } + #[test] + fn deserialize_legacy_session_configured_event_uses_sandbox_policy() -> Result<()> { + let cwd = test_path_buf("/home/user/project"); + let value = json!({ + "session_id": "67e55044-10b1-426f-9247-bb680e5fe0c8", + "model": "codex-mini-latest", + "model_provider_id": "openai", + "approval_policy": "never", + "approvals_reviewer": "user", + "sandbox_policy": { + "type": "read-only" + }, + "cwd": cwd, + "history_log_id": 0, + "history_entry_count": 0, + }); + + let event: SessionConfiguredEvent = serde_json::from_value(value)?; + assert_eq!(event.permission_profile, PermissionProfile::read_only()); + Ok(()) + } + #[test] fn vec_u8_as_base64_serialization_and_deserialization() -> Result<()> { let event = ExecCommandOutputDeltaEvent { diff --git a/codex-rs/tui/src/app/config_persistence.rs b/codex-rs/tui/src/app/config_persistence.rs index 9f6b631226..3164655374 100644 --- a/codex-rs/tui/src/app/config_persistence.rs +++ b/codex-rs/tui/src/app/config_persistence.rs @@ -556,6 +556,7 @@ mod tests { use crate::app::test_support::app_enabled_in_effective_config; use crate::app::test_support::make_test_app; use crate::test_support::PathBufExt; + use codex_protocol::models::PermissionProfile; use codex_protocol::protocol::Event; use codex_protocol::protocol::EventMsg; use codex_protocol::protocol::SessionConfiguredEvent; @@ -653,8 +654,7 @@ mod tests { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: next_cwd.clone().abs(), reasoning_effort: None, history_log_id: 0, diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs index 8a08f8bf16..6c82dac638 100644 --- a/codex-rs/tui/src/app/tests.rs +++ b/codex-rs/tui/src/app/tests.rs @@ -3566,8 +3566,7 @@ async fn render_clear_ui_header_after_long_transcript_for_snapshot() -> String { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/tmp/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::High), history_log_id: 0, @@ -4317,8 +4316,7 @@ async fn backtrack_selection_with_duplicate_history_targets_unique_turn() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: None, history_log_id: 0, @@ -4381,8 +4379,7 @@ async fn backtrack_selection_with_duplicate_history_targets_unique_turn() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: None, history_log_id: 0, @@ -4475,8 +4472,7 @@ async fn backtrack_resubmit_preserves_data_image_urls_in_user_turn() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: None, history_log_id: 0, @@ -4859,8 +4855,7 @@ async fn new_session_requests_shutdown_for_previous_conversation() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: None, history_log_id: 0, @@ -4972,8 +4967,7 @@ async fn clear_only_ui_reset_preserves_chat_session_state() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/tmp/project").abs(), reasoning_effort: None, history_log_id: 0, diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index f69eea4afc..2b18718860 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -142,12 +142,8 @@ use codex_protocol::items::AgentMessageContent; use codex_protocol::items::AgentMessageItem; use codex_protocol::items::UserMessageItem; use codex_protocol::models::MessagePhase; -use codex_protocol::models::PermissionProfile; -use codex_protocol::models::SandboxEnforcement; use codex_protocol::models::local_image_label_text; use codex_protocol::parse_command::ParsedCommand; -use codex_protocol::permissions::FileSystemSandboxPolicy; -use codex_protocol::permissions::NetworkSandboxPolicy; use codex_protocol::plan_tool::PlanItemArg as UpdatePlanItemArg; use codex_protocol::plan_tool::StepStatus as UpdatePlanItemStatus; #[cfg(test)] @@ -1620,8 +1616,7 @@ fn thread_session_state_to_legacy_event( service_tier: session.service_tier, approval_policy: session.approval_policy, approvals_reviewer: session.approvals_reviewer, - sandbox_policy: session.sandbox_policy, - permission_profile: Some(session.permission_profile), + permission_profile: session.permission_profile, cwd: session.cwd, reasoning_effort: session.reasoning_effort, history_log_id: session.history_log_id, @@ -2349,32 +2344,14 @@ impl ChatWidget { self.config.permissions.approval_policy = Constrained::allow_only(event.approval_policy); } - let permission_sync = match event.permission_profile.clone() { - Some(permission_profile) => self - .config - .permissions - .set_permission_profile(permission_profile), - None => self - .config - .permissions - .set_legacy_sandbox_policy(event.sandbox_policy.clone(), event.cwd.as_path()), - }; + let permission_sync = self + .config + .permissions + .set_permission_profile(event.permission_profile.clone()); if let Err(err) = permission_sync { tracing::warn!(%err, "failed to sync permissions from SessionConfigured"); - let permission_profile = event.permission_profile.clone().unwrap_or_else(|| { - let file_system_sandbox_policy = - FileSystemSandboxPolicy::from_legacy_sandbox_policy_for_cwd( - &event.sandbox_policy, - event.cwd.as_path(), - ); - PermissionProfile::from_runtime_permissions_with_enforcement( - SandboxEnforcement::from_legacy_sandbox_policy(&event.sandbox_policy), - &file_system_sandbox_policy, - NetworkSandboxPolicy::from(&event.sandbox_policy), - ) - }); self.config.permissions.permission_profile = - Constrained::allow_only(permission_profile); + Constrained::allow_only(event.permission_profile.clone()); } self.config.approvals_reviewer = event.approvals_reviewer; self.status_line_project_root_name_cache = None; diff --git a/codex-rs/tui/src/chatwidget/tests/composer_submission.rs b/codex-rs/tui/src/chatwidget/tests/composer_submission.rs index 302c4ea38c..d21febaa81 100644 --- a/codex-rs/tui/src/chatwidget/tests/composer_submission.rs +++ b/codex-rs/tui/src/chatwidget/tests/composer_submission.rs @@ -16,8 +16,7 @@ async fn submission_preserves_text_elements_and_local_images() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -121,8 +120,7 @@ async fn submission_includes_configured_permission_profile() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: Some(expected_permission_profile.clone()), + permission_profile: expected_permission_profile.clone(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -172,10 +170,7 @@ async fn submission_keeps_profile_when_legacy_projection_is_external() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::ExternalSandbox { - network_access: codex_protocol::protocol::NetworkAccess::Restricted, - }, - permission_profile: Some(expected_permission_profile.clone()), + permission_profile: expected_permission_profile.clone(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -218,8 +213,7 @@ async fn submission_with_remote_and_local_images_keeps_local_placeholder_numberi service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -314,8 +308,7 @@ async fn enter_with_only_remote_images_submits_user_turn() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -380,8 +373,7 @@ async fn shift_enter_with_only_remote_images_does_not_submit_user_turn() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -421,8 +413,7 @@ async fn enter_with_only_remote_images_does_not_submit_when_modal_is_active() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -462,8 +453,7 @@ async fn enter_with_only_remote_images_does_not_submit_when_input_disabled() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -506,8 +496,7 @@ async fn submission_prefers_selected_duplicate_skill_path() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, diff --git a/codex-rs/tui/src/chatwidget/tests/exec_flow.rs b/codex-rs/tui/src/chatwidget/tests/exec_flow.rs index 4d87914aa4..ec1d03f9fc 100644 --- a/codex-rs/tui/src/chatwidget/tests/exec_flow.rs +++ b/codex-rs/tui/src/chatwidget/tests/exec_flow.rs @@ -1004,8 +1004,7 @@ async fn bang_shell_enter_while_task_running_submits_run_user_shell_command() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, diff --git a/codex-rs/tui/src/chatwidget/tests/history_replay.rs b/codex-rs/tui/src/chatwidget/tests/history_replay.rs index 77f52524f4..443cac0532 100644 --- a/codex-rs/tui/src/chatwidget/tests/history_replay.rs +++ b/codex-rs/tui/src/chatwidget/tests/history_replay.rs @@ -24,8 +24,7 @@ async fn resumed_initial_messages_render_history() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: codex_protocol::models::PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -138,8 +137,7 @@ async fn replayed_user_message_preserves_text_elements_and_local_images() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: codex_protocol::models::PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -200,8 +198,7 @@ async fn replayed_user_message_preserves_remote_image_urls() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: codex_protocol::models::PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -256,7 +253,6 @@ async fn session_configured_syncs_widget_config_permissions_and_cwd() { .expect("set sandbox policy"); chat.config.cwd = test_path_buf("/home/user/main").abs(); - let legacy_fallback_sandbox = SandboxPolicy::new_read_only_policy(); let expected_cwd = test_path_buf("/home/user/sub-agent").abs(); let expected_file_system_policy = FileSystemSandboxPolicy::restricted(vec![ FileSystemSandboxEntry { @@ -289,8 +285,7 @@ async fn session_configured_syncs_widget_config_permissions_and_cwd() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: legacy_fallback_sandbox, - permission_profile: Some(expected_permission_profile.clone()), + permission_profile: expected_permission_profile.clone(), cwd: expected_cwd.clone(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -355,8 +350,9 @@ async fn session_configured_external_sandbox_keeps_external_runtime_policy() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: expected_sandbox.clone(), - permission_profile: None, + permission_profile: codex_protocol::models::PermissionProfile::External { + network: NetworkSandboxPolicy::Restricted, + }, cwd: test_path_buf("/home/user/external").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -405,8 +401,7 @@ async fn replayed_user_message_with_only_remote_images_renders_history_cell() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: codex_protocol::models::PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -459,8 +454,7 @@ async fn replayed_user_message_with_only_local_images_does_not_render_history_ce service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: codex_protocol::models::PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -781,8 +775,7 @@ async fn replayed_reasoning_item_hides_raw_reasoning_when_disabled() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: codex_protocol::models::PermissionProfile::read_only(), cwd: test_project_path().abs(), reasoning_effort: None, history_log_id: 0, @@ -829,8 +822,7 @@ async fn replayed_reasoning_item_shows_raw_reasoning_when_enabled() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: codex_protocol::models::PermissionProfile::read_only(), cwd: test_project_path().abs(), reasoning_effort: None, history_log_id: 0, diff --git a/codex-rs/tui/src/chatwidget/tests/permissions.rs b/codex-rs/tui/src/chatwidget/tests/permissions.rs index 388bc67f81..5018e6fea8 100644 --- a/codex-rs/tui/src/chatwidget/tests/permissions.rs +++ b/codex-rs/tui/src/chatwidget/tests/permissions.rs @@ -483,8 +483,7 @@ async fn permissions_selection_marks_auto_review_current_after_session_configure service_tier: None, approval_policy: AskForApproval::OnRequest, approvals_reviewer: ApprovalsReviewer::AutoReview, - sandbox_policy: SandboxPolicy::new_workspace_write_policy(), - permission_profile: None, + permission_profile: PermissionProfile::workspace_write(), cwd: test_project_path().abs(), reasoning_effort: None, history_log_id: 0, @@ -519,6 +518,16 @@ async fn permissions_selection_marks_auto_review_current_with_custom_workspace_w .set_enabled(Feature::GuardianApproval, /*enabled*/ true); let extra_root = test_path_buf("/tmp/guardian-approvals-extra").abs(); + let cwd = test_project_path().abs(); + let permission_profile = PermissionProfile::from_legacy_sandbox_policy_for_cwd( + &SandboxPolicy::WorkspaceWrite { + writable_roots: vec![extra_root], + network_access: false, + exclude_tmpdir_env_var: false, + exclude_slash_tmp: false, + }, + cwd.as_path(), + ); chat.handle_codex_event(Event { id: "session-configured-custom-workspace".to_string(), @@ -531,14 +540,8 @@ async fn permissions_selection_marks_auto_review_current_with_custom_workspace_w service_tier: None, approval_policy: AskForApproval::OnRequest, approvals_reviewer: ApprovalsReviewer::AutoReview, - sandbox_policy: SandboxPolicy::WorkspaceWrite { - writable_roots: vec![extra_root], - network_access: false, - exclude_tmpdir_env_var: false, - exclude_slash_tmp: false, - }, - permission_profile: None, - cwd: test_project_path().abs(), + permission_profile, + cwd, reasoning_effort: None, history_log_id: 0, history_entry_count: 0, diff --git a/codex-rs/tui/src/chatwidget/tests/plan_mode.rs b/codex-rs/tui/src/chatwidget/tests/plan_mode.rs index 65f6ae0c31..c6e1f73763 100644 --- a/codex-rs/tui/src/chatwidget/tests/plan_mode.rs +++ b/codex-rs/tui/src/chatwidget/tests/plan_mode.rs @@ -1059,8 +1059,7 @@ async fn submit_user_message_emits_structured_plugin_mentions_from_bindings() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, @@ -1305,8 +1304,7 @@ async fn plan_slash_command_with_args_submits_prompt_in_plan_mode() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, diff --git a/codex-rs/tui/src/chatwidget/tests/status_and_layout.rs b/codex-rs/tui/src/chatwidget/tests/status_and_layout.rs index d7aefbe4b4..19890a5d3c 100644 --- a/codex-rs/tui/src/chatwidget/tests/status_and_layout.rs +++ b/codex-rs/tui/src/chatwidget/tests/status_and_layout.rs @@ -1741,8 +1741,7 @@ async fn session_configured_clears_goal_status_footer() { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), history_log_id: 0, diff --git a/codex-rs/tui/src/history_cell.rs b/codex-rs/tui/src/history_cell.rs index 33e2f25c63..af19f064f4 100644 --- a/codex-rs/tui/src/history_cell.rs +++ b/codex-rs/tui/src/history_cell.rs @@ -54,6 +54,8 @@ use codex_protocol::account::PlanType; use codex_protocol::mcp::Resource; #[cfg(test)] use codex_protocol::mcp::ResourceTemplate; +use codex_protocol::models::ManagedFileSystemPermissions; +use codex_protocol::models::PermissionProfile; use codex_protocol::models::WebSearchAction; use codex_protocol::models::local_image_label_text; use codex_protocol::openai_models::ReasoningEffort as ReasoningEffortConfig; @@ -64,7 +66,6 @@ use codex_protocol::protocol::AskForApproval; use codex_protocol::protocol::FileChange; use codex_protocol::protocol::McpAuthStatus; use codex_protocol::protocol::McpInvocation; -use codex_protocol::protocol::SandboxPolicy; use codex_protocol::protocol::SessionConfiguredEvent; use codex_protocol::request_user_input::RequestUserInputAnswer; use codex_protocol::request_user_input::RequestUserInputQuestion; @@ -1240,7 +1241,7 @@ pub(crate) fn new_session_info( model, reasoning_effort, approval_policy, - sandbox_policy, + permission_profile, .. } = event; // Header box rendered as history (so it appears at the very top) @@ -1251,7 +1252,7 @@ pub(crate) fn new_session_info( config.cwd.to_path_buf(), CODEX_CLI_VERSION, ) - .with_yolo_mode(has_yolo_permissions(approval_policy, &sandbox_policy)); + .with_yolo_mode(has_yolo_permissions(approval_policy, &permission_profile)); let mut parts: Vec> = vec![Box::new(header)]; if is_first_event { @@ -1313,14 +1314,23 @@ pub(crate) fn new_session_info( pub(crate) fn is_yolo_mode(config: &Config) -> bool { has_yolo_permissions( config.permissions.approval_policy.value(), - &config - .permissions - .legacy_sandbox_policy(config.cwd.as_path()), + &config.permissions.permission_profile(), ) } -fn has_yolo_permissions(approval_policy: AskForApproval, sandbox_policy: &SandboxPolicy) -> bool { - approval_policy == AskForApproval::Never && *sandbox_policy == SandboxPolicy::DangerFullAccess +fn has_yolo_permissions( + approval_policy: AskForApproval, + permission_profile: &PermissionProfile, +) -> bool { + approval_policy == AskForApproval::Never + && matches!( + permission_profile, + PermissionProfile::Disabled + | PermissionProfile::Managed { + file_system: ManagedFileSystemPermissions::Unrestricted, + network: codex_protocol::protocol::NetworkSandboxPolicy::Enabled, + } + ) } pub(crate) fn new_user_prompt( @@ -2993,7 +3003,6 @@ mod tests { use codex_protocol::parse_command::ParsedCommand; use codex_protocol::protocol::AskForApproval; use codex_protocol::protocol::McpAuthStatus; - use codex_protocol::protocol::SandboxPolicy; use codex_protocol::protocol::SessionConfiguredEvent; use dirs::home_dir; use pretty_assertions::assert_eq; @@ -3184,8 +3193,7 @@ mod tests { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), - permission_profile: None, + permission_profile: PermissionProfile::read_only(), cwd: test_path_buf("/tmp/project").abs(), reasoning_effort: None, history_log_id: 0, @@ -4205,6 +4213,19 @@ mod tests { insta::assert_snapshot!(rendered); } + #[test] + fn yolo_mode_includes_managed_full_access_profiles() { + let permission_profile = PermissionProfile::Managed { + file_system: ManagedFileSystemPermissions::Unrestricted, + network: codex_protocol::protocol::NetworkSandboxPolicy::Enabled, + }; + + assert!(has_yolo_permissions( + AskForApproval::Never, + &permission_profile + )); + } + #[test] fn session_header_directory_center_truncates() { let mut dir = home_dir().expect("home directory"); From dd9545ccdf4e7f8bdde53f0abefcdc31e03e4b79 Mon Sep 17 00:00:00 2001 From: Michael Bolin Date: Mon, 27 Apr 2026 17:11:10 -0700 Subject: [PATCH 2/3] permissions: derive snapshot sandbox projections --- .../app-server/src/codex_message_processor.rs | 18 +++++++++--------- codex-rs/core/src/codex_thread.rs | 13 ++++++++++++- codex-rs/core/src/memories/tests.rs | 8 ++++---- codex-rs/core/src/session/session.rs | 1 - .../src/tools/handlers/multi_agents_tests.rs | 2 +- 5 files changed, 26 insertions(+), 16 deletions(-) diff --git a/codex-rs/app-server/src/codex_message_processor.rs b/codex-rs/app-server/src/codex_message_processor.rs index c625e4c594..49eef9a813 100644 --- a/codex-rs/app-server/src/codex_message_processor.rs +++ b/codex-rs/app-server/src/codex_message_processor.rs @@ -2712,6 +2712,7 @@ impl CodexMessageProcessor { /*has_in_progress_turn*/ false, ); + let sandbox = config_snapshot.sandbox_policy().into(); let permission_profile = thread_response_permission_profile(config_snapshot.permission_profile); @@ -2724,7 +2725,7 @@ impl CodexMessageProcessor { instruction_sources, approval_policy: config_snapshot.approval_policy.into(), approvals_reviewer: config_snapshot.approvals_reviewer.into(), - sandbox: config_snapshot.sandbox_policy.into(), + sandbox, permission_profile, reasoning_effort: config_snapshot.reasoning_effort, }; @@ -3284,7 +3285,7 @@ impl CodexMessageProcessor { builder.model_provider = Some(model_provider.clone()); builder.cwd = config_snapshot.cwd.to_path_buf(); builder.cli_version = Some(env!("CARGO_PKG_VERSION").to_string()); - builder.sandbox_policy = config_snapshot.sandbox_policy.clone(); + builder.sandbox_policy = config_snapshot.sandbox_policy(); builder.approval_mode = config_snapshot.approval_policy; let metadata = builder.build(model_provider.as_str()); if let Err(err) = state_db_ctx.insert_thread_if_absent(&metadata).await { @@ -4248,7 +4249,7 @@ impl CodexMessageProcessor { instruction_sources, approval_policy: session_configured.approval_policy.into(), approvals_reviewer: session_configured.approvals_reviewer.into(), - sandbox: config_snapshot.sandbox_policy.into(), + sandbox: config_snapshot.sandbox_policy().into(), permission_profile, reasoning_effort: session_configured.reasoning_effort, }; @@ -4844,7 +4845,7 @@ impl CodexMessageProcessor { instruction_sources, approval_policy: session_configured.approval_policy.into(), approvals_reviewer: session_configured.approvals_reviewer.into(), - sandbox: config_snapshot.sandbox_policy.into(), + sandbox: config_snapshot.sandbox_policy().into(), permission_profile, reasoning_effort: session_configured.reasoning_effort, }; @@ -8085,13 +8086,13 @@ async fn handle_pending_thread_resume_request( tracing::warn!("failed to apply goal resume runtime effects: {err}"); } + let sandbox_policy = pending.config_snapshot.sandbox_policy(); let ThreadConfigSnapshot { model, model_provider_id, service_tier, approval_policy, approvals_reviewer, - sandbox_policy, permission_profile, cwd, reasoning_effort, @@ -8314,8 +8315,9 @@ fn collect_resume_override_mismatches( } } if let Some(requested_sandbox) = request.sandbox.as_ref() { + let active_sandbox = config_snapshot.sandbox_policy(); let sandbox_matches = matches!( - (requested_sandbox, &config_snapshot.sandbox_policy), + (requested_sandbox, &active_sandbox), ( SandboxMode::ReadOnly, codex_protocol::protocol::SandboxPolicy::ReadOnly { .. } @@ -8332,8 +8334,7 @@ fn collect_resume_override_mismatches( ); if !sandbox_matches { mismatch_details.push(format!( - "sandbox requested={requested_sandbox:?} active={:?}", - config_snapshot.sandbox_policy + "sandbox requested={requested_sandbox:?} active={active_sandbox:?}" )); } } @@ -10019,7 +10020,6 @@ mod tests { service_tier: Some(codex_protocol::config_types::ServiceTier::Flex), approval_policy: codex_protocol::protocol::AskForApproval::OnRequest, approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, - sandbox_policy: codex_protocol::protocol::SandboxPolicy::DangerFullAccess, permission_profile: codex_protocol::models::PermissionProfile::Disabled, cwd, ephemeral: false, diff --git a/codex-rs/core/src/codex_thread.rs b/codex-rs/core/src/codex_thread.rs index 7454b98651..fa4bd8067c 100644 --- a/codex-rs/core/src/codex_thread.rs +++ b/codex-rs/core/src/codex_thread.rs @@ -47,7 +47,6 @@ pub struct ThreadConfigSnapshot { pub service_tier: Option, pub approval_policy: AskForApproval, pub approvals_reviewer: ApprovalsReviewer, - pub sandbox_policy: SandboxPolicy, pub permission_profile: PermissionProfile, pub cwd: AbsolutePathBuf, pub ephemeral: bool, @@ -56,6 +55,18 @@ pub struct ThreadConfigSnapshot { pub session_source: SessionSource, } +impl ThreadConfigSnapshot { + pub fn sandbox_policy(&self) -> SandboxPolicy { + let file_system_sandbox_policy = self.permission_profile.file_system_sandbox_policy(); + codex_sandboxing::compatibility_sandbox_policy_for_permission_profile( + &self.permission_profile, + &file_system_sandbox_policy, + self.permission_profile.network_sandbox_policy(), + self.cwd.as_path(), + ) + } +} + /// Turn context overrides that app-server validates before starting a turn. #[derive(Clone, Default)] pub struct CodexThreadTurnContextOverrides { diff --git a/codex-rs/core/src/memories/tests.rs b/codex-rs/core/src/memories/tests.rs index c00c77b8e4..cbf7222b1a 100644 --- a/codex-rs/core/src/memories/tests.rs +++ b/codex-rs/core/src/memories/tests.rs @@ -883,11 +883,11 @@ mod phase2 { config_snapshot.cwd.as_path(), memory_root(&harness.config.codex_home).as_path() ); - match &config_snapshot.sandbox_policy { + let sandbox_policy = config_snapshot.sandbox_policy(); + match &sandbox_policy { SandboxPolicy::WorkspaceWrite { network_access, .. } => { assert!(!*network_access); - let effective_writable_roots: Vec<_> = config_snapshot - .sandbox_policy + let effective_writable_roots: Vec<_> = sandbox_policy .get_writable_roots_with_cwd(config_snapshot.cwd.as_path()) .into_iter() .map(|root| root.root) @@ -917,7 +917,7 @@ mod phase2 { let file_system_sandbox_policy = turn_context.file_system_sandbox_policy(); let legacy_file_system_sandbox_policy = FileSystemSandboxPolicy::from_legacy_sandbox_policy_for_cwd( - &config_snapshot.sandbox_policy, + &sandbox_policy, config_snapshot.cwd.as_path(), ); assert!( diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rs index 176865ee6c..1d37db1b8d 100644 --- a/codex-rs/core/src/session/session.rs +++ b/codex-rs/core/src/session/session.rs @@ -126,7 +126,6 @@ impl SessionConfiguration { service_tier: self.service_tier, approval_policy: self.approval_policy.value(), approvals_reviewer: self.approvals_reviewer, - sandbox_policy: self.sandbox_policy(), permission_profile: self.permission_profile(), cwd: self.cwd.clone(), ephemeral: self.original_config_do_not_use.ephemeral, diff --git a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs index 64cc9db032..fc861be61c 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs @@ -2143,7 +2143,7 @@ async fn spawn_agent_reapplies_runtime_sandbox_after_role_config() { .expect("spawned agent thread should exist") .config_snapshot() .await; - assert_eq!(snapshot.sandbox_policy, expected_sandbox); + assert_eq!(snapshot.sandbox_policy(), expected_sandbox); assert_eq!(snapshot.approval_policy, AskForApproval::OnRequest); assert_eq!(snapshot.permission_profile, expected_permission_profile); let child_thread = manager From 88df7ef0b887fe5ae4f082b7d7c3d49cb8a5f35d Mon Sep 17 00:00:00 2001 From: Michael Bolin Date: Mon, 27 Apr 2026 17:11:10 -0700 Subject: [PATCH 3/3] permissions: store thread sessions as profiles --- codex-rs/tui/src/app/tests.rs | 9 +------ codex-rs/tui/src/app/thread_events.rs | 2 -- codex-rs/tui/src/app/thread_session_state.rs | 26 +------------------- codex-rs/tui/src/app_server_session.rs | 4 --- 4 files changed, 2 insertions(+), 39 deletions(-) diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs index 6c82dac638..9477030bc5 100644 --- a/codex-rs/tui/src/app/tests.rs +++ b/codex-rs/tui/src/app/tests.rs @@ -2211,7 +2211,6 @@ async fn inactive_thread_approval_bubbles_into_active_view() -> Result<()> { /*capacity*/ 1, ThreadSessionState { approval_policy: AskForApproval::OnRequest, - sandbox_policy: SandboxPolicy::new_workspace_write_policy(), permission_profile: PermissionProfile::workspace_write(), rollout_path: Some(test_path_buf("/tmp/agent-rollout.jsonl")), ..test_thread_session(agent_thread_id, test_path_buf("/tmp/agent")) @@ -2371,7 +2370,6 @@ async fn side_defers_subagent_approval_overlay_until_side_exits() -> Result<()> /*capacity*/ 4, ThreadSessionState { approval_policy: AskForApproval::OnRequest, - sandbox_policy: SandboxPolicy::new_workspace_write_policy(), permission_profile: PermissionProfile::workspace_write(), rollout_path: Some(test_path_buf("/tmp/agent-rollout.jsonl")), ..test_thread_session(agent_thread_id, test_path_buf("/tmp/agent")) @@ -2663,7 +2661,6 @@ async fn inactive_thread_approval_badge_clears_after_turn_completion_notificatio /*capacity*/ 4, ThreadSessionState { approval_policy: AskForApproval::OnRequest, - sandbox_policy: SandboxPolicy::new_workspace_write_policy(), permission_profile: PermissionProfile::workspace_write(), rollout_path: Some(test_path_buf("/tmp/agent-rollout.jsonl")), ..test_thread_session(agent_thread_id, test_path_buf("/tmp/agent")) @@ -2717,7 +2714,6 @@ async fn inactive_thread_started_notification_initializes_replay_session() -> Re ThreadId::from_string("00000000-0000-0000-0000-000000000202").expect("valid thread"); let primary_session = ThreadSessionState { approval_policy: AskForApproval::OnRequest, - sandbox_policy: SandboxPolicy::new_workspace_write_policy(), permission_profile: PermissionProfile::workspace_write(), ..test_thread_session(main_thread_id, test_path_buf("/tmp/main")) }; @@ -2742,7 +2738,7 @@ async fn inactive_thread_started_notification_initializes_replay_session() -> Re current_date: None, timezone: None, approval_policy: primary_session.approval_policy, - sandbox_policy: primary_session.sandbox_policy.clone(), + sandbox_policy: SandboxPolicy::new_workspace_write_policy(), permission_profile: None, network: None, file_system_sandbox_policy: None, @@ -2830,7 +2826,6 @@ async fn inactive_thread_started_notification_preserves_primary_model_when_path_ ThreadId::from_string("00000000-0000-0000-0000-000000000302").expect("valid thread"); let primary_session = ThreadSessionState { approval_policy: AskForApproval::OnRequest, - sandbox_policy: SandboxPolicy::new_workspace_write_policy(), permission_profile: PermissionProfile::workspace_write(), ..test_thread_session(main_thread_id, test_path_buf("/tmp/main")) }; @@ -2899,7 +2894,6 @@ async fn thread_read_session_state_does_not_reuse_primary_permission_profile() { ThreadId::from_string("00000000-0000-0000-0000-000000000402").expect("valid thread"); let primary_session = ThreadSessionState { approval_policy: AskForApproval::OnRequest, - sandbox_policy: SandboxPolicy::new_workspace_write_policy(), permission_profile: PermissionProfile::workspace_write(), ..test_thread_session(main_thread_id, test_path_buf("/tmp/main")) }; @@ -3803,7 +3797,6 @@ fn test_thread_session(thread_id: ThreadId, cwd: PathBuf) -> ThreadSessionState service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), permission_profile: PermissionProfile::read_only(), cwd: cwd.abs(), instruction_source_paths: Vec::new(), diff --git a/codex-rs/tui/src/app/thread_events.rs b/codex-rs/tui/src/app/thread_events.rs index d73c39dfea..10fc370f58 100644 --- a/codex-rs/tui/src/app/thread_events.rs +++ b/codex-rs/tui/src/app/thread_events.rs @@ -335,7 +335,6 @@ mod tests { use codex_config::types::ApprovalsReviewer; use codex_protocol::models::PermissionProfile; use codex_protocol::protocol::AskForApproval; - use codex_protocol::protocol::SandboxPolicy; use pretty_assertions::assert_eq; use std::path::PathBuf; @@ -350,7 +349,6 @@ mod tests { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), permission_profile: PermissionProfile::read_only(), cwd: cwd.abs(), instruction_source_paths: Vec::new(), diff --git a/codex-rs/tui/src/app/thread_session_state.rs b/codex-rs/tui/src/app/thread_session_state.rs index a0ba5bdc30..0ff1cec26b 100644 --- a/codex-rs/tui/src/app/thread_session_state.rs +++ b/codex-rs/tui/src/app/thread_session_state.rs @@ -4,7 +4,6 @@ use crate::read_session_model; use codex_app_server_protocol::Thread; use codex_protocol::ThreadId; use codex_protocol::models::PermissionProfile; -use codex_protocol::protocol::SandboxPolicy; impl App { pub(super) async fn sync_active_thread_permission_settings_to_cached_session(&mut self) { @@ -14,10 +13,6 @@ impl App { let approval_policy = self.config.permissions.approval_policy.value(); let approvals_reviewer = self.config.approvals_reviewer; - let sandbox_policy = self - .config - .permissions - .legacy_sandbox_policy(self.config.cwd.as_path()); let permission_profile = self .chat_widget .config_ref() @@ -26,7 +21,6 @@ impl App { let update_session = |session: &mut ThreadSessionState| { session.approval_policy = approval_policy; session.approvals_reviewer = approvals_reviewer; - session.sandbox_policy = sandbox_policy.clone(); session.permission_profile = permission_profile.clone(); }; @@ -49,7 +43,6 @@ impl App { thread_id: ThreadId, thread: &Thread, ) -> ThreadSessionState { - let sandbox_policy = self.active_legacy_sandbox_policy_for_cwd(thread.cwd.as_path()); let permission_profile = self.active_permission_profile(); let mut session = self .primary_session_configured @@ -64,7 +57,6 @@ impl App { service_tier: self.chat_widget.current_service_tier(), approval_policy: self.config.permissions.approval_policy.value(), approvals_reviewer: self.config.approvals_reviewer, - sandbox_policy: sandbox_policy.clone(), permission_profile: permission_profile.clone(), cwd: thread.cwd.clone(), instruction_source_paths: Vec::new(), @@ -78,7 +70,6 @@ impl App { session.thread_name = thread.name.clone(); session.model_provider_id = thread.model_provider.clone(); session.cwd = thread.cwd.clone(); - session.sandbox_policy = sandbox_policy; session.permission_profile = permission_profile; session.instruction_source_paths = Vec::new(); session.rollout_path = thread.path.clone(); @@ -100,13 +91,6 @@ impl App { .permissions .permission_profile() } - - fn active_legacy_sandbox_policy_for_cwd(&self, cwd: &std::path::Path) -> SandboxPolicy { - self.chat_widget - .config_ref() - .permissions - .legacy_sandbox_policy(cwd) - } } #[cfg(test)] @@ -141,7 +125,6 @@ mod tests { service_tier: None, approval_policy: AskForApproval::Never, approvals_reviewer: ApprovalsReviewer::User, - sandbox_policy: SandboxPolicy::new_read_only_policy(), permission_profile: PermissionProfile::read_only(), cwd: cwd.abs(), instruction_source_paths: Vec::new(), @@ -163,7 +146,7 @@ mod tests { let main_session = test_thread_session(main_thread_id, test_path_buf("/tmp/main")); let side_session = ThreadSessionState { approval_policy: AskForApproval::OnRequest, - sandbox_policy: SandboxPolicy::new_workspace_write_policy(), + permission_profile: PermissionProfile::workspace_write(), ..test_thread_session(side_thread_id, test_path_buf("/tmp/side")) }; @@ -215,7 +198,6 @@ mod tests { let expected_main_session = ThreadSessionState { approval_policy: AskForApproval::OnRequest, approvals_reviewer: ApprovalsReviewer::AutoReview, - sandbox_policy: expected_sandbox_policy, permission_profile: expected_permission_profile, ..main_session }; @@ -348,17 +330,11 @@ mod tests { .session_state_for_thread_read(read_thread_id, &read_thread) .await; - let expected_sandbox_policy = app - .chat_widget - .config_ref() - .permissions - .legacy_sandbox_policy(read_thread.cwd.as_path()); let expected_permission_profile = app .chat_widget .config_ref() .permissions .permission_profile(); - assert_eq!(session.sandbox_policy, expected_sandbox_policy); assert_eq!(session.permission_profile, expected_permission_profile); assert_ne!( session.permission_profile, diff --git a/codex-rs/tui/src/app_server_session.rs b/codex-rs/tui/src/app_server_session.rs index 5a33896dd3..0d38449db9 100644 --- a/codex-rs/tui/src/app_server_session.rs +++ b/codex-rs/tui/src/app_server_session.rs @@ -156,9 +156,6 @@ pub(crate) struct ThreadSessionState { pub(crate) service_tier: Option, pub(crate) approval_policy: AskForApproval, pub(crate) approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer, - /// Legacy sandbox projection kept only for compatibility fields that have - /// not migrated to `PermissionProfile` yet. - pub(crate) sandbox_policy: SandboxPolicy, /// Canonical active permissions for this session. Legacy app-server /// responses are converted to a profile at ingestion time using the /// response cwd so cached sessions do not reinterpret cwd-bound grants. @@ -1420,7 +1417,6 @@ async fn thread_session_state_from_thread_response( service_tier, approval_policy, approvals_reviewer, - sandbox_policy, permission_profile, cwd, instruction_source_paths,