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