clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-24 13:04:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 5212bac2dc into sapling-pr-archive-bolinfest

Browse Source
This commit is contained in:
Michael Bolin
2026-05-14 17:52:22 -07:00
committed by GitHub
parent f986e7462f 5212bac2dc
commit 2794fbd985
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codex-rs/tui/src/app/config_persistence.rs
View File

@@ -301,7 +301,7 @@ impl App {
}
let permission_profile_override_value = permission_profile_override
.is_some()
.then(|| self.config.permissions.permission_profile().get().clone());
.then(|| self.config.permissions.permission_profile().clone());
if let Some(permission_profile) = permission_profile_override_value.as_ref()
&& let Err(err) = self
.chat_widget

2
codex-rs/tui/src/app/event_dispatch.rs
View File

@@ -1426,7 +1426,7 @@ impl App {
return Ok(AppRunControl::Continue);
}
self.runtime_permission_profile_override =
Some(self.config.permissions.permission_profile().get().clone());
Some(self.config.permissions.permission_profile().clone());
self.sync_active_thread_permission_settings_to_cached_session()
.await;

2
codex-rs/tui/src/app/tests.rs
View File

@@ -3140,7 +3140,7 @@ async fn side_fork_config_inherits_parent_thread_runtime_settings() {
fork_config.model_reasoning_effort,
fork_config.service_tier.as_deref(),
fork_config.permissions.approval_policy.value(),
fork_config.permissions.permission_profile().get(),
fork_config.permissions.permission_profile(),
fork_config.approvals_reviewer,
),
(

3
codex-rs/tui/src/app/thread_session_state.rs
View File

@@ -357,12 +357,11 @@ mod tests {
.config_ref()
.permissions
.permission_profile()
.get()
.clone();
assert_eq!(session.permission_profile, expected_permission_profile);
assert_ne!(
session.permission_profile,
app.config.permissions.permission_profile().get().clone(),
app.config.permissions.permission_profile().clone(),
"thread/read fallback must use the active widget permissions rather than stale app \
config defaults"
);

2
codex-rs/tui/src/chatwidget/permission_popups.rs
View File

@@ -17,7 +17,7 @@ impl ChatWidget {
let include_read_only = cfg!(target_os = "windows");
let current_approval =
AskForApproval::from(self.config.permissions.approval_policy.value());
let current_permission_profile = self.config.permissions.permission_profile().get().clone();
let current_permission_profile = self.config.permissions.permission_profile().clone();
let guardian_approval_enabled = self.config.features.enabled(Feature::GuardianApproval);
let current_review_policy = self.config.approvals_reviewer;
let mut items: Vec<SelectionItem> = Vec::new();