Repository navigation
chore(occ-deps): update rerun state after 4c28cab1 - #1543
Closed
github-actions[bot] wants to merge 1 commit into
Closed
github-actions[bot] wants to merge 1 commit into
github-actions[bot] wants to merge 1 commit into
Conversation
jonahgabriel
enabled auto-merge (squash)
May 24, 2026 19:19
Contributor
|
Closing: superseded by #1574 (identical diff, latest OCC rerun-state). Part of OMN-11979 Wave 1 cleanup. |
auto-merge was automatically disabled
May 24, 2026 23:17
Pull request was closed
jonahgabriel
added a commit
that referenced
this pull request
Sep 17, 2026
Four product PRs now land under OMN-18601 -- omninode_infra #1536, #1543 and #1547, plus omnibase_infra #3727 (the v0.38.31 cut that unblocks the promotion's parity gate) -- so the autobinder has authored contracts/OMN-18601.yaml repeatedly and this companion went DIRTY when dev gained the #3727 entries. Resolved as an APPEND-ONLY structural union, per the recorded resolution for this collision class and identically to the earlier OMN-18582 case: * dev's file text is kept VERBATIM -- no yaml re-dump, which mangles quoting and unicode and can trip the yamlfmt contamination ratchet; * the two identifiers dev lacks are spliced in as exact byte blocks: dod-OmniNode-ai-omninode_infra-pr-1547 and occ-self-bind-pr-10102; * the seven identifiers present on BOTH sides are kept once from dev, because a duplicate id is a contract-shape risk and dev's copy is the one existing receipts are hashed against. Asserted by the splice rather than by eye: no duplicate identifier in the result, and every unique identifier from both sides survives. Eleven entries in, eleven out. VERIFIED with the real validator rather than by inspection: every receipt under drift/dod_receipts/OMN-18601/ that declares a contract_entry_sha256 recomputes equal to it against the union -- 11 matches, 0 mismatches. That is the control for this resolution: validation is entry-hash-first, so appending entries cannot invalidate an existing receipt, and a union that moves no entry hash should rebind nothing. Refs: OMN-18601
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.
Automated OCC rerun state update for merge 4c28cab.\n\nThis PR is opened instead of direct-pushing to protected main.