Skip to content

fix(OMN-15336,OMN-15337,OMN-15446,OMN-15567): terminal-merge-SHA supersessions for 7 stale evidence items - #6330

Merged
jonahgabriel merged 2 commits into
devfrom
jonah/occ-terminal-merge-rebind-15336-15337-15446-15567
Aug 10, 2026
Merged

jonahgabriel merged 2 commits into
devfrom
jonah/occ-terminal-merge-rebind-15336-15337-15446-15567

Conversation

@jonahgabriel

@jonahgabriel jonahgabriel commented Aug 10, 2026 •

Copy link
Copy Markdown
Contributor

Summary

Append-only supersession receipts for 7 stale DoD evidence items across
OMN-15336, OMN-15337, OMN-15446, OMN-15567: each hardcoded .state == "OPEN"/"open" against a PR that has since merged, or pinned a now-orphaned
pre-merge commit. Re-binds each to the durable merged-terminal fact
(state=closed, merged=true, exact merge_commit_sha). This lane repairs
evidence mechanics only — no product source is touched, and no merged file
is edited (11 files changed, 305 insertions, 0 deletions).

Per-ticket detail

OMN-15336 (3 entries)

  • omn15336-repair-infra-2666-merged supersedes dod-infra-pr-2666-06a95efc
    — omnibase_infra#2666 MERGED 3bc7fcaf2e0858b04dda5f3fd3e695a7df88b754
    (2026-08-10T12:03:55Z); PR advanced past the pinned 06a95efc head first.
  • omn15336-repair-infra-2676-merged supersedes
    dod-OmniNode-ai-omnibase_infra-pr-2676 — omnibase_infra#2676 MERGED
    7cf512348186ab2ef0d47d58b7bb42e46639c706 (2026-08-10T03:28:56Z).
  • occ-self-bind-pr-6167-merged-supersession supersedes
    occ-self-bind-pr-6167 — OCC#6167 MERGED
    7d55f50be5cedcf6f12a5e6395c085b6915286fb (2026-08-09T07:49:57Z); source
    branch codex/omn-15336-occ-pr2676 confirmed deleted (404 live). New check
    binds by PR number only.

OMN-15337 (1 entry)

  • omn15337-repair-infra-2665-merged supersedes
    dod-OmniNode-ai-omnibase_infra-pr-2665-daf53881 — omnibase_infra#2665
    MERGED ea4d233c3d0c5a97631d96af037ca2161fa189ef (2026-08-10T10:38:14Z).

OMN-15446 (2 entries)

  • omn15446-repair-market-1961-merged supersedes
    dod-omnimarket-pr-1961-exact-head — its content-fetch checks pinned
    omnimarket#1961's pre-merge branch-tip commit
    200fbdff4b6c0b2154801412b8a3933a1626b38c, orphaned (unreachable from any
    branch) after the repo's squash-only merge (2026-07-30T17:13:09Z).
    Re-anchors the same implementation/test blob assertions to the terminal
    merge commit 96a1afc48638f51aa359b476f4c24556f636c5aa.
  • occ-self-bind-pr-5693-merged-supersession supersedes
    occ-self-bind-pr-5693, whose .state == "open" check_value now hard-fails
    on re-run (live exit 1, confirmed 2026-08-10). OCC#5693 MERGED
    12369b3d0684da8cffb9b127212671d486a2f3b9 (2026-07-31T02:08:39Z).

OMN-15567 (1 entry)

  • omn15567-repair-infra-2663-merged supersedes dod-infra-pr-2663-dabe52dd
    — omnibase_infra#2663 MERGED 16c28f06915a8ab270a424c7d0fed0fb527fe9bf
    (2026-08-10T12:19:28Z).

Verification method

  • Every new check_value was executed live via gh api immediately before
    authoring (exit 0) and re-executed a second, independent time against the
    final on-disk (post-yamlfmt) files as a positive control — all 7 still
    exit 0 with byte-exact probe_stdout.
  • Every contract_entry_sha256 was computed via the real
    omnibase_core.validation.validator_receipt_gate.compute_contract_entry_sha256
    function against the actual post-format contract file, not hand-derived.
  • All 4 contract diffs are pure appends (0 removed lines beyond the diff
    header ---); all 7 receipts are net-new files under drift/dod_receipts/.
  • runner (claude/guard-repair-lane) and verifier
    (claude/guard-repair-independent-reverify) are distinct identities so
    ModelDodReceipt's self-attestation rule does not downgrade status —
    confirmed each receipt round-trips through the real Pydantic model with
    status=PASS.
  • Pattern precedents: occ-self-bind-pr-5540-merged-supersession (OMN-15446),
    the omn15567-repair-*-merged cohort (OMN-15567, OCC#6112).

Evidence-Source

Ticket references: OMN-15336, OMN-15337, OMN-15446, OMN-15567.

Untouched by design: dod-infra-pr-2676-vendor-byte-parity (OMN-15336) and
dod-source-proof-pr-2665-daf53881 (OMN-15337) are content-fetch-only checks
(no .state assertion) pinned at the same now-orphaned pre-merge SHAs; they
still pass live today (GitHub has not GC'd the dangling commits) so they are
not mechanically broken. Flagging as a residual durability gap, out of this
lane's explicit scope, not fixed here.

Summary by CodeRabbit

  • Verification Updates
    • Added verified evidence confirming several pull requests reached their expected merged state.
    • Updated checks to use durable merge commits and pre-merge revisions instead of stale open-state references.
    • Confirmed implementation and test revisions for the market-related change.
    • Added successful verification records, including branch, commit, status, and integrity details.
    • Superseded outdated evidence while preserving prior records for traceability.

…rsessions for 7 stale evidence items

Append-only supersession receipts re-binding evidence that either hardcoded
`.state == "OPEN"`/`"open"` against PRs that have since merged, or pinned a
now-orphaned pre-merge commit, to the durable merged-terminal fact
(state=closed, merged=true, exact merge_commit_sha).

OMN-15336 (3 entries):
- omn15336-repair-infra-2666-merged: supersedes dod-infra-pr-2666-06a95efc.
  omnibase_infra#2666 MERGED 2026-08-10T12:03:55Z (merge_commit_sha
  3bc7fcaf2e0858b04dda5f3fd3e695a7df88b754); the PR advanced past the pinned
  06a95efc head before merging.
- omn15336-repair-infra-2676-merged: supersedes
  dod-OmniNode-ai-omnibase_infra-pr-2676. omnibase_infra#2676 MERGED
  2026-08-10T03:28:56Z (merge_commit_sha 7cf512348186ab2ef0d47d58b7bb42e46639c706);
  advanced past the pinned 34c25d90 head before merging.
- occ-self-bind-pr-6167-merged-supersession: supersedes occ-self-bind-pr-6167.
  OCC#6167 MERGED 2026-08-09T07:49:57Z (merge_commit_sha
  7d55f50); source branch
  codex/omn-15336-occ-pr2676 confirmed deleted (404 live) -- new check binds
  by PR number only, no branch-ref dependency.

OMN-15337 (1 entry):
- omn15337-repair-infra-2665-merged: supersedes
  dod-OmniNode-ai-omnibase_infra-pr-2665-daf53881. omnibase_infra#2665 MERGED
  2026-08-10T10:38:14Z (merge_commit_sha ea4d233c3d0c5a97631d96af037ca2161fa189ef).

OMN-15446 (2 entries):
- omn15446-repair-market-1961-merged: supersedes
  dod-omnimarket-pr-1961-exact-head, whose content-fetch checks pinned
  omnimarket#1961's pre-merge branch-tip commit 200fbdff4b6c0b2154801412b8a3933a1626b38c
  -- orphaned (unreachable from any branch) after the repo's squash-only
  merge 2026-07-30T17:13:09Z. Re-anchors the same implementation/test blob
  assertions to the durable terminal merge commit 96a1afc48638f51aa359b476f4c24556f636c5aa.
- occ-self-bind-pr-5693-merged-supersession: supersedes occ-self-bind-pr-5693,
  whose `.state == "open"` check_value now hard-fails on re-run (live exit 1,
  confirmed 2026-08-10). OCC#5693 MERGED 2026-07-31T02:08:39Z (merge_commit_sha
  12369b3).

OMN-15567 (1 entry):
- omn15567-repair-infra-2663-merged: supersedes dod-infra-pr-2663-dabe52dd.
  omnibase_infra#2663 MERGED 2026-08-10T12:19:28Z (merge_commit_sha
  16c28f06915a8ab270a424c7d0fed0fb527fe9bf).

Every new check_value was independently re-executed live immediately before
authoring (exit 0, byte-exact probe_stdout captured) and again as a final
positive control after yamlfmt normalization, against the on-disk contract
+ receipt files as they will be committed. Every contract_entry_sha256 was
computed via the real omnibase_core.validation.validator_receipt_gate
.compute_contract_entry_sha256 function against the post-format contract,
not hand-derived. All 4 contract diffs are pure appends (0 lines removed
beyond the diff header) and all 7 receipts are net-new files under
drift/dod_receipts/ -- no merged file was edited.

Pattern precedents: occ-self-bind-pr-5540-merged-supersession (OMN-15446),
the omn15567-repair-*-merged cohort (OMN-15567, OCC#6112).

OMN-15336, OMN-15337, OMN-15446, OMN-15567
@jonahgabriel jonahgabriel added the ci:ready Full CI runs on this PR (OMN-15731 label-gated CI pilot) label Aug 10, 2026
@coderabbitai

coderabbitai Bot commented Aug 10, 2026 •

Copy link
Copy Markdown

Review Change Stack

Warning

Review limit reached

You’ve reached a temporary PR review limit under our Fair Usage Limits Policy.

Your recent review volume is higher than typical usage, so adaptive limits are currently applied.

Next review available in: 52 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: f3bde5b0-58d3-4e80-a98d-43ea0edc31f4

📥 Commits

Reviewing files that changed from the base of the PR and between 463498d and 0c36153.

📒 Files selected for processing (8)
  • contracts/OMN-15336.yaml
  • contracts/OMN-15337.yaml
  • contracts/OMN-15446.yaml
  • contracts/OMN-15567.yaml
  • drift/dod_receipts/OMN-15336/occ-self-bind-pr-6330/command.yaml
  • drift/dod_receipts/OMN-15337/occ-self-bind-pr-6330/command.yaml
  • drift/dod_receipts/OMN-15446/occ-self-bind-pr-6330/command.yaml
  • drift/dod_receipts/OMN-15567/occ-self-bind-pr-6330/command.yaml
📝 Walkthrough

Walkthrough

The PR appends contract evidence and command receipts for merged pull requests. The records replace stale open-state bindings with validated merge commits, pre-merge heads, branch data, blob SHAs, and execution metadata.

Changes

Merged pull-request evidence

Layer / File(s) Summary
Contract evidence supersessions
contracts/OMN-15336.yaml, contracts/OMN-15337.yaml, contracts/OMN-15446.yaml, contracts/OMN-15567.yaml
The contracts add append-only evidence for merged infrastructure, OCC, and OmniMarket pull requests. Checks validate terminal state, merge commits, head SHAs, branches, and implementation/test blobs where required.
Infrastructure verification receipts
drift/dod_receipts/OMN-15336/..., drift/dod_receipts/OMN-15337/..., drift/dod_receipts/OMN-15567/...
Command receipts verify infrastructure pull requests 2666, 2676, 2665, and 2663 through GitHub API checks. They record PASS status, commit metadata, execution details, contract hashes, and source-change state.
OCC and market verification receipts
drift/dod_receipts/OMN-15336/occ-self-bind-pr-6167-merged-supersession/command.yaml, drift/dod_receipts/OMN-15446/...
Command receipts verify OCC pull requests 6167 and 5693 and OmniMarket pull request 1961. The records include merged-state output, superseded receipt references, and pinned implementation/test blob hashes for pull request 1961.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Possibly related PRs

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the main change: terminal merge SHA supersessions for seven stale evidence items across the four listed work items.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch jonah/occ-terminal-merge-rebind-15336-15337-15446-15567

Comment @coderabbitai help to get the list of available commands.

@onexbot-occ-writer

Copy link
Copy Markdown
Contributor

OCC autobind stood down for OmniNode-ai/onex_change_control#6330 (OMN-15336): this PR (hand_authored) already carries evidence for that ticket, so no competing companion was minted (OMN-15247 defer-on-contention).

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@drift/dod_receipts/OMN-15336/omn15336-repair-infra-2666-merged/command.yaml`:
- Around line 1-10: Rename the seven listed command.yaml receipts to filenames
based on each receipt’s run_timestamp, preserving their existing ticket and item
directories:
drift/dod_receipts/OMN-15336/omn15336-repair-infra-2666-merged/command.yaml
(lines 1-10),
drift/dod_receipts/OMN-15336/omn15336-repair-infra-2676-merged/command.yaml
(lines 1-10),
drift/dod_receipts/OMN-15337/omn15337-repair-infra-2665-merged/command.yaml
(lines 1-10),
drift/dod_receipts/OMN-15567/omn15567-repair-infra-2663-merged/command.yaml
(lines 1-10),
drift/dod_receipts/OMN-15336/occ-self-bind-pr-6167-merged-supersession/command.yaml
(lines 1-11),
drift/dod_receipts/OMN-15446/occ-self-bind-pr-5693-merged-supersession/command.yaml
(lines 1-11), and
drift/dod_receipts/OMN-15446/omn15446-repair-market-1961-merged/command.yaml
(lines 1-13); update all receipt resolution references to the new paths and
ensure no receipt remains at a command.yaml path.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 855e3a69-31d4-450a-8cfd-8301659e758c

📥 Commits

Reviewing files that changed from the base of the PR and between 144d536 and 463498d.

📒 Files selected for processing (11)
  • contracts/OMN-15336.yaml
  • contracts/OMN-15337.yaml
  • contracts/OMN-15446.yaml
  • contracts/OMN-15567.yaml
  • drift/dod_receipts/OMN-15336/occ-self-bind-pr-6167-merged-supersession/command.yaml
  • drift/dod_receipts/OMN-15336/omn15336-repair-infra-2666-merged/command.yaml
  • drift/dod_receipts/OMN-15336/omn15336-repair-infra-2676-merged/command.yaml
  • drift/dod_receipts/OMN-15337/omn15337-repair-infra-2665-merged/command.yaml
  • drift/dod_receipts/OMN-15446/occ-self-bind-pr-5693-merged-supersession/command.yaml
  • drift/dod_receipts/OMN-15446/omn15446-repair-market-1961-merged/command.yaml
  • drift/dod_receipts/OMN-15567/omn15567-repair-infra-2663-merged/command.yaml

Comment on lines +1 to +10
---
schema_version: 1.0.0
ticket_id: OMN-15336
evidence_item_id: omn15336-repair-infra-2666-merged
check_type: command
check_value: 'gh api repos/OmniNode-ai/omnibase_infra/pulls/2666 --jq ''if (.state == "closed" and .merged
== true and .merge_commit_sha == "3bc7fcaf2e0858b04dda5f3fd3e695a7df88b754" and .head.sha == "e13447099ec2958733d5f94f7cfade812fa03cd8")
then "true" else error("unexpected #2666 terminal state") end'''
status: PASS
run_timestamp: '2026-08-10T20:00:59Z'

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Use the required timestamped receipt filenames.

The seven receipts use command.yaml. Store each receipt as drift/dod_receipts/<TICKET>/<ITEM_ID>/<run_timestamp>.yaml and update receipt resolution references.

  • drift/dod_receipts/OMN-15336/omn15336-repair-infra-2666-merged/command.yaml#L1-L10: Rename the receipt with its run_timestamp.
  • drift/dod_receipts/OMN-15336/omn15336-repair-infra-2676-merged/command.yaml#L1-L10: Rename the receipt with its run_timestamp.
  • drift/dod_receipts/OMN-15337/omn15337-repair-infra-2665-merged/command.yaml#L1-L10: Rename the receipt with its run_timestamp.
  • drift/dod_receipts/OMN-15567/omn15567-repair-infra-2663-merged/command.yaml#L1-L10: Rename the receipt with its run_timestamp.
  • drift/dod_receipts/OMN-15336/occ-self-bind-pr-6167-merged-supersession/command.yaml#L1-L11: Rename the receipt with its run_timestamp.
  • drift/dod_receipts/OMN-15446/occ-self-bind-pr-5693-merged-supersession/command.yaml#L1-L11: Rename the receipt with its run_timestamp.
  • drift/dod_receipts/OMN-15446/omn15446-repair-market-1961-merged/command.yaml#L1-L13: Rename the receipt with its run_timestamp.

As per coding guidelines, DoD receipts must be stored only at drift/dod_receipts/<TICKET>/<ITEM_ID>/<run_timestamp>.yaml.

📍 Affects 7 files
  • drift/dod_receipts/OMN-15336/omn15336-repair-infra-2666-merged/command.yaml#L1-L10 (this comment)
  • drift/dod_receipts/OMN-15336/omn15336-repair-infra-2676-merged/command.yaml#L1-L10
  • drift/dod_receipts/OMN-15337/omn15337-repair-infra-2665-merged/command.yaml#L1-L10
  • drift/dod_receipts/OMN-15567/omn15567-repair-infra-2663-merged/command.yaml#L1-L10
  • drift/dod_receipts/OMN-15336/occ-self-bind-pr-6167-merged-supersession/command.yaml#L1-L11
  • drift/dod_receipts/OMN-15446/occ-self-bind-pr-5693-merged-supersession/command.yaml#L1-L11
  • drift/dod_receipts/OMN-15446/omn15446-repair-market-1961-merged/command.yaml#L1-L13
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@drift/dod_receipts/OMN-15336/omn15336-repair-infra-2666-merged/command.yaml`
around lines 1 - 10, Rename the seven listed command.yaml receipts to filenames
based on each receipt’s run_timestamp, preserving their existing ticket and item
directories:
drift/dod_receipts/OMN-15336/omn15336-repair-infra-2666-merged/command.yaml
(lines 1-10),
drift/dod_receipts/OMN-15336/omn15336-repair-infra-2676-merged/command.yaml
(lines 1-10),
drift/dod_receipts/OMN-15337/omn15337-repair-infra-2665-merged/command.yaml
(lines 1-10),
drift/dod_receipts/OMN-15567/omn15567-repair-infra-2663-merged/command.yaml
(lines 1-10),
drift/dod_receipts/OMN-15336/occ-self-bind-pr-6167-merged-supersession/command.yaml
(lines 1-11),
drift/dod_receipts/OMN-15446/occ-self-bind-pr-5693-merged-supersession/command.yaml
(lines 1-11), and
drift/dod_receipts/OMN-15446/omn15446-repair-market-1961-merged/command.yaml
(lines 1-13); update all receipt resolution references to the new paths and
ensure no receipt remains at a command.yaml path.

Source: Coding guidelines

…companion PR #6330

occ-preflight / eligibility requires every ticket cited by a PR to carry at
least one PASS receipt bound to that PR's own number (or one of its commit
SHAs) -- confirmed by reading the live failure detail from run 31427430157
("no PASS receipt for one or more tickets binds to PR #6330 ...") and by
tracing the exact rule in
omnibase_core.validation.validator_occ_merge_eligibility._receipt_bound_to_pr.

Adds one net-new occ-self-bind-pr-6330 entry per ticket (4 total), each
pr_number=6330, chained via evidence_artifact from that ticket's current
self-bind lineage endpoint (occ-self-bind-pr-6290 / occ-self-bind-pr-6182 /
occ-self-bind-pr-5693-merged-supersession / occ-self-bind-pr-6289
respectively). Verified locally before pushing by invoking the actual
validate_occ_merge_eligibility() function against the on-disk contracts +
receipts with this PR's real title/branch/commit sha -- result: eligible=True.

All 4 contract diffs remain pure appends; both new receipt files are net-new.

OMN-15336, OMN-15337, OMN-15446, OMN-15567
@jonahgabriel
jonahgabriel merged commit 18a84cf into dev Aug 10, 2026
64 checks passed
@jonahgabriel
jonahgabriel deleted the jonah/occ-terminal-merge-rebind-15336-15337-15446-15567 branch August 10, 2026 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci:ready Full CI runs on this PR (OMN-15731 label-gated CI pilot)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant