Two follow-ups to #197 (hq ADR 0276), on a branch off main after #197's merge. Tracker issues 377 (the mixed batch) and 378 (the plan line).
1. A merge on the controller's own path never shares a batch with a catalogue merge (issue 377)
Decided during the build on 2026-10-10 (ADR 0276's dated note, hq#277). #197 as merged holds the first cut of this rule (PlanBatch.Own, a batch per kind). This PR fixes what its review found:
Blocker: an own-path batch no longer folds a waiting catalogue walk into a batch. The merged mesh-delivery (d2af46b) ends a delivery as superseded when taken_over_by names a batch, so rebatchWaiting is gone. An own-path batch is cut beside the waiting catalogue walk, which keeps waiting; it folds nothing.
One walk at a time by deferral, not refusal.deliver (letGo) takes the word even while another walk is started; the walk asks its first tier only once no other started walk is open (startedBeside, in advanceOnce), noting "let go; starts once plan-X ended". mesh-delivery says its word once and is never refused; before, a refused deliver would have been retried on a doubling backoff.
An own-path batch whose window closed is cut before a catalogue one, so the catalogue batch queues behind it instead of being cut and overtaken.
A late catalogue merge is not answered by a walk that waited for nobody while the delivery seat has a holder (a mixed merge's walk): it joins the next catalogue batch. With no holder on record, any walk that built it answers, as before.
Whether a walk waits for its word is read from what its merges moved, never from the modules a folded walk carried along (which hold dependents).
Unchanged and said: a single merge that touches both an own-path module and a catalogue module (e.g. modules/nats and modules/app) is one own-path merge and starts without the word, as it always did.
2. plans names a walk by what it moves (issue 378)
The operator asked why a plan is called "mesh-catalog". The list line now reads <plan id> <repo> #<pr> <title, cut at 50> · <modules it moves> → <machines running them> · <state words>, e.g. mesh-catalog #175 a tap shows its outcome · messenger, telegram → novox · tier 1 of 1, building for 2m0s. The plan id stays first (tools parse it). The pull request's number and title come from the forge's merge announcement (link.SourceMoved gains title; the record keeps number, title and the moved modules per merge: delivery.merges[].number/title/moves, a backward-compatible wire addition). A record naming no pull request is named by its commit, as before; nothing is fetched. A batch's line is followed by one line per repository (mesh-catalog #175 dunst: the font the operator chose (answers #174 claude-code: an agent proposes a section) · app, notes), the moved modules once per repository. status keeps the headline without the machines.
Tests
TestAMergeOnTheControllersPathNeverSharesABatch (rewritten): a controller merge and two catalogue merges in one window are two batches; the controller's is cut first and starts; the catalogue batch queues behind it, is cut when the controller's walk ended, waits for its word with both merges, and no catalogue module is asked without the word; a catalogue walk waiting when an own-path batch is cut keeps waiting beside it, is not folded, takes its word meanwhile, and starts once the own-path walk ended.
TestAWalkLetGoBesideAStartedOneStartsOnceItEnded, TestALateCatalogueMergeIsNotAnsweredByAnOwnPathWalk, TestAPlanLineNamesWhatItMoves (with machines, without, a record naming no pull request, a long title cut), and TestTheAssemblingBatchIsShown gains the per-repository lines.
Mutation pass, each killed by a named test: own batch folds the waiting walk; catalogue batch cut before the own one; no deferral; own-path walk answers a late catalogue merge; batch line without the pull request; headline without the pull request; title never cut; no machines; moves not kept; own path never; one batch for both kinds. Not covered by a mutant: reading the wait from direct moves rather than a fold's carry (needs an own-path module standing on a catalogue module, which the test catalogue has no edge for).
Full suite and vet green. Not merged: one controller rollout at a time; #197's plan goes first.
Two follow-ups to #197 (hq ADR 0276), on a branch off main after #197's merge. Tracker issues 377 (the mixed batch) and 378 (the plan line).
## 1. A merge on the controller's own path never shares a batch with a catalogue merge (issue 377)
Decided during the build on 2026-10-10 (ADR 0276's dated note, hq#277). #197 as merged holds the first cut of this rule (`PlanBatch.Own`, a batch per kind). This PR fixes what its review found:
- **Blocker: an own-path batch no longer folds a waiting catalogue walk into a batch.** The merged mesh-delivery (d2af46b) ends a delivery as `superseded` when `taken_over_by` names a batch, so `rebatchWaiting` is gone. An own-path batch is cut beside the waiting catalogue walk, which keeps waiting; it folds nothing.
- **One walk at a time by deferral, not refusal.** `deliver` (letGo) takes the word even while another walk is started; the walk asks its first tier only once no other started walk is open (`startedBeside`, in advanceOnce), noting "let go; starts once plan-X ended". mesh-delivery says its word once and is never refused; before, a refused `deliver` would have been retried on a doubling backoff.
- **An own-path batch whose window closed is cut before a catalogue one**, so the catalogue batch queues behind it instead of being cut and overtaken.
- **A late catalogue merge is not answered by a walk that waited for nobody** while the delivery seat has a holder (a mixed merge's walk): it joins the next catalogue batch. With no holder on record, any walk that built it answers, as before.
- **Whether a walk waits for its word is read from what its merges moved**, never from the modules a folded walk carried along (which hold dependents).
Unchanged and said: a single merge that touches both an own-path module and a catalogue module (e.g. `modules/nats` and `modules/app`) is one own-path merge and starts without the word, as it always did.
## 2. `plans` names a walk by what it moves (issue 378)
The operator asked why a plan is called "mesh-catalog". The list line now reads `<plan id> <repo> #<pr> <title, cut at 50> · <modules it moves> → <machines running them> · <state words>`, e.g. `mesh-catalog #175 a tap shows its outcome · messenger, telegram → novox · tier 1 of 1, building for 2m0s`. The plan id stays first (tools parse it). The pull request's number and title come from the forge's merge announcement (`link.SourceMoved` gains `title`; the record keeps number, title and the moved modules per merge: `delivery.merges[].number/title/moves`, a backward-compatible wire addition). A record naming no pull request is named by its commit, as before; nothing is fetched. A batch's line is followed by one line per repository (`mesh-catalog #175 dunst: the font the operator chose (answers #174 claude-code: an agent proposes a section) · app, notes`), the moved modules once per repository. `status` keeps the headline without the machines.
## Tests
- `TestAMergeOnTheControllersPathNeverSharesABatch` (rewritten): a controller merge and two catalogue merges in one window are two batches; the controller's is cut first and starts; the catalogue batch queues behind it, is cut when the controller's walk ended, waits for its word with both merges, and no catalogue module is asked without the word; a catalogue walk waiting when an own-path batch is cut keeps waiting beside it, is not folded, takes its word meanwhile, and starts once the own-path walk ended.
- `TestAWalkLetGoBesideAStartedOneStartsOnceItEnded`, `TestALateCatalogueMergeIsNotAnsweredByAnOwnPathWalk`, `TestAPlanLineNamesWhatItMoves` (with machines, without, a record naming no pull request, a long title cut), and `TestTheAssemblingBatchIsShown` gains the per-repository lines.
- Mutation pass, each killed by a named test: own batch folds the waiting walk; catalogue batch cut before the own one; no deferral; own-path walk answers a late catalogue merge; batch line without the pull request; headline without the pull request; title never cut; no machines; moves not kept; own path never; one batch for both kinds. Not covered by a mutant: reading the wait from direct moves rather than a fold's carry (needs an own-path module standing on a catalogue module, which the test catalogue has no edge for).
Full suite and vet green. Not merged: one controller rollout at a time; #197's plan goes first.
mesh/merge-gate pass: builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step; every machine composes with the change as it did without …
Deliverynovox/mesh-controller@16362e1bbd9d — delivered since 2026-10-10T13:25:03Z
Delivery plan — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
tier 0: mesh-controller
tier 1: build-agent
ace: receives build-agent
g14: receives build-agent
novox: receives mesh-controller, build-agent
shanks: receives build-agent
build-agent keeps data (ADR 0233): what it holds is backed up before it moves
Machines
mesh-controller on novox: passed — healthy 3 times over 3m38s
mesh-controller on the rest running it: sent
build-agent on ace: passed — healthy 3 times over 3m12s
build-agent on the rest running it: sent
Transitions
2026-10-10 12:53 (new) → proposed (announced): novox/mesh-controller#200's head announced
2026-10-10 12:58 proposed → checked (checked): the verdict names this commit
2026-10-10 12:58 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
2026-10-10 13:16 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
2026-10-10 13:16 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-10 13:25 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@16362e1bbd9d` — **delivered** since 2026-10-10T13:25:03Z
**Delivery plan** — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
- tier 0: mesh-controller
- tier 1: build-agent
- ace: receives build-agent
- g14: receives build-agent
- novox: receives mesh-controller, build-agent
- shanks: receives build-agent
- build-agent keeps data (ADR 0233): what it holds is backed up before it moves
**Machines**
- mesh-controller on novox: passed — healthy 3 times over 3m38s
- mesh-controller on the rest running it: sent
- build-agent on ace: passed — healthy 3 times over 3m12s
- build-agent on the rest running it: sent
**Transitions**
- 2026-10-10 12:53 (new) → proposed (announced): novox/mesh-controller#200's head announced
- 2026-10-10 12:58 proposed → checked (checked): the verdict names this commit
- 2026-10-10 12:58 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
- 2026-10-10 13:16 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
- 2026-10-10 13:16 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-10 13:25 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/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller)
mesh/repo-check: PASS — its merge-check.sh passed
Delivery plan — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
tier 0: mesh-controller
tier 1: build-agent
ace: receives build-agent
g14: receives build-agent
novox: receives mesh-controller, build-agent
shanks: receives build-agent
build-agent keeps data (ADR 0233): what it holds is backed up before it moves
read by no module's build: cmd/mesh-controller/batches_test.go
Run by the build seat on g14 as build-1791635824113093108 (builds --log build-1791635824113093108).
--- the gate: build-agent, mesh-controller
mesh-controller: ok, 55 tool(s); WARNING: merge-window ask(s) for a setting and do(es) not say whether it is trusted, so it counts as trusted: set at the terminal alone; say "trusted" false where nothing trusts it (novox/hq issue 339); WARNING: controller stay(s) up and say(s) not how it is ready — judged by liveness alone, refused from 2026-11-18 (ADR 0240 rule 8)
long-running resources without health: 1
files asking for a setting without saying whether it is trusted: 1
1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here
judging 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T12:28:18Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-10T12:28:18Z
modules the change moves:
- mesh-controller (changed)
machines:
- a machine (f35): composes
- holds mesh-dns-resolver (idt): composes
- holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
- a machine (yvbpsm): composes
a merge would rebuild 2 module(s) in 2 tier(s): build-agent, mesh-controller
--- its merge-check.sh (go toolchain)
ok github.com/novox/mesh-controller/cmd/mesh-builder 1.028s
ok github.com/novox/mesh-controller/cmd/mesh-controller 225.416s
ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.022s
ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.029s
ok github.com/novox/mesh-controller/examples/redis-provisioner 1.022s
ok github.com/novox/mesh-controller/examples/route-proxy 1.162s
ok github.com/novox/mesh-controller/internal/artifacts 1.052s
ok github.com/novox/mesh-controller/internal/broker 2.639s
ok github.com/novox/mesh-controller/internal/builder 2.522s
ok github.com/novox/mesh-controller/internal/catalogue 4.535s
ok github.com/novox/mesh-controller/internal/conditions 2.388s
ok github.com/novox/mesh-controller/internal/envfile 1.031s
ok github.com/novox/mesh-controller/internal/facts 1.029s
ok github.com/novox/mesh-controller/internal/identity 4.200s
ok github.com/novox/mesh-controller/internal/inventory 77.822s
ok github.com/novox/mesh-controller/internal/lease 17.619s
ok github.com/novox/mesh-controller/internal/licences 3.740s
ok github.com/novox/mesh-controller/internal/licences/adapters 1.007s
ok github.com/novox/mesh-controller/internal/link 52.104s
ok github.com/novox/mesh-controller/internal/lint 2.016s
ok github.com/novox/mesh-controller/internal/outward 1.029s
ok github.com/novox/mesh-controller/internal/overlay 1.019s
ok github.com/novox/mesh-controller/internal/secrets 1.453s
ok github.com/novox/mesh-controller/internal/store 3.206s
ok github.com/novox/mesh-controller/internal/testbus 1.162s
ok github.com/novox/mesh-controller/internal/token 1.012s
**Merge check** at `04fcce2f`
- `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller)
- `mesh/repo-check`: **PASS** — its merge-check.sh passed
**Delivery plan** — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
- tier 0: mesh-controller
- tier 1: build-agent
- ace: receives build-agent
- g14: receives build-agent
- novox: receives mesh-controller, build-agent
- shanks: receives build-agent
- build-agent keeps data (ADR 0233): what it holds is backed up before it moves
- read by no module's build: cmd/mesh-controller/batches_test.go
Run by the build seat on g14 as `build-1791635824113093108` (`builds --log build-1791635824113093108`).
```
--- the gate: build-agent, mesh-controller
mesh-controller: ok, 55 tool(s); WARNING: merge-window ask(s) for a setting and do(es) not say whether it is trusted, so it counts as trusted: set at the terminal alone; say "trusted" false where nothing trusts it (novox/hq issue 339); WARNING: controller stay(s) up and say(s) not how it is ready — judged by liveness alone, refused from 2026-11-18 (ADR 0240 rule 8)
long-running resources without health: 1
files asking for a setting without saying whether it is trusted: 1
1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here
judging 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T12:28:18Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-10T12:28:18Z
modules the change moves:
- mesh-controller (changed)
machines:
- a machine (f35): composes
- holds mesh-dns-resolver (idt): composes
- holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
- a machine (yvbpsm): composes
a merge would rebuild 2 module(s) in 2 tier(s): build-agent, mesh-controller
--- its merge-check.sh (go toolchain)
ok github.com/novox/mesh-controller/cmd/mesh-builder 1.028s
ok github.com/novox/mesh-controller/cmd/mesh-controller 225.416s
ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.022s
ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.029s
ok github.com/novox/mesh-controller/examples/redis-provisioner 1.022s
ok github.com/novox/mesh-controller/examples/route-proxy 1.162s
ok github.com/novox/mesh-controller/internal/artifacts 1.052s
ok github.com/novox/mesh-controller/internal/broker 2.639s
ok github.com/novox/mesh-controller/internal/builder 2.522s
ok github.com/novox/mesh-controller/internal/catalogue 4.535s
ok github.com/novox/mesh-controller/internal/conditions 2.388s
ok github.com/novox/mesh-controller/internal/envfile 1.031s
ok github.com/novox/mesh-controller/internal/facts 1.029s
ok github.com/novox/mesh-controller/internal/identity 4.200s
ok github.com/novox/mesh-controller/internal/inventory 77.822s
ok github.com/novox/mesh-controller/internal/lease 17.619s
ok github.com/novox/mesh-controller/internal/licences 3.740s
ok github.com/novox/mesh-controller/internal/licences/adapters 1.007s
ok github.com/novox/mesh-controller/internal/link 52.104s
ok github.com/novox/mesh-controller/internal/lint 2.016s
ok github.com/novox/mesh-controller/internal/outward 1.029s
ok github.com/novox/mesh-controller/internal/overlay 1.019s
ok github.com/novox/mesh-controller/internal/secrets 1.453s
ok github.com/novox/mesh-controller/internal/store 3.206s
ok github.com/novox/mesh-controller/internal/testbus 1.162s
ok github.com/novox/mesh-controller/internal/token 1.012s
```
mesh/merge-gate pass: builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step; every machine composes with the change as it did without …
After review (head 3496b58): a walk let go while another walk is started now reads as a wait, not as a tier running late: plans and status say its note ("let go; starts once plan-X ended"), the line never says LATE for it, and S3 leaves it out (deferred, release_plan.go). Test: TestAWalkLetGoBesideAStartedOneStartsOnceItEnded, an hour on.
Left as follow-ups, said here:
A late catalogue merge that joins the next catalogue batch is named by its own, older commit. The walk builds the branch's tip (which the own-path walk already built), under the word, which is the intent; but the record names the older commit, and the module's recorded head moves back to it until the build registers the tip. Naming it as carried by the branch's known newest commit is the fix; not in this PR.
mesh-delivery marks a delivery delivering while its walk is deferred. With the word accepted, the walk reads as started to mesh-delivery (WalkSeen.Started), so the delivery moves to delivering before anything is built; nothing ends it, and stalled lists it only after 2 h. The walk's note, which reaches mesh-delivery through plan-moved, says why. Acceptable for the deferral's length; a deferred word on the wire would let mesh-delivery say it.
After review (head 3496b58): a walk let go while another walk is started now reads as a wait, not as a tier running late: `plans` and `status` say its note ("let go; starts once plan-X ended"), the line never says LATE for it, and S3 leaves it out (`deferred`, release_plan.go). Test: TestAWalkLetGoBesideAStartedOneStartsOnceItEnded, an hour on.
Left as follow-ups, said here:
- **A late catalogue merge that joins the next catalogue batch is named by its own, older commit.** The walk builds the branch's tip (which the own-path walk already built), under the word, which is the intent; but the record names the older commit, and the module's recorded head moves back to it until the build registers the tip. Naming it as carried by the branch's known newest commit is the fix; not in this PR.
- **mesh-delivery marks a delivery `delivering` while its walk is deferred.** With the word accepted, the walk reads as started to mesh-delivery (WalkSeen.Started), so the delivery moves to `delivering` before anything is built; nothing ends it, and `stalled` lists it only after 2 h. The walk's note, which reaches mesh-delivery through plan-moved, says why. Acceptable for the deferral's length; a `deferred` word on the wire would let mesh-delivery say it.
mesh/merge-gate pass: builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step; every machine composes with the change as it did without …
mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller)
mesh/repo-check: PASS — its merge-check.sh passed
Delivery plan — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
tier 0: mesh-controller
tier 1: build-agent
ace: receives build-agent
g14: receives build-agent
novox: receives mesh-controller, build-agent
shanks: receives build-agent
build-agent keeps data (ADR 0233): what it holds is backed up before it moves
read by no module's build: cmd/mesh-controller/batches_test.go
Run by the build seat on novox as build-1791636522469697544 (builds --log build-1791636522469697544).
--- the gate: build-agent, mesh-controller
mesh-controller: ok, 55 tool(s); WARNING: merge-window ask(s) for a setting and do(es) not say whether it is trusted, so it counts as trusted: set at the terminal alone; say "trusted" false where nothing trusts it (novox/hq issue 339); WARNING: controller stay(s) up and say(s) not how it is ready — judged by liveness alone, refused from 2026-11-18 (ADR 0240 rule 8)
long-running resources without health: 1
files asking for a setting without saying whether it is trusted: 1
1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here
judging 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T12:47:18Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-10T12:47:18Z
modules the change moves:
- mesh-controller (changed)
machines:
- a machine (f35): composes
- holds mesh-dns-resolver (idt): composes
- holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
- a machine (yvbpsm): composes
a merge would rebuild 2 module(s) in 2 tier(s): build-agent, mesh-controller
--- its merge-check.sh (go toolchain)
ok github.com/novox/mesh-controller/cmd/mesh-builder 1.044s
ok github.com/novox/mesh-controller/cmd/mesh-controller 261.865s
ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.020s
ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.026s
ok github.com/novox/mesh-controller/examples/redis-provisioner 1.019s
ok github.com/novox/mesh-controller/examples/route-proxy 1.120s
ok github.com/novox/mesh-controller/internal/artifacts 1.053s
ok github.com/novox/mesh-controller/internal/broker 4.596s
ok github.com/novox/mesh-controller/internal/builder 4.987s
ok github.com/novox/mesh-controller/internal/catalogue 5.000s
ok github.com/novox/mesh-controller/internal/conditions 2.491s
ok github.com/novox/mesh-controller/internal/envfile 1.030s
ok github.com/novox/mesh-controller/internal/facts 1.031s
ok github.com/novox/mesh-controller/internal/identity 13.830s
ok github.com/novox/mesh-controller/internal/inventory 102.932s
ok github.com/novox/mesh-controller/internal/lease 18.677s
ok github.com/novox/mesh-controller/internal/licences 13.088s
ok github.com/novox/mesh-controller/internal/licences/adapters 1.013s
ok github.com/novox/mesh-controller/internal/link 57.539s
ok github.com/novox/mesh-controller/internal/lint 2.141s
ok github.com/novox/mesh-controller/internal/outward 1.032s
ok github.com/novox/mesh-controller/internal/overlay 1.288s
ok github.com/novox/mesh-controller/internal/secrets 1.463s
ok github.com/novox/mesh-controller/internal/store 7.781s
ok github.com/novox/mesh-controller/internal/testbus 1.179s
ok github.com/novox/mesh-controller/internal/token 1.014s
**Merge check** at `3496b58f`
- `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller)
- `mesh/repo-check`: **PASS** — its merge-check.sh passed
**Delivery plan** — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
- tier 0: mesh-controller
- tier 1: build-agent
- ace: receives build-agent
- g14: receives build-agent
- novox: receives mesh-controller, build-agent
- shanks: receives build-agent
- build-agent keeps data (ADR 0233): what it holds is backed up before it moves
- read by no module's build: cmd/mesh-controller/batches_test.go
Run by the build seat on novox as `build-1791636522469697544` (`builds --log build-1791636522469697544`).
```
--- the gate: build-agent, mesh-controller
mesh-controller: ok, 55 tool(s); WARNING: merge-window ask(s) for a setting and do(es) not say whether it is trusted, so it counts as trusted: set at the terminal alone; say "trusted" false where nothing trusts it (novox/hq issue 339); WARNING: controller stay(s) up and say(s) not how it is ready — judged by liveness alone, refused from 2026-11-18 (ADR 0240 rule 8)
long-running resources without health: 1
files asking for a setting without saying whether it is trusted: 1
1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here
judging 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T12:47:18Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-10T12:47:18Z
modules the change moves:
- mesh-controller (changed)
machines:
- a machine (f35): composes
- holds mesh-dns-resolver (idt): composes
- holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
- a machine (yvbpsm): composes
a merge would rebuild 2 module(s) in 2 tier(s): build-agent, mesh-controller
--- its merge-check.sh (go toolchain)
ok github.com/novox/mesh-controller/cmd/mesh-builder 1.044s
ok github.com/novox/mesh-controller/cmd/mesh-controller 261.865s
ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.020s
ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.026s
ok github.com/novox/mesh-controller/examples/redis-provisioner 1.019s
ok github.com/novox/mesh-controller/examples/route-proxy 1.120s
ok github.com/novox/mesh-controller/internal/artifacts 1.053s
ok github.com/novox/mesh-controller/internal/broker 4.596s
ok github.com/novox/mesh-controller/internal/builder 4.987s
ok github.com/novox/mesh-controller/internal/catalogue 5.000s
ok github.com/novox/mesh-controller/internal/conditions 2.491s
ok github.com/novox/mesh-controller/internal/envfile 1.030s
ok github.com/novox/mesh-controller/internal/facts 1.031s
ok github.com/novox/mesh-controller/internal/identity 13.830s
ok github.com/novox/mesh-controller/internal/inventory 102.932s
ok github.com/novox/mesh-controller/internal/lease 18.677s
ok github.com/novox/mesh-controller/internal/licences 13.088s
ok github.com/novox/mesh-controller/internal/licences/adapters 1.013s
ok github.com/novox/mesh-controller/internal/link 57.539s
ok github.com/novox/mesh-controller/internal/lint 2.141s
ok github.com/novox/mesh-controller/internal/outward 1.032s
ok github.com/novox/mesh-controller/internal/overlay 1.288s
ok github.com/novox/mesh-controller/internal/secrets 1.463s
ok github.com/novox/mesh-controller/internal/store 7.781s
ok github.com/novox/mesh-controller/internal/testbus 1.179s
ok github.com/novox/mesh-controller/internal/token 1.014s
```
mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller)
mesh/repo-check: PASS — its merge-check.sh passed
Delivery plan — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
tier 0: mesh-controller
tier 1: build-agent
ace: receives build-agent
g14: receives build-agent
novox: receives mesh-controller, build-agent
shanks: receives build-agent
build-agent keeps data (ADR 0233): what it holds is backed up before it moves
read by no module's build: cmd/mesh-controller/batches_test.go
Run by the build seat on ace as build-1791636795688734979 (builds --log build-1791636795688734979).
--- the gate: build-agent, mesh-controller
mesh-controller: ok, 55 tool(s); WARNING: merge-window ask(s) for a setting and do(es) not say whether it is trusted, so it counts as trusted: set at the terminal alone; say "trusted" false where nothing trusts it (novox/hq issue 339); WARNING: controller stay(s) up and say(s) not how it is ready — judged by liveness alone, refused from 2026-11-18 (ADR 0240 rule 8)
long-running resources without health: 1
files asking for a setting without saying whether it is trusted: 1
1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here
judging 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T12:49:13Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-10T12:49:13Z
modules the change moves:
- mesh-controller (changed)
machines:
- a machine (f35): composes
- holds mesh-dns-resolver (idt): composes
- holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
- a machine (yvbpsm): composes
a merge would rebuild 2 module(s) in 2 tier(s): build-agent, mesh-controller
notes:
- cmd/mesh-controller/batches_test.go read by no module's build, and rebuild nothing (issue 280)
--- its merge-check.sh (go toolchain)
ok github.com/novox/mesh-controller/cmd/mesh-builder 1.034s
ok github.com/novox/mesh-controller/cmd/mesh-controller 199.203s
ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.031s
ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.048s
ok github.com/novox/mesh-controller/examples/redis-provisioner 1.033s
ok github.com/novox/mesh-controller/examples/route-proxy 1.134s
ok github.com/novox/mesh-controller/internal/artifacts 1.072s
ok github.com/novox/mesh-controller/internal/broker 3.314s
ok github.com/novox/mesh-controller/internal/builder 4.124s
ok github.com/novox/mesh-controller/internal/catalogue 4.443s
ok github.com/novox/mesh-controller/internal/conditions 2.484s
ok github.com/novox/mesh-controller/internal/envfile 1.038s
ok github.com/novox/mesh-controller/internal/facts 1.042s
ok github.com/novox/mesh-controller/internal/identity 5.052s
ok github.com/novox/mesh-controller/internal/inventory 73.814s
ok github.com/novox/mesh-controller/internal/lease 17.655s
ok github.com/novox/mesh-controller/internal/licences 4.582s
ok github.com/novox/mesh-controller/internal/licences/adapters 1.040s
ok github.com/novox/mesh-controller/internal/link 51.303s
ok github.com/novox/mesh-controller/internal/lint 1.992s
ok github.com/novox/mesh-controller/internal/outward 1.067s
ok github.com/novox/mesh-controller/internal/overlay 1.051s
ok github.com/novox/mesh-controller/internal/secrets 1.396s
ok github.com/novox/mesh-controller/internal/store 3.767s
ok github.com/novox/mesh-controller/internal/testbus 1.205s
ok github.com/novox/mesh-controller/internal/token 1.017s
**Merge check** at `16362e1b`
- `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller)
- `mesh/repo-check`: **PASS** — its merge-check.sh passed
**Delivery plan** — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
- tier 0: mesh-controller
- tier 1: build-agent
- ace: receives build-agent
- g14: receives build-agent
- novox: receives mesh-controller, build-agent
- shanks: receives build-agent
- build-agent keeps data (ADR 0233): what it holds is backed up before it moves
- read by no module's build: cmd/mesh-controller/batches_test.go
Run by the build seat on ace as `build-1791636795688734979` (`builds --log build-1791636795688734979`).
```
--- the gate: build-agent, mesh-controller
mesh-controller: ok, 55 tool(s); WARNING: merge-window ask(s) for a setting and do(es) not say whether it is trusted, so it counts as trusted: set at the terminal alone; say "trusted" false where nothing trusts it (novox/hq issue 339); WARNING: controller stay(s) up and say(s) not how it is ready — judged by liveness alone, refused from 2026-11-18 (ADR 0240 rule 8)
long-running resources without health: 1
files asking for a setting without saying whether it is trusted: 1
1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here
judging 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T12:49:13Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-10T12:49:13Z
modules the change moves:
- mesh-controller (changed)
machines:
- a machine (f35): composes
- holds mesh-dns-resolver (idt): composes
- holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
- a machine (yvbpsm): composes
a merge would rebuild 2 module(s) in 2 tier(s): build-agent, mesh-controller
notes:
- cmd/mesh-controller/batches_test.go read by no module's build, and rebuild nothing (issue 280)
--- its merge-check.sh (go toolchain)
ok github.com/novox/mesh-controller/cmd/mesh-builder 1.034s
ok github.com/novox/mesh-controller/cmd/mesh-controller 199.203s
ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.031s
ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.048s
ok github.com/novox/mesh-controller/examples/redis-provisioner 1.033s
ok github.com/novox/mesh-controller/examples/route-proxy 1.134s
ok github.com/novox/mesh-controller/internal/artifacts 1.072s
ok github.com/novox/mesh-controller/internal/broker 3.314s
ok github.com/novox/mesh-controller/internal/builder 4.124s
ok github.com/novox/mesh-controller/internal/catalogue 4.443s
ok github.com/novox/mesh-controller/internal/conditions 2.484s
ok github.com/novox/mesh-controller/internal/envfile 1.038s
ok github.com/novox/mesh-controller/internal/facts 1.042s
ok github.com/novox/mesh-controller/internal/identity 5.052s
ok github.com/novox/mesh-controller/internal/inventory 73.814s
ok github.com/novox/mesh-controller/internal/lease 17.655s
ok github.com/novox/mesh-controller/internal/licences 4.582s
ok github.com/novox/mesh-controller/internal/licences/adapters 1.040s
ok github.com/novox/mesh-controller/internal/link 51.303s
ok github.com/novox/mesh-controller/internal/lint 1.992s
ok github.com/novox/mesh-controller/internal/outward 1.067s
ok github.com/novox/mesh-controller/internal/overlay 1.051s
ok github.com/novox/mesh-controller/internal/secrets 1.396s
ok github.com/novox/mesh-controller/internal/store 3.767s
ok github.com/novox/mesh-controller/internal/testbus 1.205s
ok github.com/novox/mesh-controller/internal/token 1.017s
```
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.
Two follow-ups to #197 (hq ADR 0276), on a branch off main after #197's merge. Tracker issues 377 (the mixed batch) and 378 (the plan line).
1. A merge on the controller's own path never shares a batch with a catalogue merge (issue 377)
Decided during the build on 2026-10-10 (ADR 0276's dated note, hq#277). #197 as merged holds the first cut of this rule (
PlanBatch.Own, a batch per kind). This PR fixes what its review found:supersededwhentaken_over_bynames a batch, sorebatchWaitingis gone. An own-path batch is cut beside the waiting catalogue walk, which keeps waiting; it folds nothing.deliver(letGo) takes the word even while another walk is started; the walk asks its first tier only once no other started walk is open (startedBeside, in advanceOnce), noting "let go; starts once plan-X ended". mesh-delivery says its word once and is never refused; before, a refuseddeliverwould have been retried on a doubling backoff.Unchanged and said: a single merge that touches both an own-path module and a catalogue module (e.g.
modules/natsandmodules/app) is one own-path merge and starts without the word, as it always did.2.
plansnames a walk by what it moves (issue 378)The operator asked why a plan is called "mesh-catalog". The list line now reads
<plan id> <repo> #<pr> <title, cut at 50> · <modules it moves> → <machines running them> · <state words>, e.g.mesh-catalog #175 a tap shows its outcome · messenger, telegram → novox · tier 1 of 1, building for 2m0s. The plan id stays first (tools parse it). The pull request's number and title come from the forge's merge announcement (link.SourceMovedgainstitle; the record keeps number, title and the moved modules per merge:delivery.merges[].number/title/moves, a backward-compatible wire addition). A record naming no pull request is named by its commit, as before; nothing is fetched. A batch's line is followed by one line per repository (mesh-catalog #175 dunst: the font the operator chose (answers #174 claude-code: an agent proposes a section) · app, notes), the moved modules once per repository.statuskeeps the headline without the machines.Tests
TestAMergeOnTheControllersPathNeverSharesABatch(rewritten): a controller merge and two catalogue merges in one window are two batches; the controller's is cut first and starts; the catalogue batch queues behind it, is cut when the controller's walk ended, waits for its word with both merges, and no catalogue module is asked without the word; a catalogue walk waiting when an own-path batch is cut keeps waiting beside it, is not folded, takes its word meanwhile, and starts once the own-path walk ended.TestAWalkLetGoBesideAStartedOneStartsOnceItEnded,TestALateCatalogueMergeIsNotAnsweredByAnOwnPathWalk,TestAPlanLineNamesWhatItMoves(with machines, without, a record naming no pull request, a long title cut), andTestTheAssemblingBatchIsShowngains the per-repository lines.Full suite and vet green. Not merged: one controller rollout at a time; #197's plan goes first.
Delivery
novox/mesh-controller@16362e1bbd9d— delivered since 2026-10-10T13:25:03ZDelivery plan — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
Machines
Transitions
The commit's note under
refs/notes/mesh-plankeeps every transition:git log --notes=mesh-plan.Merge check at
04fcce2fmesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller)mesh/repo-check: PASS — its merge-check.sh passedDelivery plan — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
Run by the build seat on g14 as
build-1791635824113093108(builds --log build-1791635824113093108).After review (head
3496b58): a walk let go while another walk is started now reads as a wait, not as a tier running late:plansandstatussay its note ("let go; starts once plan-X ended"), the line never says LATE for it, and S3 leaves it out (deferred, release_plan.go). Test: TestAWalkLetGoBesideAStartedOneStartsOnceItEnded, an hour on.Left as follow-ups, said here:
deliveringwhile its walk is deferred. With the word accepted, the walk reads as started to mesh-delivery (WalkSeen.Started), so the delivery moves todeliveringbefore anything is built; nothing ends it, andstalledlists it only after 2 h. The walk's note, which reaches mesh-delivery through plan-moved, says why. Acceptable for the deferral's length; adeferredword on the wire would let mesh-delivery say it.Merge check at
3496b58fmesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller)mesh/repo-check: PASS — its merge-check.sh passedDelivery plan — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
Run by the build seat on novox as
build-1791636522469697544(builds --log build-1791636522469697544).Merge check at
16362e1bmesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller)mesh/repo-check: PASS — its merge-check.sh passedDelivery plan — builds build-agent, mesh-controller → ace, g14, novox, shanks; no bus step
Run by the build seat on ace as
build-1791636795688734979(builds --log build-1791636795688734979).