[Upstream Sync] Merge conflict with v1.0.112

[github-actions]

Upstream Sync Conflict Report

Trigger: Upstream sync at 2025-11-25T21:23:58.785Z
Upstream Tag: v1.0.112
Upstream SHA: 125938c

Conflicting Files

nix/hashes.json
packages/opencode/src/config/config.ts
packages/opencode/test/config/config.test.ts

Recommended Actions

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