fix(ci) Resolve merge conflict

2026-03-16 19:06:30 +03:00 · 2026-03-09 19:26:42 -07:00
1 changed files with 2 additions and 0 deletions
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -2851,6 +2851,7 @@ impl Session {
            AskForApproval::Never => {
                return Some(RequestPermissionsResponse {
                    permissions: PermissionProfile::default(),
+                    scope: PermissionGrantScope::default(),
                });
            }
            AskForApproval::Reject(reject_config)
@@ -2858,6 +2859,7 @@ impl Session {
            {
                return Some(RequestPermissionsResponse {
                    permissions: PermissionProfile::default(),
+                    scope: PermissionGrantScope::default(),
                });
            }
            AskForApproval::OnFailure