Let several modules declare one package, and refuse only present beside absent (hq ADR 0303) #237

Merged
mesh-admin merged 1 commits from feat/303-shared-packages into main 2026-10-11 20:39:23 +00:00
Contributor

Merge only once ADR 0303 is accepted (proposed 2026-10-11, needs the operator's Approve).

Why. assign ace media-importer was refused: youtube and media-importer both declare ffmpeg, and the controller held ADR 0210 §11 (one declaration per package per node). The operator: two modules should be able to declare the same package. The node-engine (applyPackage) installs a missing package, never upgrades, and never removes one a declaration stopped naming, so a second declaration changes nothing on the machine.

What changes (internal/catalogue)

  • checkResources treats a package apart: several modules declaring it present is fine; one declaring it absent (ADR 0180) while another declares it present is refused, naming both, with ADR 0303.
  • CollisionRefusal no longer appends ADR 0210's "one owner per node" text to that refusal.
  • Paths, units and names keep their one-owner rule unchanged.

Tests: TestTwoModulesMayDeclareOnePackage (replaces the test that refused it) and TestAPackageDeclaredPresentAndAbsentIsRefusedNamingBoth (refused naming both, an unrelated assignment not refused, one already on the node left to status). go test ./internal/catalogue/ green.

After merge: mesh-media-catalog #20 (the importer dropping ffmpeg) is no longer needed and closes unmerged.

**Merge only once ADR 0303 is accepted** (proposed 2026-10-11, needs the operator's Approve). **Why.** `assign ace media-importer` was refused: youtube and media-importer both declare `ffmpeg`, and the controller held ADR 0210 §11 (one declaration per package per node). The operator: two modules should be able to declare the same package. The node-engine (`applyPackage`) installs a missing package, never upgrades, and never removes one a declaration stopped naming, so a second declaration changes nothing on the machine. **What changes** (`internal/catalogue`) - `checkResources` treats a package apart: several modules declaring it present is fine; one declaring it `absent` (ADR 0180) while another declares it present is refused, naming both, with ADR 0303. - `CollisionRefusal` no longer appends ADR 0210's "one owner per node" text to that refusal. - Paths, units and names keep their one-owner rule unchanged. **Tests**: `TestTwoModulesMayDeclareOnePackage` (replaces the test that refused it) and `TestAPackageDeclaredPresentAndAbsentIsRefusedNamingBoth` (refused naming both, an unrelated assignment not refused, one already on the node left to status). `go test ./internal/catalogue/` green. **After merge**: mesh-media-catalog #20 (the importer dropping ffmpeg) is no longer needed and closes unmerged.
mesh-admin added 1 commit 2026-10-11 19:55:30 +00:00
Let several modules declare one package, and refuse only present beside absent (hq ADR 0303)
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/repo-check pass: its merge-check.sh passed
mesh/delivery delivered
6d2138217f
Assigning the media-importer beside youtube was refused because both
declare ffmpeg. The node-engine installs a missing package and never
removes one a declaration stopped naming, so a second declaration
changes nothing on the machine; what two modules can contradict is one
declaring a package present and another absent, which stays refused.
Author
Contributor

Delivery novox/mesh-controller@6d2138217fd0 — delivered since 2026-10-11T20:51:34Z

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
  • grants step: if this changes what the bus's user list says (a new tool, subject or user), novox is sent that list alone, every build there kept, before build-agent is judged on its first machine

Machines

  • mesh-controller on novox: passed — healthy 3 times over 4m7s
  • mesh-controller on the rest running it: sent
  • build-agent on ace: passed — healthy 3 times over 3m35s
  • build-agent on the rest running it: sent

Transitions

  • 2026-10-11 19:55 (new) → proposed (announced): novox/mesh-controller#237's head announced
  • 2026-10-11 20:01 proposed → checked (checked): the verdict names this commit
  • 2026-10-11 20:01 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-11 20:41 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
  • 2026-10-11 20:41 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-11 20:51 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@6d2138217fd0` — **delivered** since 2026-10-11T20:51:34Z **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 - grants step: if this changes what the bus's user list says (a new tool, subject or user), novox is sent that list alone, every build there kept, before build-agent is judged on its first machine **Machines** - mesh-controller on novox: passed — healthy 3 times over 4m7s - mesh-controller on the rest running it: sent - build-agent on ace: passed — healthy 3 times over 3m35s - build-agent on the rest running it: sent **Transitions** - 2026-10-11 19:55 (new) → proposed (announced): novox/mesh-controller#237's head announced - 2026-10-11 20:01 proposed → checked (checked): the verdict names this commit - 2026-10-11 20:01 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-11 20:41 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move - 2026-10-11 20:41 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-11 20:51 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 6d213821

  • 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
  • grants step: if this changes what the bus's user list says (a new tool, subject or user), novox is sent that list alone, every build there kept, before build-agent is judged on its first machine
  • read by no module's build: internal/catalogue/contribution_dependencies_test.go

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

--- the gate: build-agent, mesh-controller
mesh-controller: ok, 56 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-11T19:48:31Z 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-11T19:48:31Z

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:
  - internal/catalogue/contribution_dependencies_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.038s
ok  	github.com/novox/mesh-controller/cmd/mesh-controller	225.140s
ok  	github.com/novox/mesh-controller/examples/objectstore-provisioner	1.022s
ok  	github.com/novox/mesh-controller/examples/postgres-provisioner	1.024s
ok  	github.com/novox/mesh-controller/examples/redis-provisioner	1.019s
ok  	github.com/novox/mesh-controller/examples/route-proxy	1.150s
ok  	github.com/novox/mesh-controller/internal/artifacts	1.072s
?   	github.com/novox/mesh-controller/internal/beside	[no test files]
ok  	github.com/novox/mesh-controller/internal/broker	3.024s
ok  	github.com/novox/mesh-controller/internal/builder	16.120s
ok  	github.com/novox/mesh-controller/internal/catalogue	7.573s
ok  	github.com/novox/mesh-controller/internal/conditions	2.791s
ok  	github.com/novox/mesh-controller/internal/envfile	1.064s
ok  	github.com/novox/mesh-controller/internal/facts	1.070s
ok  	github.com/novox/mesh-controller/internal/identity	4.596s
ok  	github.com/novox/mesh-controller/internal/inventory	88.138s
ok  	github.com/novox/mesh-controller/internal/lease	17.736s
ok  	github.com/novox/mesh-controller/internal/licences	4.207s
ok  	github.com/novox/mesh-controller/internal/licences/adapters	1.053s
ok  	github.com/novox/mesh-controller/internal/link	59.566s
ok  	github.com/novox/mesh-controller/internal/lint	2.326s
ok  	github.com/novox/mesh-controller/internal/outward	1.078s
ok  	github.com/novox/mesh-controller/internal/overlay	1.071s
ok  	github.com/novox/mesh-controller/internal/secrets	1.481s
ok  	github.com/novox/mesh-controller/internal/store	3.483s
ok  	github.com/novox/mesh-controller/internal/testbus	1.211s
ok  	github.com/novox/mesh-controller/internal/token	1.017s
store tests, each run against the store:
  ./cmd/mesh-controller --- PASS: TestAStopWithoutAMergeWalksTheOthersAgain (0.42s)
  ./cmd/mesh-controller --- PASS: TestAStopWithoutAMergeEndsTheMergesThatContainIt (0.45s)
  ./cmd/mesh-controller --- PASS: TestAStopWalksTheOthersAgainInTheOpenBatch (0.38s)
  ./cmd/mesh-controller --- PASS: TestAStopNamesWhatStaysOnTheMachinesAndWhatStillCarriesIt (0.36s)
  ./cmd/mesh-controller --- PASS: TestAStopWithoutAMergeLeavesItOutOfABatch (0.35s)
  ./cmd/mesh-controller --- PASS: TestSavingPlansAndMovingMergesIsOneAct (0.33s)
  ./cmd/mesh-controller --- PASS: TestNodeShowAndStatusReadTheLastSendFromTheStore (0.39s)
  ./internal/inventory --- PASS: TestTheLastSendSaysWhatTheMachineAnswered (0.22s)
  ./internal/inventory --- PASS: TestAReportIsTheLastSendsAnswerOnlyWhenItIsAboutThatSend (0.22s)
**Merge check** at `6d213821` - `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 - grants step: if this changes what the bus's user list says (a new tool, subject or user), novox is sent that list alone, every build there kept, before build-agent is judged on its first machine - read by no module's build: internal/catalogue/contribution_dependencies_test.go Run by the build seat on ace as `build-1791748557381185801` (`builds --log build-1791748557381185801`). ``` --- the gate: build-agent, mesh-controller mesh-controller: ok, 56 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-11T19:48:31Z 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-11T19:48:31Z 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: - internal/catalogue/contribution_dependencies_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.038s ok github.com/novox/mesh-controller/cmd/mesh-controller 225.140s ok github.com/novox/mesh-controller/examples/objectstore-provisioner 1.022s ok github.com/novox/mesh-controller/examples/postgres-provisioner 1.024s ok github.com/novox/mesh-controller/examples/redis-provisioner 1.019s ok github.com/novox/mesh-controller/examples/route-proxy 1.150s ok github.com/novox/mesh-controller/internal/artifacts 1.072s ? github.com/novox/mesh-controller/internal/beside [no test files] ok github.com/novox/mesh-controller/internal/broker 3.024s ok github.com/novox/mesh-controller/internal/builder 16.120s ok github.com/novox/mesh-controller/internal/catalogue 7.573s ok github.com/novox/mesh-controller/internal/conditions 2.791s ok github.com/novox/mesh-controller/internal/envfile 1.064s ok github.com/novox/mesh-controller/internal/facts 1.070s ok github.com/novox/mesh-controller/internal/identity 4.596s ok github.com/novox/mesh-controller/internal/inventory 88.138s ok github.com/novox/mesh-controller/internal/lease 17.736s ok github.com/novox/mesh-controller/internal/licences 4.207s ok github.com/novox/mesh-controller/internal/licences/adapters 1.053s ok github.com/novox/mesh-controller/internal/link 59.566s ok github.com/novox/mesh-controller/internal/lint 2.326s ok github.com/novox/mesh-controller/internal/outward 1.078s ok github.com/novox/mesh-controller/internal/overlay 1.071s ok github.com/novox/mesh-controller/internal/secrets 1.481s ok github.com/novox/mesh-controller/internal/store 3.483s ok github.com/novox/mesh-controller/internal/testbus 1.211s ok github.com/novox/mesh-controller/internal/token 1.017s store tests, each run against the store: ./cmd/mesh-controller --- PASS: TestAStopWithoutAMergeWalksTheOthersAgain (0.42s) ./cmd/mesh-controller --- PASS: TestAStopWithoutAMergeEndsTheMergesThatContainIt (0.45s) ./cmd/mesh-controller --- PASS: TestAStopWalksTheOthersAgainInTheOpenBatch (0.38s) ./cmd/mesh-controller --- PASS: TestAStopNamesWhatStaysOnTheMachinesAndWhatStillCarriesIt (0.36s) ./cmd/mesh-controller --- PASS: TestAStopWithoutAMergeLeavesItOutOfABatch (0.35s) ./cmd/mesh-controller --- PASS: TestSavingPlansAndMovingMergesIsOneAct (0.33s) ./cmd/mesh-controller --- PASS: TestNodeShowAndStatusReadTheLastSendFromTheStore (0.39s) ./internal/inventory --- PASS: TestTheLastSendSaysWhatTheMachineAnswered (0.22s) ./internal/inventory --- PASS: TestAReportIsTheLastSendsAnswerOnlyWhenItIsAboutThatSend (0.22s) ```
mesh-admin merged commit e1953ad3f5 into main 2026-10-11 20:39:23 +00:00
mesh-admin deleted branch feat/303-shared-packages 2026-10-11 20:39:24 +00:00
This repo is archived. You cannot comment on pull requests.
No Reviewers
1 Participants
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/mesh-controller#237