Upstream Sync Conflict Report

Trigger: Upstream sync at 2025-12-11T16:48:42.741Z
Upstream Tag: v1.0.147
Upstream SHA: 48c7913

Conflicting Files

.github/workflows/publish.yml
.opencode/opencode.jsonc
bun.lock
packages/desktop/src/context/global-sync.tsx
packages/desktop/src/context/layout.tsx
packages/desktop/src/context/sync.tsx
script/publish.ts

Recommended Actions

1. Checkout integration branch locally
2. Run: git fetch upstream && git merge v1.0.147
3. Resolve conflicts manually
4. Run validation: bun install && bun turbo typecheck && bun turbo test
5. Push resolved integration branch
6. Close this issue

Manual Sync Commands

git remote add upstream https://github.com/sst/opencode.git 2>/dev/null || true
git fetch upstream --tags
git checkout integration
git merge v1.0.147
# Resolve conflicts...
bun install
bun turbo typecheck
bun turbo test
git push origin integration