Merge branch 'main' into docs/branching-strategy

docs: replace branching strategy doc with trunk-based development reference
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-13 14:00:13 -07:00 · 2026-02-13 11:05:58 -07:00 · 2026-02-12 18:58:13 -06:00
6 changed files with 10 additions and 2 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -73,7 +73,7 @@ After searching, use the [feature request template](https://github.com/bmad-code
 ### Target Branch
-Submit PRs to the `main` branch.
+Submit PRs to the `main` branch. We use [trunk-based development](https://trunkbaseddevelopment.com/branch-for-release/): `main` is the trunk where all work lands, and stable release branches receive only cherry-picked fixes.
 ### PR Size
--- a/tools/cli/installers/lib/ide/templates/combined/opencode-agent.md
+++ b/tools/cli/installers/lib/ide/templates/combined/opencode-agent.md
@ -1,5 +1,5 @@
 ---
-mode: primary
+name: '{{name}}'
 description: '{{description}}'
 ---
--- a/tools/cli/installers/lib/ide/templates/combined/opencode-task.md
+++ b/tools/cli/installers/lib/ide/templates/combined/opencode-task.md
@ -1,10 +1,12 @@
 ---
 name: '{{name}}'
 description: '{{description}}'
 ---
 Execute the BMAD '{{name}}' task.
 TASK INSTRUCTIONS:
 1. LOAD the task file from {project-root}/{{bmadFolderName}}/{{path}}
 2. READ its entire contents
 3. FOLLOW every instruction precisely as specified
--- a/tools/cli/installers/lib/ide/templates/combined/opencode-tool.md
+++ b/tools/cli/installers/lib/ide/templates/combined/opencode-tool.md
@ -1,10 +1,12 @@
 ---
 name: '{{name}}'
 description: '{{description}}'
 ---
 Execute the BMAD '{{name}}' tool.
 TOOL INSTRUCTIONS:
 1. LOAD the tool file from {project-root}/{{bmadFolderName}}/{{path}}
 2. READ its entire contents
 3. FOLLOW every instruction precisely as specified
--- a/tools/cli/installers/lib/ide/templates/combined/opencode-workflow-yaml.md
+++ b/tools/cli/installers/lib/ide/templates/combined/opencode-workflow-yaml.md
@ -1,4 +1,5 @@
 ---
 name: '{{name}}'
 description: '{{description}}'
 ---
@ -7,6 +8,7 @@ Execute the BMAD '{{name}}' workflow.
 CRITICAL: You must load and follow the workflow definition exactly.
 WORKFLOW INSTRUCTIONS:
 1. LOAD the workflow file from {project-root}/{{bmadFolderName}}/{{path}}
 2. READ its entire contents
 3. FOLLOW every step precisely as specified
--- a/tools/cli/installers/lib/ide/templates/combined/opencode-workflow.md
+++ b/tools/cli/installers/lib/ide/templates/combined/opencode-workflow.md
@ -1,4 +1,5 @@
 ---
 name: '{{name}}'
 description: '{{description}}'
 ---
@ -7,6 +8,7 @@ Execute the BMAD '{{name}}' workflow.
 CRITICAL: You must load and follow the workflow definition exactly.
 WORKFLOW INSTRUCTIONS:
 1. LOAD the workflow file from {project-root}/{{bmadFolderName}}/{{path}}
 2. READ its entire contents
 3. FOLLOW every step precisely as specified
Author	SHA1	Message	Date
Alex Verkhovsky	a7b213d5f0	Merge branch 'main' into docs/branching-strategy	2026-02-13 14:00:13 -07:00
Alex Verkhovsky	9a33db2042	docs: replace branching strategy doc with trunk-based development reference Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-02-13 11:05:58 -07:00
Adam Biggs	b815410904	fix(opencode): remove incorrect mode: primary and restore name field in templates (#1644 ) Remove hallucinated mode: primary from opencode-agent template - OpenCode defaults to mode: all and mode: primary does not enable Tab-switching as the original PR #1556 claimed. Restore the name frontmatter field across all OpenCode templates to match the standard pattern used by other IDEs.	2026-02-12 18:58:13 -06:00