mesh-delivery: a walk answers every merge it contains, never an ended delivery (hq issue 362, ADR 0276) #171

Merged
mesh-admin merged 1 commits from fix/362-a-walk-answers-every-merge-it-contains into main 2026-10-10 11:14:08 +00:00
Contributor

hq issue 362 (two merges seconds apart left their delivery waiting for a person); hq ADR 0276 decisions 3, 5, 6, 7, 8, 9 (mesh-delivery's side). Work in progress: the description of the wire interface is final; the code lands on this branch.

Wire interface (for the controller's batches)

A walk record (mesh-controller.plan-moved, delivery-walks) is read as today, with these additions, all inside the delivery object (the plan's delivery jsonb column, so no new column is needed for them):

"delivery": {
  "awaits": "mesh-delivery", "go": …, "by": …,            // as today
  "merges": [                                              // every merge the walk answers
    {"repository": "novox/mesh-catalog", "commit": "553b7191…", "carried": "48bda475…"},
    {"repository": "novox/mesh-catalog", "commit": "48bda475…"},           // carried omitted = commit itself
    {"repository": "novox/mesh-controller", "commit": "a6bc0931…"}
  ],
  "taken_over_by": "plan-…",                              // on a walk folded (superseded) before it started
  "batch": {"closes_at": "RFC3339", "at_most": "RFC3339", "behind": "plan-…"}  // only while a batch
}
  • merges: full merge commits, repository as owner/repo (any case). carried is the commit of that repository the walk builds and sends: the merge itself, or the later merge of its branch that contains it (ADR 0276 decision 2/3). A delivery whose merge is carried by a later commit ends covered when the walk is done, and goes back to published (waiting for a walk of its own commit) when the walk fails; a delivery carried as itself ends delivered / failed. A walk across repositories may keep any one of them in the top-level repository/commit; mesh-delivery reads merges when present.
  • Without merges (today's controller): a walk answers the merge of its own commit, and a merge of the same repository and branch that the forge says its commit contains (gitea_contains, asked by mesh-delivery for a merged delivery with no walk, kept per pair).
  • taken_over_by: the deliveries of a superseded walk follow the named walk and are not ended superseded. Without it, the note "superseded at tier N by plan-X (…)" is read for the same. Only a superseded walk naming no successor ends its deliveries superseded.
  • A batch is a plan record whose state is assembling (window open) or queued (closed, waiting behind batch.behind), with merges listing what it holds so far and batch its times. mesh-delivery never links, adopts or gives its word to a batch; it shows it: deliveries/show say of a merged delivery in it "its batch plan-…: assembling, 42s left (at the latest 00:31:09)" or "queued behind plan-…", and a merge in a batch is not held as unwalked. When the batch is cut it keeps its id and its next record is building.
  • The word: deliver is asked once per walk, and only when every live delivery the walk carries is at its turn (a group member in its group's order, a lone delivery once published).
  • stalled lines gain walk (a plan id) and two cases: a delivery held because no walk answers its merge is listed at once (bound 0), its says naming the open walks of its repository or that there are none; and a waiting walk that no live delivery holds is listed as state unheld, id <repository>@<commit>, walk = the plan id, H2 none.
hq issue 362 (two merges seconds apart left their delivery waiting for a person); hq ADR 0276 decisions 3, 5, 6, 7, 8, 9 (mesh-delivery's side). Work in progress: the description of the wire interface is final; the code lands on this branch. ## Wire interface (for the controller's batches) A walk record (`mesh-controller.plan-moved`, `delivery-walks`) is read as today, with these additions, all inside the `delivery` object (the plan's `delivery` jsonb column, so no new column is needed for them): ``` "delivery": { "awaits": "mesh-delivery", "go": …, "by": …, // as today "merges": [ // every merge the walk answers {"repository": "novox/mesh-catalog", "commit": "553b7191…", "carried": "48bda475…"}, {"repository": "novox/mesh-catalog", "commit": "48bda475…"}, // carried omitted = commit itself {"repository": "novox/mesh-controller", "commit": "a6bc0931…"} ], "taken_over_by": "plan-…", // on a walk folded (superseded) before it started "batch": {"closes_at": "RFC3339", "at_most": "RFC3339", "behind": "plan-…"} // only while a batch } ``` - **merges**: full merge commits, repository as `owner/repo` (any case). `carried` is the commit of that repository the walk builds and sends: the merge itself, or the later merge of its branch that contains it (ADR 0276 decision 2/3). A delivery whose merge is carried by a later commit ends `covered` when the walk is done, and goes back to `published` (waiting for a walk of its own commit) when the walk fails; a delivery carried as itself ends `delivered` / `failed`. A walk across repositories may keep any one of them in the top-level `repository`/`commit`; mesh-delivery reads `merges` when present. - **Without `merges`** (today's controller): a walk answers the merge of its own `commit`, and a merge of the same repository and `branch` that the forge says its commit contains (`gitea_contains`, asked by mesh-delivery for a merged delivery with no walk, kept per pair). - **taken_over_by**: the deliveries of a superseded walk follow the named walk and are not ended `superseded`. Without it, the note "superseded at tier N by plan-X (…)" is read for the same. Only a superseded walk naming no successor ends its deliveries `superseded`. - **A batch** is a plan record whose `state` is `assembling` (window open) or `queued` (closed, waiting behind `batch.behind`), with `merges` listing what it holds so far and `batch` its times. mesh-delivery never links, adopts or gives its word to a batch; it shows it: `deliveries`/`show` say of a merged delivery in it "its batch plan-…: assembling, 42s left (at the latest 00:31:09)" or "queued behind plan-…", and a merge in a batch is not held as unwalked. When the batch is cut it keeps its id and its next record is `building`. - **The word**: `deliver` is asked once per walk, and only when every live delivery the walk carries is at its turn (a group member in its group's order, a lone delivery once published). - **stalled** lines gain `walk` (a plan id) and two cases: a delivery held because no walk answers its merge is listed at once (bound 0), its `says` naming the open walks of its repository or that there are none; and a waiting walk that no live delivery holds is listed as state `unheld`, id `<repository>@<commit>`, `walk` = the plan id, H2 none.
Author
Contributor

Delivery novox/mesh-catalog@13ffae7706c6 — delivered since 2026-10-10T11:17:22Z

Delivery plan — builds mesh-delivery → novox; no bus step

  • tier 0: mesh-delivery
  • novox: receives mesh-delivery

Machines

  • mesh-delivery on novox: passed — healthy 3 times over 2m12s
  • mesh-delivery on the rest running it: sent

Transitions

  • 2026-10-10 11:06 (new) → proposed (announced): novox/mesh-catalog#171's head announced
  • 2026-10-10 11:09 proposed → checked (checked): the verdict names this commit
  • 2026-10-10 11:09 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-10 11:14 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 11:14 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
  • 2026-10-10 11:17 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-catalog@13ffae7706c6` — **delivered** since 2026-10-10T11:17:22Z **Delivery plan** — builds mesh-delivery → novox; no bus step - tier 0: mesh-delivery - novox: receives mesh-delivery **Machines** - mesh-delivery on novox: passed — healthy 3 times over 2m12s - mesh-delivery on the rest running it: sent **Transitions** - 2026-10-10 11:06 (new) → proposed (announced): novox/mesh-catalog#171's head announced - 2026-10-10 11:09 proposed → checked (checked): the verdict names this commit - 2026-10-10 11:09 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-10 11:14 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 11:14 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 - 2026-10-10 11:17 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`.
Author
Contributor

Merge check at 6a2b7fd1

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: mesh-delivery)
  • mesh/repo-check: PASS — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript)

Delivery plan — builds mesh-delivery → novox; no bus step

  • tier 0: mesh-delivery
  • novox: receives mesh-delivery

Run by the build seat on ace as build-1791629227021635156 (builds --log build-1791629227021635156).

--- the gate: mesh-delivery
mesh-delivery: ok, 1 tool(s), invokes seat:mesh-controller.delivery-plan, seat:mesh-controller.delivery-order, seat:mesh-controller.delivery-check, seat:mesh-controller.deliver, seat:mesh-controller.delivery-stop, seat:mesh-controller.delivery-walks, gitea.gitea_note_append, gitea.gitea_delivery_view, gitea.gitea_commit_status, gitea.gitea_commit_statuses, gitea.gitea_contains, gitea.gitea_open_pulls, keeps state deliveries, groups
long-running resources without health: 0
files asking for a setting without saying whether it is trusted: 0
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 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T10:41:49Z 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-10T10:41:49Z

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 1 module(s) in 1 tier(s): mesh-delivery
--- its merge-check.sh (go toolchain)
ok  	git.novox.be/novox/mesh-catalog/checks/words	0.002s
words: 12 retired words and 70 daemons' lines, none in the 36427 strings of 629 files
ok  	git.novox.be/novox/mesh-catalog/checks/agenthome	0.011s
agent-home: no archive and no file written into under the agent's home
ok  	git.novox.be/novox/mesh-catalog/checks/paths	0.005s
paths: no module names another's state on its machine (3 known, listed to go)
long-running resources without health: 70, as kept
testing modules/mesh-delivery
ok  	mesh-delivery/cmd/mesh-delivery	1.249s
--- its merge-check-typescript.sh (typescript toolchain)
**Merge check** at `6a2b7fd1` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: mesh-delivery) - `mesh/repo-check`: **PASS** — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript) **Delivery plan** — builds mesh-delivery → novox; no bus step - tier 0: mesh-delivery - novox: receives mesh-delivery Run by the build seat on ace as `build-1791629227021635156` (`builds --log build-1791629227021635156`). ``` --- the gate: mesh-delivery mesh-delivery: ok, 1 tool(s), invokes seat:mesh-controller.delivery-plan, seat:mesh-controller.delivery-order, seat:mesh-controller.delivery-check, seat:mesh-controller.deliver, seat:mesh-controller.delivery-stop, seat:mesh-controller.delivery-walks, gitea.gitea_note_append, gitea.gitea_delivery_view, gitea.gitea_commit_status, gitea.gitea_commit_statuses, gitea.gitea_contains, gitea.gitea_open_pulls, keeps state deliveries, groups long-running resources without health: 0 files asking for a setting without saying whether it is trusted: 0 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 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T10:41:49Z 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-10T10:41:49Z 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 1 module(s) in 1 tier(s): mesh-delivery --- its merge-check.sh (go toolchain) ok git.novox.be/novox/mesh-catalog/checks/words 0.002s words: 12 retired words and 70 daemons' lines, none in the 36427 strings of 629 files ok git.novox.be/novox/mesh-catalog/checks/agenthome 0.011s agent-home: no archive and no file written into under the agent's home ok git.novox.be/novox/mesh-catalog/checks/paths 0.005s paths: no module names another's state on its machine (3 known, listed to go) long-running resources without health: 70, as kept testing modules/mesh-delivery ok mesh-delivery/cmd/mesh-delivery 1.249s --- its merge-check-typescript.sh (typescript toolchain) ```
Author
Contributor

Merge check at f8c4bc55

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: mesh-delivery)
  • mesh/repo-check: PASS — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript)

Delivery plan — builds mesh-delivery → novox; no bus step

  • tier 0: mesh-delivery
  • novox: receives mesh-delivery

Run by the build seat on novox as build-1791629681306005835 (builds --log build-1791629681306005835).

--- the gate: mesh-delivery
mesh-delivery: ok, 1 tool(s), invokes seat:mesh-controller.delivery-plan, seat:mesh-controller.delivery-order, seat:mesh-controller.delivery-check, seat:mesh-controller.deliver, seat:mesh-controller.delivery-stop, seat:mesh-controller.delivery-walks, gitea.gitea_note_append, gitea.gitea_delivery_view, gitea.gitea_commit_status, gitea.gitea_commit_statuses, gitea.gitea_contains, gitea.gitea_open_pulls, keeps state deliveries, groups
long-running resources without health: 0
files asking for a setting without saying whether it is trusted: 0
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 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T10:50:49Z 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-10T10:50:49Z

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 1 module(s) in 1 tier(s): mesh-delivery
--- its merge-check.sh (go toolchain)
ok  	git.novox.be/novox/mesh-catalog/checks/words	0.003s
words: 12 retired words and 70 daemons' lines, none in the 36501 strings of 630 files
ok  	git.novox.be/novox/mesh-catalog/checks/agenthome	0.013s
agent-home: no archive and no file written into under the agent's home
ok  	git.novox.be/novox/mesh-catalog/checks/paths	0.007s
paths: no module names another's state on its machine (3 known, listed to go)
long-running resources without health: 70, as kept
testing modules/mesh-delivery
ok  	mesh-delivery/cmd/mesh-delivery	1.451s
--- its merge-check-typescript.sh (typescript toolchain)
**Merge check** at `f8c4bc55` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: mesh-delivery) - `mesh/repo-check`: **PASS** — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript) **Delivery plan** — builds mesh-delivery → novox; no bus step - tier 0: mesh-delivery - novox: receives mesh-delivery Run by the build seat on novox as `build-1791629681306005835` (`builds --log build-1791629681306005835`). ``` --- the gate: mesh-delivery mesh-delivery: ok, 1 tool(s), invokes seat:mesh-controller.delivery-plan, seat:mesh-controller.delivery-order, seat:mesh-controller.delivery-check, seat:mesh-controller.deliver, seat:mesh-controller.delivery-stop, seat:mesh-controller.delivery-walks, gitea.gitea_note_append, gitea.gitea_delivery_view, gitea.gitea_commit_status, gitea.gitea_commit_statuses, gitea.gitea_contains, gitea.gitea_open_pulls, keeps state deliveries, groups long-running resources without health: 0 files asking for a setting without saying whether it is trusted: 0 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 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T10:50:49Z 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-10T10:50:49Z 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 1 module(s) in 1 tier(s): mesh-delivery --- its merge-check.sh (go toolchain) ok git.novox.be/novox/mesh-catalog/checks/words 0.003s words: 12 retired words and 70 daemons' lines, none in the 36501 strings of 630 files ok git.novox.be/novox/mesh-catalog/checks/agenthome 0.013s agent-home: no archive and no file written into under the agent's home ok git.novox.be/novox/mesh-catalog/checks/paths 0.007s paths: no module names another's state on its machine (3 known, listed to go) long-running resources without health: 70, as kept testing modules/mesh-delivery ok mesh-delivery/cmd/mesh-delivery 1.451s --- its merge-check-typescript.sh (typescript toolchain) ```
jschoubben added 1 commit 2026-10-10 11:05:53 +00:00
mesh-delivery: a walk answers every merge it carries, never a delivery that ended (hq issue 362, ADR 0276)
mesh/delivery delivered
mesh/merge-gate pass: builds mesh-delivery → novox; no bus step; every machine composes with the change as it did without (4 of 4 compose)
mesh/repo-check pass: its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript)
13ffae7706
Two catalogue merges 18 s apart were walked by one walk at the later commit,
which superseded the first; this owner tied that walk to the dunst delivery
the supersession had ended and to no other, so nothing gave it its word and
claude-code was held for a person with a reason naming neither cause.

A delivery now follows the newest walk that answers its merge: one naming it
(delivery.merges, the controller's batches), its own commit, the walk that
took its own over (taken_over_by, or the superseded note), or, from a
controller that names no merges, an open walk of its branch made for a later
merge, moving all it moves, whose commit the forge says contains it. Only its
own walk's record moves an ended delivery. The word is asked once per walk,
when every delivery it carries is at its turn, a group's members on one walk
together. An earlier merge carried by a later commit ends covered with the
walk, and waits for a walk of its own when it fails. A merge no walk answers
is held with the true reason and listed at once; a waiting walk no live
delivery holds is listed as unheld; a merge in an assembling or queued batch
is shown, not held. Replay R362 fails before.
jschoubben force-pushed fix/362-a-walk-answers-every-merge-it-contains from f8c4bc5599 to 13ffae7706 2026-10-10 11:05:53 +00:00 Compare
Author
Contributor

Ready for review: head 13ffae7. The branch was rebuilt as one commit, so a 5 MB build binary added by mistake is gone; .gitignore now names it.

The wire interface as built. These points refine the description above, for the controller's side:

  1. delivery.merges is authoritative. A walk that names any merge answers only the merges it names. Neither the forge containment fallback nor the taken-over-by repository fallback applies to it. So name every merge a walk answers, including the walk's own commits.
  2. The fallbacks are only for a controller that names no merges.
    • Containment: the walk is open, of the same repository and branch, made for a later merge, and moves every module the merged delivery's plan moves. The forge must say its commit contains the merge, and the delivery must be ready with no walk.
    • Taken over: the successor is of the same repository and branch.
    • A successor that turns out not to answer the delivery ends it superseded, as before.
  3. taken_over_by (or the note "superseded at tier N by plan-X (…)") moves the deliveries of the superseded walk to the successor, which mesh-delivery reads by its id when it is not heard of. A delivery that follows a new walk waits for that walk's own word.
  4. A batch, once cut, keeps its id. Its next record is building or rolling. While a merge's batch record (state assembling or queued) is heard of, the merge is not held as unwalked, for up to 3 h past batch.at_most. A walk under a new id would leave the batch shown as assembling, 0 s left, until then.
  5. The word. deliver is asked once per walk, never while an earlier ask for it is in flight, and only when every live delivery the walk carries is at its turn. Members of one delivery group carried by the same walk take their turns together, in the group's order.
  6. Ends. A walk done ends each delivery it carries as delivered (its own commit) or covered (carried is a later commit). A walk failed ends the first as failed; the second goes back to published, waiting for a walk of its own commit (bound 10 min, then stalled). A walk stopped stops them all.
  7. stalled lines have an optional walk field.
    • State unheld: id <repository>@<walk commit>, H2 none.
    • A delivery held because no walk answers its merge: bound 0s, with a reason naming the open walks of its repository, or saying there are none.
    • A merge waiting for its own walk after its carrying walk failed: bound 10m0s.

Tests and review.

  • go test and go test -race pass. Mutation pass: 22 of 22 mutations killed (list in the hand-back).
  • Replay R362 (mesh-lab #75) is proved with cmd/prove: it fails on 52f34d3 and passes on 13ffae7.
  • One independent review was done. Its blocker (the binary) and major finding (two group members on one walk deadlocked) are fixed, with tests. Its minor findings m1 to m5 and nits n1, n2 and n4 are fixed. n3 is kept: stopInGroup stops the whole walk, which with batches can carry deliveries outside the group. That belongs to the controller-side batch work.
**Ready for review: head 13ffae7.** The branch was rebuilt as one commit, so a 5 MB build binary added by mistake is gone; `.gitignore` now names it. **The wire interface as built.** These points refine the description above, for the controller's side: 1. **`delivery.merges` is authoritative.** A walk that names any merge answers only the merges it names. Neither the forge containment fallback nor the taken-over-by repository fallback applies to it. So name every merge a walk answers, including the walk's own commits. 2. **The fallbacks are only for a controller that names no merges.** - Containment: the walk is open, of the same repository and branch, made for a later merge, and moves every module the merged delivery's plan moves. The forge must say its commit contains the merge, and the delivery must be `ready` with no walk. - Taken over: the successor is of the same repository and branch. - A successor that turns out not to answer the delivery ends it `superseded`, as before. 3. **`taken_over_by`** (or the note "superseded at tier N by plan-X (…)") moves the deliveries of the superseded walk to the successor, which mesh-delivery reads by its id when it is not heard of. A delivery that follows a new walk waits for that walk's own word. 4. **A batch, once cut, keeps its id.** Its next record is `building` or `rolling`. While a merge's batch record (state `assembling` or `queued`) is heard of, the merge is not held as unwalked, for up to 3 h past `batch.at_most`. A walk under a new id would leave the batch shown as assembling, 0 s left, until then. 5. **The word.** `deliver` is asked once per walk, never while an earlier ask for it is in flight, and only when every live delivery the walk carries is at its turn. Members of one delivery group carried by the same walk take their turns together, in the group's order. 6. **Ends.** A walk done ends each delivery it carries as `delivered` (its own commit) or `covered` (`carried` is a later commit). A walk failed ends the first as `failed`; the second goes back to `published`, waiting for a walk of its own commit (bound 10 min, then `stalled`). A walk stopped stops them all. 7. **`stalled` lines** have an optional `walk` field. - State `unheld`: id `<repository>@<walk commit>`, H2 none. - A delivery held because no walk answers its merge: bound `0s`, with a reason naming the open walks of its repository, or saying there are none. - A merge waiting for its own walk after its carrying walk failed: bound `10m0s`. **Tests and review.** - `go test` and `go test -race` pass. Mutation pass: 22 of 22 mutations killed (list in the hand-back). - Replay R362 (mesh-lab #75) is proved with `cmd/prove`: it fails on 52f34d3 and passes on 13ffae7. - One independent review was done. Its blocker (the binary) and major finding (two group members on one walk deadlocked) are fixed, with tests. Its minor findings m1 to m5 and nits n1, n2 and n4 are fixed. n3 is kept: `stopInGroup` stops the whole walk, which with batches can carry deliveries outside the group. That belongs to the controller-side batch work.
Author
Contributor

Merge check at 13ffae77

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: mesh-delivery)
  • mesh/repo-check: PASS — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript)

Delivery plan — builds mesh-delivery → novox; no bus step

  • tier 0: mesh-delivery
  • novox: receives mesh-delivery
  • read by no module's build: .gitignore

Run by the build seat on novox as build-1791630383154212888 (builds --log build-1791630383154212888).

--- the gate: mesh-delivery
mesh-delivery: ok, 1 tool(s), invokes seat:mesh-controller.delivery-plan, seat:mesh-controller.delivery-order, seat:mesh-controller.delivery-check, seat:mesh-controller.deliver, seat:mesh-controller.delivery-stop, seat:mesh-controller.delivery-walks, gitea.gitea_note_append, gitea.gitea_delivery_view, gitea.gitea_commit_status, gitea.gitea_commit_statuses, gitea.gitea_contains, gitea.gitea_open_pulls, keeps state deliveries, groups
long-running resources without health: 0
files asking for a setting without saying whether it is trusted: 0
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 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T11:00:49Z 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-10T11:00:49Z

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 1 module(s) in 1 tier(s): mesh-delivery

notes:
  - .gitignore read by no module's build, and rebuild nothing (issue 280)
--- its merge-check.sh (go toolchain)
ok  	git.novox.be/novox/mesh-catalog/checks/words	0.352s
words: 12 retired words and 70 daemons' lines, none in the 36511 strings of 630 files
ok  	git.novox.be/novox/mesh-catalog/checks/agenthome	0.013s
agent-home: no archive and no file written into under the agent's home
ok  	git.novox.be/novox/mesh-catalog/checks/paths	0.007s
paths: no module names another's state on its machine (3 known, listed to go)
long-running resources without health: 70, as kept
testing modules/mesh-delivery
ok  	mesh-delivery/cmd/mesh-delivery	1.557s
--- its merge-check-typescript.sh (typescript toolchain)
**Merge check** at `13ffae77` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: mesh-delivery) - `mesh/repo-check`: **PASS** — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript) **Delivery plan** — builds mesh-delivery → novox; no bus step - tier 0: mesh-delivery - novox: receives mesh-delivery - read by no module's build: .gitignore Run by the build seat on novox as `build-1791630383154212888` (`builds --log build-1791630383154212888`). ``` --- the gate: mesh-delivery mesh-delivery: ok, 1 tool(s), invokes seat:mesh-controller.delivery-plan, seat:mesh-controller.delivery-order, seat:mesh-controller.delivery-check, seat:mesh-controller.deliver, seat:mesh-controller.delivery-stop, seat:mesh-controller.delivery-walks, gitea.gitea_note_append, gitea.gitea_delivery_view, gitea.gitea_commit_status, gitea.gitea_commit_statuses, gitea.gitea_contains, gitea.gitea_open_pulls, keeps state deliveries, groups long-running resources without health: 0 files asking for a setting without saying whether it is trusted: 0 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 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T11:00:49Z 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-10T11:00:49Z 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 1 module(s) in 1 tier(s): mesh-delivery notes: - .gitignore read by no module's build, and rebuild nothing (issue 280) --- its merge-check.sh (go toolchain) ok git.novox.be/novox/mesh-catalog/checks/words 0.352s words: 12 retired words and 70 daemons' lines, none in the 36511 strings of 630 files ok git.novox.be/novox/mesh-catalog/checks/agenthome 0.013s agent-home: no archive and no file written into under the agent's home ok git.novox.be/novox/mesh-catalog/checks/paths 0.007s paths: no module names another's state on its machine (3 known, listed to go) long-running resources without health: 70, as kept testing modules/mesh-delivery ok mesh-delivery/cmd/mesh-delivery 1.557s --- its merge-check-typescript.sh (typescript toolchain) ```
mesh-admin merged commit d2af46b715 into main 2026-10-10 11:14:08 +00:00
mesh-admin deleted branch fix/362-a-walk-answers-every-merge-it-contains 2026-10-10 11:14:08 +00:00
Sign in to join this conversation.
No Reviewers
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/mesh-catalog#171