Uh oh!
There was an error while loading. Please reload this page.
chore: document merge conflict remediation in CHANGELOG - #7
Merged
Conversation
This was referenced Aug 2, 2026
mdheller added a commit
that referenced
this pull request
Aug 2, 2026
… (T7-5/#243) Resolves#243 without a 6th agent_class: model daemon = system_core passport + InferenceProvider record, linked via new optional InferenceProvider.passportRef. Adds design-review teeth to T7 provenance schemas (verified both ways): - ledger hash-chain: ledgerPrevHash required for non-genesis entries (seq>=1) on InferenceReceipt/EscalationDecision/AdapterPromotionDecision (finding #4) - biometric hard boundary: EscalationDecision with a biometric sensitiveCategory is schema-forced to refused/biometric-boundary (finding #7) New example escalation-decision.refused-biometric.json. See ADR-0017.
8 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 freeto 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.
Motivation
Description
Unreleased→Fixedentry toCHANGELOG.mdnoting the merge-conflict remediation and committed the update on branchwork.Testing
rg -n "<<<<<<<|>>>>>>>|======="over the listed files with no matches found; JSON parse checks forexamples/*.jsonandschemas/*.jsonpassed; YAML parse checks foropenapi*.yamlandasyncapi*.yamlpassed.Codex Task