Conflicts resolved:
- VERSION: keep 0.13.0.0 (our branch > main's 0.12.9.0)
- package.json: same version resolution
- CHANGELOG.md: keep both entries, 0.13.0.0 on top of 0.12.9.0
Main brought in: uninstall script, skill namespacing, faster install,
Python security patterns, Windows port fix, office-hours Codex fallback.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>