mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
* [a1bde3b9] Add CI-status guard to pr_pass + update pr_reviewer prompt (#417) (#420) * [a1bde3b9] feat(gateway): CI-status guard on pr_pass + reviewer prompt update * [a1bde3b9] docs(pr-gate-review, worksession-git): document CI-status guard on pr_pass Updated two architecture documentation files to reflect the new CI-status guard: **pr-gate-review.md:** - Documented _ci_status_guard method: blocks pr_pass on failing/pending/unscheduled/error CI with reviewer-aware pr_fail remediation - Documented _resolve_ci_status: best-effort GitHub check-runs lookup with fail-open behavior - Updated _pr_pass_blocked description: now returns (rejection_envelope, ci_note) tuple - Updated _record_gate_verdict_for/verdict to note ci_status field stamping on pr_pass - Added ci_note parameter documentation for evidence tracking when no CI is configured - Updated Logical Tree to show new methods - Added Config Flags note: CI guard is always armed, fails open on config gaps - Added two regression risks: check-runs-only limitation, fail-open design **worksession-git.md:** - Documented GitService.get_pr_ci_status(project_slug, pr_number): CI status lookup with state classification - Documented supporting methods: _ci_status_prereqs, _fetch_check_runs, _classify_check_runs, _classify_zero_check_runs - Each method notes its fail-open behavior and configuration gap handling --------- Co-authored-by: Backend Developer 1 <be-dev-1@roboco.tech> Co-authored-by: Backend Documenter <be-doc@roboco.tech> * [e8f275d7] test(gateway): lock the 7-AC-to-test map + assert pr_reviewer prompt content (#425) (#426) Co-authored-by: Backend Developer 1 <be-dev-1@roboco.tech> * [24b4237e] Fix reflow-check, CI-status classification, and noqa suppression (#440) (#443) * [24b4237e] fix(gateway): classify unreachable/nonexistent CI-status repo as no_ci_configured, remove test noqa, reflow pr_reviewer.md Split GitService.get_pr_ci_status's PR-head-sha lookup into a dedicated helper so a config gap (missing project/git_url/token) or an unreachable/ nonexistent repo/PR (network error or 404) classifies as no_ci_configured (pr_pass passes through and stamps the evidence note) while a genuine GitHub API failure on a real, reachable repo (any other non-2xx, or an unparseable body) stays the fail-closed error state. Replaced the `# noqa: PLR2004` in test_git_pr_ci_status.py with a named HTTP-status range constant, updated the config-gap tests to assert the new classification, and added tests for the unreachable-repo and real-repo- API-error branches. Reflowed agents/prompts/roles/pr_reviewer.md's one hard-wrapped continuation line so it passes make reflow-check. * [24b4237e] docs(gateway): update pr-gate-review.md for CI-status classification refactor Updated the internal architectural map to reflect the new CI-status classification scheme introduced in PR #440. Configuration gaps (missing project/git_url/token) and unreachable/nonexistent repos (404 or network error) now explicitly classify as no_ci_configured and pass through with evidence stamps. Genuine GitHub API failures on reachable repos classify as error and stay fail-closed (retryable). - Clarified _ci_status_guard behavior: config gaps/unreachable repos pass through with distinct classification; only real API failures stay fail-closed - Updated Config Flags section to describe the new three-way classification - Updated Regression Risks section to document the new explicit classification scheme - Noted that _resolve_ci_status now wraps git.get_pr_ci_status and interprets its result dict --------- Co-authored-by: Backend Developer 1 <be-dev-1@roboco.tech> Co-authored-by: Backend Documenter <be-doc@roboco.tech> * [1f6a06a2] round-3 fixes: pr_gate back to xenon rank A; 404 means no CI, not error Eight extracted helpers bring the module average from B(5.05) to A(4.04) with every external contract untouched (170 gate tests byte-identical). The CI-status guard now classifies a 404 on the check-runs or workflows endpoints as no_ci_configured (pass-through with evidence note) — a repo without Actions is not a transport failure — reserving the fail-closed error state for network/5xx/auth failures, with pinning tests for all four shapes. The e2e fake-GitHub router gains check-runs and workflows routes so the scripted lifecycle exercises the guard's green-CI success branch end to end. * [1f6a06a2] merge master; align gate-diff-base tests with the tuple contract The merged tree is the first integration of the CI-status guard with the preferred-parent diff-base guard: _pr_pass_blocked now returns (rejection, ci_note), so the diff-base tests unpack it instead of asserting on a bare result. Both guards verified live in the merged pr_gate (preferred_parent threading and _ci_status_guard present). --------- Co-authored-by: Backend Developer 1 <be-dev-1@roboco.tech> Co-authored-by: Backend Documenter <be-doc@roboco.tech> Co-authored-by: Renn F <rennf93@users.noreply.github.com>
301 lines
12 KiB
Python
301 lines
12 KiB
Python
"""pr_pass refuses to pass an assembled PR unless CI on its head commit is green.
|
|
|
|
Before this guard, ``pr_pass`` had no CI-status check at all — a reviewer could
|
|
pass an assembled PR whose CI was red, still running, or not yet scheduled.
|
|
``_ci_status_guard`` (wired into ``_pr_pass_blocked`` alongside the existing
|
|
toolchain/conventions guards) reads ``GitService.get_pr_ci_status`` and blocks
|
|
on failure/pending/pending_not_scheduled/error with reviewer-aware remediation
|
|
(``pr_fail``, never ``i_am_blocked`` — a reviewer has no such verb). A project
|
|
with no CI configured at all passes through cleanly, stamping the verdict note
|
|
with why the guard did not block. ``pr_fail`` is unaffected by CI state
|
|
entirely, and the separate inbound ``PRReviewerMixin`` surface
|
|
(``claim_pr_review`` / ``post_pr_review``) never consults CI status at all.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import inspect
|
|
from pathlib import Path
|
|
from typing import Any
|
|
from unittest.mock import AsyncMock, MagicMock
|
|
from uuid import uuid4
|
|
|
|
import pytest
|
|
from roboco.foundation.policy import lifecycle as spec_module
|
|
from roboco.services.gateway.choreographer import (
|
|
Choreographer,
|
|
ChoreographerDeps,
|
|
pr_review,
|
|
)
|
|
|
|
|
|
def _make_choreographer() -> Choreographer:
|
|
base: dict[str, Any] = {
|
|
"task": AsyncMock(),
|
|
"work_session": AsyncMock(),
|
|
"git": AsyncMock(),
|
|
"a2a": AsyncMock(),
|
|
"journal": AsyncMock(),
|
|
"audit": AsyncMock(),
|
|
"evidence_repo": AsyncMock(),
|
|
}
|
|
return Choreographer(ChoreographerDeps(**base))
|
|
|
|
|
|
def _stub_gate_path(
|
|
c: Choreographer, *, reviewer_id: Any, t_before: Any, t_after: Any
|
|
) -> MagicMock:
|
|
"""Drive ``_gate_decision`` past preflight/tracing and into the real
|
|
``_pr_pass_blocked`` -> ``_ci_status_guard`` path — only the ownership/
|
|
tracing plumbing is stubbed (it has its own tests); the CI guard under
|
|
test runs for real. Mirrors ``test_pr_gate_notifies_pm._stub_gate_path``.
|
|
"""
|
|
agent = MagicMock(role="pr_reviewer", slug="be-pr-reviewer")
|
|
cc: Any = c
|
|
cc._gate_preflight = AsyncMock(
|
|
return_value=(
|
|
t_before,
|
|
agent,
|
|
"pr_reviewer",
|
|
{},
|
|
spec_module.Context(actor_id=reviewer_id),
|
|
)
|
|
)
|
|
cc._gate_tracing = AsyncMock(return_value=None)
|
|
cc._project_slug_for = AsyncMock(return_value="proj-slug")
|
|
record_spy = MagicMock()
|
|
cc._record_gate_verdict = record_spy
|
|
cc._post_gate_review_to_pr = AsyncMock()
|
|
runner = MagicMock()
|
|
runner.run_intent = AsyncMock(return_value=t_after)
|
|
cc._verb_runner = MagicMock(return_value=runner)
|
|
return record_spy
|
|
|
|
|
|
def _t(*, status: str = "awaiting_pr_review", pr_number: int | None = 42) -> MagicMock:
|
|
return MagicMock(
|
|
id=uuid4(),
|
|
assigned_to=None,
|
|
pr_number=pr_number,
|
|
parent_task_id=uuid4(),
|
|
status=status,
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# The six CI-guard branches, exercised through pr_pass
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_blocked_on_failing_ci() -> None:
|
|
reviewer_id = uuid4()
|
|
t_before = _t()
|
|
c = _make_choreographer()
|
|
_stub_gate_path(c, reviewer_id=reviewer_id, t_before=t_before, t_after=None)
|
|
c.git.get_pr_ci_status = AsyncMock(
|
|
return_value={"state": "failure", "failing_checks": ["tests"]}
|
|
)
|
|
|
|
env = await c.pr_pass(reviewer_id, t_before.id, "Looks clean to me.")
|
|
|
|
assert env.error == "invalid_state"
|
|
assert "CI is failing" in (env.message or "")
|
|
assert "tests" in (env.message or "")
|
|
assert "pr_fail" in (env.remediate or "")
|
|
c.task.get.assert_not_called() # never reached the runner
|
|
cc: Any = c
|
|
cc._record_gate_verdict.assert_not_called()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_blocked_on_pending_ci() -> None:
|
|
reviewer_id = uuid4()
|
|
t_before = _t()
|
|
c = _make_choreographer()
|
|
_stub_gate_path(c, reviewer_id=reviewer_id, t_before=t_before, t_after=None)
|
|
c.git.get_pr_ci_status = AsyncMock(return_value={"state": "pending"})
|
|
|
|
env = await c.pr_pass(reviewer_id, t_before.id, "Looks clean to me.")
|
|
|
|
assert env.error == "invalid_state"
|
|
assert "still running" in (env.message or "")
|
|
assert "wait" in (env.remediate or "").lower()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_blocked_on_zero_checks_workflows_pending() -> None:
|
|
reviewer_id = uuid4()
|
|
t_before = _t()
|
|
c = _make_choreographer()
|
|
_stub_gate_path(c, reviewer_id=reviewer_id, t_before=t_before, t_after=None)
|
|
c.git.get_pr_ci_status = AsyncMock(return_value={"state": "pending_not_scheduled"})
|
|
|
|
env = await c.pr_pass(reviewer_id, t_before.id, "Looks clean to me.")
|
|
|
|
assert env.error == "invalid_state"
|
|
assert "has not started" in (env.message or "")
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_blocked_on_github_api_error() -> None:
|
|
reviewer_id = uuid4()
|
|
t_before = _t()
|
|
c = _make_choreographer()
|
|
_stub_gate_path(c, reviewer_id=reviewer_id, t_before=t_before, t_after=None)
|
|
c.git.get_pr_ci_status = AsyncMock(return_value={"state": "error"})
|
|
|
|
env = await c.pr_pass(reviewer_id, t_before.id, "Looks clean to me.")
|
|
|
|
assert env.error == "invalid_state"
|
|
assert "GitHub API error" in (env.message or "")
|
|
assert "retry" in (env.remediate or "").lower()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_succeeds_on_all_green() -> None:
|
|
reviewer_id = uuid4()
|
|
t_before = _t()
|
|
t_after = _t(status="awaiting_pm_review")
|
|
c = _make_choreographer()
|
|
record_spy = _stub_gate_path(
|
|
c, reviewer_id=reviewer_id, t_before=t_before, t_after=t_after
|
|
)
|
|
c.git.get_pr_ci_status = AsyncMock(return_value={"state": "success"})
|
|
|
|
env = await c.pr_pass(reviewer_id, t_before.id, "Looks clean to me.")
|
|
|
|
assert env.error is None, env.as_dict()
|
|
assert env.status == "awaiting_pm_review"
|
|
record_spy.assert_called_once()
|
|
# No CI note stamped when the guard passed because CI was actually green.
|
|
assert record_spy.call_args.kwargs.get("ci_note") is None
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_passes_through_when_no_ci_configured_and_stamps_evidence() -> (
|
|
None
|
|
):
|
|
reviewer_id = uuid4()
|
|
t_before = _t()
|
|
t_after = _t(status="awaiting_pm_review")
|
|
c = _make_choreographer()
|
|
record_spy = _stub_gate_path(
|
|
c, reviewer_id=reviewer_id, t_before=t_before, t_after=t_after
|
|
)
|
|
c.git.get_pr_ci_status = AsyncMock(return_value={"state": "no_ci_configured"})
|
|
|
|
env = await c.pr_pass(reviewer_id, t_before.id, "Looks clean to me.")
|
|
|
|
assert env.error is None, env.as_dict()
|
|
assert env.status == "awaiting_pm_review"
|
|
record_spy.assert_called_once()
|
|
assert (
|
|
record_spy.call_args.kwargs.get("ci_note") == "no CI configured on this project"
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_pass_fails_open_when_ci_status_unresolvable() -> None:
|
|
"""A configuration gap (no resolvable project/token/head sha) -> None from
|
|
get_pr_ci_status -> the guard never blocks (fail open, matches the other
|
|
pr_pass guards' posture on an unresolvable signal)."""
|
|
reviewer_id = uuid4()
|
|
t_before = _t()
|
|
t_after = _t(status="awaiting_pm_review")
|
|
c = _make_choreographer()
|
|
_stub_gate_path(c, reviewer_id=reviewer_id, t_before=t_before, t_after=t_after)
|
|
c.git.get_pr_ci_status = AsyncMock(return_value=None)
|
|
|
|
env = await c.pr_pass(reviewer_id, t_before.id, "Looks clean to me.")
|
|
|
|
assert env.error is None, env.as_dict()
|
|
assert env.status == "awaiting_pm_review"
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Regression: pr_fail is unaffected by CI state entirely
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_pr_fail_succeeds_regardless_of_ci_state() -> None:
|
|
"""pr_fail must never consult get_pr_ci_status — the CI guard lives only in
|
|
the pr_pass branch of _gate_decision."""
|
|
reviewer_id = uuid4()
|
|
t_before = _t()
|
|
t_after = _t(status="needs_revision")
|
|
c = _make_choreographer()
|
|
_stub_gate_path(c, reviewer_id=reviewer_id, t_before=t_before, t_after=t_after)
|
|
# Even if configured to report red CI, pr_fail must not care — and must not
|
|
# even call it.
|
|
c.git.get_pr_ci_status = AsyncMock(return_value={"state": "failure"})
|
|
|
|
env = await c.pr_fail(reviewer_id, t_before.id, ["a concrete actionable issue"])
|
|
|
|
assert env.error is None, env.as_dict()
|
|
assert env.status == "needs_revision"
|
|
c.git.get_pr_ci_status.assert_not_awaited()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Regression: the inbound PRReviewerMixin surface never consults CI status
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_pr_review_mixin_has_no_ci_status_coupling() -> None:
|
|
"""claim_pr_review / post_pr_review (the external inbound review surface,
|
|
``PRReviewerMixin`` in pr_review.py) must stay completely untouched by the
|
|
new CI-status guard — it is wired only into ``PRGateMixin.pr_pass``
|
|
(the in-path assembled-PR gate) via ``_pr_pass_blocked``. A source-level
|
|
check is the most robust regression here: any accidental import or call of
|
|
``get_pr_ci_status`` / ``_ci_status_guard`` into the inbound mixin fails
|
|
this immediately, regardless of how its heavier claim/decision plumbing
|
|
(self_review_block, tracing, content gates) evolves."""
|
|
source = inspect.getsource(pr_review)
|
|
assert "get_pr_ci_status" not in source
|
|
assert "_ci_status_guard" not in source
|
|
assert not hasattr(pr_review.PRReviewerMixin, "_ci_status_guard")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Regression-lock: this task's 7 ACs mapped to the test(s) that cover each
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_ac_coverage_map_and_pr_reviewer_prompt_states_ci_guard() -> None:
|
|
"""Explicit AC-to-test mapping for this task's 7 acceptance criteria.
|
|
|
|
AC1 (CI failure names the failing check) ->
|
|
test_pr_pass_blocked_on_failing_ci (this file, line ~90)
|
|
AC2 (pending vs error are distinct invalid_state envelopes with a
|
|
different remediate text) -> test_pr_pass_blocked_on_pending_ci
|
|
(~111), test_pr_pass_blocked_on_github_api_error (~140)
|
|
AC3 (pending_not_scheduled is the retryable not-yet-scheduled case) ->
|
|
test_pr_pass_blocked_on_zero_checks_workflows_pending (~126)
|
|
AC4 (no_ci_configured passes through + stamps the ci_status verdict
|
|
note) -> test_pr_pass_passes_through_when_no_ci_configured_and_
|
|
stamps_evidence (~175)
|
|
AC5 (all-green CI passes through with no note) ->
|
|
test_pr_pass_succeeds_on_all_green (~155)
|
|
AC6 (pr_fail and the inbound PRReviewerMixin have zero CI-status
|
|
coupling) -> test_pr_fail_succeeds_regardless_of_ci_state (~221),
|
|
test_pr_review_mixin_has_no_ci_status_coupling (~245)
|
|
AC7 (the pr_reviewer prompt states the per-AC evidence-walk + CI-status
|
|
guard section) -> asserted directly below. Previously verified only
|
|
by manual reading during self-verification, with no test-level
|
|
regression lock — this closes that gap.
|
|
"""
|
|
prompt_path = (
|
|
Path(__file__).resolve().parents[3]
|
|
/ "agents"
|
|
/ "prompts"
|
|
/ "roles"
|
|
/ "pr_reviewer.md"
|
|
)
|
|
text = prompt_path.read_text(encoding="utf-8")
|
|
assert "per-AC evidence-walk" in text
|
|
assert "named-deliverable/silent-drop rule" in text
|
|
assert "CI status:" in text
|
|
assert 'ci_status: "no CI configured on this project"' in text
|