mirror of
https://github.com/CopilotKit/CopilotKit.git
synced 2026-09-14 16:26:20 +08:00
Maxim
0b1b37e0af
Resolves the append-only registry conflict this PR's description predicted: #6302 (logistics / Meridian) landed first and took the same two lines, so keel takes the trivial conflict. Both edits are additive, so the resolution is keep-both in both registries — logistics first (it landed first), keel second. Why the merge was necessary rather than optional: GitHub does not create pull_request workflow runs for a PR whose mergeable state is CONFLICTING, because it cannot compute the merge ref those events run against. The push of the review fixes therefore produced ZERO CI runs — verified over 12 minutes of polling the Actions API by head SHA, and corroborated by Actions being healthy repo-wide at the same time. Not a timing artifact, and not a path filter: test_e2e-legacy-v1 and auto_merge_showcases both trigger on pull_request with paths: examples/**, and synchronize is a default activity type. Scope of the drift: main is 127 commits ahead of the merge-base, but within reskinnable-demo it added only logistics' own files (48 skin + 17 API route + 2 reskin-skill docs) plus +7 append-only lines across exactly the two registry files. No globals.css change, no skin-contract.ts change, no skins-config.ts change — so the shared token vocabulary and the frozen Skin contract are untouched, and keel's isolation claim still holds against a four-skin registry. All four skins are now registered under the same id in both registries (banking, airline, logistics, keel), which is the invariant the two-registry split exists to maintain. Co-Authored-By: Claude <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FkMi54kqfNwAoUB3M3CBp3