mirror of
https://github.com/openai/codex.git
synced 2026-11-19 22:30:42 +00:00
feat(tui): preselect suggested permission scope
Thread `suggestedScope` through the app-server permission approval request and use it when constructing TUI approval requests. This keeps the protocol backward compatible by defaulting the field to `turn` when older clients omit it. Add focused app-server and TUI coverage, plus a snapshot for the session-suggested approval overlay so reviewers can see the preselected session row.
This commit is contained in:
@@ -1840,6 +1840,7 @@ impl App {
|
||||
call_id: params.item_id.clone(),
|
||||
reason: params.reason.clone(),
|
||||
permissions: params.permissions.clone().into(),
|
||||
suggested_scope: params.suggested_scope.to_core(),
|
||||
}),
|
||||
),
|
||||
_ => None,
|
||||
@@ -6422,6 +6423,7 @@ mod tests {
|
||||
use codex_protocol::protocol::SessionConfiguredEvent;
|
||||
use codex_protocol::protocol::SessionSource;
|
||||
use codex_protocol::protocol::TurnContextItem;
|
||||
use codex_protocol::request_permissions::PermissionGrantScope;
|
||||
use codex_protocol::request_permissions::RequestPermissionProfile;
|
||||
use codex_protocol::user_input::TextElement;
|
||||
use codex_protocol::user_input::UserInput;
|
||||
@@ -8681,11 +8683,13 @@ guardian_approval = true
|
||||
write: Some(vec![test_absolute_path("/tmp/write")]),
|
||||
}),
|
||||
},
|
||||
suggested_scope: codex_app_server_protocol::PermissionGrantScope::Turn,
|
||||
},
|
||||
};
|
||||
|
||||
let Some(ThreadInteractiveRequest::Approval(ApprovalRequest::Permissions {
|
||||
permissions,
|
||||
suggested_scope,
|
||||
..
|
||||
})) = app
|
||||
.interactive_request_for_thread_request(thread_id, &request)
|
||||
@@ -8706,6 +8710,7 @@ guardian_approval = true
|
||||
}),
|
||||
}
|
||||
);
|
||||
assert_eq!(suggested_scope, PermissionGrantScope::Turn);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
|
||||
@@ -368,6 +368,7 @@ mod tests {
|
||||
"network": { "enabled": null }
|
||||
}))
|
||||
.expect("valid permissions"),
|
||||
suggested_scope: codex_app_server_protocol::PermissionGrantScope::Turn,
|
||||
},
|
||||
}),
|
||||
None
|
||||
|
||||
@@ -60,6 +60,7 @@ pub(crate) enum ApprovalRequest {
|
||||
call_id: String,
|
||||
reason: Option<String>,
|
||||
permissions: RequestPermissionProfile,
|
||||
suggested_scope: PermissionGrantScope,
|
||||
},
|
||||
ApplyPatch {
|
||||
thread_id: ThreadId,
|
||||
@@ -144,7 +145,7 @@ impl ApprovalOverlay {
|
||||
header: Box<dyn Renderable>,
|
||||
_features: &Features,
|
||||
) -> (Vec<ApprovalOption>, SelectionViewParams) {
|
||||
let (options, title) = match request {
|
||||
let (options, title, initial_selected_idx) = match request {
|
||||
ApprovalRequest::Exec {
|
||||
available_decisions,
|
||||
network_approval_context,
|
||||
@@ -165,18 +166,24 @@ impl ApprovalOverlay {
|
||||
)
|
||||
},
|
||||
),
|
||||
None,
|
||||
),
|
||||
ApprovalRequest::Permissions { .. } => (
|
||||
ApprovalRequest::Permissions {
|
||||
suggested_scope, ..
|
||||
} => (
|
||||
permissions_options(),
|
||||
"Would you like to grant these permissions?".to_string(),
|
||||
matches!(suggested_scope, PermissionGrantScope::Session).then_some(1),
|
||||
),
|
||||
ApprovalRequest::ApplyPatch { .. } => (
|
||||
patch_options(),
|
||||
"Would you like to make the following edits?".to_string(),
|
||||
None,
|
||||
),
|
||||
ApprovalRequest::McpElicitation { server_name, .. } => (
|
||||
elicitation_options(),
|
||||
format!("{server_name} needs your approval."),
|
||||
None,
|
||||
),
|
||||
};
|
||||
|
||||
@@ -202,6 +209,7 @@ impl ApprovalOverlay {
|
||||
footer_hint: Some(approval_footer_hint(request)),
|
||||
items,
|
||||
header,
|
||||
initial_selected_idx,
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
@@ -918,6 +926,7 @@ mod tests {
|
||||
write: Some(vec![absolute_path("/tmp/out.txt")]),
|
||||
}),
|
||||
},
|
||||
suggested_scope: PermissionGrantScope::Turn,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1258,6 +1267,40 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn permissions_session_suggestion_preselects_session_scope() {
|
||||
let (tx, mut rx) = unbounded_channel::<AppEvent>();
|
||||
let tx = AppEventSender::new(tx);
|
||||
let mut request = make_permissions_request();
|
||||
let ApprovalRequest::Permissions {
|
||||
suggested_scope, ..
|
||||
} = &mut request
|
||||
else {
|
||||
panic!("expected permissions request");
|
||||
};
|
||||
*suggested_scope = PermissionGrantScope::Session;
|
||||
let mut view = ApprovalOverlay::new(request, tx, Features::with_defaults());
|
||||
|
||||
view.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
|
||||
|
||||
let mut saw_op = false;
|
||||
while let Ok(ev) = rx.try_recv() {
|
||||
if let AppEvent::SubmitThreadOp {
|
||||
op: Op::RequestPermissionsResponse { response, .. },
|
||||
..
|
||||
} = ev
|
||||
{
|
||||
assert_eq!(response.scope, PermissionGrantScope::Session);
|
||||
saw_op = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
assert!(
|
||||
saw_op,
|
||||
"expected preselected session approval to submit a session-scoped response"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn additional_permissions_prompt_shows_permission_rule_line() {
|
||||
let (tx, _rx) = unbounded_channel::<AppEvent>();
|
||||
@@ -1349,6 +1392,25 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn permissions_prompt_session_suggestion_snapshot() {
|
||||
let (tx, _rx) = unbounded_channel::<AppEvent>();
|
||||
let tx = AppEventSender::new(tx);
|
||||
let mut request = make_permissions_request();
|
||||
let ApprovalRequest::Permissions {
|
||||
suggested_scope, ..
|
||||
} = &mut request
|
||||
else {
|
||||
panic!("expected permissions request");
|
||||
};
|
||||
*suggested_scope = PermissionGrantScope::Session;
|
||||
let view = ApprovalOverlay::new(request, tx, Features::with_defaults());
|
||||
assert_snapshot!(
|
||||
"approval_overlay_permissions_prompt_session_suggested",
|
||||
normalize_snapshot_paths(render_overlay_lines(&view, /*width*/ 120))
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn network_exec_prompt_title_includes_host() {
|
||||
let (tx, _rx) = unbounded_channel::<AppEvent>();
|
||||
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
---
|
||||
source: tui/src/bottom_pane/approval_overlay.rs
|
||||
expression: "normalize_snapshot_paths(render_overlay_lines(&view, 120))"
|
||||
---
|
||||
|
||||
Would you like to grant these permissions?
|
||||
|
||||
Reason: need workspace access
|
||||
|
||||
Permission rule: network; read `/tmp/readme.txt`; write `/tmp/out.txt`
|
||||
|
||||
1. Yes, grant these permissions (y)
|
||||
› 2. Yes, grant these permissions for this session (a)
|
||||
3. No, continue without permissions (n)
|
||||
|
||||
Press enter to confirm or esc to cancel
|
||||
@@ -1572,7 +1572,7 @@ fn request_permissions_from_params(
|
||||
call_id: params.item_id,
|
||||
reason: params.reason,
|
||||
permissions: params.permissions.into(),
|
||||
suggested_scope: codex_protocol::request_permissions::PermissionGrantScope::Turn,
|
||||
suggested_scope: params.suggested_scope.to_core(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4582,6 +4582,7 @@ impl ChatWidget {
|
||||
call_id: ev.call_id,
|
||||
reason: ev.reason,
|
||||
permissions: ev.permissions,
|
||||
suggested_scope: ev.suggested_scope,
|
||||
};
|
||||
self.bottom_pane
|
||||
.push_approval_request(request, &self.config.features);
|
||||
|
||||
@@ -160,6 +160,7 @@ fn app_server_request_permissions_preserves_file_system_permissions() {
|
||||
write: Some(vec![write_path.clone()]),
|
||||
}),
|
||||
},
|
||||
suggested_scope: codex_app_server_protocol::PermissionGrantScope::Turn,
|
||||
});
|
||||
|
||||
assert_eq!(
|
||||
@@ -174,6 +175,10 @@ fn app_server_request_permissions_preserves_file_system_permissions() {
|
||||
}),
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
request.suggested_scope,
|
||||
codex_protocol::request_permissions::PermissionGrantScope::Turn
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
|
||||
Reference in New Issue
Block a user