Repository navigation
Conversation
#5974) Wire floor-emitted MergeAdmissionReceipt stamping (base_tree_hash, gate_roster_hash, floor conclusion) and a required ci.yml merge-admission gate step that reads merge_admission_blocks_merge. Keep GatingComputedDeferred until CI proves the produce→consume path; flip to GatingEnforced is the follow-on activation step. Co-authored-by: Cursor <cursoragent@cursor.com>
…token ci_workflow.dag authority updated; generated_artifact_drift_gate will require regen via main_wet on merge (operator/workflows permission). Co-authored-by: Cursor <cursoragent@cursor.com>
gunbai-bot
Bot
changed the title
2 of 3 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Closes the #5974 activation gap left after the model/actuator land (#5973/#5974): merge admission is no longer an unwired model.
claim_executor, the CI floor script stamps a realMergeAdmissionReceiptto.gunbc/merge-admission-receipt.wirewithbase_tree_hash(merge-base tree at run time),gate_roster_hash(current_gate_roster_hashfromcommit_gate_roster), andconclusion(Success/Failure from floor exit code).ci_workflow.dagadds a required Merge-admission gate step runningdsl/tools/merge_admission_gate.dag, which reads the stamped receipt and callsmerge_admission_blocks_merge(receipt, merge_target_tree_hash, current_gate_roster_hash).merge_freshness_gating_statusstaysGatingComputedDeferred; flip toGatingEnforcedis the last step after CI proves produce→consume end-to-end (prevents fleet-wide merge freeze).New modules:
gunbc.merge_admission_produce,tools.merge_admission_stamp,tools.merge_admission_gate. Witnesses prove stale-base →MergeDeniedStaleBase, stale-roster →MergeDeniedStaleRoster, red conclusion →MergeDeniedNotSuccess, fresh green →MergeAdmitted.ci.yml note
ci_workflow.dagauthority changed; committed.github/workflows/ci.ymlwas not pushed (GitHub App token lacksworkflowspermission).generated_artifact_drift_gatewill fail until an operator regens viagunbc run --source-root dsl --entry dsl/tools/generated_artifact_gate.dag --function main_wetand commits the updatedci.yml(adds floor stamp tail + Merge-admission gate step).Test plan
gunbc compile --source-root dsl— 0 diagnosticswire_roundtrip_preserves_admission_fields,would_block_stale_base,red_verdict_is_merge_denied_not_success— alltrue