fix(rereview): fallback to app reviewer when team request fails (#27)

If team reviewer requests fail (including aireview/ai-review alias retries), request the app user as fallback so @kodiai recheck still retriggers review without thread noise.

Author: keithah

src/handlers/mention.ts

@@ -588,6 +588,7 @@ export function createMentionHandler(deps: {
             repo: mention.repo,
             prNumber: mention.prNumber,
             configuredTeam,
+            fallbackReviewer: githubApp.getAppSlug(),
             logger,
           });
 

src/handlers/rereview-team.test.ts

@@ -59,8 +59,8 @@ describe("rereview-team helpers", () => {
         rest: {
           pulls: {
             listRequestedReviewers: async () => ({ data: { users: [], teams: [] } }),
-            requestReviewers: async (params: { team_reviewers: string[] }) => {
-              const slug = params.team_reviewers[0] ?? "";
+            requestReviewers: async (params: { team_reviewers: string[]; reviewers?: string[] }) => {
+              const slug = params.team_reviewers[0] ?? params.reviewers?.[0] ?? "";
               attempted.push(slug);
               if (slug === "aireview") {
                 const err = new Error("Validation failed") as Error & { status: number };
@@ -83,4 +83,38 @@ describe("rereview-team helpers", () => {
     expect(result.requestedTeam).toBe("ai-review");
     expect(result.alreadyRequested).toBe(false);
   });
+
+  test("requestRereviewTeamBestEffort requests fallback reviewer when teams fail", async () => {
+    const attemptedTeams: string[] = [];
+    let fallbackReviewer: string | undefined;
+
+    await requestRereviewTeamBestEffort({
+      octokit: {
+        rest: {
+          pulls: {
+            listRequestedReviewers: async () => ({ data: { users: [], teams: [] } }),
+            requestReviewers: async (params: { team_reviewers: string[]; reviewers?: string[] }) => {
+              if (params.team_reviewers.length > 0) {
+                attemptedTeams.push(params.team_reviewers[0] ?? "");
+                const err = new Error("team failed") as Error & { status: number };
+                err.status = 422;
+                throw err;
+              }
+              fallbackReviewer = params.reviewers?.[0];
+              return { data: {} };
+            },
+          },
+        },
+      },
+      owner: "xbmc",
+      repo: "kodiai",
+      prNumber: 3,
+      configuredTeam: "aireview",
+      fallbackReviewer: "kodiai",
+      logger: createNoopLogger(),
+    });
+
+    expect(attemptedTeams).toEqual(["aireview", "ai-review"]);
+    expect(fallbackReviewer).toBe("kodiai");
+  });
 });

src/handlers/rereview-team.ts

@@ -36,6 +36,7 @@ export async function requestRereviewTeamBestEffort(options: {
           owner: string;
           repo: string;
           pull_number: number;
+          reviewers?: string[];
           team_reviewers: string[];
         }) => Promise<unknown>;
       };
@@ -45,9 +46,10 @@ export async function requestRereviewTeamBestEffort(options: {
   repo: string;
   prNumber: number;
   configuredTeam: string;
+  fallbackReviewer?: string;
   logger: Logger;
 }): Promise<{ requestedTeam?: string; alreadyRequested: boolean }> {
-  const { octokit, owner, repo, prNumber, configuredTeam, logger } = options;
+  const { octokit, owner, repo, prNumber, configuredTeam, fallbackReviewer, logger } = options;
   const candidates = buildRereviewTeamCandidates(configuredTeam);
   if (candidates.length === 0) return { alreadyRequested: false };
 
@@ -100,5 +102,27 @@ export async function requestRereviewTeamBestEffort(options: {
     }
   }
 
+  const reviewer = (fallbackReviewer ?? "").trim();
+  if (reviewer.length > 0) {
+    try {
+      await octokit.rest.pulls.requestReviewers({
+        owner,
+        repo,
+        pull_number: prNumber,
+        reviewers: [reviewer],
+        team_reviewers: [],
+      });
+      logger.info(
+        { owner, repo, prNumber, reviewer },
+        "Requested fallback reviewer after rereview team request failure",
+      );
+    } catch (err) {
+      logger.warn(
+        { err, owner, repo, prNumber, reviewer },
+        "Failed to request fallback reviewer after rereview team request failure",
+      );
+    }
+  }
+
   return { alreadyRequested: false };
 }

src/handlers/review.ts

@@ -296,6 +296,7 @@ export function createReviewHandler(deps: {
             repo: apiRepo,
             prNumber: pr.number,
             configuredTeam: config.review.uiRereviewTeam,
+            fallbackReviewer: githubApp.getAppSlug(),
             logger,
           });
         }