Unbreak main, red from two semantic merge collisions #813

Closed

coilyco-ops wants to merge 1 commit from aos/claude/yt58-unbreak-main into main

coilyco-ops commented

2026-08-15 16:33:41 +00:00

Member

main at af5816c does not pass ward exec gate on a clean checkout. Found while branching for #370. Two independent breakages, neither introduced by any single pull request.

The compile break

deliverOrReport grew a fourth argument in #803. replyfailure_test.go:229 was written against the three-argument form on a branch cut before that landed, so once both merged the test package stopped compiling:

vet: internal/community/replyfailure_test.go:229:71: not enough arguments in call to agent.deliverOrReport
	have (context.Context, *rejectingTurn, string)
	want (context.Context, turnIO, string, string)

ward exec vet and ward exec test both fail, so the test job is red for every branch cut from main right now.

The fix is the fourth argument, nothingWithheld, matching undelivered_test.go:111 which is the sibling call and was updated. The test is about Discord verdict classification and has nothing to do with withheld content, so the sentinel is the correct value rather than a placeholder.

The doc cap break

docs/sirens-echo-delivery-failures.md was edited by both #803 and #807. Each left it inside the 80-line cap against the base it was cut from; the merge of both put it at 81, so documentation-layout and catalog-doc-size fail.

One paragraph in "What this does not do" is reflowed from four lines to three. The attribution needs becomes That needs. No meaning is dropped and no other prose is touched. I did not raise the cap.

Why this is its own pull request

It is unrelated to the work I was starting, and main being red blocks every branch, not just mine. Merging this first means the next PR's CI failure means something.

The pattern

Both are the shape #788 described: a branch is green against the base it was cut from, and nothing re-checks it against the base it lands on. A merge-queue style pre-merge rebuild would catch both, and neither reviewer could have caught either by reading the diff. Worth its own issue if you want it chased; I have not filed one because the remedy is a CI policy decision rather than a code change.

Verified

ward exec gate green on this branch: build, policy-check, vet, test, test-skips, pre-commit. It fails on main without these two changes, which is the point.

**`main` at `af5816c` does not pass `ward exec gate` on a clean checkout.** Found while branching for #370. Two independent breakages, neither introduced by any single pull request. ## The compile break `deliverOrReport` grew a fourth argument in #803. `replyfailure_test.go:229` was written against the three-argument form on a branch cut before that landed, so once both merged the test package stopped compiling: ``` vet: internal/community/replyfailure_test.go:229:71: not enough arguments in call to agent.deliverOrReport have (context.Context, *rejectingTurn, string) want (context.Context, turnIO, string, string) ``` `ward exec vet` and `ward exec test` both fail, so the `test` job is red for every branch cut from `main` right now. The fix is the fourth argument, `nothingWithheld`, matching `undelivered_test.go:111` which is the sibling call and was updated. The test is about Discord verdict classification and has nothing to do with withheld content, so the sentinel is the correct value rather than a placeholder. ## The doc cap break `docs/sirens-echo-delivery-failures.md` was edited by both #803 and #807. Each left it inside the 80-line cap against the base it was cut from; the merge of both put it at 81, so `documentation-layout` and `catalog-doc-size` fail. One paragraph in "What this does not do" is reflowed from four lines to three. `The attribution needs` becomes `That needs`. No meaning is dropped and no other prose is touched. I did not raise the cap. ## Why this is its own pull request It is unrelated to the work I was starting, and `main` being red blocks every branch, not just mine. Merging this first means the next PR's CI failure means something. ## The pattern Both are the shape #788 described: a branch is green against the base it was cut from, and nothing re-checks it against the base it lands on. A merge-queue style pre-merge rebuild would catch both, and neither reviewer could have caught either by reading the diff. Worth its own issue if you want it chased; I have not filed one because the remedy is a CI policy decision rather than a code change. ## Verified `ward exec gate` green on this branch: build, policy-check, vet, test, test-skips, pre-commit. It fails on `main` without these two changes, which is the point.

coilyco-ops added 1 commit

2026-08-15 16:33:42 +00:00

fix(ci): unbreak main, red from two semantic merge collisions

ci / image-build (pull_request) Successful in 20s

Details

ci / test (pull_request) Successful in 45s

Details

ci / publish-echo-image (pull_request) Has been skipped

Details

ci / publish-observed (pull_request) Has been skipped

Details

e16d134353

`main` at af5816c fails `ward exec gate` on a clean checkout, in two
places, neither of which any single pull request introduced.

`deliverOrReport` took a fourth argument in #803. `replyfailure_test.go`
was written against the three-argument form on a branch cut before that,
so the test package stopped compiling once both landed. `go vet` and
`go test` both fail.

`docs/sirens-echo-delivery-failures.md` was edited by #803 and #807.
Each left it inside the 80-line cap on its own base and the merge of
both put it at 81, so documentation-layout fails. One paragraph is
reflowed from four lines to three, with no meaning dropped.

Both are the shape #788 described: a branch is green against the base it
was cut from, and nothing re-checks it against the base it lands on.

Co-authored-by: Kai Siren <coilysiren@gmail.com>
Co-authored-by: Claude <noreply@anthropic.com>