@atlashub/smartstack-cli 1.34.0 → 1.36.0

package/templates/skills/gitflow/phases/abort.md

@@ -11,6 +11,13 @@ Provide rollback and recovery options for GitFlow operations.
 
 ---
 
+## PRE-CHECK:
+
+```bash
+# Load GitFlow config (sets GF_* variables)
+read_gitflow_config || { echo "❌ Run /gitflow init first."; exit 1; }
+```
+
 ## OPTIONS:
 
 ```yaml
@@ -23,7 +30,7 @@ AskUserQuestion:
     - label: "Abandon current branch"
       description: "Delete branch and worktree, return to develop"
     - label: "Restore from checkpoint"
-      description: "Restore to a saved checkpoint"
+      description: "Restore to a saved checkpoint (not yet implemented)"
     - label: "Reset branch to remote"
       description: "Discard local changes, match remote"
 ```
@@ -69,7 +76,7 @@ git tag "$BACKUP_TAG" HEAD
 echo "✓ Backup created: $BACKUP_TAG"
 
 # Switch to develop
-git checkout develop
+git checkout $GF_DEVELOP_BRANCH
 
 # Remove worktree
 [ -n "$WORKTREE" ] && {
@@ -87,30 +94,35 @@ echo "  Backup: $BACKUP_TAG (use 'git checkout $BACKUP_TAG' to recover)"
 
 ### Option 3: Restore from Checkpoint
 
+> **Note:** Checkpoint creation is not yet implemented. This option uses backup tags
+> created by abort operations as a recovery mechanism. Full checkpoint support
+> (automatic state snapshots during plan execution) is planned for a future release.
+
 ```bash
-# List available checkpoints
-CHECKPOINTS=$(ls -t .claude/gitflow/logs/checkpoint_*.json 2>/dev/null)
+# List available backup tags (created by abandon operations)
+BACKUPS=$(git tag -l "backup/*" --sort=-creatordate 2>/dev/null)
 
-if [ -z "$CHECKPOINTS" ]; then
-  echo "No checkpoints found"
+if [ -z "$BACKUPS" ]; then
+  echo "No backup tags found"
+  echo "  Backup tags are created automatically when abandoning branches."
+  echo "  Use 'Reset branch to remote' instead."
   exit 1
 fi
 
-echo "Available checkpoints:"
-for cp in $CHECKPOINTS; do
-  TIMESTAMP=$(grep -oP '"timestamp":\s*"\K[^"]+' "$cp")
-  BRANCH=$(grep -oP '"branch":\s*"\K[^"]+' "$cp")
-  COMMIT=$(grep -oP '"commit":\s*"\K[^"]+' "$cp")
-  echo "  - $TIMESTAMP: $BRANCH @ $COMMIT"
+echo "Available backups:"
+for tag in $BACKUPS; do
+  COMMIT=$(git rev-parse --short "$tag")
+  DATE=$(git log -1 --format=%ci "$tag" 2>/dev/null)
+  echo "  - $tag → $COMMIT ($DATE)"
 done
 
-# Select checkpoint
+# Select backup
 # ... user selection ...
 
 # Restore
-COMMIT=$(grep -oP '"commit":\s*"\K[^"]+' "$SELECTED_CHECKPOINT")
-git reset --hard "$COMMIT"
-echo "✓ Restored to $COMMIT"
+git checkout "$SELECTED_TAG"
+git checkout -b "recovered-$(date +%Y%m%d-%H%M%S)"
+echo "✓ Restored from $SELECTED_TAG to new branch"
 ```
 
 ### Option 4: Reset to Remote

package/templates/skills/gitflow/phases/cleanup.md

@@ -16,12 +16,15 @@ Audit worktrees and branches, remove orphaned/stale items.
 ## PRE-CHECK:
 
 ```bash
+# Load GitFlow config (sets GF_* variables)
+read_gitflow_config || { echo "❌ Run /gitflow init first."; exit 1; }
+
 CURRENT=$(git rev-parse --abbrev-ref HEAD)
 
-[[ "$CURRENT" != "main" ]] && [[ "$CURRENT" != "develop" ]] && {
-  echo "❌ Cleanup must be run from main or develop"
+[[ "$CURRENT" != "$GF_MAIN_BRANCH" ]] && [[ "$CURRENT" != "$GF_DEVELOP_BRANCH" ]] && {
+  echo "❌ Cleanup must be run from $GF_MAIN_BRANCH or $GF_DEVELOP_BRANCH"
   echo "   Current branch: $CURRENT"
-  echo "→ Run: git checkout develop"
+  echo "→ Run: git checkout $GF_DEVELOP_BRANCH"
   STOP
 }
 ```
@@ -35,7 +38,8 @@ CURRENT=$(git rev-parse --abbrev-ref HEAD)
 ```bash
 echo "Scanning worktrees..."
 
-git worktree list > /tmp/worktrees.txt
+mkdir -p .claude/gitflow/cache
+git worktree list > .claude/gitflow/cache/worktrees.txt
 
 ORPHANED=()
 STALE=()
@@ -54,13 +58,13 @@ while read -r line; do
 
   # Check if branch still exists on remote
   REMOTE_EXISTS=$(git branch -r --list "origin/$WT_BRANCH" | wc -l)
-  if [ "$REMOTE_EXISTS" -eq 0 ] && [[ "$WT_BRANCH" != "main" ]] && [[ "$WT_BRANCH" != "develop" ]]; then
+  if [ "$REMOTE_EXISTS" -eq 0 ] && [[ "$WT_BRANCH" != "$GF_MAIN_BRANCH" ]] && [[ "$WT_BRANCH" != "$GF_DEVELOP_BRANCH" ]]; then
     STALE+=("$WT_PATH:$WT_BRANCH")
     continue
   fi
 
   VALID+=("$WT_PATH:$WT_BRANCH")
-done < /tmp/worktrees.txt
+done < .claude/gitflow/cache/worktrees.txt
 ```
 
 ### 2. Audit Local Branches
@@ -72,17 +76,17 @@ MERGED_BRANCHES=()
 UNMERGED_BRANCHES=()
 
 # Find merged branches
-for branch in $(git branch --merged develop | grep -v "^\*" | grep -v "main" | grep -v "develop"); do
+for branch in $(git branch --merged $GF_DEVELOP_BRANCH | grep -v "^\*" | grep -v "$GF_MAIN_BRANCH" | grep -v "$GF_DEVELOP_BRANCH"); do
   # Check if remote exists
   REMOTE_EXISTS=$(git branch -r --list "origin/$branch" | wc -l)
   [ "$REMOTE_EXISTS" -eq 0 ] && MERGED_BRANCHES+=("$branch")
 done
 
 # Find branches without remote
-for branch in $(git branch | grep -v "^\*" | grep -v "main" | grep -v "develop"); do
+for branch in $(git branch | grep -v "^\*" | grep -v "$GF_MAIN_BRANCH" | grep -v "$GF_DEVELOP_BRANCH"); do
   REMOTE_EXISTS=$(git branch -r --list "origin/$branch" | wc -l)
   [ "$REMOTE_EXISTS" -eq 0 ] && {
-    MERGED=$(git branch --merged develop | grep -c "$branch")
+    MERGED=$(git branch --merged $GF_DEVELOP_BRANCH | grep -c "$branch")
     [ "$MERGED" -eq 0 ] && UNMERGED_BRANCHES+=("$branch")
   }
 done

package/templates/skills/gitflow/phases/status.md

@@ -13,16 +13,15 @@ Display complete GitFlow state including branches, worktrees, remotes, and pendi
 
 ## EXECUTION:
 
-### 1. Repository Info
+### 1. Load Config and Repository Info
 
 ```bash
-REPO_NAME=$(basename $(git rev-parse --show-toplevel))
-CURRENT=$(git rev-parse --abbrev-ref HEAD)
-REMOTE_URL=$(git remote get-url origin 2>/dev/null || echo "No remote")
+# Load GitFlow config (sets GF_* variables)
+read_gitflow_config || { echo "❌ Run /gitflow init first."; exit 1; }
 
-# Detect provider
-[[ "$REMOTE_URL" == *"github.com"* ]] && GIT_PROVIDER="GitHub"
-[[ "$REMOTE_URL" == *"dev.azure.com"* ]] && GIT_PROVIDER="Azure DevOps"
+REPO_NAME="$GF_PROJECT_NAME"
+CURRENT=$(git rev-parse --abbrev-ref HEAD)
+GIT_PROVIDER="$GF_PROVIDER"
 ```
 
 ### 2. Branch Status
@@ -30,27 +29,27 @@ REMOTE_URL=$(git remote get-url origin 2>/dev/null || echo "No remote")
 ```bash
 git fetch origin --quiet
 
-# Main branches
-MAIN_LOCAL=$(git rev-parse --short main 2>/dev/null || echo "N/A")
-MAIN_REMOTE=$(git rev-parse --short origin/main 2>/dev/null || echo "N/A")
-DEVELOP_LOCAL=$(git rev-parse --short develop 2>/dev/null || echo "N/A")
-DEVELOP_REMOTE=$(git rev-parse --short origin/develop 2>/dev/null || echo "N/A")
+# Main branches (from config)
+MAIN_LOCAL=$(git rev-parse --short $GF_MAIN_BRANCH 2>/dev/null || echo "N/A")
+MAIN_REMOTE=$(git rev-parse --short origin/$GF_MAIN_BRANCH 2>/dev/null || echo "N/A")
+DEVELOP_LOCAL=$(git rev-parse --short $GF_DEVELOP_BRANCH 2>/dev/null || echo "N/A")
+DEVELOP_REMOTE=$(git rev-parse --short origin/$GF_DEVELOP_BRANCH 2>/dev/null || echo "N/A")
 
 # Divergence
-DEVELOP_AHEAD=$(git rev-list --count origin/main..origin/develop 2>/dev/null || echo "0")
+DEVELOP_AHEAD=$(git rev-list --count origin/$GF_MAIN_BRANCH..origin/$GF_DEVELOP_BRANCH 2>/dev/null || echo "0")
 ```
 
 ### 3. Active Branches
 
 ```bash
-# Feature branches
-FEATURES=$(git branch -r | grep "origin/feature/" | sed 's/origin\///')
+# Feature branches (using prefixes from config)
+FEATURES=$(git branch -r | grep "origin/${GF_FEATURE_PREFIX}" | sed 's/origin\///')
 
 # Release branches
-RELEASES=$(git branch -r | grep "origin/release/" | sed 's/origin\///')
+RELEASES=$(git branch -r | grep "origin/${GF_RELEASE_PREFIX}" | sed 's/origin\///')
 
 # Hotfix branches
-HOTFIXES=$(git branch -r | grep "origin/hotfix/" | sed 's/origin\///')
+HOTFIXES=$(git branch -r | grep "origin/${GF_HOTFIX_PREFIX}" | sed 's/origin\///')
 ```
 
 ### 4. Worktree Status

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

@@ -28,20 +28,26 @@ Validate changes, check EF Core migrations, and create commit with proper messag
 
 ### 0. Pre-commit Guards
 
+**0.0 Load Config:**
+```bash
+# Load GitFlow config (sets GF_* variables)
+read_gitflow_config || { echo "❌ Run /gitflow init first."; exit 1; }
+```
+
 **0.1 Branch Protection:**
 ```bash
 CURRENT=$(git rev-parse --abbrev-ref HEAD)
 
 # BLOCK: main
-[[ "$CURRENT" == "main" ]] && {
-  echo "⛔ COMMIT BLOCKED - main is protected"
+[[ "$CURRENT" == "$GF_MAIN_BRANCH" ]] && {
+  echo "⛔ COMMIT BLOCKED - $GF_MAIN_BRANCH is protected"
   echo "→ Use: /gitflow start hotfix <name>"
   STOP
 }
 
 # WARNING: develop
-[[ "$CURRENT" == "develop" ]] && {
-  echo "⚠️ Direct commits to develop are discouraged"
+[[ "$CURRENT" == "$GF_DEVELOP_BRANCH" ]] && {
+  echo "⚠️ Direct commits to $GF_DEVELOP_BRANCH are discouraged"
   # Offer RESCUE TO FEATURE
 }
 ```
@@ -52,7 +58,7 @@ git fetch origin --quiet
 STAGED=$(git diff --cached --name-only | wc -l)
 MODIFIED=$(git diff --name-only | wc -l)
 UNTRACKED=$(git ls-files --others --exclude-standard | wc -l)
-LOCAL_COMMITS=$(git rev-list --count origin/develop..HEAD 2>/dev/null || echo "0")
+LOCAL_COMMITS=$(git rev-list --count origin/$GF_DEVELOP_BRANCH..HEAD 2>/dev/null || echo "0")
 
 # If there are changes or commits, offer rescue
 [ "$STAGED" -gt 0 ] || [ "$MODIFIED" -gt 0 ] || [ "$LOCAL_COMMITS" -gt 0 ] && {

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

@@ -16,9 +16,12 @@ Create tags for releases/hotfixes, merge back to develop, clean up worktree and
 
 ## EXECUTION SEQUENCE:
 
-### 1. Determine Branch Context
+### 1. Load Config and Determine Branch Context
 
 ```bash
+# Load GitFlow config (sets GF_* variables)
+read_gitflow_config || { echo "❌ Run /gitflow init first."; exit 1; }
+
 # Get current or specified branch
 BRANCH=${1:-$(git rev-parse --abbrev-ref HEAD)}
 BRANCH_TYPE=$(echo $BRANCH | cut -d'/' -f1)
@@ -27,8 +30,8 @@ BRANCH_NAME=$(echo $BRANCH | cut -d'/' -f2)
 # Validate branch type
 case "$BRANCH_TYPE" in
   feature|release|hotfix) ;;
-  main|develop)
-    echo "❌ Cannot finish main or develop branch"
+  $GF_MAIN_BRANCH|$GF_DEVELOP_BRANCH)
+    echo "❌ Cannot finish $GF_MAIN_BRANCH or $GF_DEVELOP_BRANCH branch"
     STOP
     ;;
   *)
@@ -46,12 +49,12 @@ git fetch origin
 # Check if branch was merged
 case "$BRANCH_TYPE" in
   feature)
-    MERGED=$(git branch -r --merged origin/develop | grep "$BRANCH" | wc -l)
-    TARGET="develop"
+    MERGED=$(git branch -r --merged origin/$GF_DEVELOP_BRANCH | grep "$BRANCH" | wc -l)
+    TARGET="$GF_DEVELOP_BRANCH"
     ;;
   release|hotfix)
-    MERGED=$(git branch -r --merged origin/main | grep "$BRANCH" | wc -l)
-    TARGET="main"
+    MERGED=$(git branch -r --merged origin/$GF_MAIN_BRANCH | grep "$BRANCH" | wc -l)
+    TARGET="$GF_MAIN_BRANCH"
     ;;
 esac
 
@@ -74,8 +77,8 @@ esac
 
 ```bash
 if [ "$BRANCH_TYPE" = "release" ] || [ "$BRANCH_TYPE" = "hotfix" ]; then
-  # Get version
-  VERSION=$(grep -oP '"current":\s*"\K[^"]+' .claude/gitflow/config.json 2>/dev/null)
+  # Get version from config (already loaded)
+  VERSION="$GF_VERSION"
 
   # For hotfix, increment patch
   if [ "$BRANCH_TYPE" = "hotfix" ]; then
@@ -95,8 +98,8 @@ if [ "$BRANCH_TYPE" = "release" ] || [ "$BRANCH_TYPE" = "hotfix" ]; then
   }
 
   # Create tag on main
-  git checkout main
-  git pull origin main
+  git checkout $GF_MAIN_BRANCH
+  git pull origin $GF_MAIN_BRANCH
   git tag -a "$TAG_NAME" -m "$BRANCH_TYPE: $BRANCH_NAME"
   git push origin "$TAG_NAME"
 
@@ -108,13 +111,13 @@ fi
 
 ```bash
 if [ "$BRANCH_TYPE" = "release" ] || [ "$BRANCH_TYPE" = "hotfix" ]; then
-  echo "Merging $TAG_NAME back to develop..."
+  echo "Merging $TAG_NAME back to $GF_DEVELOP_BRANCH..."
 
-  git checkout develop
-  git pull origin develop
+  git checkout $GF_DEVELOP_BRANCH
+  git pull origin $GF_DEVELOP_BRANCH
 
   # Merge with merge commit (preserve history)
-  git merge main -m "Merge $TAG_NAME back to develop"
+  git merge $GF_MAIN_BRANCH -m "Merge $TAG_NAME back to $GF_DEVELOP_BRANCH"
 
   # Handle conflicts
   CONFLICTS=$(git diff --name-only --diff-filter=U | wc -l)
@@ -125,48 +128,55 @@ if [ "$BRANCH_TYPE" = "release" ] || [ "$BRANCH_TYPE" = "hotfix" ]; then
     # Options: resolve, abort
   }
 
-  git push origin develop
+  git push origin $GF_DEVELOP_BRANCH
 
   # CRITICAL: Verify push and update tracking refs
-  git fetch origin develop:refs/remotes/origin/develop --force --quiet
+  git fetch origin $GF_DEVELOP_BRANCH:refs/remotes/origin/$GF_DEVELOP_BRANCH --force --quiet
   LOCAL_SHA=$(git rev-parse HEAD)
-  REMOTE_SHA=$(git rev-parse origin/develop)
+  REMOTE_SHA=$(git rev-parse origin/$GF_DEVELOP_BRANCH)
   if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
     echo "✅ Push verified - local/remote in sync"
   else
     echo "⚠️ Push verification FAILED"
     echo "  Local:  $LOCAL_SHA"
     echo "  Remote: $REMOTE_SHA"
-    echo "  → Try: git push origin develop --force-with-lease"
+    echo "  → Try: git push origin $GF_DEVELOP_BRANCH --force-with-lease"
   fi
 
-  echo "✅ Merged back to develop"
+  echo "✅ Merged back to $GF_DEVELOP_BRANCH"
 fi
 ```
 
-### 5. Update Version (Release only)
+### 5. Update Version (Release and Hotfix)
 
 ```bash
-if [ "$BRANCH_TYPE" = "release" ]; then
-  # Increment minor version for next development
+if [ "$BRANCH_TYPE" = "release" ] || [ "$BRANCH_TYPE" = "hotfix" ]; then
   MAJOR=$(echo $VERSION | cut -d'.' -f1)
   MINOR=$(echo $VERSION | cut -d'.' -f2)
-  NEXT_VERSION="$MAJOR.$((MINOR + 1)).0"
+  PATCH=$(echo $VERSION | cut -d'.' -f3)
+
+  if [ "$BRANCH_TYPE" = "release" ]; then
+    # Release: increment minor, reset patch
+    NEXT_VERSION="$MAJOR.$((MINOR + 1)).0"
+  else
+    # Hotfix: increment patch (patch was already bumped for the tag, bump again for next dev)
+    NEXT_VERSION="$MAJOR.$MINOR.$((PATCH + 2))"
+  fi
 
-  # Update config
-  sed -i "s/\"current\": \"$VERSION\"/\"current\": \"$NEXT_VERSION\"/" .claude/gitflow/config.json
+  # Update config (using resolved config path)
+  sed -i "s/\"current\": \".*\"/\"current\": \"$NEXT_VERSION\"/" "$GF_CONFIG_FILE"
 
   # Update source files
   # csproj, package.json, etc.
 
   git add -A
   git commit -m "chore: bump version to $NEXT_VERSION for development"
-  git push origin develop
+  git push origin $GF_DEVELOP_BRANCH
 
   # CRITICAL: Verify push and update tracking refs
-  git fetch origin develop:refs/remotes/origin/develop --force --quiet
+  git fetch origin $GF_DEVELOP_BRANCH:refs/remotes/origin/$GF_DEVELOP_BRANCH --force --quiet
   LOCAL_SHA=$(git rev-parse HEAD)
-  REMOTE_SHA=$(git rev-parse origin/develop)
+  REMOTE_SHA=$(git rev-parse origin/$GF_DEVELOP_BRANCH)
   if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
     echo "✅ Push verified - local/remote in sync"
   else
@@ -182,14 +192,14 @@ fi
 ### 6. Clean Up Worktree
 
 ```bash
-# Find worktree for this branch
-WORKTREE_PATH=$(git worktree list | grep "$BRANCH" | awk '{print $1}')
+# Find worktree for this branch (use --porcelain for reliable parsing)
+WORKTREE_PATH=$(git worktree list --porcelain | grep -B2 "branch refs/heads/$BRANCH" | grep "^worktree " | sed 's/^worktree //')
 
 if [ -n "$WORKTREE_PATH" ] && [ -d "$WORKTREE_PATH" ]; then
   echo "Removing worktree: $WORKTREE_PATH"
 
-  # Make sure we're not in the worktree
-  cd $(git rev-parse --show-toplevel)
+  # Make sure we're not in the worktree directory
+  cd "$GF_DEVELOP_PATH" 2>/dev/null || cd "$(git rev-parse --show-toplevel)"
 
   git worktree remove "$WORKTREE_PATH" --force 2>/dev/null || {
     rm -rf "$WORKTREE_PATH"

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

@@ -265,7 +265,127 @@ AskUserQuestion:
     multiSelect: false
 ```
 
-The user will type the actual name via "Other". Use it as `{PROJECT_NAME}`.
+The user will type the actual name via "Other". Use this raw input for step 6b.
+
+### 6b. Normalize Project Name (INTELLIGENT)
+
+**⛔ ALWAYS normalize, even if user chose the detected name.**
+
+**Step 1: Parse input into words**
+
+Split the raw input on any separator: spaces, hyphens, underscores, dots, camelCase boundaries.
+
+| Raw input | Parsed words |
+|-----------|-------------|
+| `mon super projet` | `["mon", "super", "projet"]` |
+| `gestion-des-stocks` | `["gestion", "des", "stocks"]` |
+| `my_awesome_app` | `["my", "awesome", "app"]` |
+| `SmartStack.App` | `["Smart", "Stack", "App"]` |
+| `userManagement` | `["user", "Management"]` |
+
+**Step 2: Language detection and spell check**
+
+For EACH word, you MUST:
+1. **Detect the language** (French, English, or technical/proper noun)
+2. **Check spelling** - flag obvious typos
+3. **Suggest corrections** if misspelled
+
+| Word | Language | Spelling | Suggestion |
+|------|----------|----------|------------|
+| `gestion` | FR | ✅ | - |
+| `gestoin` | FR | ❌ typo | → `gestion` |
+| `managment` | EN | ❌ typo | → `management` |
+| `SmartStack` | Proper noun | ✅ | - |
+| `auth` | EN (abbreviation) | ✅ | - |
+
+**If typos detected**, ask the user BEFORE generating variants:
+
+```yaml
+AskUserQuestion:
+  - header: "Spelling"
+    question: "Corrections detected. Accept?"
+    options:
+      - label: "Accept corrections (Recommended)"
+        description: "'gestoin' → 'gestion', 'managment' → 'management'"
+      - label: "Keep original"
+        description: "Use the name as typed"
+    multiSelect: false
+```
+
+**Step 3: Generate all name variants**
+
+From the cleaned words, generate ALL variants:
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│  PROJECT NAME VARIANTS                                       │
+│  Input: "gestion des stocks"                                 │
+├─────────────────────────────────────────────────────────────┤
+│                                                              │
+│  A) PascalCase.Dot    →  Gestion.Des.Stocks                 │
+│     Best for: .NET namespace, C# project, folder name        │
+│                                                              │
+│  B) PascalCase        →  GestionDesStocks                    │
+│     Best for: Class name, assembly name                      │
+│                                                              │
+│  C) kebab-case        →  gestion-des-stocks                  │
+│     Best for: Git repo, npm package, URL slug                │
+│                                                              │
+│  D) snake_case        →  gestion_des_stocks                  │
+│     Best for: Database, Python, file system                  │
+│                                                              │
+└─────────────────────────────────────────────────────────────┘
+```
+
+**Step 4: Ask user to choose the PRIMARY format**
+
+```yaml
+AskUserQuestion:
+  - header: "Format"
+    question: "Which format for the project name?"
+    options:
+      - label: "PascalCase.Dot (Recommended)"
+        description: "{PascalCase.Dot variant} - .NET convention"
+      - label: "PascalCase"
+        description: "{PascalCase variant} - single word"
+      - label: "kebab-case"
+        description: "{kebab-case variant} - git/npm convention"
+      - label: "snake_case"
+        description: "{snake_case variant} - database/python convention"
+    multiSelect: false
+```
+
+**Step 5: Store all derived names**
+
+Regardless of the chosen primary format, ALL variants are generated and stored:
+
+```json
+{
+  "PROJECT_NAME": "{chosen format}",
+  "PROJECT_VARIANTS": {
+    "pascalCaseDot": "Gestion.Des.Stocks",
+    "pascalCase": "GestionDesStocks",
+    "kebabCase": "gestion-des-stocks",
+    "snakeCase": "gestion_des_stocks",
+    "displayName": "Gestion Des Stocks",
+    "words": ["gestion", "des", "stocks"],
+    "language": "fr"
+  }
+}
+```
+
+These variants are available for subsequent steps (repo name, namespace, folder, etc.).
+
+**Real-world examples:**
+
+| User types | PascalCase.Dot | kebab-case | PascalCase |
+|-----------|---------------|------------|------------|
+| `smart stack app` | `SmartStack.App` | `smart-stack-app` | `SmartStackApp` |
+| `gestion-des-stocks` | `Gestion.Des.Stocks` | `gestion-des-stocks` | `GestionDesStocks` |
+| `Mon Projet V2` | `Mon.Projet.V2` | `mon-projet-v2` | `MonProjetV2` |
+| `user auth module` | `User.Auth.Module` | `user-auth-module` | `UserAuthModule` |
+| `PROJET TEST` | `Projet.Test` | `projet-test` | `ProjetTest` |
+| `e-commerce platform` | `ECommerce.Platform` | `e-commerce-platform` | `ECommercePlatform` |
 
 ### 7. Ask Worktree Mode
 
@@ -333,6 +453,14 @@ mkdir -p "$DEVELOP_PATH/.claude/gitflow/{plans,logs,cache,backup}"
   "repository": {
     "name": "{PROJECT_NAME}",
     "rootFolder": "{ROOT_FOLDER}",
+    "nameVariants": {
+      "pascalCaseDot": "{PascalCase.Dot}",
+      "pascalCase": "{PascalCase}",
+      "kebabCase": "{kebab-case}",
+      "snakeCase": "{snake_case}",
+      "displayName": "{Display Name}"
+    },
+    "defaultBranch": "main",
     "remoteUrl": "{REPO_URL}"
   },
   "git": {
@@ -367,7 +495,8 @@ mkdir -p "$DEVELOP_PATH/.claude/gitflow/{plans,logs,cache,backup}"
   "efcore": {
     "enabled": true,
     "validateOnCommit": true,
-    "blockDestructive": true
+    "blockDestructive": true,
+    "migrationNaming": "{context}_v{version}_{sequence}_{Description}"
   },
   "workflow": {
     "push": {
@@ -377,6 +506,9 @@ mkdir -p "$DEVELOP_PATH/.claude/gitflow/{plans,logs,cache,backup}"
       "autoLabels": true,
       "requireReview": true
     }
+  },
+  "language": {
+    "code": "{GF_LANG}"
   }
 }
 ```

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

@@ -16,19 +16,33 @@ Run through review checklist and merge the pull request with appropriate strateg
 
 ## EXECUTION SEQUENCE:
 
-### 1. Load PR Context
+### 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=$(grep -oP '"provider":\s*"\K[^"]+' .claude/gitflow/config.json 2>/dev/null || echo "github")
+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
 
-# Get PR number
-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}")
+# 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" ] && {
@@ -125,7 +139,7 @@ case "$BRANCH_TYPE" in
   release|hotfix)
     MERGE_STRATEGY="merge"
     DELETE_BRANCH=true
-    MERGE_BACK="develop"
+    MERGE_BACK="$GF_DEVELOP_BRANCH"
     ;;
 esac
 ```