Skip to content

fix: fallback to app reviewer for rereview triggers #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keithah merged 1 commit into from
Feb 11, 2026
Merged

fix: fallback to app reviewer for rereview triggers #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/handlers/mention.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,7 @@ export function createMentionHandler(deps: {
repo: mention.repo,
prNumber: mention.prNumber,
configuredTeam,
fallbackReviewer: githubApp.getAppSlug(),
logger,
});

Expand Down
38 changes: 36 additions & 2 deletions src/handlers/rereview-team.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
Expand All @@ -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");
});
});
26 changes: 25 additions & 1 deletion src/handlers/rereview-team.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export async function requestRereviewTeamBestEffort(options: {
owner: string;
repo: string;
pull_number: number;
reviewers?: string[];
team_reviewers: string[];
}) => Promise<unknown>;
};
Expand All @@ -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 };

Expand Down Expand Up @@ -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: [],
});
Comment on lines +105 to +114
Copy link

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fallback reviewer request doesn’t check whether that reviewer is already in listRequestedReviewers (users). If the team request fails and the fallback reviewer is already requested, GitHub typically returns 422 and no new review_requested event is emitted, which can make repeated recheck attempts ineffective and adds noisy warn logs. Consider extending the initial listRequestedReviewers check to also detect an already-requested fallbackReviewer (normalize/trim like elsewhere) and return alreadyRequested: true (or skip the fallback call) in that case.

Copilot uses AI. Check for mistakes.
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 };
}
1 change: 1 addition & 0 deletions src/handlers/review.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ export function createReviewHandler(deps: {
repo: apiRepo,
prNumber: pr.number,
configuredTeam: config.review.uiRereviewTeam,
fallbackReviewer: githubApp.getAppSlug(),
logger,
});
}
Expand Down
Loading