Upstream Sync Conflict Report

Trigger: Upstream sync at 2025-12-04T03:39:20.334Z
Upstream Tag: v1.0.130
Upstream SHA: dcfeb52

Conflicting Files

AGENTS.md
packages/opencode/script/build.ts
packages/opencode/src/session/processor.ts
packages/opencode/src/tool/task.ts

Recommended Actions

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