Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 17 additions & 4 deletions .github/scripts/pull-request-dashboard/RATIONALE.md
Original file line number Diff line number Diff line change
Expand Up @@ -381,10 +381,23 @@ the implementation understandable and operationally cheap.
gate would arrive older still. Either way the age blames reviewers for a wait
they could not have answered, and sorts the PR above ones they really have
been sitting on.
- Only the handoff from the author restarts the wait. A held PR that was already
with reviewers and is released to maintainers keeps its wait, because it never
left the people who owe it a response, and restarting there would present an
approval a week old as a merge request that just arrived.
- Without an explicit command, only the handoff from the author restarts the
wait. A held PR already with reviewers and released to maintainers keeps its
wait, because it never left the people who owe it a response, and restarting
there would present an approval a week old as a merge request that just arrived.
- An explicit `/dashboard route:reviewers` command starts the reviewer wait at
the command's effective timestamp, including when an approver issues it or the
PR is already with reviewers. The handoff overrides older activity and pending
threads, so reviewers are not charged for time before the explicit handoff.
That timestamp remains a lower bound while the handoff is active, including
across refreshes and pushes, without replacing a later review re-request.
- Handoffs and pending human re-requests are ordered by their GitHub event
timestamps, not by when a refresh discovers them or which clock rule runs
first. Pending review requests have no timestamp themselves, so the timestamp
comes from the paginated review-request timeline. An active handoff uses the
later of its command and the pending re-requests, including without cached
routing state. An undated request cannot supersede a dated handoff. Completing
a re-request preserves its cached wait as the PR progresses to maintainers.
- PRs from unattended automation never route to their author because the
automation cannot respond to a dashboard action. Copilot-delegated PRs are
different. The dashboard recovers a human assignee or the first commit's
Expand Down
4 changes: 4 additions & 0 deletions .github/scripts/pull-request-dashboard/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,10 @@
handoff reaches reviewers,
restarted when a re-review
returns the PR to approvers,
or dated by the later of an
explicit reviewer handoff
and pending human re-requests
using their event timestamps,
and otherwise never moves
forward on a reviewer route.
waiting_age_basis str Which heuristic chose
Expand Down
60 changes: 59 additions & 1 deletion .github/scripts/pull-request-dashboard/github_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -1012,6 +1012,53 @@ def fetch_review_threads(owner: str, repo_name: str, number: int) -> list[dict[s
"""


REVIEW_REQUEST_EVENTS_QUERY = """
query($owner: String!, $name: String!, $number: Int!, $after: String) {
repository(owner: $owner, name: $name) {
pullRequest(number: $number) {
timelineItems(first: 100, after: $after, itemTypes: [REVIEW_REQUESTED_EVENT]) {
pageInfo {
hasNextPage
endCursor
}
nodes {
... on ReviewRequestedEvent {
createdAt
requestedReviewer {
... on User {
login
}
}
}
}
}
}
}
}
"""


def _review_request_times(owner: str, repo_name: str, number: int) -> dict[str, str]:
requested_at: dict[str, str] = {}
after: str | None = None
while True:
data = gh_graphql(
REVIEW_REQUEST_EVENTS_QUERY,
{"owner": owner, "name": repo_name, "number": number, "after": after},
)
page = (((data.get("data") or {}).get("repository") or {}).get("pullRequest") or {}).get("timelineItems") or {}
for event in page.get("nodes") or []:
login = (event.get("requestedReviewer") or {}).get("login")
timestamp = event.get("createdAt")
if login and timestamp:
key = login.casefold()
requested_at[key] = max(timestamp, requested_at.get(key, ""))
page_info = page.get("pageInfo") or {}
if not page_info.get("hasNextPage"):
return requested_at
after = page_info.get("endCursor") or ""


def fetch_review_requests(owner: str, repo_name: str, number: int) -> list[dict[str, Any]]:
# `gh pr view --json reviewRequests` silently drops Bot reviewers, so a
# pending Copilot request looks absent. Ask GraphQL for the Bot node
Expand All @@ -1030,5 +1077,16 @@ def fetch_review_requests(owner: str, repo_name: str, number: int) -> list[dict[
reviewers.append(reviewer)
page_info = page.get("pageInfo") or {}
if not page_info.get("hasNextPage"):
return reviewers
break
after = page_info.get("endCursor") or ""
human_reviewers = [
reviewer for reviewer in reviewers
if reviewer.get("__typename") == "User" and reviewer.get("login")
]
if human_reviewers:
requested_at = _review_request_times(owner, repo_name, number)
for reviewer in human_reviewers:
timestamp = requested_at.get(reviewer["login"].casefold())
if timestamp:
reviewer["requested_at"] = timestamp
return reviewers
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,11 @@ async def evaluate_pull_request(
pending_human_reviewer_logins=(
prepared_reviewers.pending_human_reviewer_logins
),
pending_review_requested_at={
request.login: request.requested_at
for request in pr_source.review_requests
if request.login in prepared_reviewers.pending_human_reviewer_logins
},
)
)
route = routing_outcome.route
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ def effective_content_timestamp(self) -> str:
class ReviewRequest:
kind: str = ""
login: str = ""
requested_at: str = ""

@property
def is_copilot_reviewer(self) -> bool:
Expand Down Expand Up @@ -639,6 +640,7 @@ def normalize_review_requests(values: Any) -> tuple[ReviewRequest, ...]:
or ("Team" if reviewer.get("slug") else "")
),
login=_text(reviewer.get("login") or reviewer.get("slug")),
requested_at=_text(item.get("requested_at")),
))
return tuple(requests)

Expand Down
53 changes: 42 additions & 11 deletions .github/scripts/pull-request-dashboard/routing_decision.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from __future__ import annotations

from collections.abc import Mapping
from dataclasses import dataclass
from dataclasses import dataclass, field
from datetime import datetime, timedelta
from typing import Any

Expand Down Expand Up @@ -33,6 +33,7 @@ class RoutingInput:
require_clean_copilot_review: bool
manual_reviewer_handoff: bool
pending_human_reviewer_logins: frozenset[str]
pending_review_requested_at: Mapping[str, str] = field(default_factory=dict)
now: datetime | None = None


Expand Down Expand Up @@ -242,12 +243,51 @@ def _add_wait_age_facts(
previous_facts: DashboardFacts,
now: datetime,
pending_human_reviewer_logins: frozenset[str],
pending_review_requested_at: Mapping[str, str],
) -> DashboardFacts:
handoff_ts = (
parse_ts(facts.dashboard_override_since)
if route.value in _REVIEWER_ROUTES and reviewer_handoff_active(facts)
else None
)
previous_wait_ts = parse_ts(previous_facts.waiting_since)
request_times = [
timestamp
for login in pending_human_reviewer_logins
if (timestamp := parse_ts(pending_review_requested_at.get(login))) is not None
]
latest_request_ts = max(request_times, default=None)
if handoff_ts is not None:
wait_ts, basis = handoff_ts, "reviewer_handoff"
if latest_request_ts is not None and latest_request_ts > wait_ts:
wait_ts, basis = latest_request_ts, "review_rerequest"
if (
previous_route is not None
and previous_route.value in _REVIEWER_ROUTES
and previous_facts.waiting_age_basis == "review_rerequest"
and parse_ts(previous_facts.dashboard_override_since) == handoff_ts
and previous_wait_ts is not None
and previous_wait_ts > wait_ts
):
wait_ts, basis = previous_wait_ts, "review_rerequest"
return facts.with_changes(
waiting_since=format_ts(wait_ts),
waiting_age_basis=basis,
)
previous_pending_reviewers = {
reviewer.login
for reviewer in previous_facts.reviewers
if reviewer.pending_review
}
if (
route is DashboardRoute.APPROVER
and previous_route is DashboardRoute.MAINTAINER
and pending_human_reviewer_logins - previous_pending_reviewers
):
return facts.with_changes(
waiting_since=format_ts(latest_request_ts or now),
waiting_age_basis="review_rerequest",
Comment thread
trask marked this conversation as resolved.
Resolved
)
if facts.route_held_for_gates and previous_facts.waiting_since:
return facts.with_changes(
waiting_since=previous_facts.waiting_since,
Expand All @@ -262,15 +302,6 @@ def _add_wait_age_facts(
waiting_since=format_ts(now),
waiting_age_basis="gate_release",
)
if (
route is DashboardRoute.APPROVER
and previous_route is DashboardRoute.MAINTAINER
and pending_human_reviewer_logins - previous_pending_reviewers
):
return facts.with_changes(
waiting_since=format_ts(now),
waiting_age_basis="review_rerequest",
)
if (
route.value in _REVIEWER_ROUTES
and previous_route is not None
Expand Down Expand Up @@ -311,7 +342,6 @@ def _add_wait_age_facts(
if wait_ts is None:
wait_ts = parse_ts(facts.created_at)
basis = "created"
previous_wait_ts = parse_ts(previous_facts.waiting_since)
if (
route.value in _REVIEWER_ROUTES
and previous_route is not None
Expand Down Expand Up @@ -367,5 +397,6 @@ def resolve_routing(routing_input: RoutingInput) -> RoutingOutcome:
routing_input.previous_facts,
now,
routing_input.pending_human_reviewer_logins,
routing_input.pending_review_requested_at,
)
return RoutingOutcome(route=route, facts=facts)
2 changes: 1 addition & 1 deletion .github/scripts/pull-request-dashboard/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
# caches. Every constant ending in _STATE_VERSION or _REVISION is included.
# dashboard-state.json: accepted PR routing results and backfill readiness.
# Routing facts include current-head Copilot error counts for bounded retries.
DASHBOARD_STATE_VERSION = 19
DASHBOARD_STATE_VERSION = 20
DASHBOARD_STATE_COMPATIBLE_VERSIONS: tuple[int, ...] = ()
# backfill-state.json: round-robin cursor used by full dashboard refreshes.
BACKFILL_STATE_VERSION = 3
Expand Down
6 changes: 5 additions & 1 deletion .github/scripts/pull-request-dashboard/test_dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ async def test_evaluation_routes_pending_reviewers_and_projects_reviewer_rows(
submitted_at="2026-08-16T08:00:00Z",
body="",
),),
review_requests=(review_request(),),
review_requests=(review_request(requested_at="2026-08-16T09:00:00Z"),),
)

result = await evaluate_pr(
Expand All @@ -927,6 +927,10 @@ async def test_evaluation_routes_pending_reviewers_and_projects_reviewer_rows(
frozenset({"reviewer"}),
routing_input.pending_human_reviewer_logins,
)
self.assertEqual(
{"reviewer": "2026-08-16T09:00:00Z"},
routing_input.pending_review_requested_at,
)
self.assertEqual(
(ReviewerSummary(login="reviewer", pending_review=True),),
result.facts.reviewers,
Expand Down
65 changes: 62 additions & 3 deletions .github/scripts/pull-request-dashboard/test_github_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
from pull_request_source import fetch_pull_request_source


def _review_requests_page(nodes, has_next=False, cursor=""):
def _review_requests_page(nodes, has_next=False, cursor="", connection="reviewRequests"):
return {
"data": {
"repository": {
"pullRequest": {
"reviewRequests": {
connection: {
"pageInfo": {
"hasNextPage": has_next,
"endCursor": cursor,
Expand Down Expand Up @@ -240,7 +240,7 @@ def test_returns_bot_reviewers_that_gh_pr_view_omits(self) -> None:
reviewers,
)
# A Bot login is only returned when the query asks for it explicitly.
self.assertIn("... on Bot", gh_graphql.call_args.args[0])
self.assertIn("... on Bot", gh_graphql.call_args_list[0].args[0])

def test_skips_reviewers_the_caller_cannot_see(self) -> None:
page = _review_requests_page([
Expand All @@ -266,6 +266,7 @@ def test_follows_pagination(self) -> None:
_review_requests_page(
[{"requestedReviewer": {"__typename": "User", "login": "second"}}],
),
_review_requests_page([], connection="timelineItems"),
]

with patch("github_cli.gh_graphql", side_effect=pages) as gh_graphql:
Expand All @@ -277,6 +278,64 @@ def test_follows_pagination(self) -> None:
gh_graphql.call_args_list[1].args[1]["after"],
)

def test_attaches_latest_request_time_across_timeline_pages(self) -> None:
pages = [
_review_requests_page([
{"requestedReviewer": {"__typename": "User", "login": "reviewer"}},
{"requestedReviewer": {"__typename": "Team", "slug": "approvers"}},
]),
_review_requests_page(
[
{"createdAt": "2026-08-16T08:00:00Z",
"requestedReviewer": {"login": "reviewer"}},
{"createdAt": "2026-08-16T09:00:00Z",
"requestedReviewer": None},
],
has_next=True,
cursor="timeline-next",
connection="timelineItems",
),
_review_requests_page(
[
{"createdAt": "2026-08-16T11:00:00Z",
"requestedReviewer": {"login": "Reviewer"}},
{"createdAt": "2026-08-16T10:00:00Z",
"requestedReviewer": {"login": "reviewer"}},
],
connection="timelineItems",
),
]
with patch("github_cli.gh_graphql", side_effect=pages) as query:
reviewers = fetch_review_requests("owner", "repo", 7)

self.assertEqual([
{"__typename": "User", "login": "reviewer",
"requested_at": "2026-08-16T11:00:00Z"},
{"__typename": "Team", "slug": "approvers"},
], reviewers)
self.assertEqual("timeline-next", query.call_args_list[2].args[1]["after"])

def test_does_not_fetch_timeline_for_bot_and_team_requests(self) -> None:
page = _review_requests_page([
{"requestedReviewer": {"__typename": "Bot", "login": "Copilot"}},
{"requestedReviewer": {"__typename": "Team", "slug": "approvers"}},
])
with patch("github_cli.gh_graphql", return_value=page) as query:
fetch_review_requests("owner", "repo", 7)

query.assert_called_once()

def test_timeline_failure_is_not_treated_as_missing_timestamps(self) -> None:
page = _review_requests_page([
{"requestedReviewer": {"__typename": "User", "login": "reviewer"}},
])
with patch(
"github_cli.gh_graphql",
side_effect=[page, TransientGhError("timeline unavailable")],
):
with self.assertRaisesRegex(TransientGhError, "timeline unavailable"):
fetch_review_requests("owner", "repo", 7)


class GithubCliTest(unittest.TestCase):
def test_generic_action_required_keeps_unknown_ownership(self) -> None:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ def test_normalizes_mixed_gh_rest_and_graphql_shapes(self) -> None:
"requestedReviewer": {
"__typename": "Team",
"slug": "maintainers",
}
},
"requested_at": "2026-08-20T08:00:00Z",
}
],
"review_threads": [
Expand Down Expand Up @@ -194,6 +195,7 @@ def test_normalizes_mixed_gh_rest_and_graphql_shapes(self) -> None:
)
self.assertEqual(13, source.reviews[0].database_id)
self.assertEqual("maintainers", source.review_requests[0].login)
self.assertEqual("2026-08-20T08:00:00Z", source.review_requests[0].requested_at)
self.assertEqual(
"2026-08-20T08:30:00Z",
source.review_threads[0].comments[0].updated_at,
Expand Down
Loading
Loading