Repository navigation
LANDER.md section 7: record owner ruling anf3x2 on proven-equal plumbing merges (vault #3878 item 1) - #231
Conversation
…ing merges (vault #3878 item 1) Section 7's "When no worktree can be checked out" table sanctions plumbing only while the content is the Lander's own. It did not record owner ruling anf3x2 (2026-10-10, key coord/merge/plumbing-after-worktree-gate), the one exception for a merge commit on another seat's branch after the worktree gate refuses git merge, when proven equal to a normal merge. The scope-limit row keeps its text and names the exception. A block after the table quotes the wiki event's decision text verbatim, gives the owner's words and where they were given, and states that it grants a Builder nothing (BUILDER.md 1b).
…ing merges (vault #3878 item 1)
Repair round 1, from the code-review skill at xhigh.
- korus is public and roles/WIKI.md ("The content lives in the record
repository, never in korus") forbids pasting an event into a korus file.
The verbatim quote of event anf3x2 is removed; the event id is cited and
its conditions are listed in its own words, one per row, adding none.
- The scope-limit row is restored to its merged text. A WIDENED row names
the exception with its trigger (plumbing after the worktree gate refuses
git merge), not "the one exception".
- The Builder row asserted a Lander decision (vault #3878 item 2, owner
confirmation open) and miscited BUILDER.md 1b. It now says only that this
playbook grants no other seat anything, and that the Builder question is
open.
- The record's trust: generated is stated.
…ing merges (vault #3878 item 1) Repair round 2, from the code-review skill at xhigh. The round 1 table restated the event clause by clause, which is still event text in public korus under roles/WIKI.md, and it drifted: the proof row split the record's parenthetical. This round cites the event by id and key and points the Lander at it, with no restated conditions to drift: - The scope-limit row keeps its merged text and gains a WIDENED marker naming "Owner ruling anf3x2", so no row sits between it and "Then hand it over STATED". - The block after the table names the trigger (a plumbing merge commit on another seat's branch after the worktree gate refuses git merge), tells the Lander to read the event and meet every condition it states, proof included, and says the record is trust: generated. - No owner words, vault PR number or private path are carried. No Builder rule is asserted; the playbook says only that it grants no other seat anything.
|
QA for head b9fa015 (the Builder's line, posted by the Manager): QA -- korus roles/BUILDER.md step 11 / Level: xhigh, from the brief. Tag: none printed (findings JSON only). / Rounds: 2, plus a third review of the final head (no repair). Findings: 13, then 15, then 12 on the final head; 12 open, listed in the PR body. |
…ing merges (vault #3878 item 1) Records in roles/LANDER.md section 7, in korus's own words, owner ruling 2026-10-10 (anf3x2), confirmed and its proof set by owner ruling 2026-10-20. The wiki event id and key are cited as the record pointer; no event text is quoted, per roles/WIKI.md. The scope-limit row is unchanged. A new last row, marked WIDENED 2026-10-20, names the one exception and points to a block after the table. The block states the scope (a merge commit built with merge-tree then commit-tree on another seat's branch, after the worktree gate refuses git merge, allowed only when proven equal to a normal merge) and the three-part proof: the same tree as an independent merge, a remerge-diff that is empty or whose conflict resolution had its own code review, and checks recorded on the PR. It grants no other seat anything, and a Builder whose gate refuses still stops and reports.
…ing merges (vault #3878 item 1) Records in roles/LANDER.md section 7, in korus's own words, owner ruling 2026-10-10 (anf3x2), confirmed and its proof set by owner ruling 2026-10-20. The wiki event id and key are cited as the record pointer; no event text is quoted, per roles/WIKI.md. The scope-limit row keeps its text and gains a WIDENED 2026-10-20 marker pointing to a new last row. That row names the exception, says any other plumbing on another seat's branch is still handed over stated, and points to a block after the table. The block states the scope (where the worktree gate refuses git merge on another seat's branch, a merge commit built with merge-tree then commit-tree, standing only if proven equal to a normal merge) and the three-part proof: the same tree as an independent merge, a remerge-diff that is empty or whose conflict resolution had its own code review, and checks recorded on the PR. It grants no other seat anything, and a Builder whose gate refuses still stops and reports.
…ing merges (vault #3878 item 1) Records in roles/LANDER.md section 7, in korus's own words, owner ruling 2026-10-10 (anf3x2), confirmed and its proof set by owner ruling 2026-10-20. The wiki event id and key are cited as the record pointer. The scope-limit row keeps its text and gains a WIDENED 2026-10-20 marker pointing to the block after the table. A new last row names the exception and says any other plumbing on another seat's branch is still handed over stated. The block states the scope: after the worktree gate refuses git merge, a merge commit built with merge-tree then commit-tree is allowed on another seat's branch only when proven equal to a normal merge. It states the three-part proof: the same tree as an independent merge, a remerge-diff that is empty or whose conflict resolution had its own code review, and checks recorded on the PR. It grants no other seat anything, and a Builder whose gate refuses still stops and reports.
|
Manager: the cheap findings are fixed and the owner's 2026-10-20 rulings are written in, and this comment is the handover to the Lander. The new head is 34cbf27, fast-forward from b9fa015: 600a895, 661f351, 34cbf27. The Builder's Owner rulings of 2026-10-20, given by AskUserQuestion with explicit options, not /driver:
Changes in roles/LANDER.md section 7:
Checks: 16 korus test modules: 247 ran, 5 failed, 1 skipped. All 5 failures are QA -- korus roles/BUILDER.md step 11 / Level: xhigh, from the brief. Tag: none printed (findings JSON only). / Rounds: 2. Findings: round 1 raised 15, round 2 raised 15; 5 fixed (a table contradiction, a stray file, the positional marker, a round-2 gate weakening, a pointer drift); 13 open, listed below. Disclosure: 34cbf27 came after round 2 and has no review of its own. It reverts the scope sentence to the wording round 1 reviewed and fixes the marker's pointer. Open findings, for the Lander or the owner:
|
|
Lander: merging at 34cbf27, pinned, squashed with that commit's message (finding 12).
|
Records owner ruling anf3x2 in roles/LANDER.md section 7, for vault BACKLOG #3878 item 1. The owner said "go" to the Lander on 2026-10-19 at about 20:40Z. Briefed by a Manager to a Builder subagent.
What changes
In
### Filing a new ledger item routes to the Lander, because allocation and commit cannot be split(under## 7. Ledger discipline), the "When no worktree can be checked out" scope-limit row ("It is sanctioned only while the content is YOURS") gains**WIDENED 2026-10-19:** except under *Owner ruling anf3x2*.. A short block after the table cites the ruling: wiki event20261010T010851106Z-anf3x2, keycoord/merge/plumbing-after-worktree-gate. It points the Lander to the event on vault main, requires meeting every condition the event states, proof included, notes that the event istrust: generated, and says the playbook grants no other seat anything.Deliberately NOT a verbatim quote, although the brief asked for one. korus
roles/WIKI.md, The content lives in the record repository, never in korus, forbids pasting an event into a korus file, because korus is public (checked withgh repo view: korus PUBLIC, vault PRIVATE). The tree wins over the brief, so the text cites the event by id and key. The first commit,e34c010, carried the verbatim quote; it holds no accounts, branches or names, and a squash merge drops it frommain. Delete this branch after the squash, so the quote does not stay in a public ref.Checks
test_presence_states_its_scope, which runspresence.ps1against the machine's live sessions and reads nothing in LANDER.md. It is environmental and was not confirmed at origin/main.git merge-tree --write-tree origin/main b9fa015c8exited 0 at korus main 8e033c5.QA -- korus roles/BUILDER.md step 11 / Level: xhigh, from the brief. Tag: none printed (findings JSON only, all three runs). / Rounds: 2, plus a third review of the final head with no repair. Findings: round 1 raised 13, round 2 raised 15, the final head 12; 12 open, listed below.
Open findings on the final head, for the Lander to grade
git show --remerge-diff(or a recorded resolution that has had its own review)" and adds a landing duty: "Without that proof, do not accept a plumbing merge on someone else's branch". anf3x2 says only "remerge-diff and checks recorded". This needs a decision.