docs(contributing): add Git workflow for Soushi+Tibi collaboration

- Branch model: main ← dev ← feature branches
- Branch naming convention: {type}/issue-{N}-{slug}
- Commit message conventions with scope table
- PR lifecycle: draft → ready, squash merge to dev, merge commit to main
- Semver release tagging on main
- ci(build): extend CI to dev branch push and PR triggers

Author: Soushi888

.github/workflows/build.yml

@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches: [main]
+    branches: [main, dev]
   pull_request:
-    branches: [main]
+    branches: [main, dev]
 
 jobs:
   build:
@@ -34,4 +34,3 @@ jobs:
 
       - name: Build happ
         run: nix develop --command bun run build:happ
-

CONTRIBUTING.md

@@ -0,0 +1,156 @@
+# Contributing to Nondominium
+
+Development workflow for the Soushi + Tibi core team.
+
+---
+
+## Branch Model
+
+```
+main          ← production-stable, tagged releases only
+  └── dev     ← integration branch, always deployable
+        └── feat/issue-N-short-slug    ← feature work
+        └── fix/issue-N-short-slug     ← bug fixes
+        └── refactor/short-slug        ← refactoring
+        └── docs/short-slug            ← documentation
+        └── chore/short-slug           ← maintenance, deps, config
+```
+
+**Rules:**
+- `main` — no direct pushes. Only merges from `dev` via PR when cutting a release.
+- `dev` — integration branch. Feature PRs land here first.
+- Feature branches — fork from `dev`, PR back to `dev`. Short-lived.
+
+---
+
+## Starting a Feature
+
+```bash
+git checkout dev
+git pull origin dev
+git checkout -b feat/issue-N-short-slug
+```
+
+Branch name format: `{type}/issue-{N}-{slug}` or `{type}/{slug}` when not tied to an issue.
+
+| Type | When |
+|------|------|
+| `feat` | New capability |
+| `fix` | Bug fix |
+| `refactor` | Restructure without behavior change |
+| `docs` | Documentation only |
+| `chore` | Deps, config, CI, maintenance |
+| `test` | Tests only |
+
+Examples:
+- `feat/issue-56-resource-lifecycle`
+- `fix/issue-42-capability-grant-validation`
+- `chore/bump-holochain-0-4`
+- `docs/governance-zome-api`
+
+---
+
+## Commit Messages
+
+Conventional Commits format — already in use, keep it consistent.
+
+```
+{type}({scope}): imperative verb + specific object
+```
+
+**Scopes:** `person`, `resource`, `governance`, `ui`, `tests`, `hrea`, `ci`, `nix`, `docs`
+
+```
+feat(governance): add resource claim validation
+fix(person): capability grant not persisting across conductor restart
+refactor(resource): extract lifecycle state machine into module
+docs(governance): add PPR system sequence diagram
+chore(ci): extend build check to dev branch PRs
+test(person): add multi-agent capability revocation scenario
+```
+
+Breaking changes: add `!` after the scope, or add `BREAKING CHANGE:` footer.
+
+```
+feat(governance)!: rename EconomicEvent fields to match ValueFlows 2.0
+```
+
+---
+
+## Opening a Pull Request
+
+1. Push your branch: `git push -u origin feat/issue-N-slug`
+2. Open PR **targeting `dev`** (not `main`)
+3. Fill the PR template (Intent, Changes, Decisions, How to test, Documentation, Related)
+4. Open as **Draft** while work is in progress
+5. Mark **Ready for Review** when complete and CI passes
+
+**Review:** One approval required before merge. Soushi reviews Tibi's PRs, Tibi reviews Soushi's. Mexi is notified for visibility but doesn't block merges.
+
+**Merge method:** Squash merge — keeps `dev` history clean, one commit per feature.
+
+---
+
+## Releasing to main
+
+When `dev` is stable and ready for a release:
+
+1. Open a PR from `dev` to `main`
+2. PR title: `release: vX.Y.Z`
+3. Merge using **merge commit** (preserves the release boundary in history)
+4. Tag immediately after merge: `git tag vX.Y.Z && git push origin vX.Y.Z`
+
+**Versioning:** Semantic versioning. Increment:
+- `MAJOR` for breaking changes to zome APIs or DNA hash
+- `MINOR` for new features (backward-compatible)
+- `PATCH` for bug fixes and docs
+
+---
+
+## Branch Cleanup
+
+Delete feature branches after merge:
+```bash
+git branch -d feat/issue-N-slug           # local
+git push origin --delete feat/issue-N-slug  # remote
+```
+
+GitHub's "Delete branch" button on the merged PR does both.
+
+---
+
+## CI
+
+The build pipeline runs on:
+- Push to `main`
+- PRs targeting `main`
+- PRs targeting `dev`
+
+Checks: Nix environment, `bun install`, `build:happ` (WASM compilation).
+
+Tests are included but non-blocking while the test suite is being stabilized. Once stable, tests will be promoted to a required check.
+
+---
+
+## Worktrees (Soushi)
+
+Soushi uses git worktrees for feature branches (via PAI tooling). Worktrees live in
+`.worktrees/` (gitignored). If you see a `.worktrees/` directory, that's normal.
+
+Tibi: standard `git checkout` workflow works fine — worktrees are optional.
+
+---
+
+## Current Branch State (as of 2026-03)
+
+| Branch | Status | Action |
+|--------|--------|--------|
+| `main` | Production-stable | Protected — PR only |
+| `dev` | Integration | Active — base for new features |
+| `feat/issues-51-52-53-55-hrea-person-bridge` | In-progress hREA Phase 1 | PR to `dev` when ready |
+
+---
+
+## Questions?
+
+Open an issue or ping in the team channel.