A merge moves a module only when its build source holds a changed file (hq ADR 0267, issue 363) #193

Merged
mesh-admin merged 3 commits from fix/0267-a-merge-moves-what-its-build-source-holds into main 2026-10-10 02:00:18 +00:00
Contributor

Step 2 of building hq ADR 0267 (hq issue 363, hq #266). Stacked on #192: this branch carries #192's commit; merge #192 first, then this shows only its own commit.

What changes

  • Migration 0088: build.build_sources jsonb. RecordBuild keeps what the builder said (link.BuildResult.Sources); ReadRepositories lays it over what the newest successful build read: a context's entry gains Paths, the module's own repository an entry marked Own. Never stored in built_contexts (a controller rolled back would read an own entry as a context and draw packages edges across the catalogue).
  • Planner (upgrades.go): readsFrom moves a context reader only when a changed file is in its recorded paths; touchedBy (now given read) moves a module only when a changed file is in its own recorded build source; unread counts a file read by a context reader. No build source said (old builds, off-trunk builds, unknown kinds), or paths not all said/truncated: as before.
  • Pending modules read whole: a module an open plan has yet to build is read without its build source (readForAMerge, used by the merge handler and the missed-merge catch-up), so a merge that adds an import and a following merge changing the imported package cannot slip between a plan and its build.
  • dependenciesOf draws no packages edge (rule 4); one read from an old record or snapshot neither widens nor orders.
  • The facts snapshot carries sources (own said apart from reads), and the merge gate's graphOfFacts reads them, so the gate plans as the merge does.
  • check here lists changed files with --no-renames, so a file moved out of a build source is said under its old name.

Acceptance (tests): TestASharedRepositoryMovesOnlyWhatItsBuildSourceHolds and TestASharedRepositoryIsPlannedFromTheRecordedBuildSources (rows tagged 338 flipped): cmd/mesh-controller/main.go -> mesh-controller; internal/conditions/* -> mesh-controller; README.md -> nothing (unread); examples/route-proxy/main.go -> route-proxy; internal/broker/* -> mesh-controller | build-agent | route-proxy (three tiers by worker-of then built-by, not the two ADR 0267's consequences predicted). Plus the property test without packages, pending-module test, gate-from-snapshot test, store round trip.

Live effect starts only after this and #192 run and each module has had one trunk build under the new builder; until then every module reads as before. merge-check.sh passes locally against a throwaway store (race on).

Step 2 of building hq ADR 0267 (hq issue 363, hq #266). **Stacked on #192**: this branch carries #192's commit; merge #192 first, then this shows only its own commit. **What changes** - Migration 0088: `build.build_sources jsonb`. `RecordBuild` keeps what the builder said (`link.BuildResult.Sources`); `ReadRepositories` lays it over what the newest successful build read: a context's entry gains `Paths`, the module's own repository an entry marked `Own`. Never stored in `built_contexts` (a controller rolled back would read an own entry as a context and draw packages edges across the catalogue). - Planner (`upgrades.go`): `readsFrom` moves a context reader only when a changed file is in its recorded paths; `touchedBy` (now given `read`) moves a module only when a changed file is in its own recorded build source; `unread` counts a file read by a context reader. No build source said (old builds, off-trunk builds, unknown kinds), or paths not all said/truncated: as before. - **Pending modules read whole**: a module an open plan has yet to build is read without its build source (`readForAMerge`, used by the merge handler and the missed-merge catch-up), so a merge that adds an import and a following merge changing the imported package cannot slip between a plan and its build. - `dependenciesOf` draws no `packages` edge (rule 4); one read from an old record or snapshot neither widens nor orders. - The facts snapshot carries `sources` (own said apart from `reads`), and the merge gate's `graphOfFacts` reads them, so the gate plans as the merge does. - `check here` lists changed files with `--no-renames`, so a file moved out of a build source is said under its old name. **Acceptance (tests)**: `TestASharedRepositoryMovesOnlyWhatItsBuildSourceHolds` and `TestASharedRepositoryIsPlannedFromTheRecordedBuildSources` (rows tagged 338 flipped): `cmd/mesh-controller/main.go` -> `mesh-controller`; `internal/conditions/*` -> `mesh-controller`; `README.md` -> nothing (unread); `examples/route-proxy/main.go` -> `route-proxy`; `internal/broker/*` -> `mesh-controller | build-agent | route-proxy` (three tiers by worker-of then built-by, not the two ADR 0267's consequences predicted). Plus the property test without packages, pending-module test, gate-from-snapshot test, store round trip. **Live effect** starts only after this and #192 run and each module has had one trunk build under the new builder; until then every module reads as before. `merge-check.sh` passes locally against a throwaway store (race on).
mesh-admin added 1 commit 2026-10-10 00:57:04 +00:00
Say what a build was made from, and hand an image compiling Go only that (hq ADR 0267, issue 363)
mesh/merge-gate pass: builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step; every machine composes with the change as it…
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery superseded: a newer head of the same pull request
4d1b81b6cb
A merge to the controller's repository moved the route proxy and the build
seat's holder whatever it changed, because nothing said which files their
builds read. A build of a trunk commit now says its build source per
repository: a Go program's import closure, an archive's directory, an
image's recipe and the package it names in the new 'compiles' field. That
image is built from its build source alone, so a recipe reading past it
fails by name, and its fingerprint is over what it was handed.
Author
Contributor

Delivery novox/mesh-controller@bd35b1c06c40 — delivered since 2026-10-10T02:16:03Z

Delivery plan — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step

  • tier 0: mesh-controller
  • tier 1: build-agent
  • tier 2: route-proxy
  • ace: receives build-agent, route-proxy
  • g14: receives build-agent
  • novox: receives mesh-controller, build-agent, route-proxy
  • shanks: receives build-agent
  • build-agent keeps data (ADR 0233): what it holds is backed up before it moves
  • route-proxy provides route: its consumers are sent again after it
  • route-proxy keeps data (ADR 0233): what it holds is backed up before it moves

Machines

  • mesh-controller on novox: passed — healthy 3 times over 3m37s
  • mesh-controller on the rest running it: sent
  • build-agent on ace: passed — healthy 3 times over 3m30s
  • build-agent on the rest running it: sent
  • route-proxy on ace: passed — healthy 3 times over 3m36s
  • route-proxy on the rest running it: sent

Transitions

  • 2026-10-10 01:24 (new) → proposed (announced): novox/mesh-controller#193's head announced
  • 2026-10-10 01:30 proposed → checked (checked): the verdict names this commit
  • 2026-10-10 01:30 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-10 02:00 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 02:00 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 02:16 delivering → delivered (done): its walk is done: 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@bd35b1c06c40` — **delivered** since 2026-10-10T02:16:03Z **Delivery plan** — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step - tier 0: mesh-controller - tier 1: build-agent - tier 2: route-proxy - ace: receives build-agent, route-proxy - g14: receives build-agent - novox: receives mesh-controller, build-agent, route-proxy - shanks: receives build-agent - build-agent keeps data (ADR 0233): what it holds is backed up before it moves - route-proxy provides route: its consumers are sent again after it - route-proxy keeps data (ADR 0233): what it holds is backed up before it moves **Machines** - mesh-controller on novox: passed — healthy 3 times over 3m37s - mesh-controller on the rest running it: sent - build-agent on ace: passed — healthy 3 times over 3m30s - build-agent on the rest running it: sent - route-proxy on ace: passed — healthy 3 times over 3m36s - route-proxy on the rest running it: sent **Transitions** - 2026-10-10 01:24 (new) → proposed (announced): novox/mesh-controller#193's head announced - 2026-10-10 01:30 proposed → checked (checked): the verdict names this commit - 2026-10-10 01:30 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-10 02:00 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 02:00 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 02:16 delivering → delivered (done): its walk is done: 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 93f704da

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller, route-proxy)
  • mesh/repo-check: PASS — its merge-check.sh passed

Delivery plan — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step

  • tier 0: mesh-controller
  • tier 1: build-agent
  • tier 2: route-proxy
  • ace: receives build-agent, route-proxy
  • g14: receives build-agent
  • novox: receives mesh-controller, build-agent, route-proxy
  • shanks: receives build-agent
  • build-agent keeps data (ADR 0233): what it holds is backed up before it moves
  • route-proxy provides route: its consumers are sent again after it
  • route-proxy keeps data (ADR 0233): what it holds is backed up before it moves

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

--- the gate: build-agent, mesh-controller, route-proxy
mesh-controller: ok, 54 tool(s); 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: 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 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T00:37:45Z 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-10T00:37:45Z

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 3 module(s) in 3 tier(s): build-agent, mesh-controller, route-proxy
--- its merge-check.sh (go toolchain)
ok  	github.com/novox/mesh-controller/cmd/mesh-builder	1.031s
ok  	github.com/novox/mesh-controller/cmd/mesh-controller	222.822s
ok  	github.com/novox/mesh-controller/examples/objectstore-provisioner	1.011s
ok  	github.com/novox/mesh-controller/examples/postgres-provisioner	1.014s
ok  	github.com/novox/mesh-controller/examples/redis-provisioner	1.045s
ok  	github.com/novox/mesh-controller/examples/route-proxy	1.106s
ok  	github.com/novox/mesh-controller/internal/artifacts	1.073s
ok  	github.com/novox/mesh-controller/internal/broker	2.637s
ok  	github.com/novox/mesh-controller/internal/builder	2.513s
ok  	github.com/novox/mesh-controller/internal/catalogue	4.465s
ok  	github.com/novox/mesh-controller/internal/conditions	2.442s
ok  	github.com/novox/mesh-controller/internal/envfile	1.047s
ok  	github.com/novox/mesh-controller/internal/facts	1.051s
ok  	github.com/novox/mesh-controller/internal/identity	4.134s
ok  	github.com/novox/mesh-controller/internal/inventory	83.079s
ok  	github.com/novox/mesh-controller/internal/lease	17.683s
ok  	github.com/novox/mesh-controller/internal/licences	3.772s
ok  	github.com/novox/mesh-controller/internal/licences/adapters	1.078s
ok  	github.com/novox/mesh-controller/internal/link	51.333s
ok  	github.com/novox/mesh-controller/internal/lint	2.064s
ok  	github.com/novox/mesh-controller/internal/outward	1.100s
ok  	github.com/novox/mesh-controller/internal/overlay	1.091s
ok  	github.com/novox/mesh-controller/internal/secrets	1.461s
ok  	github.com/novox/mesh-controller/internal/store	3.302s
ok  	github.com/novox/mesh-controller/internal/testbus	1.216s
ok  	github.com/novox/mesh-controller/internal/token	1.016s
**Merge check** at `93f704da` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller, route-proxy) - `mesh/repo-check`: **PASS** — its merge-check.sh passed **Delivery plan** — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step - tier 0: mesh-controller - tier 1: build-agent - tier 2: route-proxy - ace: receives build-agent, route-proxy - g14: receives build-agent - novox: receives mesh-controller, build-agent, route-proxy - shanks: receives build-agent - build-agent keeps data (ADR 0233): what it holds is backed up before it moves - route-proxy provides route: its consumers are sent again after it - route-proxy keeps data (ADR 0233): what it holds is backed up before it moves Run by the build seat on ace as `build-1791593838600199856` (`builds --log build-1791593838600199856`). ``` --- the gate: build-agent, mesh-controller, route-proxy mesh-controller: ok, 54 tool(s); 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: 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 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T00:37:45Z 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-10T00:37:45Z 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 3 module(s) in 3 tier(s): build-agent, mesh-controller, route-proxy --- its merge-check.sh (go toolchain) ok github.com/novox/mesh-controller/cmd/mesh-builder 1.031s ok github.com/novox/mesh-controller/cmd/mesh-controller 222.822s ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.011s ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.014s ok github.com/novox/mesh-controller/examples/redis-provisioner 1.045s ok github.com/novox/mesh-controller/examples/route-proxy 1.106s ok github.com/novox/mesh-controller/internal/artifacts 1.073s ok github.com/novox/mesh-controller/internal/broker 2.637s ok github.com/novox/mesh-controller/internal/builder 2.513s ok github.com/novox/mesh-controller/internal/catalogue 4.465s ok github.com/novox/mesh-controller/internal/conditions 2.442s ok github.com/novox/mesh-controller/internal/envfile 1.047s ok github.com/novox/mesh-controller/internal/facts 1.051s ok github.com/novox/mesh-controller/internal/identity 4.134s ok github.com/novox/mesh-controller/internal/inventory 83.079s ok github.com/novox/mesh-controller/internal/lease 17.683s ok github.com/novox/mesh-controller/internal/licences 3.772s ok github.com/novox/mesh-controller/internal/licences/adapters 1.078s ok github.com/novox/mesh-controller/internal/link 51.333s ok github.com/novox/mesh-controller/internal/lint 2.064s ok github.com/novox/mesh-controller/internal/outward 1.100s ok github.com/novox/mesh-controller/internal/overlay 1.091s ok github.com/novox/mesh-controller/internal/secrets 1.461s ok github.com/novox/mesh-controller/internal/store 3.302s ok github.com/novox/mesh-controller/internal/testbus 1.216s ok github.com/novox/mesh-controller/internal/token 1.016s ```
jschoubben added 1 commit 2026-10-10 01:16:40 +00:00
Say a build source only for the trunk's head, and hold what C, assembly and a new go.mod reach (hq ADR 0267, review)
mesh/merge-gate pass: builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step; every machine composes with the change as it…
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery superseded: a newer head of the same pull request
abe5f7dc17
A hand build of an older trunk commit said a closure lacking what was
imported since, and the planner would have mapped the next merge onto it.
C and assembly beside Go may include files below their directory, and a
go.mod made above a package moves it out of its module: each is now held.
jschoubben force-pushed fix/0267-a-merge-moves-what-its-build-source-holds from 93f704da9a to 05fa3705b6 2026-10-10 01:16:40 +00:00 Compare
Author
Contributor

Merge check at 05fa3705

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller, route-proxy)
  • mesh/repo-check: PASS — its merge-check.sh passed

Delivery plan — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step

  • tier 0: mesh-controller
  • tier 1: build-agent
  • tier 2: route-proxy
  • ace: receives build-agent, route-proxy
  • g14: receives build-agent
  • novox: receives mesh-controller, build-agent, route-proxy
  • shanks: receives build-agent
  • build-agent keeps data (ADR 0233): what it holds is backed up before it moves
  • route-proxy provides route: its consumers are sent again after it
  • route-proxy keeps data (ADR 0233): what it holds is backed up before it moves

Run by the build seat on g14 as build-1791595025028070209 (builds --log build-1791595025028070209).

--- the gate: build-agent, mesh-controller, route-proxy
mesh-controller: ok, 54 tool(s); 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: 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 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T00:37:45Z 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-10T00:37:45Z

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 3 module(s) in 3 tier(s): build-agent, mesh-controller, route-proxy
--- its merge-check.sh (go toolchain)
ok  	github.com/novox/mesh-controller/cmd/mesh-builder	1.033s
ok  	github.com/novox/mesh-controller/cmd/mesh-controller	209.386s
ok  	github.com/novox/mesh-controller/examples/objectstore-provisioner	1.009s
ok  	github.com/novox/mesh-controller/examples/postgres-provisioner	1.013s
ok  	github.com/novox/mesh-controller/examples/redis-provisioner	1.008s
ok  	github.com/novox/mesh-controller/examples/route-proxy	1.182s
ok  	github.com/novox/mesh-controller/internal/artifacts	1.052s
ok  	github.com/novox/mesh-controller/internal/broker	2.663s
ok  	github.com/novox/mesh-controller/internal/builder	2.639s
ok  	github.com/novox/mesh-controller/internal/catalogue	4.494s
ok  	github.com/novox/mesh-controller/internal/conditions	2.427s
ok  	github.com/novox/mesh-controller/internal/envfile	1.029s
ok  	github.com/novox/mesh-controller/internal/facts	1.033s
ok  	github.com/novox/mesh-controller/internal/identity	4.260s
ok  	github.com/novox/mesh-controller/internal/inventory	76.068s
ok  	github.com/novox/mesh-controller/internal/lease	17.700s
ok  	github.com/novox/mesh-controller/internal/licences	3.792s
ok  	github.com/novox/mesh-controller/internal/licences/adapters	1.007s
ok  	github.com/novox/mesh-controller/internal/link	52.363s
ok  	github.com/novox/mesh-controller/internal/lint	2.017s
ok  	github.com/novox/mesh-controller/internal/outward	1.033s
ok  	github.com/novox/mesh-controller/internal/overlay	1.027s
ok  	github.com/novox/mesh-controller/internal/secrets	1.437s
ok  	github.com/novox/mesh-controller/internal/store	3.192s
ok  	github.com/novox/mesh-controller/internal/testbus	1.166s
ok  	github.com/novox/mesh-controller/internal/token	1.017s
**Merge check** at `05fa3705` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller, route-proxy) - `mesh/repo-check`: **PASS** — its merge-check.sh passed **Delivery plan** — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step - tier 0: mesh-controller - tier 1: build-agent - tier 2: route-proxy - ace: receives build-agent, route-proxy - g14: receives build-agent - novox: receives mesh-controller, build-agent, route-proxy - shanks: receives build-agent - build-agent keeps data (ADR 0233): what it holds is backed up before it moves - route-proxy provides route: its consumers are sent again after it - route-proxy keeps data (ADR 0233): what it holds is backed up before it moves Run by the build seat on g14 as `build-1791595025028070209` (`builds --log build-1791595025028070209`). ``` --- the gate: build-agent, mesh-controller, route-proxy mesh-controller: ok, 54 tool(s); 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: 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 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T00:37:45Z 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-10T00:37:45Z 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 3 module(s) in 3 tier(s): build-agent, mesh-controller, route-proxy --- its merge-check.sh (go toolchain) ok github.com/novox/mesh-controller/cmd/mesh-builder 1.033s ok github.com/novox/mesh-controller/cmd/mesh-controller 209.386s ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.009s ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.013s ok github.com/novox/mesh-controller/examples/redis-provisioner 1.008s ok github.com/novox/mesh-controller/examples/route-proxy 1.182s ok github.com/novox/mesh-controller/internal/artifacts 1.052s ok github.com/novox/mesh-controller/internal/broker 2.663s ok github.com/novox/mesh-controller/internal/builder 2.639s ok github.com/novox/mesh-controller/internal/catalogue 4.494s ok github.com/novox/mesh-controller/internal/conditions 2.427s ok github.com/novox/mesh-controller/internal/envfile 1.029s ok github.com/novox/mesh-controller/internal/facts 1.033s ok github.com/novox/mesh-controller/internal/identity 4.260s ok github.com/novox/mesh-controller/internal/inventory 76.068s ok github.com/novox/mesh-controller/internal/lease 17.700s ok github.com/novox/mesh-controller/internal/licences 3.792s ok github.com/novox/mesh-controller/internal/licences/adapters 1.007s ok github.com/novox/mesh-controller/internal/link 52.363s ok github.com/novox/mesh-controller/internal/lint 2.017s ok github.com/novox/mesh-controller/internal/outward 1.033s ok github.com/novox/mesh-controller/internal/overlay 1.027s ok github.com/novox/mesh-controller/internal/secrets 1.437s ok github.com/novox/mesh-controller/internal/store 3.192s ok github.com/novox/mesh-controller/internal/testbus 1.166s ok github.com/novox/mesh-controller/internal/token 1.017s ```
jschoubben added 4 commits 2026-10-10 01:23:52 +00:00
Hold a cgo file's directory whole: its preamble may include from below it (hq ADR 0267, review)
mesh/delivery delivered
mesh/merge-gate pass: builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step; every machine composes with the change as it…
mesh/repo-check pass: its merge-check.sh passed
de55c63e12
Every merge to the controller's repository planned the controller, the
build seat's holder and the route proxy in three gated tiers, whatever it
changed (issue 338). The planner now maps a merge's files onto the build
source each module's newest trunk build said: a README moves nothing, the
controller's command the controller alone, the proxy's program the proxy
alone. A module with none said, or one an open plan has yet to build, is
read whole as before. Sharing a repository draws no packages edge any more,
and one recorded before neither widens nor orders a plan.
A failed build, or a plan closed before reaching a module, left the
closure its last good build said, and a fix-forward to a newly imported
package would have moved nothing. A missed merge moving only a module
that packages the repository was never caught up, and an older merge
read as history for it through a look that was not its own. The gate,
a pull request's check, the what-if and a delivery's order now read the
same view the merge handler does.
Judge a packaging module's news by plans that built it, over every plan since its build (hq ADR 0267, review)
mesh/delivery delivered
mesh/merge-gate pass: builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step; every machine composes with the change as it…
mesh/repo-check pass: its merge-check.sh passed
bd35b1c06c
A plan that closed without building a module hid a missed merge from it;
a window of recent plans let an old closure back in once the plan that
overtook it slid out; a merge the forge gave no time was acted on again
every pass. A plan answering the merge's own commit is now a look at it,
and clocks a little apart do not make a merge history.
jschoubben force-pushed fix/0267-a-merge-moves-what-its-build-source-holds from 05fa3705b6 to bd35b1c06c 2026-10-10 01:23:52 +00:00 Compare
Author
Contributor

Merge check at bd35b1c0

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller, route-proxy)
  • mesh/repo-check: PASS — its merge-check.sh passed

Delivery plan — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step

  • tier 0: mesh-controller
  • tier 1: build-agent
  • tier 2: route-proxy
  • ace: receives build-agent, route-proxy
  • g14: receives build-agent
  • novox: receives mesh-controller, build-agent, route-proxy
  • shanks: receives build-agent
  • build-agent keeps data (ADR 0233): what it holds is backed up before it moves
  • route-proxy provides route: its consumers are sent again after it
  • route-proxy keeps data (ADR 0233): what it holds is backed up before it moves

Run by the build seat on g14 as build-1791595449939276965 (builds --log build-1791595449939276965).

--- the gate: build-agent, mesh-controller, route-proxy
mesh-controller: ok, 54 tool(s); 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: 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 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T00:37:45Z 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-10T00:37:45Z

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 3 module(s) in 3 tier(s): build-agent, mesh-controller, route-proxy
--- its merge-check.sh (go toolchain)
ok  	github.com/novox/mesh-controller/cmd/mesh-builder	1.029s
ok  	github.com/novox/mesh-controller/cmd/mesh-controller	214.837s
ok  	github.com/novox/mesh-controller/examples/objectstore-provisioner	1.013s
ok  	github.com/novox/mesh-controller/examples/postgres-provisioner	1.024s
ok  	github.com/novox/mesh-controller/examples/redis-provisioner	1.012s
ok  	github.com/novox/mesh-controller/examples/route-proxy	1.182s
ok  	github.com/novox/mesh-controller/internal/artifacts	1.045s
ok  	github.com/novox/mesh-controller/internal/broker	2.617s
ok  	github.com/novox/mesh-controller/internal/builder	2.577s
ok  	github.com/novox/mesh-controller/internal/catalogue	4.370s
ok  	github.com/novox/mesh-controller/internal/conditions	2.386s
ok  	github.com/novox/mesh-controller/internal/envfile	1.030s
ok  	github.com/novox/mesh-controller/internal/facts	1.033s
ok  	github.com/novox/mesh-controller/internal/identity	4.116s
ok  	github.com/novox/mesh-controller/internal/inventory	72.864s
ok  	github.com/novox/mesh-controller/internal/lease	17.711s
ok  	github.com/novox/mesh-controller/internal/licences	3.710s
ok  	github.com/novox/mesh-controller/internal/licences/adapters	1.006s
ok  	github.com/novox/mesh-controller/internal/link	51.296s
ok  	github.com/novox/mesh-controller/internal/lint	1.977s
ok  	github.com/novox/mesh-controller/internal/outward	1.035s
ok  	github.com/novox/mesh-controller/internal/overlay	1.021s
ok  	github.com/novox/mesh-controller/internal/secrets	1.447s
ok  	github.com/novox/mesh-controller/internal/store	3.181s
ok  	github.com/novox/mesh-controller/internal/testbus	1.159s
ok  	github.com/novox/mesh-controller/internal/token	1.015s
**Merge check** at `bd35b1c0` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: build-agent, mesh-controller, route-proxy) - `mesh/repo-check`: **PASS** — its merge-check.sh passed **Delivery plan** — builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus step - tier 0: mesh-controller - tier 1: build-agent - tier 2: route-proxy - ace: receives build-agent, route-proxy - g14: receives build-agent - novox: receives mesh-controller, build-agent, route-proxy - shanks: receives build-agent - build-agent keeps data (ADR 0233): what it holds is backed up before it moves - route-proxy provides route: its consumers are sent again after it - route-proxy keeps data (ADR 0233): what it holds is backed up before it moves Run by the build seat on g14 as `build-1791595449939276965` (`builds --log build-1791595449939276965`). ``` --- the gate: build-agent, mesh-controller, route-proxy mesh-controller: ok, 54 tool(s); 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: 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 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-10T00:37:45Z 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-10T00:37:45Z 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 3 module(s) in 3 tier(s): build-agent, mesh-controller, route-proxy --- its merge-check.sh (go toolchain) ok github.com/novox/mesh-controller/cmd/mesh-builder 1.029s ok github.com/novox/mesh-controller/cmd/mesh-controller 214.837s ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.013s ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.024s ok github.com/novox/mesh-controller/examples/redis-provisioner 1.012s ok github.com/novox/mesh-controller/examples/route-proxy 1.182s ok github.com/novox/mesh-controller/internal/artifacts 1.045s ok github.com/novox/mesh-controller/internal/broker 2.617s ok github.com/novox/mesh-controller/internal/builder 2.577s ok github.com/novox/mesh-controller/internal/catalogue 4.370s ok github.com/novox/mesh-controller/internal/conditions 2.386s ok github.com/novox/mesh-controller/internal/envfile 1.030s ok github.com/novox/mesh-controller/internal/facts 1.033s ok github.com/novox/mesh-controller/internal/identity 4.116s ok github.com/novox/mesh-controller/internal/inventory 72.864s ok github.com/novox/mesh-controller/internal/lease 17.711s ok github.com/novox/mesh-controller/internal/licences 3.710s ok github.com/novox/mesh-controller/internal/licences/adapters 1.006s ok github.com/novox/mesh-controller/internal/link 51.296s ok github.com/novox/mesh-controller/internal/lint 1.977s ok github.com/novox/mesh-controller/internal/outward 1.035s ok github.com/novox/mesh-controller/internal/overlay 1.021s ok github.com/novox/mesh-controller/internal/secrets 1.447s ok github.com/novox/mesh-controller/internal/store 3.181s ok github.com/novox/mesh-controller/internal/testbus 1.159s ok github.com/novox/mesh-controller/internal/token 1.015s ```
mesh-admin merged commit 513ebd0577 into main 2026-10-10 02:00:18 +00:00
mesh-admin deleted branch fix/0267-a-merge-moves-what-its-build-source-holds 2026-10-10 02:00:18 +00:00
This repo is archived. You cannot comment on pull requests.
No Reviewers
2 Participants
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/mesh-controller#193