[EPIC] Fork Realignment — Minimize Divergence, Automate Sync

[randomm]

Objective

Reduce our fork from 303 changed files to a minimal, maintainable surface, automate upstream sync, and eliminate unnecessary divergence.

Current State (after WS1 + WS3 + WS4 work)

Branches with completed work (NOT YET MERGED TO DEV)

• ws1/refactor-async-tasks — async-tasks.ts extraction + resolveTools reversal (commits f39765847, e86ce0e)
• ws3/rg-tool-clean — 2 clean rg tool commits on anomalyco/dev base (commits 0be1b50b1, 5ffca707f)
• ws4/remove-oclite — 42 oclite files deleted (commit a912e9dd3)

Full Fork Audit (303 files vs upstream)

Category	Files	Action	Issue
Desktop pkg deletion	139	Restore upstream ✅ decided	#166
Oclite TUI	65	Deleted ✅	#162
GitHub workflows	23	Restore upstream ✅ decided	#166
Async task tool	~14	Keep — core feature ✅	#159
rg tool	8	Keep — rebase patch ✅	#161
Remory integration	5	Remove ✅ decided	#167
1M context	2	Keep until upstream fixes	—
processor.ts + prompt.ts	2	Reduce mixed diffs	#164
Scattered core mods	~31	Audit + minimize	#165
Build/config	~10	Clean up with sync	#165
TUI performance	TBD	Surgical fixes	#168

Key Metrics After WS1 Refactoring

• session/index.ts: 148 lines diff (was 600+) ✅
• session/prompt.ts: 387 lines diff (was 592, target ~150) — needs [WS1.1] Reduce processor.ts and prompt.ts diff — investigate mixed changes #164
• session/async-tasks.ts: 595 lines NEW (additive, zero conflict) ✅
• Upstream is 151 commits ahead, we are 56 commits ahead

All Issues (Priority Order)

Completed ✅

• [WS1] Refactor async task tool to minimal-invasion pattern #159 [WS1] Refactor async task tool — index.ts 148 lines, async-tasks.ts extracted
• [WS3] Isolate rg tool as clean 2-commit rebaseable patch #161 [WS3] Isolate rg tool as 2-commit patch — on ws3/rg-tool-clean
• [WS4] Evaluate CodeNomad + remove oclite from fork #162 [WS4] Drop oclite — 42 files, 2409 lines deleted on ws4/remove-oclite

Decisions Made ✅

• [WS6] Decide fate of desktop package deletion and CI workflows #166 [WS6] Restore desktop package + upstream workflows (eliminates 161 files)
• [WS7] Decide fate of remory integration (5 files) #167 [WS7] Remove remory integration from fork

Pending Work

• MERGE completed branches ws1, ws3, ws4 into dev
• [WS1.1] Reduce processor.ts and prompt.ts diff — investigate mixed changes #164 [WS1.1] Reduce processor.ts and prompt.ts mixed diffs
• [WS1.2] Audit and minimize scattered core file modifications #165 [WS1.2] Audit and minimize scattered core file modifications
• [WS7] Decide fate of remory integration (5 files) #167 [WS7] Remove remory files (implement the decision)
• [WS8] Surgical TUI performance improvements to upstream OpenCode TUI #168 [WS8] Surgical TUI performance improvements — NEEDS SCOPING with owner
• [WS2] Implement shuvcode-style upstream sync automation #160 [WS2] Implement shuvcode-style upstream sync automation
• [WS5] Contribute async task refactor to upstream (PR #7206 / issue #5887) #163 [WS5] Contribute async tasks upstream

Execution Order

1. Merge completed branches — ws1, ws3, ws4 into dev
2. [WS7] Decide fate of remory integration (5 files) #167 — Remove remory files
3. [WS1.1] Reduce processor.ts and prompt.ts diff — investigate mixed changes #164 — Reduce processor.ts + prompt.ts diffs
4. [WS1.2] Audit and minimize scattered core file modifications #165 — Audit remaining core file modifications
5. [WS6] Decide fate of desktop package deletion and CI workflows #166 — Restore desktop + workflows (during first upstream sync)
6. [WS8] Surgical TUI performance improvements to upstream OpenCode TUI #168 — Surgical TUI fixes (needs scoping session)
7. [WS2] Implement shuvcode-style upstream sync automation #160 — Build sync automation with fork-features.json
8. [WS5] Contribute async task refactor to upstream (PR #7206 / issue #5887) #163 — Contribute async tasks upstream (long-term)

Success Criteria

• Fork diff reduced from 303 to ≤30 intentional files
• Every remaining diff is documented and justified
• Automated sync handles upstream releases
• All branches merged to dev
• TUI performance acceptable for long sessions