Use this skill when multiple contributors or agents may touch the same product surface. The goal is to keep the app deployable while features, redesigns, and refactors happen in parallel.
Process
- Identify team shape: solo, designer+agent, small team, client team, or multi-agent workflow.
- Recommend branch model: production, integration, short-lived feature/fix branches, and agent branch prefix.
- Define PR slicing rules: visual, behavior, content, infrastructure, data, and intentional vertical slices.
- Recommend worktrees when old and new UI must be compared side by side.
- Define commit convention and merge policy.
- Define agent-safe rules: allowed files, do-not-edit lock file, human review, and feature-flag expectations.
- Produce a workflow checklist.
Output format
## Git workflow plan
Branch model: Branch naming: Commit convention:
PR slicing rules
- Visual:
- Behavior/data:
- Content:
- Infrastructure:
- Vertical slice exception:
Agent policy
- Branch prefix:
- Human review:
- Lock file:
- Allowed scope:
Worktree recommendation
Review and merge policy
Coordination artifacts
- [item]
Workflow checklist
- [criterion]
## Worked example
## Git workflow plan
**Branch model:** main (production) ← dev (integration) ← feat/*
**Branch naming:** feat/short-description, fix/short-description
**Commit convention:** Conventional Commits (feat:, fix:, chore:)
### PR slicing rules
- Visual: token and component changes, no behaviour
- Behavior/data: logic and API changes
- Content: copy and documentation
- Infrastructure: tooling and CI
- Vertical slice exception: allowed when small and demoable
### Agent policy
- Branch prefix: agent/*
- Human review: required on every PR; no direct pushes to dev/main
- Lock file: pnpm-lock.yaml — agents never edit
- Allowed scope: stated per task in the PR description
### Worktree recommendation
Use a worktree for the redesign so old and new UI compare side by side.
### Review and merge policy
Squash merge to dev; no rebase; dev stays deployable at all times.
### Coordination artifacts
- docs/agent-lock.md; PR template with scope checklist
### Workflow checklist
- [ ] Branch from dev
- [ ] Scope stated before the agent starts
- [ ] Human review before merge
## Common mistakes to prevent
- Do not let redesigns live as one long branch.
- Do not mix visual changes and business logic unless it is an intentional, reviewable vertical slice.
- Do not let agents edit files without explicit scope and human review.
## Boundaries
- Do not use for a solo, throwaway prototype — keep git trivial.
- Do not use when the question is the *content* of AGENTS.md — use `$agent-context-file-planner`.
## Validate before final
- The branch model keeps `main` production-safe and the integration branch deployable.
- The PR rules explain how to split visual, behavioral, content, and infrastructure changes.
## See also
- [Design Engineering guide: Collaborative Repository Workflow](https://frontendguide.dev/docs/collaborative-repository-workflow)