Skip to content

chore: document merge-to-main conflict reconciliation in CHANGELOG#10

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.

Sign up for GitHub

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

Merged
mdheller merged 1 commit into from
Apr 8, 2026
Merged

chore: document merge-to-main conflict reconciliation in CHANGELOG #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ This file follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) conve
- `.github/PULL_REQUEST_TEMPLATE.md` proper PR template.

### Changed
- Reconciled long-lived branch drift across documentation, API contracts, examples, and schema artifacts to unblock merge-to-`main` conflict resolution (no contract-level semantic changes).
- `openapi.yaml` — added `info.description`, `info.contact`, `info.license`, `components/responses` (BadRequest, Unauthorized, Forbidden, NotFound, InternalServerError), `GET` and `DELETE` operations for all resources, operation `summary` and `description` strings, and 4xx/5xx responses on all endpoints.
- `openapi.agent-plane.patch.yaml` — added operation summaries, descriptions, `GET` operations for sessions, skills, and memory, and error responses.
- `asyncapi.yaml` — added `info.description`, `info.contact`, `info.license`, `subscribe` directions for all channels, channel `description` and `operationId` values, and five new channels for `agreement`, `connector`, `provenance`, `schema`, and `token` events.
Expand Down