Repository navigation
feat(pr-pipeline): lane-arm the merge gate's own code on a verified pr-merge attestation #10966
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
3b90d1d
feat(pr-pipeline): lane-arm gate workflow and hold-path PRs on bound …
kyle-sexton fc8dad1
test(pr-pipeline): pin the switch's fail-closed read and qualify the …
kyle-sexton e6696af
fix(pr-merge): carry an approval over a base merge that only shifts h…
kyle-sexton 8413b31
fix(pr-pipeline): hold every gate row for a person and withdraw the h…
kyle-sexton 50040c0
Merge remote-tracking branch 'origin/main' into feat/lane-arm-gate-wo…
kyle-sexton 47b3aac
Merge remote-tracking branch 'origin/main' into feat/lane-arm-gate-wo…
kyle-sexton 07751e0
Merge remote-tracking branch 'origin/main' into feat/lane-arm-gate-wo…
kyle-sexton 13ba2ed
fix(pr-pipeline): check that the merge scripts' import closure stays …
kyle-sexton d7264b2
docs(pr-pipeline): add the changelog fragment for the closure check note
kyle-sexton 7c1f502
revert: restore the lane-arm machinery for the gate-attestation rescope
kyle-sexton 6a16f95
feat(pr-pipeline): lane-arm the merge gate's own code on a verified p…
kyle-sexton 5586d25
Merge remote-tracking branch 'origin/main' into feat/lane-arm-gate-wo…
kyle-sexton 60fa48d
test(pr-pipeline): drop a tracker marker from the floor closure pin
kyle-sexton 60af038
Merge remote-tracking branch 'origin/main' into feat/lane-arm-gate-wo…
kyle-sexton 9c711ac
fix(pr-pipeline): accept a lane-armed attestation only from a schedul…
kyle-sexton ffdde44
fix(pr-pipeline): bind the lane-armed attestation to main's commits a…
kyle-sexton 8f3a6a0
fix(pr-pipeline): judge the floor on the pull request's patch, not th…
kyle-sexton e4812b1
Merge remote-tracking branch 'origin/main' into feat/lane-arm-gate-wo…
kyle-sexton 6daeb47
fix(pr-pipeline): read the floor base at the merge base, and refuse r…
kyle-sexton 860916a
fix(pr-pipeline): judge babysit_risk.py rebinding on parsed trees, no…
kyle-sexton 5f4b019
fix(pr-pipeline): count dunders, imports and frame names in the floor…
kyle-sexton c3ee34d
Merge remote-tracking branch 'origin/main' into feat/lane-arm-gate-wo…
kyle-sexton 9563725
fix(pr-pipeline): judge floor-ast.py as code and count dynamic JS in …
kyle-sexton 081662b
fix(pr-pipeline): lock lane-armed.mjs's token list and call-shape eval
kyle-sexton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- | ||
| bump: minor | ||
| --- | ||
|
|
||
| ### Added | ||
|
|
||
| - `merge.lane-arm-gate` (on) and `merge.person-held` (owner decisions Q7 and Q5): a pull request held only by the merge gate's own code, `babysit_risk.py` and the `.github/scripts/pr-merge/` scripts, merges with no person once both review lanes are bound to the main-run review of its head with no finding, no review thread is open, and pr-merge has attested it. Every other `trust` and `gate` row stays with a person, and `scripts/sync-hold-floor.py` refuses a `gate` row outside the merge gate's code that `merge.person-held` does not list. | ||
| - pr-merge's `lane-armed` job (`lane-armed.mjs`) posts the check run `pr-merge/lane-armed` at a head whose gate passed its lane-armed paths and whose hold floor does not shrink against the base, then re-runs its red ci-status job. Each attestation is one `lane-armed {...}` record line, in the check run and as a notice; each refusal logs the failed condition. | ||
| - ci-status (`merge-holds.mjs` `laneArmedHold`) holds a lane-armed path until that check run is at the head and names a run of `pr-merge.yml` on the default branch, started by schedule or workflow_dispatch, whose commit is on that branch and which uploaded the run-scoped attestation artifact; a trusted person's approval still lifts it. | ||
| - `pr-review-main.yml` also reviews a pull request after a red ci-status when it changes main's lane-armed code, so neither the red status nor the human-gated label blocks the review the attestation needs. clear-escalations lifts that label at the same head once the gate's reader refuses nothing there. | ||
| - The review criteria `pr-review-main.yml` copies from main (`plugins/review/skills/**`, `plugins/review/reference/**`) are `enforcement` floor rows: a change to them waits for a clean bound security review. |
18 changes: 18 additions & 0 deletions
18
.changes/source-control/feat-lane-arm-gate-paths-a95e03b4.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| --- | ||
| bump: minor | ||
| --- | ||
|
|
||
| ### Added | ||
|
|
||
| - lane-arm the merge gate's own code on a clean main-run review | ||
|
|
||
| With `merge.lane-arm-gate` on, the merge gate's risk score drops the | ||
| `high-path:` hold on `babysit_risk.py` and the pr-merge scripts | ||
| (`LANE_ARMED_FLOOR`) when both review lanes are bound to a main-run review | ||
| of the head (`LaneEvidence.main_run`) with no open finding and the pull | ||
| request has no unresolved review thread (`RiskInput.open_threads`). Those | ||
| paths are lane sources, so only a main-run review binds them. The gate | ||
| records what pr-merge's attestation needs as `laneArmed` | ||
| (`babysit_risk.lane_arm_record`), with the first failed condition. Every | ||
| other floor path, a configured denied path and any unread input keep the | ||
| person hold. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.