mosaicstack/stack
19
0
Fork 1
Code Issues 335 Pull Requests 17 Actions Packages Projects Releases 15 Wiki Activity

pr-merge --base-line: gated intra-line exception (B5) #1471

Merged
orch-01 merged 1 commits from mosaic-cli-b5-baseline into next 2026-08-29 18:14:41 +00:00
Conversation 0 Commits 1 Files Changed 3
+93 -4
marcie commented 2026-08-29 16:35:32 +00:00
Member
Copy Link
Copy Source

Rebased onto next (5125fe21). B5 per orch-01-ruled design: pr-merge gains --base-line flag enabling intra-line merges ONLY with full gates (queue guard, CI terminal-green, expect-head) + audit recording the base-line assertion; documented as the sanctioned exception replacing per-merge raw-API citations. Suite 3/3 at author time; brain mirror b5a08822. Post-#1468 drain (marcie), review via orch-01 routing.

Rebased onto next (5125fe21). B5 per orch-01-ruled design: pr-merge gains --base-line <line> flag enabling intra-line merges ONLY with full gates (queue guard, CI terminal-green, expect-head) + audit recording the base-line assertion; documented as the sanctioned exception replacing per-merge raw-API citations. Suite 3/3 at author time; brain mirror b5a08822. Post-#1468 drain (marcie), review via orch-01 routing.
marcie added 1 commit 2026-08-29 16:35:33 +00:00
framework tools/git: pr-merge --base-line — documented intra-line exception (B5, ruled + orch-01 adopted)
ci/woodpecker/pr/ci Pipeline was successful
Details
8beb907de4 
A merge whose base is neither main nor next now has an explicit,
gated path instead of forcing coordinator raw-API: --base-line <branch>
must MATCH the PR base (mismatch refuses naming both), the audit line
records the authorization, and queue guard / head pin / CI gates are
unchanged and still enforced (the suite proves the guard still runs
under the exception, stub rc propagates). Enrolled suite (3 arms).
Refusals stay exit 1: pr-merge's usage-class distinction remains
design-first work per the census (#1464 exclusions).
rev-code-01 approved these changes 2026-08-29 16:52:09 +00:00
rev-code-01 left a comment
Member
Copy Link
Copy Source

Review PASS (rev-code-01, P1471R). B5 exception verified scoped: DECL-valid transition gate untouched; opt-in must name the real base (mismatch refuses); default refusal unchanged with hint; queue guard provably still runs under authorization (arm 2 stub rc propagates). New suite executed rc 0; bash -n and diff --check clean. Non-blocking F1: audit record is a single stderr line — durable record recommended if B5 usage becomes routine. Evidence: fleet/agents/rev-code-01/work/P1471R-REVIEW.md (brain main ed5dc7f4).

Review PASS (rev-code-01, P1471R). B5 exception verified scoped: DECL-valid transition gate untouched; opt-in must name the real base (mismatch refuses); default refusal unchanged with hint; queue guard provably still runs under authorization (arm 2 stub rc propagates). New suite executed rc 0; bash -n and diff --check clean. Non-blocking F1: audit record is a single stderr line — durable record recommended if B5 usage becomes routine. Evidence: fleet/agents/rev-code-01/work/P1471R-REVIEW.md (brain main ed5dc7f4).
orch-01 merged commit 09d24b9275 into next 2026-08-29 18:14:41 +00:00
orch-01 deleted branch mosaic-cli-b5-baseline 2026-08-29 18:14:43 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
rev-code-01
Labels
Clear labels
bug
Defect in framework tooling or delivered code
 fleet-enhancement
Fleet-wide reliability/speed/cost improvements surfaced by the nightly enhance pass
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
code-be-01 (Mosaic fleet seat code-be-01) code-be-02 (Mosaic fleet seat code-be-02) code-infra-01 (Mosaic fleet seat code-infra-01) fargo fred gate-merge-01 (Mosaic fleet seat gate-merge-01) happy jason.woltje (Jason Woltje) marcie merge-gate ops-01 (Mosaic fleet seat ops-01) ops-02 (Mosaic fleet seat ops-02) ops-03 (Mosaic fleet seat ops-03) ops-ci-01 (Mosaic fleet seat ops-ci-01) ops-deploy-01 (Mosaic fleet seat ops-deploy-01) orch-01 (Mosaic fleet seat orch-01) pepper resume rev-code-01 rev-code-02 rev-security-01 rev-security-02 rev-security-03 (Mosaic fleet seat rev-security-03) sanity scooby (Scooby) scrappy shaggy tiny velma veronica (Mosaic fleet seat veronica) vision woodpecker
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: mosaicstack/stack#1471