Conflicts resolved: (a) test_phase5_api.py — with lane G's capsule AND lane E's features/direct all landed, the CLI stub loop is empty, so test_cli_dispatches_stubs_gracefully is retired with a pointer comment to the real dispatch coverage (test_capsule.py / test_audio_features.py / test_director.py); (b) CHANGE_REQUESTS.md — lane G keeps the ratified CR-4; lane E's entry renumbered to CR-5 and updated for the merged reality. Merged tree: 189 passed (169 main + 21 lane E - 1 retired), frontend build clean. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| festival4d | ||
| tests | ||