From 76ddab3ea76877d2180e352bfbabfe992c5a0d02 Mon Sep 17 00:00:00 2001 From: jochen Date: Fri, 20 Nov 2026 01:58:40 +0100 Subject: [PATCH] Cite ADR 0682 by its final clauses in milestone H, with no branch protection read and every ask offered Claude-Session: https://claude.ai/code/session_01JG73KHUnBze48rdua8u2sy --- 00-META/glossary.md | 22 ++++++++++- .../G-1-pipelines-registration-and-steps.md | 6 +-- .../H-1-the-merge-call-and-the-take-in.md | 38 ++++++++----------- .../H-2-wants-builds-reads-and-tools.md | 4 +- .../H-3-corrections-and-what-retires.md | 15 +++++--- 5 files changed, 50 insertions(+), 35 deletions(-) diff --git a/00-META/glossary.md b/00-META/glossary.md index c2f9c89a..6d7039e4 100644 --- a/00-META/glossary.md +++ b/00-META/glossary.md @@ -600,8 +600,8 @@ controller (the planner, the rollout) until release 6 of ADR 0429; from each rel registering and changing one are trusted acts (ADR 0666 §2). The mesh knows modules, and a repository only as a module's git origin. - **watched branch** — a branch a module's registration names, whose commits start that module's pipeline and which a - placement may choose for a node; registering one the forge does not protect is refused (ADR 0666 §3, §6), a refusal - the operator removed on 2026-11-14 (design 47 G §5); a merge into it still needs its protection (ADR 0666 §11). + placement may choose for a node; from milestone H's delivery it need not be protected, and nothing reads its + protection (ADR 0682 §13, which ends ADR 0666 §3's refusal and §11's judgement). - **merge call** — one call of the seat `git`'s verb `merge-pull` naming one or more pull requests, each at the head its caller names: from the delivery of design 47's milestone H the start of their delivery and, with two or more, their group; the forge module judges every member before it merges any and says the call as its event @@ -613,6 +613,24 @@ controller (the planner, the rollout) until release 6 of ADR 0429; from each rel `head-untaken` and delivered by nothing but a later merge call or the gate's hand take (ADR 0682; design 47 H §740). Not a pending revision, which is a source revision not yet taken in. *Not:* ~~merge-untaken~~ (hq) +- **`merge-called`** — the seat `git`'s event saying one merge call: its members that landed, each at its merge + commit, and those refused; the gate's one input that names a source revision (ADR 0682 §1; design 47 H §736). + *Not:* ~~merge notice~~ (hq) +- **`head-moved`** — the forge bridge's one message for a move of a watched branch's head, however it moved, heard by + the gate's watchdog alone (ADR 0682 §3; design 47 H §739). It replaces the messages `merged` and `pushed`. + *Not:* ~~pushed message~~ (hq) +- **`head-untaken`** — the gate's finding for an **untaken head**, raised when `untaken-bound` passes (ADR 0682 §3). + *Not:* ~~untaken merge~~ (hq) +- **`untaken-bound`** — the gate's setting, default 10 minutes, after which a head moved and not named by a source + revision is `head-untaken` (ADR 0682 §3). + *Not:* ~~take-in bound~~ (hq) +- **`pipelines-at-once`** — the runner's setting, 1 to 8, default 1: how many pipelines have their steps asked at + once; the rest wait in order (ADR 0682 §7; design 47 H §748). + *Not:* ~~concurrent pipelines~~ (hq) +- **`tier-late`** — the assigner's finding when one tier of a pipeline's movers does not run on its present machines + within `tier-bound`: no later tier is written and the delivery record ends `failed` (ADR 0682 §8, §9; design 47 H + §751). + *Not:* ~~late tier~~ (hq) - **take-in** — the indexer's act on one source revision of a watched branch: the commits it names, the build-input fingerprints of the modules registered for those repositories, and one catalog revision of that branch, said as `take-in.taken` naming the **movers**; it validates no manifest (that is the pipeline step `validate`) and diff --git a/03-DESIGN/01-to-be/47-milestones/G-1-pipelines-registration-and-steps.md b/03-DESIGN/01-to-be/47-milestones/G-1-pipelines-registration-and-steps.md index e6d9de97..fd942445 100644 --- a/03-DESIGN/01-to-be/47-milestones/G-1-pipelines-registration-and-steps.md +++ b/03-DESIGN/01-to-be/47-milestones/G-1-pipelines-registration-and-steps.md @@ -86,8 +86,8 @@ check and deliver milestone G itself (ADR 0667 §2); each of them says so in a l then that event, never by reading the ledger (ADR 0666 §3, ADR 0596). - §5 **An unprotected branch is not refused at registration** (corrected in place by design 47 H §763). `register` and `watch` read no branch's protection and refuse no watched branch for it: the operator approved removing the - check on 2026-11-14 (G-23, *Met during G's start*), which ADR 0666 §3 still states. `merge-pull` still judges the - protection at every merge (ADR 0666 §11, §38), and §17's `branch-unprotected` stands. + check on 2026-11-14 (G-23, *Met during G's start*), and ADR 0682 §13 ends ADR 0666 §3's refusal, `merge-pull`'s + protection judgement and §17's `branch-unprotected` (design 47 H §735, §739). - §6 **The foundation parts are the manifest validator's list.** The manifest validator's list (ADR 0619 §3) holds exactly the foundation parts, ADR 0619 §1's, the runner, which joins them (ADR 0666 §4), and the forge and image registry modules (§584); the checker leaves the @@ -320,7 +320,7 @@ check and deliver milestone G itself (ADR 0667 §2); each of them says so in a l branch. - §40 **The operator-channel hides no ask.** It keeps no count of open asks per asker and holds none back: every ask is offered when it is raised (A-424, the operator, 2026-11-15 about 15:50 CET), and it replaces an open ask by the - same asker's ask with the same `about` (ADR 0666 §12, whose three open asks per asker A-424 ends; design 46 §6; + same asker's ask with the same `about` (ADR 0682 §14, which ends ADR 0666 §12's three open asks per asker; design 46 §6; corrected in place by design 47 H §763). - §41 **How it is checked.** Whole (forge module, forge bridge): a session's `merge-pull` at its head merges with no run yet, and with a passed one, and asks no Approve; with the runner stopped a head merges; a head at whose fingerprint any diff --git a/03-DESIGN/01-to-be/47-milestones/H-1-the-merge-call-and-the-take-in.md b/03-DESIGN/01-to-be/47-milestones/H-1-the-merge-call-and-the-take-in.md index 7a8fbc31..ad23eb01 100644 --- a/03-DESIGN/01-to-be/47-milestones/H-1-the-merge-call-and-the-take-in.md +++ b/03-DESIGN/01-to-be/47-milestones/H-1-the-merge-call-and-the-take-in.md @@ -26,7 +26,7 @@ is named, it is named by module and function, from the gap tables of 2026-11-20, registered modules." 2026-11-20 about 01:10 CET: "parallel pipelines sounds like a very bad idea". 01:15 to 01:20 CET: a delivery is started by hand by the merge it already needs, the lead named principle 3 (a start a person forgets is a silent non-delivery), and the operator chose "A": the merge through the mesh is the start and the group, and the -forge's event is the watchdog. ADR 0682 records it (cited by the clause numbers of its version 5). The chain these lines build, in one sentence: a **merge call** +forge's event is the watchdog. ADR 0682 records it (cited by the clause numbers of its version 8, fourteen clauses). The chain these lines build, in one sentence: a **merge call** (the seat `git`'s `merge-pull` naming one or more pull requests) merges the heads, the gate names them one source revision per watched branch and opens its delivery record, the indexer takes that revision in and names the movers, the runner runs one pipeline for it when no other runs, and the assigner wants the newest passed release; the forge @@ -58,9 +58,11 @@ flowchart LR the forge module's `merge-pull` handler and the seat `git`'s contract in mesh-delivery-contracts. How it is checked: whole (forge module): a call naming two pull requests in two repositories merges both and says one `merge-called` (§736). Replaces G §38's one-pull form. -- §735 **Every member is judged before any is merged.** (ADR 0682 §1; ADR 0666 §11; principle 3) The verb judges each - member as ADR 0666 §11 does (still the pull request's head; a branch protection that refuses a direct push, read - again; no run at the head's build-input fingerprint failed a `required` step), all of them first. When one member is +- §735 **Every member is judged before any is merged.** (ADR 0682 §1, §13; ADR 0666 §11; principle 3) The verb judges + each member as ADR 0666 §11 does, but for the branch protection (still the pull request's head; no run at the head's + build-input fingerprint failed a `required` step), all of them first. It judges no branch protection: a watched + branch need not be protected (ADR 0682 §13), and a head moved outside the mesh, a push included, is the watchdog's + untaken head (§740). When one member is refused, none is merged, and the answer names every refused member and why. Then it merges the members in the order the call names them. The forge module's `failed-steps` that this judges is written from the runner's `step-ended`, whose body names the mover, its commit and its build-input fingerprint (H-A-18). Why judging first: a group merged in @@ -132,9 +134,9 @@ flowchart LR `forge...head-moved`, kept `head-moved-retention` (a setting, default 7 days): `repository`, `branch`, `head`, `before` (the head it held for that branch in its state `heads`, empty the first time) and `start` (true when said at its start). It writes it whether the head moved by a merge call, a merge in the forge's screen or - an admitted push: it reads no pull request and no tree. A head equal to the one it holds writes nothing. An - unprotected watched branch writes nothing and is said as `branch-unprotected` (G §17 stands). Its one consumer is the - gate (§740). Built in H1 in the bridge; the messages `merged` and `pushed`, their `base`, their trees in its state + an admitted push: it reads no pull request and no tree. A head equal to the one it holds writes nothing. It + reads no branch protection: an unprotected watched branch moves like any other, and `branch-unprotected` (G §17) + ends (ADR 0682 §13). Its one consumer is the gate (§740). Built in H1 in the bridge; the messages `merged` and `pushed`, their `base`, their trees in its state `inputs`, and its call of `git.pull` for a merged commit go (§764). How it is checked: whole (bridge): a merge, an admitted push and a restart each give one `head-moved`; a head heard twice gives one. Replaces G §509 and §714's message form. @@ -200,7 +202,7 @@ flowchart LR names mesh-sdk and its importers; one changing only a document names no mover and pins nothing; a restart between the revision's write and the acknowledgement writes no second revision. Replaces G §16, §19, §509, §712 to §715 and the main file's *Taken in by the indexer it names* (§764). -- §744 **A take-in that cannot be written is held, said and skippable.** (H-A-12; principles 1, 3 and 4) A take-in that +- §744 **A take-in that cannot be written is held, said and skippable.** (ADR 0682 §4; H-A-12; principles 1, 3 and 4) A take-in that cannot be written (the catalog store `full`, G §181) is held: its `source-moved` stays unacknowledged and is not redelivered on the acknowledgement timer (the consumer's wait for an acknowledgement is longer than any hold, and it is redelivered with no delay only when the indexer asks); the indexer takes it again when the bus module's `room` for @@ -213,8 +215,8 @@ flowchart LR writes the hand-act log. The state `pending`, its keys `m.` and `g.`, and `indexer_drop_pending` go (§764). Built in H1 (indexer). How it is checked: whole (indexer): with the store full a `source-moved` is held, said once, taken in on `room`; a second branch's take-in goes on meanwhile; a skip ends it in the hand-act log (acceptance - test 116). ADR 0682 §4 at version 5 ends `take-in.pending`, `take-in-waits`' bound and `indexer_pending`, which H-A-12 - keeps (question 1 below). + test 116). ADR 0682 §4 keeps `take-in.pending`, `take-in-waits`, `indexer_pending` and `indexer_take_in_pending` and + ends `indexer_drop_pending`. - §745 **Manifest validation is the pipeline step `validate`.** (ADR 0682 §5; H-A-6; A-476 (a); ADR 0666 §17) The step `validate` is served by the assigner as an accepted kind `step` of the seat `mesh-wants`, the seat that serves the composition step (G §22), asked by the runner for each mover as the step before its composition step: the assigner @@ -226,8 +228,7 @@ flowchart LR gains it. The indexer's events `manifest-refused` and `manifest-accepted` (G §500, §668) go; their readers read the step's end (§764). Built in H1 (assigner: the step; runner: the order; indexer: the seed's default). How it is checked: whole (assigner, runner): a take-in whose manifest names an unknown field fails `validate` naming it and asks - no composition; a take-in making a cycle fails it naming the cycle (acceptance test 117). ADR 0682 §5 at version 5 - still names `mesh-module-assigner`; H-A-6 asks the record writer to correct it. + no composition; a take-in making a cycle fails it naming the cycle (acceptance test 117). ### One take-in, one pipeline, none in parallel @@ -237,7 +238,7 @@ flowchart LR catalog graph's build order (a mover's build waits for the `package-published` of each mover it has a "published before it builds" edge to, toolchain edges first), and computes the movers' delivery order in ADR 0666 §14's order as tiers (acting parts first, providers before their consumers; movers no edge orders share a tier). The pipeline passes - when every mover's `required` steps passed, a `required` step ending `nothing to run` counting as passed (H-A-3), and + when every mover's `required` steps passed, a `required` step ending `nothing to run` counting as passed (ADR 0682 §8; H-A-3), and fails when one did not. Its events (G §73) move to `mesh.seat.mesh-pipeline-runner.event...` for `pipeline-started` and `pipeline-ended`: `pipeline-started` names `pipeline`, `branch`, `source`, `call`, `revision` and the movers; `pipeline-ended` is said once with `pipeline`, `branch`, `source`, `call`, `revision`, the @@ -278,7 +279,7 @@ flowchart LR count against the bound, and when its approval is answered it is placed first, ahead of every `seq`. When pipelines wait and none runs after a placing, the runner raises its finding `pipelines-stalled`, naming the first waiting, and clears it when one runs. At most `pipelines-waiting-cap` pipelines wait (a setting, default 64): a start over it - leaves its `take-in.taken` unacknowledged, raises `queue-full`, and is taken on the next end. Superseding: a waiting + leaves its `take-in.taken` unacknowledged, raises `queue-full`, and is taken on the next end. Superseding (ADR 0682 §7): a waiting pipeline's mover that a newer waiting pipeline of the same branch also moves leaves the older one, which ends `superseded` when no mover is left; a running pipeline runs to its end (G §31's supersession of running steps no longer applies across pipelines). A waiting pipeline is progress not owed (§741). The runner's tool `runner_waiting` @@ -294,12 +295,3 @@ flowchart LR H1 (indexer: `JudgePins`; runner). How it is checked: whole (indexer): a restart while a pipeline runs on revision 510 keeps 510. Corrects A-449 (§763). -### Questions this file leaves open - -1. **What stays of ADR 0633 §5 for a held take-in.** ADR 0682 §4 at version 5 ends `take-in.pending`, the bound of - `take-in-waits`, `indexer_pending` and the hand acts with the pending revision; H-A-12 keeps them for a take-in held - on a full store, as §744 writes. The record and §744 must agree before H1's prepare: either the clause keeps them for - a held take-in, or §744 drops them and `head-untaken` is the only bound. -2. **Records behind three answers.** H-A-3 (`nothing to run` counts as passed), H-A-10 (wants tier by tier, §751) and - the supersession of a waiting pipeline (§748) are said to be in ADR 0682, and version 5's clauses do not say them; - §746, §748 and §751 are written from the answers. diff --git a/03-DESIGN/01-to-be/47-milestones/H-2-wants-builds-reads-and-tools.md b/03-DESIGN/01-to-be/47-milestones/H-2-wants-builds-reads-and-tools.md index 9359c664..8f4585ec 100644 --- a/03-DESIGN/01-to-be/47-milestones/H-2-wants-builds-reads-and-tools.md +++ b/03-DESIGN/01-to-be/47-milestones/H-2-wants-builds-reads-and-tools.md @@ -48,7 +48,7 @@ main file, *Every delivery part wakes on its inputs alone*; §762 here says whic every placing machine, whatever build an acting part runs; a version whose pipeline failed is not wanted; an older end heard after a newer one writes nothing; a placement `build` names the want's version (acceptance test 113). Replaces G §29's per-revision want, §291 and §292 in their want half, and design 47's six rules in *Where it goes*. -- §751 **One pipeline's wants are written tier by tier.** (H-A-10; ADR 0682 §9; ADR 0666 §14; principles 3 and 7) On a +- §751 **One pipeline's wants are written tier by tier.** (ADR 0682 §8, §9; H-A-10; ADR 0666 §14; principles 3 and 7) On a passed `pipeline-ended` the assigner writes the wants of its tier-1 movers on every placing machine; once each of them reports `running` at that version on every present placing machine (the node-engine seat's `running`), it writes the next tier's, and so on. Each tier has `tier-bound` (a setting of the assigner, default 30 minutes): a tier whose @@ -115,7 +115,7 @@ main file, *Every delivery part wakes on its inputs alone*; §762 here says whic nothing; `build.ended` names its version (acceptance test 119). - §757 **The steps a mover can run are asked at every pipeline.** (ADR 0666 §7; G §8, §22; H-A-3) At each pipeline's start the runner asks each build seat's `steps` for each mover's artifacts, never only at the seed; a step the answer - says has nothing to do ends `nothing to run`, which counts as passed for the pipeline (§746). Built in H2 (runner). + says has nothing to do ends `nothing to run`, which counts as passed for the pipeline (§746; ADR 0682 §8). Built in H2 (runner). How it is checked: whole (runner): a library module whose unit tests vanish ends that step `nothing to run` and its pipeline passes (acceptance test 119). - §758 **A registration whose pipeline would have no step is refused.** (ADR 0666 §2; acceptance test 67) `register` diff --git a/03-DESIGN/01-to-be/47-milestones/H-3-corrections-and-what-retires.md b/03-DESIGN/01-to-be/47-milestones/H-3-corrections-and-what-retires.md index c8b88144..2c095ab6 100644 --- a/03-DESIGN/01-to-be/47-milestones/H-3-corrections-and-what-retires.md +++ b/03-DESIGN/01-to-be/47-milestones/H-3-corrections-and-what-retires.md @@ -20,20 +20,21 @@ One file of milestone H's part of [design 47](../47-delivery-from-commit-to-deli - §763 **The small contradictions are corrected in place.** (plan item 10; each line names its source) These lines of milestone G and the main file now say what holds, each marked "corrected in place by design 47 H §763": - - G §5: `register` and `watch` refuse no unprotected branch (the operator, 2026-11-14, G-23 *Met during G's start*). - ADR 0666 §3 still states the refusal: a clause owed. + - G §5: `register` and `watch` refuse no unprotected branch (ADR 0682 §13, which ends ADR 0666 §3; the operator, + 2026-11-14, G-23 *Met during G's start*). G §17, G §38's and G §41's protection judgement of `merge-pull`: no part + reads a branch's protection (ADR 0682 §13, which ends ADR 0666 §11's protection judgement and §6's condition). - G §654: mesh-config consumes no pull request event and calls no `git.pull` (ADR 0681 §1). - A-449 and A-449a: the runner says no `pinned` or `freed`; the indexer pins and frees a pipeline's revision (§749). - Acceptance test 53: its `forge-made` and checker rows go (G §151; §740; the checker goes). - G §476 and §648: `take-in.taken` carries one entry per mover, `{module, commit, fingerprint, repository}`, no `pull` (§743). - - G §40: the operator channel keeps no count of open asks per asker (A-424, the operator, 2026-11-15). ADR 0666 §12 - still says three: a clause owed. + - G §40: the operator channel keeps no count of open asks per asker and offers every ask (ADR 0682 §14, which ends + ADR 0666 §12's three; A-424, the operator, 2026-11-15). - G §386: the grants part makes one durable consumer per process that hears a `*` event, named as A-397 names it. - G §73's subject table and G-4's row of the runner's events, and G §74's wait per module: `pipeline-started` and `pipeline-ended` are said per source revision and waited for so (§746). How it is checked: hq's review of this amendment reads each corrected line against its source. -- §764 **What retires at milestone H's delivery.** (ADR 0682 §1 to §4, §6, §8, §9; ADR 0681; ADR 0667 §12) Each is +- §764 **What retires at milestone H's delivery.** (ADR 0682 §1 to §4, §6, §8, §9, §13, §14; ADR 0681; ADR 0667 §12) Each is removed in the release named, with its code, its state (dropped by §765), its tools, its events in the seat definitions, its readers and its tests; nothing of it is kept unread. - **The forge module (H1, H3):** the single-pull form of `merge-pull` (§734); the merge-check machinery: the @@ -41,6 +42,10 @@ One file of milestone H's part of [design 47](../47-delivery-from-commit-to-deli `trunksMoved`, `siblingMoves`, `GateWriter`) and its files on disk, its one-minute poll and ten-minute timer (H3). The forge's branch protections drop the required statuses `mesh/merge-gate` and `mesh/repo-check` in H1, through the forge module's protection setting, so no merge waits on a status nothing writes (H-A-15). + - **The branch protection (H1; ADR 0682 §13):** `merge-pull`'s judgement of a branch's protection, the bridge's + read of it on every move and its finding `branch-unprotected` (G §17), and the protection rows of G §41's test. + - **The operator channel's limit (ADR 0682 §14):** any count of open asks per asker, and ADR 0666 §25's tool for + asks held back, which reads empty and goes. - **The forge bridge (H1):** the messages `merged` and `pushed` and their `base` (§739), with their readers, the indexer's take-in and the gate's `ForgeMerged`; its state `inputs` and its read of trees; its call of `git.pull` for a merged commit; the group it sets on a member, `forge.group.merged`, `bridge_groups` and