diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b4bdb6f..673790e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -251,7 +251,53 @@ All repositories must have the following branch protection rules enabled on the # Contribution & Code Review Policy -## Branch Protection Rules +## Branch Protection & Review Policy + +All repositories must enforce these rules on the `main` branch: + +| Rule | Status | Rationale | +|---|---|---| +| Require PR for merge | ✅ Enabled | Prevent direct commits | +| Required approvals | ✅ 1+ | Minimum review threshold | +| Dismiss stale approvals | ✅ Enabled | Re-review after new commits | +| Require CI to pass | ⚠ Conditional | Only where CI exists | +| Block force push | ✅ Enabled | Protect commit history | +| Block branch deletion | ✅ Enabled | Prevent accidental deletion | + +### Repository-Specific Configuration + +**1. hermes-agent** +- ✅ All protections enabled +- 🔒 Required reviewer: `@Timmy` (owner gate) +- 🧪 CI: Enabled (currently functional) + +**2. the-nexus** +- ✅ All protections enabled +- ⚠ CI: Disabled (runner dead - see #915) +- 🧪 CI: Re-enable when runner restored + +**3. timmy-home** +- ✅ PR + 1 approval required +- 🧪 CI: No CI configured + +**4. timmy-config** +- ✅ PR + 1 approval required +- 🧪 CI: Limited CI + +### Default Reviewer Assignment + +All repositories must: +- 🧑‍ Default reviewer: `@perplexity` (QA gate) +- 🧑 Required reviewer: `@Timmy` for `hermes-agent/` only + +### Acceptance Criteria + +- [x] All four repositories have protection rules applied +- [x] Default reviewers configured per matrix above +- [x] This policy documented in all repositories +- [x] Policy enforced for 72 hours with no unreviewed merges + +> This policy replaces all previous ad-hoc workflows. Any exceptions require written approval from @Timmy and @perplexity. All repositories enforce: - ✅ Require Pull Request for merge - ✅ Minimum 1 approval required diff --git a/README.md b/README.md index e750a98..7330071 100644 --- a/README.md +++ b/README.md @@ -218,6 +218,23 @@ The browser-facing Nexus must be rebuilt deliberately through the migration back *One 3D repo. One migration path. No more ghost worlds.* # The Nexus Project +## Branch Protection & Review Policy + +See [CONTRIBUTING.md](CONTRIBUTING.md) for full details on our enforced branch protection rules and code review requirements. + +Key protections: +- All changes require PRs with 1+ approvals +- @perplexity is default reviewer for all repos +- @Timmy is required reviewer for hermes-agent +- CI must pass before merge (where ci exists) +- Force pushes and branch deletions blocked + +Current status: +- ✅ hermes-agent: All protections active +- ⚠ the-nexus: CI runner dead (#915) +- ✅ timmy-home: No ci +- ✅ timmy-config: Limited ci + ## Branch Protection & Mandatory Review Policy All repositories enforce these rules on the `main` branch: