Upstream Sync Conflict Report

Trigger: Upstream sync at 2025-12-04T22:05:05.025Z
Upstream Tag: v1.0.133
Upstream SHA: 49800a0

Conflicting Files

github/action.yml
packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
packages/opencode/src/cli/cmd/tui/routes/session/index.tsx

Recommended Actions

1. Checkout integration branch locally
2. Run: git fetch upstream && git merge v1.0.133
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.133
# Resolve conflicts...
bun install
bun turbo typecheck
bun turbo test
git push origin integration