@atlashub/smartstack-cli 1.6.1 → 1.8.0

package/templates/commands/gitflow/1-init.md

@@ -163,11 +163,112 @@ mkdir -p .claude/gitflow/{plans,logs,migrations,backup,cache}
     └── {hotfix-name}/
 ```
 
+### ÉTAPE 7.5 : Détection et Configuration Azure DevOps (Optionnel)
+
+**Détecter si Azure CLI est installé:**
+
+```bash
+# Vérifier Azure CLI
+AZ_CLI_INSTALLED=$(az --version 2>/dev/null | head -1)
+
+# Vérifier l'extension azure-devops
+AZ_DEVOPS_EXT=$(az extension show --name azure-devops 2>/dev/null | grep -o '"name": "azure-devops"')
+```
+
+**Si Azure CLI détecté, proposer la configuration:**
+
+```javascript
+if (AZ_CLI_INSTALLED) {
+  AskUserQuestion({
+    questions: [{
+      question: "Azure CLI détecté. Voulez-vous configurer l'intégration Azure DevOps ?",
+      header: "Azure DevOps",
+      options: [
+        { label: "Oui", description: "Configurer Azure DevOps pour PR, work items et boards (Recommandé si vous utilisez Azure DevOps)" },
+        { label: "Non", description: "Ignorer pour l'instant (peut être configuré plus tard)" },
+        { label: "Installer extension", description: "L'extension azure-devops n'est pas installée" }
+      ],
+      multiSelect: false
+    }]
+  })
+}
+```
+
+**Si "Oui" sélectionné, demander les informations:**
+
+```javascript
+// Détecter l'organisation depuis le remote URL si Azure DevOps
+REMOTE_URL=$(git remote get-url origin 2>/dev/null)
+// https://dev.azure.com/myorg/myproject/_git/myrepo → org=myorg, project=myproject
+
+AskUserQuestion({
+  questions: [
+    {
+      question: "Quelle est votre organisation Azure DevOps ?",
+      header: "Organisation",
+      options: [
+        { label: "${DETECTED_ORG}", description: "Détecté depuis l'URL remote (Recommandé)" },
+        { label: "Autre", description: "Entrer une autre organisation" }
+      ],
+      multiSelect: false
+    },
+    {
+      question: "Quel est le nom de votre projet Azure DevOps ?",
+      header: "Projet",
+      options: [
+        { label: "${DETECTED_PROJECT}", description: "Détecté depuis l'URL remote (Recommandé)" },
+        { label: "Autre", description: "Entrer un autre projet" }
+      ],
+      multiSelect: false
+    }
+  ]
+})
+```
+
+**Configurer Azure CLI defaults:**
+
+```bash
+# Configurer les defaults Azure DevOps
+az devops configure --defaults organization="$AZ_ORG" project="$AZ_PROJECT"
+
+# Vérifier la connexion
+az devops project show --project "$AZ_PROJECT" > /dev/null 2>&1 || {
+  echo "⚠️  Impossible de se connecter à Azure DevOps."
+  echo "   Exécutez 'az login' pour vous authentifier."
+}
+```
+
+**Si Azure CLI non installé, afficher les instructions:**
+
+```
+┌──────────────────────────────────────────────────────────────────────────────┐
+│  ℹ️  AZURE DEVOPS CLI NON DÉTECTÉ                                             │
+├──────────────────────────────────────────────────────────────────────────────┤
+│  Pour activer l'intégration Azure DevOps (PR, work items, boards):           │
+│                                                                              │
+│  1. Installer Azure CLI:                                                     │
+│     winget install Microsoft.AzureCLI                                        │
+│                                                                              │
+│  2. Installer l'extension:                                                   │
+│     az extension add --name azure-devops                                     │
+│                                                                              │
+│  3. Se connecter:                                                            │
+│     az login                                                                 │
+│                                                                              │
+│  4. Reconfigurer GitFlow:                                                    │
+│     /gitflow:1-init --migrate                                                │
+│                                                                              │
+│  Documentation: https://learn.microsoft.com/cli/azure/boards                 │
+└──────────────────────────────────────────────────────────────────────────────┘
+```
+
+---
+
 ### ÉTAPE 8 : Configuration
 
 ```json
 {
-  "version": "1.3.0",
+  "version": "1.4.0",
   "initMode": "clone",
   "repository": {
     "name": "{repo_name}",
@@ -769,7 +870,7 @@ parent/
 #### Organized Mode (v1.3)
 ```json
 {
-  "version": "1.3.0",
+  "version": "1.4.0",
   "initMode": "organized",
   "repository": { "name": "", "defaultBranch": "main", "remoteUrl": "" },
   "versioning": { "strategy": "semver", "current": "0.1.0", "source": "auto", "sourceFile": "", "tagPrefix": "v", "autoIncrement": { "feature": "minor", "hotfix": "patch", "release": "manual" } },
@@ -799,6 +900,19 @@ parent/
     "namePrefix": "",
     "autoCreateLocalConfig": true
   },
+  "azureDevOps": {
+    "enabled": false,
+    "organization": "",
+    "project": "",
+    "defaultReviewers": [],
+    "workItemTypes": {
+      "feature": "User Story",
+      "hotfix": "Bug",
+      "release": "Epic"
+    },
+    "linkWorkItems": true,
+    "autoTransitionWorkItems": true
+  },
   "efcore": {
     "enabled": false, "contexts": [], "generateScript": false, "scriptOutputPath": "",
     "crossBranch": { "enabled": true, "scanOnMigrationCreate": true, "blockOnConflict": true, "cacheExpiry": "1h" }
@@ -807,6 +921,49 @@ parent/
 }
 ```
 
+### Azure DevOps Configuration (NEW in v1.4)
+
+La section `azureDevOps` configure l'integration avec Azure DevOps CLI pour les PR, work items et boards:
+
+| Parametre | Description | Defaut |
+|-----------|-------------|--------|
+| `enabled` | Activer l'integration Azure DevOps | `false` |
+| `organization` | URL de l'organisation (ex: `https://dev.azure.com/myorg`) | - |
+| `project` | Nom du projet Azure DevOps | - |
+| `defaultReviewers` | Liste des reviewers par defaut pour les PR | `[]` |
+| `workItemTypes.feature` | Type de work item pour les features | `User Story` |
+| `workItemTypes.hotfix` | Type de work item pour les hotfixes | `Bug` |
+| `workItemTypes.release` | Type de work item pour les releases | `Epic` |
+| `linkWorkItems` | Lier automatiquement les PR aux work items | `true` |
+| `autoTransitionWorkItems` | Transitionner automatiquement les work items au merge | `true` |
+
+**Commandes disponibles avec Azure DevOps:**
+
+| Action | Commande |
+|--------|----------|
+| Creer PR avec work item | `az repos pr create --work-items 123` |
+| Completer PR (merge) | `az repos pr update --id 42 --status completed` |
+| Creer work item | `az boards work-item create --type "User Story" --title "..."` |
+| Lier commit a work item | Message commit avec `#123` |
+
+**Installation Azure CLI:**
+
+```bash
+# 1. Installer Azure CLI
+winget install Microsoft.AzureCLI
+
+# 2. Ajouter l'extension Azure DevOps (auto-install au premier usage)
+az extension add --name azure-devops
+
+# 3. Se connecter
+az login
+
+# 4. Configurer les defaults (fait automatiquement par /gitflow:1-init)
+az devops configure --defaults organization=https://dev.azure.com/VOTRE_ORG project=VOTRE_PROJET
+```
+
+---
+
 ### Database Configuration (NEW in v1.3)
 
 La section `database` configure la creation automatique de `appsettings.Local.json` lors du `/gitflow:10-start`:
@@ -839,7 +996,7 @@ La section `database` configure la creation automatique de `appsettings.Local.js
 #### Adjacent/Legacy Mode (v1.2 compatible)
 ```json
 {
-  "version": "1.3.0",
+  "version": "1.4.0",
   "initMode": "adjacent",
   "repository": { "name": "", "defaultBranch": "main", "remoteUrl": "" },
   "versioning": { "strategy": "semver", "current": "0.1.0", "source": "auto", "sourceFile": "", "tagPrefix": "v", "autoIncrement": { "feature": "minor", "hotfix": "patch", "release": "manual" } },
@@ -852,6 +1009,15 @@ La section `database` configure la creation automatique de `appsettings.Local.js
     "structure": { "features": "features/", "releases": "releases/", "hotfixes": "hotfixes/" },
     "cleanupOnFinish": true
   },
+  "azureDevOps": {
+    "enabled": false,
+    "organization": "",
+    "project": "",
+    "defaultReviewers": [],
+    "workItemTypes": { "feature": "User Story", "hotfix": "Bug", "release": "Epic" },
+    "linkWorkItems": true,
+    "autoTransitionWorkItems": true
+  },
   "efcore": {
     "enabled": false, "contexts": [], "generateScript": false, "scriptOutputPath": "",
     "crossBranch": { "enabled": true, "scanOnMigrationCreate": true, "blockOnConflict": true, "cacheExpiry": "1h" }
@@ -929,16 +1095,61 @@ User runs: /gitflow:1-init
 | `/gitflow:1-init` | Generate plan (asks if structure exists, asks for structure style) |
 | `/gitflow:1-init --exec` | Execute existing plan |
 | `/gitflow:1-init --yes` | Generate + execute without intermediate file |
-| `/gitflow:1-init --migrate` | Force migration of existing structure to v1.3.0 |
+| `/gitflow:1-init --migrate` | Force migration of existing structure to v1.4.0 |
 | `/gitflow:1-init --reset` | Force reset (backup + recreate from scratch) |
 | `/gitflow:1-init --organized` | Force organized structure (01-Main, 02-Develop) |
 | `/gitflow:1-init --adjacent` | Force adjacent/legacy structure (../worktrees) |
 | `/gitflow:1-init --no-worktrees` | Generate plan without worktrees |
+| `/gitflow:1-init --with-azure-devops` | Configure Azure DevOps integration during init |
+| `/gitflow:1-init --skip-azure-devops` | Skip Azure DevOps detection/configuration |
 
 ---
 
 ## Migration Details
 
+### v1.3 → v1.4 (Azure DevOps Integration)
+
+When migrating to v1.4, these changes are available:
+
+#### New Config Fields
+
+```json
+{
+  "version": "1.4.0",
+  "azureDevOps": {
+    "enabled": false,                    // NEW - Enable Azure DevOps CLI integration
+    "organization": "",                  // NEW - Azure DevOps organization URL
+    "project": "",                       // NEW - Azure DevOps project name
+    "defaultReviewers": [],              // NEW - Default PR reviewers
+    "workItemTypes": {                   // NEW - Work item type mapping
+      "feature": "User Story",
+      "hotfix": "Bug",
+      "release": "Epic"
+    },
+    "linkWorkItems": true,               // NEW - Auto-link PR to work items
+    "autoTransitionWorkItems": true      // NEW - Auto-transition work items on merge
+  }
+}
+```
+
+#### Migration Options
+
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "v1.3 config detected. Azure DevOps integration is now available. Configure it?",
+    header: "Azure DevOps",
+    options: [
+      { label: "Yes, configure", description: "Set up Azure DevOps CLI integration (Recommended if using Azure DevOps)" },
+      { label: "Skip for now", description: "Just update version to v1.4.0, configure later" }
+    ],
+    multiSelect: false
+  }]
+})
+```
+
+---
+
 ### v1.2 → v1.3 (Organized Structure)
 
 When migrating to v1.3, these changes are available:
@@ -947,7 +1158,7 @@ When migrating to v1.3, these changes are available:
 
 ```json
 {
-  "version": "1.3.0",
+  "version": "1.4.0",
   "initMode": "organized",      // NEW - "organized" | "adjacent" | "clone" | "interactive"
   "worktrees": {
     "mode": "organized",        // NEW - matches initMode

package/templates/commands/gitflow/10-start.md

@@ -263,9 +263,71 @@ AskUserQuestion({
 | Check | Commande | Action si echec |
 |-------|----------|-----------------|
 | Working tree clean | `git status --porcelain` | Proposer stash ou commit |
-| Branche n'existe pas | `git branch --list {branch}` | Erreur avec suggestion |
+| Branche n'existe pas | `git branch -a --list {branch}` | Erreur avec suggestion |
 | Base a jour | `git fetch origin` | Fetch automatique |
 
+### 5.1 Verifier que la branche SPECIFIQUE n'existe pas
+
+**IMPORTANT:** Cette verification doit etre faite sur la branche EXACTE demandee, pas sur le nombre total de branches.
+
+```bash
+# Construire le nom complet de la branche
+BRANCH_FULL_NAME="${TYPE}/${NAME}"  # ex: feature/add-user-auth
+
+# Fetch pour avoir les branches remote a jour
+git fetch origin --quiet
+
+# Verifier si la branche existe en LOCAL
+LOCAL_EXISTS=$(git branch --list "$BRANCH_FULL_NAME")
+
+# Verifier si la branche existe en REMOTE
+REMOTE_EXISTS=$(git branch -r --list "origin/$BRANCH_FULL_NAME")
+
+# Si la branche existe deja
+if [ -n "$LOCAL_EXISTS" ] || [ -n "$REMOTE_EXISTS" ]; then
+  echo ""
+  echo "ERROR: La branche '$BRANCH_FULL_NAME' existe deja!"
+  echo ""
+
+  if [ -n "$LOCAL_EXISTS" ]; then
+    echo "  - Existe en LOCAL"
+  fi
+  if [ -n "$REMOTE_EXISTS" ]; then
+    echo "  - Existe en REMOTE (origin)"
+  fi
+
+  echo ""
+  echo "Options:"
+  echo "  1. Choisir un autre nom"
+  echo "  2. Supprimer la branche existante: git branch -D $BRANCH_FULL_NAME"
+  echo "  3. Continuer sur la branche existante: git checkout $BRANCH_FULL_NAME"
+  echo ""
+
+  # Proposer a l'utilisateur
+  AskUserQuestion({
+    questions: [{
+      question: "La branche '$BRANCH_FULL_NAME' existe deja. Que faire ?",
+      header: "Conflit",
+      options: [
+        { label: "Autre nom", description: "Choisir un nom different" },
+        { label: "Checkout", description: "Basculer sur la branche existante" },
+        { label: "Supprimer", description: "Supprimer et recreer (ATTENTION: perte de donnees)" }
+      ],
+      multiSelect: false
+    }]
+  })
+
+  # Actions selon choix:
+  # - "Autre nom" -> Retourner a ETAPE 4 pour redemander le nom
+  # - "Checkout" -> git checkout $BRANCH_FULL_NAME && exit
+  # - "Supprimer" -> git branch -D $BRANCH_FULL_NAME && git push origin --delete $BRANCH_FULL_NAME 2>/dev/null
+fi
+
+echo "OK Branche '$BRANCH_FULL_NAME' disponible"
+```
+
+### 5.2 Verifier working directory
+
 **Si working directory dirty:**
 
 ```javascript
@@ -289,16 +351,44 @@ AskUserQuestion({
 
 ### Detecter le mode worktree
 
+**IMPORTANT:** Toujours detecter la structure EXISTANTE en priorite, avant de lire la config.
+
 ```bash
-# Lire la config GitFlow
-CONFIG_FILE=".claude/gitflow/config.json"
-if [ -f "$CONFIG_FILE" ]; then
-  WORKTREE_MODE=$(grep -o '"mode": *"[^"]*"' "$CONFIG_FILE" | head -1 | cut -d'"' -f4)
-  # Default to adjacent if not specified
-  WORKTREE_MODE=${WORKTREE_MODE:-adjacent}
-else
+# ═══════════════════════════════════════════════════════════════
+# ETAPE 1: Detection automatique basee sur la structure des dossiers
+# ═══════════════════════════════════════════════════════════════
+
+# Verifier si on est dans une structure "organized" (01-Main, 02-Develop, features/, etc.)
+# Ces dossiers sont a la racine du projet parent (..)
+if [ -d "../features" ] && [ -d "../releases" ] && [ -d "../hotfixes" ]; then
+  # Structure organized detectee
+  WORKTREE_MODE="organized"
+  echo "[AUTO-DETECT] Structure organized detectee (../features/, ../releases/, ../hotfixes/)"
+elif [ -d "../01-Main" ] && [ -d "../02-Develop" ]; then
+  # Structure organized detectee via les prefixes numerotes
+  WORKTREE_MODE="organized"
+  echo "[AUTO-DETECT] Structure organized detectee (../01-Main/, ../02-Develop/)"
+elif [ -d "../worktrees" ]; then
+  # Structure adjacent/legacy detectee
   WORKTREE_MODE="adjacent"
+  echo "[AUTO-DETECT] Structure adjacent detectee (../worktrees/)"
+else
+  # ═══════════════════════════════════════════════════════════════
+  # ETAPE 2: Fallback sur la config GitFlow si structure non detectee
+  # ═══════════════════════════════════════════════════════════════
+  CONFIG_FILE=".claude/gitflow/config.json"
+  if [ -f "$CONFIG_FILE" ]; then
+    WORKTREE_MODE=$(grep -o '"mode": *"[^"]*"' "$CONFIG_FILE" | head -1 | cut -d'"' -f4)
+    WORKTREE_MODE=${WORKTREE_MODE:-adjacent}
+    echo "[CONFIG] Mode lu depuis config.json: $WORKTREE_MODE"
+  else
+    # Default: adjacent si rien n'est detecte
+    WORKTREE_MODE="adjacent"
+    echo "[DEFAULT] Aucune structure detectee, mode par defaut: adjacent"
+  fi
 fi
+
+echo "WORKTREE_MODE=$WORKTREE_MODE"
 ```
 
 ### Mode Worktree - Organized (v1.3)
@@ -619,34 +709,114 @@ git push -u origin {branch}
 
 ## ETAPE 8: Resume et prochaines etapes
 
+**Afficher un resume adapte au TYPE de branche creee:**
+
+### Si FEATURE:
+
 ```
 ================================================================================
-                         BRANCHE CREEE
+                         FEATURE CREEE
 ================================================================================
 
-TYPE:     {feature|release|hotfix}
-BRANCHE:  {branch_name}
-BASE:     {develop|main}
-CIBLE:    {develop|main+develop}
-VERSION:  {version} (si release)
+BRANCHE:  feature/{name}
+BASE:     develop
+CIBLE:    develop
+WORKTREE: ../features/{name}/
+
+================================================================================
+PROCHAINES ETAPES
+================================================================================
+
+1. Naviguer vers le worktree:
+   cd ../features/{name}
+   # ou dans VSCode:
+   code ../features/{name}
+
+2. Faire vos modifications et committer:
+   /gitflow:3-commit
+
+3. Creer une Pull Request (feature/{name} → develop):
+   /gitflow:7-pull-request feature/{name}
+
+4. Apres merge de la PR, nettoyer:
+   /gitflow:11-finish feature/{name}
+   Cela va:
+     ✓ Supprimer la branche feature/{name}
+     ✓ Nettoyer le worktree
+
+================================================================================
+```
+
+### Si RELEASE:
+
+```
+================================================================================
+                         RELEASE CREEE
+================================================================================
 
-WORKTREE:
-  - Organized mode: ../{type}s/{name}/ (ex: ../features/add-user/)
-  - Adjacent mode:  ../worktrees/{type}s/{name}/
-  - No worktree:    meme repertoire
+BRANCHE:  release/v{version}
+BASE:     develop
+CIBLE:    main + develop (merge back)
+VERSION:  v{version}
+WORKTREE: ../releases/v{version}/
 
 ================================================================================
 PROCHAINES ETAPES
 ================================================================================
 
 1. Naviguer vers le worktree:
-   - Organized: cd "../{type}s/{name}" ou code "../{type}s/{name}"
-   - Adjacent:  cd "../worktrees/{type}s/{name}"
+   cd ../releases/v{version}
+   # ou dans VSCode:
+   code ../releases/v{version}
+
+2. Creer une Pull Request (release/v{version} → main):
+   /gitflow:7-pull-request release/v{version}
+
+3. Apres merge de la PR, finaliser:
+   /gitflow:11-finish release/v{version}
+   Cela va:
+     ✓ Creer le tag v{version}
+     ✓ Merger main → develop (merge back)
+     ✓ Incrementer la version sur develop ({version} → {next_minor})
+     ✓ Nettoyer le worktree
 
-2. Faire vos modifications
-3. /gitflow:3-commit
-4. /gitflow:7-pull-request
-5. /gitflow:11-finish (apres merge PR)
+================================================================================
+```
+
+### Si HOTFIX:
+
+```
+================================================================================
+                         HOTFIX CREE
+================================================================================
+
+BRANCHE:  hotfix/{name}
+BASE:     main
+CIBLE:    main + develop (merge back)
+WORKTREE: ../hotfixes/{name}/
+
+================================================================================
+PROCHAINES ETAPES
+================================================================================
+
+1. Naviguer vers le worktree:
+   cd ../hotfixes/{name}
+   # ou dans VSCode:
+   code ../hotfixes/{name}
+
+2. Faire vos corrections et committer:
+   /gitflow:3-commit
+
+3. Creer une Pull Request (hotfix/{name} → main):
+   /gitflow:7-pull-request hotfix/{name}
+
+4. Apres merge de la PR, finaliser:
+   /gitflow:11-finish hotfix/{name}
+   Cela va:
+     ✓ Incrementer la version PATCH ({current} → {current+patch})
+     ✓ Creer le tag v{new_version}
+     ✓ Merger main → develop (merge back)
+     ✓ Nettoyer le worktree
 
 ================================================================================
 ```