Issue 341: a merge check judges the pull request's head, not what merging it makes #242

Merged
mesh-admin merged 1 commits from issues/341-a-merge-check-judges-the-head-not-the-merge into main 2026-10-10 01:02:10 +00:00
Contributor

Registers issue 341 (status: located). Do not merge without review.

Symptom (2026-10-09, UTC). Node-engine #64/#65 merged at 00:15, each adding Applied.Declared (string, key declared). Node-engine #66 (head dfb1415) was checked at 00:49:42, after that, and both mesh/merge-gate and mesh/repo-check passed. It merged at 00:54 as 690966d. #66 had added its own Applied.Declared (*FoundUnit, same key), on different lines, so git merged cleanly and the trunk did not compile (internal/store/store.go:145:2: Declared redeclared). The walk plan-1791507264215942736 failed in tier 0; nothing reached a node (all kept d28ca95). Node-engine #67 repaired it.

Cause (from the code). mesh-controller 36008e0: checks.go sends Ref: p.Commit; internal/builder/check.go clones and checks out that head and never merges the base (Base only picks the check script and shows the trunk's manifests). mesh-catalog 63de373: mesh-delivery's table rechecks a ready delivery only when a person asks or its group changes; a merge leaves the repository's other open deliveries untouched. The forge keeps no refs/pull/N/merge.

The records say the head. ADR 0237 decision 4 and ADR 0238 decisions 1 and 2 name the pull request's head, never the merge, and nothing says a verdict goes stale when the trunk moves. The fix needs a decision record (extending 0237 §4, 0238 §1–2 and 0239's table); three directions are written in the diagnosis, none chosen.

Cost evidence: the night's manual rechecks and rebases (controller #148, #159, #165, #169, #171; catalogue #145, #147), with what each pull request's own text says.

Checks run locally from a fresh clone: records.py, index.py, cycle.py, words.py (with the catalogue's list) all pass.

Registers issue 341 (status: located). Do not merge without review. **Symptom (2026-10-09, UTC).** Node-engine #64/#65 merged at 00:15, each adding `Applied.Declared` (string, key `declared`). Node-engine #66 (head `dfb1415`) was checked at 00:49:42, after that, and both `mesh/merge-gate` and `mesh/repo-check` passed. It merged at 00:54 as `690966d`. #66 had added its own `Applied.Declared` (`*FoundUnit`, same key), on different lines, so git merged cleanly and the trunk did not compile (`internal/store/store.go:145:2: Declared redeclared`). The walk `plan-1791507264215942736` failed in tier 0; nothing reached a node (all kept `d28ca95`). Node-engine #67 repaired it. **Cause (from the code).** mesh-controller `36008e0`: `checks.go` sends `Ref: p.Commit`; `internal/builder/check.go` clones and checks out that head and never merges the base (`Base` only picks the check script and shows the trunk's manifests). mesh-catalog `63de373`: mesh-delivery's table rechecks a ready delivery only when a person asks or its group changes; a merge leaves the repository's other open deliveries untouched. The forge keeps no `refs/pull/N/merge`. **The records say the head.** ADR 0237 decision 4 and ADR 0238 decisions 1 and 2 name the pull request's head, never the merge, and nothing says a verdict goes stale when the trunk moves. **The fix needs a decision record** (extending 0237 §4, 0238 §1–2 and 0239's table); three directions are written in the diagnosis, none chosen. **Cost evidence:** the night's manual rechecks and rebases (controller #148, #159, #165, #169, #171; catalogue #145, #147), with what each pull request's own text says. Checks run locally from a fresh clone: records.py, index.py, cycle.py, words.py (with the catalogue's list) all pass.
mesh-admin added 1 commit 2026-10-09 01:13:50 +00:00
Issue 341: a merge check judges the pull request's head, not what merging it makes
mesh/merge-gate pass: the change touches no module of the mesh's graph
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery delivered
3d71532a3a
Node-engine #66 passed both required statuses after #64/#65 had merged,
and its merge did not compile: each side added Applied.Declared. The
check clones the head alone and nothing marks a verdict stale when the
trunk moves; ADR 0237/0238 say the head, so the fix needs a decision.
Author
Contributor

Delivery novox/hq@3d71532a3ae4 — delivered since 2026-10-10T01:02:20Z

Delivery plan — builds nothing: the change touches no module of the mesh's graph

Transitions

  • 2026-10-09 01:14 (new) → proposed (announced): novox/hq#242's head announced
  • 2026-10-09 01:14 proposed → checked (checked): the verdict names this commit
  • 2026-10-09 01:14 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-10 01:02 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 01:02 published → delivered (done): nothing for a walk to move

The commit's note under refs/notes/mesh-plan keeps every transition: git log --notes=mesh-plan.

<!-- mesh-delivery:view --> **Delivery** `novox/hq@3d71532a3ae4` — **delivered** since 2026-10-10T01:02:20Z **Delivery plan** — builds nothing: the change touches no module of the mesh's graph **Transitions** - 2026-10-09 01:14 (new) → proposed (announced): novox/hq#242's head announced - 2026-10-09 01:14 proposed → checked (checked): the verdict names this commit - 2026-10-09 01:14 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-10 01:02 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 01:02 published → delivered (done): nothing for a walk to move The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.
mesh-admin merged commit 591731ab54 into main 2026-10-10 01:02:10 +00:00
mesh-admin deleted branch issues/341-a-merge-check-judges-the-head-not-the-merge 2026-10-10 01:02:11 +00:00
Sign in to join this conversation.
No Reviewers
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/hq#242