@sleighmaster/bmad 1.5.1 → 1.5.2

package/data/_bmad/.custom-files.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "description": "BMad6GitHub 커스텀 파일 목록 - 동기화 시 보호할 파일들",
-  "version": "1.0.0",
+  "schema_version": "1.0.0",
   "upstream": {
     "url": "https://github.com/bmad-code-org/BMAD-METHOD.git",
     "branch": "main"

package/data/_bmad/_config/manifest.yaml

@@ -1,3 +1,8 @@
+distribution:
+  name: BMad6GitHub
+  version: 1.2.0
+  upstream: 6.0.0-Beta.4
+  repo: https://github.com/SleighMaster99/BMad6GitHub
 installation:
   version: 6.0.0-Beta.4
   installDate: 2026-01-30T08:02:42.183Z

package/data/_bmad/bmm/agents/pm.md

@@ -62,7 +62,7 @@ You must fully embody this agent's persona and follow all activation instruction
     <item cmd="CP or fuzzy match on create-prd" exec="{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow.md">[CP] Create PRD: Expert led facilitation to produce your Product Requirements Document</item>
     <item cmd="VP or fuzzy match on validate-prd" exec="{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow.md">[VP] Validate PRD: Validate a Product Requirements Document is comprehensive, lean, well organized and cohesive</item>
     <item cmd="EP or fuzzy match on edit-prd" exec="{project-root}/_bmad/bmm/workflows/2-plan-workflows/create-prd/workflow.md">[EP] Edit PRD: Update an existing Product Requirements Document</item>
-    <item cmd="CE or fuzzy match on epics-stories" exec="{project-root}/_bmad/bmm/workflows/3-solutioning/create-epics-and-stories/workflow.md">[CE] Create Epics and Stories: Create the Epics and Stories Listing, these are the specs that will drive development</item>
+    <item cmd="CE or fuzzy match on epics" exec="{project-root}/_bmad/bmm/workflows/3-solutioning/create-epics-and-stories/workflow.md">[CE] Create Epics: Create the Epics listing that organizes requirements into implementable units (stories are created separately via SM agent CS command)</item>
     <item cmd="IR or fuzzy match on implementation-readiness" exec="{project-root}/_bmad/bmm/workflows/3-solutioning/check-implementation-readiness/workflow.md">[IR] Implementation Readiness: Ensure the PRD, UX, and Architecture and Epics and Stories List are all aligned</item>
     <item cmd="CC or fuzzy match on correct-course" workflow="{project-root}/_bmad/bmm/workflows/4-implementation/correct-course/workflow.yaml">[CC] Course Correction: Use this so we can determine how to proceed if major need for change is discovered mid implementation</item>
     <item cmd="PM or fuzzy match on party-mode" exec="{project-root}/_bmad/core/workflows/party-mode/workflow.md">[PM] Start Party Mode</item>

package/data/_bmad/bmm/workflows/3-solutioning/create-epics-and-stories/steps/step-01-validate-prerequisites.md

@@ -1,6 +1,6 @@
 ---
 name: 'step-01-validate-prerequisites'
-description: 'Validate required documents exist and extract all requirements for epic and story creation'
+description: 'Validate required documents exist and extract all requirements for epic creation'
 
 # Path Definitions
 workflow_path: '{project-root}/_bmad/bmm/workflows/3-solutioning/create-epics-and-stories'
@@ -24,7 +24,7 @@ epicsTemplate: '{workflow_path}/templates/epics-template.md'
 
 ## STEP GOAL:
 
-To validate that all required input documents exist and extract all requirements (FRs, NFRs, and additional requirements from UX/Architecture) needed for epic and story creation.
+To validate that all required input documents exist and extract all requirements (FRs, NFRs, and additional requirements from UX/Architecture) needed for epic creation.
 
 ## MANDATORY EXECUTION RULES (READ FIRST):
 
@@ -47,7 +47,7 @@ To validate that all required input documents exist and extract all requirements
 ### Step-Specific Rules:
 
 - 🎯 Focus ONLY on extracting and organizing requirements
-- 🚫 FORBIDDEN to start creating epics or stories in this step
+- 🚫 FORBIDDEN to start creating epics in this step
 - 💬 Extract requirements from ALL available documents
 - 🚪 POPULATE the template sections exactly as needed
 
@@ -62,7 +62,7 @@ To validate that all required input documents exist and extract all requirements
 
 ### 1. Welcome and Overview
 
-Welcome {user_name} to comprehensive epic and story creation!
+Welcome {user_name} to comprehensive epic creation!
 
 **CRITICAL PREREQUISITE VALIDATION:**
 
@@ -131,7 +131,7 @@ NFR2: [Performance/Security/Usability requirement]
 
 ### 5. Extract Additional Requirements from Architecture
 
-Review the Architecture document for technical requirements that impact epic and story creation:
+Review the Architecture document for technical requirements that impact epic creation:
 
 **Look for:**
 
@@ -156,7 +156,7 @@ Review the Architecture document for technical requirements that impact epic and
 
 ### 6. Extract Additional Requirements from UX (if exists)
 
-Review the UX document for requirements that affect epic and story creation:
+Review the UX document for requirements that affect epic creation:
 
 **Look for:**
 

package/data/_bmad/bmm/workflows/3-solutioning/create-epics-and-stories/steps/step-02-design-epics.md

@@ -7,7 +7,7 @@ workflow_path: '{project-root}/_bmad/bmm/workflows/3-solutioning/create-epics-an
 
 # File References
 thisStepFile: './step-02-design-epics.md'
-nextStepFile: './step-03-create-stories.md'
+nextStepFile: './step-04-final-validation.md'
 workflowFile: '{workflow_path}/workflow.md'
 outputFile: '{planning_artifacts}/epics.md'
 
@@ -199,7 +199,7 @@ Ask user:
 ### 7. Get Final Approval
 
 **CRITICAL:** Must get explicit user approval:
-"Do you approve this epic structure for proceeding to story creation?"
+"Do you approve this epic structure?"
 
 If user wants changes:
 
@@ -236,7 +236,7 @@ Display: "**Select an Option:** [A] Advanced Elicitation [P] Party Mode [C] Cont
 
 ## CRITICAL STEP COMPLETION NOTE
 
-ONLY WHEN C is selected and the approved epics_list is saved to document, will you then read fully and follow: {nextStepFile} to begin story creation step.
+ONLY WHEN C is selected and the approved epics_list is saved to document, will you then read fully and follow: {nextStepFile} to begin final validation step.
 
 ---
 

package/data/_bmad/bmm/workflows/3-solutioning/create-epics-and-stories/steps/step-04-final-validation.md

@@ -1,6 +1,6 @@
 ---
 name: 'step-04-final-validation'
-description: 'Validate complete coverage of all requirements and ensure implementation readiness'
+description: 'Validate complete coverage of all requirements by epics and ensure epic structure readiness'
 
 # Path Definitions
 workflow_path: '{project-root}/_bmad/bmm/workflows/3-solutioning/create-epics-and-stories'
@@ -22,7 +22,7 @@ epicsTemplate: '{workflow_path}/templates/epics-template.md'
 
 ## STEP GOAL:
 
-To validate complete coverage of all requirements and ensure stories are ready for development.
+To validate complete coverage of all requirements by epics and ensure epic structure is ready for story creation.
 
 ## MANDATORY EXECUTION RULES (READ FIRST):
 
@@ -44,36 +44,35 @@ To validate complete coverage of all requirements and ensure stories are ready f
 
 ### Step-Specific Rules:
 
-- 🎯 Focus ONLY on validating complete requirements coverage
+- 🎯 Focus ONLY on validating complete requirements coverage by epics
 - 🚫 FORBIDDEN to skip any validation checks
-- 💬 Validate FR coverage, story completeness, and dependencies
-- 🚪 ENSURE all stories are ready for development
+- 💬 Validate FR coverage and epic structure
+- 🚪 ENSURE all epics are well-defined for subsequent story creation
 
 ## EXECUTION PROTOCOLS:
 
-- 🎯 Validate every requirement has story coverage
-- 💾 Check story dependencies and flow
+- 🎯 Validate every requirement is covered by at least one epic
+- 💾 Check epic dependencies and flow
 - 📖 Verify architecture compliance
 - 🚫 FORBIDDEN to approve incomplete coverage
 
 ## CONTEXT BOUNDARIES:
 
-- Available context: Complete epic and story breakdown from previous steps
-- Focus: Final validation of requirements coverage and story readiness
+- Available context: Complete epic breakdown from previous steps
+- Focus: Final validation of requirements coverage and epic readiness
 - Limits: Validation only, no new content creation
-- Dependencies: Completed story generation from Step 3
+- Dependencies: Completed epic design from Step 2
 
 ## VALIDATION PROCESS:
 
 ### 1. FR Coverage Validation
 
-Review the complete epic and story breakdown to ensure EVERY FR is covered:
+Review the epic breakdown to ensure EVERY FR is covered:
 
 **CRITICAL CHECK:**
 
 - Go through each FR from the Requirements Inventory
-- Verify it appears in at least one story
-- Check that acceptance criteria fully address the FR
+- Verify it appears in at least one epic's FR coverage
 - No FRs should be left uncovered
 
 ### 2. Architecture Implementation Validation
@@ -81,37 +80,18 @@ Review the complete epic and story breakdown to ensure EVERY FR is covered:
 **Check for Starter Template Setup:**
 
 - Does Architecture document specify a starter template?
-- If YES: Epic 1 Story 1 must be "Set up initial project from starter template"
-- This includes cloning, installing dependencies, initial configuration
+- If YES: Note that Epic 1 should include project setup from the starter template
 
-**Database/Entity Creation Validation:**
-
-- Are database tables/entities created ONLY when needed by stories?
-- ❌ WRONG: Epic 1 creates all tables upfront
-- ✅ RIGHT: Tables created as part of the first story that needs them
-- Each story should create/modify ONLY what it needs
-
-### 3. Story Quality Validation
-
-**Each story must:**
-
-- Be completable by a single dev agent
-- Have clear acceptance criteria
-- Reference specific FRs it implements
-- Include necessary technical details
-- **Not have forward dependencies** (can only depend on PREVIOUS stories)
-- Be implementable without waiting for future stories
-
-### 4. Epic Structure Validation
+### 3. Epic Structure Validation
 
 **Check that:**
 
 - Epics deliver user value, not technical milestones
 - Dependencies flow naturally
-- Foundation stories only setup what's needed
-- No big upfront technical work
+- Each epic has a clear goal statement
+- No big upfront technical work without user value
 
-### 5. Dependency Validation (CRITICAL)
+### 4. Dependency Validation (CRITICAL)
 
 **Epic Independence Check:**
 
@@ -121,17 +101,7 @@ Review the complete epic and story breakdown to ensure EVERY FR is covered:
 - ❌ WRONG: Epic 2 requires Epic 3 features to work
 - ✅ RIGHT: Each epic is independently valuable
 
-**Within-Epic Story Dependency Check:**
-For each epic, review stories in order:
-
-- Can Story N.1 be completed without Stories N.2, N.3, etc.?
-- Can Story N.2 be completed using only Story N.1 output?
-- Can Story N.3 be completed using only Stories N.1 & N.2 outputs?
-- ❌ WRONG: "This story depends on a future story"
-- ❌ WRONG: Story references features not yet implemented
-- ✅ RIGHT: Each story builds only on previous stories
-
-### 6. Parallel Development Validation (병렬 개발 검증)
+### 5. Parallel Development Validation (병렬 개발 검증)
 
 **독립 실행 검증:**
 - 각 에픽이 다른 기능 에픽 없이 테스트 가능한가?
@@ -152,7 +122,7 @@ For each epic, review stories in order:
 - [ ] 머지 충돌 위험 영역 식별됨
 - [ ] 필요시 인터페이스로 분리됨
 
-### 7. Complete and Save
+### 6. Complete and Save
 
 If all validations pass:
 
@@ -163,8 +133,19 @@ If all validations pass:
 **Present Final Menu:**
 **All validations complete!** [C] Complete Workflow
 
-When C is selected, the workflow is complete and the epics.md is ready for development.
+When C is selected, the workflow is complete and the epics.md is ready.
+
+Epics creation complete. Read fully and follow: `_bmad/core/tasks/bmad-help.md` with argument `Create Epics`.
+
+Upon Completion of task output:
 
-Epics and Stories complete. Read fully and follow: `_bmad/core/tasks/bmad-help.md` with argument `Create Epics and Stories`.
+1. Inform the user: **"에픽 생성이 완료되었습니다. 개별 스토리는 SM 에이전트의 [CS] Create Story 명령을 사용하여 생성하세요."**
+2. Offer to answer any questions about the epics.
+
+---
 
-Upon Completion of task output: offer to answer any questions about the Epics and Stories.
+> **🛑 PHASE BOUNDARY - MANDATORY HALT**
+>
+> Solutioning 워크플로우가 완료되었습니다.
+> create-story, dev-story, sprint-planning 등 구현 워크플로우를 자동으로 시작하지 마세요.
+> 사용자가 명시적으로 다음 작업을 선택해야 합니다. HALT하고 사용자 입력을 기다리세요.

package/data/_bmad/bmm/workflows/3-solutioning/create-epics-and-stories/templates/epics-template.md

@@ -7,7 +7,7 @@ inputDocuments: []
 
 ## Overview
 
-This document provides the complete epic and story breakdown for {{project_name}}, decomposing the requirements from the PRD, UX Design if it exists, and Architecture requirements into implementable stories.
+This document provides the complete epic breakdown for {{project_name}}, organizing the requirements from the PRD, UX Design if it exists, and Architecture requirements into implementable epics.
 
 ## Requirements Inventory
 
@@ -37,21 +37,6 @@ This document provides the complete epic and story breakdown for {{project_name}
 
 {{epic_goal_N}}
 
-<!-- Repeat for each story (M = 1, 2, 3...) within epic N -->
+**FRs covered:** {{epic_fr_list_N}}
 
-### Story {{N}}.{{M}}: {{story_title_N_M}}
-
-As a {{user_type}},
-I want {{capability}},
-So that {{value_benefit}}.
-
-**Acceptance Criteria:**
-
-<!-- for each AC on this story -->
-
-**Given** {{precondition}}
-**When** {{action}}
-**Then** {{expected_outcome}}
-**And** {{additional_criteria}}
-
-<!-- End story repeat -->
+<!-- End epic repeat -->

package/data/_bmad/bmm/workflows/3-solutioning/create-epics-and-stories/workflow.md

@@ -1,12 +1,12 @@
 ---
 name: create-epics-and-stories
-description: 'Transform PRD requirements and Architecture decisions into comprehensive stories organized by user value. This workflow requires completed PRD + Architecture documents (UX recommended if UI exists) and breaks down requirements into implementation-ready epics and user stories that incorporate all available technical and design context. Creates detailed, actionable stories with complete acceptance criteria for development teams.'
+description: 'Transform PRD requirements and Architecture decisions into user-value-focused epics. This workflow requires completed PRD + Architecture documents (UX recommended if UI exists) and organizes requirements into implementable epics with clear goals and FR coverage. Individual stories are created separately using the SM agent CS workflow.'
 web_bundle: true
 ---
 
-# Create Epics and Stories
+# Create Epics
 
-**Goal:** Transform PRD requirements and Architecture decisions into comprehensive stories organized by user value, creating detailed, actionable stories with complete acceptance criteria for development teams.
+**Goal:** Transform PRD requirements and Architecture decisions into user-value-focused epics that organize all requirements into implementable units. Individual stories for each epic are created separately using the SM agent's CS (Create Story) command.
 
 **Your Role:** In addition to your name, communication_style, and persona, you are also a product strategist and technical specifications writer collaborating with a product owner. This is a partnership, not a client-vendor relationship. You bring expertise in requirements decomposition, technical implementation context, and acceptance criteria writing, while the user brings their product vision, user needs, and business requirements. Work together as equals.
 

package/data/_bmad/bmm/workflows/4-implementation/create-story/instructions.xml

@@ -403,14 +403,11 @@
       - Issue: #{{issue_number}} ({{issue_url}})
       - Branch: {{branch_name}}
 
-      **Next Steps:**
-      1. Review the comprehensive story in {{story_file}}
-      2. Run dev agents `dev-story` for optimized implementation
-      3. Run `code-review` when complete (auto-marks done)
-      4. Optional: If Test Architect module installed, run `/bmad:tea:automate` after `dev-story` to generate guardrail tests
-
       **The developer now has everything needed for flawless implementation!**
     </output>
+
+    <critical>🛑 PHASE BOUNDARY: create-story 워크플로우가 완료되었습니다. dev-story, code-review 등 다른 워크플로우를 자동으로 실행하지 마세요. 사용자의 다음 지시를 기다리세요.</critical>
+    <action>HALT - Workflow complete. Await user's next instruction.</action>
   </step>
 
 </workflow>

package/data/_bmad/bmm/workflows/4-implementation/dev-story/instructions.xml

@@ -1,4 +1,5 @@
 <workflow>
+  <critical>🛑 USER INVOCATION REQUIRED: dev-story는 사용자가 에이전트 메뉴 또는 직접 명령으로 명시적으로 호출해야 합니다. create-story, create-epics-and-stories 등 다른 워크플로우에서 자동 체이닝으로 도달한 경우 즉시 중단하고 사용자에게 제어를 반환하세요.</critical>
   <critical>The workflow execution engine is governed by: {project-root}/_bmad/core/tasks/workflow.xml</critical>
   <critical>You MUST have already loaded and processed: {installed_path}/workflow.yaml</critical>
   <critical>Communicate all responses in {communication_language} and language MUST be tailored to {user_skill_level}</critical>

package/data/_bmad/bmm/workflows/4-implementation/retrospective/workflow.yaml

@@ -36,7 +36,7 @@ input_file_patterns:
     load_strategy: "SELECTIVE_LOAD"
   previous_retrospective:
     description: "Previous epic's retrospective (optional)"
-    pattern: "{implementation_artifacts}/**/epic-{{prev_epic_num}}-retro-*.md"
+    pattern: "{retrospectives_folder}/epic-{{prev_epic_num}}-retro-*.md"
     load_strategy: "SELECTIVE_LOAD"
   architecture:
     description: "System architecture for context"
@@ -58,6 +58,6 @@ input_file_patterns:
 # Required files
 sprint_status_file: "{implementation_artifacts}/sprint-status.yaml"
 story_directory: "{stories_artifacts}"
-retrospectives_folder: "{implementation_artifacts}"
+retrospectives_folder: "{implementation_artifacts}/retrospectives"
 
 standalone: true

package/data/_bmad/core/tasks/workflow.xml

@@ -105,8 +105,8 @@
 
   <execution-modes>
     <mode name="normal">Full user interaction and confirmation of EVERY step at EVERY template output - NO EXCEPTIONS except yolo MODE</mode>
-    <mode name="yolo">Skip all confirmations and elicitation, minimize prompts and try to produce all of the workflow automatically by
-      simulating the remaining discussions with an simulated expert user</mode>
+    <mode name="yolo">Skip all confirmations and elicitation WITHIN THE CURRENT WORKFLOW ONLY, minimize prompts and try to produce all of the workflow automatically by
+      simulating the remaining discussions with a simulated expert user. YOLO mode NEVER carries across workflow boundaries -- when the current workflow completes, YOLO mode ends and the agent MUST HALT and wait for the user to explicitly choose the next action.</mode>
   </execution-modes>
 
   <supported-tags desc="Instructions can use these tags">

package/data/_bmad/hooks/post-merge

@@ -0,0 +1,38 @@
+#!/bin/bash
+# BMad6GitHub - Post-merge Hook
+# 원격에서 삭제된 브랜치의 로컬 사본을 자동 정리
+
+# 원격 추적 정보 갱신 (삭제된 원격 브랜치 반영)
+git fetch --prune --quiet 2>/dev/null
+
+# [gone] 상태인 로컬 브랜치 추출
+gone_branches=$(git branch -vv | grep '\[.*: gone\]' | awk '{print $1}')
+
+if [ -z "$gone_branches" ]; then
+    exit 0
+fi
+
+echo ""
+echo "=========================================="
+echo "  로컬 브랜치 자동 정리"
+echo "=========================================="
+echo ""
+
+deleted=0
+skipped=0
+
+for branch in $gone_branches; do
+    if git branch -d "$branch" 2>/dev/null; then
+        echo "  삭제: $branch"
+        deleted=$((deleted + 1))
+    else
+        echo "  건너뜀 (머지되지 않음): $branch"
+        skipped=$((skipped + 1))
+    fi
+done
+
+echo ""
+echo "  결과: ${deleted}개 삭제, ${skipped}개 건너뜀"
+echo ""
+
+exit 0

package/data/_bmad/hooks/pre-push

@@ -1,9 +1,83 @@
 #!/bin/bash
 # BMad6GitHub - Pre-push Hook
-# 1. master/main 브랜치로 직접 푸시 방지
-# 2. 태그 푸시 시 CHANGELOG.md 업데이트 여부 검증
+# 1. 로컬 기본 브랜치(master/main) 자동 동기화
+# 2. master/main 브랜치로 직접 푸시 방지
+# 3. 태그 푸시 시 CHANGELOG.md 업데이트 여부 검증
 
-# 푸시 대상 분석
+# --- 로컬 기본 브랜치 자동 동기화 ---
+_sync_default_branch() {
+    # 기본 브랜치 감지
+    local default_branch=""
+    if git show-ref --verify --quiet refs/heads/master; then
+        default_branch="master"
+    elif git show-ref --verify --quiet refs/heads/main; then
+        default_branch="main"
+    fi
+
+    if [ -z "$default_branch" ]; then
+        return
+    fi
+
+    # origin 최신 정보 fetch
+    git fetch origin "$default_branch" --quiet 2>/dev/null || return
+
+    # 로컬과 origin 비교
+    local local_sha remote_sha
+    local_sha=$(git rev-parse "refs/heads/$default_branch" 2>/dev/null)
+    remote_sha=$(git rev-parse "refs/remotes/origin/$default_branch" 2>/dev/null)
+
+    if [ "$local_sha" = "$remote_sha" ]; then
+        return
+    fi
+
+    local behind
+    behind=$(git rev-list --count "$default_branch..origin/$default_branch" 2>/dev/null)
+
+    if [ "$behind" -eq 0 ] 2>/dev/null; then
+        return
+    fi
+
+    echo ""
+    echo "=========================================="
+    echo "  로컬 $default_branch 브랜치 자동 동기화"
+    echo "=========================================="
+    echo ""
+    echo "  로컬 $default_branch가 origin/$default_branch보다 ${behind}커밋 뒤처져 있습니다."
+
+    # fast-forward 가능 여부 확인
+    if git merge-base --is-ancestor "$default_branch" "origin/$default_branch"; then
+        local current_branch
+        current_branch=$(git symbolic-ref --short HEAD 2>/dev/null)
+
+        if [ "$current_branch" != "$default_branch" ]; then
+            # 현재 브랜치가 기본 브랜치가 아니면 fetch로 직접 업데이트
+            git fetch origin "$default_branch:$default_branch" --quiet 2>/dev/null
+        else
+            # 현재 브랜치가 기본 브랜치면 pull
+            git pull origin "$default_branch" --ff-only --quiet 2>/dev/null
+        fi
+        echo "  -> fast-forward 자동 업데이트 완료!"
+
+        # 피처 브랜치에서 작업 중이면 merge 안내
+        if [ -n "$current_branch" ] && [ "$current_branch" != "$default_branch" ]; then
+            local branch_behind
+            branch_behind=$(git rev-list --count "$current_branch..${default_branch}" 2>/dev/null)
+            if [ "$branch_behind" -gt 0 ] 2>/dev/null; then
+                echo ""
+                echo "  현재 브랜치($current_branch)에 최신 $default_branch 반영이 필요합니다:"
+                echo "    git merge $default_branch"
+            fi
+        fi
+    else
+        echo "  -> fast-forward 불가 (로컬 $default_branch에 독립 커밋 존재)"
+        echo "  -> 수동으로 해결해 주세요: git checkout $default_branch && git pull"
+    fi
+    echo ""
+}
+
+_sync_default_branch
+
+# --- 푸시 대상 분석 ---
 while read local_ref local_sha remote_ref remote_sha; do
     # master/main 직접 푸시 차단
     if echo "$remote_ref" | grep -qE "refs/heads/(master|main)$"; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sleighmaster/bmad",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "BMad6GitHub CLI - BMAD + GitHub Integration installer",
   "type": "module",
   "bin": {