Context

opencode-skein is a permanent downstream fork of anomalyco/opencode. Current baseline is upstream commit 8716c43 synced 2026-06-18. Fork is 215 commits ahead, upstream is 1208 commits ahead.

Goal is to bring fork onto current upstream dev without losing Skein capabilities, while preserving fork history and making future syncs easier.

Requirements

• Preserve fork history; do not rewrite dev
• Integrate upstream via merge into sync worktree, then merge back to dev
• Preserve all Skein capabilities: loop, auto-reply, pattern detection, hooks, scheduler, llama-skein discovery, local provider UI, context sidebar, themed loading
• Update fork/manifest.json baseline atomically with sync
• Verify fork:verify passes and behavioral tests remain green
• Do not discard 215 fork commits
• Keep patch surface minimal

Non-goals

• Rebase dev history
• Merge fork features upstream
• Major refactor of Skein before sync is stable

Success criteria

• dev contains upstream dev SHA d041eee or later
• fork/manifest.json baseline updated
• fork:verify passes
• All Skein capabilities verified behaviorally

Disposition (2026-09-18)

Shipped. Merged (baseline 4643e65, 2026-08-14). Upstream is ~316 commits ahead again — the next sync is a new change.

Design

Merge strategy

Use existing fork sync tooling: bun run sync:check --apply creates worktree sync/upstream-YYYYMMDD. Merge upstream/dev into worktree, resolve conflicts, verify, then merge back to dev via PR.

Conflict resolution policy

• Fork-owned files: keep fork implementation, verify imports
• Patched upstream files: start from upstream structure, reapply minimal Skein behavior
• Moved subsystems: port capability to new location
• Upstream equivalent exists: remove fork code
• Lockfiles/generated: regenerate

Verification

• bun run fork:verify
• Typecheck packages/opencode
• Behavioral smoke tests for loop, auto-reply, local provider discovery, themed loading

Manifest update

Update baseline.upstreamRef to merged upstream SHA, baseline.syncedAt to today, baseline.forkTag to new tag. Commit atomically with sync merge.

Safety

Rerere enabled, merge.conflictstyle zdiff3, pre-sync tag pre-sync/2026-08-11, backup branch backup-dev-2026-08-11.