Skip to content

fix(review): close review-thread and claim-time gaps #1791

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
JSONbored merged 1 commit into from
Jun 29, 2026
Merged

fix(review): close review-thread and claim-time gaps #1791

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
42 changes: 32 additions & 10 deletions src/db/repositories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,12 @@ export async function upsertPullRequestFromGitHub(
.from(pullRequests)
.where(and(eq(pullRequests.repoFullName, repoFullName), eq(pullRequests.number, pr.number)))
.limit(1);
const linkedIssueClaimedAt =
record.linkedIssues.length === 0
? null
: existingClaimRows[0]?.linkedIssuesJson === linkedIssuesJson
? (existingClaimRows[0].linkedIssueClaimedAt ?? observedLinkedIssueClaimedAt)
: observedLinkedIssueClaimedAt;
const linkedIssueClaimedAt = resolveLinkedIssueClaimedAt(
record.linkedIssues,
linkedIssuesJson,
existingClaimRows[0],
observedLinkedIssueClaimedAt,
);
await db
.insert(pullRequests)
.values({
Expand Down Expand Up @@ -355,10 +355,7 @@ export async function upsertPullRequestFromGitHub(
htmlUrl: pr.html_url,
labelsJson: jsonString(record.labels),
linkedIssuesJson,
linkedIssueClaimedAt:
record.linkedIssues.length === 0
? null
: sql`CASE WHEN ${pullRequests.linkedIssuesJson} = ${linkedIssuesJson} THEN COALESCE(${pullRequests.linkedIssueClaimedAt}, ${observedLinkedIssueClaimedAt}) ELSE ${observedLinkedIssueClaimedAt} END`,
linkedIssueClaimedAt,
lastSeenOpenAt,
payloadJson: jsonString(compactGitHubPayload(pr)),
updatedAt: syncedAt,
Expand All @@ -367,6 +364,31 @@ export async function upsertPullRequestFromGitHub(
return { ...record, linkedIssueClaimedAt };
}

function resolveLinkedIssueClaimedAt(
linkedIssues: number[],
linkedIssuesJson: string,
existing:
| {
linkedIssuesJson: string;
linkedIssueClaimedAt: string | null;
}
| undefined,
observedLinkedIssueClaimedAt: string | null,
): string | null {
if (linkedIssues.length === 0) return null;
if (!existing) return observedLinkedIssueClaimedAt;
if (existing.linkedIssuesJson === linkedIssuesJson) return existing.linkedIssueClaimedAt ?? observedLinkedIssueClaimedAt;
if (existing.linkedIssueClaimedAt && linkedIssuesOverlap(parseJson<number[]>(existing.linkedIssuesJson, []), linkedIssues)) {
return existing.linkedIssueClaimedAt;
}
return observedLinkedIssueClaimedAt;
}

function linkedIssuesOverlap(left: number[], right: number[]): boolean {
const rightIssues = new Set(right);
return left.some((issue) => rightIssues.has(issue));
}

export async function upsertIssueFromGitHub(env: Env, repoFullName: string, issue: GitHubIssuePayload, options: { seenOpenAt?: string } = {}): Promise<IssueRecord> {
const record = toIssueRecord(repoFullName, issue);
const db = getDb(env.DB);
Expand Down
93 changes: 60 additions & 33 deletions src/github/backfill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2223,25 +2223,33 @@ export async function fetchLivePullRequestReviewDecision(env: Env, repoFullName:
return result?.data?.repository?.pullRequest?.reviewDecision ?? undefined;
}

type GitHubReviewThreadNode = {
isResolved?: boolean | null;
isOutdated?: boolean | null;
path?: string | null;
line?: number | null;
comments?: {
nodes?: Array<{
body?: string | null;
url?: string | null;
author?: { login?: string | null } | null;
} | null> | null;
} | null;
};

type GitHubReviewThreadConnection = {
nodes?: Array<GitHubReviewThreadNode | null> | null;
pageInfo?: {
hasNextPage?: boolean | null;
endCursor?: string | null;
} | null;
};

type GitHubReviewThreadResponse = {
data?: {
repository?: {
pullRequest?: {
reviewThreads?: {
nodes?: Array<{
isResolved?: boolean | null;
isOutdated?: boolean | null;
path?: string | null;
line?: number | null;
comments?: {
nodes?: Array<{
body?: string | null;
url?: string | null;
author?: { login?: string | null } | null;
} | null> | null;
} | null;
} | null> | null;
} | null;
reviewThreads?: GitHubReviewThreadConnection | null;
} | null;
} | null;
};
Expand All @@ -2254,30 +2262,49 @@ export async function fetchLiveReviewThreadBlockers(env: Env, repoFullName: stri
if (!token) return [];
const [owner, name] = repoFullName.split("/");
if (!owner || !name) return [];
const query = `query GittensoryPullRequestReviewThreads {
repository(owner: ${JSON.stringify(owner)}, name: ${JSON.stringify(name)}) {
pullRequest(number: ${prNumber}) {
reviewThreads(first: 50) {
nodes {
isResolved
isOutdated
path
line
comments(first: 20) {
nodes {
body
url
author { login }
const threads: Array<GitHubReviewThreadNode | null> = [];
let cursor: string | null = null;
const seenCursors = new Set<string>();
for (;;) {
const after: string = cursor ? `, after: ${JSON.stringify(cursor)}` : "";
const query: string = `query GittensoryPullRequestReviewThreads {
repository(owner: ${JSON.stringify(owner)}, name: ${JSON.stringify(name)}) {
pullRequest(number: ${prNumber}) {
reviewThreads(first: 50${after}) {
nodes {
isResolved
isOutdated
path
line
comments(first: 20) {
nodes {
body
url
author { login }
}
}
}
pageInfo {
hasNextPage
endCursor
}
}
}
}
}`;
const result: GitHubReviewThreadResponse | undefined = await githubGraphQl<GitHubReviewThreadResponse>(env, query, token).catch(() => undefined);
const connection: GitHubReviewThreadConnection | null | undefined = result?.data?.repository?.pullRequest?.reviewThreads;
if (!connection?.nodes) {
if (threads.length === 0) return [];
break;
}
}`;
const result = await githubGraphQl<GitHubReviewThreadResponse>(env, query, token).catch(() => undefined);
const threads = result?.data?.repository?.pullRequest?.reviewThreads?.nodes;
if (!threads) return [];
threads.push(...connection.nodes);
if (connection.pageInfo?.hasNextPage !== true) break;
const nextCursor: string | null | undefined = connection.pageInfo.endCursor;
if (!nextCursor || seenCursors.has(nextCursor)) break;
seenCursors.add(nextCursor);
cursor = nextCursor;
}
const blockers: ReviewThreadBlocker[] = [];
for (const thread of threads) {
if (!thread || thread.isResolved !== false || thread.isOutdated === true) continue;
Expand Down
193 changes: 193 additions & 0 deletions test/unit/backfill.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3338,6 +3338,199 @@ describe("GitHub backfill", () => {
]);
});

it("paginates review threads so blockers beyond the first page cannot hide", async () => {
const env = createTestEnv({ GITHUB_PUBLIC_TOKEN: "public-token" });
const queries: string[] = [];
const fetchSpy = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
if (input.toString() !== "https://api.github.com/graphql") return new Response("not found", { status: 404 });
const query = JSON.parse(String(init?.body)).query as string;
queries.push(query);
if (!query.includes("after:")) {
return Response.json({
data: {
repository: {
pullRequest: {
reviewThreads: {
nodes: [{ isResolved: true, isOutdated: false, path: "resolved.ts", line: 1, comments: { nodes: [{ body: "already resolved", author: { login: "scanner[bot]" } }] } }],
pageInfo: { hasNextPage: true, endCursor: "cursor-1" },
},
},
},
},
});
}
return Response.json({
data: {
repository: {
pullRequest: {
reviewThreads: {
nodes: [
{
isResolved: false,
isOutdated: false,
path: "src/hidden.ts",
line: 77,
comments: {
nodes: [
{
body: "**P0:** Hidden second-page review thread must block",
url: "https://github.example/thread/second-page",
author: { login: "superagent-security[bot]" },
},
],
},
},
],
pageInfo: { hasNextPage: false, endCursor: "cursor-2" },
},
},
},
},
});
});
vi.stubGlobal("fetch", fetchSpy);

const blockers = await fetchLiveReviewThreadBlockers(env, "JSONbored/gittensory", 1781, "public-token");

expect(fetchSpy).toHaveBeenCalledTimes(2);
expect(queries[0]).toContain("reviewThreads(first: 50)");
expect(queries[1]).toContain('reviewThreads(first: 50, after: "cursor-1")');
expect(blockers).toEqual([
expect.objectContaining({
title: "Hidden second-page review thread must block",
priority: "P0",
path: "src/hidden.ts",
line: 77,
url: "https://github.example/thread/second-page",
}),
]);
});

it("stops review-thread pagination on a repeated cursor without dropping fetched blockers", async () => {
const env = createTestEnv({ GITHUB_PUBLIC_TOKEN: "public-token" });
let calls = 0;
vi.stubGlobal("fetch", async (input: RequestInfo | URL) => {
if (input.toString() !== "https://api.github.com/graphql") return new Response("not found", { status: 404 });
calls += 1;
return Response.json({
data: {
repository: {
pullRequest: {
reviewThreads: {
nodes:
calls === 1
? []
: [
{
isResolved: false,
isOutdated: false,
path: "src/repeated-cursor.ts",
line: 9,
comments: { nodes: [{ body: "**P1:** Repeated cursor blocker", author: { login: "scanner[bot]" } }] },
},
],
pageInfo: { hasNextPage: true, endCursor: "cursor-1" },
},
},
},
},
});
});

const blockers = await fetchLiveReviewThreadBlockers(env, "JSONbored/gittensory", 1781, "public-token");

expect(calls).toBe(2);
expect(blockers).toEqual([
expect.objectContaining({
title: "Repeated cursor blocker",
path: "src/repeated-cursor.ts",
line: 9,
}),
]);
});

it("keeps fetched review-thread blockers when a later page is malformed", async () => {
const env = createTestEnv({ GITHUB_PUBLIC_TOKEN: "public-token" });
let calls = 0;
vi.stubGlobal("fetch", async (input: RequestInfo | URL) => {
if (input.toString() !== "https://api.github.com/graphql") return new Response("not found", { status: 404 });
calls += 1;
if (calls === 2) {
return Response.json({ data: { repository: { pullRequest: { reviewThreads: null } } } });
}
return Response.json({
data: {
repository: {
pullRequest: {
reviewThreads: {
nodes: [
{
isResolved: false,
isOutdated: false,
path: "src/fetched-before-malformed-page.ts",
line: 14,
comments: { nodes: [{ body: "**P1:** Fetched blocker before malformed page", author: { login: "scanner[bot]" } }] },
},
],
pageInfo: { hasNextPage: true, endCursor: "cursor-1" },
},
},
},
},
});
});

const blockers = await fetchLiveReviewThreadBlockers(env, "JSONbored/gittensory", 1781, "public-token");

expect(calls).toBe(2);
expect(blockers).toEqual([
expect.objectContaining({
title: "Fetched blocker before malformed page",
path: "src/fetched-before-malformed-page.ts",
line: 14,
}),
]);
});

it("stops review-thread pagination when GitHub omits the next cursor", async () => {
const env = createTestEnv({ GITHUB_PUBLIC_TOKEN: "public-token" });
const fetchSpy = vi.fn(async (input: RequestInfo | URL) => {
if (input.toString() !== "https://api.github.com/graphql") return new Response("not found", { status: 404 });
return Response.json({
data: {
repository: {
pullRequest: {
reviewThreads: {
nodes: [
{
isResolved: false,
isOutdated: false,
path: "src/missing-cursor.ts",
line: 12,
comments: { nodes: [{ body: "**P2:** Missing cursor blocker", author: { login: "scanner[bot]" } }] },
},
],
pageInfo: { hasNextPage: true, endCursor: null },
},
},
},
},
});
});
vi.stubGlobal("fetch", fetchSpy);

const blockers = await fetchLiveReviewThreadBlockers(env, "JSONbored/gittensory", 1781, "public-token");

expect(fetchSpy).toHaveBeenCalledTimes(1);
expect(blockers).toEqual([
expect.objectContaining({
title: "Missing cursor blocker",
path: "src/missing-cursor.ts",
line: 12,
}),
]);
});

it("ignores resolved, outdated, own-bot, and empty review threads", async () => {
const env = createTestEnv({ GITHUB_PUBLIC_TOKEN: "public-token" });
vi.stubGlobal("fetch", async (input: RequestInfo | URL) => {
Expand Down
Loading
Loading