diff --git a/codex-rs/analytics/src/analytics_client_tests.rs b/codex-rs/analytics/src/analytics_client_tests.rs index 091a85e11f..61bbd35cb7 100644 --- a/codex-rs/analytics/src/analytics_client_tests.rs +++ b/codex-rs/analytics/src/analytics_client_tests.rs @@ -223,6 +223,7 @@ fn sample_thread_start_response( approvals_reviewer: AppServerApprovalsReviewer::User, sandbox: AppServerSandboxPolicy::DangerFullAccess, active_permission_profile: None, + active_permission_preset_id: None, reasoning_effort: None, multi_agent_mode: Default::default(), }) @@ -288,6 +289,7 @@ fn sample_thread_resume_response_with_source( approvals_reviewer: AppServerApprovalsReviewer::User, sandbox: AppServerSandboxPolicy::DangerFullAccess, active_permission_profile: None, + active_permission_preset_id: None, reasoning_effort: None, multi_agent_mode: Default::default(), initial_turns_page: None, diff --git a/codex-rs/analytics/src/client_tests.rs b/codex-rs/analytics/src/client_tests.rs index a14fe7bf2d..d81ddf7fbd 100644 --- a/codex-rs/analytics/src/client_tests.rs +++ b/codex-rs/analytics/src/client_tests.rs @@ -313,6 +313,7 @@ fn sample_thread_start_response() -> ClientResponsePayload { approvals_reviewer: AppServerApprovalsReviewer::User, sandbox: AppServerSandboxPolicy::DangerFullAccess, active_permission_profile: None, + active_permission_preset_id: None, reasoning_effort: None, multi_agent_mode: Default::default(), }) @@ -331,6 +332,7 @@ fn sample_thread_resume_response() -> ClientResponsePayload { approvals_reviewer: AppServerApprovalsReviewer::User, sandbox: AppServerSandboxPolicy::DangerFullAccess, active_permission_profile: None, + active_permission_preset_id: None, reasoning_effort: None, multi_agent_mode: Default::default(), initial_turns_page: None, @@ -350,6 +352,7 @@ fn sample_thread_fork_response() -> ClientResponsePayload { approvals_reviewer: AppServerApprovalsReviewer::User, sandbox: AppServerSandboxPolicy::DangerFullAccess, active_permission_profile: None, + active_permission_preset_id: None, reasoning_effort: None, multi_agent_mode: Default::default(), }) diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json index 0df2583ef7..b2be46f1f3 100644 --- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json +++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json @@ -12990,39 +12990,6 @@ } ] }, - "PermissionPreset": { - "properties": { - "approvalPolicy": { - "$ref": "#/definitions/v2/AskForApproval" - }, - "approvalsReviewer": { - "$ref": "#/definitions/v2/ApprovalsReviewer" - }, - "description": { - "type": [ - "string", - "null" - ] - }, - "id": { - "type": "string" - }, - "isDefault": { - "type": "boolean" - }, - "permissionProfileId": { - "type": "string" - } - }, - "required": [ - "approvalPolicy", - "approvalsReviewer", - "id", - "isDefault", - "permissionProfileId" - ], - "type": "object" - }, "PermissionProfileListParams": { "$schema": "http://json-schema.org/draft-07/schema#", "properties": { diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json index 7b13da044e..98b0d42976 100644 --- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json +++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json @@ -9394,39 +9394,6 @@ } ] }, - "PermissionPreset": { - "properties": { - "approvalPolicy": { - "$ref": "#/definitions/AskForApproval" - }, - "approvalsReviewer": { - "$ref": "#/definitions/ApprovalsReviewer" - }, - "description": { - "type": [ - "string", - "null" - ] - }, - "id": { - "type": "string" - }, - "isDefault": { - "type": "boolean" - }, - "permissionProfileId": { - "type": "string" - } - }, - "required": [ - "approvalPolicy", - "approvalsReviewer", - "id", - "isDefault", - "permissionProfileId" - ], - "type": "object" - }, "PermissionProfileListParams": { "$schema": "http://json-schema.org/draft-07/schema#", "properties": { diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/PermissionPreset.ts b/codex-rs/app-server-protocol/schema/typescript/v2/PermissionPreset.ts deleted file mode 100644 index ae96d094a8..0000000000 --- a/codex-rs/app-server-protocol/schema/typescript/v2/PermissionPreset.ts +++ /dev/null @@ -1,7 +0,0 @@ -// GENERATED CODE! DO NOT MODIFY BY HAND! - -// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ApprovalsReviewer } from "./ApprovalsReviewer"; -import type { AskForApproval } from "./AskForApproval"; - -export type PermissionPreset = { id: string, permissionProfileId: string, description: string | null, approvalPolicy: AskForApproval, approvalsReviewer: ApprovalsReviewer, isDefault: boolean, }; diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/index.ts b/codex-rs/app-server-protocol/schema/typescript/v2/index.ts index 4e0cf39bf6..3e769d3fab 100644 --- a/codex-rs/app-server-protocol/schema/typescript/v2/index.ts +++ b/codex-rs/app-server-protocol/schema/typescript/v2/index.ts @@ -279,7 +279,6 @@ export type { OverriddenMetadata } from "./OverriddenMetadata"; export type { PatchApplyStatus } from "./PatchApplyStatus"; export type { PatchChangeKind } from "./PatchChangeKind"; export type { PermissionGrantScope } from "./PermissionGrantScope"; -export type { PermissionPreset } from "./PermissionPreset"; export type { PermissionProfileListParams } from "./PermissionProfileListParams"; export type { PermissionProfileListResponse } from "./PermissionProfileListResponse"; export type { PermissionProfileSummary } from "./PermissionProfileSummary"; diff --git a/codex-rs/app-server-protocol/src/export.rs b/codex-rs/app-server-protocol/src/export.rs index 91eca690f1..7a480214c2 100644 --- a/codex-rs/app-server-protocol/src/export.rs +++ b/codex-rs/app-server-protocol/src/export.rs @@ -43,6 +43,10 @@ pub(crate) const GENERATED_TS_HEADER: &str = "// GENERATED CODE! DO NOT MODIFY B const IGNORED_DEFINITIONS: &[&str] = &["Option<()>"]; const JSON_V1_ALLOWLIST: &[&str] = &["InitializeParams", "InitializeResponse"]; const EXPERIMENTAL_CLIENT_METHOD_DEPENDENCY_TYPES: &[&str] = &[ + "PermissionPreset", + "PermissionPresetDefaultSource", + "PermissionPresetKind", + "PermissionPresetUnavailabilityReason", "RemoteControlClient", "RemoteControlClientsListOrder", "ThreadBackgroundTerminal", @@ -2127,6 +2131,7 @@ mod tests { client_request_ts.contains("MockExperimentalMethodParams"), false ); + assert_eq!(client_request_ts.contains("permissionPreset/list"), false); let server_request_ts = std::str::from_utf8( fixture_tree .get(Path::new("ServerRequest.ts")) @@ -2154,6 +2159,16 @@ mod tests { fixture_tree.contains_key(Path::new("v2/MockExperimentalMethodResponse.ts")), false ); + for path in [ + "v2/PermissionPreset.ts", + "v2/PermissionPresetDefaultSource.ts", + "v2/PermissionPresetKind.ts", + "v2/PermissionPresetListParams.ts", + "v2/PermissionPresetListResponse.ts", + "v2/PermissionPresetUnavailabilityReason.ts", + ] { + assert_eq!(fixture_tree.contains_key(Path::new(path)), false); + } assert_eq!( fixture_tree.contains_key(Path::new("v2/CurrentTimeReadParams.ts")), false @@ -2379,6 +2394,15 @@ mod tests { .contains("MockExperimentalMethodResponse"), true ); + assert_eq!(client_request_ts.contains("permissionPreset/list"), true); + assert_eq!( + client_request_ts.contains("PermissionPresetListParams"), + true + ); + assert_eq!( + v2::PermissionPresetListResponse::export_to_string()?.contains("PermissionPreset"), + true + ); let thread_start_ts = v2::ThreadStartParams::export_to_string()?; assert_eq!(thread_start_ts.contains("mockExperimentalField"), true); @@ -2862,6 +2886,7 @@ permissionProfile?: string | null}; client_request_json.contains("mock/experimentalMethod"), false ); + assert_eq!(client_request_json.contains("permissionPreset/list"), false); assert_eq!(output_dir.join("EventMsg.json").exists(), false); let bundle_json = @@ -2977,6 +3002,12 @@ permissionProfile?: string | null}; .exists(), false ); + for schema in [ + "PermissionPresetListParams.json", + "PermissionPresetListResponse.json", + ] { + assert_eq!(output_dir.join("v2").join(schema).exists(), false); + } let _cleanup = fs::remove_dir_all(&output_dir); Ok(()) @@ -2993,6 +3024,7 @@ permissionProfile?: string | null}; assert!(client_request_json.contains("remoteControl/pairing/status")); assert!(client_request_json.contains("remoteControl/client/list")); assert!(client_request_json.contains("remoteControl/client/revoke")); + assert!(client_request_json.contains("permissionPreset/list")); for schema in [ "RemoteControlPairingStartParams.json", "RemoteControlPairingStartResponse.json", @@ -3002,6 +3034,8 @@ permissionProfile?: string | null}; "RemoteControlClientsListResponse.json", "RemoteControlClientsRevokeParams.json", "RemoteControlClientsRevokeResponse.json", + "PermissionPresetListParams.json", + "PermissionPresetListResponse.json", ] { assert!(output_dir.join("v2").join(schema).exists()); } diff --git a/codex-rs/app-server-protocol/src/protocol/common.rs b/codex-rs/app-server-protocol/src/protocol/common.rs index 540b547278..972e0395e2 100644 --- a/codex-rs/app-server-protocol/src/protocol/common.rs +++ b/codex-rs/app-server-protocol/src/protocol/common.rs @@ -2614,6 +2614,7 @@ mod tests { approvals_reviewer: v2::ApprovalsReviewer::User, sandbox: v2::SandboxPolicy::DangerFullAccess, active_permission_profile: None, + active_permission_preset_id: None, reasoning_effort: None, multi_agent_mode: MultiAgentMode::ExplicitRequestOnly, }, @@ -2663,6 +2664,7 @@ mod tests { "type": "dangerFullAccess" }, "activePermissionProfile": null, + "activePermissionPresetId": null, "reasoningEffort": null, "multiAgentMode": "explicitRequestOnly" } @@ -3606,6 +3608,7 @@ mod tests { approvals_reviewer: v2::ApprovalsReviewer::User, sandbox_policy: v2::SandboxPolicy::DangerFullAccess, active_permission_profile: None, + active_permission_preset_id: None, model: "gpt-5.4".to_string(), model_provider: "openai".to_string(), service_tier: None, diff --git a/codex-rs/app-server-protocol/src/protocol/v2/permissions.rs b/codex-rs/app-server-protocol/src/protocol/v2/permissions.rs index 6382379209..ddf7653876 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2/permissions.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2/permissions.rs @@ -406,16 +406,54 @@ pub struct PermissionPresetListParams { pub cwd: Option, } +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)] +#[serde(rename_all = "camelCase")] +#[ts(export_to = "v2/")] +pub enum PermissionPresetKind { + ReadOnly, + Auto, + Granular, + GuardianApprovals, + FullAccess, + PermissionProfile, + LegacyConfig, +} + +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)] +#[serde(tag = "type", rename_all = "camelCase")] +#[ts(tag = "type", export_to = "v2/")] +pub enum PermissionPresetUnavailabilityReason { + PermissionProfile { + #[serde(rename = "permissionProfileId")] + #[ts(rename = "permissionProfileId")] + permission_profile_id: String, + }, + ApprovalPolicy, + ApprovalsReviewer, +} + +#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, JsonSchema, TS)] +#[serde(rename_all = "camelCase")] +#[ts(rename_all = "camelCase", export_to = "v2/")] +pub enum PermissionPresetDefaultSource { + Implicit, + Config, + Requirements, +} + #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)] #[serde(rename_all = "camelCase")] #[ts(export_to = "v2/")] pub struct PermissionPreset { pub id: String, - pub permission_profile_id: String, + pub kind: PermissionPresetKind, + pub permission_profile_id: Option, pub description: Option, + pub sandbox_policy: SandboxPolicy, pub approval_policy: AskForApproval, pub approvals_reviewer: ApprovalsReviewer, - pub is_default: bool, + pub allowed: bool, + pub unavailability_reason: Option, } #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)] @@ -424,6 +462,8 @@ pub struct PermissionPreset { pub struct PermissionPresetListResponse { pub data: Vec, pub next_cursor: Option, + pub default_preset_id: String, + pub default_source: PermissionPresetDefaultSource, } #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)] diff --git a/codex-rs/app-server-protocol/src/protocol/v2/tests.rs b/codex-rs/app-server-protocol/src/protocol/v2/tests.rs index 74e534be00..879fa23616 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2/tests.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2/tests.rs @@ -199,6 +199,7 @@ fn thread_resume_response_round_trips_initial_turns_page() { approvals_reviewer: ApprovalsReviewer::User, sandbox: SandboxPolicy::DangerFullAccess, active_permission_profile: None, + active_permission_preset_id: None, reasoning_effort: None, multi_agent_mode: Default::default(), initial_turns_page: Some(TurnsPage { @@ -3782,6 +3783,7 @@ fn turn_start_params_preserve_explicit_null_service_tier() { approvals_reviewer: None, sandbox_policy: None, permissions: None, + permission_preset_id: None, model: None, service_tier: None, effort: None, diff --git a/codex-rs/app-server-protocol/src/protocol/v2/thread.rs b/codex-rs/app-server-protocol/src/protocol/v2/thread.rs index 6a51f71e51..b119a15e21 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2/thread.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2/thread.rs @@ -84,6 +84,11 @@ pub struct ThreadStartParams { #[experimental("thread/start.permissions")] #[ts(optional = nullable)] pub permissions: Option, + /// Permission preset to apply. Cannot be combined with raw permission, + /// sandbox, approval-policy, or reviewer overrides. + #[experimental("thread/start.permissionPresetId")] + #[ts(optional = nullable)] + pub permission_preset_id: Option, #[ts(optional = nullable)] pub config: Option>, #[ts(optional = nullable)] @@ -185,6 +190,9 @@ pub struct ThreadStartResponse { #[experimental("thread/start.activePermissionProfile")] #[serde(default)] pub active_permission_profile: Option, + #[experimental("thread/start.activePermissionPresetId")] + #[serde(default)] + pub active_permission_preset_id: Option, pub reasoning_effort: Option, /// Current multi-agent mode for this thread. #[experimental("thread/start.multiAgentMode")] @@ -224,6 +232,11 @@ pub struct ThreadSettingsUpdateParams { #[experimental("thread/settings/update.permissions")] #[ts(optional = nullable)] pub permissions: Option, + /// Permission preset to apply. Cannot be combined with raw permission, + /// sandbox, approval-policy, or reviewer overrides. + #[experimental("thread/settings/update.permissionPresetId")] + #[ts(optional = nullable)] + pub permission_preset_id: Option, /// Override the model for subsequent turns. #[ts(optional = nullable)] pub model: Option, @@ -273,6 +286,9 @@ pub struct ThreadSettings { pub approvals_reviewer: ApprovalsReviewer, pub sandbox_policy: SandboxPolicy, pub active_permission_profile: Option, + #[experimental("thread/settings.activePermissionPresetId")] + #[serde(default)] + pub active_permission_preset_id: Option, pub model: String, pub model_provider: String, pub service_tier: Option, @@ -368,6 +384,11 @@ pub struct ThreadResumeParams { #[experimental("thread/resume.permissions")] #[ts(optional = nullable)] pub permissions: Option, + /// Permission preset to apply. Cannot be combined with raw permission, + /// sandbox, approval-policy, or reviewer overrides. + #[experimental("thread/resume.permissionPresetId")] + #[ts(optional = nullable)] + pub permission_preset_id: Option, #[ts(optional = nullable)] pub config: Option>, #[ts(optional = nullable)] @@ -418,6 +439,9 @@ pub struct ThreadResumeResponse { #[experimental("thread/resume.activePermissionProfile")] #[serde(default)] pub active_permission_profile: Option, + #[experimental("thread/resume.activePermissionPresetId")] + #[serde(default)] + pub active_permission_preset_id: Option, pub reasoning_effort: Option, /// Current multi-agent mode for this thread. #[experimental("thread/resume.multiAgentMode")] @@ -529,6 +553,11 @@ pub struct ThreadForkParams { #[experimental("thread/fork.permissions")] #[ts(optional = nullable)] pub permissions: Option, + /// Permission preset to apply. Cannot be combined with raw permission, + /// sandbox, approval-policy, or reviewer overrides. + #[experimental("thread/fork.permissionPresetId")] + #[ts(optional = nullable)] + pub permission_preset_id: Option, #[ts(optional = nullable)] pub config: Option>, #[ts(optional = nullable)] @@ -577,6 +606,9 @@ pub struct ThreadForkResponse { #[experimental("thread/fork.activePermissionProfile")] #[serde(default)] pub active_permission_profile: Option, + #[experimental("thread/fork.activePermissionPresetId")] + #[serde(default)] + pub active_permission_preset_id: Option, pub reasoning_effort: Option, /// Current multi-agent mode for this thread. #[experimental("thread/fork.multiAgentMode")] diff --git a/codex-rs/app-server-protocol/src/protocol/v2/turn.rs b/codex-rs/app-server-protocol/src/protocol/v2/turn.rs index 1fc35d1515..16c4716c87 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2/turn.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2/turn.rs @@ -116,6 +116,11 @@ pub struct TurnStartParams { #[experimental("turn/start.permissions")] #[ts(optional = nullable)] pub permissions: Option, + /// Permission preset to apply. Cannot be combined with raw permission, + /// sandbox, approval-policy, or reviewer overrides. + #[experimental("turn/start.permissionPresetId")] + #[ts(optional = nullable)] + pub permission_preset_id: Option, /// Override the model for this turn and subsequent turns. #[ts(optional = nullable)] pub model: Option, diff --git a/codex-rs/app-server/src/message_processor_tracing_tests.rs b/codex-rs/app-server/src/message_processor_tracing_tests.rs index 7c4ae8c985..d5c370d482 100644 --- a/codex-rs/app-server/src/message_processor_tracing_tests.rs +++ b/codex-rs/app-server/src/message_processor_tracing_tests.rs @@ -665,6 +665,7 @@ async fn turn_start_jsonrpc_span_parents_core_turn_spans() -> Result<()> { approval_policy: None, sandbox_policy: None, permissions: None, + permission_preset_id: None, approvals_reviewer: None, model: None, service_tier: None, diff --git a/codex-rs/app-server/src/permission_presets.rs b/codex-rs/app-server/src/permission_presets.rs index 6d5f8f3af6..07c4b97025 100644 --- a/codex-rs/app-server/src/permission_presets.rs +++ b/codex-rs/app-server/src/permission_presets.rs @@ -1,143 +1,507 @@ use crate::config_manager::ConfigManager; use codex_app_server_protocol::PermissionPreset; +use codex_app_server_protocol::PermissionPresetDefaultSource; +use codex_app_server_protocol::PermissionPresetKind; +use codex_app_server_protocol::PermissionPresetUnavailabilityReason; +use codex_app_server_protocol::SandboxPolicy; +use codex_config::config_toml::ConfigToml; +use codex_core::config::Config; use codex_core::config::ConfigOverrides; +use codex_core::config::permission_profile_catalog; use codex_features::Feature; use codex_protocol::config_types::ApprovalsReviewer; +use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS; +use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_READ_ONLY; +use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_WORKSPACE; +use codex_protocol::models::ManagedFileSystemPermissions; +use codex_protocol::models::PermissionProfile; use codex_protocol::protocol::AskForApproval; use codex_protocol::protocol::GranularApprovalConfig; +use codex_sandboxing::compatibility_sandbox_policy_for_permission_profile; use codex_utils_approval_presets::builtin_approval_presets; +use std::io::ErrorKind; use std::path::PathBuf; -struct PermissionPresetCandidate { - id: String, - permission_profile_id: String, - description: Option, - approval_policy: AskForApproval, - approvals_reviewer: ApprovalsReviewer, - profile_is_default: bool, +pub(crate) struct PermissionPresetCatalog { + entries: Vec, + pub(crate) default_preset_id: String, + pub(crate) default_source: PermissionPresetDefaultSource, } -pub(crate) async fn permission_presets( +pub(crate) struct PermissionPresetSelection { + pub(crate) id: String, + pub(crate) approval_policy: AskForApproval, + pub(crate) approvals_reviewer: ApprovalsReviewer, + pub(crate) permission_profile_id: Option, + pub(crate) permission_profile: PermissionProfile, +} + +impl PermissionPresetSelection { + pub(crate) fn apply_to(self, overrides: &mut ConfigOverrides) { + overrides.approval_policy = Some(self.approval_policy); + overrides.approvals_reviewer = Some(self.approvals_reviewer); + overrides.active_permission_preset_id = Some(self.id); + match self.permission_profile_id { + Some(permission_profile_id) => { + overrides.default_permissions = Some(permission_profile_id); + } + None => { + overrides.permission_profile = Some(self.permission_profile); + } + } + } +} + +struct PermissionPresetEntry { + preset: PermissionPreset, + permission_profile: PermissionProfile, +} + +impl PermissionPresetCatalog { + pub(crate) fn presets(&self) -> impl Iterator { + self.entries.iter().map(|entry| &entry.preset) + } + + pub(crate) fn selection(&self, id: &str) -> std::io::Result { + let entry = self + .entries + .iter() + .find(|entry| entry.preset.id == id) + .ok_or_else(|| { + std::io::Error::new( + ErrorKind::InvalidInput, + format!("unknown permission preset `{id}`"), + ) + })?; + if !entry.preset.allowed { + return Err(std::io::Error::new( + ErrorKind::PermissionDenied, + format!("permission preset `{id}` is not allowed"), + )); + } + + Ok(Self::selection_from_entry(entry)) + } + + pub(crate) fn selection_for_session( + &self, + active_preset_id: Option<&str>, + active_profile_id: Option<&str>, + approval_policy: AskForApproval, + approvals_reviewer: ApprovalsReviewer, + permission_profile: &PermissionProfile, + ) -> Option { + if let Some(active_preset_id) = active_preset_id { + return self.selection(active_preset_id).ok(); + } + + let mut matches = self.entries.iter().filter(|entry| { + entry.preset.allowed + && entry.preset.approval_policy.to_core() == approval_policy + && entry.preset.approvals_reviewer.to_core() == approvals_reviewer + && match active_profile_id { + Some(active_profile_id) => { + entry.preset.permission_profile_id.as_deref() == Some(active_profile_id) + } + None => { + permission_profiles_match(&entry.permission_profile, permission_profile) + } + } + }); + let entry = matches.next()?; + if matches.next().is_some() { + return None; + } + Some(Self::selection_from_entry(entry)) + } + + fn selection_from_entry(entry: &PermissionPresetEntry) -> PermissionPresetSelection { + PermissionPresetSelection { + id: entry.preset.id.clone(), + approval_policy: entry.preset.approval_policy.to_core(), + approvals_reviewer: entry.preset.approvals_reviewer.to_core(), + permission_profile_id: entry.preset.permission_profile_id.clone(), + permission_profile: entry.permission_profile.clone(), + } + } +} + +pub(crate) async fn permission_preset_catalog( config_manager: &ConfigManager, cwd: Option, -) -> std::io::Result> { +) -> std::io::Result { let config = config_manager .load_for_cwd(None, ConfigOverrides::default(), cwd) .await?; - let selectable_profiles = config.selectable_permission_profiles()?; - let active_profile_id = config - .permissions - .active_permission_profile() - .map(|profile| profile.id); - let mut candidates = Vec::new(); + permission_preset_catalog_for_config(&config) +} - for preset in builtin_approval_presets() { - if !selectable_profiles - .iter() - .any(|profile| profile.id == preset.active_permission_profile.id) - { - continue; - } - let profile_is_default = match active_profile_id.as_deref() { - Some(id) => id == preset.active_permission_profile.id, - None => preset.matches_permission_profile( - config.permissions.permission_profile(), - config.cwd.as_path(), - ), +fn permission_preset_catalog_for_config( + config: &Config, +) -> std::io::Result { + let profile_catalog = + permission_profile_catalog(&config.config_layer_stack, config.cwd.as_path())?; + let config_toml: ConfigToml = config + .config_layer_stack + .effective_config() + .try_into() + .map_err(std::io::Error::other)?; + let requirements = config.config_layer_stack.requirements(); + let requirements_override_config = config.startup_warnings.iter().any(|warning| { + [ + "approval_policy", + "approvals_reviewer", + "permission_profile", + ] + .iter() + .any(|field| { + warning.contains(&format!( + "Configured value for `{field}` is disallowed by requirements" + )) + }) + }); + let configured_default_is_active = + config_toml + .default_permissions + .as_deref() + .is_some_and(|configured_default| { + config + .permissions + .active_permission_profile() + .is_some_and(|active| active.id == configured_default) + }); + let default_source = if requirements_override_config { + PermissionPresetDefaultSource::Requirements + } else if configured_default_is_active { + PermissionPresetDefaultSource::Config + } else if config + .config_layer_stack + .requirements_toml() + .allowed_permission_profiles + .is_some() + { + PermissionPresetDefaultSource::Requirements + } else if has_explicit_permission_config(&config_toml) { + PermissionPresetDefaultSource::Config + } else if requirements.approval_policy.source.is_some() + || requirements.approvals_reviewer.source.is_some() + || requirements.permission_profile.source.is_some() + { + PermissionPresetDefaultSource::Requirements + } else { + PermissionPresetDefaultSource::Implicit + }; + let mut entries = Vec::new(); + + for builtin in builtin_approval_presets() { + let kind = match builtin.id { + "read-only" => PermissionPresetKind::ReadOnly, + "auto" => PermissionPresetKind::Auto, + "full-access" => PermissionPresetKind::FullAccess, + id => { + return Err(std::io::Error::new( + ErrorKind::InvalidData, + format!("unknown built-in permission preset `{id}`"), + )); + } }; - candidates.push(PermissionPresetCandidate { - id: preset.id.to_string(), - permission_profile_id: preset.active_permission_profile.id.clone(), - description: None, - approval_policy: preset.approval, - approvals_reviewer: ApprovalsReviewer::User, - profile_is_default, - }); - if preset.id == "auto" { - candidates.push(PermissionPresetCandidate { - id: "granular".to_string(), - permission_profile_id: preset.active_permission_profile.id.clone(), - description: None, - approval_policy: AskForApproval::Granular(GranularApprovalConfig { + entries.push(preset_entry( + builtin.id, + kind, + Some(builtin.active_permission_profile.id), + None, + builtin.permission_profile, + builtin.approval, + ApprovalsReviewer::User, + &profile_catalog, + config, + )); + if builtin.id == "auto" { + entries.push(preset_entry( + "granular", + PermissionPresetKind::Granular, + Some(BUILT_IN_PERMISSION_PROFILE_WORKSPACE.to_string()), + None, + PermissionProfile::workspace_write(), + AskForApproval::Granular(GranularApprovalConfig { sandbox_approval: false, rules: false, skill_approval: false, request_permissions: true, mcp_elicitations: true, }), - approvals_reviewer: ApprovalsReviewer::User, - profile_is_default, - }); + ApprovalsReviewer::User, + &profile_catalog, + config, + )); if config.features.enabled(Feature::GuardianApproval) { - candidates.push(PermissionPresetCandidate { - id: "guardian-approvals".to_string(), - permission_profile_id: preset.active_permission_profile.id, - description: None, - approval_policy: AskForApproval::OnRequest, - approvals_reviewer: ApprovalsReviewer::AutoReview, - profile_is_default, - }); + entries.push(preset_entry( + "guardian-approvals", + PermissionPresetKind::GuardianApprovals, + Some(BUILT_IN_PERMISSION_PROFILE_WORKSPACE.to_string()), + None, + PermissionProfile::workspace_write(), + AskForApproval::OnRequest, + ApprovalsReviewer::AutoReview, + &profile_catalog, + config, + )); } } } - candidates.extend( - selectable_profiles - .into_iter() - .filter(|profile| !profile.id.starts_with(':')) - .map(|profile| { - let profile_is_default = active_profile_id.as_deref() == Some(profile.id.as_str()); - PermissionPresetCandidate { - id: format!("permission-profile:{}", profile.id), - permission_profile_id: profile.id, - description: profile.description, - approval_policy: config.permissions.approval_policy.value(), - approvals_reviewer: config.approvals_reviewer, - profile_is_default, - } - }), - ); - - let requirements = config.config_layer_stack.requirements(); - let mut presets = Vec::new(); - for candidate in candidates { - let approval_policy = if requirements - .approval_policy - .can_set(&candidate.approval_policy) - .is_ok() - { - candidate.approval_policy - } else { - requirements.approval_policy.value() - }; - let approvals_reviewer = if requirements - .approvals_reviewer - .can_set(&candidate.approvals_reviewer) - .is_ok() - { - candidate.approvals_reviewer - } else { - requirements.approvals_reviewer.value() - }; - let preset = PermissionPreset { - id: candidate.id, - permission_profile_id: candidate.permission_profile_id, - description: candidate.description, - approval_policy: approval_policy.into(), - approvals_reviewer: approvals_reviewer.into(), - is_default: candidate.profile_is_default - && config.permissions.approval_policy.value() == approval_policy - && config.approvals_reviewer == approvals_reviewer, - }; - if presets.iter().any(|existing: &PermissionPreset| { - existing.permission_profile_id == preset.permission_profile_id - && existing.approval_policy == preset.approval_policy - && existing.approvals_reviewer == preset.approvals_reviewer - }) { - continue; - } - presets.push(preset); + for profile in profile_catalog.iter().filter(|profile| { + !matches!( + profile.id.as_str(), + BUILT_IN_PERMISSION_PROFILE_READ_ONLY + | BUILT_IN_PERMISSION_PROFILE_WORKSPACE + | BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS + ) + }) { + entries.push(preset_entry( + &format!("permission-profile:{}", profile.id), + PermissionPresetKind::PermissionProfile, + Some(profile.id.clone()), + profile.description.clone(), + profile.permission_profile.clone().ok_or_else(|| { + std::io::Error::new( + ErrorKind::InvalidData, + format!("permission profile `{}` could not be resolved", profile.id), + ) + })?, + config.permissions.approval_policy.value(), + config.approvals_reviewer, + &profile_catalog, + config, + )); } - Ok(presets) + let has_legacy_config = has_legacy_permission_config(&config_toml); + if has_legacy_config { + entries.push(preset_entry( + "legacy-config", + PermissionPresetKind::LegacyConfig, + None, + None, + config.permissions.permission_profile().clone(), + config.permissions.approval_policy.value(), + config.approvals_reviewer, + &profile_catalog, + config, + )); + } + + let default_preset_id = + if default_source == PermissionPresetDefaultSource::Config && has_legacy_config { + "legacy-config".to_string() + } else { + active_preset_id(config, &entries).ok_or_else(|| { + std::io::Error::new( + ErrorKind::InvalidData, + "effective permissions do not match an allowed permission preset", + ) + })? + }; + if !entries + .iter() + .any(|entry| entry.preset.id == default_preset_id && entry.preset.allowed) + { + return Err(std::io::Error::new( + ErrorKind::InvalidData, + format!("default permission preset `{default_preset_id}` is not allowed"), + )); + } + + Ok(PermissionPresetCatalog { + entries, + default_preset_id, + default_source, + }) +} + +#[expect( + clippy::too_many_arguments, + reason = "constructs the complete preset contract" +)] +fn preset_entry( + id: &str, + kind: PermissionPresetKind, + permission_profile_id: Option, + description: Option, + permission_profile: PermissionProfile, + approval_policy: AskForApproval, + approvals_reviewer: ApprovalsReviewer, + profile_catalog: &[codex_core::config::PermissionProfileCatalogEntry], + config: &Config, +) -> PermissionPresetEntry { + let profile_allowed = permission_profile_id.as_ref().is_none_or(|profile_id| { + profile_catalog + .iter() + .find(|profile| profile.id == *profile_id) + .is_some_and(|profile| profile.allowed) + }); + let unavailability_reason = if !profile_allowed { + Some(PermissionPresetUnavailabilityReason::PermissionProfile { + permission_profile_id: permission_profile_id.clone().unwrap_or_default(), + }) + } else if config + .config_layer_stack + .requirements() + .approval_policy + .can_set(&approval_policy) + .is_err() + { + Some(PermissionPresetUnavailabilityReason::ApprovalPolicy) + } else if config + .config_layer_stack + .requirements() + .approvals_reviewer + .can_set(&approvals_reviewer) + .is_err() + { + Some(PermissionPresetUnavailabilityReason::ApprovalsReviewer) + } else { + None + }; + let sandbox_policy = compatibility_sandbox_policy_for_permission_profile( + &permission_profile, + config.cwd.as_path(), + ); + + PermissionPresetEntry { + preset: PermissionPreset { + id: id.to_string(), + kind, + permission_profile_id, + description, + sandbox_policy: SandboxPolicy::from(sandbox_policy), + approval_policy: approval_policy.into(), + approvals_reviewer: approvals_reviewer.into(), + allowed: unavailability_reason.is_none(), + unavailability_reason, + }, + permission_profile, + } +} + +fn permission_profiles_match(left: &PermissionProfile, right: &PermissionProfile) -> bool { + match (left, right) { + (PermissionProfile::Disabled, PermissionProfile::Disabled) => true, + ( + PermissionProfile::External { + network: left_network, + }, + PermissionProfile::External { + network: right_network, + }, + ) => left_network == right_network, + ( + PermissionProfile::Managed { + file_system: left_file_system, + network: left_network, + }, + PermissionProfile::Managed { + file_system: right_file_system, + network: right_network, + }, + ) => { + left_network == right_network + && match (left_file_system, right_file_system) { + ( + ManagedFileSystemPermissions::Unrestricted, + ManagedFileSystemPermissions::Unrestricted, + ) => true, + ( + ManagedFileSystemPermissions::Restricted { + entries: left_entries, + glob_scan_max_depth: left_depth, + }, + ManagedFileSystemPermissions::Restricted { + entries: right_entries, + glob_scan_max_depth: right_depth, + }, + ) => { + let mut remaining = right_entries.clone(); + left_depth == right_depth + && left_entries.len() == remaining.len() + && left_entries.iter().all(|entry| { + let Some(index) = + remaining.iter().position(|candidate| candidate == entry) + else { + return false; + }; + remaining.swap_remove(index); + true + }) + } + _ => false, + } + } + _ => false, + } +} + +fn active_preset_id(config: &Config, entries: &[PermissionPresetEntry]) -> Option { + let active_profile_id = config + .permissions + .active_permission_profile() + .map(|profile| profile.id); + entries + .iter() + .filter(|entry| entry.preset.allowed) + .find(|entry| { + entry.preset.permission_profile_id.as_deref() == active_profile_id.as_deref() + && entry.preset.approval_policy.to_core() + == config.permissions.approval_policy.value() + && entry.preset.approvals_reviewer.to_core() == config.approvals_reviewer + }) + .map(|entry| entry.preset.id.clone()) + .or_else(|| { + entries + .iter() + .filter(|entry| entry.preset.allowed) + .find(|entry| { + permission_profiles_match( + &entry.permission_profile, + config.permissions.permission_profile(), + ) && entry.preset.approval_policy.to_core() + == config.permissions.approval_policy.value() + && entry.preset.approvals_reviewer.to_core() == config.approvals_reviewer + }) + .map(|entry| entry.preset.id.clone()) + }) +} + +fn has_explicit_permission_config(config: &ConfigToml) -> bool { + config.default_permissions.is_some() || has_legacy_permission_config(config) +} + +fn has_legacy_permission_config(config: &ConfigToml) -> bool { + config.default_permissions.is_none() + && (config.sandbox_mode.is_some() + || config.sandbox_workspace_write.is_some() + || config.approval_policy.is_some() + || config.approvals_reviewer.is_some()) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn permission_profile_matching_ignores_entry_order() { + let profile = PermissionProfile::workspace_write(); + let mut reordered = profile.clone(); + let PermissionProfile::Managed { + file_system: ManagedFileSystemPermissions::Restricted { entries, .. }, + .. + } = &mut reordered + else { + panic!("workspace profile should be restricted"); + }; + entries.reverse(); + + assert_ne!(profile, reordered); + assert!(permission_profiles_match(&profile, &reordered)); + } } diff --git a/codex-rs/app-server/src/request_processors/catalog_processor.rs b/codex-rs/app-server/src/request_processors/catalog_processor.rs index c593341073..66afa54865 100644 --- a/codex-rs/app-server/src/request_processors/catalog_processor.rs +++ b/codex-rs/app-server/src/request_processors/catalog_processor.rs @@ -1,6 +1,6 @@ -use crate::permission_presets::permission_presets; -use codex_core::config::permission_profile_catalog; use super::*; +use crate::permission_presets::permission_preset_catalog; +use codex_core::config::permission_profile_catalog; use futures::StreamExt; #[derive(Clone)] @@ -495,15 +495,21 @@ impl CatalogRequestProcessor { params: PermissionPresetListParams, ) -> Result { let PermissionPresetListParams { cursor, limit, cwd } = params; - let presets = permission_presets(&self.config_manager, cwd.map(PathBuf::from)) + let catalog = permission_preset_catalog(&self.config_manager, cwd.map(PathBuf::from)) .await .map_err(|err| { internal_error(format!("failed to resolve permission presets: {err}")) })?; + let presets = catalog.presets().cloned().collect(); let (data, next_cursor) = paginate_catalog_items(presets, cursor, limit, "permission presets")?; - Ok(PermissionPresetListResponse { data, next_cursor }) + Ok(PermissionPresetListResponse { + data, + next_cursor, + default_preset_id: catalog.default_preset_id, + default_source: catalog.default_source, + }) } async fn mock_experimental_method_inner( diff --git a/codex-rs/app-server/src/request_processors/thread_lifecycle.rs b/codex-rs/app-server/src/request_processors/thread_lifecycle.rs index 21adf46134..ffef2bc61d 100644 --- a/codex-rs/app-server/src/request_processors/thread_lifecycle.rs +++ b/codex-rs/app-server/src/request_processors/thread_lifecycle.rs @@ -637,6 +637,7 @@ pub(super) async fn handle_pending_thread_resume_request( approvals_reviewer, permission_profile, active_permission_profile, + active_permission_preset_id, workspace_roots, reasoning_effort, multi_agent_mode, @@ -661,6 +662,7 @@ pub(super) async fn handle_pending_thread_resume_request( approvals_reviewer: approvals_reviewer.into(), sandbox, active_permission_profile, + active_permission_preset_id, reasoning_effort, multi_agent_mode, initial_turns_page, diff --git a/codex-rs/app-server/src/request_processors/thread_processor.rs b/codex-rs/app-server/src/request_processors/thread_processor.rs index a3e4b49ce8..3b6a01cd31 100644 --- a/codex-rs/app-server/src/request_processors/thread_processor.rs +++ b/codex-rs/app-server/src/request_processors/thread_processor.rs @@ -1,5 +1,6 @@ use super::*; use crate::error_code::method_not_found; +use crate::permission_presets::permission_preset_catalog; use codex_app_server_protocol::SelectedCapabilityRoot; use codex_extension_api::ExtensionDataInit; use codex_protocol::config_types::MultiAgentMode; @@ -115,6 +116,18 @@ fn collect_resume_override_mismatches( config_snapshot.active_permission_profile )); } + if let Some(requested_permission_preset_id) = request.permission_preset_id.as_deref() + && config_snapshot.active_permission_preset_id.as_deref() + != Some(requested_permission_preset_id) + { + mismatch_details.push(format!( + "permission_preset_id requested={requested_permission_preset_id} active={}", + config_snapshot + .active_permission_preset_id + .as_deref() + .unwrap_or("") + )); + } if let Some(requested_personality) = request.personality.as_ref() && config_snapshot.personality.as_ref() != Some(requested_personality) { @@ -160,6 +173,15 @@ fn merge_persisted_resume_metadata( } } +fn session_configuration_from_rollout_items( + items: &[RolloutItem], +) -> Option { + items.iter().rev().find_map(|item| match item { + RolloutItem::EventMsg(EventMsg::SessionConfigured(event)) => Some(event.clone()), + _ => None, + }) +} + fn normalize_thread_list_cwd_filters( cwd: Option, ) -> Result>, JSONRPCErrorError> { @@ -894,6 +916,7 @@ impl ThreadRequestProcessor { approvals_reviewer, sandbox, permissions, + permission_preset_id, config, service_name, base_instructions, @@ -909,6 +932,16 @@ impl ThreadRequestProcessor { thread_source, environments, } = params; + if permission_preset_id.is_some() + && (approval_policy.is_some() + || approvals_reviewer.is_some() + || sandbox.is_some() + || permissions.is_some()) + { + return Err(invalid_request( + "`permissionPresetId` cannot be combined with raw permission overrides", + )); + } if sandbox.is_some() && permissions.is_some() { return Err(invalid_request( "`permissions` cannot be combined with `sandbox`", @@ -917,6 +950,11 @@ impl ThreadRequestProcessor { let environment_selections = resolve_turn_environment_selections(self.thread_manager.as_ref(), environments)?; let runtime_workspace_roots = runtime_workspace_roots.map(resolve_runtime_workspace_roots); + let preset_cwd = cwd.as_ref().map(PathBuf::from); + let has_raw_permission_overrides = approval_policy.is_some() + || approvals_reviewer.is_some() + || sandbox.is_some() + || permissions.is_some(); let mut typesafe_overrides = self.build_thread_config_overrides( model, model_provider, @@ -931,6 +969,14 @@ impl ThreadRequestProcessor { developer_instructions, personality, ); + self.apply_permission_preset( + permission_preset_id, + preset_cwd, + has_raw_permission_overrides, + /*inherited_session*/ None, + &mut typesafe_overrides, + ) + .await?; typesafe_overrides.ephemeral = ephemeral; let listener_task_context = ListenerTaskContext { thread_manager: Arc::clone(&self.thread_manager), @@ -1261,6 +1307,7 @@ impl ThreadRequestProcessor { approvals_reviewer: config_snapshot.approvals_reviewer.into(), sandbox, active_permission_profile, + active_permission_preset_id: config_snapshot.active_permission_preset_id, reasoning_effort: config_snapshot.reasoning_effort, multi_agent_mode: config_snapshot.multi_agent_mode, }; @@ -1327,6 +1374,47 @@ impl ThreadRequestProcessor { } } + async fn apply_permission_preset( + &self, + permission_preset_id: Option, + cwd: Option, + has_raw_permission_overrides: bool, + inherited_session: Option<&SessionConfiguredEvent>, + overrides: &mut ConfigOverrides, + ) -> Result<(), JSONRPCErrorError> { + if permission_preset_id.is_none() && has_raw_permission_overrides { + return Ok(()); + } + let catalog = permission_preset_catalog(&self.config_manager, cwd) + .await + .map_err(|err| config_load_error(&err))?; + match permission_preset_id { + Some(permission_preset_id) => catalog + .selection(&permission_preset_id) + .map_err(|err| invalid_request(err.to_string()))? + .apply_to(overrides), + None => { + if let Some(selection) = inherited_session.and_then(|session| { + catalog.selection_for_session( + session.active_permission_preset_id.as_deref(), + session + .active_permission_profile + .as_ref() + .map(|profile| profile.id.as_str()), + session.approval_policy, + session.approvals_reviewer, + &session.permission_profile, + ) + }) { + selection.apply_to(overrides); + } else { + overrides.active_permission_preset_id = Some(catalog.default_preset_id); + } + } + } + Ok(()) + } + async fn thread_archive_inner( &self, params: ThreadArchiveParams, @@ -2541,7 +2629,6 @@ impl ThreadRequestProcessor { .await; return Ok(()); } - if params.sandbox.is_some() && params.permissions.is_some() { self.outgoing .send_error( @@ -2551,6 +2638,22 @@ impl ThreadRequestProcessor { .await; return Ok(()); } + if params.permission_preset_id.is_some() + && (params.approval_policy.is_some() + || params.approvals_reviewer.is_some() + || params.sandbox.is_some() + || params.permissions.is_some()) + { + self.outgoing + .send_error( + request_id, + invalid_request( + "`permissionPresetId` cannot be combined with raw permission overrides", + ), + ) + .await; + return Ok(()); + } let redact_resume_payloads = should_redact_thread_resume_payloads(app_server_client_name.as_deref()); @@ -2591,6 +2694,7 @@ impl ThreadRequestProcessor { approvals_reviewer, sandbox, permissions, + permission_preset_id, config: mut request_overrides, base_instructions, developer_instructions, @@ -2623,6 +2727,17 @@ impl ThreadRequestProcessor { let history_cwd = thread_history.session_cwd(); let runtime_workspace_roots = runtime_workspace_roots.map(resolve_runtime_workspace_roots); + let preset_cwd = cwd + .as_ref() + .map(PathBuf::from) + .or_else(|| history_cwd.clone()); + let has_raw_permission_overrides = approval_policy.is_some() + || approvals_reviewer.is_some() + || sandbox.is_some() + || permissions.is_some(); + let inherited_session = (permission_preset_id.is_none() && !has_raw_permission_overrides) + .then(|| session_configuration_from_rollout_items(&thread_history.get_rollout_items())) + .flatten(); let mut typesafe_overrides = self.build_thread_config_overrides( model, model_provider, @@ -2637,6 +2752,19 @@ impl ThreadRequestProcessor { developer_instructions, personality, ); + if let Err(error) = self + .apply_permission_preset( + permission_preset_id, + preset_cwd, + has_raw_permission_overrides, + inherited_session.as_ref(), + &mut typesafe_overrides, + ) + .await + { + self.outgoing.send_error(request_id, error).await; + return Ok(()); + } self.load_and_apply_persisted_resume_metadata( &thread_history, &mut request_overrides, @@ -2792,6 +2920,7 @@ impl ThreadRequestProcessor { approvals_reviewer: session_configured.approvals_reviewer.into(), sandbox, active_permission_profile, + active_permission_preset_id: config_snapshot.active_permission_preset_id, reasoning_effort: session_configured.reasoning_effort, multi_agent_mode: config_snapshot.multi_agent_mode, initial_turns_page, @@ -2916,6 +3045,20 @@ impl ThreadRequestProcessor { ))); } let config_snapshot = existing_thread.config_snapshot().await; + if let Some(permission_preset_id) = params.permission_preset_id.as_deref() { + permission_preset_catalog( + &self.config_manager, + params + .cwd + .as_ref() + .map(PathBuf::from) + .or_else(|| Some(config_snapshot.cwd().as_path().to_path_buf())), + ) + .await + .map_err(|err| config_load_error(&err))? + .selection(permission_preset_id) + .map_err(|err| invalid_request(err.to_string()))?; + } let mismatch_details = collect_resume_override_mismatches(params, &config_snapshot); if !mismatch_details.is_empty() { let has_subscribers = !self @@ -2951,6 +3094,19 @@ impl ThreadRequestProcessor { } } + if let Some(permission_preset_id) = params.permission_preset_id.as_deref() + && config_snapshot.active_permission_preset_id.as_deref() + != Some(permission_preset_id) + { + return Err(invalid_request(format!( + "cannot resume running thread {existing_thread_id} with permission preset `{permission_preset_id}`; active preset is `{}`", + config_snapshot + .active_permission_preset_id + .as_deref() + .unwrap_or("") + ))); + } + // Preserve rejoin semantics when another client can still observe // the loaded thread or shutdown did not complete. tracing::warn!( @@ -3300,6 +3456,7 @@ impl ThreadRequestProcessor { approvals_reviewer, sandbox, permissions, + permission_preset_id, config: cli_overrides, base_instructions, developer_instructions, @@ -3308,6 +3465,16 @@ impl ThreadRequestProcessor { exclude_turns, } = params; let include_turns = !exclude_turns; + if permission_preset_id.is_some() + && (approval_policy.is_some() + || approvals_reviewer.is_some() + || sandbox.is_some() + || permissions.is_some()) + { + return Err(invalid_request( + "`permissionPresetId` cannot be combined with raw permission overrides", + )); + } if sandbox.is_some() && permissions.is_some() { return Err(invalid_request( "`permissions` cannot be combined with `sandbox`", @@ -3355,6 +3522,17 @@ impl ThreadRequestProcessor { Some(cli_overrides) }; let runtime_workspace_roots = runtime_workspace_roots.map(resolve_runtime_workspace_roots); + let preset_cwd = cwd + .as_ref() + .map(PathBuf::from) + .or_else(|| history_cwd.clone()); + let has_raw_permission_overrides = approval_policy.is_some() + || approvals_reviewer.is_some() + || sandbox.is_some() + || permissions.is_some(); + let inherited_session = (permission_preset_id.is_none() && !has_raw_permission_overrides) + .then(|| session_configuration_from_rollout_items(&history_items)) + .flatten(); let mut typesafe_overrides = self.build_thread_config_overrides( model, model_provider, @@ -3369,6 +3547,14 @@ impl ThreadRequestProcessor { developer_instructions, /*personality*/ None, ); + self.apply_permission_preset( + permission_preset_id, + preset_cwd, + has_raw_permission_overrides, + inherited_session.as_ref(), + &mut typesafe_overrides, + ) + .await?; typesafe_overrides.ephemeral = ephemeral.then_some(true); // Derive a Config using the same logic as new conversation, honoring overrides if provided. let config = self @@ -3514,6 +3700,7 @@ impl ThreadRequestProcessor { approvals_reviewer: session_configured.approvals_reviewer.into(), sandbox, active_permission_profile, + active_permission_preset_id: config_snapshot.active_permission_preset_id, reasoning_effort: session_configured.reasoning_effort, multi_agent_mode: config_snapshot.multi_agent_mode, }; diff --git a/codex-rs/app-server/src/request_processors/thread_processor_tests.rs b/codex-rs/app-server/src/request_processors/thread_processor_tests.rs index 1f5ae12f44..74994d49fb 100644 --- a/codex-rs/app-server/src/request_processors/thread_processor_tests.rs +++ b/codex-rs/app-server/src/request_processors/thread_processor_tests.rs @@ -746,6 +746,7 @@ mod thread_processor_behavior_tests { approvals_reviewer: None, sandbox: None, permissions: None, + permission_preset_id: None, config: None, base_instructions: None, developer_instructions: None, @@ -761,6 +762,7 @@ mod thread_processor_behavior_tests { approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, permission_profile: codex_protocol::models::PermissionProfile::Disabled, active_permission_profile: None, + active_permission_preset_id: None, environments: TurnEnvironmentSelections::new(cwd, Vec::new()), workspace_roots: Vec::new(), profile_workspace_roots: Vec::new(), diff --git a/codex-rs/app-server/src/request_processors/thread_summary.rs b/codex-rs/app-server/src/request_processors/thread_summary.rs index bb2c6708cd..30b4ffb2fd 100644 --- a/codex-rs/app-server/src/request_processors/thread_summary.rs +++ b/codex-rs/app-server/src/request_processors/thread_summary.rs @@ -199,6 +199,7 @@ pub(crate) fn thread_settings_from_config_snapshot( active_permission_profile: thread_response_active_permission_profile( config_snapshot.active_permission_profile.clone(), ), + active_permission_preset_id: config_snapshot.active_permission_preset_id.clone(), model: config_snapshot.model.clone(), model_provider: config_snapshot.model_provider_id.clone(), service_tier: config_snapshot.service_tier.clone(), @@ -221,6 +222,7 @@ pub(crate) fn thread_settings_from_core_snapshot( approvals_reviewer, permission_profile, active_permission_profile, + active_permission_preset_id, cwd, reasoning_effort, reasoning_summary, @@ -237,6 +239,7 @@ pub(crate) fn thread_settings_from_core_snapshot( active_permission_profile: thread_response_active_permission_profile( active_permission_profile, ), + active_permission_preset_id, model, model_provider: model_provider_id, service_tier, diff --git a/codex-rs/app-server/src/request_processors/turn_processor.rs b/codex-rs/app-server/src/request_processors/turn_processor.rs index 7b5cafe0aa..aa42d1eb51 100644 --- a/codex-rs/app-server/src/request_processors/turn_processor.rs +++ b/codex-rs/app-server/src/request_processors/turn_processor.rs @@ -1,4 +1,5 @@ use super::*; +use crate::permission_presets::permission_preset_catalog; use codex_protocol::config_types::MultiAgentMode; use codex_protocol::protocol::AdditionalContextEntry as CoreAdditionalContextEntry; use codex_protocol::protocol::AdditionalContextKind as CoreAdditionalContextKind; @@ -56,6 +57,7 @@ struct ThreadSettingsBuildParams { approvals_reviewer: Option, sandbox_policy: Option, permissions: Option, + permission_preset_id: Option, model: Option, service_tier: Option>, effort: Option, @@ -451,6 +453,7 @@ impl TurnRequestProcessor { approvals_reviewer: params.approvals_reviewer, sandbox_policy: params.sandbox_policy, permissions: params.permissions, + permission_preset_id: params.permission_preset_id, model: params.model, service_tier: params.service_tier, effort: params.effort, @@ -558,6 +561,7 @@ impl TurnRequestProcessor { approvals_reviewer, sandbox_policy, permissions, + permission_preset_id, model, service_tier, effort, @@ -567,6 +571,16 @@ impl TurnRequestProcessor { personality, } = params; + if permission_preset_id.is_some() + && (approval_policy.is_some() + || approvals_reviewer.is_some() + || sandbox_policy.is_some() + || permissions.is_some()) + { + return Err(invalid_request( + "`permissionPresetId` cannot be combined with raw permission overrides", + )); + } if sandbox_policy.is_some() && permissions.is_some() { return Err(invalid_request( "`permissions` cannot be combined with `sandboxPolicy`", @@ -580,7 +594,7 @@ impl TurnRequestProcessor { // `thread/settings/update` only acknowledges that the update was queued. // Clients that send dependent partial updates should wait for // `thread/settings/updated` or combine the fields in one request. - let snapshot = if permissions.is_some() { + let snapshot = if permissions.is_some() || permission_preset_id.is_some() { Some(thread.config_snapshot().await) } else { None @@ -592,6 +606,7 @@ impl TurnRequestProcessor { || approvals_reviewer.is_some() || sandbox_policy.is_some() || permissions.is_some() + || permission_preset_id.is_some() || model.is_some() || service_tier.is_some() || effort.is_some() @@ -602,19 +617,19 @@ impl TurnRequestProcessor { let runtime_workspace_roots = runtime_workspace_roots_request.map(resolve_runtime_workspace_roots); - let approval_policy = + let mut approval_policy = approval_policy.map(codex_app_server_protocol::AskForApproval::to_core); - let approvals_reviewer = + let mut approvals_reviewer = approvals_reviewer.map(codex_app_server_protocol::ApprovalsReviewer::to_core); let sandbox_policy = sandbox_policy.map(|policy| policy.to_core()); let (permission_profile, active_permission_profile, profile_workspace_roots) = - if let Some(permissions) = permissions { + if permissions.is_some() || permission_preset_id.is_some() { let Some(snapshot) = snapshot.as_ref() else { return Err(internal_error(format!( "{method} permission selection missing thread snapshot" ))); }; - let overrides = ConfigOverrides { + let mut overrides = ConfigOverrides { cwd: environments .as_ref() .map(|environments| environments.legacy_fallback_cwd.to_path_buf()), @@ -623,11 +638,25 @@ impl TurnRequestProcessor { .clone() .unwrap_or_else(|| snapshot.workspace_roots.clone()), ), - default_permissions: Some(permissions), + default_permissions: permissions, codex_linux_sandbox_exe: self.arg0_paths.codex_linux_sandbox_exe.clone(), main_execve_wrapper_exe: self.arg0_paths.main_execve_wrapper_exe.clone(), ..Default::default() }; + if let Some(permission_preset_id) = permission_preset_id.as_deref() { + let cwd = overrides + .cwd + .clone() + .unwrap_or_else(|| snapshot.cwd().to_path_buf()); + let selection = permission_preset_catalog(&self.config_manager, Some(cwd)) + .await + .map_err(|err| config_load_error(&err))? + .selection(permission_preset_id) + .map_err(|err| invalid_request(err.to_string()))?; + approval_policy = Some(selection.approval_policy); + approvals_reviewer = Some(selection.approvals_reviewer); + selection.apply_to(&mut overrides); + } let config = self .config_manager .load_for_cwd( @@ -655,6 +684,17 @@ impl TurnRequestProcessor { } else { (None, None, None) }; + let active_permission_preset_id = if let Some(permission_preset_id) = permission_preset_id { + Some(Some(permission_preset_id)) + } else if approval_policy.is_some() + || approvals_reviewer.is_some() + || sandbox_policy.is_some() + || permission_profile.is_some() + { + Some(None) + } else { + None + }; let effort = effort.map(Some); if has_any_overrides { @@ -667,6 +707,7 @@ impl TurnRequestProcessor { sandbox_policy: sandbox_policy.clone(), permission_profile: permission_profile.clone(), active_permission_profile: active_permission_profile.clone(), + active_permission_preset_id: active_permission_preset_id.clone(), profile_workspace_roots: profile_workspace_roots.clone(), windows_sandbox_level: None, model: model.clone(), @@ -692,6 +733,7 @@ impl TurnRequestProcessor { sandbox_policy, permission_profile, active_permission_profile, + active_permission_preset_id, windows_sandbox_level: None, model, effort, @@ -724,6 +766,7 @@ impl TurnRequestProcessor { approvals_reviewer: params.approvals_reviewer, sandbox_policy: params.sandbox_policy, permissions: params.permissions, + permission_preset_id: params.permission_preset_id, model: params.model, service_tier: params.service_tier, effort: params.effort, diff --git a/codex-rs/app-server/src/thread_state.rs b/codex-rs/app-server/src/thread_state.rs index e4e4e42adf..015aaeb98d 100644 --- a/codex-rs/app-server/src/thread_state.rs +++ b/codex-rs/app-server/src/thread_state.rs @@ -228,6 +228,7 @@ mod tests { network_access: false, }, active_permission_profile: None, + active_permission_preset_id: None, model: model.to_string(), model_provider: "mock_provider".to_string(), service_tier: None, diff --git a/codex-rs/app-server/tests/suite/v2/permission_preset_list.rs b/codex-rs/app-server/tests/suite/v2/permission_preset_list.rs index eab5417608..4ddd6d2d08 100644 --- a/codex-rs/app-server/tests/suite/v2/permission_preset_list.rs +++ b/codex-rs/app-server/tests/suite/v2/permission_preset_list.rs @@ -7,9 +7,13 @@ use codex_app_server_protocol::ApprovalsReviewer; use codex_app_server_protocol::AskForApproval; use codex_app_server_protocol::JSONRPCResponse; use codex_app_server_protocol::PermissionPreset; +use codex_app_server_protocol::PermissionPresetDefaultSource; +use codex_app_server_protocol::PermissionPresetKind; use codex_app_server_protocol::PermissionPresetListParams; use codex_app_server_protocol::PermissionPresetListResponse; +use codex_app_server_protocol::PermissionPresetUnavailabilityReason; use codex_app_server_protocol::RequestId; +use codex_app_server_protocol::SandboxPolicy; use codex_core::config::set_project_trust_level; use codex_protocol::config_types::TrustLevel; use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS; @@ -22,7 +26,7 @@ use tokio::time::timeout; const DEFAULT_TIMEOUT: Duration = Duration::from_secs(30); #[tokio::test] -async fn permission_preset_list_returns_resolved_builtin_presets() -> Result<()> { +async fn permission_preset_list_returns_complete_builtin_catalog() -> Result<()> { let actual = list_permission_presets_from_config( r#" default_permissions = ":workspace" @@ -39,23 +43,27 @@ guardian_approval = true actual, PermissionPresetListResponse { data: vec![ - preset( + builtin_preset( "read-only", + PermissionPresetKind::ReadOnly, BUILT_IN_PERMISSION_PROFILE_READ_ONLY, + read_only(), AskForApproval::OnRequest, ApprovalsReviewer::User, - /*is_default*/ false, ), - preset( + builtin_preset( "auto", + PermissionPresetKind::Auto, BUILT_IN_PERMISSION_PROFILE_WORKSPACE, + workspace_write(), AskForApproval::OnRequest, ApprovalsReviewer::User, - /*is_default*/ false, ), - preset( + builtin_preset( "granular", + PermissionPresetKind::Granular, BUILT_IN_PERMISSION_PROFILE_WORKSPACE, + workspace_write(), AskForApproval::Granular { sandbox_approval: false, rules: false, @@ -64,31 +72,57 @@ guardian_approval = true mcp_elicitations: true, }, ApprovalsReviewer::User, - /*is_default*/ false, ), - preset( + builtin_preset( "guardian-approvals", + PermissionPresetKind::GuardianApprovals, BUILT_IN_PERMISSION_PROFILE_WORKSPACE, + workspace_write(), AskForApproval::OnRequest, ApprovalsReviewer::AutoReview, - /*is_default*/ true, ), - preset( + builtin_preset( "full-access", + PermissionPresetKind::FullAccess, BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS, + SandboxPolicy::DangerFullAccess, AskForApproval::Never, ApprovalsReviewer::User, - /*is_default*/ false, ), ], next_cursor: None, + default_preset_id: "guardian-approvals".to_string(), + default_source: PermissionPresetDefaultSource::Config, } ); Ok(()) } #[tokio::test] -async fn permission_preset_list_applies_managed_profile_and_policy_fallbacks() -> Result<()> { +async fn permission_preset_list_keeps_allowed_config_default_provenance() -> Result<()> { + let actual = list_permission_presets_from_config( + r#" +default_permissions = ":workspace" +"#, + Some( + r#" +default_permissions = ":read-only" + +[allowed_permission_profiles] +":read-only" = true +":workspace" = true +"#, + ), + ) + .await?; + + assert_eq!(actual.default_preset_id, "auto"); + assert_eq!(actual.default_source, PermissionPresetDefaultSource::Config); + Ok(()) +} + +#[tokio::test] +async fn permission_preset_list_retains_disallowed_profiles_without_coercion() -> Result<()> { let actual = list_permission_presets_from_config( r#" default_permissions = "dev" @@ -121,113 +155,136 @@ description = "Inspect without writes." ) .await?; + assert_eq!(actual.default_preset_id, "permission-profile:audit"); assert_eq!( - actual, - PermissionPresetListResponse { - data: vec![ - preset( - "read-only", - BUILT_IN_PERMISSION_PROFILE_READ_ONLY, - AskForApproval::OnRequest, - ApprovalsReviewer::User, - /*is_default*/ false, - ), - PermissionPreset { - id: "permission-profile:audit".to_string(), - permission_profile_id: "audit".to_string(), - description: Some("Inspect without writes.".to_string()), - approval_policy: AskForApproval::OnRequest, - approvals_reviewer: ApprovalsReviewer::User, - is_default: true, - }, - ], - next_cursor: None, - } + actual.default_source, + PermissionPresetDefaultSource::Requirements + ); + assert_eq!( + actual + .data + .iter() + .map(|preset| preset.id.as_str()) + .collect::>(), + vec![ + "read-only", + "auto", + "granular", + "guardian-approvals", + "full-access", + "permission-profile:audit", + "permission-profile:dev", + ] + ); + assert_eq!( + preset(&actual, "auto").unavailability_reason, + Some(PermissionPresetUnavailabilityReason::PermissionProfile { + permission_profile_id: BUILT_IN_PERMISSION_PROFILE_WORKSPACE.to_string(), + }) + ); + assert_eq!( + preset(&actual, "full-access").approval_policy, + AskForApproval::Never + ); + assert_eq!( + preset(&actual, "permission-profile:dev").unavailability_reason, + Some(PermissionPresetUnavailabilityReason::PermissionProfile { + permission_profile_id: "dev".to_string(), + }) + ); + assert!(preset(&actual, "permission-profile:audit").allowed); + Ok(()) +} + +#[tokio::test] +async fn permission_preset_list_reports_approval_and_reviewer_constraints() -> Result<()> { + let actual = list_permission_presets_from_config( + r#" +[features] +guardian_approval = true +"#, + Some( + r#" +allowed_approval_policies = ["on-request"] +allowed_approvals_reviewers = ["user"] +default_permissions = ":workspace" + +[allowed_permission_profiles] +":read-only" = true +":workspace" = true +":danger-full-access" = true +"#, + ), + ) + .await?; + + assert_eq!( + preset(&actual, "granular").unavailability_reason, + Some(PermissionPresetUnavailabilityReason::ApprovalPolicy) + ); + assert_eq!( + preset(&actual, "guardian-approvals").unavailability_reason, + Some(PermissionPresetUnavailabilityReason::ApprovalsReviewer) + ); + assert_eq!( + preset(&actual, "full-access").unavailability_reason, + Some(PermissionPresetUnavailabilityReason::ApprovalPolicy) + ); + assert_eq!( + preset(&actual, "full-access").approval_policy, + AskForApproval::Never ); Ok(()) } #[tokio::test] -async fn permission_preset_list_matches_legacy_defaults() -> Result<()> { - for (config, requirements, expected, expected_ids) in [ - ( - r#" +async fn permission_preset_list_keeps_equivalent_legacy_config() -> Result<()> { + let actual = list_permission_presets_from_config( + r#" sandbox_mode = "read-only" approval_policy = "on-request" "#, - None, - preset( - "read-only", - BUILT_IN_PERMISSION_PROFILE_READ_ONLY, - AskForApproval::OnRequest, - ApprovalsReviewer::User, - /*is_default*/ true, - ), - None, - ), - ( - r#" -sandbox_mode = "workspace-write" -approval_policy = "on-request" -"#, - Some( - r#" -allowed_sandbox_modes = ["read-only"] -"#, - ), - preset( - "read-only", - BUILT_IN_PERMISSION_PROFILE_READ_ONLY, - AskForApproval::OnRequest, - ApprovalsReviewer::User, - /*is_default*/ true, - ), - Some(vec!["read-only"]), - ), - ( - r#" -sandbox_mode = "danger-full-access" -approval_policy = "never" -"#, - None, - preset( - "full-access", - BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS, - AskForApproval::Never, - ApprovalsReviewer::User, - /*is_default*/ true, - ), - None, - ), - ] { - let actual = list_permission_presets_from_config(config, requirements).await?; + /*requirements*/ None, + ) + .await?; - if let Some(expected_ids) = expected_ids { - assert_eq!( - actual - .data - .iter() - .map(|preset| preset.id.as_str()) - .collect::>(), - expected_ids - ); - } - - assert_eq!( - actual - .data - .iter() - .filter(|preset| preset.is_default) - .cloned() - .collect::>(), - vec![expected] - ); - } + assert_eq!(actual.default_preset_id, "legacy-config"); + assert_eq!(actual.default_source, PermissionPresetDefaultSource::Config); + assert_eq!( + preset(&actual, "legacy-config").kind, + PermissionPresetKind::LegacyConfig + ); + assert_eq!( + preset(&actual, "legacy-config").sandbox_policy, + preset(&actual, "read-only").sandbox_policy + ); Ok(()) } #[tokio::test] -async fn permission_preset_list_resolves_project_profiles_and_paginates() -> Result<()> { +async fn permission_preset_list_keeps_named_profile_equivalent_to_builtin() -> Result<()> { + let actual = list_permission_presets_from_config( + r#" +default_permissions = "project" + +[permissions.project] +description = "Project-scoped profile." +extends = ":workspace" +"#, + /*requirements*/ None, + ) + .await?; + + assert_eq!(actual.default_preset_id, "permission-profile:project"); + assert_eq!( + preset(&actual, "permission-profile:project").sandbox_policy, + preset(&actual, "auto").sandbox_policy + ); + Ok(()) +} + +#[tokio::test] +async fn permission_preset_list_paginates_without_losing_default_metadata() -> Result<()> { let codex_home = TempDir::new()?; let workspace = TempDir::new()?; let project_config_dir = workspace.path().join(".codex"); @@ -238,11 +295,7 @@ async fn permission_preset_list_resolves_project_profiles_and_paginates() -> Res default_permissions = "project" [permissions.project] -description = "Project-scoped profile." extends = ":workspace" - -[features] -guardian_approval = false "#, )?; set_project_trust_level(codex_home.path(), workspace.path(), TrustLevel::Trusted)?; @@ -250,7 +303,6 @@ guardian_approval = false let mut mcp = TestAppServer::new(codex_home.path()).await?; timeout(DEFAULT_TIMEOUT, mcp.initialize()).await??; let cwd = workspace.path().to_string_lossy().into_owned(); - let first = list_permission_presets( &mut mcp, PermissionPresetListParams { @@ -260,129 +312,67 @@ guardian_approval = false }, ) .await?; - assert_eq!( - first, - PermissionPresetListResponse { - data: vec![ - preset( - "read-only", - BUILT_IN_PERMISSION_PROFILE_READ_ONLY, - AskForApproval::OnRequest, - ApprovalsReviewer::User, - /*is_default*/ false, - ), - preset( - "auto", - BUILT_IN_PERMISSION_PROFILE_WORKSPACE, - AskForApproval::OnRequest, - ApprovalsReviewer::User, - /*is_default*/ false, - ), - preset( - "granular", - BUILT_IN_PERMISSION_PROFILE_WORKSPACE, - AskForApproval::Granular { - sandbox_approval: false, - rules: false, - skill_approval: false, - request_permissions: true, - mcp_elicitations: true, - }, - ApprovalsReviewer::User, - /*is_default*/ false, - ), - preset( - "full-access", - BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS, - AskForApproval::Never, - ApprovalsReviewer::User, - /*is_default*/ false, - ), - ], - next_cursor: Some("4".to_string()), - } - ); - let second = list_permission_presets( &mut mcp, PermissionPresetListParams { - cursor: first.next_cursor, + cursor: first.next_cursor.clone(), limit: Some(4), cwd: Some(cwd), }, ) .await?; - assert_eq!( - second, - PermissionPresetListResponse { - data: vec![PermissionPreset { - id: "permission-profile:project".to_string(), - permission_profile_id: "project".to_string(), - description: Some("Project-scoped profile.".to_string()), - approval_policy: AskForApproval::OnRequest, - approvals_reviewer: ApprovalsReviewer::User, - is_default: true, - }], - next_cursor: None, - } - ); + + assert_eq!(first.next_cursor, Some("4".to_string())); + assert_eq!(second.data.len(), 2); + assert_eq!(first.default_preset_id, second.default_preset_id); + assert_eq!(first.default_source, second.default_source); Ok(()) } -#[tokio::test] -async fn permission_preset_list_removes_presets_with_identical_resolved_settings() -> Result<()> { - let actual = list_permission_presets_from_config( - r#" -default_permissions = ":workspace" -approval_policy = "never" -approvals_reviewer = "auto_review" -"#, - Some( - r#" -allowed_approval_policies = ["on-request"] -allowed_approvals_reviewers = ["user"] -default_permissions = ":workspace" - -[allowed_permission_profiles] -":workspace" = true -"#, - ), - ) - .await?; - - assert_eq!( - actual, - PermissionPresetListResponse { - data: vec![preset( - "auto", - BUILT_IN_PERMISSION_PROFILE_WORKSPACE, - AskForApproval::OnRequest, - ApprovalsReviewer::User, - /*is_default*/ true, - )], - next_cursor: None, - } - ); - Ok(()) -} - -fn preset( +fn builtin_preset( id: &str, + kind: PermissionPresetKind, permission_profile_id: &str, + sandbox_policy: SandboxPolicy, approval_policy: AskForApproval, approvals_reviewer: ApprovalsReviewer, - is_default: bool, ) -> PermissionPreset { PermissionPreset { id: id.to_string(), - permission_profile_id: permission_profile_id.to_string(), + kind, + permission_profile_id: Some(permission_profile_id.to_string()), description: None, + sandbox_policy, approval_policy, approvals_reviewer, - is_default, + allowed: true, + unavailability_reason: None, } } +fn read_only() -> SandboxPolicy { + SandboxPolicy::ReadOnly { + network_access: false, + } +} + +fn workspace_write() -> SandboxPolicy { + SandboxPolicy::WorkspaceWrite { + writable_roots: Vec::new(), + network_access: false, + exclude_tmpdir_env_var: false, + exclude_slash_tmp: false, + } +} + +fn preset<'a>(response: &'a PermissionPresetListResponse, id: &str) -> &'a PermissionPreset { + response + .data + .iter() + .find(|preset| preset.id == id) + .unwrap_or_else(|| panic!("missing permission preset `{id}`")) +} + async fn list_permission_presets( mcp: &mut TestAppServer, params: PermissionPresetListParams, diff --git a/codex-rs/app-server/tests/suite/v2/skills_list.rs b/codex-rs/app-server/tests/suite/v2/skills_list.rs index ef7ee6c1d1..678a3fac9d 100644 --- a/codex-rs/app-server/tests/suite/v2/skills_list.rs +++ b/codex-rs/app-server/tests/suite/v2/skills_list.rs @@ -784,6 +784,7 @@ async fn skills_changed_notification_is_emitted_after_skill_change() -> Result<( approvals_reviewer: None, sandbox: None, permissions: None, + permission_preset_id: None, config: None, service_name: None, base_instructions: None, diff --git a/codex-rs/app-server/tests/suite/v2/thread_fork.rs b/codex-rs/app-server/tests/suite/v2/thread_fork.rs index 4a650bcd4a..bc146ca775 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_fork.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_fork.rs @@ -10,6 +10,7 @@ use codex_app_server_protocol::JSONRPCError; use codex_app_server_protocol::JSONRPCMessage; use codex_app_server_protocol::JSONRPCResponse; use codex_app_server_protocol::RequestId; +use codex_app_server_protocol::SandboxPolicy; use codex_app_server_protocol::ServerNotification; use codex_app_server_protocol::SessionSource; use codex_app_server_protocol::ThreadForkParams; @@ -58,6 +59,86 @@ const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs #[cfg(not(windows))] const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10); +#[tokio::test] +async fn thread_fork_applies_permission_preset() -> Result<()> { + let server = create_mock_responses_server_repeating_assistant("Done").await; + let codex_home = TempDir::new()?; + create_config_toml(codex_home.path(), &server.uri())?; + let thread_id = create_fake_rollout( + codex_home.path(), + "2025-01-05T12-00-00", + "2025-01-05T12:00:00Z", + "Saved user message", + Some("mock_provider"), + /*git_info*/ None, + )?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??; + + let request_id = mcp + .send_thread_fork_request(ThreadForkParams { + thread_id, + permission_preset_id: Some("full-access".to_string()), + ..Default::default() + }) + .await?; + let response: ThreadForkResponse = to_response( + timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(request_id)), + ) + .await??, + )?; + + assert_eq!( + response.active_permission_preset_id.as_deref(), + Some("full-access") + ); + assert_eq!( + response.approval_policy, + codex_app_server_protocol::AskForApproval::Never + ); + assert_eq!(response.sandbox, SandboxPolicy::DangerFullAccess); + Ok(()) +} + +#[tokio::test] +async fn thread_fork_rejects_permission_preset_with_raw_overrides() -> Result<()> { + let server = create_mock_responses_server_repeating_assistant("Done").await; + let codex_home = TempDir::new()?; + create_config_toml(codex_home.path(), &server.uri())?; + let thread_id = create_fake_rollout( + codex_home.path(), + "2025-01-05T12-00-00", + "2025-01-05T12:00:00Z", + "Saved user message", + Some("mock_provider"), + /*git_info*/ None, + )?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??; + + let request_id = mcp + .send_thread_fork_request(ThreadForkParams { + thread_id, + permission_preset_id: Some("full-access".to_string()), + approval_policy: Some(codex_app_server_protocol::AskForApproval::Never), + ..Default::default() + }) + .await?; + let error: JSONRPCError = timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_error_message(RequestId::Integer(request_id)), + ) + .await??; + + assert_eq!( + error.error.message, + "`permissionPresetId` cannot be combined with raw permission overrides" + ); + Ok(()) +} + async fn list_threads(mcp: &mut TestAppServer) -> Result { let list_id = mcp .send_thread_list_request(ThreadListParams { diff --git a/codex-rs/app-server/tests/suite/v2/thread_resume.rs b/codex-rs/app-server/tests/suite/v2/thread_resume.rs index ea7a1a9d46..e4501abb0a 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_resume.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_resume.rs @@ -27,6 +27,7 @@ use codex_app_server_protocol::McpToolCallAppContext; use codex_app_server_protocol::PatchApplyStatus; use codex_app_server_protocol::PatchChangeKind; use codex_app_server_protocol::RequestId; +use codex_app_server_protocol::SandboxPolicy; use codex_app_server_protocol::ServerNotification; use codex_app_server_protocol::ServerRequest; use codex_app_server_protocol::SessionSource; @@ -67,6 +68,7 @@ use codex_protocol::protocol::McpInvocation; use codex_protocol::protocol::McpToolCallEndEvent; use codex_protocol::protocol::MultiAgentVersion; use codex_protocol::protocol::RolloutItem; +use codex_protocol::protocol::SessionConfiguredEvent; use codex_protocol::protocol::SessionMeta; use codex_protocol::protocol::SessionMetaLine; use codex_protocol::protocol::SessionSource as RolloutSessionSource; @@ -114,6 +116,149 @@ const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10); const CODEX_5_2_INSTRUCTIONS_TEMPLATE_DEFAULT: &str = "You are Codex, a coding agent based on GPT-5. You and the user share the same workspace and collaborate to achieve the user's goals."; +#[tokio::test] +async fn thread_resume_applies_permission_preset() -> Result<()> { + let server = create_mock_responses_server_repeating_assistant("Done").await; + let codex_home = TempDir::new()?; + create_config_toml(codex_home.path(), &server.uri())?; + let thread_id = create_fake_rollout( + codex_home.path(), + "2025-01-05T12-00-00", + "2025-01-05T12:00:00Z", + "Saved user message", + Some("mock_provider"), + /*git_info*/ None, + )?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??; + + let request_id = mcp + .send_thread_resume_request(ThreadResumeParams { + thread_id, + permission_preset_id: Some("full-access".to_string()), + ..Default::default() + }) + .await?; + let response: ThreadResumeResponse = to_response( + timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(request_id)), + ) + .await??, + )?; + + assert_eq!( + response.active_permission_preset_id.as_deref(), + Some("full-access") + ); + assert_eq!(response.approval_policy, AskForApproval::Never); + assert_eq!(response.sandbox, SandboxPolicy::DangerFullAccess); + Ok(()) +} + +#[tokio::test] +async fn thread_resume_rejects_permission_preset_with_raw_overrides() -> Result<()> { + let server = create_mock_responses_server_repeating_assistant("Done").await; + let codex_home = TempDir::new()?; + create_config_toml(codex_home.path(), &server.uri())?; + let thread_id = create_fake_rollout( + codex_home.path(), + "2025-01-05T12-00-00", + "2025-01-05T12:00:00Z", + "Saved user message", + Some("mock_provider"), + /*git_info*/ None, + )?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??; + + let request_id = mcp + .send_thread_resume_request(ThreadResumeParams { + thread_id, + permission_preset_id: Some("full-access".to_string()), + approval_policy: Some(AskForApproval::Never), + ..Default::default() + }) + .await?; + let error = timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_error_message(RequestId::Integer(request_id)), + ) + .await??; + + assert_eq!( + error.error.message, + "`permissionPresetId` cannot be combined with raw permission overrides" + ); + Ok(()) +} + +#[tokio::test] +async fn thread_resume_derives_legacy_permission_preset() -> Result<()> { + let server = create_mock_responses_server_repeating_assistant("Done").await; + let codex_home = TempDir::new()?; + create_config_toml(codex_home.path(), &server.uri())?; + let thread_id = create_fake_rollout( + codex_home.path(), + "2025-01-05T12-00-00", + "2025-01-05T12:00:00Z", + "Saved user message", + Some("mock_provider"), + /*git_info*/ None, + )?; + let parsed_thread_id = ThreadId::from_string(&thread_id)?; + let path = rollout_path(codex_home.path(), "2025-01-05T12-00-00", &thread_id); + append_rollout_item_to_path( + &path, + &RolloutItem::EventMsg(EventMsg::SessionConfigured(SessionConfiguredEvent { + session_id: codex_protocol::SessionId::from(parsed_thread_id), + thread_id: parsed_thread_id, + forked_from_id: None, + parent_thread_id: None, + thread_source: None, + thread_name: None, + model: "gpt-5.3-codex".to_string(), + model_provider_id: "mock_provider".to_string(), + service_tier: None, + approval_policy: codex_protocol::protocol::AskForApproval::Never, + approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, + permission_profile: codex_protocol::models::PermissionProfile::Disabled, + active_permission_profile: None, + active_permission_preset_id: None, + cwd: test_absolute_path("/"), + reasoning_effort: None, + initial_messages: None, + network_proxy: None, + rollout_path: Some(path.clone()), + })), + ) + .await?; + + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??; + let request_id = mcp + .send_thread_resume_request(ThreadResumeParams { + thread_id, + ..Default::default() + }) + .await?; + let response: ThreadResumeResponse = to_response( + timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(request_id)), + ) + .await??, + )?; + + assert_eq!( + response.active_permission_preset_id.as_deref(), + Some("full-access") + ); + assert_eq!(response.approval_policy, AskForApproval::Never); + assert_eq!(response.sandbox, SandboxPolicy::DangerFullAccess); + Ok(()) +} + fn normalized_existing_path(path: impl AsRef) -> Result { Ok(AbsolutePathBuf::from_absolute_path(path.as_ref().canonicalize()?)?.into_path_buf()) } @@ -260,6 +405,63 @@ async fn thread_resume_with_empty_path_uses_running_thread_id() -> Result<()> { Ok(()) } +#[tokio::test] +async fn thread_resume_rejects_unknown_permission_preset_for_running_thread() -> Result<()> { + let server = create_mock_responses_server_repeating_assistant("Done").await; + let codex_home = TempDir::new()?; + create_config_toml(codex_home.path(), &server.uri())?; + + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??; + + let start_id = mcp + .send_thread_start_request(ThreadStartParams::default()) + .await?; + let response = timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(start_id)), + ) + .await??; + let ThreadStartResponse { thread, .. } = to_response(response)?; + + let turn_id = mcp + .send_turn_start_request(TurnStartParams { + thread_id: thread.id.clone(), + input: vec![UserInput::Text { + text: "materialize rollout".to_string(), + text_elements: Vec::new(), + }], + ..Default::default() + }) + .await?; + timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(turn_id)), + ) + .await??; + timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_notification_message("turn/completed"), + ) + .await??; + + let resume_id = mcp + .send_thread_resume_request(ThreadResumeParams { + thread_id: thread.id, + permission_preset_id: Some("unknown".to_string()), + ..Default::default() + }) + .await?; + let error = timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_error_message(RequestId::Integer(resume_id)), + ) + .await??; + + assert_eq!(error.error.message, "unknown permission preset `unknown`"); + Ok(()) +} + #[tokio::test] async fn thread_resume_running_thread_uses_cached_instruction_sources() -> Result<()> { let server = create_mock_responses_server_repeating_assistant("Done").await; diff --git a/codex-rs/app-server/tests/suite/v2/thread_settings_update.rs b/codex-rs/app-server/tests/suite/v2/thread_settings_update.rs index 9ad25ca992..41e5151852 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_settings_update.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_settings_update.rs @@ -6,6 +6,7 @@ use app_test_support::create_mock_responses_server_sequence_unchecked; use app_test_support::to_response; use app_test_support::write_mock_responses_config_toml; use app_test_support::write_models_cache; +use codex_app_server_protocol::AskForApproval; use codex_app_server_protocol::JSONRPCError; use codex_app_server_protocol::JSONRPCNotification; use codex_app_server_protocol::JSONRPCResponse; @@ -397,6 +398,74 @@ async fn thread_settings_update_rejects_sandbox_policy_with_permissions() -> Res Ok(()) } +#[tokio::test] +async fn thread_settings_update_applies_permission_preset() -> Result<()> { + let server = create_mock_responses_server_sequence_unchecked(Vec::new()).await; + let codex_home = TempDir::new()?; + create_config_toml(codex_home.path(), &server.uri())?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_TIMEOUT, mcp.initialize()).await??; + let thread = start_thread(&mut mcp).await?.thread; + + send_thread_settings_update( + &mut mcp, + ThreadSettingsUpdateParams { + thread_id: thread.id, + permission_preset_id: Some("full-access".to_string()), + ..Default::default() + }, + ) + .await?; + let updated = read_thread_settings_updated(&mut mcp).await?; + + assert_eq!( + updated + .thread_settings + .active_permission_preset_id + .as_deref(), + Some("full-access") + ); + assert_eq!( + updated.thread_settings.approval_policy, + AskForApproval::Never + ); + assert_eq!( + updated.thread_settings.sandbox_policy, + SandboxPolicy::DangerFullAccess + ); + Ok(()) +} + +#[tokio::test] +async fn thread_settings_update_rejects_permission_preset_with_raw_overrides() -> Result<()> { + let server = create_mock_responses_server_sequence_unchecked(Vec::new()).await; + let codex_home = TempDir::new()?; + create_config_toml(codex_home.path(), &server.uri())?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_TIMEOUT, mcp.initialize()).await??; + let thread = start_thread(&mut mcp).await?.thread; + + let request_id = mcp + .send_thread_settings_update_request(ThreadSettingsUpdateParams { + thread_id: thread.id, + permission_preset_id: Some("full-access".to_string()), + approval_policy: Some(AskForApproval::Never), + ..Default::default() + }) + .await?; + let error: JSONRPCError = timeout( + DEFAULT_TIMEOUT, + mcp.read_stream_until_error_message(RequestId::Integer(request_id)), + ) + .await??; + + assert_eq!( + error.error.message, + "`permissionPresetId` cannot be combined with raw permission overrides" + ); + Ok(()) +} + #[tokio::test] async fn turn_start_settings_override_emits_thread_settings_updated() -> Result<()> { let server = create_mock_responses_server_sequence_unchecked(vec![ @@ -447,6 +516,91 @@ async fn turn_start_settings_override_emits_thread_settings_updated() -> Result< Ok(()) } +#[tokio::test] +async fn turn_start_applies_permission_preset() -> Result<()> { + let server = create_mock_responses_server_sequence_unchecked(vec![ + create_final_assistant_message_sse_response("done")?, + ]) + .await; + let codex_home = TempDir::new()?; + create_config_toml(codex_home.path(), &server.uri())?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_TIMEOUT, mcp.initialize()).await??; + let thread = start_thread(&mut mcp).await?.thread; + timeout( + DEFAULT_TIMEOUT, + mcp.read_stream_until_notification_message("thread/started"), + ) + .await??; + + let request_id = mcp + .send_turn_start_request(TurnStartParams { + thread_id: thread.id, + input: vec![V2UserInput::Text { + text: "hello".to_string(), + text_elements: Vec::new(), + }], + permission_preset_id: Some("full-access".to_string()), + ..Default::default() + }) + .await?; + let _: TurnStartResponse = to_response( + timeout( + DEFAULT_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(request_id)), + ) + .await??, + )?; + let updated = read_thread_settings_updated(&mut mcp).await?; + + assert_eq!( + updated + .thread_settings + .active_permission_preset_id + .as_deref(), + Some("full-access") + ); + assert_eq!( + updated.thread_settings.approval_policy, + AskForApproval::Never + ); + Ok(()) +} + +#[tokio::test] +async fn turn_start_rejects_permission_preset_with_raw_overrides() -> Result<()> { + let server = create_mock_responses_server_sequence_unchecked(Vec::new()).await; + let codex_home = TempDir::new()?; + create_config_toml(codex_home.path(), &server.uri())?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_TIMEOUT, mcp.initialize()).await??; + let thread = start_thread(&mut mcp).await?.thread; + + let request_id = mcp + .send_turn_start_request(TurnStartParams { + thread_id: thread.id, + input: vec![V2UserInput::Text { + text: "hello".to_string(), + text_elements: Vec::new(), + }], + permission_preset_id: Some("full-access".to_string()), + approval_policy: Some(AskForApproval::Never), + ..Default::default() + }) + .await?; + let error: JSONRPCError = timeout( + DEFAULT_TIMEOUT, + mcp.read_stream_until_error_message(RequestId::Integer(request_id)), + ) + .await??; + + assert_eq!( + error.error.message, + "`permissionPresetId` cannot be combined with raw permission overrides" + ); + Ok(()) +} + async fn send_thread_settings_update( mcp: &mut TestAppServer, params: ThreadSettingsUpdateParams, diff --git a/codex-rs/app-server/tests/suite/v2/thread_start.rs b/codex-rs/app-server/tests/suite/v2/thread_start.rs index dcfeb4fa94..4e6a07646f 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_start.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_start.rs @@ -14,6 +14,7 @@ use codex_app_server_protocol::McpServerStartupState; use codex_app_server_protocol::McpServerStatusUpdatedNotification; use codex_app_server_protocol::RequestId; use codex_app_server_protocol::SandboxMode; +use codex_app_server_protocol::SandboxPolicy; use codex_app_server_protocol::ServerNotification; use codex_app_server_protocol::ThreadSource; use codex_app_server_protocol::ThreadStartParams; @@ -54,6 +55,85 @@ use super::analytics::wait_for_analytics_payload; const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10); const INVALID_REQUEST_ERROR_CODE: i64 = -32600; +#[tokio::test] +async fn thread_start_applies_permission_preset() -> Result<()> { + let server = create_mock_responses_server_repeating_assistant("Done").await; + let codex_home = TempDir::new()?; + create_config_toml_without_approval_policy(codex_home.path(), &server.uri())?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??; + + let request_id = mcp + .send_thread_start_request(ThreadStartParams { + permission_preset_id: Some("full-access".to_string()), + ..Default::default() + }) + .await?; + let response: ThreadStartResponse = to_response( + timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(request_id)), + ) + .await??, + )?; + + assert_eq!( + response.active_permission_preset_id.as_deref(), + Some("full-access") + ); + assert_eq!(response.approval_policy, AskForApproval::Never); + assert_eq!(response.sandbox, SandboxPolicy::DangerFullAccess); + Ok(()) +} + +#[tokio::test] +async fn thread_start_rejects_unknown_disallowed_and_conflicting_permission_presets() -> Result<()> +{ + let server = create_mock_responses_server_repeating_assistant("Done").await; + let codex_home = TempDir::new()?; + create_config_toml_without_approval_policy(codex_home.path(), &server.uri())?; + std::fs::write( + codex_home.path().join("requirements.toml"), + r#" +default_permissions = ":read-only" + +[allowed_permission_profiles] +":read-only" = true +"#, + )?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??; + + for (permission_preset_id, approval_policy, expected) in [ + ("missing", None, "unknown permission preset `missing`"), + ( + "full-access", + None, + "permission preset `full-access` is not allowed", + ), + ( + "read-only", + Some(AskForApproval::OnRequest), + "`permissionPresetId` cannot be combined with raw permission overrides", + ), + ] { + let request_id = mcp + .send_thread_start_request(ThreadStartParams { + permission_preset_id: Some(permission_preset_id.to_string()), + approval_policy, + ..Default::default() + }) + .await?; + let error: JSONRPCError = timeout( + DEFAULT_READ_TIMEOUT, + mcp.read_stream_until_error_message(RequestId::Integer(request_id)), + ) + .await??; + assert_eq!(error.error.message, expected); + } + Ok(()) +} + #[tokio::test] async fn thread_start_creates_thread_and_emits_started() -> Result<()> { // Provide a mock server and config so model wiring is valid. diff --git a/codex-rs/app-server/tests/suite/v2/turn_start.rs b/codex-rs/app-server/tests/suite/v2/turn_start.rs index 3edd8da6fb..e8e4966c50 100644 --- a/codex-rs/app-server/tests/suite/v2/turn_start.rs +++ b/codex-rs/app-server/tests/suite/v2/turn_start.rs @@ -2569,6 +2569,7 @@ async fn turn_start_updates_sandbox_and_cwd_between_turns_v2() -> Result<()> { exclude_slash_tmp: true, }), permissions: None, + permission_preset_id: None, model: Some("mock-model".to_string()), effort: Some(ReasoningEffort::Medium), summary: Some(ReasoningSummary::Auto), @@ -2609,6 +2610,7 @@ async fn turn_start_updates_sandbox_and_cwd_between_turns_v2() -> Result<()> { approvals_reviewer: None, sandbox_policy: Some(codex_app_server_protocol::SandboxPolicy::DangerFullAccess), permissions: None, + permission_preset_id: None, model: Some("mock-model".to_string()), effort: Some(ReasoningEffort::Medium), summary: Some(ReasoningSummary::Auto), diff --git a/codex-rs/core/src/codex_thread.rs b/codex-rs/core/src/codex_thread.rs index a522cd62aa..5ed6093180 100644 --- a/codex-rs/core/src/codex_thread.rs +++ b/codex-rs/core/src/codex_thread.rs @@ -64,6 +64,7 @@ pub struct ThreadConfigSnapshot { pub approvals_reviewer: ApprovalsReviewer, pub permission_profile: PermissionProfile, pub active_permission_profile: Option, + pub active_permission_preset_id: Option, pub environments: TurnEnvironmentSelections, pub workspace_roots: Vec, pub profile_workspace_roots: Vec, @@ -147,6 +148,7 @@ pub struct CodexThreadSettingsOverrides { pub sandbox_policy: Option, pub permission_profile: Option, pub active_permission_profile: Option, + pub active_permission_preset_id: Option>, pub windows_sandbox_level: Option, pub model: Option, pub effort: Option>, @@ -368,6 +370,7 @@ impl CodexThread { sandbox_policy, permission_profile, active_permission_profile, + active_permission_preset_id, windows_sandbox_level, model, effort, @@ -396,6 +399,7 @@ impl CodexThread { sandbox_policy, permission_profile, active_permission_profile, + active_permission_preset_id, windows_sandbox_level, collaboration_mode: Some(collaboration_mode), multi_agent_mode, diff --git a/codex-rs/core/src/config/config_loader_tests.rs b/codex-rs/core/src/config/config_loader_tests.rs index 1a9245b1aa..442afc7861 100644 --- a/codex-rs/core/src/config/config_loader_tests.rs +++ b/codex-rs/core/src/config/config_loader_tests.rs @@ -1,7 +1,6 @@ use crate::config::ConfigBuilder; use crate::config::ConfigOverrides; use crate::config::ConstraintError; -use crate::config::PermissionProfileCatalogEntry; use crate::config::permission_profile_catalog; use codex_app_server_protocol::ConfigLayerSource; use codex_config::CONFIG_TOML_FILE; @@ -1770,36 +1769,25 @@ extends = ":workspace" .build() .await?; + let catalog = permission_profile_catalog(&config.config_layer_stack)?; assert_eq!( - permission_profile_catalog(&config.config_layer_stack)?, + catalog + .iter() + .map(|entry| (entry.id.as_str(), entry.allowed)) + .collect::>(), vec![ - PermissionProfileCatalogEntry { - id: ":read-only".to_string(), - description: None, - allowed: false, - }, - PermissionProfileCatalogEntry { - id: ":workspace".to_string(), - description: None, - allowed: false, - }, - PermissionProfileCatalogEntry { - id: ":danger-full-access".to_string(), - description: None, - allowed: false, - }, - PermissionProfileCatalogEntry { - id: "managed-disabled".to_string(), - description: None, - allowed: false, - }, - PermissionProfileCatalogEntry { - id: "managed-standard".to_string(), - description: None, - allowed: true, - }, + (":read-only", false), + (":workspace", false), + (":danger-full-access", false), + ("managed-disabled", false), + ("managed-standard", true), ] ); + assert!( + catalog + .iter() + .all(|entry| entry.permission_profile.is_some()) + ); Ok(()) } diff --git a/codex-rs/core/src/config/config_tests.rs b/codex-rs/core/src/config/config_tests.rs index f2fd9428b0..d0e36bdc81 100644 --- a/codex-rs/core/src/config/config_tests.rs +++ b/codex-rs/core/src/config/config_tests.rs @@ -3194,6 +3194,7 @@ async fn permissions_profiles_allow_direct_write_roots_outside_workspace_root() vec![PermissionProfileCatalogEntry { id: "dev".to_string(), description: Some("Workspace access.".to_string()), + permission_profile: Some(config.permissions.permission_profile().clone()), allowed: true, }] ); diff --git a/codex-rs/core/src/config/mod.rs b/codex-rs/core/src/config/mod.rs index 585f6882ff..ec53651958 100644 --- a/codex-rs/core/src/config/mod.rs +++ b/codex-rs/core/src/config/mod.rs @@ -153,7 +153,6 @@ mod permissions; mod resolved_permission_profile; #[cfg(test)] mod schema; -mod selectable_permission_profiles; pub use auth_keyring::resolve_bootstrap_auth_keyring_backend_kind; pub use codex_config::ConfigLoadOptions; pub use codex_config::Constrained; @@ -176,7 +175,6 @@ pub(crate) use permissions::reject_unknown_builtin_permission_profile; pub(crate) use permissions::resolve_permission_profile; pub use resolved_permission_profile::PermissionProfileSnapshot; pub(crate) use resolved_permission_profile::PermissionProfileState; -pub use selectable_permission_profiles::SelectablePermissionProfile; const DEFAULT_IGNORE_LARGE_UNTRACKED_DIRS: i64 = 200; const DEFAULT_IGNORE_LARGE_UNTRACKED_FILES: i64 = 10 * 1024 * 1024; @@ -655,6 +653,9 @@ pub struct Config { /// User-defined permission profiles available from effective config. pub custom_permission_profiles: Vec, + /// App-server permission preset identity applied to this session, when known. + pub active_permission_preset_id: Option, + /// Configures who approval requests are routed to for review once they have /// been escalated. This does not disable separate safety checks such as /// ARC. @@ -2392,6 +2393,7 @@ pub struct ConfigOverrides { pub sandbox_mode: Option, pub permission_profile: Option, pub default_permissions: Option, + pub active_permission_preset_id: Option, pub model_provider: Option, pub service_tier: Option>, pub codex_self_exe: Option, @@ -2963,6 +2965,7 @@ impl Config { sandbox_mode, permission_profile, default_permissions: default_permissions_override, + active_permission_preset_id, model_provider, service_tier: service_tier_override, codex_self_exe, @@ -3773,6 +3776,8 @@ impl Config { windows_sandbox_private_desktop, }, explicit_permission_profile_mode, + custom_permission_profiles, + active_permission_preset_id, approvals_reviewer: constrained_approvals_reviewer.value(), enforce_residency: enforce_residency.value, notify: cfg.notify, diff --git a/codex-rs/core/src/config/permission_profile_catalog.rs b/codex-rs/core/src/config/permission_profile_catalog.rs index 51b34c2640..4617e7cea5 100644 --- a/codex-rs/core/src/config/permission_profile_catalog.rs +++ b/codex-rs/core/src/config/permission_profile_catalog.rs @@ -22,6 +22,7 @@ use super::validate_required_permission_profile_catalog; pub struct PermissionProfileCatalogEntry { pub id: String, pub description: Option, + pub permission_profile: Option, pub allowed: bool, } @@ -66,13 +67,14 @@ pub(super) fn permission_profile_catalog_from_permissions( id: id.to_string(), description: None, allowed: permission_profile_is_allowed(config_layer_stack, id, &permission_profile), + permission_profile: Some(permission_profile), }) .collect::>(); if let Some(permissions) = permissions { catalog.extend(permissions.entries.iter().map(|(id, profile)| { let mut warnings = Vec::new(); - let allowed = compile_permission_profile_selection( + let permission_profile = compile_permission_profile_selection( Some(permissions), id, /*workspace_write*/ None, @@ -81,12 +83,16 @@ pub(super) fn permission_profile_catalog_from_permissions( .map(|(file_system, network)| { PermissionProfile::from_runtime_permissions(&file_system, network) }) - .is_ok_and(|permission_profile| { - permission_profile_is_allowed(config_layer_stack, id, &permission_profile) - }); + .ok(); + let allowed = permission_profile + .as_ref() + .is_some_and(|permission_profile| { + permission_profile_is_allowed(config_layer_stack, id, permission_profile) + }); PermissionProfileCatalogEntry { id: id.clone(), description: profile.description.clone(), + permission_profile, allowed, } })); diff --git a/codex-rs/core/src/config/selectable_permission_profiles.rs b/codex-rs/core/src/config/selectable_permission_profiles.rs deleted file mode 100644 index 04f103d6fe..0000000000 --- a/codex-rs/core/src/config/selectable_permission_profiles.rs +++ /dev/null @@ -1,106 +0,0 @@ -use super::Config; -use super::merge_managed_permission_profiles; -use super::permissions::BUILT_IN_DANGER_FULL_ACCESS_PROFILE; -use super::permissions::BUILT_IN_READ_ONLY_PROFILE; -use super::permissions::BUILT_IN_WORKSPACE_PROFILE; -use super::permissions::builtin_permission_profile; -use super::permissions::compile_permission_profile_selection; -use codex_config::config_toml::ConfigToml; -use codex_protocol::models::PermissionProfile; -use std::io::ErrorKind; - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct SelectablePermissionProfile { - pub id: String, - pub description: Option, -} - -impl Config { - /// Returns built-in and configured permission profiles allowed by current requirements. - pub fn selectable_permission_profiles( - &self, - ) -> std::io::Result> { - let config_toml: ConfigToml = self - .config_layer_stack - .effective_config() - .try_into() - .map_err(|err| std::io::Error::new(ErrorKind::InvalidData, err))?; - let requirements_toml = self.config_layer_stack.requirements_toml(); - let permissions = - merge_managed_permission_profiles(config_toml.permissions.as_ref(), requirements_toml)?; - let mut profiles = Vec::new(); - - for id in [ - BUILT_IN_READ_ONLY_PROFILE, - BUILT_IN_WORKSPACE_PROFILE, - BUILT_IN_DANGER_FULL_ACCESS_PROFILE, - ] { - if let Some(profile) = self.selectable_permission_profile( - permissions.as_ref(), - id, - /*description*/ None, - ) { - profiles.push(profile); - } - } - if let Some(permissions) = permissions.as_ref() { - for (id, profile) in &permissions.entries { - if let Some(profile) = self.selectable_permission_profile( - Some(permissions), - id, - profile.description.clone(), - ) { - profiles.push(profile); - } - } - } - - Ok(profiles) - } - - fn selectable_permission_profile( - &self, - permissions: Option<&codex_config::permissions_toml::PermissionsToml>, - id: &str, - description: Option, - ) -> Option { - if self - .config_layer_stack - .requirements_toml() - .allowed_permission_profiles - .as_ref() - .is_some_and(|allowed| !allowed.get(id).copied().unwrap_or(false)) - { - return None; - } - let permission_profile = match builtin_permission_profile(id, /*workspace_write*/ None) { - Some(permission_profile) => permission_profile, - None => { - let mut startup_warnings = Vec::new(); - let (file_system, network) = compile_permission_profile_selection( - permissions, - id, - /*workspace_write*/ None, - self.cwd.as_path(), - &mut startup_warnings, - ) - .ok()?; - PermissionProfile::from_runtime_permissions(&file_system, network) - } - }; - self.permissions - .can_set_permission_profile(&permission_profile) - .ok()?; - self.config_layer_stack - .requirements() - .permission_profile - .clone() - .set(permission_profile) - .ok()?; - - Some(SelectablePermissionProfile { - id: id.to_string(), - description, - }) - } -} diff --git a/codex-rs/core/src/session/handlers.rs b/codex-rs/core/src/session/handlers.rs index 2feee3e9f3..5d4507589b 100644 --- a/codex-rs/core/src/session/handlers.rs +++ b/codex-rs/core/src/session/handlers.rs @@ -118,6 +118,7 @@ async fn thread_settings_update( sandbox_policy, permission_profile, active_permission_profile, + active_permission_preset_id, windows_sandbox_level, model, effort, @@ -148,6 +149,7 @@ async fn thread_settings_update( sandbox_policy, permission_profile, active_permission_profile, + active_permission_preset_id, windows_sandbox_level, collaboration_mode: Some(collaboration_mode), multi_agent_mode, @@ -173,6 +175,7 @@ async fn thread_settings_applied_event(sess: &Session) -> EventMsg { approvals_reviewer: snapshot.approvals_reviewer, permission_profile: snapshot.permission_profile, active_permission_profile: snapshot.active_permission_profile, + active_permission_preset_id: snapshot.active_permission_preset_id, cwd, reasoning_effort: snapshot.reasoning_effort, reasoning_summary: snapshot.reasoning_summary, diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rs index b4740bea99..655fb7a6da 100644 --- a/codex-rs/core/src/session/session.rs +++ b/codex-rs/core/src/session/session.rs @@ -185,6 +185,10 @@ impl SessionConfiguration { approvals_reviewer: self.approvals_reviewer, permission_profile: self.permission_profile(), active_permission_profile: self.active_permission_profile(), + active_permission_preset_id: self + .original_config_do_not_use + .active_permission_preset_id + .clone(), environments: self.environments.clone(), workspace_roots: self.workspace_roots.clone(), profile_workspace_roots: self.profile_workspace_roots().to_vec(), @@ -375,6 +379,11 @@ impl SessionConfiguration { if let Some(app_server_client_version) = updates.app_server_client_version.clone() { next_configuration.app_server_client_version = Some(app_server_client_version); } + if let Some(active_permission_preset_id) = updates.active_permission_preset_id.clone() { + let mut config = (*next_configuration.original_config_do_not_use).clone(); + config.active_permission_preset_id = active_permission_preset_id; + next_configuration.original_config_do_not_use = Arc::new(config); + } Ok(next_configuration) } @@ -425,6 +434,7 @@ pub(crate) struct SessionSettingsUpdate { pub(crate) sandbox_policy: Option, pub(crate) permission_profile: Option, pub(crate) active_permission_profile: Option, + pub(crate) active_permission_preset_id: Option>, pub(crate) windows_sandbox_level: Option, pub(crate) collaboration_mode: Option, pub(crate) multi_agent_mode: Option, @@ -1120,6 +1130,7 @@ impl Session { approvals_reviewer: session_configuration.approvals_reviewer, permission_profile: session_configuration.permission_profile(), active_permission_profile: session_configuration.active_permission_profile(), + active_permission_preset_id: config.active_permission_preset_id.clone(), cwd: session_configuration.cwd().clone(), reasoning_effort: session_configuration.collaboration_mode.reasoning_effort(), initial_messages, diff --git a/codex-rs/exec/src/event_processor_with_human_output_tests.rs b/codex-rs/exec/src/event_processor_with_human_output_tests.rs index 5e89d48c7f..5297dd9b21 100644 --- a/codex-rs/exec/src/event_processor_with_human_output_tests.rs +++ b/codex-rs/exec/src/event_processor_with_human_output_tests.rs @@ -221,6 +221,7 @@ async fn config_summary_entries_include_runtime_workspace_roots() { approvals_reviewer: config.approvals_reviewer, permission_profile: config.permissions.effective_permission_profile(), active_permission_profile: None, + active_permission_preset_id: None, cwd, reasoning_effort: None, initial_messages: None, diff --git a/codex-rs/exec/src/lib.rs b/codex-rs/exec/src/lib.rs index 08c905c001..841e783a75 100644 --- a/codex-rs/exec/src/lib.rs +++ b/codex-rs/exec/src/lib.rs @@ -428,6 +428,7 @@ pub async fn run_main(cli: Cli, arg0_paths: Arg0DispatchPaths) -> anyhow::Result sandbox_mode, permission_profile: None, default_permissions: None, + active_permission_preset_id: None, cwd: resolved_cwd, workspace_roots: None, model_provider: model_provider.clone(), @@ -896,6 +897,7 @@ async fn run_exec_session(args: ExecRunArgs) -> anyhow::Result<()> { approvals_reviewer: None, sandbox_policy: None, permissions: None, + permission_preset_id: None, model: None, service_tier: None, effort: default_effort, @@ -1182,6 +1184,7 @@ fn session_configured_from_thread_start_response( response.approvals_reviewer.to_core(), config.permissions.effective_permission_profile(), response.active_permission_profile.clone().map(Into::into), + response.active_permission_preset_id.clone(), response.cwd.clone(), response.reasoning_effort.clone(), ) @@ -1205,6 +1208,7 @@ fn session_configured_from_thread_resume_response( response.approvals_reviewer.to_core(), config.permissions.effective_permission_profile(), response.active_permission_profile.clone().map(Into::into), + response.active_permission_preset_id.clone(), response.cwd.clone(), response.reasoning_effort.clone(), ) @@ -1237,6 +1241,7 @@ fn session_configured_from_thread_response( approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer, permission_profile: PermissionProfile, active_permission_profile: Option, + active_permission_preset_id: Option, cwd: AbsolutePathBuf, reasoning_effort: Option, ) -> Result { @@ -1263,6 +1268,7 @@ fn session_configured_from_thread_response( approvals_reviewer, permission_profile, active_permission_profile, + active_permission_preset_id, cwd, reasoning_effort, initial_messages: None, diff --git a/codex-rs/exec/src/lib_tests.rs b/codex-rs/exec/src/lib_tests.rs index 4e341d773b..f4b2ba8dbb 100644 --- a/codex-rs/exec/src/lib_tests.rs +++ b/codex-rs/exec/src/lib_tests.rs @@ -789,6 +789,7 @@ fn sample_thread_start_response() -> ThreadStartResponse { exclude_slash_tmp: false, }, active_permission_profile: None, + active_permission_preset_id: None, reasoning_effort: None, multi_agent_mode: Default::default(), } 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 1f44ca31a8..09fb568d39 100644 --- a/codex-rs/exec/tests/event_processor_with_json_output.rs +++ b/codex-rs/exec/tests/event_processor_with_json_output.rs @@ -121,6 +121,7 @@ fn session_configured_produces_thread_started_event() { approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, permission_profile: PermissionProfile::read_only(), active_permission_profile: None, + active_permission_preset_id: None, cwd: test_path_buf("/tmp/project").abs(), reasoning_effort: None, initial_messages: None, diff --git a/codex-rs/mcp-server/src/outgoing_message.rs b/codex-rs/mcp-server/src/outgoing_message.rs index 3790fed60b..d8728ed4bc 100644 --- a/codex-rs/mcp-server/src/outgoing_message.rs +++ b/codex-rs/mcp-server/src/outgoing_message.rs @@ -309,6 +309,7 @@ mod tests { approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, permission_profile: PermissionProfile::read_only(), active_permission_profile: None, + active_permission_preset_id: None, cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffort::default()), initial_messages: None, @@ -355,6 +356,7 @@ mod tests { approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, permission_profile: PermissionProfile::read_only(), active_permission_profile: None, + active_permission_preset_id: None, cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffort::default()), initial_messages: None, @@ -423,6 +425,7 @@ mod tests { approvals_reviewer: codex_protocol::config_types::ApprovalsReviewer::User, permission_profile: PermissionProfile::read_only(), active_permission_profile: None, + active_permission_preset_id: None, cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffort::default()), initial_messages: None, diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs index dfcc6cb7a5..50fd376ae6 100644 --- a/codex-rs/protocol/src/protocol.rs +++ b/codex-rs/protocol/src/protocol.rs @@ -458,6 +458,9 @@ pub struct ThreadSettingsOverrides { /// update selected a profile rather than supplying raw permissions. pub active_permission_profile: Option, + /// App-server permission preset identity applied by this update. + pub active_permission_preset_id: Option>, + /// Updated Windows sandbox mode for tool execution. pub windows_sandbox_level: Option, @@ -1990,6 +1993,11 @@ pub struct ThreadSettingsSnapshot { #[serde(default, skip_serializing_if = "Option::is_none")] #[ts(optional)] pub active_permission_profile: Option, + + /// App-server permission preset identity that produced the active settings. + #[serde(default, skip_serializing_if = "Option::is_none")] + #[ts(optional)] + pub active_permission_preset_id: Option, pub cwd: AbsolutePathBuf, #[serde(skip_serializing_if = "Option::is_none")] pub reasoning_effort: Option, @@ -3719,6 +3727,11 @@ pub struct SessionConfiguredEvent { #[ts(optional)] pub active_permission_profile: Option, + /// App-server permission preset identity that produced the active settings. + #[serde(default, skip_serializing_if = "Option::is_none")] + #[ts(optional)] + pub active_permission_preset_id: Option, + /// Working directory that should be treated as the *root* of the /// session. pub cwd: AbsolutePathBuf, @@ -3771,6 +3784,8 @@ impl<'de> Deserialize<'de> for SessionConfiguredEvent { permission_profile: Option, #[serde(default)] active_permission_profile: Option, + #[serde(default)] + active_permission_preset_id: Option, cwd: AbsolutePathBuf, reasoning_effort: Option, initial_messages: Option>, @@ -3804,6 +3819,7 @@ impl<'de> Deserialize<'de> for SessionConfiguredEvent { approvals_reviewer: wire.approvals_reviewer, permission_profile, active_permission_profile: wire.active_permission_profile, + active_permission_preset_id: wire.active_permission_preset_id, cwd: wire.cwd, reasoning_effort: wire.reasoning_effort, initial_messages: wire.initial_messages, @@ -5555,6 +5571,7 @@ mod tests { approvals_reviewer: ApprovalsReviewer::User, permission_profile: permission_profile.clone(), active_permission_profile: None, + active_permission_preset_id: None, cwd: test_path_buf("/home/user/project").abs(), reasoning_effort: Some(ReasoningEffortConfig::default()), initial_messages: None, diff --git a/codex-rs/thread-manager-sample/src/main.rs b/codex-rs/thread-manager-sample/src/main.rs index 487b8c1519..59fd91c438 100644 --- a/codex-rs/thread-manager-sample/src/main.rs +++ b/codex-rs/thread-manager-sample/src/main.rs @@ -185,6 +185,8 @@ fn new_config(model: Option, arg0_paths: Arg0DispatchPaths) -> anyhow::R Constrained::allow_any(PermissionProfile::read_only()), )?, explicit_permission_profile_mode: false, + custom_permission_profiles: Vec::new(), + active_permission_preset_id: None, approvals_reviewer: ApprovalsReviewer::User, enforce_residency: Constrained::allow_any(/*initial_value*/ None), hide_agent_reasoning: false, diff --git a/codex-rs/tui/src/app/app_server_event_targets.rs b/codex-rs/tui/src/app/app_server_event_targets.rs index 212c45b4be..d8b6fbaeb9 100644 --- a/codex-rs/tui/src/app/app_server_event_targets.rs +++ b/codex-rs/tui/src/app/app_server_event_targets.rs @@ -220,6 +220,7 @@ mod tests { network_access: false, }, active_permission_profile: None, + active_permission_preset_id: None, model: "gpt-5.4".to_string(), model_provider: "openai".to_string(), service_tier: None, diff --git a/codex-rs/tui/src/app/tests.rs b/codex-rs/tui/src/app/tests.rs index 0fc561cb2a..9b9728b61a 100644 --- a/codex-rs/tui/src/app/tests.rs +++ b/codex-rs/tui/src/app/tests.rs @@ -6032,6 +6032,7 @@ async fn inactive_thread_settings_notification_updates_cached_collaboration_mode active_permission_profile: Some( codex_app_server_protocol::ActivePermissionProfile::read_only(), ), + active_permission_preset_id: None, model: "gpt-plan".to_string(), model_provider: "openai".to_string(), service_tier: None, diff --git a/codex-rs/tui/src/app_server_session.rs b/codex-rs/tui/src/app_server_session.rs index 527cde57ed..67c7d501df 100644 --- a/codex-rs/tui/src/app_server_session.rs +++ b/codex-rs/tui/src/app_server_session.rs @@ -782,6 +782,7 @@ impl AppServerSession { approvals_reviewer: Some(approvals_reviewer.into()), sandbox_policy, permissions, + permission_preset_id: None, model: Some(model), service_tier, effort, @@ -2383,6 +2384,7 @@ mod tests { .expect("read-only profile must be legacy-compatible") .into(), active_permission_profile: None, + active_permission_preset_id: None, reasoning_effort: None, multi_agent_mode: Default::default(), initial_turns_page: None, diff --git a/codex-rs/tui/src/chatwidget/permissions_menu.rs b/codex-rs/tui/src/chatwidget/permissions_menu.rs index dd0a75bfa0..a692fe47ef 100644 --- a/codex-rs/tui/src/chatwidget/permissions_menu.rs +++ b/codex-rs/tui/src/chatwidget/permissions_menu.rs @@ -27,15 +27,17 @@ impl ChatWidget { ); return; }; - let mut items = vec![self.builtin_permission_mode_selection_item( - default, - ":workspace", - default - .description - .replace(" (Identical to Agent mode)", ""), - AskForApproval::from(default.approval), - ApprovalsReviewer::User, - )]; + let mut items = vec![ + self.builtin_permission_mode_selection_item( + default, + ":workspace", + default + .description + .replace(" (Identical to Agent mode)", ""), + AskForApproval::from(default.approval), + ApprovalsReviewer::User, + ), + ]; if self.config.features.enabled(Feature::GuardianApproval) { items.push(self.builtin_permission_mode_selection_item( default, diff --git a/codex-rs/tui/src/chatwidget/tests/app_server.rs b/codex-rs/tui/src/chatwidget/tests/app_server.rs index a10c2cca93..e758236b66 100644 --- a/codex-rs/tui/src/chatwidget/tests/app_server.rs +++ b/codex-rs/tui/src/chatwidget/tests/app_server.rs @@ -17,6 +17,7 @@ fn thread_settings_for_test( active_permission_profile: Some( codex_app_server_protocol::ActivePermissionProfile::read_only(), ), + active_permission_preset_id: None, model: model.to_string(), model_provider: "openai".to_string(), service_tier: Some(ServiceTier::Fast.request_value().to_string()), diff --git a/codex-rs/tui/src/chatwidget/tests/permissions.rs b/codex-rs/tui/src/chatwidget/tests/permissions.rs index 3c7255fd22..5b79209024 100644 --- a/codex-rs/tui/src/chatwidget/tests/permissions.rs +++ b/codex-rs/tui/src/chatwidget/tests/permissions.rs @@ -59,8 +59,7 @@ fn windows_sandbox_requirements_stack( allowed_sandbox_implementations: Some(allowed_sandbox_implementations), }), ..Default::default() - }; - requirements_stack(requirements_toml) + }) } fn requirements_stack(requirements_toml: codex_config::ConfigRequirementsToml) -> ConfigLayerStack { @@ -140,11 +139,13 @@ async fn profile_permissions_selection_popup_with_custom_profiles_snapshot() { id: "locked-down".to_string(), description: Some("Inspect and patch only approved workspace files.".to_string()), allowed: true, + permission_profile: Some(PermissionProfile::workspace_write()), }, PermissionProfileCatalogEntry { id: "web-enabled".to_string(), description: Some("Workspace profile with network access.".to_string()), allowed: false, + permission_profile: Some(PermissionProfile::workspace_write()), }, ]; chat.config @@ -223,6 +224,7 @@ async fn profile_permissions_selection_emits_active_custom_profile() { id: "locked-down".to_string(), description: None, allowed: true, + permission_profile: Some(PermissionProfile::workspace_write()), }]; chat.config .permissions