Discover permission profiles from the app server (#42453)

## Why

The permissions menu needs to reflect the profiles and configuration requirements available in the active app-server scope, including remote workspaces.

## What changed

- Load permission profiles and configuration requirements asynchronously when opening the permissions menu, using the active thread working directory.
- Render loading, retry, empty-catalog, and unsupported-server states, and fall back to the legacy permissions menu when explicit profiles are not configured.
- Disable profiles rejected by server requirements or unavailable in the catalog. Remote custom profiles remain visible but cannot yet be selected.
- Bound pagination and request time, reject malformed catalogs, and ignore responses made stale by account, thread, or modal changes.

## Testing

- Cover local, session-only, remote, legacy, empty, unsupported, pagination, malformed-response, and timeout discovery paths.
- Add TUI tests for loading, failures, retries, empty results, remote catalogs, stale responses, and working-directory changes.

GitOrigin-RevId: 3e2ab53a4eae1179587d064f9a4c605765ea7880
This commit is contained in:
Eric Traut authored and copyberry committed 2026-09-03 05:24:31 +00:00
1 parent 8b8ee28a9b
commit c9fecd3fa0
19 files changed
+797 -22

No files matched your search

@@ -1842,3 +1842,27 @@ async fn live_app_server_thread_closed_requests_immediate_exit() {
assert_matches!(rx.try_recv(), Ok(AppEvent::Exit(ExitMode::Immediate)));
}
#[tokio::test]
async fn permission_discovery_invalidates_on_thread_settings_and_uses_updated_cwd() {
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await;
let thread_id = ThreadId::new();
chat.thread_id = Some(thread_id);
chat.config.explicit_permission_profile_mode = true;
for complete in [false, true] {
chat.open_permissions_popup();
let request_id = chat.permission_popup_request_id.unwrap();
if complete {
chat.on_permission_profiles_loaded(request_id, Err("disconnected".to_string()));
}
chat.on_thread_settings_updated(thread_settings_for_test("gpt-5.2", thread_id));
chat.on_permission_profiles_loaded(request_id, Err("stale".to_string()));
assert!(!chat.bottom_pane.has_active_view());
}
while rx.try_recv().is_ok() {}
chat.open_permissions_popup();
let AppEvent::FetchPermissionProfiles { thread_cwd, .. } = rx.try_recv().unwrap() else {
panic!("expected discovery")
};
assert_eq!(thread_cwd, Some(test_path_buf("/tmp/thread-settings")));
}
@@ -1,5 +1,6 @@
use super::*;
use crate::legacy_core::config::PermissionProfileCatalogEntry;
use crate::permission_discovery::PermissionDiscovery as Discovery;
use codex_protocol::models::ActivePermissionProfile;
use codex_protocol::models::BUILT_IN_PERMISSION_PROFILE_DANGER_FULL_ACCESS;
use codex_protocol::models::ManagedFileSystemPermissions;
@@ -10,6 +11,127 @@ use codex_protocol::permissions::FileSystemSpecialPath;
use codex_protocol::permissions::NetworkSandboxPolicy;
use pretty_assertions::assert_eq;
#[tokio::test]
async fn permission_discovery_uses_server_catalog_and_keeps_remote_custom_selection_disabled() {
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await;
chat.config.explicit_permission_profile_mode = false;
chat.set_permission_profile_from_session_snapshot(PermissionProfileSnapshot::active(
PermissionProfile::workspace_write(),
ActivePermissionProfile::new(":workspace"),
))
.unwrap();
let mut discovery = Discovery::local(&chat.config);
discovery.remote = true;
discovery
.profiles
.push(codex_app_server_protocol::PermissionProfileSummary {
id: "server-only".to_string(),
description: Some("Description from the connected server.".to_string()),
allowed: true,
});
discovery.requirements = Some(
serde_json::from_value(serde_json::json!({
"allowedApprovalsReviewers": ["user"],
"allowedPermissionProfiles": {":workspace": true, "server-only": true}
}))
.unwrap(),
);
chat.request_permission_profiles();
let request_id = chat.permission_popup_request_id.unwrap();
rx.try_recv().unwrap();
assert_chatwidget_snapshot!(
"permission_discovery_loading",
render_bottom_popup(&chat, /*width*/ 80)
);
chat.on_permission_profiles_loaded(request_id, Ok(discovery));
assert_chatwidget_snapshot!(
"permission_discovery_remote",
render_bottom_popup(&chat, /*width*/ 110)
);
// Server-only alternatives remain visible, but cannot enter the local mutation path.
chat.handle_key_event(KeyEvent::from(KeyCode::Char('5')));
assert!(rx.try_recv().is_err());
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
chat.open_permissions_popup();
rx.try_recv().unwrap();
let request_id = chat.permission_popup_request_id.unwrap();
let mut legacy = Discovery::local(&chat.config);
legacy.explicit_profile_mode = false;
chat.on_permission_profiles_loaded(request_id, Ok(legacy));
let actual = render_bottom_popup(&chat, /*width*/ 110);
chat.open_legacy_permissions_popup();
assert_eq!(actual, render_bottom_popup(&chat, /*width*/ 110));
}
#[tokio::test]
async fn permission_discovery_discards_stale_results_and_preserves_covering_modal() {
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await;
chat.config.explicit_permission_profile_mode = true;
chat.open_permissions_popup();
let first = chat.permission_popup_request_id.unwrap();
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
chat.on_permission_profiles_loaded(first, Ok(Discovery::local(&chat.config)));
assert!(!chat.bottom_pane.has_active_view());
chat.open_permissions_popup();
let second = chat.permission_popup_request_id.unwrap();
chat.on_permission_profiles_loaded(first, Ok(Discovery::local(&chat.config)));
assert!(chat.permission_popup_request_is_current(second));
chat.update_account_state(
/*status_account_display*/ None, /*plan_type*/ None,
/*has_chatgpt_account*/ false, /*has_codex_backend_auth*/ false,
);
chat.on_permission_profiles_loaded(second, Ok(Discovery::local(&chat.config)));
assert!(!chat.bottom_pane.has_active_view());
chat.open_permissions_popup();
let request_id = chat.permission_popup_request_id.unwrap();
chat.bottom_pane.show_selection_view(SelectionViewParams {
view_id: Some("other-modal"),
title: Some("Other modal".to_string()),
..Default::default()
});
chat.on_permission_profiles_loaded(request_id, Ok(Discovery::local(&chat.config)));
assert_eq!(chat.bottom_pane.active_view_id(), Some("other-modal"));
chat.handle_key_event(KeyEvent::from(KeyCode::Esc));
assert!(!chat.bottom_pane.has_active_view());
}
#[tokio::test]
async fn permission_discovery_failure_can_retry_and_empty_catalog_keeps_current_profile() {
let (mut chat, mut rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await;
chat.config.explicit_permission_profile_mode = true;
chat.set_permission_profile_from_session_snapshot(PermissionProfileSnapshot::active(
PermissionProfile::workspace_write(),
ActivePermissionProfile::new("current-profile"),
))
.unwrap();
chat.open_permissions_popup();
let request_id = chat.permission_popup_request_id.unwrap();
rx.try_recv().unwrap();
chat.on_permission_profiles_loaded(
request_id,
Err("Failed to load permissions: disconnected".to_string()),
);
assert_chatwidget_snapshot!(
"permission_discovery_failure",
render_bottom_popup(&chat, /*width*/ 80)
);
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
assert!(matches!(rx.try_recv(), Ok(AppEvent::OpenPermissionsPopup)));
chat.open_permissions_popup();
let request_id = chat.permission_popup_request_id.unwrap();
rx.try_recv().unwrap();
let mut discovery = Discovery::local(&chat.config);
discovery.profiles.clear();
chat.on_permission_profiles_loaded(request_id, Ok(discovery));
assert_chatwidget_snapshot!(
"permission_discovery_empty",
render_bottom_popup(&chat, /*width*/ 100)
);
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
assert!(rx.try_recv().is_err());
}
fn app_server_workspace_write_profile(extra_root: AbsolutePathBuf) -> PermissionProfile {
PermissionProfile::Managed {
network: NetworkSandboxPolicy::Restricted,
@@ -108,7 +230,7 @@ async fn profile_permissions_selection_popup_snapshot() {
))
.expect("set active profile");
chat.open_permissions_popup();
chat.open_permission_profiles_popup(Discovery::local(&chat.config));
assert_chatwidget_snapshot!(
"profile_permissions_selection_popup",
@@ -128,7 +250,7 @@ async fn profile_permissions_selection_popup_with_disallowed_full_access_snapsho
..Default::default()
});
chat.open_permissions_popup();
chat.open_permission_profiles_popup(Discovery::local(&chat.config));
assert_chatwidget_snapshot!(
"profile_permissions_selection_popup_with_disallowed_full_access",
@@ -160,7 +282,7 @@ async fn profile_permissions_selection_popup_with_custom_profiles_snapshot() {
))
.expect("set active profile");
chat.open_permissions_popup();
chat.open_permission_profiles_popup(Discovery::local(&chat.config));
assert_chatwidget_snapshot!(
"profile_permissions_selection_popup_with_custom_profiles",
@@ -184,7 +306,7 @@ async fn profile_permissions_selection_emits_named_profile_event_only() {
))
.expect("set active profile");
chat.open_permissions_popup();
chat.open_permission_profiles_popup(Discovery::local(&chat.config));
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::<Vec<_>>();
@@ -217,7 +339,7 @@ async fn profile_permissions_selection_emits_active_custom_profile() {
))
.expect("set active profile");
chat.open_permissions_popup();
chat.open_permission_profiles_popup(Discovery::local(&chat.config));
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
let events = std::iter::from_fn(|| rx.try_recv().ok()).collect::<Vec<_>>();
@@ -249,7 +371,7 @@ async fn profile_permissions_selection_emits_auto_review_mode_event() {
))
.expect("set active profile");
chat.open_permissions_popup();
chat.open_permission_profiles_popup(Discovery::local(&chat.config));
chat.handle_key_event(KeyEvent::from(KeyCode::Down));
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));
@@ -273,7 +395,7 @@ async fn profile_permissions_full_access_always_opens_confirmation() {
chat.set_feature_enabled(Feature::GuardianApproval, /*enabled*/ false);
chat.local_settings.notices.hide_full_access_warning = Some(true);
chat.open_permissions_popup();
chat.open_permission_profiles_popup(Discovery::local(&chat.config));
chat.handle_key_event(KeyEvent::from(KeyCode::Up));
chat.handle_key_event(KeyEvent::from(KeyCode::Enter));