@atlashub/smartstack-cli 3.36.0 → 3.38.0

package/templates/skills/gitflow/references/init-environment-detection.md

@@ -0,0 +1,41 @@
+# Environment Detection
+
+## Platform and Git Detection
+
+```bash
+# PLATFORM DETECTION (required for correct path handling on WSL/Windows/macOS/Linux)
+if [ -f /proc/version ] && grep -qi "microsoft\|wsl" /proc/version 2>/dev/null; then
+  GF_PLATFORM="wsl"; GF_SHELL="bash"
+elif [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "mingw"* ]] || [[ "$OSTYPE" == "cygwin" ]]; then
+  GF_PLATFORM="windows"; GF_SHELL="gitbash"
+elif [[ -n "$WINDIR" ]] || [[ -n "$SystemRoot" ]]; then
+  GF_PLATFORM="windows"; GF_SHELL="powershell"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  GF_PLATFORM="macos"; GF_SHELL="zsh"
+elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+  GF_PLATFORM="linux"; GF_SHELL="bash"
+else
+  GF_PLATFORM="unknown"; GF_SHELL="bash"
+fi
+echo "Platform: $GF_PLATFORM ($GF_SHELL)"
+
+# Check if we're in a git repository
+IS_GIT_REPO=$(git rev-parse --git-dir 2>/dev/null && echo "true" || echo "false")
+
+# Auto-detect values for defaults (will be confirmed by user)
+DETECTED_URL=$(git remote get-url origin 2>/dev/null || echo "")
+DETECTED_FOLDER=$(dirname "$(pwd)")
+DETECTED_NAME=$(basename -s .git "$DETECTED_URL" 2>/dev/null || basename "$(pwd)")
+
+# Detect git provider
+if [[ "$DETECTED_URL" == *"github.com"* ]]; then
+  GIT_PROVIDER="github"
+elif [[ "$DETECTED_URL" == *"dev.azure.com"* ]]; then
+  GIT_PROVIDER="azuredevops"
+else
+  GIT_PROVIDER="unknown"
+fi
+
+# Check if already initialized
+ALREADY_INITIALIZED=$([ -f ".claude/gitflow/config.json" ] && echo "true" || echo "false")
+```

package/templates/skills/gitflow/references/init-questions.md

@@ -0,0 +1,185 @@
+# MANDATORY User Questions for Init
+
+All questions must be asked in order. See step-init.md for context on when each is asked.
+
+## Question 1: Repository URL
+
+**⛔ ALWAYS ask, even if URL was detected:**
+
+```yaml
+AskUserQuestion:
+  - header: "Repository"
+    question: "Repository URL? (detected: {DETECTED_URL})"
+    options:
+      - label: "Use detected URL (Recommended)"
+        description: "{DETECTED_URL}"
+      - label: "Enter GitHub URL"
+        description: "https://github.com/org/repo.git"
+      - label: "Enter Azure DevOps URL"
+        description: "https://dev.azure.com/org/project/_git/repo"
+      - label: "Local only (no remote)"
+        description: "Initialize without remote (limited features)"
+    multiSelect: false
+```
+
+**⛔ FOLLOW-UP: If user selects "Enter GitHub URL" or "Enter Azure DevOps URL":**
+
+The selected option is just a choice, NOT the actual URL. You MUST ask a follow-up question:
+
+```yaml
+AskUserQuestion:
+  - header: "URL"
+    question: "Enter the repository URL:"
+    options:
+      - label: "https://github.com/org/repo.git"
+        description: "Example GitHub format"
+      - label: "https://dev.azure.com/org/project/_git/repo"
+        description: "Example Azure DevOps format"
+    multiSelect: false
+```
+
+The user will type the actual URL via "Other". Then:
+- Validate format
+- Update `{REPO_URL}` and `{GIT_PROVIDER}`
+
+## Question 2: Root Folder
+
+**⛔ ALWAYS ask where to create THIS project's structure:**
+
+**If sibling projects exist, show where it fits:**
+
+```
+{WORKSPACE_DIR}/
+├── SmartStack.app/    ✅ (gitflow)
+├── SmartStack.mcp/    ✅ (gitflow)
+├── SmartStack.cli/    ✅ (gitflow)
+└── NewProject/        ← THIS PROJECT
+    ├── .bare/
+    ├── 01-Main/
+    ├── 02-Develop/
+    ├── features/
+    ├── releases/
+    └── hotfixes/
+```
+
+```yaml
+AskUserQuestion:
+  - header: "Location"
+    question: "Root folder for THIS project? (worktrees will be created here)"
+    options:
+      - label: "Use parent folder (Recommended)"
+        description: "{DETECTED_FOLDER}/ - consistent with {#SIBLING_PROJECTS} sibling project(s)"
+      - label: "Use current folder"
+        description: "$(pwd)/ - Will create subfolders here"
+      - label: "Custom path"
+        description: "Specify a different location"
+    multiSelect: false
+```
+
+**⛔ FOLLOW-UP: If user selects "Custom path":**
+
+You MUST ask a follow-up question to get the actual path:
+
+```yaml
+AskUserQuestion:
+  - header: "Path"
+    question: "Enter the full path for the project root folder:"
+    options:
+      - label: "{DETECTED_FOLDER}/"
+        description: "Parent of current directory"
+      - label: "{WORKSPACE_DIR}/"
+        description: "Workspace root"
+    multiSelect: false
+```
+
+The user will type the actual path via "Other". Validate the path exists or can be created.
+
+**Explain the structure that will be created for this project:**
+
+```
+{ROOT_FOLDER}/
+├── .bare/                 # Git bare repository (this repo only)
+├── 01-Main/               # Worktree: main branch
+├── 02-Develop/            # Worktree: develop branch
+├── features/              # Feature branch worktrees
+├── releases/              # Release branch worktrees
+└── hotfixes/              # Hotfix branch worktrees
+```
+
+## Question 3: Project Name
+
+**⛔ ALWAYS ask to confirm project name:**
+
+```yaml
+AskUserQuestion:
+  - header: "Project"
+    question: "Project name? (detected: {DETECTED_NAME})"
+    options:
+      - label: "Use detected name (Recommended)"
+        description: "Project: {DETECTED_NAME}"
+      - label: "Custom name"
+        description: "Specify a different project name"
+    multiSelect: false
+```
+
+**⛔ FOLLOW-UP: If user selects "Custom name":**
+
+You MUST ask a follow-up question to get the actual name:
+
+```yaml
+AskUserQuestion:
+  - header: "Name"
+    question: "Enter the project name:"
+    options:
+      - label: "{DETECTED_NAME}"
+        description: "Detected from repository"
+      - label: "{DETECTED_NAME}-v2"
+        description: "Variant of detected name"
+    multiSelect: false
+```
+
+The user will type the actual name via "Other". Use this raw input for step 6b (normalization).
+
+## Question 4: Existing Configuration
+
+**If `ALREADY_INITIALIZED` = true:**
+
+Display current configuration and ask what to do:
+
+```yaml
+AskUserQuestion:
+  - header: "Existing"
+    question: "GitFlow is already initialized. Current config will be shown. What do you want to do?"
+    options:
+      - label: "Reconfigure (Recommended)"
+        description: "Review and update all settings"
+      - label: "Repair"
+        description: "Fix missing directories only"
+      - label: "View only"
+        description: "Display current config and exit"
+      - label: "Cancel"
+        description: "Exit without changes"
+    multiSelect: false
+```
+
+**Handle choices:**
+- **Reconfigure**: Continue to step 4 (will ask all questions again)
+- **Repair**: Check directories, fix missing ones, exit
+- **View only**: Display config, exit
+- **Cancel**: Exit immediately
+
+## Question 5: Worktree Mode
+
+```yaml
+AskUserQuestion:
+  - header: "Worktrees"
+    question: "How should worktrees be organized?"
+    options:
+      - label: "Organized (Recommended)"
+        description: "01-Main, 02-Develop, features/, releases/, hotfixes/"
+      - label: "Simple"
+        description: "main/, develop/, features/, releases/, hotfixes/"
+      - label: "Disabled"
+        description: "No worktrees, use git checkout (not recommended)"
+    multiSelect: false
+```

package/templates/skills/gitflow/references/init-structure-creation.md

@@ -0,0 +1,71 @@
+# Directory Structure Creation
+
+## Path Normalization for WSL
+
+```bash
+# If on WSL, translate Windows paths to /mnt/ format
+# normalize_path_for_platform() from _shared.md handles this
+# Example: D:/projects/MyApp → /mnt/d/projects/MyApp
+PROJECT_BASE="{ROOT_FOLDER}"  # Must be already normalized for current platform
+```
+
+## Create Complete Structure
+
+**⛔ CRITICAL: Use ABSOLUTE PATHS for ALL operations. NEVER use `cd` (it does not persist between Bash calls).**
+**⛔ Use `git -C <path>` or `GIT_DIR=<path>` instead of `cd` + `git`.**
+
+```bash
+PROJECT_BASE="{ROOT_FOLDER}"
+
+# Create subdirectories (absolute paths)
+mkdir -p "$PROJECT_BASE/features" "$PROJECT_BASE/releases" "$PROJECT_BASE/hotfixes"
+
+# Create bare repository if not exists (absolute path, no cd)
+if [ ! -d "$PROJECT_BASE/.bare" ]; then
+  git clone --bare "{REPO_URL}" "$PROJECT_BASE/.bare"
+
+  # Configure bare repo for worktrees (using git -C, no cd)
+  git -C "$PROJECT_BASE/.bare" config core.bare false
+  git -C "$PROJECT_BASE/.bare" config core.worktree ..
+fi
+
+# Create .git pseudo-file pointing to .bare
+echo "gitdir: ./.bare" > "$PROJECT_BASE/.git"
+
+# Organized mode: numbered main folders (absolute paths, GIT_DIR instead of cd)
+if [ "$WORKTREE_MODE" = "organized" ]; then
+  [ ! -d "$PROJECT_BASE/01-Main" ] && \
+    GIT_DIR="$PROJECT_BASE/.bare" git worktree add "$PROJECT_BASE/01-Main" main
+
+  [ ! -d "$PROJECT_BASE/02-Develop" ] && \
+    GIT_DIR="$PROJECT_BASE/.bare" git worktree add "$PROJECT_BASE/02-Develop" develop
+fi
+
+# Simple mode: named folders (absolute paths)
+if [ "$WORKTREE_MODE" = "simple" ]; then
+  [ ! -d "$PROJECT_BASE/main" ] && \
+    GIT_DIR="$PROJECT_BASE/.bare" git worktree add "$PROJECT_BASE/main" main
+
+  [ ! -d "$PROJECT_BASE/develop" ] && \
+    GIT_DIR="$PROJECT_BASE/.bare" git worktree add "$PROJECT_BASE/develop" develop
+fi
+
+# Create gitflow config directory (absolute paths)
+DEVELOP_DIR=$([ "$WORKTREE_MODE" = "organized" ] && echo "02-Develop" || echo "develop")
+mkdir -p "$PROJECT_BASE/$DEVELOP_DIR/.claude/gitflow/plans"
+mkdir -p "$PROJECT_BASE/$DEVELOP_DIR/.claude/gitflow/logs"
+mkdir -p "$PROJECT_BASE/$DEVELOP_DIR/.claude/gitflow/cache"
+mkdir -p "$PROJECT_BASE/$DEVELOP_DIR/.claude/gitflow/backup"
+```
+
+## Folder Structure to Create
+
+```
+{ROOT_FOLDER}/
+├── .bare/                 # Git bare repository (this repo only)
+├── 01-Main/               # Worktree: main branch
+├── 02-Develop/            # Worktree: develop branch
+├── features/              # Feature branch worktrees
+├── releases/              # Release branch worktrees
+└── hotfixes/              # Hotfix branch worktrees
+```

package/templates/skills/gitflow/references/init-version-detection.md

@@ -0,0 +1,21 @@
+# Version Detection
+
+## Detect Version (with Priority)
+
+**⛔ Use absolute paths with `git -C`, no `cd`.**
+
+```bash
+DEVELOP_FULL_PATH="$PROJECT_BASE/$DEVELOP_DIR"
+
+# Priority: csproj > Directory.Build.props > package.json > VERSION > tag
+VERSION=$(grep -oP '<Version>\K[^<]+' "$DEVELOP_FULL_PATH"/*.csproj 2>/dev/null | head -1)
+[ -z "$VERSION" ] && VERSION=$(grep -oP '<Version>\K[^<]+' "$DEVELOP_FULL_PATH/Directory.Build.props" 2>/dev/null)
+[ -z "$VERSION" ] && VERSION=$(grep -oP '"version":\s*"\K[^"]+' "$DEVELOP_FULL_PATH/package.json" 2>/dev/null)
+[ -z "$VERSION" ] && VERSION=$(cat "$DEVELOP_FULL_PATH/VERSION" 2>/dev/null)
+[ -z "$VERSION" ] && VERSION=$(git -C "$DEVELOP_FULL_PATH" describe --tags --abbrev=0 2>/dev/null | sed 's/^v//')
+[ -z "$VERSION" ] && VERSION="0.1.0"
+```
+
+## Version will be stored in config.json
+
+The detected version is used in the GitFlow config template under `versioning.current`.

package/templates/skills/gitflow/references/init-workspace-detection.md

@@ -0,0 +1,43 @@
+# Workspace Detection
+
+## Scan for Sibling Projects
+
+```bash
+WORKSPACE_DIR=$(dirname "$(pwd)")
+SIBLING_PROJECTS=()
+
+for dir in "$WORKSPACE_DIR"/*/; do
+  [ -d "$dir/.bare" ] || [ -d "$dir/01-Main" ] || [ -d "$dir/02-Develop" ] && {
+    PROJECT_NAME_SIBLING=$(basename "$dir")
+    SIBLING_PROJECTS+=("$PROJECT_NAME_SIBLING")
+  }
+done
+```
+
+## Display Workspace Context
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│  WORKSPACE: {WORKSPACE_DIR}                                  │
+├─────────────────────────────────────────────────────────────┤
+│  Each project has its OWN independent GitFlow configuration. │
+│  This init configures only: {DETECTED_NAME}                  │
+├─────────────────────────────────────────────────────────────┤
+{if SIBLING_PROJECTS not empty}
+│  Existing GitFlow projects:                                  │
+│  {for each SIBLING} ✅ {SIBLING_NAME}/                       │
+│     ├── .bare/  01-Main/  02-Develop/                        │
+│     └── features/  releases/  hotfixes/                      │
+│  {end for}                                                   │
+│                                                              │
+│  New project to initialize:                                  │
+│  ⬜ {DETECTED_NAME}/                                         │
+│     └── (same structure will be created)                     │
+{else}
+│  No existing GitFlow projects detected.                      │
+│  This will be the first project in this workspace.           │
+{endif}
+└─────────────────────────────────────────────────────────────┘
+```
+
+**Key principle:** GitFlow is **per-repository**. Each project has its own `config.json`, its own worktree structure, and its own version history. Projects do not share configuration.

package/templates/skills/gitflow/references/merge-ci-status.md

@@ -0,0 +1,36 @@
+# Check CI and Review Status
+
+## Check CI Status (GitHub)
+
+```bash
+if [ "$GIT_PROVIDER" = "github" ]; then
+  CI_STATUS=$(gh pr checks $PR_NUMBER --json state --jq '.[].state' | sort -u)
+
+  [[ "$CI_STATUS" == *"FAILURE"* ]] && {
+    echo "❌ CI checks failing"
+    gh pr checks $PR_NUMBER
+
+    if [ "$auto_mode" != true ]; then
+      AskUserQuestion:
+        header: "CI"
+        question: "CI checks are failing. Continue anyway?"
+        options:
+          - label: "Wait for fix"
+          - label: "Merge anyway (not recommended)"
+    fi
+  }
+fi
+```
+
+## Check Review Status (GitHub)
+
+```bash
+if [ "$GIT_PROVIDER" = "github" ]; then
+  REVIEWS=$(gh pr view $PR_NUMBER --json reviews --jq '.reviews | map(select(.state == "APPROVED")) | length')
+  REQUIRED_REVIEWS=$(gh api repos/:owner/:repo --jq '.default_branch_protection.required_pull_request_reviews.required_approving_review_count // 0')
+
+  [ "$REVIEWS" -lt "$REQUIRED_REVIEWS" ] && {
+    echo "⚠️ Needs $REQUIRED_REVIEWS approvals, has $REVIEWS"
+  }
+fi
+```

package/templates/skills/gitflow/references/merge-execution.md

@@ -0,0 +1,62 @@
+# Merge Execution and Verification
+
+## Determine Merge Strategy
+
+```bash
+BRANCH_TYPE=$(echo $CURRENT | cut -d'/' -f1)
+
+case "$BRANCH_TYPE" in
+  feature)
+    MERGE_STRATEGY="squash"
+    DELETE_BRANCH=true
+    ;;
+  release|hotfix)
+    MERGE_STRATEGY="merge"
+    DELETE_BRANCH=true
+    MERGE_BACK="$GF_DEVELOP_BRANCH"
+    ;;
+esac
+```
+
+## Execute Merge
+
+**GitHub:**
+```bash
+case "$MERGE_STRATEGY" in
+  squash)
+    gh pr merge $PR_NUMBER --squash --delete-branch
+    ;;
+  merge)
+    gh pr merge $PR_NUMBER --merge --delete-branch
+    ;;
+esac
+```
+
+**Azure DevOps:**
+```bash
+case "$MERGE_STRATEGY" in
+  squash)
+    az repos pr update --id $PR_NUMBER --status completed --squash true --delete-source-branch true
+    ;;
+  merge)
+    az repos pr update --id $PR_NUMBER --status completed --squash false --delete-source-branch true
+    ;;
+esac
+```
+
+## Verify Merge
+
+```bash
+# CRITICAL: Force update tracking refs to get accurate state
+git fetch origin $TARGET_BRANCH:refs/remotes/origin/$TARGET_BRANCH --force --quiet
+git fetch origin --prune --quiet
+
+MERGED=$(git branch -r --merged origin/$TARGET_BRANCH | grep "$CURRENT" | wc -l)
+
+[ "$MERGED" -eq 0 ] && {
+  echo "⚠️ Merge verification failed - branch may not be merged"
+  echo "  → Check PR status on remote"
+} || {
+  echo "✅ Merge verified - branch merged to $TARGET_BRANCH"
+}
+```

package/templates/skills/gitflow/references/merge-pr-context.md

@@ -0,0 +1,76 @@
+# Load PR Context and Load Review Checklist
+
+## Load Config and PR Context
+
+```bash
+# Load GitFlow config (sets GF_* variables)
+read_gitflow_config || { echo "❌ Run /gitflow init first."; exit 1; }
+
+CURRENT=$(git rev-parse --abbrev-ref HEAD)
+GIT_PROVIDER="$GF_PROVIDER"
+
+# Try loading persisted PR state first
+CONFIG_DIR=$(dirname "$GF_CONFIG_FILE")
+PR_STATE_FILE="$CONFIG_DIR/cache/pr-state.json"
+if [ -f "$PR_STATE_FILE" ]; then
+  PR_NUMBER=$(grep -oP '"pr_number":\s*"\K[^"]+' "$PR_STATE_FILE" | head -1)
+  TARGET_BRANCH=$(grep -oP '"target_branch":\s*"\K[^"]+' "$PR_STATE_FILE" | head -1)
+  echo "✓ Loaded PR state from cache: PR #$PR_NUMBER → $TARGET_BRANCH"
+fi
+
+# Fallback: query provider if no cached state
+if [ -z "$PR_NUMBER" ]; then
+  if [ "$GIT_PROVIDER" = "github" ]; then
+    PR_NUMBER=$(gh pr list --head "$CURRENT" --json number --jq '.[0].number')
+    PR_STATUS=$(gh pr view $PR_NUMBER --json state,mergeable,reviews --jq '.')
+  elif [ "$GIT_PROVIDER" = "azuredevops" ]; then
+    PR_NUMBER=$(az repos pr list --source-branch "$CURRENT" --query "[0].pullRequestId" -o tsv)
+    PR_STATUS=$(az repos pr show --id $PR_NUMBER --query "{status:status,mergeStatus:mergeStatus}")
+  fi
+fi
+
+[ -z "$PR_NUMBER" ] && {
+  echo "❌ No PR found for branch $CURRENT"
+  echo "→ Run /gitflow pr first"
+  STOP
+}
+```
+
+## Display Review Checklist
+
+```
+╔══════════════════════════════════════════════════════════════════╗
+║                    PR REVIEW CHECKLIST                            ║
+╠══════════════════════════════════════════════════════════════════╣
+║  PR #${PR_NUMBER}: ${PR_TITLE}                                    ║
+╠══════════════════════════════════════════════════════════════════╣
+
+## Code Quality
+- [ ] Code follows project conventions
+- [ ] No unnecessary complexity
+- [ ] No code duplication
+- [ ] Variable/function names are clear
+
+## Security
+- [ ] No hardcoded secrets
+- [ ] Input validation present
+- [ ] Authentication/authorization correct
+- [ ] No SQL injection risks
+
+## Testing
+- [ ] Unit tests added/updated
+- [ ] Integration tests pass
+- [ ] Manual testing completed
+
+## EF Core (if applicable)
+- [ ] Migration files complete (3 files)
+- [ ] No destructive operations (or confirmed)
+- [ ] Snapshot synced with base
+
+## Documentation
+- [ ] Code comments where needed
+- [ ] API docs updated (if applicable)
+- [ ] README updated (if applicable)
+
+╚══════════════════════════════════════════════════════════════════╝
+```

package/templates/skills/gitflow/references/pr-build-checks.md

@@ -0,0 +1,60 @@
+# Pre-PR Build Checks
+
+## Multi-Runtime Detection
+
+```bash
+# Build check (multi-runtime detection)
+echo "Running build check..."
+if [ -f "*.sln" ] || ls *.csproj 2>/dev/null | head -1 > /dev/null; then
+  dotnet build --no-restore 2>&1 || {
+    echo "❌ .NET build failed. Fix before creating PR."
+    STOP
+  }
+  # Migration check
+  echo "Checking migrations..."
+  dotnet ef migrations list 2>&1 || echo "No migrations or EF Core not configured"
+elif [ -f "package.json" ]; then
+  npm run build 2>&1 || {
+    echo "❌ npm build failed. Fix before creating PR."
+    STOP
+  }
+elif [ -f "requirements.txt" ] || [ -f "pyproject.toml" ]; then
+  echo "Python project detected — skipping build check"
+else
+  echo "⚠️ No known build system detected — skipping build check"
+fi
+```
+
+## Enforce Migration Squash (Feature Branches)
+
+**BLOCKING**: Feature branches must have at most 1 migration before creating a PR.
+
+```bash
+if [ "$BRANCH_TYPE" = "feature" ]; then
+  MIGRATION_DIR=$(find . -path "*/Persistence/Migrations" -type d 2>/dev/null | head -1)
+  if [ -n "$MIGRATION_DIR" ]; then
+    # Count migration .cs files added by this feature (not in target branch)
+    NEW_MIGRATIONS=$(git diff --name-only "origin/$TARGET_BRANCH...HEAD" -- "$MIGRATION_DIR" \
+      | grep -E '\.cs$' \
+      | grep -v 'Designer\|ModelSnapshot' \
+      | wc -l)
+
+    if [ "$NEW_MIGRATIONS" -gt 1 ]; then
+      echo ""
+      echo "❌ MULTIPLE MIGRATIONS DETECTED ($NEW_MIGRATIONS migrations)"
+      echo "→ Feature branches must have exactly 1 migration (squashed) before PR"
+      echo "→ Run: /efcore squash"
+      echo ""
+      echo "Migrations found:"
+      git diff --name-only "origin/$TARGET_BRANCH...HEAD" -- "$MIGRATION_DIR" \
+        | grep -E '\.cs$' \
+        | grep -v 'Designer\|ModelSnapshot'
+      STOP
+    elif [ "$NEW_MIGRATIONS" -eq 1 ]; then
+      echo "✓ Single migration detected (squashed)"
+    else
+      echo "✓ No migrations in this feature"
+    fi
+  fi
+fi
+```

package/templates/skills/gitflow/references/pr-generation.md

@@ -0,0 +1,58 @@
+# Pull Request Content Generation
+
+## Generate PR Title
+
+```bash
+BRANCH_NAME=$(echo $CURRENT | sed 's/.*\///')
+BRANCH_TYPE=$(echo $CURRENT | cut -d'/' -f1)
+
+case "$BRANCH_TYPE" in
+  feature) TITLE="feat: $BRANCH_NAME" ;;
+  hotfix)  TITLE="fix: $BRANCH_NAME" ;;
+  release) TITLE="release: v$GF_VERSION" ;;
+esac
+```
+
+## Generate PR Body
+
+```markdown
+## Summary
+
+{Auto-generated from commit messages}
+
+## Changes
+
+{List of files changed with categories}
+
+## Testing
+
+- [ ] Build passes
+- [ ] Unit tests pass
+- [ ] Manual testing completed
+
+## EF Core Migrations
+
+{Migration status: None | Added | Modified}
+
+---
+
+🤖 Generated with [Claude Code](https://claude.ai/code)
+```
+
+## Persist PR Info for Merge Step
+
+```bash
+# Persist PR info for merge step (uses config path for portability)
+CONFIG_DIR=$(dirname "$GF_CONFIG_FILE")
+cat > "$CONFIG_DIR/cache/pr-state.json" << EOF
+{
+  "pr_number": "$PR_NUMBER",
+  "pr_url": "$PR_URL",
+  "source_branch": "$CURRENT",
+  "target_branch": "$TARGET_BRANCH",
+  "git_provider": "$GIT_PROVIDER",
+  "created_at": "$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+}
+EOF
+echo "✓ PR state saved to $CONFIG_DIR/cache/pr-state.json"
+```

package/templates/skills/gitflow/references/start-branch-normalization.md

@@ -0,0 +1,28 @@
+# Branch Name Normalization and Validation
+
+## Normalize Branch Name
+
+```bash
+normalize_branch_name() {
+  echo "$1" | tr '[:upper:]' '[:lower:]' | \
+    sed 'y/àâäéèêëïîôùûüçœæ/aaaeeeeiioouucoa/' | \
+    sed "s/[ _']/-/g" | sed 's/[^a-z0-9-]//g' | \
+    sed 's/--*/-/g' | sed 's/^-//;s/-$//' | cut -c1-50
+}
+
+BRANCH_NAME=$(normalize_branch_name "$branch_name")
+FULL_BRANCH="${branch_type}/${BRANCH_NAME}"
+```
+
+## Check if Branch Already Exists
+
+```bash
+# Check if exists
+LOCAL_EXISTS=$(git branch --list "$FULL_BRANCH")
+REMOTE_EXISTS=$(git branch -r --list "origin/$FULL_BRANCH")
+
+[ -n "$LOCAL_EXISTS" ] || [ -n "$REMOTE_EXISTS" ] && {
+  echo "ERROR: Branch '$FULL_BRANCH' already exists"
+  # Options: Different name | Checkout existing | Delete and recreate
+}
+```