Fix merging as admin

Author: kylecarbs

src/browser/components/pr-overview.tsx

@@ -140,6 +140,8 @@ export const PROverview = memo(function PROverview() {
 
   // Viewer permissions from GraphQL (more reliable than REST)
   const [viewerPermission, setViewerPermission] = useState<string | null>(null);
+  // Whether the viewer can bypass branch protections (from GraphQL pullRequest.viewerCanMergeAsAdmin)
+  const [viewerCanMergeAsAdmin, setViewerCanMergeAsAdmin] = useState(false);
 
   // Repo permissions - use GraphQL viewerPermission as primary source
   const isArchived = pr.base?.repo?.archived ?? false;
@@ -272,6 +274,7 @@ export const PROverview = memo(function PROverview() {
           github.getReviewThreads(owner, repo, pr.number).catch(() => ({
             threads: [] as ReviewThread[],
             viewerPermission: null,
+            viewerCanMergeAsAdmin: false,
           })),
         ]);
 
@@ -294,6 +297,7 @@ export const PROverview = memo(function PROverview() {
         setTimeline(timelineData);
         setReviewThreads(reviewThreadsResult.threads);
         setViewerPermission(reviewThreadsResult.viewerPermission);
+        setViewerCanMergeAsAdmin(reviewThreadsResult.viewerCanMergeAsAdmin);
 
         // Check if branch was already deleted (and not restored) from timeline
         // Branch is deleted if there are more delete events than restore events
@@ -1107,7 +1111,7 @@ export const PROverview = memo(function PROverview() {
                       }
                       approvingWorkflows={approvingWorkflows}
                       onApproveWorkflows={handleApproveWorkflows}
-                      canBypassBranchProtections={viewerPermission === "ADMIN"}
+                      canBypassBranchProtections={viewerCanMergeAsAdmin}
                     />
                     {/* Still in progress - only show if NOT a draft and user can merge */}
                     {canMergeRepo && !pr.draft && (
@@ -3046,8 +3050,10 @@ function MergeSection({
             <p className="text-sm text-destructive">{mergeError}</p>
           )}
 
-          {/* Bypass rules checkbox - only show for users who can bypass branch protections */}
-          {canBypassBranchProtections && (
+          {/* Bypass rules checkbox - only show when:
+              1. User can bypass branch protections (viewerCanMergeAsAdmin)
+              2. AND there are actually unmet requirements (something to bypass) */}
+          {canBypassBranchProtections && overallStatus !== "success" && (
             <label className="flex items-start gap-2 cursor-pointer group">
               <Checkbox
                 checked={bypassRules}

src/browser/components/pr-review.tsx

@@ -197,6 +197,7 @@ export function PRReviewContent({
   const [files, setFiles] = useState<PullRequestFile[]>([]);
   const [comments, setComments] = useState<ReviewComment[]>([]);
   const [viewerPermission, setViewerPermission] = useState<string | null>(null);
+  const [viewerCanMergeAsAdmin, setViewerCanMergeAsAdmin] = useState(false);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
 
@@ -219,13 +220,15 @@ export function PRReviewContent({
             github.getReviewThreads(owner, repo, number).catch(() => ({
               threads: [],
               viewerPermission: null,
+              viewerCanMergeAsAdmin: false,
             })),
           ]);
 
         setPr(prData);
         setFiles(filesData);
         setComments(commentsData as ReviewComment[]);
         setViewerPermission(reviewThreadsResult.viewerPermission);
+        setViewerCanMergeAsAdmin(reviewThreadsResult.viewerCanMergeAsAdmin);
 
         // Track PR viewed
         track("pr_viewed", {

src/browser/contexts/github.tsx

@@ -2267,13 +2267,18 @@ function createGitHubStore() {
     owner: string,
     repo: string,
     number: number
-  ): Promise<{ threads: ReviewThread[]; viewerPermission: string | null }> {
+  ): Promise<{
+    threads: ReviewThread[];
+    viewerPermission: string | null;
+    viewerCanMergeAsAdmin: boolean;
+  }> {
     if (!batcher) throw new Error("Not initialized");
 
     const data = await batcher.query<{
       repository: {
         viewerPermission: string | null;
         pullRequest: {
+          viewerCanMergeAsAdmin: boolean;
           reviewThreads: { nodes: ReviewThread[] };
         };
       };
@@ -2283,6 +2288,7 @@ function createGitHubStore() {
         repository(owner: $owner, name: $repo) {
           viewerPermission
           pullRequest(number: $number) {
+            viewerCanMergeAsAdmin
             reviewThreads(first: 100) {
               nodes {
                 id
@@ -2316,6 +2322,7 @@ function createGitHubStore() {
     return {
       threads: data.repository.pullRequest.reviewThreads.nodes,
       viewerPermission: data.repository.viewerPermission,
+      viewerCanMergeAsAdmin: data.repository.pullRequest.viewerCanMergeAsAdmin,
     };
   }