mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
* feat(gateway): delegation detail-fidelity — details survive hand-off, both directions
Details thinned out at every delegation hop: a PM child task mapped to no
parent criterion was legal (coverage only surfaced at submit_up, after the
whole wave ran — a 12-subtask docs tree grew through 8 review rounds that
way, one child titled 'docs page and route wrapper' shipping only the
page), and QA could pass work on a gestalt read (a 4-scene video brief
shipped 3 scenes past every gate because the features existed only in
prose). Three chokepoint gates:
- delegate (down): every child must declare covers_parent_criteria
resolving against the parent's real acceptance criteria — no mapping or
an unresolvable ref rejects naming every offending child and the valid
criteria; the success envelope carries parent_ac_coverage
{covered, uncovered} so a wave-planning PM sees remaining gaps in the
same turn. Full coverage stays enforced at submit_up (waves stay legal).
- pass_review (up): mandatory criteria_verified — one {criterion,
evidence} entry per task AC, matched by the findings ledger's
id-or-exact-text matcher, evidence soup-checked and capped; rejects
naming the unverified criteria; entries render deterministically into
qa_notes as '[AC] <criterion> — verified: <evidence>' lines. The old
count-only ac_verdicts gate is superseded (arg kept for back-compat).
- video briefs (structured detail at origination): an enumerable feature
list (release highlights, or input_props.highlights carried onto a
reject re-author) becomes its own scene acceptance criterion, bounded to
the AC caps; a re-author without highlights carries the
feedback-addressed criterion instead.
Extracted findings.py's criterion matcher into shared unmatched_criteria /
uncovered_acceptance_criteria instead of duplicating it; criteria_verified
joins the WAF free-text exclusion set like findings/issues.
* fix(gateway): break the block/unblock wedge — four hardening fixes from the live PM loop
A cell task looped fe-pm/main-pm block/unblock for hours (10 cycles, 43
spawns): a transient GitHub API error resolving CI became an unwaivable
blocker finding whose own fix text said no code change was required, the
submit freshness guard then demanded a commit no finding called for,
escalate_up auto-blocked, and main-pm's correct recovery plan 422'd on
the approach length cap, degrading it to a bare unblock. Four fixes:
- pr_pass CI-unresolvable refusal is now explicitly transient-worded:
retry pr_pass shortly, do NOT pr_fail over a CI-status lookup error —
a platform blip is not a code finding
- submit freshness guard grants ONE unchanged-head resubmission per
head sha when the findings ledger has zero open rows (all addressed
without code changes) — stamped via the resubmit_unchanged_head
marker so the same head can never loop a second time
- unblock carries a flip breaker: block_flip_count marker, and at the
third flip a one-shot CEO notification flags the task as structurally
wedged (unblock itself still succeeds — the breaker signals, it does
not wedge recovery)
- i_will_plan's approach cap truncates at 800 chars instead of
rejecting — an over-detailed plan must never cost the PM its turn
---------
Co-authored-by: Renn F <rennf93@users.noreply.github.com>
316 lines
12 KiB
Python
316 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; only ``failure`` remediates
|
|
via ``pr_fail`` (never ``i_am_blocked`` — a reviewer has no such verb) — the
|
|
``error`` state is a transient GitHub API lookup failure and remediates via
|
|
retry only, never ``pr_fail``. 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(),
|
|
}
|
|
# pr_fail inserts its findings into the ledger before the transition;
|
|
# the repository needs an awaitable ``flush()`` on the mock session.
|
|
base["task"].session = MagicMock()
|
|
base["task"].session.add = MagicMock()
|
|
base["task"].session.flush = AsyncMock()
|
|
# pr_pass's verified-stamp (ReviewFindingsRepository.list_for_task) reads
|
|
# via session.execute — an empty scalars result (no findings).
|
|
base["task"].session.execute = AsyncMock(
|
|
return_value=MagicMock(
|
|
scalars=MagicMock(return_value=MagicMock(all=MagicMock(return_value=[])))
|
|
)
|
|
)
|
|
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()
|
|
assert "do NOT pr_fail" in (env.remediate or "")
|
|
|
|
|
|
@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
|