Clean merge with no conflicts or compile fixes. Regenerated bindings differ from the merged files only in formatting, so none are included. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>