Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
18 changes: 2 additions & 16 deletions scripts/ci/pr_review_merge_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def review_author_login(review: dict[str, Any]) -> str:

def is_opencode_review(review: dict[str, Any]) -> bool:
"""Return whether a review was authored by the OpenCode agent."""
return review_author_login(review) == "opencode-agent"
return review_author_login(review) in {"opencode-agent", "opencode-agent[bot]"}


def current_head_review_state(pr: dict[str, Any], state: str) -> bool:
Expand All @@ -221,20 +221,6 @@ def current_head_review_state(pr: dict[str, Any], state: str) -> bool:
return False


def latest_opencode_review(pr: dict[str, Any]) -> dict[str, Any] | None:
"""Return the newest OpenCode review from the PR review list."""
for review in reversed((pr.get("reviews") or {}).get("nodes") or []):
if is_opencode_review(review):
return review
return None


def latest_opencode_approved(pr: dict[str, Any]) -> bool:
"""Return whether the newest OpenCode review is an approval."""
review = latest_opencode_review(pr)
return bool(review and (review.get("state") or "").upper() == "APPROVED")


def has_current_head_approval(pr: dict[str, Any]) -> bool:
"""Return whether OpenCode approved the exact current head commit."""
return current_head_review_state(pr, "APPROVED")
Expand Down Expand Up @@ -418,7 +404,7 @@ def inspect_pr(
return Decision(
number,
"review_dispatch",
"current head has completed Strix evidence; same-head Strix and OpenCode dispatched",
"current head has completed Strix evidence; same-head OpenCode dispatched",
)

return Decision(number, "block", "current head has no OpenCode approval")
Expand Down
5 changes: 1 addition & 4 deletions tests/test_pr_review_merge_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,15 @@ def test_context_review_and_check_helpers():
assert sched.review_author_login({}) == ""
assert sched.review_author_login({"author": {"login": "OpenCode-Agent"}}) == "opencode-agent"
assert sched.is_opencode_review(opencode_review())
assert sched.is_opencode_review(opencode_review(login="opencode-agent[bot]"))
assert not sched.is_opencode_review(opencode_review(login="human"))


def test_review_state_and_failed_checks():
pr = make_pr(reviews={"nodes": [opencode_review("APPROVED", "old"), opencode_review("APPROVED", "head")]})
assert sched.current_head_review_state(pr, "APPROVED")
assert sched.latest_opencode_review(pr)["commit"]["oid"] == "head"
assert sched.latest_opencode_approved(pr)
assert sched.has_current_head_approval(pr)
assert not sched.has_current_head_changes_requested(pr)
assert sched.latest_opencode_review(make_pr()) is None
assert not sched.latest_opencode_approved(make_pr())
superseded = make_pr(
reviews={
"nodes": [
Expand Down
Loading