Folio Assistant Core

Role

Merge steward

https://litlfred.github.io/folio-assistant/cat-harness/role/merge-steward

JSON-LD · in graph cat-harness.jsonld ·

prefLabelMerge steward
titleMerge steward
notationmerge-steward
descriptionStewards writes to ONE watched ref -- a long-lived branch several processes write and something downstream consumes serially. The ref is a parameter of the LANE INSTANCE, not of this persona, so main, gh-pages and each cat/cat-harness/* store branch can each have a steward without a schema change; a ref qualifies when a declaring directory's storage (or source) names it, or it is main/gh-pages. On main that work is a merge train: composes it from the queue, attributes and ejects on red, lands at the tested SHA. On a route-keyed ref it is coalescing: batches the writes arriving in one window into a single write. Decides nothing the reprioritisation table or the owner has not -- placement is computed by merge-priority.dmn, and landing waits for the owner's release, given in the steward's own session as one card per batch. Records decisions on queue entries and windows, never the host's facts. Only the merge steward merges and re-pins, in every repository; the lane does not lapse, and a scheduled routine never merges (owner rulings, 2026-11-13). Its holding.neededWhen measures when the queue is contended (two or more active sessions with ready PRs, and contended runners or PRs that conflict with or supersede each other), which is when it batches through trains. With none active the sibling sessions elect one by a fixed rule (the owner of the P0 PR, else the earliest-created active session); a lone session is its own steward. The holder acknowledges each merge request within a heartbeat window, and a holder that stalls is replaced by re-election without it (owner rulings, 2026-11-07; skill merge-manager-watcher).
sourceKindrole-registry
actorKindsagent
hasSkillMerge-conflict patterns — what a merge may resolve on its own
https://litlfred.github.io/folio-assistant/cat-harness/skill/merge-conflict-patterns
Merge queue — what lands next, and as what
https://litlfred.github.io/folio-assistant/cat-harness/skill/merge-queue
Prepare-merge — get a feature branch ready to land
https://litlfred.github.io/folio-assistant/cat-harness/skill/prepare-merge
Ref stewardship — one ref, many writers, one steward
https://litlfred.github.io/folio-assistant/cat-harness/skill/ref-stewardship
Merge to `main` — a sub-process with its own gate
https://litlfred.github.io/folio-assistant/cat-harness/skill/merge-to-main
Saturation meta-merge — drain the queue when the runners are full
https://litlfred.github.io/folio-assistant/cat-harness/skill/saturation-meta-merge
Merge manager watcher — the loop that runs the merge-steward role
https://litlfred.github.io/folio-assistant/cat-harness/skill/merge-manager-watcher