Issue 1583. mesh-catalog #404 merged at 2026-10-21 08:16:06 UTC while another delivery plan ran; at 08:16:17 the controller logged 'batches: the assignments cannot be read from the bus: nats: jetstream not enabled', and the merge was acknowledged and lost: no plan until the next mesh-catalog merge (#405, 08:40) made the catch-up find it.
Cause: hearMerge (cmd/mesh-controller/batches.go) wrapped its failures in notNow, which returns link.ErrTryAgain only for inventory.Unreachable errors and ErrPlansBusy; nats.ErrJetStreamNotEnabled is neither, so Server.sourceMoved (internal/link/serve.go) took the merge with Took(). Same class as issue 921.
heldMerge(err): any failure before the merge is kept becomes link.ErrTryAgain wrapping the cause, so sourceMoved holds the announcement on the bus (MergeRedeliverAfter, 5 s to 5 min) and it joins the next batch; every notNow in hearMerge, and firstBuilds' error, go through it. notNow and its other callers are unchanged. A merge already kept is still acknowledged once (MergeOf says known on the next hand-over).
Tests: TestAMergeThatFailsOnAnyErrorIsHeldAndNotTaken (unit); TestAMergeHeardWhileTheBusHasNoJetStreamIsHeldAndRecordedWhenHandedOverAgain (integration: an assignments bucket answering ErrJetStreamNotEnabled; fails on main where the merge is taken). Unit suite and go vet -tags integration clean; mesh-controller.try build-1792572199876952974 passed at 5c94759c (6 min 46 s, integration level included).
Acceptance after delivery: a merge heard while the bus answers an error is held and joins the next batch, with no person's release and nothing held in mesh-delivery.stalled.
Hardening found by the review: issue 1584 (a merge held past a bound raises a condition).
Issue 1583. mesh-catalog #404 merged at 2026-10-21 08:16:06 UTC while another delivery plan ran; at 08:16:17 the controller logged 'batches: the assignments cannot be read from the bus: nats: jetstream not enabled', and the merge was acknowledged and lost: no plan until the next mesh-catalog merge (#405, 08:40) made the catch-up find it.
Cause: hearMerge (cmd/mesh-controller/batches.go) wrapped its failures in notNow, which returns link.ErrTryAgain only for inventory.Unreachable errors and ErrPlansBusy; nats.ErrJetStreamNotEnabled is neither, so Server.sourceMoved (internal/link/serve.go) took the merge with Took(). Same class as issue 921.
- `heldMerge(err)`: any failure before the merge is kept becomes link.ErrTryAgain wrapping the cause, so sourceMoved holds the announcement on the bus (MergeRedeliverAfter, 5 s to 5 min) and it joins the next batch; every notNow in hearMerge, and firstBuilds' error, go through it. notNow and its other callers are unchanged. A merge already kept is still acknowledged once (MergeOf says known on the next hand-over).
Tests: `TestAMergeThatFailsOnAnyErrorIsHeldAndNotTaken` (unit); `TestAMergeHeardWhileTheBusHasNoJetStreamIsHeldAndRecordedWhenHandedOverAgain` (integration: an assignments bucket answering ErrJetStreamNotEnabled; fails on main where the merge is taken). Unit suite and `go vet -tags integration` clean; mesh-controller.try build-1792572199876952974 passed at 5c94759c (6 min 46 s, integration level included).
Acceptance after delivery: a merge heard while the bus answers an error is held and joins the next batch, with no person's release and nothing held in mesh-delivery.stalled.
Hardening found by the review: issue 1584 (a merge held past a bound raises a condition).
Reviewed-by: reviewer-1583@shanks at 5c94759cc0c285b5f7ff6d4b8b742e7bfb1dae92
mesh/merge-gate head 5c94759cc0c2 merged into trunk c8539bf35a8d — pass: builds mesh-controller → novox; no bus step; every machine composes with the chang…
Deliverynovox/mesh-controller@5c94759cc0c2 — delivered since 2026-10-21T09:06:51Z
Delivery plan — builds mesh-controller → novox; no bus step
tier 0: mesh-controller
novox: receives mesh-controller
Machines
mesh-controller on every machine running it: sent
Transitions
2026-10-21 08:52 (new) → proposed (announced): novox/mesh-controller#414's head announced
2026-10-21 09:01 proposed → checked (checked): a verdict names this commit and the trunk's head as its trunk commit
2026-10-21 09:01 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
2026-10-21 09:06 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
2026-10-21 09:06 published → delivering (go): its walk started: let go by this owner in its group's order, by a person, or on the controller's own path — not a failed walk that carried a later commit for it, after which it waits for a walk of its own commit
2026-10-21 09:06 delivering → delivered (done): its walk is done, carrying its own commit: every machine of its deploy plan passed, or was left as its policy says
The commit's note under refs/notes/mesh-plan keeps every transition: git log --notes=mesh-plan.
<!-- mesh-delivery:view -->
**Delivery** `novox/mesh-controller@5c94759cc0c2` — **delivered** since 2026-10-21T09:06:51Z
**Delivery plan** — builds mesh-controller → novox; no bus step
- tier 0: mesh-controller
- novox: receives mesh-controller
**Machines**
- mesh-controller on every machine running it: sent
**Transitions**
- 2026-10-21 08:52 (new) → proposed (announced): novox/mesh-controller#414's head announced
- 2026-10-21 09:01 proposed → checked (checked): a verdict names this commit and the trunk's head as its trunk commit
- 2026-10-21 09:01 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
- 2026-10-21 09:06 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
- 2026-10-21 09:06 published → delivering (go): its walk started: let go by this owner in its group's order, by a person, or on the controller's own path — not a failed walk that carried a later commit for it, after which it waits for a walk of its own commit
- 2026-10-21 09:06 delivering → delivered (done): its walk is done, carrying its own commit: every machine of its deploy plan passed, or was left as its policy says
The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Issue 1583. mesh-catalog #404 merged at 2026-10-21 08:16:06 UTC while another delivery plan ran; at 08:16:17 the controller logged 'batches: the assignments cannot be read from the bus: nats: jetstream not enabled', and the merge was acknowledged and lost: no plan until the next mesh-catalog merge (#405, 08:40) made the catch-up find it.
Cause: hearMerge (cmd/mesh-controller/batches.go) wrapped its failures in notNow, which returns link.ErrTryAgain only for inventory.Unreachable errors and ErrPlansBusy; nats.ErrJetStreamNotEnabled is neither, so Server.sourceMoved (internal/link/serve.go) took the merge with Took(). Same class as issue 921.
heldMerge(err): any failure before the merge is kept becomes link.ErrTryAgain wrapping the cause, so sourceMoved holds the announcement on the bus (MergeRedeliverAfter, 5 s to 5 min) and it joins the next batch; every notNow in hearMerge, and firstBuilds' error, go through it. notNow and its other callers are unchanged. A merge already kept is still acknowledged once (MergeOf says known on the next hand-over).Tests:
TestAMergeThatFailsOnAnyErrorIsHeldAndNotTaken(unit);TestAMergeHeardWhileTheBusHasNoJetStreamIsHeldAndRecordedWhenHandedOverAgain(integration: an assignments bucket answering ErrJetStreamNotEnabled; fails on main where the merge is taken). Unit suite andgo vet -tags integrationclean; mesh-controller.try build-1792572199876952974 passed at5c94759c(6 min 46 s, integration level included).Acceptance after delivery: a merge heard while the bus answers an error is held and joins the next batch, with no person's release and nothing held in mesh-delivery.stalled.
Hardening found by the review: issue 1584 (a merge held past a bound raises a condition).
Reviewed-by: reviewer-1583@shanks at
5c94759cc0Delivery
novox/mesh-controller@5c94759cc0c2— delivered since 2026-10-21T09:06:51ZDelivery plan — builds mesh-controller → novox; no bus step
Machines
Transitions
The commit's note under
refs/notes/mesh-plankeeps every transition:git log --notes=mesh-plan.Merge check at
5c94759cJudged: head
5c94759cc0c2merged into trunkc8539bf35a8d; read beside it: mesh-catalog17d2f7fd5df1, mesh-controller-mainc8539bf35a8d, mesh-hostc5c4caa2a4ab, mesh-toolse0fadc43d9ddmesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: mesh-controller)mesh/repo-check: PASS — its merge-check.sh passedDelivery plan — builds mesh-controller → novox; no bus step
Run by the build seat on ace as
build-1792572762921704996(builds --log build-1792572762921704996).