Merge branch 'dev' of https://github.com/anomalyco/opencode into dev