Fork discipline: staying mergeable with OpenCode
doc.haus pulls upstream innovation with git merge upstream/dev. This path shows the rules that keep that merge clean and the seams where the legal product actually lives.
6 · The upstream delta
The fork's mergeability story is mostly true and worth stating precisely
(verified with git log --diff-filter=M -- packages):
- Additive paths (
dochaus/,services/,apps/,demo/) carry ~39 fork commits and cannot conflict withgit merge upstream/dev. - Doc/metadata files (
README.md,AGENTS.md,CONTRIBUTING.md,SECURITY.md,.github/ownership) keep doc.haus content in a prepended section above the upstream body. - But the code delta is no longer zero. Two isolated, justified commits
modify 4 upstream files — exactly the escape hatch
CLAUDE.mdallows:5d93749lifts the GlobalBus max-listener cap (packages/opencode/src/bus/global.ts) because every SSE subscriber is one listener and multi-tab use exceeds Node's default of 10.7e837bcmakes the V2 session runner honor per-agentstepscaps instead of a hardcoded 25 (packages/core/src/session/runner/llm.ts- two test files) — doc.haus agents like
qasetstepsin frontmatter.
- two test files) — doc.haus agents like