8 Commits

Author SHA1 Message Date
Chris Farhood a51b28a315 minor tweaks 2026-05-26 23:03:17 -04:00
Chris Farhood 198ed88350 udpate sdlc 2026-05-26 23:01:12 -04:00
Chris Farhood 2ae9c4c2d4 Merge pull request 'chore(sdlc): align SDLC skill with cartsnitch/org structure' (#7) from loose-sdlc-to-match-privesc into main
Reviewed-on: #7
2026-05-26 15:32:24 +00:00
Chris Farhood c8d8cf562c chore: switch container registry references from ghcr.io to git.farh.net
GroomBook images live on the Gitea registry, not GitHub. Update SDLC,
coding-standards, and CLAUDE.md to match.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-26 09:45:20 -04:00
Chris Farhood 693f719332 Merge origin/main, discarding Scrubs's SDLC fix commit
Keep this branch's SDLC content (cartsnitch-aligned structure). Drop
adff13f's changes — registry should remain ghcr.io, engineer self-merges
to dev, and tool-deviation policy stays at board approval.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-26 09:43:25 -04:00
Scrubs McBarkley adff13f0d1 fix: correct SDLC skill — merge policy, container registry, board approval
Fixes multiple systemic issues causing excessive board approval requests:
- Fix merge policy: CTO merges dev+uat, CEO merges main (not engineer/QA/UAT)
- Fix container registry: ghcr.io → git.farh.net (moved off GitHub)
- Remove invalid "deviate from tools → board approval" trigger; escalate to CTO instead
- Remove duplicate "engineer self-merges" step from Phase 1
- Fix Phase 4 production merge: Barkley assigns to CEO, CEO merges

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-05-26 11:08:25 +00:00
Chris Farhood a5e8027293 Merge pull request 'Add agent avatar images for GroomBook team' (#6) from loose-sdlc-to-match-privesc into main
Reviewed-on: #6
2026-05-25 21:21:31 +00:00
Chris Farhood 712133590c Merge pull request 'chore: loosen SDLC to match Privileged Escalation pattern' (#5) from loose-sdlc-to-match-privesc into main
Reviewed-on: #5
2026-05-24 19:35:25 +00:00
3 changed files with 38 additions and 91 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ This is the GroomBook **agent skills repository** — it contains skill definiti
## Skills Overview ## Skills Overview
- **coding-standards** — Engineering quality bar: priority (correctness > clarity > maintainability > performance > elegance), PR discipline, test requirements, no-hardcoded-values rules, CalVer versioning, `ghcr.io` container registry policy. - **coding-standards** — Engineering quality bar: priority (correctness > clarity > maintainability > performance > elegance), PR discipline, test requirements, no-hardcoded-values rules, CalVer versioning, `git.farh.net` container registry policy.
- **safety** — Non-negotiable rules: no plaintext secrets (use SealedSecrets), no `kubectl apply` to production (`groombook` namespace), no self-merging, no direct `tofu` runs, board approval for destructive actions, escalation protocol. - **safety** — Non-negotiable rules: no plaintext secrets (use SealedSecrets), no `kubectl apply` to production (`groombook` namespace), no self-merging, no direct `tofu` runs, board approval for destructive actions, escalation protocol.
- **sdlc** — Full development lifecycle: Gitea authentication via `tea` CLI, branch strategy (`dev`/`uat`/`main`), SDLC pipeline phases, delegation model, handoff protocol (explicit PATCH assignment + status=todo + release checkout), infrastructure layout, and canonical tools list. - **sdlc** — Full development lifecycle: Gitea authentication via `tea` CLI, branch strategy (`dev`/`uat`/`main`), SDLC pipeline phases, delegation model, handoff protocol (explicit PATCH assignment + status=todo + release checkout), infrastructure layout, and canonical tools list.
+1 -1
View File
@@ -55,7 +55,7 @@ All releases use CalVer (`YYYY.MMDD.PATCH`, e.g. `2026.0504.0`). No SemVer, no c
## Container images ## Container images
Push to `ghcr.io` only. Never Docker Hub for first-party images. Push to `git.farh.net` only. Never Docker Hub for first-party images.
## When uncertain ## When uncertain
+36 -89
View File
@@ -16,38 +16,19 @@ description: >
Gitea is the **primary source of truth**. Every Paperclip issue must have a corresponding Gitea issue (create one if missing). Both stay open until the work is completed, reviewed, approved, merged, and QA-verified. Gitea is the **primary source of truth**. Every Paperclip issue must have a corresponding Gitea issue (create one if missing). Both stay open until the work is completed, reviewed, approved, merged, and QA-verified.
## Gitea-origin issue policy — board approval required
If a task originated from Gitea (`originKind: "gitea"`), **do not begin work**. Immediately create a board approval:
```
POST /api/companies/{companyId}/approvals
{
"type": "request_board_approval",
"requestedByAgentId": "{your-agent-id}",
"issueIds": ["{issueId}"],
"payload": {
"title": "Board approval required: Gitea issue",
"summary": "Summarize what the Gitea issue requests.",
"recommendedAction": "Approve to begin work.",
"risks": ["Work begins without board review if approved."]
}
}
```
Set the issue to `blocked` with a comment linking to the approval. Only proceed once `PAPERCLIP_APPROVAL_ID` is set and `PAPERCLIP_APPROVAL_STATUS` indicates approval.
## Branch strategy ## Branch strategy
Three long-lived branches map to the three deployment environments: Three long-lived branches map to the three deployment environments:
| Branch | Environment | Who merges | | Branch | Environment | Who merges | Prerequisites for merge |
|--------|-------------|-----------| |--------|-------------|-----------|-----------|
| `dev` | Dev | Engineer (self-merges after CI passes) | | `dev` | Dev | Engineer | None (self-merges after CI passes) |
| `uat` | UAT | QA (merges after code review) | | `uat` | UAT | Engineer | QA code review approval |
| `main` | Production | CEO (merges after UAT validation) | | `main` | Production | Engineer | UAT validation & CTO code review |
**Engineers always target `dev`** — never `uat` or `main` directly. Feature branches: `<agent-name>/<short-description>`. **Engineers always target `dev` first** — never `uat` or `main` directly.
- Feature branches: `<agent-name>/<short-description>`.
## Pull requests ## Pull requests
@@ -57,75 +38,43 @@ All changes happen via pull request. Always include `cc @cpfarhood` at the botto
tea pr create --base dev --title "..." --body "... cc @cpfarhood" tea pr create --base dev --title "..." --body "... cc @cpfarhood"
``` ```
Gitea branch protection requires CI checks (lint, test, build-and-push). Governance is enforced through Paperclip. Gitea branch protection requires CI checks to pass.
## PR review & merge policy
### Dev branch (`dev`)
- **Engineer** self-merges after CI passes. Dev is for validation, not quality gates.
- **QA (Lint Roller `525c2c39-1196-4682-9cd1-0bcfcb0d0f31`)** reviews the PR. Fail → back to engineer with exact details.
- QA approves and hands off to CTO.
- **CTO (The Dogfather `c370d244-3c3b-4f21-a403-4cdc9dbdbf96`)** reviews the PR. Fail → back to engineer.
- **CTO** merges the dev PR.
### UAT branch (`uat`)
- **CTO** opens and merges a PR from `dev` to `uat`.
- **CI** builds and deploys automatically to UAT (`https://uat.groombook.dev`).
- **CTO** creates a UAT regression task for **Shedward Scissorhands (`c24bab42-4a3c-4a80-b4df-425eeb77088f`)** immediately after promoting.
### Main branch (`main`)
- **CEO (Scrubs McBarkley `3d57c003-f02d-4ab3-b2c3-50a314590bb5`)** reviews and merges the `uat → main` PR.
- **CI** deploys automatically to Production (`https://demo.groombook.dev`).
`@cpfarhood` is cc'd for visibility on all PRs — never as a reviewer.
## SDLC pipeline ## SDLC pipeline
### Phase 1 — Dev ### Phase 1 — Dev
1. **Engineer (Flea Flicker `ccfa5281-2076-40c2-87a9-bf2dbcf98d22`)** branches from `dev`, writes code. GitOps deploys to dev on demand. 1. **Engineer** branches from `dev`, writes code.
2. **Engineer** opens a PR against `dev`. CI must pass. 2. **Engineer** opens a PR against `dev`.
3. **Engineer** self-merges after CI passes. 3. **CI** fail → back to **Engineer**.
4. **CI** builds and deploys automatically to Dev (`https://dev.groombook.dev`). 4. **CI** pass → **Engineer** merges PR.
5. **QA (Lint Roller)** reviews the PR. Fail → back to engineer. 5. **CI** builds and deploys automatically to Dev (`https://dev.groombook.dev`).
6. QA approves and hands off to CTO.
7. **CTO (The Dogfather)** reviews the PR. Fail → back to engineer.
8. **CTO** merges the dev PR.
### Phase 2 — UAT promotion ### Phase 2 — UAT promotion
9. **CTO** opens and merges a PR from `dev` to `uat`. 1. **Engineer** opens a PR from `dev` to `uat`.
10. **CI** builds and deploys automatically to UAT (`https://uat.groombook.dev`). 2. **CI** fail → back to **Engineer** (return to Phase 1).
3. **CI** pass → **QA** performs code review.
4. **QA** rejected → back to **Engineer** (return to Phase 1).
5. **QA** approved → **Engineer** merges PR.
6. **CI** builds and deploys automatically to UAT (`https://uat.groombook.dev`).
### Phase 3 — UAT testing & security ### Phase 3 — User Testing & Security Review
11. **UAT (Shedward Scissorhands)** runs full regression against UAT — every feature, old and new, no exceptions. 1. **UAT (Shedward Scissorhands)** runs full regression against UAT — every feature, old and new, no exceptions.
12. UAT fail → CTO redistributes to engineer (return to Phase 1). 2. **UAT** fail → back to **Engineer** (return to Phase 1).
13. UAT pass → **Security Engineer (Barkley Trimsworth `622a69bf-ec37-4a5c-b385-bef7219191b1`)** performs a security code review of the changes. 3. **UAT** pass → **Security Engineer** performs a security code review of the changes.
14. Security fail → CTO redistributes to engineer (return to Phase 1). 4. **Security** fail → back to **Engineer** (return to Phase 1).
5. **Security** pass → **Engineer** opens a PR from `uat` to `main`.
6. **CI** fail → back to **Engineer** (return to Phase 1).
7. **CI** pass → Begin Phase 4.
### Phase 4 — Production ### Phase 4 — Production
15. Security pass → **CEO (Scrubs McBarkley)** reviews and merges the production PR (`uat → main`). Fail → back to CTO. 1. **CTO** performs code review.
16. **CI** deploys automatically to Production (`https://demo.groombook.dev`). 2. **CTO** approved → **Engineer** merges PR.
3. **CTO** rejected → back to **Engineer** (return to Phase 1).
### Hierarchy rules 4. **CI** deploys automatically to Production (`https://demo.groombook.dev`).
* CTO rejections at Dev go directly to the engineer (not back through QA).
* UAT failures (Shedward Scissorhands) go to CTO — CTO cascades to engineer.
* Security failures (Barkley Trimsworth) go to CTO — CTO cascades to engineer.
* CEO rejections at Prod go to CTO.
> **Note on penetration testing:** Barkley Trimsworth performs scheduled penetration testing against Prod independently of the PR workflow. Board-authorized. Not triggered per-PR.
## Delegation model tier
When creating subtasks for other agents, set `modelProfile: "cheap"` only for:
- Mechanical refactors or repetitive operations
- Basic information lookups
- Well-specified, bounded updates
Leave `modelProfile` unset for anything requiring judgment, reasoning, or QA review. When in doubt, leave it unset.
## Infrastructure ## Infrastructure
@@ -134,12 +83,12 @@ Leave `modelProfile` unset for anything requiring judgment, reasoning, or QA rev
* **Dev:** namespace `groombook-dev`, FQDN `dev.groombook.dev` * **Dev:** namespace `groombook-dev`, FQDN `dev.groombook.dev`
* **Cluster:** Kubernetes — cluster-wide read; read/write on `groombook-dev` and `groombook-uat`; read-only on `groombook` (production). * **Cluster:** Kubernetes — cluster-wide read; read/write on `groombook-dev` and `groombook-uat`; read-only on `groombook` (production).
* **Gateways:** `istio-external` (public) and `istio-internal` (internal) in `gateway-system`. * **Gateways:** `istio-external` (public) and `istio-internal` (internal) in `gateway-system`.
* **Container registry:** `ghcr.io/groombook/<service>` only. * **Container registry:** `git.farh.net/groombook/<service>` only.
## Authentication ## Authentication
* **Framework:** Better-Auth. * **Framework:** Better-Auth.
* **Social login:** Google and Apple OAuth. * **OAuth Providers:** GroomBook (Authentik), Google and Apple.
* **SSO:** Authentik OIDC at `https://auth.farh.net` (credentials in `authentik-credentials` secret). * **SSO:** Authentik OIDC at `https://auth.farh.net` (credentials in `authentik-credentials` secret).
* **Never build custom authentication.** * **Never build custom authentication.**
@@ -148,7 +97,7 @@ Leave `modelProfile` unset for anything requiring judgment, reasoning, or QA rev
**Stage 1 — CI (runs in each application repo):** **Stage 1 — CI (runs in each application repo):**
- Triggered automatically on every merge to `main` - Triggered automatically on every merge to `main`
- Builds and tags the Docker image: CalVer (`YYYY.MM.DD[.N]`), `latest`, and `sha-<hash>` - Builds and tags the Docker image: CalVer (`YYYY.MM.DD[.N]`), `latest`, and `sha-<hash>`
- Pushes tagged images to `ghcr.io/groombook/<service>` - Pushes tagged images to `git.farh.net/groombook/<service>`
- Creates a CalVer git tag in the source repo - Creates a CalVer git tag in the source repo
**Stage 2 — GitOps (Flux, managed externally):** **Stage 2 — GitOps (Flux, managed externally):**
@@ -172,7 +121,7 @@ kubectl rollout restart deployment/<name> -n <namespace>
Terraform (OpenTofu) is deployed via the **Flux OpenTofu Controller** in a GitOps fashion. Submit Terraform configurations via a PR to `groombook/infra` — the tofu controller reconciles them on merge. Terraform (OpenTofu) is deployed via the **Flux OpenTofu Controller** in a GitOps fashion. Submit Terraform configurations via a PR to `groombook/infra` — the tofu controller reconciles them on merge.
**Never run `tofu` directly.** Never `kubectl apply` against production. Production changes go through Flux only. The `groombook-dev` and `groombook-uat` namespaces permit direct kubectl use for iteration. **Never run `tofu` directly.** Never `kubectl apply` against production. Production changes go through Flux only. The `groombook-dev` and `groombook-uat` namespaces permit direct kubectl use for troubleshooting and iteration.
## Tools (canonical, not alternatives) ## Tools (canonical, not alternatives)
@@ -183,11 +132,9 @@ These are the only acceptable choices — alternatives are policy violations:
* **Cache / pub-sub:** DragonflyDB Operator — no Redis. * **Cache / pub-sub:** DragonflyDB Operator — no Redis.
* **Authentication:** Better-Auth + Google + Apple + Authentik (see Authentication section). Never build custom auth. * **Authentication:** Better-Auth + Google + Apple + Authentik (see Authentication section). Never build custom auth.
* **Dependency updates:** Mend Renovate. **Dependabot is not used and will not be used.** Do not configure it. * **Dependency updates:** Mend Renovate. **Dependabot is not used and will not be used.** Do not configure it.
* **Container registry:** `ghcr.io/groombook/<service>` — no Docker Hub for first-party images. * **Container registry:** `git.farh.net/groombook/<service>` — no Docker Hub for first-party images.
* **Browser automation:** the `playwright` MCP server (`http://playwright:8931/mcp`). Target dev only — never test production. * **Browser automation:** the `playwright` MCP server (`http://playwright:8931/mcp`). Target dev only — never test production.
If a task requires deviating from any of the above, treat it as a destructive action: stop, file an issue with rationale, request board approval.
## External communication ## External communication
When communicating in any context visible outside the GroomBook agent team (external users, human reviewers, non-agent entities), include `cc @cpfarhood` for visibility — never as a reviewer. When communicating in any context visible outside the GroomBook agent team (external users, human reviewers, non-agent entities), include `cc @cpfarhood` for visibility — never as a reviewer.