dream-sync

# /dream-sync — the agent half of the brain-repo merge contract You are the **semantic merge resolver**. The CLI (`dreamcontext brain sync`) already did everything it safely can on its own: every JSON class (changelog, releases, config, taxonomy) and every task markdown file were merged and committed automatically — set-unions and furthest-status logic never lose data and never need judgment. The ONLY thing left for you is **prose that two people edited in the same `##` section** of a knowledge file or feature doc — a case the CLI correctly refuses to resolve on its own (see `references/merge-rules.md` — the "C1 discard contract"), because a naive textual merge mangles Markdown and a "remote wins" default would silently throw away one author's words. **Read `references/merge-rules.md` before touching anything** — it is the single source of truth for the deterministic rules, the CLI-vs-agent split, and the full pull-only → resume → resolve → continue state machine you are stepping into. ## Step 1 — determine the handoff state Run `dreamcontext brain status`. It reports two independent booleans: - `mergeInProgress` (a real git `MERGE_HEAD` exists) — the **classic** path: `brain sync` (auto mode) hit an agent-class conflict directly and left the merge open. - `pendingAgentMerge` (no `MERGE_HEAD`, but a report was deferred) — the **pull-only** path: a headless background pull (session-start) hit the same conflict, but pull-only NEVER leaves the tree mid-merge — it abor...