Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
bump: patch
---

### Fixed

- The babysit merge gate clears `verify:earlier-fail` for a pass at a head of the same change when a trusted person recorded an owner decision on a linked issue after the FAIL's run and before the pass's run was created: a new spec comment, or an issue body edit, that links an owner-decisions row and quotes the owner after `verbatim:`. A FAIL against a done-when item the owner later amended no longer blocks the pull request forever. An amendment without that link, an untrusted edit or comment, a pass judged before the amendment, and any failed read keep the refusal ([#18023](https://github.com/melodic-software/claude-code-plugins/pull/18023)).
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,13 @@
body change alone) and, for each counted pass at the head,
a trusted person edited the body from the last such FAIL's creation to the
pass run's creation and only trusted people edited the body or connected
or disconnected an issue up to its completion (`_body_fixed`). Any
or disconnected an issue up to its completion (`_body_fixed`), or every
counted FAIL there and every counted pass at the head record the same
linked issues and, for each pass, a trusted person recorded an owner
decision on one of them from the last such FAIL's creation to the pass
run's creation: a spec comment (`_spec_comments`) created then, or a body
a trusted person last edited then, that links an owner-decisions row and
quotes the owner (`merge_policy.decision_gaps`; `_spec_amended`). Any
other failed read of a run time or a diff refuses as the next item does;
- a FAIL-named artifact tied to this pull request by number or SHA whose run
cannot be read: `verify:unreadable`. An untied FAIL whose run cannot be read
Expand Down Expand Up @@ -4392,6 +4398,7 @@ def capped(heads: set[str]) -> str:
number, sha, fail_artifacts, passes, judged_at=head
)
or self._body_fixed(number, sha, fail_artifacts, passes)
or self._spec_amended(number, sha, fail_artifacts, passes)
),
)
):
Expand Down Expand Up @@ -4971,6 +4978,85 @@ def _body_fixed(
return False
return True

def _spec_amended(
self,
number: int,
sha: str,
fail_artifacts: dict[str, list[tuple[int, str, Any]]],
passes: list[tuple[int, str, Any]],
) -> bool:
"""Every counted FAIL at `sha` records this pull request, head and
verdict, each counted pass at the head records the same linked
issues as each FAIL, and for each pass a trusted person
(`_trusted_actor`) recorded an owner decision on one of those issues
after the last FAIL's creation, up to the pass run's creation: a spec
comment (`_spec_comments`) created then, or the issue body as last
edited then (ACTIONS_ISSUE_QUERY), that links an owner-decisions row
and quotes the owner (`merge_policy.decision_gaps`). A trusted
change without that link amends nothing. The pass judged an amended
spec the FAIL never read, which the same change cannot carry; a
relink stays `_superseded`'s. A record, time or read that fails is
False."""
fails = fail_artifacts.get(sha, [])
if not passes or not fails:
return False

def decided(text: Any) -> bool:
return not merge_policy.decision_gaps(text)

try:
judged: set[frozenset[int]] = set()
for run_id, name, artifact in fails:
record = self._record(run_id, name, artifact)
if (
record.get("pr") != number
or record.get("head_sha") != sha
or record.get("verdict") != "fail"
):
return False
judged.add(_linked_numbers(record))
if len(judged) != 1:
return False
issues = next(iter(judged))
created = [self._fresh_created(r) for r, _, _ in fails]
if None in created:
return False
last = max(c for c in created if c)
live = self._live_issues.get(number)
if live is None:
live = self._live_issues[number] = self._closing_issues(number)
amended = []
for n in issues & set(live):
nodes = json_array(json_object(live[n].get("comments")).get("nodes"))
trusted = self._spec_comments(nodes)
amended += [
postmerge._time(c.get("createdAt"))
for c in map(json_object, nodes)
if (c.get("databaseId"), c.get("updatedAt")) in trusted
and decided(c.get("body"))
]
edited = live[n].get("lastEditedAt")
if edited is None or postmerge._time(edited) <= last:
continue
node = json_object(
self._graphql(ACTIONS_ISSUE_QUERY, n, "spec issue").get("issue")
)
editor = json_object(node.get("editor"))
if self._trusted_actor(
editor.get("__typename"), editor.get("databaseId")
) and decided(node.get("body")):
amended.append(postmerge._time(node.get("lastEditedAt")))
for run_id, name, artifact in passes:
record = self._record(run_id, name, artifact)
if _linked_numbers(record) != issues:
return False
begun = self._fresh_created(run_id)
if begun is None or not any(last < at <= begun for at in amended):
return False
except (_Unreadable, postmerge.PostMergeReadError):
return False
return True

def _relinked_by_people(
self, number: int, since: datetime, until: datetime, *, body_edit: bool = False
) -> bool:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ def __init__(
self.closing_total: int | None = None
# Each closing issue's body lastEditedAt now, by number.
self.closing_edited: dict[int, str | None] = {}
self.issue_bodies: dict[int, dict[str, Any]] = {}
# Each closing issue's comments now, and a totalCount that cuts them.
self.closing_comments: dict[int, list[dict[str, Any]]] = {}
self.comments_total: dict[int, int] = {}
Expand Down Expand Up @@ -424,6 +425,9 @@ def missing() -> subprocess.CompletedProcess[str]:
else {"__typename": "Issue"} | self.issue(n, kind)
)
return ok({"data": {"repository": {"issueOrPullRequest": node}}})
if any("issue(number:$n){title body" in a for a in args):
n = int(next(a for a in args if a.startswith("n="))[2:])
return ok({"data": {"repository": {"issue": self.issue_bodies[n]}}})
nodes = [self.issue(n, repo) for n, repo in self.closing]
refs = {"totalCount": self.closing_total or len(nodes), "nodes": nodes}
pull = {"body": self.body, "closingIssuesReferences": refs}
Expand Down Expand Up @@ -1724,6 +1728,150 @@ def test_a_pass_created_before_the_fail_keeps_it(self) -> None:
self.assertEqual(read(fake).refusal, "verify:earlier-fail")


class ATrustedSpecAmendmentClearsAnEarlierFailOnTheSameChange(unittest.TestCase):
"""Pull request #18023's shape: a FAIL at an earlier head against issue
#17908's done-when item, the item amended by a trusted comment after the
FAIL's run, and a pass at a head of the same change whose run was
created after the comment. The amendment counts only when it links an
owner-decisions row and quotes the owner (owner decision, option B), so
the pass judged an owner-decided spec and clears the FAIL
(`_spec_amended`); an amendment without that link, an untrusted one or
a pass created before it keep `verify:earlier-fail`."""

STRANGER = {"__typename": "User", "login": "stranger", "databaseId": 999}
ROW = (
"https://github.com/acme/records/blob/"
+ "0" * 40
+ "/docs/owner-decisions.md#L42"
)
DECIDED = f'Item 1 now reads as amended. Decision: {ROW} verbatim: "amend item 1"'

def setUp(self) -> None:
patcher = mock.patch.object(
policy,
"DECISION_ROW",
policy.merge_settings.decision_row_pattern(
"acme/records/docs/owner-decisions.md"
),
)
patcher.start()
self.addCleanup(patcher.stop)

@classmethod
def amended(
cls,
author: dict[str, Any] = HUMAN,
at: str = RELINK_AT,
recorded: bool = True,
body: str | None = None,
) -> FakeGitHub:
"""A FAIL at EARLIER (run 2, created OLDER_START) noting a file, a
pass at HEAD (run 1, created RUN_STARTED) of the same change, no PR
body edit or relink, and comment 9 on issue 7 by `author` created at
`at` with `body` (DECIDED by default), which the pass records as spec
when `recorded`."""
fake = AFixedBodyClearsABodyOnlyFailOnTheSameChange.body_fail(
[NOTE_ON_A_FILE], relink_answer()
)
text = cls.DECIDED if body is None else body
fake.closing_comments[7] = [
comment(9, HUMAN, at, createdAt=at, body=text) | {"author": author}
]
spec = [{"id": 9, "updated_at": at}] if recorded else []
fake.records[named(HEAD, "pass")] = record(
linked_issues=[{**TRUSTED_ISSUE, "spec_comments": spec}]
)
return fake

@classmethod
def body_edited(
cls, body: str | None = None, editor: dict[str, Any] = HUMAN
) -> FakeGitHub:
"""The same FAIL and pass, with issue 7's body last edited at
RELINK_AT by `editor` to `body` (DECIDED by default)."""
fake = AFixedBodyClearsABodyOnlyFailOnTheSameChange.body_fail(
[NOTE_ON_A_FILE], relink_answer()
)
fake.closing_edited[7] = RELINK_AT
fake.issue_bodies[7] = {
"title": "t",
"body": cls.DECIDED if body is None else body,
"lastEditedAt": RELINK_AT,
"author": HUMAN,
"editor": editor,
}
fake.records[named(HEAD, "pass")] = record(
linked_issues=[
{
**TRUSTED_ISSUE,
"last_edited_at": RELINK_AT,
"editor_login": editor.get("login"),
"editor_id": editor.get("databaseId"),
"editor_type": editor.get("__typename"),
}
]
)
return fake

def test_pr_18023s_fail_clears_after_a_trusted_decision_comment(self) -> None:
evidence = read(self.amended())
self.assertIsNone(evidence.refusal)
self.assertEqual(evidence.report()["earlierFails"], [EARLIER])

def test_a_trusted_issue_body_edit_linking_a_decision_clears_it(self) -> None:
self.assertIsNone(read(self.body_edited()).refusal)

def test_a_trusted_amendment_without_a_decision_link_keeps_it(self) -> None:
for label, body in (
("plain text", "Item 1 now reads as amended."),
("row link, no quote", f"Decision: {self.ROW}"),
("quote, no row link", 'verbatim: "amend item 1"'),
("link inside an HTML comment", f'<!-- {self.ROW} --> verbatim: "x"'),
):
with self.subTest(f"comment, {label}"):
fake = self.amended(body=body)
self.assertEqual(read(fake).refusal, "verify:earlier-fail")
with self.subTest(f"issue body, {label}"):
fake = self.body_edited(body=body)
self.assertEqual(read(fake).refusal, "verify:earlier-fail")

def test_an_issue_body_an_outsider_last_edited_keeps_it(self) -> None:
fake = self.body_edited(editor=self.STRANGER)
self.assertEqual(read(fake).refusal, "verify:earlier-fail")

def test_an_untrusted_comment_keeps_it(self) -> None:
for label, author in (
("a stranger", self.STRANGER),
("the lanes App", LANES_ACTOR),
):
with self.subTest(label):
fake = self.amended(author, recorded=False)
self.assertEqual(read(fake).refusal, "verify:earlier-fail")

def test_a_trusted_comment_an_outsider_edited_keeps_it(self) -> None:
fake = self.amended(recorded=False)
fake.closing_comments[7][0] |= {
"lastEditedAt": RELINK_AT,
"editor": self.STRANGER,
}
self.assertEqual(read(fake).refusal, "verify:earlier-fail")

def test_a_pass_created_before_the_amendment_keeps_it(self) -> None:
fake = self.amended(at=PASS_RUNNING)
self.assertEqual(read(fake).refusal, "verify:earlier-fail")

def test_an_amendment_before_the_fail_keeps_it(self) -> None:
fake = self.amended(at="2026-10-13T00:00:00Z")
self.assertEqual(read(fake).refusal, "verify:earlier-fail")

def test_a_pass_on_other_linked_issues_keeps_it(self) -> None:
fake = self.amended()
fake.records[named(EARLIER, "fail")]["linked_issues"] = [
{**TRUSTED_ISSUE, "number": 8}
]
self.assertEqual(read(fake).refusal, "verify:earlier-fail")


class AFailAnsweredInTheBodyGivesWayAtAMergeOnlyHead(unittest.TestCase):
"""A counted FAIL at an earlier head of the same change, answered by a
trusted body edit, gives way at a head that only merged main since once
Expand Down
Loading