Require full access justification from requirements

Add an enterprise-only requirements flag that forces a written justification before switching to full access mode. Thread the requirement through config loading, the TUI and app-server permission flows, and OTEL/session telemetry, and expose it through the app-server requirements API.

Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
Charles Cunningham
2026-03-24 23:44:34 -07:00
co-authored by Codex
parent 8c62829a2b
commit 311396354b
28 changed files with 939 additions and 91 deletions
@@ -6871,6 +6871,12 @@
"object",
"null"
]
},
"requireFullAccessJustification": {
"type": [
"boolean",
"null"
]
}
},
"type": "object"
@@ -3431,6 +3431,12 @@
"object",
"null"
]
},
"requireFullAccessJustification": {
"type": [
"boolean",
"null"
]
}
},
"type": "object"
@@ -98,6 +98,12 @@
"object",
"null"
]
},
"requireFullAccessJustification": {
"type": [
"boolean",
"null"
]
}
},
"type": "object"
@@ -6,4 +6,4 @@ import type { AskForApproval } from "./AskForApproval";
import type { ResidencyRequirement } from "./ResidencyRequirement";
import type { SandboxMode } from "./SandboxMode";
export type ConfigRequirements = {allowedApprovalPolicies: Array<AskForApproval> | null, allowedSandboxModes: Array<SandboxMode> | null, allowedWebSearchModes: Array<WebSearchMode> | null, featureRequirements: { [key in string]?: boolean } | null, enforceResidency: ResidencyRequirement | null};
export type ConfigRequirements = {allowedApprovalPolicies: Array<AskForApproval> | null, allowedSandboxModes: Array<SandboxMode> | null, allowedWebSearchModes: Array<WebSearchMode> | null, requireFullAccessJustification: boolean | null, featureRequirements: { [key in string]?: boolean } | null, enforceResidency: ResidencyRequirement | null};
@@ -855,6 +855,7 @@ pub struct ConfigRequirements {
pub allowed_approval_policies: Option<Vec<AskForApproval>>,
pub allowed_sandbox_modes: Option<Vec<SandboxMode>>,
pub allowed_web_search_modes: Option<Vec<WebSearchMode>>,
pub require_full_access_justification: Option<bool>,
pub feature_requirements: Option<BTreeMap<String, bool>>,
pub enforce_residency: Option<ResidencyRequirement>,
#[experimental("configRequirements/read.network")]
@@ -7239,6 +7240,7 @@ mod tests {
}]),
allowed_sandbox_modes: None,
allowed_web_search_modes: None,
require_full_access_justification: None,
feature_requirements: None,
enforce_residency: None,
network: None,
+1 -1
View File
@@ -185,7 +185,7 @@ Example with notification opt-out:
- `externalAgentConfig/import` — apply selected external-agent migration items by passing explicit `migrationItems` with `cwd` (`null` for home).
- `config/value/write` — write a single config key/value to the user's config.toml on disk.
- `config/batchWrite` — apply multiple config edits atomically to the user's config.toml on disk, with optional `reloadUserConfig: true` to hot-reload loaded threads.
- `configRequirements/read` — fetch loaded requirements constraints from `requirements.toml` and/or MDM (or `null` if none are configured), including allow-lists (`allowedApprovalPolicies`, `allowedSandboxModes`, `allowedWebSearchModes`), pinned feature values (`featureRequirements`), `enforceResidency`, and `network` constraints.
- `configRequirements/read` — fetch loaded requirements constraints from `requirements.toml` and/or MDM (or `null` if none are configured), including allow-lists (`allowedApprovalPolicies`, `allowedSandboxModes`, `allowedWebSearchModes`), `requireFullAccessJustification`, pinned feature values (`featureRequirements`), `enforceResidency`, and `network` constraints.
### Example: Start or resume a thread
+4
View File
@@ -374,6 +374,7 @@ fn map_requirements_toml_to_api(requirements: ConfigRequirementsToml) -> ConfigR
}
normalized
}),
require_full_access_justification: requirements.require_full_access_justification,
feature_requirements: requirements
.feature_requirements
.map(|requirements| requirements.entries),
@@ -479,6 +480,7 @@ mod tests {
allowed_web_search_modes: Some(vec![
codex_core::config_loader::WebSearchModeRequirement::Cached,
]),
require_full_access_justification: Some(true),
guardian_developer_instructions: None,
feature_requirements: Some(codex_core::config_loader::FeatureRequirementsToml {
entries: std::collections::BTreeMap::from([
@@ -522,6 +524,7 @@ mod tests {
mapped.allowed_web_search_modes,
Some(vec![WebSearchMode::Cached, WebSearchMode::Disabled]),
);
assert_eq!(mapped.require_full_access_justification, Some(true));
assert_eq!(
mapped.feature_requirements,
Some(std::collections::BTreeMap::from([
@@ -556,6 +559,7 @@ mod tests {
allowed_approval_policies: None,
allowed_sandbox_modes: None,
allowed_web_search_modes: Some(Vec::new()),
require_full_access_justification: None,
guardian_developer_instructions: None,
feature_requirements: None,
mcp_servers: None,
@@ -82,6 +82,7 @@ pub struct ConfigRequirements {
pub feature_requirements: Option<Sourced<FeatureRequirementsToml>>,
pub mcp_servers: Option<Sourced<BTreeMap<String, McpServerRequirement>>>,
pub exec_policy: Option<Sourced<RequirementsExecPolicy>>,
pub require_full_access_justification: Option<Sourced<bool>>,
pub enforce_residency: ConstrainedWithSource<Option<ResidencyRequirement>>,
/// Managed network constraints derived from requirements.
pub network: Option<Sourced<NetworkConstraints>>,
@@ -105,6 +106,7 @@ impl Default for ConfigRequirements {
feature_requirements: None,
mcp_servers: None,
exec_policy: None,
require_full_access_justification: None,
enforce_residency: ConstrainedWithSource::new(
Constrained::allow_any(/*initial_value*/ None),
/*source*/ None,
@@ -291,6 +293,7 @@ pub struct ConfigRequirementsToml {
pub allowed_approval_policies: Option<Vec<AskForApproval>>,
pub allowed_sandbox_modes: Option<Vec<SandboxModeRequirement>>,
pub allowed_web_search_modes: Option<Vec<WebSearchModeRequirement>>,
pub require_full_access_justification: Option<bool>,
#[serde(rename = "features", alias = "feature_requirements")]
pub feature_requirements: Option<FeatureRequirementsToml>,
pub mcp_servers: Option<BTreeMap<String, McpServerRequirement>>,
@@ -329,6 +332,7 @@ pub struct ConfigRequirementsWithSources {
pub allowed_approval_policies: Option<Sourced<Vec<AskForApproval>>>,
pub allowed_sandbox_modes: Option<Sourced<Vec<SandboxModeRequirement>>>,
pub allowed_web_search_modes: Option<Sourced<Vec<WebSearchModeRequirement>>>,
pub require_full_access_justification: Option<Sourced<bool>>,
pub feature_requirements: Option<Sourced<FeatureRequirementsToml>>,
pub mcp_servers: Option<Sourced<BTreeMap<String, McpServerRequirement>>>,
pub apps: Option<Sourced<AppsRequirementsToml>>,
@@ -360,6 +364,7 @@ impl ConfigRequirementsWithSources {
allowed_approval_policies: _,
allowed_sandbox_modes: _,
allowed_web_search_modes: _,
require_full_access_justification: _,
feature_requirements: _,
mcp_servers: _,
apps: _,
@@ -385,6 +390,7 @@ impl ConfigRequirementsWithSources {
allowed_approval_policies,
allowed_sandbox_modes,
allowed_web_search_modes,
require_full_access_justification,
feature_requirements,
mcp_servers,
rules,
@@ -408,6 +414,7 @@ impl ConfigRequirementsWithSources {
allowed_approval_policies,
allowed_sandbox_modes,
allowed_web_search_modes,
require_full_access_justification,
feature_requirements,
mcp_servers,
apps,
@@ -420,6 +427,8 @@ impl ConfigRequirementsWithSources {
allowed_approval_policies: allowed_approval_policies.map(|sourced| sourced.value),
allowed_sandbox_modes: allowed_sandbox_modes.map(|sourced| sourced.value),
allowed_web_search_modes: allowed_web_search_modes.map(|sourced| sourced.value),
require_full_access_justification: require_full_access_justification
.map(|sourced| sourced.value),
feature_requirements: feature_requirements.map(|sourced| sourced.value),
mcp_servers: mcp_servers.map(|sourced| sourced.value),
apps: apps.map(|sourced| sourced.value),
@@ -470,6 +479,7 @@ impl ConfigRequirementsToml {
self.allowed_approval_policies.is_none()
&& self.allowed_sandbox_modes.is_none()
&& self.allowed_web_search_modes.is_none()
&& self.require_full_access_justification.is_none()
&& self
.feature_requirements
.as_ref()
@@ -497,6 +507,7 @@ impl TryFrom<ConfigRequirementsWithSources> for ConfigRequirements {
allowed_approval_policies,
allowed_sandbox_modes,
allowed_web_search_modes,
require_full_access_justification,
feature_requirements,
mcp_servers,
apps: _apps,
@@ -602,6 +613,8 @@ impl TryFrom<ConfigRequirementsWithSources> for ConfigRequirements {
}
None => None,
};
let require_full_access_justification = require_full_access_justification
.map(|Sourced { value, source }| Sourced::new(value, source));
let web_search_mode = match allowed_web_search_modes {
Some(Sourced {
value: modes,
@@ -685,6 +698,7 @@ impl TryFrom<ConfigRequirementsWithSources> for ConfigRequirements {
feature_requirements,
mcp_servers,
exec_policy,
require_full_access_justification,
enforce_residency,
network,
})
@@ -718,6 +732,7 @@ mod tests {
allowed_approval_policies,
allowed_sandbox_modes,
allowed_web_search_modes,
require_full_access_justification,
feature_requirements,
mcp_servers,
apps,
@@ -733,6 +748,8 @@ mod tests {
.map(|value| Sourced::new(value, RequirementSource::Unknown)),
allowed_web_search_modes: allowed_web_search_modes
.map(|value| Sourced::new(value, RequirementSource::Unknown)),
require_full_access_justification: require_full_access_justification
.map(|value| Sourced::new(value, RequirementSource::Unknown)),
feature_requirements: feature_requirements
.map(|value| Sourced::new(value, RequirementSource::Unknown)),
mcp_servers: mcp_servers.map(|value| Sourced::new(value, RequirementSource::Unknown)),
@@ -760,6 +777,7 @@ mod tests {
WebSearchModeRequirement::Cached,
WebSearchModeRequirement::Live,
];
let require_full_access_justification = true;
let feature_requirements = FeatureRequirementsToml {
entries: BTreeMap::from([("personality".to_string(), true)]),
};
@@ -774,6 +792,7 @@ mod tests {
allowed_approval_policies: Some(allowed_approval_policies.clone()),
allowed_sandbox_modes: Some(allowed_sandbox_modes.clone()),
allowed_web_search_modes: Some(allowed_web_search_modes.clone()),
require_full_access_justification: Some(require_full_access_justification),
feature_requirements: Some(feature_requirements.clone()),
mcp_servers: None,
apps: None,
@@ -797,6 +816,10 @@ mod tests {
allowed_web_search_modes,
enforce_source.clone(),
)),
require_full_access_justification: Some(Sourced::new(
require_full_access_justification,
enforce_source.clone(),
)),
feature_requirements: Some(Sourced::new(
feature_requirements,
enforce_source.clone(),
@@ -838,6 +861,7 @@ mod tests {
)),
allowed_sandbox_modes: None,
allowed_web_search_modes: None,
require_full_access_justification: None,
feature_requirements: None,
mcp_servers: None,
apps: None,
@@ -881,6 +905,7 @@ mod tests {
)),
allowed_sandbox_modes: None,
allowed_web_search_modes: None,
require_full_access_justification: None,
feature_requirements: None,
mcp_servers: None,
apps: None,
@@ -959,6 +984,19 @@ guardian_developer_instructions = """
Ok(())
}
#[test]
fn deserialize_require_full_access_justification() -> Result<()> {
let requirements: ConfigRequirementsToml = from_str(
r#"
require_full_access_justification = true
"#,
)?;
assert_eq!(requirements.require_full_access_justification, Some(true));
assert!(!requirements.is_empty());
Ok(())
}
#[test]
fn deserialize_apps_requirements() -> Result<()> {
let toml_str = r#"
@@ -1226,6 +1264,13 @@ guardian_developer_instructions = """
requirements.web_search_mode.source,
Some(source_location.clone())
);
assert_eq!(
requirements
.require_full_access_justification
.as_ref()
.map(|requirement| (requirement.value, requirement.source.clone())),
None
);
assert_eq!(
requirements
.feature_requirements
@@ -1238,10 +1283,35 @@ guardian_developer_instructions = """
Ok(())
}
#[test]
fn full_access_justification_requirement_stores_requirement_source() -> Result<()> {
let source: ConfigRequirementsToml = from_str(
r#"
require_full_access_justification = true
"#,
)?;
let source_location = RequirementSource::CloudRequirements;
let mut target = ConfigRequirementsWithSources::default();
target.merge_unset_fields(source_location.clone(), source);
let requirements = ConfigRequirements::try_from(target)?;
assert_eq!(
requirements
.require_full_access_justification
.as_ref()
.map(|requirement| (requirement.value, requirement.source.clone())),
Some((true, source_location))
);
Ok(())
}
#[test]
fn deserialize_allowed_approval_policies() -> Result<()> {
let toml_str = r#"
allowed_approval_policies = ["untrusted", "on-request"]
require_full_access_justification = true
"#;
let config: ConfigRequirementsToml = from_str(toml_str)?;
let requirements: ConfigRequirements = with_unknown_source(config).try_into()?;
@@ -1251,6 +1321,13 @@ guardian_developer_instructions = """
AskForApproval::UnlessTrusted,
"currently, there is no way to specify the default value for approval policy in the toml, so it picks the first allowed value"
);
assert_eq!(
requirements
.require_full_access_justification
.as_ref()
.map(|requirement| requirement.value),
Some(true)
);
assert!(
requirements
.approval_policy
+1
View File
@@ -1688,6 +1688,7 @@ impl Session {
config.model_auto_compact_token_limit,
config.permissions.approval_policy.value(),
config.permissions.sandbox_policy.get().clone(),
config.require_full_access_justification,
mcp_servers.keys().map(String::as_str).collect(),
config.active_profile.clone(),
);
+60
View File
@@ -3058,6 +3058,60 @@ fn load_config_ignores_empty_requirements_guardian_developer_instructions() -> s
Ok(())
}
#[test]
fn load_config_uses_requirements_full_access_justification_flag() -> std::io::Result<()> {
let codex_home = TempDir::new()?;
let config_layer_stack = ConfigLayerStack::new(
Vec::new(),
crate::config_loader::ConfigRequirements {
require_full_access_justification: Some(crate::config_loader::Sourced::new(
true,
crate::config_loader::RequirementSource::CloudRequirements,
)),
..Default::default()
},
crate::config_loader::ConfigRequirementsToml {
require_full_access_justification: Some(true),
..Default::default()
},
)
.map_err(std::io::Error::other)?;
let config = Config::load_config_with_layer_stack(
ConfigToml::default(),
ConfigOverrides {
cwd: Some(codex_home.path().to_path_buf()),
..Default::default()
},
codex_home.path().to_path_buf(),
config_layer_stack,
)?;
assert!(config.require_full_access_justification);
Ok(())
}
#[test]
fn config_toml_cannot_enable_full_access_justification_requirement() -> std::io::Result<()> {
let codex_home = TempDir::new()?;
let cfg = toml::from_str::<ConfigToml>("require_full_access_justification = true")
.expect("TOML deserialization should succeed");
let config = Config::load_from_base_config_with_overrides(
cfg,
ConfigOverrides {
cwd: Some(codex_home.path().to_path_buf()),
..Default::default()
},
codex_home.path().to_path_buf(),
)?;
assert!(!config.require_full_access_justification);
Ok(())
}
#[test]
fn load_config_rejects_missing_agent_role_config_file() -> std::io::Result<()> {
let codex_home = TempDir::new()?;
@@ -4273,6 +4327,7 @@ fn test_precedence_fixture_with_o3_profile() -> std::io::Result<()> {
},
approvals_reviewer: ApprovalsReviewer::User,
enforce_residency: Constrained::allow_any(None),
require_full_access_justification: false,
user_instructions: None,
notify: None,
cwd: fixture.cwd(),
@@ -4416,6 +4471,7 @@ fn test_precedence_fixture_with_gpt3_profile() -> std::io::Result<()> {
},
approvals_reviewer: ApprovalsReviewer::User,
enforce_residency: Constrained::allow_any(None),
require_full_access_justification: false,
user_instructions: None,
notify: None,
cwd: fixture.cwd(),
@@ -4557,6 +4613,7 @@ fn test_precedence_fixture_with_zdr_profile() -> std::io::Result<()> {
},
approvals_reviewer: ApprovalsReviewer::User,
enforce_residency: Constrained::allow_any(None),
require_full_access_justification: false,
user_instructions: None,
notify: None,
cwd: fixture.cwd(),
@@ -4684,6 +4741,7 @@ fn test_precedence_fixture_with_gpt5_profile() -> std::io::Result<()> {
},
approvals_reviewer: ApprovalsReviewer::User,
enforce_residency: Constrained::allow_any(None),
require_full_access_justification: false,
user_instructions: None,
notify: None,
cwd: fixture.cwd(),
@@ -4788,6 +4846,7 @@ fn test_requirements_web_search_mode_allowlist_does_not_warn_when_unset() -> any
apps: None,
rules: None,
enforce_residency: None,
require_full_access_justification: None,
network: None,
guardian_developer_instructions: None,
};
@@ -5388,6 +5447,7 @@ async fn explicit_sandbox_mode_falls_back_when_disallowed_by_requirements() -> s
apps: None,
rules: None,
enforce_residency: None,
require_full_access_justification: None,
network: None,
guardian_developer_instructions: None,
};
+7
View File
@@ -323,6 +323,10 @@ pub struct Config {
/// Guardian-specific developer instructions override from requirements.toml.
pub guardian_developer_instructions: Option<String>,
/// Require a user-provided justification before enabling full access mode.
/// This is derived from `requirements.toml`, not `config.toml`.
pub require_full_access_justification: bool,
/// Compact prompt override.
pub compact_prompt: Option<String>,
@@ -2026,6 +2030,7 @@ impl Config {
feature_requirements,
mcp_servers,
exec_policy: _,
require_full_access_justification,
enforce_residency,
network: network_requirements,
} = config_layer_stack.requirements().clone();
@@ -2657,6 +2662,8 @@ impl Config {
.or(show_raw_agent_reasoning)
.unwrap_or(false),
guardian_developer_instructions,
require_full_access_justification: require_full_access_justification
.is_some_and(|requirement| requirement.value),
model_reasoning_effort: config_profile
.model_reasoning_effort
.or(cfg.model_reasoning_effort),
+3
View File
@@ -656,6 +656,7 @@ allowed_approval_policies = ["on-request"]
apps: None,
rules: None,
enforce_residency: None,
require_full_access_justification: None,
network: None,
guardian_developer_instructions: None,
}))
@@ -707,6 +708,7 @@ allowed_approval_policies = ["on-request"]
apps: None,
rules: None,
enforce_residency: None,
require_full_access_justification: None,
network: None,
guardian_developer_instructions: None,
},
@@ -747,6 +749,7 @@ async fn load_config_layers_includes_cloud_requirements() -> anyhow::Result<()>
apps: None,
rules: None,
enforce_residency: None,
require_full_access_justification: None,
network: None,
guardian_developer_instructions: None,
};
@@ -319,6 +319,7 @@ impl SessionTelemetry {
auto_compact_token_limit: Option<i64>,
approval_policy: AskForApproval,
sandbox_policy: SandboxPolicy,
require_full_access_justification: bool,
mcp_servers: Vec<&str>,
active_profile: Option<String>,
) {
@@ -342,6 +343,7 @@ impl SessionTelemetry {
auto_compact_token_limit = auto_compact_token_limit,
approval_policy = %approval_policy,
sandbox_policy = %sandbox_policy,
require_full_access_justification = require_full_access_justification,
},
log: {
mcp_servers = mcp_servers.join(", "),
@@ -354,6 +356,36 @@ impl SessionTelemetry {
);
}
pub fn full_access_mode_enabled(
&self,
justification_required: bool,
justification: Option<&str>,
remember_choice: bool,
) {
let justification_to_log = match justification {
Some(justification) if self.metadata.log_user_prompts => justification,
Some(_) => "[REDACTED]",
None => "",
};
log_event!(
self,
event.name = "codex.full_access_mode_enabled",
justification_required = justification_required,
justification_present = justification.is_some(),
justification = %justification_to_log,
remember_choice = remember_choice,
);
trace_event!(
self,
event.name = "codex.full_access_mode_enabled",
justification_required = justification_required,
justification_present = justification.is_some(),
justification_length = justification.map(|value| value.chars().count() as i64),
remember_choice = remember_choice,
);
}
pub async fn log_request<F, Fut>(&self, attempt: u64, f: F) -> Result<Response, Error>
where
F: FnOnce() -> Fut,
@@ -200,6 +200,103 @@ fn otel_export_routing_policy_routes_user_prompt_log_and_trace_events() {
assert!(!prompt_trace_attrs.contains_key("user.account_id"));
}
#[test]
fn otel_export_routing_policy_routes_full_access_mode_enabled_events() {
let log_exporter = InMemoryLogExporter::default();
let logger_provider = SdkLoggerProvider::builder()
.with_simple_exporter(log_exporter.clone())
.build();
let span_exporter = InMemorySpanExporter::default();
let tracer_provider = SdkTracerProvider::builder()
.with_simple_exporter(span_exporter.clone())
.build();
let tracer = tracer_provider.tracer("sink-split-test");
let subscriber = tracing_subscriber::registry()
.with(
opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge::new(
&logger_provider,
)
.with_filter(filter_fn(OtelProvider::log_export_filter)),
)
.with(
tracing_opentelemetry::layer()
.with_tracer(tracer)
.with_filter(filter_fn(OtelProvider::trace_export_filter)),
);
tracing::subscriber::with_default(subscriber, || {
tracing::callsite::rebuild_interest_cache();
let manager = SessionTelemetry::new(
ThreadId::new(),
"gpt-5.1",
"gpt-5.1",
Some("account-id".to_string()),
Some("engineer@example.com".to_string()),
Some(TelemetryAuthMode::ApiKey),
"codex_exec".to_string(),
true,
"tty".to_string(),
SessionSource::Cli,
);
let root_span = tracing::info_span!("root");
let _root_guard = root_span.enter();
manager.full_access_mode_enabled(
/*justification_required*/ true,
Some("Need to inspect repo-local secrets handling"),
/*remember_choice*/ false,
);
});
logger_provider.force_flush().expect("flush logs");
tracer_provider.force_flush().expect("flush traces");
let logs = log_exporter.get_emitted_logs().expect("log export");
let full_access_log = find_log_by_event_name(&logs, "codex.full_access_mode_enabled");
let full_access_log_attrs = log_attributes(&full_access_log.record);
assert_eq!(
full_access_log_attrs
.get("justification_required")
.map(String::as_str),
Some("true")
);
assert_eq!(
full_access_log_attrs
.get("justification_present")
.map(String::as_str),
Some("true")
);
assert_eq!(
full_access_log_attrs
.get("justification")
.map(String::as_str),
Some("Need to inspect repo-local secrets handling")
);
let spans = span_exporter.get_finished_spans().expect("span export");
let full_access_trace_event =
find_span_event_by_name_attr(&spans[0].events.events, "codex.full_access_mode_enabled");
let full_access_trace_attrs = span_event_attributes(full_access_trace_event);
assert_eq!(
full_access_trace_attrs
.get("justification_required")
.map(String::as_str),
Some("true")
);
assert_eq!(
full_access_trace_attrs
.get("justification_present")
.map(String::as_str),
Some("true")
);
assert_eq!(
full_access_trace_attrs
.get("justification_length")
.map(String::as_str),
Some("43")
);
}
#[test]
fn otel_export_routing_policy_routes_tool_result_log_and_trace_events() {
let log_exporter = InMemoryLogExporter::default();
@@ -509,6 +606,7 @@ fn otel_export_routing_policy_routes_api_request_auth_observability() {
None,
AskForApproval::Never,
SandboxPolicy::DangerFullAccess,
true,
Vec::new(),
None,
);
@@ -548,6 +646,12 @@ fn otel_export_routing_policy_routes_api_request_auth_observability() {
.map(String::as_str),
Some("configured")
);
assert_eq!(
conversation_log_attrs
.get("require_full_access_justification")
.map(String::as_str),
Some("true")
);
let request_log = find_log_by_event_name(&logs, "codex.api_request");
let request_log_attrs = log_attributes(&request_log.record);
assert_eq!(
@@ -611,6 +715,12 @@ fn otel_export_routing_policy_routes_api_request_auth_observability() {
.map(String::as_str),
Some("true")
);
assert_eq!(
conversation_trace_attrs
.get("require_full_access_justification")
.map(String::as_str),
Some("true")
);
let request_trace_event =
find_span_event_by_name_attr(&spans[0].events.events, "codex.api_request");
let request_trace_attrs = span_event_attributes(request_trace_event);
+11
View File
@@ -3240,6 +3240,17 @@ impl App {
self.chat_widget
.open_full_access_confirmation(preset, return_to_permissions);
}
AppEvent::OpenFullAccessJustificationPrompt {
preset,
acknowledge_warning,
persist_warning_acknowledged,
} => {
self.chat_widget.open_full_access_justification_prompt(
preset,
acknowledge_warning,
persist_warning_acknowledged,
);
}
AppEvent::OpenWorldWritableWarningConfirmation {
preset,
sample_paths,
+7
View File
@@ -331,6 +331,13 @@ pub(crate) enum AppEvent {
return_to_permissions: bool,
},
/// Open the required justification prompt before enabling full access mode.
OpenFullAccessJustificationPrompt {
preset: ApprovalPreset,
acknowledge_warning: bool,
persist_warning_acknowledged: bool,
},
/// Open the Windows world-writable directories warning.
/// If `preset` is `Some`, the confirmation will apply the provided
/// approval/sandbox configuration on Continue; if `None`, it performs no
+145 -43
View File
@@ -7152,6 +7152,12 @@ impl ChatWidget {
return_to_permissions: !include_read_only,
});
})]
} else if preset.id == "full-access" {
self.full_access_preset_actions(
preset.clone(),
/*acknowledge_warning*/ false,
/*persist_warning_acknowledged*/ false,
)
} else if preset.id == "auto" {
#[cfg(target_os = "windows")]
{
@@ -7314,32 +7320,90 @@ impl ChatWidget {
approvals_reviewer: ApprovalsReviewer,
) -> Vec<SelectionAction> {
vec![Box::new(move |tx| {
let sandbox_clone = sandbox.clone();
tx.send(AppEvent::CodexOp(Op::OverrideTurnContext {
cwd: None,
approval_policy: Some(approval),
approvals_reviewer: Some(approvals_reviewer),
sandbox_policy: Some(sandbox_clone.clone()),
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
}));
tx.send(AppEvent::UpdateAskForApprovalPolicy(approval));
tx.send(AppEvent::UpdateSandboxPolicy(sandbox_clone));
tx.send(AppEvent::UpdateApprovalsReviewer(approvals_reviewer));
tx.send(AppEvent::InsertHistoryCell(Box::new(
history_cell::new_info_event(
format!("Permissions updated to {label}"),
/*hint*/ None,
),
)));
Self::send_permission_preset_updates(
tx,
approval,
sandbox.clone(),
label.as_str(),
approvals_reviewer,
);
})]
}
fn full_access_preset_actions(
&self,
preset: ApprovalPreset,
acknowledge_warning: bool,
persist_warning_acknowledged: bool,
) -> Vec<SelectionAction> {
if self.config.require_full_access_justification {
return vec![Box::new(move |tx| {
tx.send(AppEvent::OpenFullAccessJustificationPrompt {
preset: preset.clone(),
acknowledge_warning,
persist_warning_acknowledged,
});
})];
}
let approval = preset.approval;
let sandbox = preset.sandbox.clone();
let label = preset.label.to_string();
let session_telemetry = self.session_telemetry.clone();
vec![Box::new(move |tx| {
session_telemetry.full_access_mode_enabled(
/*justification_required*/ false,
/*justification*/ None,
persist_warning_acknowledged,
);
if acknowledge_warning {
tx.send(AppEvent::UpdateFullAccessWarningAcknowledged(true));
}
if persist_warning_acknowledged {
tx.send(AppEvent::PersistFullAccessWarningAcknowledged);
}
Self::send_permission_preset_updates(
tx,
approval,
sandbox.clone(),
label.as_str(),
ApprovalsReviewer::User,
);
})]
}
fn send_permission_preset_updates(
tx: &AppEventSender,
approval: AskForApproval,
sandbox: SandboxPolicy,
label: &str,
approvals_reviewer: ApprovalsReviewer,
) {
let sandbox_clone = sandbox;
tx.send(AppEvent::CodexOp(Op::OverrideTurnContext {
cwd: None,
approval_policy: Some(approval),
approvals_reviewer: Some(approvals_reviewer),
sandbox_policy: Some(sandbox_clone.clone()),
windows_sandbox_level: None,
model: None,
effort: None,
summary: None,
service_tier: None,
collaboration_mode: None,
personality: None,
}));
tx.send(AppEvent::UpdateAskForApprovalPolicy(approval));
tx.send(AppEvent::UpdateSandboxPolicy(sandbox_clone));
tx.send(AppEvent::UpdateApprovalsReviewer(approvals_reviewer));
tx.send(AppEvent::InsertHistoryCell(Box::new(
history_cell::new_info_event(
format!("Permissions updated to {label}"),
/*hint*/ None,
),
)));
}
fn preset_matches_current(
current_approval: AskForApproval,
current_sandbox: &SandboxPolicy,
@@ -7410,9 +7474,6 @@ impl ChatWidget {
preset: ApprovalPreset,
return_to_permissions: bool,
) {
let selected_name = preset.label.to_string();
let approval = preset.approval;
let sandbox = preset.sandbox;
let mut header_children: Vec<Box<dyn Renderable>> = Vec::new();
let title_line = Line::from("Enable full access?").bold();
let info_line = Line::from(vec![
@@ -7425,28 +7486,25 @@ impl ChatWidget {
header_children.push(Box::new(
Paragraph::new(vec![info_line]).wrap(Wrap { trim: false }),
));
if self.config.require_full_access_justification {
header_children.push(Box::new(
Paragraph::new(vec![Line::from(
"Your admin requires a written justification before full access is enabled.",
)])
.wrap(Wrap { trim: false }),
));
}
let header = ColumnRenderable::with(header_children);
let mut accept_actions = Self::approval_preset_actions(
approval,
sandbox.clone(),
selected_name.clone(),
ApprovalsReviewer::User,
let accept_actions = self.full_access_preset_actions(
preset.clone(),
/*acknowledge_warning*/ true,
/*persist_warning_acknowledged*/ false,
);
accept_actions.push(Box::new(|tx| {
tx.send(AppEvent::UpdateFullAccessWarningAcknowledged(true));
}));
let mut accept_and_remember_actions = Self::approval_preset_actions(
approval,
sandbox,
selected_name,
ApprovalsReviewer::User,
let accept_and_remember_actions = self.full_access_preset_actions(
preset, /*acknowledge_warning*/ true, /*persist_warning_acknowledged*/ true,
);
accept_and_remember_actions.push(Box::new(|tx| {
tx.send(AppEvent::UpdateFullAccessWarningAcknowledged(true));
tx.send(AppEvent::PersistFullAccessWarningAcknowledged);
}));
let deny_actions: Vec<SelectionAction> = vec![Box::new(move |tx| {
if return_to_permissions {
@@ -9310,6 +9368,50 @@ impl ChatWidget {
self.bottom_pane.show_view(Box::new(view));
}
pub(crate) fn open_full_access_justification_prompt(
&mut self,
preset: ApprovalPreset,
acknowledge_warning: bool,
persist_warning_acknowledged: bool,
) {
let tx = self.app_event_tx.clone();
let session_telemetry = self.session_telemetry.clone();
let approval = preset.approval;
let sandbox = preset.sandbox.clone();
let label = preset.label.to_string();
let view = CustomPromptView::new(
"Why do you need full access?".to_string(),
"Type a justification and press Enter".to_string(),
Some("Your admin requires a justification before enabling full access.".to_string()),
Box::new(move |prompt: String| {
let justification = prompt.trim().to_string();
if justification.is_empty() {
return;
}
session_telemetry.full_access_mode_enabled(
/*justification_required*/ true,
Some(justification.as_str()),
persist_warning_acknowledged,
);
if acknowledge_warning {
tx.send(AppEvent::UpdateFullAccessWarningAcknowledged(true));
}
if persist_warning_acknowledged {
tx.send(AppEvent::PersistFullAccessWarningAcknowledged);
}
Self::send_permission_preset_updates(
&tx,
approval,
sandbox.clone(),
label.as_str(),
ApprovalsReviewer::User,
);
}),
);
self.bottom_pane.show_view(Box::new(view));
}
pub(crate) fn token_usage(&self) -> TokenUsage {
self.token_info
.as_ref()
@@ -0,0 +1,16 @@
---
source: tui/src/chatwidget/tests.rs
expression: popup
---
Enable full access?
When Codex runs with full access, it can edit any file on your computer and
run commands with network, without your approval. Exercise caution when
enabling full access. This significantly increases the risk of data loss,
leaks, or unexpected behavior.
Your admin requires a written justification before full access is enabled.
› 1. Yes, continue anyway Apply full access for this session
2. Yes, and don't ask again Enable full access and remember this choice
3. Cancel Go back without enabling full access
Press enter to confirm or esc to go back
@@ -0,0 +1,10 @@
---
source: tui/src/chatwidget/tests.rs
expression: popup
---
▌ Why do you need full access?
▌ Your admin requires a justification before enabling full access.
▌
▌ Type a justification and press Enter
Press enter to confirm or esc to go back
+99
View File
@@ -8943,6 +8943,40 @@ async fn full_access_confirmation_popup_snapshot() {
assert_snapshot!("full_access_confirmation_popup", popup);
}
#[tokio::test]
async fn full_access_confirmation_popup_with_required_justification_snapshot() {
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(None).await;
chat.config.require_full_access_justification = true;
let preset = builtin_approval_presets()
.into_iter()
.find(|preset| preset.id == "full-access")
.expect("full access preset");
chat.open_full_access_confirmation(preset, false);
let popup = render_bottom_popup(&chat, 80);
assert_snapshot!(
"full_access_confirmation_popup_with_required_justification",
popup
);
}
#[tokio::test]
async fn full_access_justification_prompt_snapshot() {
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(None).await;
let preset = builtin_approval_presets()
.into_iter()
.find(|preset| preset.id == "full-access")
.expect("full access preset");
chat.open_full_access_justification_prompt(
preset, /*acknowledge_warning*/ false, /*persist_warning_acknowledged*/ false,
);
let popup = render_bottom_popup(&chat, 80);
assert_snapshot!("full_access_justification_prompt", popup);
}
#[cfg(target_os = "windows")]
#[tokio::test]
async fn windows_auto_mode_prompt_requests_enabling_sandbox_feature() {
@@ -9937,6 +9971,71 @@ async fn permissions_full_access_history_cell_emitted_only_after_confirmation()
);
}
#[tokio::test]
async fn permissions_full_access_requires_justification_when_warning_hidden() {
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(None).await;
#[cfg(target_os = "windows")]
{
chat.config.notices.hide_world_writable_warning = Some(true);
chat.set_windows_sandbox_mode(Some(WindowsSandboxModeToml::Unelevated));
}
chat.config.notices.hide_full_access_warning = Some(true);
chat.config.require_full_access_justification = true;
chat.open_permissions_popup();
move_permissions_popup_selection_to(&mut chat, "Full Access", KeyCode::Down);
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::<Vec<_>>();
assert!(
events
.iter()
.any(|event| matches!(event, AppEvent::OpenFullAccessJustificationPrompt { .. })),
"expected full access selection to request a justification prompt: {events:?}"
);
assert!(
!events
.iter()
.any(|event| matches!(event, AppEvent::InsertHistoryCell(_))),
"did not expect a history cell before justification is submitted: {events:?}"
);
}
#[tokio::test]
async fn full_access_justification_prompt_submission_applies_permissions() {
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(None).await;
let preset = builtin_approval_presets()
.into_iter()
.find(|preset| preset.id == "full-access")
.expect("full access preset");
chat.open_full_access_justification_prompt(
preset, /*acknowledge_warning*/ false, /*persist_warning_acknowledged*/ false,
);
for ch in "Need direct filesystem access".chars() {
chat.handle_key_event(KeyEvent::from(KeyCode::Char(ch)));
}
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::<Vec<_>>();
assert!(
events.iter().any(|event| matches!(
event,
AppEvent::CodexOp(Op::OverrideTurnContext {
sandbox_policy: Some(SandboxPolicy::DangerFullAccess),
..
})
)),
"expected justification submission to enable full access: {events:?}"
);
assert!(
events
.iter()
.any(|event| matches!(event, AppEvent::InsertHistoryCell(_))),
"expected justification submission to emit a history cell: {events:?}"
);
}
//
// Snapshot test: command approval modal
//
+21
View File
@@ -128,6 +128,17 @@ fn render_debug_config_lines(stack: &ConfigLayerStack) -> Vec<Line<'static>> {
));
}
if let Some(required) = requirements_toml.require_full_access_justification {
requirement_lines.push(requirement_line(
"require_full_access_justification",
required.to_string(),
requirements
.require_full_access_justification
.as_ref()
.map(|sourced| &sourced.source),
));
}
if let Some(servers) = requirements_toml.mcp_servers.as_ref() {
let value = join_or_empty(servers.keys().cloned().collect::<Vec<_>>());
requirement_lines.push(requirement_line(
@@ -513,6 +524,10 @@ mod tests {
Constrained::allow_any(WebSearchMode::Cached),
Some(RequirementSource::CloudRequirements),
),
require_full_access_justification: Some(Sourced::new(
true,
RequirementSource::CloudRequirements,
)),
network: Some(Sourced::new(
NetworkConstraints {
enabled: Some(true),
@@ -528,6 +543,7 @@ mod tests {
allowed_approval_policies: Some(vec![AskForApproval::OnRequest]),
allowed_sandbox_modes: Some(vec![SandboxModeRequirement::ReadOnly]),
allowed_web_search_modes: Some(vec![WebSearchModeRequirement::Cached]),
require_full_access_justification: Some(true),
guardian_developer_instructions: None,
feature_requirements: None,
mcp_servers: Some(BTreeMap::from([(
@@ -577,6 +593,10 @@ mod tests {
"allowed_web_search_modes: cached, disabled (source: cloud requirements)"
)
);
assert!(
rendered
.contains("require_full_access_justification: true (source: cloud requirements)")
);
assert!(rendered.contains("mcp_servers: docs (source: MDM managed_config.toml (legacy))"));
assert!(rendered.contains("enforce_residency: us (source: cloud requirements)"));
assert!(rendered.contains(
@@ -656,6 +676,7 @@ approval_policy = "never"
allowed_approval_policies: None,
allowed_sandbox_modes: None,
allowed_web_search_modes: Some(Vec::new()),
require_full_access_justification: None,
guardian_developer_instructions: None,
feature_requirements: None,
mcp_servers: None,
+11
View File
@@ -3762,6 +3762,17 @@ impl App {
self.chat_widget
.open_full_access_confirmation(preset, return_to_permissions);
}
AppEvent::OpenFullAccessJustificationPrompt {
preset,
acknowledge_warning,
persist_warning_acknowledged,
} => {
self.chat_widget.open_full_access_justification_prompt(
preset,
acknowledge_warning,
persist_warning_acknowledged,
);
}
AppEvent::OpenWorldWritableWarningConfirmation {
preset,
sample_paths,
+7
View File
@@ -341,6 +341,13 @@ pub(crate) enum AppEvent {
return_to_permissions: bool,
},
/// Open the required justification prompt before enabling full access mode.
OpenFullAccessJustificationPrompt {
preset: ApprovalPreset,
acknowledge_warning: bool,
persist_warning_acknowledged: bool,
},
/// Open the Windows world-writable directories warning.
/// If `preset` is `Some`, the confirmation will apply the provided
/// approval/sandbox configuration on Continue; if `None`, it performs no
+148 -46
View File
@@ -8332,6 +8332,12 @@ impl ChatWidget {
return_to_permissions: !include_read_only,
});
})]
} else if preset.id == "full-access" {
self.full_access_preset_actions(
preset.clone(),
/*acknowledge_warning*/ false,
/*persist_warning_acknowledged*/ false,
)
} else if preset.id == "auto" {
#[cfg(target_os = "windows")]
{
@@ -8494,35 +8500,93 @@ impl ChatWidget {
approvals_reviewer: ApprovalsReviewer,
) -> Vec<SelectionAction> {
vec![Box::new(move |tx| {
let sandbox_clone = sandbox.clone();
tx.send(AppEvent::CodexOp(
AppCommand::override_turn_context(
/*cwd*/ None,
Some(approval),
Some(approvals_reviewer),
Some(sandbox_clone.clone()),
/*windows_sandbox_level*/ None,
/*model*/ None,
/*effort*/ None,
/*summary*/ None,
/*service_tier*/ None,
/*collaboration_mode*/ None,
/*personality*/ None,
)
.into_core(),
));
tx.send(AppEvent::UpdateAskForApprovalPolicy(approval));
tx.send(AppEvent::UpdateSandboxPolicy(sandbox_clone));
tx.send(AppEvent::UpdateApprovalsReviewer(approvals_reviewer));
tx.send(AppEvent::InsertHistoryCell(Box::new(
history_cell::new_info_event(
format!("Permissions updated to {label}"),
/*hint*/ None,
),
)));
Self::send_permission_preset_updates(
tx,
approval,
sandbox.clone(),
label.as_str(),
approvals_reviewer,
);
})]
}
fn full_access_preset_actions(
&self,
preset: ApprovalPreset,
acknowledge_warning: bool,
persist_warning_acknowledged: bool,
) -> Vec<SelectionAction> {
if self.config.require_full_access_justification {
return vec![Box::new(move |tx| {
tx.send(AppEvent::OpenFullAccessJustificationPrompt {
preset: preset.clone(),
acknowledge_warning,
persist_warning_acknowledged,
});
})];
}
let approval = preset.approval;
let sandbox = preset.sandbox.clone();
let label = preset.label.to_string();
let session_telemetry = self.session_telemetry.clone();
vec![Box::new(move |tx| {
session_telemetry.full_access_mode_enabled(
/*justification_required*/ false,
/*justification*/ None,
persist_warning_acknowledged,
);
if acknowledge_warning {
tx.send(AppEvent::UpdateFullAccessWarningAcknowledged(true));
}
if persist_warning_acknowledged {
tx.send(AppEvent::PersistFullAccessWarningAcknowledged);
}
Self::send_permission_preset_updates(
tx,
approval,
sandbox.clone(),
label.as_str(),
ApprovalsReviewer::User,
);
})]
}
fn send_permission_preset_updates(
tx: &AppEventSender,
approval: AskForApproval,
sandbox: SandboxPolicy,
label: &str,
approvals_reviewer: ApprovalsReviewer,
) {
let sandbox_clone = sandbox;
tx.send(AppEvent::CodexOp(
AppCommand::override_turn_context(
/*cwd*/ None,
Some(approval),
Some(approvals_reviewer),
Some(sandbox_clone.clone()),
/*windows_sandbox_level*/ None,
/*model*/ None,
/*effort*/ None,
/*summary*/ None,
/*service_tier*/ None,
/*collaboration_mode*/ None,
/*personality*/ None,
)
.into_core(),
));
tx.send(AppEvent::UpdateAskForApprovalPolicy(approval));
tx.send(AppEvent::UpdateSandboxPolicy(sandbox_clone));
tx.send(AppEvent::UpdateApprovalsReviewer(approvals_reviewer));
tx.send(AppEvent::InsertHistoryCell(Box::new(
history_cell::new_info_event(
format!("Permissions updated to {label}"),
/*hint*/ None,
),
)));
}
fn preset_matches_current(
current_approval: AskForApproval,
current_sandbox: &SandboxPolicy,
@@ -8593,9 +8657,6 @@ impl ChatWidget {
preset: ApprovalPreset,
return_to_permissions: bool,
) {
let selected_name = preset.label.to_string();
let approval = preset.approval;
let sandbox = preset.sandbox;
let mut header_children: Vec<Box<dyn Renderable>> = Vec::new();
let title_line = Line::from("Enable full access?").bold();
let info_line = Line::from(vec![
@@ -8608,28 +8669,25 @@ impl ChatWidget {
header_children.push(Box::new(
Paragraph::new(vec![info_line]).wrap(Wrap { trim: false }),
));
if self.config.require_full_access_justification {
header_children.push(Box::new(
Paragraph::new(vec![Line::from(
"Your admin requires a written justification before full access is enabled.",
)])
.wrap(Wrap { trim: false }),
));
}
let header = ColumnRenderable::with(header_children);
let mut accept_actions = Self::approval_preset_actions(
approval,
sandbox.clone(),
selected_name.clone(),
ApprovalsReviewer::User,
let accept_actions = self.full_access_preset_actions(
preset.clone(),
/*acknowledge_warning*/ true,
/*persist_warning_acknowledged*/ false,
);
accept_actions.push(Box::new(|tx| {
tx.send(AppEvent::UpdateFullAccessWarningAcknowledged(true));
}));
let mut accept_and_remember_actions = Self::approval_preset_actions(
approval,
sandbox,
selected_name,
ApprovalsReviewer::User,
let accept_and_remember_actions = self.full_access_preset_actions(
preset, /*acknowledge_warning*/ true, /*persist_warning_acknowledged*/ true,
);
accept_and_remember_actions.push(Box::new(|tx| {
tx.send(AppEvent::UpdateFullAccessWarningAcknowledged(true));
tx.send(AppEvent::PersistFullAccessWarningAcknowledged);
}));
let deny_actions: Vec<SelectionAction> = vec![Box::new(move |tx| {
if return_to_permissions {
@@ -10475,6 +10533,50 @@ impl ChatWidget {
self.bottom_pane.show_view(Box::new(view));
}
pub(crate) fn open_full_access_justification_prompt(
&mut self,
preset: ApprovalPreset,
acknowledge_warning: bool,
persist_warning_acknowledged: bool,
) {
let tx = self.app_event_tx.clone();
let session_telemetry = self.session_telemetry.clone();
let approval = preset.approval;
let sandbox = preset.sandbox.clone();
let label = preset.label.to_string();
let view = CustomPromptView::new(
"Why do you need full access?".to_string(),
"Type a justification and press Enter".to_string(),
Some("Your admin requires a justification before enabling full access.".to_string()),
Box::new(move |prompt: String| {
let justification = prompt.trim().to_string();
if justification.is_empty() {
return;
}
session_telemetry.full_access_mode_enabled(
/*justification_required*/ true,
Some(justification.as_str()),
persist_warning_acknowledged,
);
if acknowledge_warning {
tx.send(AppEvent::UpdateFullAccessWarningAcknowledged(true));
}
if persist_warning_acknowledged {
tx.send(AppEvent::PersistFullAccessWarningAcknowledged);
}
Self::send_permission_preset_updates(
&tx,
approval,
sandbox.clone(),
label.as_str(),
ApprovalsReviewer::User,
);
}),
);
self.bottom_pane.show_view(Box::new(view));
}
pub(crate) fn token_usage(&self) -> TokenUsage {
self.token_info
.as_ref()
@@ -0,0 +1,16 @@
---
source: tui_app_server/src/chatwidget/tests.rs
expression: popup
---
Enable full access?
When Codex runs with full access, it can edit any file on your computer and
run commands with network, without your approval. Exercise caution when
enabling full access. This significantly increases the risk of data loss,
leaks, or unexpected behavior.
Your admin requires a written justification before full access is enabled.
› 1. Yes, continue anyway Apply full access for this session
2. Yes, and don't ask again Enable full access and remember this choice
3. Cancel Go back without enabling full access
Press enter to confirm or esc to go back
@@ -0,0 +1,10 @@
---
source: tui_app_server/src/chatwidget/tests.rs
expression: popup
---
▌ Why do you need full access?
▌ Your admin requires a justification before enabling full access.
▌
▌ Type a justification and press Enter
Press enter to confirm or esc to go back
@@ -9496,6 +9496,40 @@ async fn full_access_confirmation_popup_snapshot() {
assert_snapshot!("full_access_confirmation_popup", popup);
}
#[tokio::test]
async fn full_access_confirmation_popup_with_required_justification_snapshot() {
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(None).await;
chat.config.require_full_access_justification = true;
let preset = builtin_approval_presets()
.into_iter()
.find(|preset| preset.id == "full-access")
.expect("full access preset");
chat.open_full_access_confirmation(preset, false);
let popup = render_bottom_popup(&chat, 80);
assert_snapshot!(
"full_access_confirmation_popup_with_required_justification",
popup
);
}
#[tokio::test]
async fn full_access_justification_prompt_snapshot() {
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(None).await;
let preset = builtin_approval_presets()
.into_iter()
.find(|preset| preset.id == "full-access")
.expect("full access preset");
chat.open_full_access_justification_prompt(
preset, /*acknowledge_warning*/ false, /*persist_warning_acknowledged*/ false,
);
let popup = render_bottom_popup(&chat, 80);
assert_snapshot!("full_access_justification_prompt", popup);
}
#[cfg(target_os = "windows")]
#[tokio::test]
async fn windows_auto_mode_prompt_requests_enabling_sandbox_feature() {
@@ -10478,6 +10512,73 @@ async fn permissions_full_access_history_cell_emitted_only_after_confirmation()
);
}
#[tokio::test]
async fn permissions_full_access_requires_justification_when_warning_hidden() {
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(None).await;
#[cfg(target_os = "windows")]
{
chat.config.notices.hide_world_writable_warning = Some(true);
chat.set_windows_sandbox_mode(Some(WindowsSandboxModeToml::Unelevated));
}
chat.config.notices.hide_full_access_warning = Some(true);
chat.config.require_full_access_justification = true;
chat.open_permissions_popup();
chat.handle_key_event(KeyEvent::from(KeyCode::Down));
#[cfg(target_os = "windows")]
chat.handle_key_event(KeyEvent::from(KeyCode::Down));
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::<Vec<_>>();
assert!(
events
.iter()
.any(|event| matches!(event, AppEvent::OpenFullAccessJustificationPrompt { .. })),
"expected full access selection to request a justification prompt: {events:?}"
);
assert!(
!events
.iter()
.any(|event| matches!(event, AppEvent::InsertHistoryCell(_))),
"did not expect a history cell before justification is submitted: {events:?}"
);
}
#[tokio::test]
async fn full_access_justification_prompt_submission_applies_permissions() {
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(None).await;
let preset = builtin_approval_presets()
.into_iter()
.find(|preset| preset.id == "full-access")
.expect("full access preset");
chat.open_full_access_justification_prompt(
preset, /*acknowledge_warning*/ false, /*persist_warning_acknowledged*/ false,
);
for ch in "Need direct filesystem access".chars() {
chat.handle_key_event(KeyEvent::from(KeyCode::Char(ch)));
}
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::<Vec<_>>();
assert!(
events.iter().any(|event| matches!(
event,
AppEvent::CodexOp(Op::OverrideTurnContext {
sandbox_policy: Some(SandboxPolicy::DangerFullAccess),
..
})
)),
"expected justification submission to enable full access: {events:?}"
);
assert!(
events
.iter()
.any(|event| matches!(event, AppEvent::InsertHistoryCell(_))),
"expected justification submission to emit a history cell: {events:?}"
);
}
//
// Snapshot test: command approval modal
//
@@ -128,6 +128,17 @@ fn render_debug_config_lines(stack: &ConfigLayerStack) -> Vec<Line<'static>> {
));
}
if let Some(required) = requirements_toml.require_full_access_justification {
requirement_lines.push(requirement_line(
"require_full_access_justification",
required.to_string(),
requirements
.require_full_access_justification
.as_ref()
.map(|sourced| &sourced.source),
));
}
if let Some(servers) = requirements_toml.mcp_servers.as_ref() {
let value = join_or_empty(servers.keys().cloned().collect::<Vec<_>>());
requirement_lines.push(requirement_line(
@@ -513,6 +524,10 @@ mod tests {
Constrained::allow_any(WebSearchMode::Cached),
Some(RequirementSource::CloudRequirements),
),
require_full_access_justification: Some(Sourced::new(
true,
RequirementSource::CloudRequirements,
)),
network: Some(Sourced::new(
NetworkConstraints {
enabled: Some(true),
@@ -528,6 +543,7 @@ mod tests {
allowed_approval_policies: Some(vec![AskForApproval::OnRequest]),
allowed_sandbox_modes: Some(vec![SandboxModeRequirement::ReadOnly]),
allowed_web_search_modes: Some(vec![WebSearchModeRequirement::Cached]),
require_full_access_justification: Some(true),
guardian_developer_instructions: None,
feature_requirements: None,
mcp_servers: Some(BTreeMap::from([(
@@ -577,6 +593,10 @@ mod tests {
"allowed_web_search_modes: cached, disabled (source: cloud requirements)"
)
);
assert!(
rendered
.contains("require_full_access_justification: true (source: cloud requirements)")
);
assert!(rendered.contains("mcp_servers: docs (source: MDM managed_config.toml (legacy))"));
assert!(rendered.contains("enforce_residency: us (source: cloud requirements)"));
assert!(rendered.contains(
@@ -656,6 +676,7 @@ approval_policy = "never"
allowed_approval_policies: None,
allowed_sandbox_modes: None,
allowed_web_search_modes: Some(Vec::new()),
require_full_access_justification: None,
guardian_developer_instructions: None,
feature_requirements: None,
mcp_servers: None,