Compare commits
15
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7d2214b17b | ||
|
|
5e023dcc97 | ||
|
|
f87101ccaa | ||
|
|
fa0cb12464 | ||
|
|
f1c7054871 | ||
|
|
4204503b41 | ||
|
|
f2d82a93ed | ||
|
|
e1dabd1b0f | ||
|
|
4d3e90e7c5 | ||
|
|
634d8a17aa | ||
|
|
bc227a9a6d | ||
|
|
077cedc0c9 | ||
|
|
1e6bd34d6f | ||
|
|
56661cd0a7 | ||
|
|
c2bba27b86 |
+411
-1
@@ -1052,6 +1052,122 @@ def _prs_from_list_response(list_prs_response: list | dict | None) -> list | Non
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
# ── Reconciliation inventory pagination proof (Issue #308) ───────────────────
|
||||||
|
#
|
||||||
|
# Already-landed reconciliation may not claim a complete queue scan (or
|
||||||
|
# that every already-landed PR was found) unless the report carries the
|
||||||
|
# pagination proof fields and the per-page gitea_list_prs metadata
|
||||||
|
# proves the final page was reached or the page limit was not hit.
|
||||||
|
|
||||||
|
_RECONCILE_COMPLETE_CLAIM_RE = re.compile(
|
||||||
|
r"complete queue scan|all already-landed|inventory complete|"
|
||||||
|
r"all open prs (?:were )?(?:inspected|scanned|listed)|found all",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
|
||||||
|
RECONCILIATION_INVENTORY_PROOF_FIELDS = (
|
||||||
|
"requested page size",
|
||||||
|
"pages fetched",
|
||||||
|
"returned pr count per page",
|
||||||
|
"final page proof",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def assess_reconciliation_inventory_proof(report_text, *,
|
||||||
|
pagination_evidence=None):
|
||||||
|
"""#308: reconciliation completeness claims need pagination proof.
|
||||||
|
|
||||||
|
*pagination_evidence* is the list of per-page ``pagination`` dicts
|
||||||
|
from the session's ``gitea_list_prs`` calls, in fetch order. Reports
|
||||||
|
that do not claim inventory completeness pass without proof; any
|
||||||
|
completeness claim requires the report proof fields and evidence
|
||||||
|
that the final page was reached (``inventory_complete``,
|
||||||
|
``is_final_page`` with ``has_more=false``, or a returned count below
|
||||||
|
the requested page size).
|
||||||
|
|
||||||
|
Returns {'complete', 'downgraded', 'reasons'}; fails closed.
|
||||||
|
"""
|
||||||
|
reasons = []
|
||||||
|
if not _RECONCILE_COMPLETE_CLAIM_RE.search(report_text or ""):
|
||||||
|
return {"complete": True, "downgraded": False, "reasons": []}
|
||||||
|
|
||||||
|
fields = _report_labeled_fields(report_text)
|
||||||
|
for required in RECONCILIATION_INVENTORY_PROOF_FIELDS:
|
||||||
|
if required not in fields:
|
||||||
|
reasons.append(
|
||||||
|
"reconciliation completeness claimed but report missing "
|
||||||
|
f"pagination proof field '{required}'"
|
||||||
|
)
|
||||||
|
|
||||||
|
if not pagination_evidence:
|
||||||
|
reasons.append(
|
||||||
|
"reconciliation completeness claimed without pagination "
|
||||||
|
"evidence from gitea_list_prs"
|
||||||
|
)
|
||||||
|
return {"complete": False, "downgraded": True, "reasons": reasons}
|
||||||
|
|
||||||
|
evidence_valid = True
|
||||||
|
for page in pagination_evidence:
|
||||||
|
if not isinstance(page, dict) or not all(
|
||||||
|
key in page for key in ("per_page", "returned_count")
|
||||||
|
):
|
||||||
|
reasons.append(
|
||||||
|
"pagination evidence page missing 'per_page'/"
|
||||||
|
"'returned_count' metadata"
|
||||||
|
)
|
||||||
|
evidence_valid = False
|
||||||
|
|
||||||
|
if evidence_valid:
|
||||||
|
last = pagination_evidence[-1]
|
||||||
|
final_proven = (
|
||||||
|
last.get("inventory_complete") is True
|
||||||
|
or (last.get("is_final_page") is True
|
||||||
|
and last.get("has_more") is False)
|
||||||
|
or last["returned_count"] < last["per_page"]
|
||||||
|
)
|
||||||
|
if not final_proven:
|
||||||
|
reasons.append(
|
||||||
|
"pagination evidence does not prove final page (need "
|
||||||
|
"inventory_complete, is_final_page with has_more=false, "
|
||||||
|
"or a returned count below the requested page size)"
|
||||||
|
)
|
||||||
|
|
||||||
|
pages_fetched = fields.get("pages fetched")
|
||||||
|
if pages_fetched:
|
||||||
|
declared = re.findall(r"\d+", pages_fetched)
|
||||||
|
if declared and int(declared[0]) != len(pagination_evidence):
|
||||||
|
reasons.append(
|
||||||
|
f"report 'Pages fetched' ({declared[0]}) does not match "
|
||||||
|
f"pagination evidence ({len(pagination_evidence)} pages)"
|
||||||
|
)
|
||||||
|
|
||||||
|
counts_field = fields.get("returned pr count per page")
|
||||||
|
if counts_field:
|
||||||
|
declared_counts = [int(n) for n in re.findall(r"\d+", counts_field)]
|
||||||
|
actual_counts = [p["returned_count"] for p in pagination_evidence]
|
||||||
|
if declared_counts != actual_counts:
|
||||||
|
reasons.append(
|
||||||
|
"report 'Returned PR count per page' "
|
||||||
|
f"({declared_counts}) does not match pagination "
|
||||||
|
f"evidence {actual_counts}"
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"complete": not reasons,
|
||||||
|
"downgraded": bool(reasons),
|
||||||
|
"reasons": reasons,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# ── Linked-issue consistency (Issue #314) ────────────────────────────────────
|
||||||
|
#
|
||||||
|
# Stale linked-issue text from a previous PR must not leak into a final
|
||||||
|
# report: the "Linked issue status" field must match the issue(s) the
|
||||||
|
# selected PR actually links, verified live this session, and no other
|
||||||
|
# "Issue #N" mention may appear unless it is a verified linked issue.
|
||||||
|
|
||||||
|
_ISSUE_MENTION_RE = re.compile(r"\bissue\s+#(\d+)", re.IGNORECASE)
|
||||||
|
|
||||||
# ── Workspace-vs-worktree mutation consistency (Issue #313) ──────────────────
|
# ── Workspace-vs-worktree mutation consistency (Issue #313) ──────────────────
|
||||||
#
|
#
|
||||||
# A worktree reset/checkout/clean is a workspace mutation even when the
|
# A worktree reset/checkout/clean is a workspace mutation even when the
|
||||||
@@ -1092,6 +1208,68 @@ def _report_labeled_fields(report_text):
|
|||||||
return fields
|
return fields
|
||||||
|
|
||||||
|
|
||||||
|
def _issue_numbers_mentioned(text):
|
||||||
|
"""Return the set of ints referenced as 'Issue #N' in *text*."""
|
||||||
|
return {int(n) for n in _ISSUE_MENTION_RE.findall(text or "")}
|
||||||
|
|
||||||
|
|
||||||
|
def assess_linked_issue_consistency(report_text, *, selected_pr=None,
|
||||||
|
linked_issues=None):
|
||||||
|
"""#314: linked-issue status must match the selected PR, live-verified.
|
||||||
|
|
||||||
|
*linked_issues* is the list of issue numbers the selected PR was
|
||||||
|
live-verified to link this session, or None when no live verification
|
||||||
|
happened. Without live proof the report may only say the status was
|
||||||
|
not verified; with proof, the ``Linked issue status`` field must name
|
||||||
|
every linked issue and no stale issue number may appear anywhere in
|
||||||
|
the report.
|
||||||
|
|
||||||
|
Returns {'complete', 'downgraded', 'reasons'}; fails closed.
|
||||||
|
"""
|
||||||
|
fields = _report_labeled_fields(report_text)
|
||||||
|
status_value = fields.get("linked issue status")
|
||||||
|
|
||||||
|
reasons = []
|
||||||
|
|
||||||
|
if status_value is None:
|
||||||
|
reasons.append(
|
||||||
|
"final report missing 'Linked issue status' field for the "
|
||||||
|
"selected PR"
|
||||||
|
)
|
||||||
|
elif linked_issues is None:
|
||||||
|
if not status_value.strip().lower().startswith("not verified"):
|
||||||
|
reasons.append(
|
||||||
|
"linked issue status claimed without live proof; report "
|
||||||
|
"'Linked issue status: not verified in this session' or "
|
||||||
|
"verify the linked issue live"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
allowed = set(linked_issues)
|
||||||
|
status_mentions = _issue_numbers_mentioned(status_value)
|
||||||
|
for missing in sorted(allowed - status_mentions):
|
||||||
|
reasons.append(
|
||||||
|
f"linked issue #{missing} of selected PR "
|
||||||
|
f"#{selected_pr} not reported in 'Linked issue status'"
|
||||||
|
)
|
||||||
|
for stale in sorted(status_mentions - allowed):
|
||||||
|
reasons.append(
|
||||||
|
f"'Linked issue status' names issue #{stale}, which is "
|
||||||
|
f"not a live-verified linked issue of selected PR "
|
||||||
|
f"#{selected_pr}"
|
||||||
|
)
|
||||||
|
for stale in sorted(_issue_numbers_mentioned(report_text) - allowed):
|
||||||
|
reasons.append(
|
||||||
|
f"stale issue #{stale} mentioned in final report but not "
|
||||||
|
f"live-verified as linked to selected PR #{selected_pr}"
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"complete": not reasons,
|
||||||
|
"downgraded": bool(reasons),
|
||||||
|
"reasons": reasons,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def _field_claims_none(fields, label):
|
def _field_claims_none(fields, label):
|
||||||
"""True when *label* is present and its value is empty or 'none...'."""
|
"""True when *label* is present and its value is empty or 'none...'."""
|
||||||
value = fields.get(label)
|
value = fields.get(label)
|
||||||
@@ -1351,6 +1529,7 @@ def build_final_report(checkout_proof, inventory, validation, contamination,
|
|||||||
report_text=None, review_decision_lock=None,
|
report_text=None, review_decision_lock=None,
|
||||||
controller_handoff=None, capability_proof=None,
|
controller_handoff=None, capability_proof=None,
|
||||||
sweep_proof=None, worktree_proof=None,
|
sweep_proof=None, worktree_proof=None,
|
||||||
|
queue_ordering=None,
|
||||||
baseline_validation=None, project_root=None):
|
baseline_validation=None, project_root=None):
|
||||||
"""Required behavior 6 + acceptance criteria: one report, distinct proofs.
|
"""Required behavior 6 + acceptance criteria: one report, distinct proofs.
|
||||||
|
|
||||||
@@ -1378,6 +1557,22 @@ def build_final_report(checkout_proof, inventory, validation, contamination,
|
|||||||
)
|
)
|
||||||
|
|
||||||
empty_queue_report = assess_empty_queue_report(report_text)
|
empty_queue_report = assess_empty_queue_report(report_text)
|
||||||
|
if queue_ordering is None and report_text:
|
||||||
|
queue_ordering_proof = assess_queue_ordering_proof(
|
||||||
|
report_text=report_text,
|
||||||
|
)
|
||||||
|
elif queue_ordering is not None:
|
||||||
|
queue_ordering_proof = assess_queue_ordering_proof(
|
||||||
|
report_text=report_text,
|
||||||
|
queue_ordering=queue_ordering,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
queue_ordering_proof = {
|
||||||
|
"proven": True,
|
||||||
|
"block": False,
|
||||||
|
"reasons": [],
|
||||||
|
"violations": [],
|
||||||
|
}
|
||||||
queue_status_report = (
|
queue_status_report = (
|
||||||
assess_queue_status_report(report_text)
|
assess_queue_status_report(report_text)
|
||||||
if report_text and _QUEUE_STATUS_REPORT_HINT.search(report_text)
|
if report_text and _QUEUE_STATUS_REPORT_HINT.search(report_text)
|
||||||
@@ -1529,6 +1724,11 @@ def build_final_report(checkout_proof, inventory, validation, contamination,
|
|||||||
"empty-queue report missing or failed trust-gate proof (#198)"
|
"empty-queue report missing or failed trust-gate proof (#198)"
|
||||||
)
|
)
|
||||||
downgrade_reasons.extend(empty_queue_report.get("reasons", []))
|
downgrade_reasons.extend(empty_queue_report.get("reasons", []))
|
||||||
|
if not queue_ordering_proof.get("proven"):
|
||||||
|
downgrade_reasons.append(
|
||||||
|
"queue ordering proof missing or failed (#321)"
|
||||||
|
)
|
||||||
|
downgrade_reasons.extend(queue_ordering_proof.get("reasons", []))
|
||||||
if not proof_wording.get("proven"):
|
if not proof_wording.get("proven"):
|
||||||
downgrade_reasons.append(
|
downgrade_reasons.append(
|
||||||
"unsupported proof wording in final report (#330)"
|
"unsupported proof wording in final report (#330)"
|
||||||
@@ -1555,10 +1755,12 @@ def build_final_report(checkout_proof, inventory, validation, contamination,
|
|||||||
# #179: no merge without a proven final live-state recheck.
|
# #179: no merge without a proven final live-state recheck.
|
||||||
and live_state_proven
|
and live_state_proven
|
||||||
and worktree_proven
|
and worktree_proven
|
||||||
|
and queue_ordering_proof.get("proven")
|
||||||
and baseline_validation.get("proven")
|
and baseline_validation.get("proven")
|
||||||
)
|
)
|
||||||
|
|
||||||
violations = []
|
violations = []
|
||||||
|
violations.extend(queue_ordering_proof.get("violations", []))
|
||||||
violations.extend(baseline_validation.get("violations", []))
|
violations.extend(baseline_validation.get("violations", []))
|
||||||
if merge_performed and not merge_allowed:
|
if merge_performed and not merge_allowed:
|
||||||
violations.append(
|
violations.append(
|
||||||
@@ -1611,6 +1813,11 @@ def build_final_report(checkout_proof, inventory, validation, contamination,
|
|||||||
else True
|
else True
|
||||||
),
|
),
|
||||||
"empty_queue_trust_gate_status": empty_queue_report.get("status"),
|
"empty_queue_trust_gate_status": empty_queue_report.get("status"),
|
||||||
|
"queue_ordering_proven": bool(queue_ordering_proof.get("proven")),
|
||||||
|
"queue_ordering_policy": queue_ordering_proof.get("policy"),
|
||||||
|
"queue_ordering_violations": list(
|
||||||
|
queue_ordering_proof.get("violations") or []
|
||||||
|
),
|
||||||
"proof_wording_proven": bool(proof_wording.get("proven")),
|
"proof_wording_proven": bool(proof_wording.get("proven")),
|
||||||
"proof_wording_violations": list(proof_wording.get("violations") or []),
|
"proof_wording_violations": list(proof_wording.get("violations") or []),
|
||||||
"queue_status_report_proven": bool(queue_status_report.get("proven")),
|
"queue_status_report_proven": bool(queue_status_report.get("proven")),
|
||||||
@@ -1762,6 +1969,20 @@ HANDOFF_BASE_FIELDS = (
|
|||||||
("Safety", ("safety",)),
|
("Safety", ("safety",)),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Issue #320: reviewer handoffs replace the legacy ambiguous
|
||||||
|
# "Workspace mutations" field with these precise mutation categories.
|
||||||
|
HANDOFF_REVIEW_MUTATION_FIELDS = (
|
||||||
|
("File edits by reviewer", ("file edits by reviewer",)),
|
||||||
|
("Worktree/index mutations", ("worktree/index mutations",)),
|
||||||
|
("Git ref mutations", ("git ref mutations",)),
|
||||||
|
("MCP/Gitea mutations", ("mcp/gitea mutations",)),
|
||||||
|
("Review mutations", ("review mutations",)),
|
||||||
|
("Merge mutations", ("merge mutations",)),
|
||||||
|
("Cleanup mutations", ("cleanup mutations",)),
|
||||||
|
("External-state mutations", ("external-state mutations",)),
|
||||||
|
("Read-only diagnostics", ("read-only diagnostics",)),
|
||||||
|
)
|
||||||
|
|
||||||
HANDOFF_ROLE_FIELDS = {
|
HANDOFF_ROLE_FIELDS = {
|
||||||
"review": (
|
"review": (
|
||||||
("Selected PR", ("selected pr",)),
|
("Selected PR", ("selected pr",)),
|
||||||
@@ -1777,7 +1998,7 @@ HANDOFF_ROLE_FIELDS = {
|
|||||||
("Merge result", ("merge result",)),
|
("Merge result", ("merge result",)),
|
||||||
("Linked issue status", ("linked issue status", "linked issue")),
|
("Linked issue status", ("linked issue status", "linked issue")),
|
||||||
("Cleanup status", ("cleanup status", "cleanup")),
|
("Cleanup status", ("cleanup status", "cleanup")),
|
||||||
),
|
) + HANDOFF_REVIEW_MUTATION_FIELDS,
|
||||||
"author": (
|
"author": (
|
||||||
("Selected issue", ("selected issue",)),
|
("Selected issue", ("selected issue",)),
|
||||||
("Issue lock proof", ("issue lock proof", "lock before diff")),
|
("Issue lock proof", ("issue lock proof", "lock before diff")),
|
||||||
@@ -1928,6 +2149,25 @@ def assess_controller_handoff(report_text, role=None, local_edits=False):
|
|||||||
field for field in required
|
field for field in required
|
||||||
if field[0] not in ("Workspace mutations", "Mutations")
|
if field[0] not in ("Workspace mutations", "Mutations")
|
||||||
]
|
]
|
||||||
|
if role == "review":
|
||||||
|
# Issue #320: reviewer handoffs use the precise mutation categories
|
||||||
|
# in HANDOFF_REVIEW_MUTATION_FIELDS instead of the legacy ambiguous
|
||||||
|
# "Workspace mutations" field, which is rejected below.
|
||||||
|
required = [
|
||||||
|
field for field in required
|
||||||
|
if field[0] != "Workspace mutations"
|
||||||
|
]
|
||||||
|
if any(label.startswith("workspace mutations") for label in labels):
|
||||||
|
return {
|
||||||
|
"verdict": "incomplete",
|
||||||
|
"downgraded": True,
|
||||||
|
"missing_fields": [],
|
||||||
|
"reasons": [
|
||||||
|
"review handoff must not include legacy "
|
||||||
|
"'Workspace mutations' field; report the precise "
|
||||||
|
"mutation categories instead (issue #320)"
|
||||||
|
],
|
||||||
|
}
|
||||||
required.extend(HANDOFF_ROLE_FIELDS.get(role or "", ()))
|
required.extend(HANDOFF_ROLE_FIELDS.get(role or "", ()))
|
||||||
|
|
||||||
missing = []
|
missing = []
|
||||||
@@ -3189,6 +3429,162 @@ def build_review_mutation_proof(run_log: list[dict]) -> dict:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Reviewer queue ordering proof (#321)
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
_QUEUE_SELECTION_CLAIM_RE = re.compile(
|
||||||
|
r"\b(?:next|oldest)\s+eligible\s+pr\b",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
|
||||||
|
_ORDERING_POLICY_LINE_RE = re.compile(
|
||||||
|
r"(?:queue\s+ordering\s+policy|selection\s+policy|ordering\s+policy)"
|
||||||
|
r"\s*:\s*(.+)",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
|
||||||
|
_SKIPPED_PR_LINE_RE = re.compile(
|
||||||
|
r"\bskipped\s+pr\s*#?(\d+)\b",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_ordering_policy(report_text: str) -> str:
|
||||||
|
for line in (report_text or "").splitlines():
|
||||||
|
match = _ORDERING_POLICY_LINE_RE.search(line)
|
||||||
|
if match:
|
||||||
|
return match.group(1).strip().rstrip(".")
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
||||||
|
def _skipped_pr_numbers(report_text: str) -> set[int]:
|
||||||
|
skipped: set[int] = set()
|
||||||
|
for match in _SKIPPED_PR_LINE_RE.finditer(report_text or ""):
|
||||||
|
try:
|
||||||
|
skipped.add(int(match.group(1)))
|
||||||
|
except ValueError:
|
||||||
|
continue
|
||||||
|
return skipped
|
||||||
|
|
||||||
|
|
||||||
|
def assess_queue_ordering_proof(
|
||||||
|
*,
|
||||||
|
report_text: str | None = None,
|
||||||
|
queue_ordering: dict | None = None,
|
||||||
|
) -> dict:
|
||||||
|
"""#321: reviewer queue selection must prove ordering before claiming next PR."""
|
||||||
|
text = report_text or ""
|
||||||
|
lower = text.lower()
|
||||||
|
proof = queue_ordering or {}
|
||||||
|
reasons: list[str] = []
|
||||||
|
violations: list[str] = []
|
||||||
|
|
||||||
|
claims_selection = bool(_QUEUE_SELECTION_CLAIM_RE.search(text))
|
||||||
|
selected = proof.get("selected_pr_number")
|
||||||
|
if selected is None and "selected pr #" in lower:
|
||||||
|
for token in lower.split():
|
||||||
|
if token.startswith("#") and token[1:].isdigit():
|
||||||
|
selected = int(token[1:])
|
||||||
|
break
|
||||||
|
|
||||||
|
if not claims_selection and selected is None:
|
||||||
|
return {
|
||||||
|
"proven": True,
|
||||||
|
"block": False,
|
||||||
|
"claims_selection": False,
|
||||||
|
"policy": None,
|
||||||
|
"reasons": [],
|
||||||
|
"violations": [],
|
||||||
|
"safe_next_action": "proceed",
|
||||||
|
}
|
||||||
|
|
||||||
|
policy = (proof.get("policy") or _parse_ordering_policy(text)).strip()
|
||||||
|
if not policy:
|
||||||
|
reasons.append(
|
||||||
|
"queue selection claimed without stated ordering policy (#321)"
|
||||||
|
)
|
||||||
|
|
||||||
|
policy_lower = policy.lower()
|
||||||
|
api_numbers: list[int] = []
|
||||||
|
for n in proof.get("api_pr_numbers") or []:
|
||||||
|
if isinstance(n, int):
|
||||||
|
api_numbers.append(n)
|
||||||
|
elif isinstance(n, str) and n.isdigit():
|
||||||
|
api_numbers.append(int(n))
|
||||||
|
skipped_entries = list(proof.get("skipped_earlier") or [])
|
||||||
|
skipped_numbers = {
|
||||||
|
int(entry["pr_number"])
|
||||||
|
for entry in skipped_entries
|
||||||
|
if isinstance(entry, dict) and entry.get("pr_number") is not None
|
||||||
|
}
|
||||||
|
skipped_numbers.update(_skipped_pr_numbers(text))
|
||||||
|
|
||||||
|
if selected is not None and api_numbers:
|
||||||
|
if "oldest" in policy_lower and "number" in policy_lower:
|
||||||
|
earlier_actionable = [
|
||||||
|
n for n in api_numbers
|
||||||
|
if n < int(selected) and n not in skipped_numbers
|
||||||
|
]
|
||||||
|
for pr_number in earlier_actionable:
|
||||||
|
entry = next(
|
||||||
|
(
|
||||||
|
e for e in skipped_entries
|
||||||
|
if isinstance(e, dict)
|
||||||
|
and int(e.get("pr_number", -1)) == pr_number
|
||||||
|
),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
reason = (entry or {}).get("reason", "").strip()
|
||||||
|
if not reason and f"skipped pr #{pr_number}" not in lower:
|
||||||
|
violations.append(
|
||||||
|
f"earlier actionable PR #{pr_number} skipped without "
|
||||||
|
"proof-backed reason (#321)"
|
||||||
|
)
|
||||||
|
reasons.append(
|
||||||
|
f"oldest-first policy requires skip reasoning for "
|
||||||
|
f"earlier PR #{pr_number} (#321)"
|
||||||
|
)
|
||||||
|
if api_numbers and api_numbers[0] != min(api_numbers):
|
||||||
|
if (
|
||||||
|
"api order" not in lower
|
||||||
|
and "sorted" not in lower
|
||||||
|
and "newest-first" not in lower
|
||||||
|
and not skipped_entries
|
||||||
|
):
|
||||||
|
reasons.append(
|
||||||
|
"API response order differs from oldest-first "
|
||||||
|
"selection but report does not prove explicit sort "
|
||||||
|
"or skip reasoning (#321)"
|
||||||
|
)
|
||||||
|
|
||||||
|
if "priority" in policy_lower:
|
||||||
|
override = (proof.get("priority_override") or "").strip()
|
||||||
|
if not override and "priority" not in lower:
|
||||||
|
reasons.append(
|
||||||
|
"priority-label ordering policy requires override "
|
||||||
|
"explanation in report (#321)"
|
||||||
|
)
|
||||||
|
|
||||||
|
proven = not reasons and not violations
|
||||||
|
return {
|
||||||
|
"proven": proven,
|
||||||
|
"block": bool(violations),
|
||||||
|
"claims_selection": True,
|
||||||
|
"policy": policy or None,
|
||||||
|
"selected_pr_number": selected,
|
||||||
|
"reasons": reasons,
|
||||||
|
"violations": violations,
|
||||||
|
"safe_next_action": (
|
||||||
|
"state queue ordering policy and proof-backed skip reasoning "
|
||||||
|
"for every earlier actionable PR"
|
||||||
|
if not proven
|
||||||
|
else "proceed"
|
||||||
|
),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Reviewer baseline validation (#325)
|
# Reviewer baseline validation (#325)
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -3444,6 +3840,13 @@ def assess_email_disclosure(
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def assess_reviewer_fallback_report(report_text, **kwargs):
|
||||||
|
"""#324: block local Gitea fallbacks during normal reviewer workflows."""
|
||||||
|
from reviewer_fallback import assess_reviewer_fallback_report as _assess
|
||||||
|
|
||||||
|
return _assess(report_text, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
def assess_final_report_validator(report_text, task_kind, **kwargs):
|
def assess_final_report_validator(report_text, task_kind, **kwargs):
|
||||||
"""#327: single entry point for task-specific final-report validation."""
|
"""#327: single entry point for task-specific final-report validation."""
|
||||||
from final_report_validator import assess_final_report_validator as _validate
|
from final_report_validator import assess_final_report_validator as _validate
|
||||||
@@ -3834,6 +4237,13 @@ def assess_git_ref_mutation_report(report_text, *, command_log=None):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def assess_prior_blocker_skip_proof(report_text, **kwargs):
|
||||||
|
"""#318: require live blocker proof before skipping earlier open PRs."""
|
||||||
|
from reviewer_blocker_skip import assess_prior_blocker_skip_proof as _assess
|
||||||
|
|
||||||
|
return _assess(report_text, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
def assess_non_mergeable_skip_proof(report_text, **kwargs):
|
def assess_non_mergeable_skip_proof(report_text, **kwargs):
|
||||||
"""#322: require conflict proof when skipping non-mergeable PRs."""
|
"""#322: require conflict proof when skipping non-mergeable PRs."""
|
||||||
from reviewer_mergeability_skip import assess_non_mergeable_skip_proof as _assess
|
from reviewer_mergeability_skip import assess_non_mergeable_skip_proof as _assess
|
||||||
|
|||||||
@@ -0,0 +1,164 @@
|
|||||||
|
"""Prior-blocker skip proof verifier for reviewer queue reports (#318)."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import re
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
_FULL_SHA = re.compile(r"\b[0-9a-f]{40}\b", re.IGNORECASE)
|
||||||
|
_SHORT_SHA = re.compile(r"\b[0-9a-f]{7,39}\b", re.IGNORECASE)
|
||||||
|
_PR_NUMBER_RE = re.compile(r"(?:\bPR\s*#?|#)(\d+)\b", re.IGNORECASE)
|
||||||
|
_BLOCKING_DECISION_RE = re.compile(
|
||||||
|
r"(?:blocking review decision|review decision|blocking decision)\s*:\s*request[_ ]changes|"
|
||||||
|
r"request[_ ]changes",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_BLOCKING_HEAD_RE = re.compile(
|
||||||
|
r"(?:blocking review head(?:\s+sha)?|blocker head(?:\s+sha)?|review head at blocker)",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_HEAD_CHANGED_RE = re.compile(
|
||||||
|
r"(?:head (?:changed|unchanged)|head sha (?:changed|unchanged)|"
|
||||||
|
r"head changed (?:after|since) (?:the )?blocker|head unchanged since blocker)",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_BLOCKER_REASON_RE = re.compile(
|
||||||
|
r"(?:reason (?:it )?remains blocked|remains blocked because|blocking category)",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_LIVE_BLOCKER_PROOF_RE = re.compile(
|
||||||
|
r"(?:blocker revalidated live|live proof|gitea_get_pr_review_feedback|"
|
||||||
|
r"gitea_view_pr|review feedback fetched|current review state)",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_BLOCKER_UNVERIFIED_RE = re.compile(r"\bBLOCKER_STATUS_UNVERIFIED\b")
|
||||||
|
|
||||||
|
|
||||||
|
def _pr_section(text: str, pr_number: int) -> str:
|
||||||
|
lines = (text or "").splitlines()
|
||||||
|
chunks: list[str] = []
|
||||||
|
capture = False
|
||||||
|
token = f"#{pr_number}"
|
||||||
|
for line in lines:
|
||||||
|
lower = line.lower()
|
||||||
|
if token in lower or f"pr {pr_number}" in lower or f"pr#{pr_number}" in lower.replace(" ", ""):
|
||||||
|
capture = True
|
||||||
|
chunks.append(line)
|
||||||
|
continue
|
||||||
|
if capture:
|
||||||
|
if _PR_NUMBER_RE.search(line) and token not in line.lower():
|
||||||
|
break
|
||||||
|
if line.strip() == "" and len(chunks) > 3:
|
||||||
|
break
|
||||||
|
chunks.append(line)
|
||||||
|
if chunks:
|
||||||
|
return "\n".join(chunks)
|
||||||
|
return text or ""
|
||||||
|
|
||||||
|
|
||||||
|
def _has_head_sha(text: str, head_sha: str | None) -> bool:
|
||||||
|
if not head_sha:
|
||||||
|
return bool(_FULL_SHA.search(text) or _SHORT_SHA.search(text))
|
||||||
|
head = head_sha.strip().lower()
|
||||||
|
if head in text.lower():
|
||||||
|
return True
|
||||||
|
if len(head) >= 7 and head[:7] in text.lower():
|
||||||
|
return True
|
||||||
|
return bool(_FULL_SHA.search(text))
|
||||||
|
|
||||||
|
|
||||||
|
def assess_prior_blocker_skip_proof(
|
||||||
|
report_text: str,
|
||||||
|
*,
|
||||||
|
skipped_prs: list[dict] | None = None,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Validate live blocker proof for skipped earlier open PRs (#318)."""
|
||||||
|
text = report_text or ""
|
||||||
|
reasons: list[str] = []
|
||||||
|
assessments: list[dict[str, Any]] = []
|
||||||
|
|
||||||
|
for entry in skipped_prs or []:
|
||||||
|
pr_number = entry.get("pr_number")
|
||||||
|
if pr_number is None:
|
||||||
|
reasons.append("skipped PR entry missing pr_number")
|
||||||
|
continue
|
||||||
|
pr_number = int(pr_number)
|
||||||
|
section = _pr_section(text, pr_number)
|
||||||
|
verified = entry.get("blocker_verified")
|
||||||
|
head_changed = entry.get("head_changed_since_blocker")
|
||||||
|
blocking_head = (entry.get("blocking_review_head_sha") or "").strip() or None
|
||||||
|
current_head = (entry.get("head_sha") or "").strip() or None
|
||||||
|
skip_reason = (entry.get("skip_reason") or entry.get("blocking_decision") or "").lower()
|
||||||
|
|
||||||
|
item_reasons: list[str] = []
|
||||||
|
|
||||||
|
if head_changed is True:
|
||||||
|
item_reasons.append(
|
||||||
|
f"PR #{pr_number} head changed after blocker; it cannot be skipped "
|
||||||
|
"based on stale REQUEST_CHANGES"
|
||||||
|
)
|
||||||
|
|
||||||
|
if f"#{pr_number}" not in text.lower() and f"pr {pr_number}" not in text.lower():
|
||||||
|
item_reasons.append(f"skipped PR #{pr_number} not documented in final report")
|
||||||
|
|
||||||
|
if "request_changes" in skip_reason or entry.get("blocking_decision") == "request_changes":
|
||||||
|
if verified is False:
|
||||||
|
if not _BLOCKER_UNVERIFIED_RE.search(section):
|
||||||
|
item_reasons.append(
|
||||||
|
f"PR #{pr_number} blocker proof unavailable; report must classify "
|
||||||
|
"BLOCKER_STATUS_UNVERIFIED"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
if not _BLOCKING_DECISION_RE.search(section):
|
||||||
|
item_reasons.append(
|
||||||
|
f"PR #{pr_number} skip missing blocking review decision proof"
|
||||||
|
)
|
||||||
|
if not _has_head_sha(section, current_head):
|
||||||
|
item_reasons.append(
|
||||||
|
f"PR #{pr_number} skip missing current head SHA"
|
||||||
|
)
|
||||||
|
if blocking_head and not _BLOCKING_HEAD_RE.search(section):
|
||||||
|
if blocking_head.lower() not in section.lower():
|
||||||
|
item_reasons.append(
|
||||||
|
f"PR #{pr_number} skip missing blocking review head SHA"
|
||||||
|
)
|
||||||
|
if head_changed is False and not _HEAD_CHANGED_RE.search(section):
|
||||||
|
item_reasons.append(
|
||||||
|
f"PR #{pr_number} skip missing head-changed-since-blocker proof"
|
||||||
|
)
|
||||||
|
if not _BLOCKER_REASON_RE.search(section):
|
||||||
|
item_reasons.append(
|
||||||
|
f"PR #{pr_number} skip missing reason-it-remains-blocked"
|
||||||
|
)
|
||||||
|
if not _LIVE_BLOCKER_PROOF_RE.search(section):
|
||||||
|
item_reasons.append(
|
||||||
|
f"PR #{pr_number} skip missing live blocker proof for this session"
|
||||||
|
)
|
||||||
|
|
||||||
|
proven = not item_reasons
|
||||||
|
assessments.append({
|
||||||
|
"pr_number": pr_number,
|
||||||
|
"proven": proven,
|
||||||
|
"classification": (
|
||||||
|
"BLOCKER_STATUS_UNVERIFIED"
|
||||||
|
if verified is False
|
||||||
|
else "BLOCKED_SKIPPED"
|
||||||
|
),
|
||||||
|
"reasons": item_reasons,
|
||||||
|
})
|
||||||
|
reasons.extend(item_reasons)
|
||||||
|
|
||||||
|
proven = not reasons
|
||||||
|
return {
|
||||||
|
"proven": proven,
|
||||||
|
"block": not proven,
|
||||||
|
"downgraded": False,
|
||||||
|
"assessments": assessments,
|
||||||
|
"reasons": reasons,
|
||||||
|
"safe_next_action": (
|
||||||
|
"fetch live review feedback and document blocker proof for each skipped PR, "
|
||||||
|
"or classify BLOCKER_STATUS_UNVERIFIED"
|
||||||
|
if reasons
|
||||||
|
else "proceed"
|
||||||
|
),
|
||||||
|
}
|
||||||
@@ -0,0 +1,213 @@
|
|||||||
|
"""Reviewer local-fallback detection for normal PR review workflows (#324).
|
||||||
|
|
||||||
|
Normal reviewer runs must use MCP tools. Reading profile secret files or
|
||||||
|
running local Gitea helper scripts while MCP is available is a fail-closed
|
||||||
|
violation. Explicit recovery mode may use local fallback only with full proof.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import re
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
LOCAL_GITEA_SCRIPT_NAMES = (
|
||||||
|
"list_prs.py",
|
||||||
|
"view_pr.py",
|
||||||
|
"create_pr.py",
|
||||||
|
"merge_pr.py",
|
||||||
|
"edit_pr.py",
|
||||||
|
"list_issues.py",
|
||||||
|
"delete_branch.py",
|
||||||
|
"create_issue.py",
|
||||||
|
"close_issue.py",
|
||||||
|
"review_pr.py",
|
||||||
|
"mark_issue.py",
|
||||||
|
"mirror_refs.sh",
|
||||||
|
)
|
||||||
|
|
||||||
|
PROFILE_SECRET_MARKERS = (
|
||||||
|
"profiles.json",
|
||||||
|
".config/gitea-tools/profiles",
|
||||||
|
"gitea_auth.py",
|
||||||
|
"gitea_config.py",
|
||||||
|
"keychain",
|
||||||
|
"credential fill",
|
||||||
|
"token store",
|
||||||
|
)
|
||||||
|
|
||||||
|
_RECOVERY_MODE_RE = re.compile(
|
||||||
|
r"\b(?:recovery mode|explicit recovery|mcp unavailable|mcp not available|"
|
||||||
|
r"mcp tools unavailable|no mcp path)\b",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_FALLBACK_CLASSIFICATION_RE = re.compile(
|
||||||
|
r"\b(?:local fallback|fallback mode|used local gitea|ran local script)\b",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_MCP_TOOL_USE_RE = re.compile(
|
||||||
|
r"\b(?:gitea_list_prs|gitea_view_pr|gitea_review_pr|gitea_merge_pr|"
|
||||||
|
r"gitea_resolve_task_capability|gitea_whoami|mcp tool)\b",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_LOCAL_SCRIPT_RE = re.compile(
|
||||||
|
r"(?:^|[\s\"'`/])(?:" + "|".join(re.escape(name) for name in LOCAL_GITEA_SCRIPT_NAMES) + r")",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_PROFILE_ACCESS_RE = re.compile(
|
||||||
|
r"(?:read|open|inspect|cat|view|access(?:ed)?|loaded?)\s+(?:file\s+)?[`'\"]?"
|
||||||
|
r"[^`'\"]*profiles\.json|profiles\.json[`'\"]?\s+(?:read|opened|inspected|accessed)|"
|
||||||
|
r"~/?\.config/gitea-tools/profiles",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_LOCAL_ENV_SCRIPT_RE = re.compile(
|
||||||
|
r"GITEA_MCP_(?:CONFIG|PROFILE)=.*\b(?:python\s+)?(?:list_prs|view_pr|create_pr|merge_pr)\.py",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
_RECOVERY_PROOF_FIELDS = (
|
||||||
|
("identity proof", ("identity proof", "exact identity proof")),
|
||||||
|
("profile proof", ("profile proof", "exact profile proof")),
|
||||||
|
("repo proof", ("repo proof", "exact repo proof")),
|
||||||
|
("capability proof", ("capability proof", "exact capability proof")),
|
||||||
|
("mcp unavailable reason", (
|
||||||
|
"why mcp was unavailable",
|
||||||
|
"mcp unavailable",
|
||||||
|
"mcp unavailability",
|
||||||
|
)),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _collect_observed_text(
|
||||||
|
report_text: str,
|
||||||
|
action_log: list[dict] | None,
|
||||||
|
) -> str:
|
||||||
|
chunks = [report_text or ""]
|
||||||
|
for entry in action_log or []:
|
||||||
|
for key in ("command", "action", "detail", "path", "script"):
|
||||||
|
value = entry.get(key)
|
||||||
|
if value:
|
||||||
|
chunks.append(str(value))
|
||||||
|
return "\n".join(chunks)
|
||||||
|
|
||||||
|
|
||||||
|
def _detect_profile_secret_access(text: str) -> list[str]:
|
||||||
|
reasons = []
|
||||||
|
lower = text.lower()
|
||||||
|
if _PROFILE_ACCESS_RE.search(text):
|
||||||
|
reasons.append("report or action log shows profiles.json/profile secret access")
|
||||||
|
for marker in PROFILE_SECRET_MARKERS:
|
||||||
|
if marker == "profiles.json":
|
||||||
|
continue
|
||||||
|
if marker in lower and "do not" not in lower and "must not" not in lower:
|
||||||
|
if any(verb in lower for verb in ("read ", "open ", "inspect ", "cat ", "loaded ")):
|
||||||
|
reasons.append(f"profile secret surface '{marker}' accessed during review")
|
||||||
|
return reasons
|
||||||
|
|
||||||
|
|
||||||
|
def _detect_local_script_use(text: str) -> list[str]:
|
||||||
|
reasons = []
|
||||||
|
match = _LOCAL_SCRIPT_RE.search(text)
|
||||||
|
if match:
|
||||||
|
reasons.append(
|
||||||
|
f"local Gitea helper script invoked ({match.group(0).strip()})"
|
||||||
|
)
|
||||||
|
if _LOCAL_ENV_SCRIPT_RE.search(text):
|
||||||
|
reasons.append(
|
||||||
|
"local Gitea script run with GITEA_MCP_CONFIG/GITEA_MCP_PROFILE env overrides"
|
||||||
|
)
|
||||||
|
return reasons
|
||||||
|
|
||||||
|
|
||||||
|
def _recovery_proof_missing(text: str) -> list[str]:
|
||||||
|
lower = text.lower()
|
||||||
|
missing = []
|
||||||
|
for label, aliases in _RECOVERY_PROOF_FIELDS:
|
||||||
|
if not any(alias in lower for alias in aliases):
|
||||||
|
missing.append(label)
|
||||||
|
if not _FALLBACK_CLASSIFICATION_RE.search(text):
|
||||||
|
missing.append("fallback classification")
|
||||||
|
if not _RECOVERY_MODE_RE.search(text):
|
||||||
|
missing.append("recovery mode declaration")
|
||||||
|
return missing
|
||||||
|
|
||||||
|
|
||||||
|
def assess_reviewer_fallback_report(
|
||||||
|
report_text: str,
|
||||||
|
*,
|
||||||
|
action_log: list[dict] | None = None,
|
||||||
|
recovery_mode: bool = False,
|
||||||
|
mcp_available: bool = True,
|
||||||
|
mcp_tools_used: bool | None = None,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Fail closed when normal reviewer workflows use local Gitea fallbacks (#324)."""
|
||||||
|
text = _collect_observed_text(report_text, action_log)
|
||||||
|
lower = (report_text or "").lower()
|
||||||
|
|
||||||
|
profile_violations = _detect_profile_secret_access(text)
|
||||||
|
script_violations = _detect_local_script_use(text)
|
||||||
|
violations = profile_violations + script_violations
|
||||||
|
|
||||||
|
if mcp_tools_used is None:
|
||||||
|
mcp_tools_used = bool(_MCP_TOOL_USE_RE.search(report_text or ""))
|
||||||
|
elif mcp_tools_used is False and _MCP_TOOL_USE_RE.search(report_text or ""):
|
||||||
|
mcp_tools_used = True
|
||||||
|
|
||||||
|
reasons: list[str] = []
|
||||||
|
recovery_declared = recovery_mode or bool(_RECOVERY_MODE_RE.search(report_text or ""))
|
||||||
|
|
||||||
|
if violations and mcp_available and not recovery_declared:
|
||||||
|
reasons.extend(violations)
|
||||||
|
if mcp_tools_used:
|
||||||
|
reasons.append(
|
||||||
|
"MCP tools were available and used; local fallback/profile access is forbidden"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
reasons.append(
|
||||||
|
"MCP path is available; normal review must not use local Gitea fallbacks"
|
||||||
|
)
|
||||||
|
|
||||||
|
if violations and recovery_declared:
|
||||||
|
missing = _recovery_proof_missing(report_text or "")
|
||||||
|
if missing:
|
||||||
|
reasons.append(
|
||||||
|
"recovery-mode fallback missing proof fields: "
|
||||||
|
+ ", ".join(missing)
|
||||||
|
)
|
||||||
|
|
||||||
|
if (
|
||||||
|
not violations
|
||||||
|
and recovery_declared
|
||||||
|
and _FALLBACK_CLASSIFICATION_RE.search(report_text or "")
|
||||||
|
and not recovery_mode
|
||||||
|
):
|
||||||
|
missing = _recovery_proof_missing(report_text or "")
|
||||||
|
if missing:
|
||||||
|
reasons.append(
|
||||||
|
"report claims local fallback but recovery proof is incomplete: "
|
||||||
|
+ ", ".join(missing)
|
||||||
|
)
|
||||||
|
|
||||||
|
proven = not reasons
|
||||||
|
blocked = bool(reasons) and not recovery_declared or any(
|
||||||
|
"recovery-mode fallback missing" in r or "recovery proof is incomplete" in r
|
||||||
|
for r in reasons
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
"proven": proven,
|
||||||
|
"block": blocked or (bool(reasons) and mcp_available and not recovery_declared),
|
||||||
|
"downgraded": bool(reasons) and not blocked,
|
||||||
|
"recovery_mode": recovery_declared,
|
||||||
|
"mcp_available": mcp_available,
|
||||||
|
"mcp_tools_used": mcp_tools_used,
|
||||||
|
"profile_violations": profile_violations,
|
||||||
|
"script_violations": script_violations,
|
||||||
|
"reasons": reasons,
|
||||||
|
"safe_next_action": (
|
||||||
|
"use MCP reviewer tools only; do not read profiles.json or run local Gitea scripts"
|
||||||
|
if reasons and not recovery_declared
|
||||||
|
else (
|
||||||
|
"complete recovery-mode fallback proof before claiming local fallback"
|
||||||
|
if reasons
|
||||||
|
else "proceed with MCP tools"
|
||||||
|
)
|
||||||
|
),
|
||||||
|
}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
"""Tests for linked-issue consistency verifier (#314).
|
||||||
|
|
||||||
|
Reviewer reports must verify the linked issue live for the selected PR;
|
||||||
|
stale issue numbers from a previous PR must not leak into the final
|
||||||
|
report, and linked-issue status must never be claimed without live proof.
|
||||||
|
"""
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||||
|
|
||||||
|
from review_proofs import assess_linked_issue_consistency # noqa: E402
|
||||||
|
|
||||||
|
|
||||||
|
class TestCorrectLinkedIssue(unittest.TestCase):
|
||||||
|
def test_matching_linked_issue_passes(self):
|
||||||
|
report = (
|
||||||
|
"Selected PR: 280\n"
|
||||||
|
"Linked issue status: Issue #275 open, closes on merge\n"
|
||||||
|
)
|
||||||
|
result = assess_linked_issue_consistency(
|
||||||
|
report, selected_pr=280, linked_issues=[275]
|
||||||
|
)
|
||||||
|
self.assertTrue(result["complete"])
|
||||||
|
self.assertFalse(result["downgraded"])
|
||||||
|
self.assertEqual(result["reasons"], [])
|
||||||
|
|
||||||
|
def test_multiple_linked_issues_all_reported_passes(self):
|
||||||
|
report = (
|
||||||
|
"Linked issue status: Issue #275 and Issue #276 both open\n"
|
||||||
|
)
|
||||||
|
result = assess_linked_issue_consistency(
|
||||||
|
report, selected_pr=280, linked_issues=[275, 276]
|
||||||
|
)
|
||||||
|
self.assertTrue(result["complete"])
|
||||||
|
|
||||||
|
def test_multiple_linked_issues_one_missing_fails(self):
|
||||||
|
report = "Linked issue status: Issue #275 open\n"
|
||||||
|
result = assess_linked_issue_consistency(
|
||||||
|
report, selected_pr=280, linked_issues=[275, 276]
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
self.assertTrue(
|
||||||
|
any("276" in r for r in result["reasons"])
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestStaleIssueLeak(unittest.TestCase):
|
||||||
|
def test_stale_issue_in_status_field_fails(self):
|
||||||
|
# #314 observed behavior: PR #280 links Issue #275 but the report
|
||||||
|
# carries Issue #260 from the previous PR.
|
||||||
|
report = "Linked issue status: Issue #260 open\n"
|
||||||
|
result = assess_linked_issue_consistency(
|
||||||
|
report, selected_pr=280, linked_issues=[275]
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
self.assertTrue(any("260" in r for r in result["reasons"]))
|
||||||
|
|
||||||
|
def test_stale_issue_in_diagnostics_fails(self):
|
||||||
|
report = (
|
||||||
|
"Linked issue status: Issue #275 open\n"
|
||||||
|
"Read-only diagnostics: viewed Issue #260 status\n"
|
||||||
|
)
|
||||||
|
result = assess_linked_issue_consistency(
|
||||||
|
report, selected_pr=280, linked_issues=[275]
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
self.assertTrue(
|
||||||
|
any("stale" in r.lower() and "260" in r for r in result["reasons"])
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_selected_pr_number_mention_is_not_stale(self):
|
||||||
|
# "PR #280" mentions must not be confused with issue mentions.
|
||||||
|
report = (
|
||||||
|
"Selected PR: 280\n"
|
||||||
|
"Validation: ran tests at PR #280 head\n"
|
||||||
|
"Linked issue status: Issue #275 open\n"
|
||||||
|
)
|
||||||
|
result = assess_linked_issue_consistency(
|
||||||
|
report, selected_pr=280, linked_issues=[275]
|
||||||
|
)
|
||||||
|
self.assertTrue(result["complete"])
|
||||||
|
|
||||||
|
|
||||||
|
class TestMissingProof(unittest.TestCase):
|
||||||
|
def test_status_claim_without_live_proof_fails(self):
|
||||||
|
report = "Linked issue status: Issue #275 open\n"
|
||||||
|
result = assess_linked_issue_consistency(
|
||||||
|
report, selected_pr=280, linked_issues=None
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
self.assertTrue(
|
||||||
|
any("live proof" in r.lower() for r in result["reasons"])
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_unverified_wording_without_proof_passes(self):
|
||||||
|
report = (
|
||||||
|
"Linked issue status: not verified in this session\n"
|
||||||
|
)
|
||||||
|
result = assess_linked_issue_consistency(
|
||||||
|
report, selected_pr=280, linked_issues=None
|
||||||
|
)
|
||||||
|
self.assertTrue(result["complete"])
|
||||||
|
|
||||||
|
def test_missing_field_fails(self):
|
||||||
|
report = "Selected PR: 280\n"
|
||||||
|
result = assess_linked_issue_consistency(
|
||||||
|
report, selected_pr=280, linked_issues=[275]
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
self.assertTrue(
|
||||||
|
any("linked issue status" in r.lower() for r in result["reasons"])
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -118,6 +118,12 @@ def test_start_issue_template_references_work_issue_workflow():
|
|||||||
assert "workflows/work-issue.md" in text
|
assert "workflows/work-issue.md" in text
|
||||||
|
|
||||||
|
|
||||||
|
def test_reviewer_fallback_verifier_exported():
|
||||||
|
from review_proofs import assess_reviewer_fallback_report
|
||||||
|
|
||||||
|
assert callable(assess_reviewer_fallback_report)
|
||||||
|
|
||||||
|
|
||||||
def test_final_report_validator_exported():
|
def test_final_report_validator_exported():
|
||||||
from review_proofs import assess_final_report_validator
|
from review_proofs import assess_final_report_validator
|
||||||
|
|
||||||
@@ -130,6 +136,12 @@ def test_create_issue_final_report_verifier_exported():
|
|||||||
assert callable(assess_create_issue_final_report)
|
assert callable(assess_create_issue_final_report)
|
||||||
|
|
||||||
|
|
||||||
|
def test_prior_blocker_skip_verifier_exported():
|
||||||
|
from review_proofs import assess_prior_blocker_skip_proof
|
||||||
|
|
||||||
|
assert callable(assess_prior_blocker_skip_proof)
|
||||||
|
|
||||||
|
|
||||||
def test_non_mergeable_skip_verifier_exported():
|
def test_non_mergeable_skip_verifier_exported():
|
||||||
from review_proofs import assess_non_mergeable_skip_proof
|
from review_proofs import assess_non_mergeable_skip_proof
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,150 @@
|
|||||||
|
"""Tests for reconciliation PR-inventory pagination proof (#308).
|
||||||
|
|
||||||
|
Already-landed reconciliation reports may not claim a complete queue
|
||||||
|
scan (or that all already-landed PRs were found) unless the report
|
||||||
|
carries pagination proof fields and the per-page evidence proves the
|
||||||
|
final page was reached or the page limit was not hit.
|
||||||
|
"""
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||||
|
|
||||||
|
from review_proofs import assess_reconciliation_inventory_proof # noqa: E402
|
||||||
|
|
||||||
|
|
||||||
|
def _report(claim=True, fields=True, pages="1", counts="12",
|
||||||
|
final_proof="is_final_page=true, has_more=false"):
|
||||||
|
lines = []
|
||||||
|
if claim:
|
||||||
|
lines.append(
|
||||||
|
"Inventory scope: complete queue scan; all already-landed "
|
||||||
|
"PRs were found."
|
||||||
|
)
|
||||||
|
if fields:
|
||||||
|
lines += [
|
||||||
|
"- Requested page size: 50",
|
||||||
|
f"- Pages fetched: {pages}",
|
||||||
|
f"- Returned PR count per page: {counts}",
|
||||||
|
f"- Final page proof: {final_proof}",
|
||||||
|
]
|
||||||
|
return "\n".join(lines) + "\n"
|
||||||
|
|
||||||
|
|
||||||
|
def _page(page, returned, per_page=50, has_more=False, final=True,
|
||||||
|
inventory_complete=None):
|
||||||
|
d = {
|
||||||
|
"page": page,
|
||||||
|
"per_page": per_page,
|
||||||
|
"returned_count": returned,
|
||||||
|
"has_more": has_more,
|
||||||
|
"is_final_page": final,
|
||||||
|
}
|
||||||
|
if inventory_complete is not None:
|
||||||
|
d["inventory_complete"] = inventory_complete
|
||||||
|
return d
|
||||||
|
|
||||||
|
|
||||||
|
class TestCompleteScanProven(unittest.TestCase):
|
||||||
|
def test_first_page_below_limit_passes(self):
|
||||||
|
result = assess_reconciliation_inventory_proof(
|
||||||
|
_report(),
|
||||||
|
pagination_evidence=[_page(1, 12)],
|
||||||
|
)
|
||||||
|
self.assertTrue(result["complete"])
|
||||||
|
self.assertEqual(result["reasons"], [])
|
||||||
|
|
||||||
|
def test_multiple_pages_to_final_passes(self):
|
||||||
|
report = _report(
|
||||||
|
pages="3", counts="50, 50, 12",
|
||||||
|
final_proof="has_more=false on page 3",
|
||||||
|
)
|
||||||
|
evidence = [
|
||||||
|
_page(1, 50, has_more=True, final=False),
|
||||||
|
_page(2, 50, has_more=True, final=False),
|
||||||
|
_page(3, 12),
|
||||||
|
]
|
||||||
|
result = assess_reconciliation_inventory_proof(
|
||||||
|
report, pagination_evidence=evidence
|
||||||
|
)
|
||||||
|
self.assertTrue(result["complete"])
|
||||||
|
|
||||||
|
def test_no_completeness_claim_needs_no_proof(self):
|
||||||
|
result = assess_reconciliation_inventory_proof(
|
||||||
|
_report(claim=False, fields=False),
|
||||||
|
pagination_evidence=None,
|
||||||
|
)
|
||||||
|
self.assertTrue(result["complete"])
|
||||||
|
|
||||||
|
|
||||||
|
class TestUnprovenScanFails(unittest.TestCase):
|
||||||
|
def test_first_page_exactly_at_limit_fails(self):
|
||||||
|
# 50 returned with per_page 50 and no final-page signal: the page
|
||||||
|
# limit was hit, so completeness is unproven.
|
||||||
|
evidence = [_page(1, 50, has_more=True, final=False)]
|
||||||
|
result = assess_reconciliation_inventory_proof(
|
||||||
|
_report(counts="50", final_proof="none"),
|
||||||
|
pagination_evidence=evidence,
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
self.assertTrue(
|
||||||
|
any("final page" in r.lower() for r in result["reasons"])
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_missing_pagination_evidence_fails(self):
|
||||||
|
result = assess_reconciliation_inventory_proof(
|
||||||
|
_report(), pagination_evidence=None
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
self.assertTrue(
|
||||||
|
any("pagination" in r.lower() for r in result["reasons"])
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_missing_report_fields_fails(self):
|
||||||
|
result = assess_reconciliation_inventory_proof(
|
||||||
|
_report(fields=False),
|
||||||
|
pagination_evidence=[_page(1, 12)],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
self.assertTrue(
|
||||||
|
any("requested page size" in r.lower()
|
||||||
|
for r in result["reasons"])
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_page_count_mismatch_fails(self):
|
||||||
|
# Report claims 1 page; evidence shows 2 were fetched.
|
||||||
|
evidence = [
|
||||||
|
_page(1, 50, has_more=True, final=False),
|
||||||
|
_page(2, 3),
|
||||||
|
]
|
||||||
|
result = assess_reconciliation_inventory_proof(
|
||||||
|
_report(pages="1", counts="50"),
|
||||||
|
pagination_evidence=evidence,
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
self.assertTrue(
|
||||||
|
any("pages fetched" in r.lower() for r in result["reasons"])
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_per_page_count_mismatch_fails(self):
|
||||||
|
evidence = [_page(1, 12)]
|
||||||
|
result = assess_reconciliation_inventory_proof(
|
||||||
|
_report(counts="11"),
|
||||||
|
pagination_evidence=evidence,
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
self.assertTrue(
|
||||||
|
any("count per page" in r.lower() for r in result["reasons"])
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_evidence_page_missing_metadata_fails(self):
|
||||||
|
result = assess_reconciliation_inventory_proof(
|
||||||
|
_report(),
|
||||||
|
pagination_evidence=[{"page": 1}],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["complete"])
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
+260
-2
@@ -24,6 +24,7 @@ from review_proofs import ( # noqa: E402
|
|||||||
ISSUE_SELECTION_CONTINUATION_EXPLICIT,
|
ISSUE_SELECTION_CONTINUATION_EXPLICIT,
|
||||||
ISSUE_SELECTION_REPRESENTED_BY_OPEN_PR,
|
ISSUE_SELECTION_REPRESENTED_BY_OPEN_PR,
|
||||||
assess_author_pr_report,
|
assess_author_pr_report,
|
||||||
|
assess_queue_ordering_proof,
|
||||||
assess_reviewer_baseline_validation_proof,
|
assess_reviewer_baseline_validation_proof,
|
||||||
assess_capability_evidence,
|
assess_capability_evidence,
|
||||||
assess_capability_proof,
|
assess_capability_proof,
|
||||||
@@ -940,13 +941,18 @@ class TestControllerHandoff(unittest.TestCase):
|
|||||||
self.assertIn("Safety", result["missing_fields"])
|
self.assertIn("Safety", result["missing_fields"])
|
||||||
|
|
||||||
def test_review_role_requires_review_fields(self):
|
def test_review_role_requires_review_fields(self):
|
||||||
result = assess_controller_handoff(self.BASE_HANDOFF, role="review")
|
# Issue #320: review handoffs must not carry the legacy
|
||||||
|
# 'Workspace mutations' line, so strip it from the shared base.
|
||||||
|
review_base = "\n".join(
|
||||||
|
line for line in self.BASE_HANDOFF.splitlines()
|
||||||
|
if not line.startswith("- Workspace mutations:"))
|
||||||
|
result = assess_controller_handoff(review_base, role="review")
|
||||||
self.assertEqual(result["verdict"], "incomplete")
|
self.assertEqual(result["verdict"], "incomplete")
|
||||||
self.assertIn("Pinned reviewed head", result["missing_fields"])
|
self.assertIn("Pinned reviewed head", result["missing_fields"])
|
||||||
self.assertIn("Worktree path", result["missing_fields"])
|
self.assertIn("Worktree path", result["missing_fields"])
|
||||||
self.assertIn("Merge result", result["missing_fields"])
|
self.assertIn("Merge result", result["missing_fields"])
|
||||||
|
|
||||||
complete = self.BASE_HANDOFF + "\n" + "\n".join([
|
complete = review_base + "\n" + "\n".join([
|
||||||
"- Selected PR: #999",
|
"- Selected PR: #999",
|
||||||
"- Reviewer eligibility: passed",
|
"- Reviewer eligibility: passed",
|
||||||
"- Pinned reviewed head: 0fdc8f582026b72a229d59a172c0a63ac4aaeaf9",
|
"- Pinned reviewed head: 0fdc8f582026b72a229d59a172c0a63ac4aaeaf9",
|
||||||
@@ -958,6 +964,15 @@ class TestControllerHandoff(unittest.TestCase):
|
|||||||
"- Merge result: merged",
|
"- Merge result: merged",
|
||||||
"- Linked issue status: closed",
|
"- Linked issue status: closed",
|
||||||
"- Cleanup status: branch deleted",
|
"- Cleanup status: branch deleted",
|
||||||
|
"- File edits by reviewer: none",
|
||||||
|
"- Worktree/index mutations: created and removed review worktree",
|
||||||
|
"- Git ref mutations: git fetch prgs",
|
||||||
|
"- MCP/Gitea mutations: none",
|
||||||
|
"- Review mutations: one approve on #999",
|
||||||
|
"- Merge mutations: PR #999 merged",
|
||||||
|
"- Cleanup mutations: removed review worktree",
|
||||||
|
"- External-state mutations: none",
|
||||||
|
"- Read-only diagnostics: git log, git diff",
|
||||||
])
|
])
|
||||||
result = assess_controller_handoff(complete, role="review")
|
result = assess_controller_handoff(complete, role="review")
|
||||||
self.assertEqual(result["verdict"], "complete")
|
self.assertEqual(result["verdict"], "complete")
|
||||||
@@ -1080,6 +1095,144 @@ class TestControllerHandoff(unittest.TestCase):
|
|||||||
self.assertEqual(res2["verdict"], "complete")
|
self.assertEqual(res2["verdict"], "complete")
|
||||||
|
|
||||||
|
|
||||||
|
class TestReviewHandoffPreciseMutationCategories(unittest.TestCase):
|
||||||
|
"""Issue #320: reviewer handoffs drop legacy 'Workspace mutations'."""
|
||||||
|
|
||||||
|
REVIEW_BASE = "\n".join([
|
||||||
|
"## Controller Handoff",
|
||||||
|
"",
|
||||||
|
"- Task: review PR #999",
|
||||||
|
"- Repo: Scaled-Tech-Consulting/Gitea-Tools",
|
||||||
|
"- Role: reviewer",
|
||||||
|
"- Identity: jcwalker3 / prgs-reviewer",
|
||||||
|
"- Issue/PR: PR #999",
|
||||||
|
"- Branch/SHA: feat/x @ 0fdc8f582026b72a229d59a172c0a63ac4aaeaf9",
|
||||||
|
"- Files changed: review_proofs.py",
|
||||||
|
"- Validation: 700 passed, 6 skipped",
|
||||||
|
"- Mutations: one review submitted",
|
||||||
|
"- Current status: review complete",
|
||||||
|
"- Blockers: none",
|
||||||
|
"- Next: controller decides",
|
||||||
|
"- Safety: no self-review; no self-merge; no secrets",
|
||||||
|
"- Selected PR: #999",
|
||||||
|
"- Reviewer eligibility: passed",
|
||||||
|
"- Pinned reviewed head: 0fdc8f582026b72a229d59a172c0a63ac4aaeaf9",
|
||||||
|
"- Worktree path: /repo/branches/review-pr-999",
|
||||||
|
"- Worktree dirty: no",
|
||||||
|
"- Scratch worktree used: yes (/repo/branches/review-pr-999)",
|
||||||
|
"- Unrelated local mutations: none",
|
||||||
|
"- Review decision: approve",
|
||||||
|
"- Merge result: none",
|
||||||
|
"- Linked issue status: open",
|
||||||
|
"- Cleanup status: worktree removed",
|
||||||
|
])
|
||||||
|
|
||||||
|
PRECISE_CATEGORIES = "\n".join([
|
||||||
|
"- File edits by reviewer: none",
|
||||||
|
"- Worktree/index mutations: created and removed review worktree",
|
||||||
|
"- Git ref mutations: git fetch prgs",
|
||||||
|
"- MCP/Gitea mutations: none",
|
||||||
|
"- Review mutations: one approve on #999",
|
||||||
|
"- Merge mutations: none",
|
||||||
|
"- Cleanup mutations: removed review worktree",
|
||||||
|
"- External-state mutations: none",
|
||||||
|
"- Read-only diagnostics: git log, git diff",
|
||||||
|
])
|
||||||
|
|
||||||
|
def _complete_handoff(self, **overrides):
|
||||||
|
text = self.REVIEW_BASE + "\n" + self.PRECISE_CATEGORIES
|
||||||
|
for old, new in overrides.items():
|
||||||
|
text = text.replace(old, new)
|
||||||
|
return text
|
||||||
|
|
||||||
|
def test_review_handoff_with_precise_categories_is_complete(self):
|
||||||
|
result = assess_controller_handoff(
|
||||||
|
self._complete_handoff(), role="review")
|
||||||
|
self.assertEqual(result["verdict"], "complete")
|
||||||
|
self.assertFalse(result["downgraded"])
|
||||||
|
|
||||||
|
def test_review_handoff_rejects_legacy_workspace_mutations_none(self):
|
||||||
|
text = self._complete_handoff() + "\n- Workspace mutations: none"
|
||||||
|
result = assess_controller_handoff(text, role="review")
|
||||||
|
self.assertEqual(result["verdict"], "incomplete")
|
||||||
|
self.assertTrue(result["downgraded"])
|
||||||
|
self.assertTrue(any(
|
||||||
|
"workspace mutations" in reason.lower()
|
||||||
|
for reason in result["reasons"]
|
||||||
|
))
|
||||||
|
|
||||||
|
def test_review_handoff_rejects_legacy_workspace_mutations_any_value(self):
|
||||||
|
text = (self._complete_handoff()
|
||||||
|
+ "\n- Workspace mutations: edited review_proofs.py")
|
||||||
|
result = assess_controller_handoff(text, role="review")
|
||||||
|
self.assertEqual(result["verdict"], "incomplete")
|
||||||
|
self.assertTrue(any(
|
||||||
|
"workspace mutations" in reason.lower()
|
||||||
|
for reason in result["reasons"]
|
||||||
|
))
|
||||||
|
|
||||||
|
def test_review_handoff_missing_precise_categories_is_incomplete(self):
|
||||||
|
result = assess_controller_handoff(self.REVIEW_BASE, role="review")
|
||||||
|
self.assertEqual(result["verdict"], "incomplete")
|
||||||
|
self.assertIn("File edits by reviewer", result["missing_fields"])
|
||||||
|
self.assertIn("Worktree/index mutations", result["missing_fields"])
|
||||||
|
self.assertIn("Read-only diagnostics", result["missing_fields"])
|
||||||
|
|
||||||
|
def test_review_handoff_does_not_require_workspace_mutations(self):
|
||||||
|
result = assess_controller_handoff(
|
||||||
|
self._complete_handoff(), role="review")
|
||||||
|
self.assertNotIn("Workspace mutations", result["missing_fields"])
|
||||||
|
|
||||||
|
def test_request_changes_handoff_with_precise_categories_is_complete(self):
|
||||||
|
text = self._complete_handoff(**{
|
||||||
|
"- Review decision: approve": "- Review decision: request-changes",
|
||||||
|
"- Review mutations: one approve on #999":
|
||||||
|
"- Review mutations: one request_changes on #999",
|
||||||
|
})
|
||||||
|
result = assess_controller_handoff(text, role="review")
|
||||||
|
self.assertEqual(result["verdict"], "complete")
|
||||||
|
|
||||||
|
def test_merge_handoff_with_precise_categories_is_complete(self):
|
||||||
|
text = self._complete_handoff(**{
|
||||||
|
"- Merge result: none": "- Merge result: merged",
|
||||||
|
"- Merge mutations: none": "- Merge mutations: PR #999 merged",
|
||||||
|
})
|
||||||
|
result = assess_controller_handoff(text, role="review")
|
||||||
|
self.assertEqual(result["verdict"], "complete")
|
||||||
|
|
||||||
|
def test_fetch_only_handoff_with_precise_categories_is_complete(self):
|
||||||
|
text = self._complete_handoff(**{
|
||||||
|
"- Review decision: approve": "- Review decision: none",
|
||||||
|
"- Review mutations: one approve on #999": "- Review mutations: none",
|
||||||
|
"- Worktree/index mutations: created and removed review worktree":
|
||||||
|
"- Worktree/index mutations: none",
|
||||||
|
"- Cleanup mutations: removed review worktree":
|
||||||
|
"- Cleanup mutations: none",
|
||||||
|
"- Mutations: one review submitted": "- Mutations: fetch only",
|
||||||
|
})
|
||||||
|
result = assess_controller_handoff(text, role="review")
|
||||||
|
self.assertEqual(result["verdict"], "complete")
|
||||||
|
|
||||||
|
def test_blocked_handoff_with_precise_categories_is_complete(self):
|
||||||
|
text = self._complete_handoff(**{
|
||||||
|
"- Blockers: none": "- Blockers: infra_stop (registry unreachable)",
|
||||||
|
"- Review decision: approve": "- Review decision: none",
|
||||||
|
"- Review mutations: one approve on #999": "- Review mutations: none",
|
||||||
|
})
|
||||||
|
result = assess_controller_handoff(text, role="review")
|
||||||
|
self.assertEqual(result["verdict"], "complete")
|
||||||
|
|
||||||
|
def test_author_role_still_requires_workspace_mutations(self):
|
||||||
|
# Non-review roles keep the legacy contract until their own issues
|
||||||
|
# migrate them.
|
||||||
|
author = TestControllerHandoff.BASE_HANDOFF
|
||||||
|
stripped = "\n".join(
|
||||||
|
line for line in author.splitlines()
|
||||||
|
if not line.startswith("- Workspace mutations:"))
|
||||||
|
result = assess_controller_handoff(stripped, role="author")
|
||||||
|
self.assertEqual(result["verdict"], "incomplete")
|
||||||
|
self.assertIn("Workspace mutations", result["missing_fields"])
|
||||||
|
|
||||||
|
|
||||||
class TestReviewMutationFinalReport(unittest.TestCase):
|
class TestReviewMutationFinalReport(unittest.TestCase):
|
||||||
"""Final reports must list exactly one live review mutation."""
|
"""Final reports must list exactly one live review mutation."""
|
||||||
@@ -2161,6 +2314,111 @@ class TestCreateIssueFinalReport(unittest.TestCase):
|
|||||||
self.assertTrue(result["downgraded"])
|
self.assertTrue(result["downgraded"])
|
||||||
|
|
||||||
|
|
||||||
|
class TestQueueOrderingProof(unittest.TestCase):
|
||||||
|
"""Issue #321: reviewer queue selection must prove ordering."""
|
||||||
|
|
||||||
|
def test_next_eligible_claim_without_policy_fails(self):
|
||||||
|
result = assess_queue_ordering_proof(
|
||||||
|
report_text="Selected the next eligible PR: PR #286.",
|
||||||
|
)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
self.assertTrue(result["claims_selection"])
|
||||||
|
|
||||||
|
def test_next_eligible_claim_with_policy_passes(self):
|
||||||
|
result = assess_queue_ordering_proof(
|
||||||
|
report_text=(
|
||||||
|
"Queue ordering policy: oldest PR number first\n"
|
||||||
|
"Selected the next eligible PR: PR #286."
|
||||||
|
),
|
||||||
|
)
|
||||||
|
self.assertTrue(result["proven"])
|
||||||
|
self.assertEqual(result["policy"], "oldest PR number first")
|
||||||
|
|
||||||
|
def test_newest_first_api_with_oldest_first_selection_passes(self):
|
||||||
|
result = assess_queue_ordering_proof(
|
||||||
|
report_text=(
|
||||||
|
"Queue ordering policy: oldest PR number first\n"
|
||||||
|
"API order was newest-first (PR #291 before PR #286).\n"
|
||||||
|
"Selected the next eligible PR: PR #286."
|
||||||
|
),
|
||||||
|
queue_ordering={
|
||||||
|
"policy": "oldest PR number first",
|
||||||
|
"selected_pr_number": 286,
|
||||||
|
"api_pr_numbers": [291, 286],
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertTrue(result["proven"])
|
||||||
|
|
||||||
|
def test_earlier_actionable_pr_without_skip_reason_fails(self):
|
||||||
|
result = assess_queue_ordering_proof(
|
||||||
|
report_text=(
|
||||||
|
"Queue ordering policy: oldest PR number first\n"
|
||||||
|
"Selected the next eligible PR: PR #300."
|
||||||
|
),
|
||||||
|
queue_ordering={
|
||||||
|
"policy": "oldest PR number first",
|
||||||
|
"selected_pr_number": 300,
|
||||||
|
"api_pr_numbers": [300, 286],
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
self.assertTrue(result["block"])
|
||||||
|
|
||||||
|
def test_priority_override_requires_explanation(self):
|
||||||
|
result = assess_queue_ordering_proof(
|
||||||
|
report_text="Selected the next eligible PR: PR #300.",
|
||||||
|
queue_ordering={
|
||||||
|
"policy": "priority label",
|
||||||
|
"selected_pr_number": 300,
|
||||||
|
"api_pr_numbers": [286, 300],
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
|
||||||
|
def test_priority_override_with_explanation_passes(self):
|
||||||
|
result = assess_queue_ordering_proof(
|
||||||
|
report_text=(
|
||||||
|
"Queue ordering policy: priority label\n"
|
||||||
|
"Priority override: security label on PR #300.\n"
|
||||||
|
"Selected the next eligible PR: PR #300."
|
||||||
|
),
|
||||||
|
queue_ordering={
|
||||||
|
"policy": "priority label",
|
||||||
|
"selected_pr_number": 300,
|
||||||
|
"api_pr_numbers": [286, 300],
|
||||||
|
"priority_override": "security label on PR #300",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertTrue(result["proven"])
|
||||||
|
|
||||||
|
def test_build_final_report_downgrades_missing_ordering_proof(self):
|
||||||
|
report = build_final_report(
|
||||||
|
checkout_proof=_good_checkout(),
|
||||||
|
inventory=_good_inventory(),
|
||||||
|
validation=_good_validation(),
|
||||||
|
contamination=_good_contamination(),
|
||||||
|
identity_eligible=True,
|
||||||
|
merge_performed=False,
|
||||||
|
issue_status_verified=True,
|
||||||
|
capability_evidence=_good_capability_evidence(),
|
||||||
|
sweep=_good_sweep(),
|
||||||
|
live_state=_good_live_state(),
|
||||||
|
role_boundary=_good_role_boundary(),
|
||||||
|
review_mutation=_good_review_mutation(),
|
||||||
|
controller_handoff=_good_handoff(),
|
||||||
|
capability_proof=_good_capability_proof(),
|
||||||
|
sweep_proof=_good_secret_sweep(),
|
||||||
|
worktree_proof={
|
||||||
|
"worktree_path": "/repo/branches/review-feat-issue-224",
|
||||||
|
"porcelain_status": "",
|
||||||
|
"pr_scope_files": ["docs/wiki/Repositories.md"],
|
||||||
|
"scratch_used": True,
|
||||||
|
},
|
||||||
|
report_text="Selected the next eligible PR: PR #286.",
|
||||||
|
)
|
||||||
|
self.assertNotEqual(report["grade"], "A")
|
||||||
|
self.assertFalse(report["queue_ordering_proven"])
|
||||||
|
|
||||||
class TestReviewerBaselineValidationProof(unittest.TestCase):
|
class TestReviewerBaselineValidationProof(unittest.TestCase):
|
||||||
"""Issue #325: baseline validation must use branches/ worktrees."""
|
"""Issue #325: baseline validation must use branches/ worktrees."""
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,139 @@
|
|||||||
|
"""Tests for prior-blocker skip proof verifier (#318)."""
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||||
|
|
||||||
|
from reviewer_blocker_skip import assess_prior_blocker_skip_proof # noqa: E402
|
||||||
|
|
||||||
|
HEAD_CURRENT = "0fdc8f582026b72a229d59a172c0a63ac4aaeaf9"
|
||||||
|
HEAD_BLOCKER = "1111111111111111111111111111111111111111"
|
||||||
|
|
||||||
|
|
||||||
|
def _good_blocker_skip_report(pr_number: int) -> str:
|
||||||
|
return "\n".join([
|
||||||
|
f"Skipped PR #{pr_number} due to prior REQUEST_CHANGES.",
|
||||||
|
f"- PR number: #{pr_number}",
|
||||||
|
f"- Current head SHA: {HEAD_CURRENT}",
|
||||||
|
"- Blocking review decision: request_changes",
|
||||||
|
f"- Blocking review head SHA: {HEAD_CURRENT}",
|
||||||
|
"- Head unchanged since blocker",
|
||||||
|
"- Reason remains blocked: unresolved review feedback at same head",
|
||||||
|
"- Blocker revalidated live in this session via gitea_get_pr_review_feedback",
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
class TestPriorBlockerSkipProof(unittest.TestCase):
|
||||||
|
def test_no_skips_passes(self):
|
||||||
|
result = assess_prior_blocker_skip_proof(
|
||||||
|
"Selected PR #281 for review.",
|
||||||
|
skipped_prs=[],
|
||||||
|
)
|
||||||
|
self.assertTrue(result["proven"])
|
||||||
|
|
||||||
|
def test_blocked_unchanged_with_live_proof_passes(self):
|
||||||
|
report = _good_blocker_skip_report(280)
|
||||||
|
result = assess_prior_blocker_skip_proof(
|
||||||
|
report,
|
||||||
|
skipped_prs=[{
|
||||||
|
"pr_number": 280,
|
||||||
|
"head_sha": HEAD_CURRENT,
|
||||||
|
"blocking_decision": "request_changes",
|
||||||
|
"blocking_review_head_sha": HEAD_CURRENT,
|
||||||
|
"head_changed_since_blocker": False,
|
||||||
|
"blocker_verified": True,
|
||||||
|
}],
|
||||||
|
)
|
||||||
|
self.assertTrue(result["proven"])
|
||||||
|
|
||||||
|
def test_head_changed_after_blocker_blocks_skip(self):
|
||||||
|
result = assess_prior_blocker_skip_proof(
|
||||||
|
_good_blocker_skip_report(280),
|
||||||
|
skipped_prs=[{
|
||||||
|
"pr_number": 280,
|
||||||
|
"head_sha": HEAD_CURRENT,
|
||||||
|
"blocking_decision": "request_changes",
|
||||||
|
"blocking_review_head_sha": HEAD_BLOCKER,
|
||||||
|
"head_changed_since_blocker": True,
|
||||||
|
"blocker_verified": True,
|
||||||
|
}],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
self.assertTrue(any("head changed" in r for r in result["reasons"]))
|
||||||
|
|
||||||
|
def test_missing_live_proof_blocks(self):
|
||||||
|
report = _good_blocker_skip_report(280).replace(
|
||||||
|
"- Blocker revalidated live in this session via gitea_get_pr_review_feedback",
|
||||||
|
"",
|
||||||
|
)
|
||||||
|
result = assess_prior_blocker_skip_proof(
|
||||||
|
report,
|
||||||
|
skipped_prs=[{
|
||||||
|
"pr_number": 280,
|
||||||
|
"head_sha": HEAD_CURRENT,
|
||||||
|
"blocking_decision": "request_changes",
|
||||||
|
"blocking_review_head_sha": HEAD_CURRENT,
|
||||||
|
"head_changed_since_blocker": False,
|
||||||
|
"blocker_verified": True,
|
||||||
|
}],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
self.assertTrue(any("live blocker proof" in r for r in result["reasons"]))
|
||||||
|
|
||||||
|
def test_blocker_unverified_classification_passes(self):
|
||||||
|
report = "\n".join([
|
||||||
|
"Skipped PR #280.",
|
||||||
|
"Classification: BLOCKER_STATUS_UNVERIFIED",
|
||||||
|
"Review feedback could not be fetched live in this session.",
|
||||||
|
])
|
||||||
|
result = assess_prior_blocker_skip_proof(
|
||||||
|
report,
|
||||||
|
skipped_prs=[{
|
||||||
|
"pr_number": 280,
|
||||||
|
"blocking_decision": "request_changes",
|
||||||
|
"blocker_verified": False,
|
||||||
|
}],
|
||||||
|
)
|
||||||
|
self.assertTrue(result["proven"])
|
||||||
|
|
||||||
|
def test_unverified_without_classification_blocks(self):
|
||||||
|
result = assess_prior_blocker_skip_proof(
|
||||||
|
"Skipped PR #280 based on memory from last session.",
|
||||||
|
skipped_prs=[{
|
||||||
|
"pr_number": 280,
|
||||||
|
"blocking_decision": "request_changes",
|
||||||
|
"blocker_verified": False,
|
||||||
|
}],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
self.assertTrue(any("BLOCKER_STATUS_UNVERIFIED" in r for r in result["reasons"]))
|
||||||
|
|
||||||
|
def test_missing_blocking_head_sha_blocks(self):
|
||||||
|
report = _good_blocker_skip_report(280).replace(
|
||||||
|
f"- Blocking review head SHA: {HEAD_CURRENT}",
|
||||||
|
"",
|
||||||
|
)
|
||||||
|
result = assess_prior_blocker_skip_proof(
|
||||||
|
report,
|
||||||
|
skipped_prs=[{
|
||||||
|
"pr_number": 280,
|
||||||
|
"head_sha": HEAD_CURRENT,
|
||||||
|
"blocking_decision": "request_changes",
|
||||||
|
"blocking_review_head_sha": HEAD_CURRENT,
|
||||||
|
"head_changed_since_blocker": False,
|
||||||
|
"blocker_verified": True,
|
||||||
|
}],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
|
||||||
|
|
||||||
|
class TestExport(unittest.TestCase):
|
||||||
|
def test_review_proofs_reexport(self):
|
||||||
|
from review_proofs import assess_prior_blocker_skip_proof as exported
|
||||||
|
|
||||||
|
self.assertTrue(callable(exported))
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
"""Tests for reviewer local-fallback verifier (#324)."""
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||||
|
|
||||||
|
from reviewer_fallback import assess_reviewer_fallback_report # noqa: E402
|
||||||
|
|
||||||
|
|
||||||
|
class TestReviewerFallbackNormalMode(unittest.TestCase):
|
||||||
|
def test_clean_mcp_report_passes(self):
|
||||||
|
report = (
|
||||||
|
"Used gitea_list_prs and gitea_view_pr via MCP reviewer namespace.\n"
|
||||||
|
"Capability evidence: gitea_resolve_task_capability(review_pr)."
|
||||||
|
)
|
||||||
|
result = assess_reviewer_fallback_report(report, mcp_available=True)
|
||||||
|
self.assertTrue(result["proven"])
|
||||||
|
self.assertFalse(result["block"])
|
||||||
|
|
||||||
|
def test_profiles_json_access_blocks(self):
|
||||||
|
report = (
|
||||||
|
"Inspected ~/.config/gitea-tools/profiles.json for reviewer credentials.\n"
|
||||||
|
"Then used gitea_view_pr."
|
||||||
|
)
|
||||||
|
result = assess_reviewer_fallback_report(report, mcp_available=True)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
self.assertTrue(result["block"])
|
||||||
|
self.assertTrue(any("profiles.json" in r for r in result["reasons"]))
|
||||||
|
|
||||||
|
def test_local_list_prs_script_blocks_when_mcp_available(self):
|
||||||
|
report = (
|
||||||
|
"Ran `python list_prs.py --remote prgs` with GITEA_MCP_CONFIG set.\n"
|
||||||
|
"MCP tools were also available."
|
||||||
|
)
|
||||||
|
result = assess_reviewer_fallback_report(
|
||||||
|
report,
|
||||||
|
mcp_available=True,
|
||||||
|
action_log=[{"command": "GITEA_MCP_PROFILE=prgs-reviewer python list_prs.py"}],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
self.assertTrue(result["block"])
|
||||||
|
self.assertTrue(result["script_violations"])
|
||||||
|
|
||||||
|
def test_action_log_profile_access_blocks(self):
|
||||||
|
result = assess_reviewer_fallback_report(
|
||||||
|
"Review complete via MCP.",
|
||||||
|
action_log=[{"path": "/Users/me/.config/gitea-tools/profiles.json", "action": "read"}],
|
||||||
|
mcp_available=True,
|
||||||
|
)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
self.assertTrue(result["block"])
|
||||||
|
|
||||||
|
|
||||||
|
class TestReviewerFallbackRecoveryMode(unittest.TestCase):
|
||||||
|
def _recovery_report(self, **extra):
|
||||||
|
base = "\n".join([
|
||||||
|
"Recovery mode: MCP tools unavailable in this session.",
|
||||||
|
"Local fallback: ran python view_pr.py after capability proof.",
|
||||||
|
"Identity proof: sysadmin / prgs-reviewer",
|
||||||
|
"Profile proof: prgs-reviewer",
|
||||||
|
"Repo proof: Scaled-Tech-Consulting/Gitea-Tools",
|
||||||
|
"Capability proof: gitea.pr.review allowed for recovery command",
|
||||||
|
"Why MCP was unavailable: reviewer MCP namespace failed to start",
|
||||||
|
])
|
||||||
|
return base + ("\n" + extra.get("append", "") if extra.get("append") else "")
|
||||||
|
|
||||||
|
def test_recovery_fallback_with_proof_passes(self):
|
||||||
|
result = assess_reviewer_fallback_report(
|
||||||
|
self._recovery_report(),
|
||||||
|
action_log=[{"command": "python view_pr.py --remote prgs"}],
|
||||||
|
mcp_available=False,
|
||||||
|
recovery_mode=True,
|
||||||
|
)
|
||||||
|
self.assertTrue(result["proven"])
|
||||||
|
self.assertFalse(result["block"])
|
||||||
|
|
||||||
|
def test_recovery_fallback_without_proof_blocks(self):
|
||||||
|
report = (
|
||||||
|
"Recovery mode engaged.\n"
|
||||||
|
"Local fallback: python list_prs.py\n"
|
||||||
|
)
|
||||||
|
result = assess_reviewer_fallback_report(
|
||||||
|
report,
|
||||||
|
mcp_available=False,
|
||||||
|
recovery_mode=True,
|
||||||
|
action_log=[{"command": "python list_prs.py"}],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["proven"])
|
||||||
|
self.assertTrue(result["block"])
|
||||||
|
self.assertTrue(
|
||||||
|
any("recovery" in r.lower() for r in result["reasons"])
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_mcp_unavailable_allows_recovery_attempt(self):
|
||||||
|
result = assess_reviewer_fallback_report(
|
||||||
|
self._recovery_report(),
|
||||||
|
mcp_available=False,
|
||||||
|
recovery_mode=True,
|
||||||
|
)
|
||||||
|
self.assertTrue(result["proven"])
|
||||||
|
|
||||||
|
|
||||||
|
class TestReviewerFallbackExport(unittest.TestCase):
|
||||||
|
def test_review_proofs_reexport(self):
|
||||||
|
from review_proofs import assess_reviewer_fallback_report as exported
|
||||||
|
|
||||||
|
self.assertTrue(callable(exported))
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
Reference in New Issue
Block a user