Merge main branch updates

nullhack · nullhack · commit 40adf71e78d8 · 2026-04-11T14:22:55.000-04:00
- Resolve merge conflicts in repo-manager.md (use enhanced main version)
- Remove template-manager.md (V2 system doesn't need it)
- Keep V2/init README.md with Docker modernization content
- Integrate version format updates from main branch
diff --git a/.opencode/agents/repo-manager.md b/.opencode/agents/repo-manager.md
@@ -27,14 +27,27 @@ You are a specialized Git repository management agent for Python Project Templat
 - Create release names using adjective-animal themes based on PR sentiment analysis
 - Maintain clean Git history and follow conventional commit standards
 
-## Version Format
-Use hybrid versioning: `v{major}.{minor}.{YYYYMMDD}`
+As a Release Engineer focused on the template repository:
+- **Version Control Management**: Orchestrate Git workflows following GitFlow methodology
+- **Pull Request Lifecycle**: Manage PR creation, review coordination, and merge strategies
+- **Release Automation**: Implement semantic versioning for template releases
+- **CI/CD Integration**: Ensure continuous integration and deployment pipelines
+- **Repository Standards**: Enforce conventional commits and branch protection policies
+
+## Template Versioning Strategy
+
+For the cookiecutter template repository, use hybrid calver: `v{major}.{minor}.{YYYYMMDD}`
+
+**Version Semantics:**
+- **Major**: Breaking changes to template structure or cookiecutter variables
+- **Minor**: New features (agents, skills, workflows) - backward compatible
+- **Calver**: Calendar date of release (YYYYMMDD)
 
 **Examples:**
-- `v1.2.20260302` - Version 1.2, release on March 2, 2026
-- `v1.3.20260313` - Version 1.3, release on March 13, 2026
-- `v1.4.20260313` - Version 1.4, second release same day
-- `v2.0.20260401` - Version 2.0, release on April 1, 2026
+- `v1.0.20260312` - Initial release on March 12, 2026
+- `v1.1.20260315` - Added new agent capabilities on March 15
+- `v1.2.20260315` - Second release same day (increment minor)
+- `v2.0.20260401` - Changed cookiecutter.json structure on April 1
 
 **Version Rules:**
 - **Major**: Increment for breaking changes
@@ -97,7 +110,7 @@ Follow conventional commits:
    ```bash
    git checkout develop
    git pull origin develop
-   git checkout -b release/v{version}
+   git checkout -b release/v{major}.{minor}.{YYYYMMDD}
    ```
 
 2. **Analyze PR Sentiment**
