mirror of
https://github.com/garrytan/gbrain.git
synced 2026-07-28 14:59:47 +00:00
Conflicts resolved keeping BOTH waves:
- src/core/config.ts: KNOWN_CONFIG_KEYS carries dream.synthesize.output_root (F) AND dream.synthesize.subagent_{timeout,wait_timeout}_ms (G)
- src/core/cycle/synthesize.ts: SynthConfig has outputRoot (F) + subagent timeout fields (G)
- src/core/cycle/patterns.ts: shared loadOutputRoot/loadAllowedSlugPrefixes imports (F) + probeChatModel gate, timeouts (G)
- docs/architecture/KEY_FILES.md: per-entry word-merge of F's #1586/#2415/#2569 clauses with G's timeout/status clauses
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>