Every document filename now mirrors its lifecycle state with a status suffix (e.g., .draft.md, .wip.md, .accepted.md). No more bare .md for tracked document types. Also renamed all from_str methods to parse to avoid FromStr trait confusion, introduced StagingDeploymentParams struct, and fixed all 19 clippy warnings across the codebase. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2.6 KiB
2.6 KiB
RFC 0007: Consistent Branch Naming
| Status | Implemented |
| Date | 2026-01-24 |
Summary
Branch names and worktrees for RFC implementation are inconsistent. Some use the full RFC name with number prefix, others use arbitrary names. This makes it hard to correlate branches with their source RFCs and clutters the git history.
Problem
Currently when implementing an RFC:
- Branch names vary:
rfc-0005,feature/local-llm,0005-local-llm-integration, etc. - Worktree directories follow no convention
- No clear way to find which branch implements which RFC
- PR titles don't consistently reference the RFC number
Proposal
Naming Convention
For an RFC file named NNNN-feature-description.md:
| Artifact | Name |
|---|---|
| RFC file | NNNN-feature-description.md |
| Branch | feature-description |
| Worktree | feature-description |
| PR title | RFC NNNN: Feature Description |
Examples
| RFC File | Branch | Worktree |
|---|---|---|
0005-local-llm-integration.md |
local-llm-integration |
local-llm-integration |
0006-document-deletion-tools.md |
document-deletion-tools |
document-deletion-tools |
0007-consistent-branch-naming.md |
consistent-branch-naming |
consistent-branch-naming |
Rationale
Why strip the number prefix?
- Branch names stay short and readable
- The RFC number is metadata, not the feature identity
git branchoutput is cleaner- Tab completion is easier
Why keep feature-description?
- Direct correlation to RFC title
- Descriptive without being verbose
- Consistent kebab-case convention
Implementation
- Update
blue_worktree_createto derive branch name from RFC title (strip number prefix) - Update
blue_pr_createto include RFC number in PR title Add validation to reject branches with number prefixes(deferred - convention is enforced by tooling)- Document convention in CLAUDE.md
Migration
Existing branches don't need to change. Convention applies to new work only.
Test Plan
blue worktree createusesfeature-descriptionformat- Branch name derived correctly from RFC title
- PR title includes RFC number when
rfcparameter provided Validation rejects(deferred)NNNN-*branch names with helpful message
Implementation Plan
- Update worktree handler to strip RFC number from branch name
- Update PR handler to format title as
RFC NNNN: Title - Add
strip_rfc_number_prefixhelper function with tests - Update documentation (CLAUDE.md)
"Names matter. Make them count."
— Blue