@atlashub/smartstack-cli 3.36.0 → 3.38.0

package/templates/skills/gitflow/steps/step-init.md

@@ -35,253 +35,26 @@ Set up GitFlow configuration with bare repository, worktrees, and branches.
 
 ### 1. Detect Environment (for defaults only)
 
-```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")
-```
+See [references/init-environment-detection.md](../references/init-environment-detection.md) for:
+- Platform detection (WSL/Windows/macOS/Linux)
+- Git provider detection
+- Auto-detect defaults (URL, folder, project name)
 
 ### 2. Detect Workspace (multi-project context)
 
-**Scan the parent directory for sibling projects already using GitFlow:**
-
-```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:**
+See [references/init-workspace-detection.md](../references/init-workspace-detection.md) for:
+- Sibling project scanning
+- Workspace context display
+- Per-repository GitFlow principle
 
-```
-┌─────────────────────────────────────────────────────────────┐
-│  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.
-
-### 3. Handle 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
-
-### 4. MANDATORY: Ask 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
-```
+### 3-7. MANDATORY User Questions
 
-**⛔ 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}`
-
-### 5. MANDATORY: Ask 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
-```
-
-### 6. MANDATORY: Ask 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.
+See [references/init-questions.md](../references/init-questions.md) for all 5 mandatory questions in order:
+1. Handle existing configuration (if already initialized)
+2. Repository URL with provider detection
+3. Root folder for project structure
+4. Project name confirmation
+5. Worktree mode (organized/simple/disabled)
 
 ### 6b. Normalize Project Name (INTELLIGENT)
 
@@ -294,80 +67,15 @@ See [references/init-name-normalization.md](../references/init-name-normalizatio
 4. Ask user to choose PRIMARY format
 5. Store all derived names in `PROJECT_VARIANTS`
 
-### 7. Ask 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
-```
 
 ### 8. Create Directory 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`.**
-
-**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 the COMPLETE structure with absolute paths:**
-
-```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"
-```
+See [references/init-structure-creation.md](../references/init-structure-creation.md) for:
+- Path normalization for WSL
+- Complete directory structure creation with absolute paths
+- Bare repository setup
+- Worktree creation (organized and simple modes)
+- GitFlow config directory creation
 
 ### 9. Create Configuration
 
@@ -381,19 +89,9 @@ See [references/init-config-template.md](../references/init-config-template.md)
 
 ### 10. Detect Version
 
-**⛔ 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"
-```
+See [references/init-version-detection.md](../references/init-version-detection.md) for:
+- Version detection with priority (csproj, package.json, tags, etc.)
+- Platform-agnostic path handling
 
 ### 10b. Post-Init Validation
 

package/templates/skills/gitflow/steps/step-merge.md

@@ -16,189 +16,30 @@ Run through review checklist and merge the pull request with appropriate strateg
 
 ## EXECUTION SEQUENCE:
 
-### 1. 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
-}
-```
-
-### 2. Display Review Checklist
-
-```
-╔══════════════════════════════════════════════════════════════════╗
-║                    PR REVIEW CHECKLIST                            ║
-╠══════════════════════════════════════════════════════════════════╣
-║  PR #${PR_NUMBER}: ${PR_TITLE}                                    ║
-╠══════════════════════════════════════════════════════════════════╣
+### 1-2. Load Config and Display Review Checklist
 
-## 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)
+See [references/merge-pr-context.md](../references/merge-pr-context.md) for:
+- Load GitFlow config and PR context
+- Load PR state from cache or query provider
+- Display review checklist
 
-╚══════════════════════════════════════════════════════════════════╝
-```
+### 3-4. Check CI and Review Status
 
-### 3. Check CI Status
-
-```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
-```
+See [references/merge-ci-status.md](../references/merge-ci-status.md) for:
+- CI status checking (GitHub)
+- Review status checking (GitHub)
+- User confirmation if CI failing or reviews insufficient
 
-### 4. Check Review Status
+### 5-8. Merge Execution and Verification
 
-```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')
+See [references/merge-execution.md](../references/merge-execution.md) for:
+- Merge strategy determination (squash for features, merge for release/hotfix)
+- Execution on GitHub and Azure DevOps
+- Merge verification with tracking ref update
 
-  [ "$REVIEWS" -lt "$REQUIRED_REVIEWS" ] && {
-    echo "⚠️ Needs $REQUIRED_REVIEWS approvals, has $REVIEWS"
-  }
-fi
-```
+### Final Confirmation
 
-### 5. 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
-```
-
-### 6. Final Confirmation
-
-```yaml
-AskUserQuestion:
-  header: "Merge"
-  question: "Ready to merge PR #$PR_NUMBER?"
-  options:
-    - label: "Yes, merge now"
-      description: "Strategy: $MERGE_STRATEGY, Delete branch: $DELETE_BRANCH"
-    - label: "No, wait"
-      description: "Cancel merge"
-```
-
-### 7. 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
-```
-
-### 8. 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"
-}
-```
+Ask user to confirm merge strategy before execution.
 
 ### 9. Summary