Implements --resolve-collisions flag for import command to safely handle ID collisions during branch merges. When enabled, colliding issues are remapped to new IDs and all text references and dependencies are automatically updated. Also adds comprehensive tests, branch-merge example, and documentation. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
7.7 KiB
Instructions for AI Agents Working on Beads
Project Overview
This is beads (command: bd), an issue tracker designed for AI-supervised coding workflows. We dogfood our own tool!
Issue Tracking
We use bd (beads) for issue tracking instead of Markdown TODOs or external tools.
Quick Reference
# Find ready work (no blockers)
bd ready --json
# Create new issue
bd create "Issue title" -t bug|feature|task -p 0-4 -d "Description" --json
# Update issue status
bd update <id> --status in_progress --json
# Link discovered work
bd dep add <discovered-id> <parent-id> --type discovered-from
# Complete work
bd close <id> --reason "Done" --json
# Show dependency tree
bd dep tree <id>
# Get issue details
bd show <id> --json
# Import with collision detection
bd import -i .beads/issues.jsonl --dry-run # Preview only
bd import -i .beads/issues.jsonl --resolve-collisions # Auto-resolve
Workflow
- Check for ready work: Run
bd readyto see what's unblocked - Claim your task:
bd update <id> --status in_progress - Work on it: Implement, test, document
- Discover new work: If you find bugs or TODOs, create issues:
bd create "Found bug in auth" -t bug -p 1 --json- Link it:
bd dep add <new-id> <current-id> --type discovered-from
- Complete:
bd close <id> --reason "Implemented" - Export: Run
bd export -o .beads/issues.jsonlbefore committing
Issue Types
bug- Something broken that needs fixingfeature- New functionalitytask- Work item (tests, docs, refactoring)epic- Large feature composed of multiple issueschore- Maintenance work (dependencies, tooling)
Priorities
0- Critical (security, data loss, broken builds)1- High (major features, important bugs)2- Medium (nice-to-have features, minor bugs)3- Low (polish, optimization)4- Backlog (future ideas)
Dependency Types
blocks- Hard dependency (issue X blocks issue Y)related- Soft relationship (issues are connected)parent-child- Epic/subtask relationshipdiscovered-from- Track issues discovered during work
Only blocks dependencies affect the ready work queue.
Development Guidelines
Code Standards
- Go version: 1.21+
- Linting:
golangci-lint run ./...(baseline warnings documented in LINTING.md) - Testing: All new features need tests (
go test ./...) - Documentation: Update relevant .md files
File Organization
beads/
├── cmd/bd/ # CLI commands
├── internal/
│ ├── types/ # Core data types
│ └── storage/ # Storage layer
│ └── sqlite/ # SQLite implementation
├── examples/ # Integration examples
└── *.md # Documentation
Before Committing
- Run tests:
go test ./... - Run linter:
golangci-lint run ./...(ignore baseline warnings) - Export issues:
bd export -o .beads/issues.jsonl - Update docs: If you changed behavior, update README.md or other docs
- Git add both:
git add .beads/issues.jsonl <your-changes>
Git Workflow
# Make changes
git add <files>
# Export beads issues
bd export -o .beads/issues.jsonl
git add .beads/issues.jsonl
# Commit
git commit -m "Your message"
# After pull
git pull
bd import -i .beads/issues.jsonl # Sync SQLite cache
Or use the git hooks in examples/git-hooks/ for automation.
Handling Import Collisions
When merging branches or pulling changes, you may encounter ID collisions (same ID, different content). bd detects and safely handles these:
Check for collisions after merge:
# After git merge or pull
bd import -i .beads/issues.jsonl --dry-run
# Output shows:
# === Collision Detection Report ===
# Exact matches (idempotent): 15
# New issues: 5
# COLLISIONS DETECTED: 3
#
# Colliding issues:
# bd-10: Fix authentication (conflicting fields: [title, priority])
# bd-12: Add feature (conflicting fields: [description, status])
Resolve collisions automatically:
# Let bd resolve collisions by remapping incoming issues to new IDs
bd import -i .beads/issues.jsonl --resolve-collisions
# bd will:
# - Keep existing issues unchanged
# - Assign new IDs to colliding issues (bd-25, bd-26, etc.)
# - Update ALL text references and dependencies automatically
# - Report the remapping with reference counts
Important: The --resolve-collisions flag is safe and recommended for branch merges. It preserves the existing database and only renumbers the incoming colliding issues. All text mentions like "see bd-10" and dependency links are automatically updated to use the new IDs.
Manual resolution (alternative):
If you prefer manual control, resolve the Git conflict in .beads/issues.jsonl directly, then import normally without --resolve-collisions.
Current Project Status
Run bd stats to see overall progress.
Active Areas
- Core CLI: Mature, but always room for polish
- Examples: Growing collection of agent integrations
- Documentation: Comprehensive but can always improve
- MCP Server: Planned (see bd-5)
- Migration Tools: Planned (see bd-6)
1.0 Milestone
We're working toward 1.0. Key blockers tracked in bd. Run:
bd dep tree bd-8 # Show 1.0 epic dependencies
Common Tasks
Adding a New Command
- Create file in
cmd/bd/ - Add to root command in
cmd/bd/main.go - Implement with Cobra framework
- Add
--jsonflag for agent use - Add tests in
cmd/bd/*_test.go - Document in README.md
Adding Storage Features
- Update schema in
internal/storage/sqlite/schema.go - Add migration if needed
- Update
internal/types/types.goif new types - Implement in
internal/storage/sqlite/sqlite.go - Add tests
- Update export/import in
cmd/bd/export.goandcmd/bd/import.go
Adding Examples
- Create directory in
examples/ - Add README.md explaining the example
- Include working code
- Link from
examples/README.md - Mention in main README.md
Questions?
- Check existing issues:
bd list - Look at recent commits:
git log --oneline -20 - Read the docs: README.md, TEXT_FORMATS.md, EXTENDING.md
- Create an issue if unsure:
bd create "Question: ..." -t task -p 2
Important Files
- README.md - Main documentation (keep this updated!)
- EXTENDING.md - Database extension guide
- TEXT_FORMATS.md - JSONL format analysis
- CONTRIBUTING.md - Contribution guidelines
- SECURITY.md - Security policy
Pro Tips for Agents
- Always use
--jsonflags for programmatic use - Link discoveries with
discovered-fromto maintain context - Check
bd readybefore asking "what next?" - Export to JSONL before committing (or use git hooks)
- Use
bd dep treeto understand complex dependencies - Priority 0-1 issues are usually more important than 2-4
- Use
--dry-runto preview import collisions before resolving - Use
--resolve-collisionsfor safe automatic branch merges - After resolving collisions, run
bd exportto save the updated state
Building and Testing
# Build
go build -o bd ./cmd/bd
# Test
go test ./...
# Test with coverage
go test -coverprofile=coverage.out ./...
go tool cover -html=coverage.out
# Run locally
./bd init --prefix test
./bd create "Test issue" -p 1
./bd ready
Release Process (Maintainers)
- Update version in code (if applicable)
- Update CHANGELOG.md (if exists)
- Run full test suite
- Tag release:
git tag v0.x.0 - Push tag:
git push origin v0.x.0 - GitHub Actions handles the rest
Remember: We're building this tool to help AI agents like you! If you find the workflow confusing or have ideas for improvement, create an issue with your feedback.
Happy coding! 🔗