docs(remediation): bank D-55f — self-merge silences the trailer generator; merger!=f10-coder joins #1030's merge preconditions
This commit is contained in:
mos-dt-0
@@ -18,14 +18,14 @@ remediation dispatched to `coder-mos2`. Review dispatches now always leave a dur
|
||||
|
||||
## In-flight
|
||||
|
||||
| Task | Owner | State |
|
||||
| ------------------- | --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| RM-01 checkout | — | **MERGED** `f58b3699` (#1027) |
|
||||
| RM-03 queue guard | Jason (re-sync) | ✅ **MERGED** `58b971ab` (#1032), #1019 closed. ⚠ **NOT DELIVERED**: installed guard still the broken one (291 lines / 0 `ASSERTED_NOT_READY` vs main 482 / 5). Re-sync via `mosaic upgrade`, then **prove it blocks a KNOWN-RED pipeline** — **D-51** |
|
||||
| RM-02 registry ★key | coder-mos2 | **ROUND-5 VERDICT id 88 REQUEST_CHANGES @ `e910a45a` (2026-08-05T22:37Z, live).** 2 blockers left: renderer accepts manifest-controlled `COMPATIBILITY `-prefixed provenance-success payloads; overclaim control is lexical-not-semantic vs docs claims. Shrink-together + evidence-subject CONFIRMED CLOSED — do not weaken. Remediation dispatched to `coder-mos2` 22:5xZ (PR comment + verified tmux); context guard: checkpoint at 85%. ⚠ **3 branch authors — squash erases 2 (D-55);** explicit squash + trailers (pr-merge.sh field: be-coder-08); trade in body; **branch MUST NOT be deleted**. ACs @ `dde38717` |
|
||||
| RM-61 CI exemption | — | ✅ **MERGED** `f4fd5967` (#1033). #1034 closed; **#1000 stays OPEN** (retirement trigger). Exemption is on `main` |
|
||||
| RM-59 / RM-60 | Jason (infra) | tracked deps; RM-60 option **B** |
|
||||
| #1023 queue attempt | Jason | SUPERSEDED-PENDING-JASON — live REQUEST_CHANGES, do **not** merge |
|
||||
| Task | Owner | State |
|
||||
| ------------------- | --------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| RM-01 checkout | — | **MERGED** `f58b3699` (#1027) |
|
||||
| RM-03 queue guard | Jason (re-sync) | ✅ **MERGED** `58b971ab` (#1032), #1019 closed. ⚠ **NOT DELIVERED**: installed guard still the broken one (291 lines / 0 `ASSERTED_NOT_READY` vs main 482 / 5). Re-sync via `mosaic upgrade`, then **prove it blocks a KNOWN-RED pipeline** — **D-51** |
|
||||
| RM-02 registry ★key | coder-mos2 | **ROUND-5 VERDICT id 88 REQUEST_CHANGES @ `e910a45a` (2026-08-05T22:37Z, live).** 2 blockers left: renderer accepts manifest-controlled `COMPATIBILITY `-prefixed provenance-success payloads; overclaim control is lexical-not-semantic vs docs claims. Shrink-together + evidence-subject CONFIRMED CLOSED — do not weaken. Remediation dispatched to `coder-mos2` 22:5xZ (PR comment + verified tmux); context guard: checkpoint at 85%. ⚠ **MERGE PRECONDITIONS (D-55/D-55f, measured):** poster=f10-coder (1 of 3 authors); (1) explicit `-m squash` (repo default `merge` discards ALL authorship); (2) **merger ≠ f10-coder** (self-merge suppresses the trailer generator → all 3 lost); (3) pr-merge.sh message field for coder-mos1/mos2 trailers (be-coder-08) — ⚠ field-supplied trailer survival **NOT MEASURED** (0/46 precedent; be-coder-08 charged with throwaway-PR proof). Trade in body; **branch MUST NOT be deleted**. ACs @ `dde38717` |
|
||||
| RM-61 CI exemption | — | ✅ **MERGED** `f4fd5967` (#1033). #1034 closed; **#1000 stays OPEN** (retirement trigger). Exemption is on `main` |
|
||||
| RM-59 / RM-60 | Jason (infra) | tracked deps; RM-60 option **B** |
|
||||
| #1023 queue attempt | Jason | SUPERSEDED-PENDING-JASON — live REQUEST_CHANGES, do **not** merge |
|
||||
|
||||
### For the incoming orchestrator — read this before acting
|
||||
|
||||
|
||||
@@ -884,6 +884,30 @@ field is added.
|
||||
**Also confirmed here:** `default_delete_branch_after_merge = False`, so `feat/rm-02-gate-registry`'s
|
||||
retention is **not on a timer** — consistent with the USC finding.
|
||||
|
||||
### D-55f — the trailer generator names only the poster, and a SELF-MERGE silences it entirely
|
||||
|
||||
**Measured by Mos across the fleet (77 rows / 2 estates, 8 decisive; decisive row usc/uconnect#3014),
|
||||
relayed 2026-08-05. Banked here because it places two new hard preconditions on #1030's merge.**
|
||||
|
||||
Gitea's squash-trailer mechanism, settled: the generator fires **iff merge author ≠ committer** (the
|
||||
merger is not the poster). When it fires it writes `Co-authored-by`/`Co-committed-by` naming **the
|
||||
POSTER only** — branch-commit trailers and co-authors are **discarded**. When the poster merges their
|
||||
own PR it does not fire at all: **zero trailers**.
|
||||
|
||||
Applied to #1030 (measured): poster = `f10-coder` (also an author, 6 commits); `coder-mos1` (4) and
|
||||
`coder-mos2` (3) both have registered addresses that WOULD link — and are lost regardless of merger,
|
||||
absent a message-field trailer. **Preconditions added to the lane:** (1) explicit `-m squash` (all
|
||||
three repos default to `merge`, which attributes to the merger and loses everyone); (2) **the merger
|
||||
must not be `f10-coder`** — a self-merge converts partial loss (2 of 3) into total loss (3 of 3), and
|
||||
the USC lane shipped exactly this without knowing it was a decision; (3) the pr-merge.sh message
|
||||
field remains the ONLY route to naming coder-mos1/coder-mos2.
|
||||
|
||||
**Open caveat, correctly held as `NOT MEASURED`:** whether a trailer supplied via the message field
|
||||
SURVIVES the generator — 0 of 46 merged squashes carry a non-poster trailer, so history cannot
|
||||
answer. be-coder-08 is charged (by Mos) with an end-to-end throwaway-PR proof including a control
|
||||
that can return ABSENT. Until then, "the field will carry them" is an untested claim and must not be
|
||||
load-bearing in any GO.
|
||||
|
||||
### D-55b — two parties quoting a third is not corroboration
|
||||
|
||||
The coordinator wrote _"installer-7's live-panel GREEN was the last thing before the command"_ **having
|
||||
|
||||
Reference in New Issue
Block a user