@atlashub/smartstack-cli 1.7.0 → 1.8.0

package/templates/commands/gitflow/11-finish.md

@@ -216,14 +216,40 @@ git push origin --delete feature/{name} 2>/dev/null || true
 ```
 
 **Resume:**
+
 ```
-FEATURE FINALISEE
-────────────────────────────────
-Branche:  feature/{name}
-Mergee:   develop
-PR:       #{number}
-Cleanup:  ✓ Branche supprimee
-────────────────────────────────
+═══════════════════════════════════════════════════════════════════════════════
+                         FEATURE FINALISÉE
+═══════════════════════════════════════════════════════════════════════════════
+
+FINISH DETAILS
+───────────────────────────────────────────────────────────────────────────────
+  • Type:      feature
+  • Branche:   feature/{name}
+  • Mergée:    develop
+  • PR:        #{number}
+
+WORKFLOW STATUT
+───────────────────────────────────────────────────────────────────────────────
+  ✓ PR #{number} mergée avec succès
+  ✓ Branche feature/{name} supprimée (local)
+  ✓ Branche feature/{name} supprimée (remote)
+  ✓ Worktree nettoyé
+
+═══════════════════════════════════════════════════════════════════════════════
+                         PROCHAINES ÉTAPES
+═══════════════════════════════════════════════════════════════════════════════
+
+1. Créer une nouvelle feature:
+   /gitflow:10-start feature {name}
+
+2. Créer une release (si prêt pour production):
+   /gitflow:10-start release
+
+3. Voir le statut du repo:
+   /gitflow:2-status
+
+═══════════════════════════════════════════════════════════════════════════════
 ```
 
 ---
@@ -251,9 +277,29 @@ git push origin "v$VERSION"
 git checkout develop
 git pull origin develop
 git merge main --no-ff -m "chore: merge release v$VERSION back to develop"
+
+# 4. AUTO-INCREMENT MINOR VERSION sur develop (prepare next release)
+# Ceci evite que les futures features utilisent la meme version que la release
+CURRENT_VERSION=$(cat package.json | jq -r '.version')
+
+# Calculer la prochaine version MINOR (ex: 1.2.0 -> 1.3.0)
+NEXT_VERSION=$(node -e "
+  const [major, minor, patch] = '$CURRENT_VERSION'.split('.').map(Number);
+  console.log([major, minor + 1, 0].join('.'));
+")
+
+# Mettre a jour package.json avec la nouvelle version
+npm version $NEXT_VERSION --no-git-tag-version
+
+# Committer le bump de version
+git add package.json package-lock.json
+git commit -m "chore: bump develop to v$NEXT_VERSION for next release"
+
 git push origin develop
 
-# 4. Cleanup worktree + branche
+echo "OK Version develop incrementee: $CURRENT_VERSION -> $NEXT_VERSION"
+
+# 5. Cleanup worktree + branche
 WORKTREE_PATH="../worktrees/releases/v$VERSION"
 if [ -d "$WORKTREE_PATH" ]; then
   git worktree remove "$WORKTREE_PATH" --force 2>/dev/null || true
@@ -263,20 +309,50 @@ git push origin --delete release/v$VERSION 2>/dev/null || true
 ```
 
 **Resume:**
+
 ```
-RELEASE FINALISEE
-════════════════════════════════════════
-Version:  v{version}
-Tag:      v{version} ✓
-Main:     ✓ Mergee
-Develop:  ✓ Merge back complete
-
-Actions effectuees:
-  ✓ Tag v{version} cree et pousse
-  ✓ Main mis a jour
-  ✓ Develop synchronise avec main
-  ✓ Branche release supprimee
-════════════════════════════════════════
+═══════════════════════════════════════════════════════════════════════════════
+                         RELEASE FINALISÉE
+═══════════════════════════════════════════════════════════════════════════════
+
+RELEASE DETAILS
+───────────────────────────────────────────────────────────────────────────────
+  • Type:      release
+  • Branche:   release/v{version}
+  • Version:   v{version}
+  • Tag:       v{version} ✓
+
+VERSIONING
+───────────────────────────────────────────────────────────────────────────────
+  • Release:   v{version} → Déployée sur main
+  • Develop:   {version} → {NEXT_VERSION} (auto-incrémenté)
+
+WORKFLOW STATUT
+───────────────────────────────────────────────────────────────────────────────
+  ✓ PR mergée sur main
+  ✓ Tag v{version} créé et poussé
+  ✓ Main mis à jour
+  ✓ Merge back vers develop effectué
+  ✓ Version develop incrémentée ({version} → {NEXT_VERSION})
+  ✓ Branche release/{version} supprimée
+  ✓ Worktree nettoyé
+
+═══════════════════════════════════════════════════════════════════════════════
+                         PROCHAINES ÉTAPES
+═══════════════════════════════════════════════════════════════════════════════
+
+✅ Release v{version} déployée avec succès!
+
+1. Créer une nouvelle feature:
+   /gitflow:10-start feature {name}
+
+2. Créer un hotfix (si besoin):
+   /gitflow:10-start hotfix {name}
+
+3. Voir le statut du repo:
+   /gitflow:2-status
+
+═══════════════════════════════════════════════════════════════════════════════
 ```
 
 ---
@@ -324,7 +400,7 @@ git pull origin develop
 git merge main --no-ff -m "chore: merge hotfix v$NEW_VERSION back to develop"
 git push origin develop
 
-# 5. Cleanup worktree + branche
+# 6. Cleanup worktree + branche
 WORKTREE_PATH="../worktrees/hotfixes/{name}"
 if [ -d "$WORKTREE_PATH" ]; then
   git worktree remove "$WORKTREE_PATH" --force 2>/dev/null || true
@@ -336,21 +412,50 @@ git push origin --delete hotfix/{name} 2>/dev/null || true
 **⚠️ IMPORTANT:** Le bump de version PATCH est automatique. Pas besoin de le faire manuellement avant le finish.
 
 **Resume:**
+
 ```
-HOTFIX FINALISE
-════════════════════════════════════════
-Hotfix:   {name}
-Version:  v{CURRENT_VERSION} → v{NEW_VERSION}
-Tag:      v{NEW_VERSION} ✓
-
-Actions effectuees:
-  ✓ Version incrementee (PATCH): {CURRENT_VERSION} → {NEW_VERSION}
-  ✓ package.json mis a jour
-  ✓ Tag v{NEW_VERSION} cree et pousse
-  ✓ Main mis a jour
-  ✓ Develop synchronise (merge back)
-  ✓ Branche hotfix supprimee
-════════════════════════════════════════
+═══════════════════════════════════════════════════════════════════════════════
+                         HOTFIX FINALISÉ
+═══════════════════════════════════════════════════════════════════════════════
+
+HOTFIX DETAILS
+───────────────────────────────────────────────────────────────────────────────
+  • Type:      hotfix
+  • Branche:   hotfix/{name}
+  • Correction: {description}
+
+VERSIONING
+───────────────────────────────────────────────────────────────────────────────
+  • Avant:     v{CURRENT_VERSION}
+  • Après:     v{NEW_VERSION} (PATCH auto-incrémenté)
+  • Tag:       v{NEW_VERSION} ✓
+
+WORKFLOW STATUT
+───────────────────────────────────────────────────────────────────────────────
+  ✓ Version incrémentée (PATCH): {CURRENT_VERSION} → {NEW_VERSION}
+  ✓ package.json mis à jour
+  ✓ Tag v{NEW_VERSION} créé et poussé
+  ✓ Main mis à jour
+  ✓ Merge back vers develop effectué
+  ✓ Branche hotfix/{name} supprimée
+  ✓ Worktree nettoyé
+
+═══════════════════════════════════════════════════════════════════════════════
+                         PROCHAINES ÉTAPES
+═══════════════════════════════════════════════════════════════════════════════
+
+✅ Hotfix v{NEW_VERSION} déployé avec succès!
+
+1. Créer une nouvelle feature:
+   /gitflow:10-start feature {name}
+
+2. Créer une release:
+   /gitflow:10-start release
+
+3. Voir le statut du repo:
+   /gitflow:2-status
+
+═══════════════════════════════════════════════════════════════════════════════
 ```
 
 ---
@@ -424,29 +529,6 @@ cleanup_worktree_for_branch "$BRANCH"
 
 ---
 
-## Resume final
-
-```
-GITFLOW FINISH COMPLETE
-════════════════════════════════════════
-Type:     {feature|release|hotfix}
-Branche:  {branch_name}
-Status:   FINALISEE
-
-Resultats:
-  PR:       #{number} (mergee)
-  Tag:      {tag|N/A}
-  Main:     {updated|N/A}
-  Develop:  {updated|unchanged}
-  Cleanup:  ✓ Branche supprimee
-  Worktree: ✓ Nettoye
-
-════════════════════════════════════════
-Workflow GitFlow complete!
-```
-
----
-
 ## Modes
 
 | Commande | Action |

package/templates/commands/gitflow/2-status.md

@@ -6,18 +6,65 @@ model: haiku
 
 # Phase 2: STATUS - Overview
 
-Tu es expert GitFlow et EF Core. Affiche l'etat complet du projet.
+Tu es expert GitFlow et EF Core. Affiche l'etat COMPLET du projet.
 
 ---
 
 ## Informations a collecter
 
-### Git
+### 1. BRANCHES - Vue complete
+
+#### Toutes les branches (locales et remote)
+```bash
+# Fetch pour avoir les infos a jour
+git fetch --all --quiet 2>/dev/null
+
+# Branches locales avec dernier commit
+echo "=== BRANCHES LOCALES ==="
+git for-each-ref --sort=-committerdate --format='%(refname:short)|%(objectname:short)|%(committerdate:short)|%(subject)' refs/heads
+
+# Branches remote avec dernier commit
+echo "=== BRANCHES REMOTE ==="
+git for-each-ref --sort=-committerdate --format='%(refname:short)|%(objectname:short)|%(committerdate:short)|%(subject)' refs/remotes/origin
+
+# Worktrees actifs
+echo "=== WORKTREES ==="
+git worktree list
+
+# Tracking relationships
+echo "=== TRACKING ==="
+git branch -vv
+```
+
+### 2. TAGS - Tous les tags avec details
+```bash
+# Tous les tags tries par version (newest first)
+echo "=== TAGS ==="
+git for-each-ref --sort=-v:refname --format='%(refname:short)|%(creatordate:short)|%(subject)' refs/tags
+
+# Dernier tag sur chaque branche principale
+echo "=== LATEST TAG PER BRANCH ==="
+for branch in main develop; do
+  if git rev-parse --verify $branch >/dev/null 2>&1; then
+    TAG=$(git describe --tags --abbrev=0 $branch 2>/dev/null || echo "none")
+    AHEAD=$(git rev-list --count $TAG..$branch 2>/dev/null || echo "0")
+    echo "$branch: $TAG (+$AHEAD commits)"
+  fi
+done
+
+# Quelles branches contiennent quels tags (3 derniers tags)
+echo "=== TAG CONTAINMENT ==="
+for tag in $(git tag -l --sort=-v:refname | head -3); do
+  BRANCHES=$(git branch -a --contains $tag 2>/dev/null | tr '\n' ',' | sed 's/,$//')
+  echo "$tag: $BRANCHES"
+done
+```
+
+### 3. Git Status courant
 - Branche courante et type (feature/release/hotfix/develop/main)
 - Etat working directory (clean/dirty)
 - Synchronisation locale vs remote (push/pull needed)
 - Synchronisation vs develop et main (commits ahead/behind)
-- Dernier tag
 
 ### Sync Local vs Remote
 ```bash
@@ -51,29 +98,82 @@ else
 fi
 ```
 
-### Sync develop vs main (CRITIQUE)
+### 4. COMPARAISONS - develop vs main vs releases (CRITIQUE)
 
 ```bash
+# === DEVELOP vs MAIN ===
+echo "=== DEVELOP vs MAIN ==="
+
 # Commits sur develop absents de main (normal - a releaser)
-DEVELOP_AHEAD=$(git rev-list --count origin/main..origin/develop 2>/dev/null || echo "0")
+DEVELOP_AHEAD=$(git rev-list --count main..develop 2>/dev/null || echo "0")
 
 # Commits sur main absents de develop (ANORMAL - hotfix non merge back?)
-MAIN_AHEAD=$(git rev-list --count origin/develop..origin/main 2>/dev/null || echo "0")
+MAIN_AHEAD=$(git rev-list --count develop..main 2>/dev/null || echo "0")
+
+echo "develop → main: +$DEVELOP_AHEAD commits"
+echo "main → develop: +$MAIN_AHEAD commits"
 
 # Determiner l'etat de synchronisation
 if [ "$DEVELOP_AHEAD" -eq 0 ] && [ "$MAIN_AHEAD" -eq 0 ]; then
-  BASE_SYNC="SYNCHRONIZED"
+  echo "STATUS: SYNCHRONIZED ✓"
 elif [ "$MAIN_AHEAD" -gt 0 ]; then
-  BASE_SYNC="DIVERGED"  # PROBLEME!
+  echo "STATUS: DIVERGED ⚠️ (main a des commits non merges dans develop)"
 elif [ "$DEVELOP_AHEAD" -gt 0 ]; then
-  BASE_SYNC="RELEASE_NEEDED"  # Normal
+  echo "STATUS: RELEASE_NEEDED (normal)"
 fi
+
+# === RELEASES EN COURS ===
+echo ""
+echo "=== RELEASES EN COURS ==="
+
+# Pour chaque branche release (locale et remote)
+for RELEASE in $(git branch -a | grep -E 'release/' | sed 's/.*release\//release\//' | sort -u); do
+  BRANCH_NAME=$(echo $RELEASE | sed 's/remotes\/origin\///')
+
+  # Verifier si la branche existe
+  if git rev-parse --verify $BRANCH_NAME >/dev/null 2>&1; then
+    REL_VS_DEV_AHEAD=$(git rev-list --count develop..$BRANCH_NAME 2>/dev/null || echo "0")
+    REL_VS_DEV_BEHIND=$(git rev-list --count $BRANCH_NAME..develop 2>/dev/null || echo "0")
+    REL_VS_MAIN_AHEAD=$(git rev-list --count main..$BRANCH_NAME 2>/dev/null || echo "0")
+    REL_VS_MAIN_BEHIND=$(git rev-list --count $BRANCH_NAME..main 2>/dev/null || echo "0")
+    LAST_COMMIT=$(git log -1 --format='%h %s' $BRANCH_NAME 2>/dev/null)
+
+    echo ""
+    echo "$BRANCH_NAME:"
+    echo "  vs develop: +$REL_VS_DEV_AHEAD/-$REL_VS_DEV_BEHIND"
+    echo "  vs main:    +$REL_VS_MAIN_AHEAD/-$REL_VS_MAIN_BEHIND"
+    echo "  last:       $LAST_COMMIT"
+
+    # Status
+    if [ "$REL_VS_DEV_AHEAD" -eq 0 ] && [ "$REL_VS_MAIN_AHEAD" -eq 0 ]; then
+      echo "  status:     MERGED ✓ (peut etre supprimee)"
+    elif [ "$REL_VS_DEV_AHEAD" -gt 0 ] || [ "$REL_VS_MAIN_AHEAD" -gt 0 ]; then
+      echo "  status:     ACTIVE (commits non merges)"
+    fi
+  fi
+done
+
+# === FEATURES EN COURS ===
+echo ""
+echo "=== FEATURES EN COURS ==="
+
+for FEATURE in $(git branch -a | grep -E 'feature/' | sed 's/.*feature\//feature\//' | sort -u | head -10); do
+  BRANCH_NAME=$(echo $FEATURE | sed 's/remotes\/origin\///')
+
+  if git rev-parse --verify $BRANCH_NAME >/dev/null 2>&1; then
+    FEAT_VS_DEV_AHEAD=$(git rev-list --count develop..$BRANCH_NAME 2>/dev/null || echo "0")
+    FEAT_VS_DEV_BEHIND=$(git rev-list --count $BRANCH_NAME..develop 2>/dev/null || echo "0")
+    LAST_COMMIT=$(git log -1 --format='%h %s' $BRANCH_NAME 2>/dev/null)
+
+    echo "$BRANCH_NAME: +$FEAT_VS_DEV_AHEAD/-$FEAT_VS_DEV_BEHIND | $LAST_COMMIT"
+  fi
+done
 ```
 
 **Si MAIN_AHEAD > 0 (main a des commits absents de develop):**
 ```bash
-# Lister les commits divergents
-git log origin/develop..origin/main --oneline
+echo "=== COMMITS MANQUANTS DANS DEVELOP ==="
+git log develop..main --oneline
 ```
 
 ### Version
@@ -132,70 +232,150 @@ done
 ## Affichage
 
 ```
-================================================================================
-                           GITFLOW STATUS
-================================================================================
+╔══════════════════════════════════════════════════════════════════════════════╗
+║                              GITFLOW STATUS                                  ║
+╚══════════════════════════════════════════════════════════════════════════════╝
 
 BRANCHE: {branch} ({type}) | {clean|dirty}
 VERSION: {version} ({source})
+REMOTE:  {UP-TO-DATE|AHEAD N|BEHIND N|DIVERGED|NO REMOTE}
+
+┌──────────────────────────────────────────────────────────────────────────────┐
+│ BRANCHES                                                                     │
+├──────────────────────────────────────────────────────────────────────────────┤
+│ LOCALES ({n})                                                                │
+│ ──────────────────────────────────────────────────────────────────────────── │
+│ Branch              │ Commit  │ Date       │ Message                         │
+│ ─────────────────────────────────────────────────────────────────────────────│
+│ * develop           │ 8e8069d │ 2026-01-17 │ fix(ci): use NPM_TOKEN...      │
+│   main              │ dd0cb2a │ 2026-01-17 │ chore(ci): update pipeline...  │
+│   release/v1.5.1    │ 10d2c58 │ 2026-01-17 │ chore: bump version to 1.5.1   │
+│                                                                              │
+│ REMOTE origin ({n})                                                          │
+│ ──────────────────────────────────────────────────────────────────────────── │
+│   origin/develop    │ 8e8069d │ 2026-01-17 │ fix(ci): use NPM_TOKEN...      │
+│   origin/main       │ 91d0986 │ 2026-01-16 │ feat(license): add license...  │
+│                                                                              │
+│ WORKTREES ({n})                                                              │
+│ ──────────────────────────────────────────────────────────────────────────── │
+│   01-Main           │ main           │ dd0cb2a                               │
+│   02-Develop        │ develop        │ 8e8069d (current)                     │
+│   releases/v1.4.2   │ release/v1.4.2 │ a45f239                               │
+└──────────────────────────────────────────────────────────────────────────────┘
+
+┌──────────────────────────────────────────────────────────────────────────────┐
+│ TAGS ({n} total)                                                             │
+├──────────────────────────────────────────────────────────────────────────────┤
+│ Tag     │ Date       │ Message                          │ Branches           │
+│ ─────────────────────────────────────────────────────────────────────────────│
+│ v1.5.2  │ 2026-01-17 │ Release v1.5.2 - Azure DevOps... │ main               │
+│ v1.5.1  │ 2026-01-17 │ Release v1.5.1 - Fix init...     │ main               │
+│ v1.5.0  │ 2026-01-17 │ Release v1.5.0 - Project scaf... │ develop, main      │
+│ v1.4.1  │ 2026-01-17 │ Release v1.4.1 - Patch release   │ develop, main      │
+│ v1.4.0  │ 2026-01-16 │ Release v1.4.0                   │ develop, main      │
+│                                                                              │
+│ DERNIERE VERSION PAR BRANCHE                                                 │
+│   main:    v1.5.2 (+2 commits depuis ce tag)                                 │
+│   develop: v1.5.0 (+10 commits depuis ce tag)                                │
+│                                                                              │
+│   Legende: "+N commits" = nombre de changements faits apres ce tag           │
+└──────────────────────────────────────────────────────────────────────────────┘
 
-REMOTE SYNC
-  vs origin/{branch}: {UP-TO-DATE|AHEAD N|BEHIND N|DIVERGED|NO REMOTE}
+┌──────────────────────────────────────────────────────────────────────────────┐
+│ COMPARAISONS ENTRE BRANCHES                                                  │
+├──────────────────────────────────────────────────────────────────────────────┤
+│ DEVELOP vs MAIN (Production)                                                 │
+│ ──────────────────────────────────────────────────────────────────────────── │
+│                                                                              │
+│   develop: {N} commits prets a publier en production                         │
+│            (changements sur develop non encore sur main)                     │
+│                                                                              │
+│   main:    {N} commits a recuperer dans develop                              │
+│            (changements sur main non encore sur develop)                     │
+│                                                                              │
+│   ETAT: {message selon situation}                                            │
+│   ✓ SYNCHRONISE   = develop et main sont identiques                          │
+│   ℹ️ A PUBLIER     = develop a des changements prets pour une release        │
+│   ⚠️ DESYNCHRONISE = main a des commits non recuperes (action requise)       │
+│                                                                              │
+│ {Si main a des commits non recuperes:}                                       │
+│   ⚠️ ATTENTION: {N} changements sur main non recuperes dans develop!         │
+│   ─────────────────────────────────────────────────────────────────────────  │
+│   Ces commits sont sur main mais absents de develop:                         │
+│   dd0cb2a chore(ci): update pipeline to use NPM_TOKEN variable               │
+│   3db14b6 Merge pull request 31 from release/v1.5.2 into main                │
+│                                                                              │
+│   → ACTION: Recuperer ces changements avec: git merge main                   │
+│                                                                              │
+│ RELEASES EN COURS                                                            │
+│ ──────────────────────────────────────────────────────────────────────────── │
+│ Branch          │ vs develop          │ vs main             │ Status         │
+│ ─────────────────────────────────────────────────────────────────────────────│
+│ release/v1.5.1  │ 0 a publier/25 a    │ 0 a publier/28 a    │ TERMINEE ✓     │
+│                 │ recuperer           │ recuperer           │ (supprimable)  │
+│ release/v1.4.2  │ 0 a publier/26 a    │ 0 a publier/29 a    │ TERMINEE ✓     │
+│                 │ recuperer           │ recuperer           │ (supprimable)  │
+│                                                                              │
+│ FEATURES (branches de fonctionnalites)                                       │
+│ ──────────────────────────────────────────────────────────────────────────── │
+│ feature/xxx: {N} commits a publier / {N} a recuperer de develop              │
+│              Dernier: {message du dernier commit}                            │
+└──────────────────────────────────────────────────────────────────────────────┘
 
---------------------------------------------------------------------------------
-SYNC DEVELOP <-> MAIN
---------------------------------------------------------------------------------
-  develop → main: +{DEVELOP_AHEAD} commits     {message}
-  main → develop: +{MAIN_AHEAD} commits        {message}
+┌──────────────────────────────────────────────────────────────────────────────┐
+│ EF CORE                                                                      │
+├──────────────────────────────────────────────────────────────────────────────┤
+│ Migrations: {total} total, {pending} pending                                 │
+│ [Pending] {liste}                                                            │
+│                                                                              │
+│ BRANCHES AVEC MIGRATIONS                                                     │
+│ ──────────────────────────────────────────────────────────────────────────── │
+│   feature/add-users    +1 migration (AddUsersTable)      Conflit: NON        │
+│   feature/add-orders   +1 migration (AddOrdersTable)     Conflit: NON        │
+│   feature/add-products +2 migrations                     Conflit: OUI ⚠️     │
+│                                                                              │
+│ ORDRE DE MERGE RECOMMANDE:                                                   │
+│   1. feature/add-users (independant)                                         │
+│   2. feature/add-orders (independant)                                        │
+│   3. feature/add-products (rebase requis apres #1 et #2)                     │
+└──────────────────────────────────────────────────────────────────────────────┘
 
-  {Si DEVELOP_AHEAD > 0 et MAIN_AHEAD == 0:}
-  ✓ Normal: develop a {N} commits prets a releaser
-  → Action: /gitflow:10-start release
+PLANS: {n} active | OPERATIONS: {none|rebase|merge} | RISKS: {liste}
 
-  {Si MAIN_AHEAD > 0:}
-  ⚠️ ATTENTION: main contient {N} commits absents de develop!
+══════════════════════════════════════════════════════════════════════════════
+ ACTIONS A FAIRE
+══════════════════════════════════════════════════════════════════════════════
 
-  Commits sur main non merges dans develop:
-  {git log origin/develop..origin/main --oneline}
+{Generer cette section dynamiquement selon l'etat detecte}
+{Chaque action = 1 ligne description + 1 bloc code copiable}
 
-  Causes possibles:
-  - Hotfix non merge back dans develop
-  - Commit direct sur main (non recommande)
-  - Release mal finalisee
+EXEMPLES DE FORMAT:
 
-  → Actions:
-    1. Merger main dans develop: git merge origin/main
-    2. Ou via release: /gitflow:10-start release (reset main)
+⚠️ Recuperer 3 commits de main dans develop
+git merge main
 
-  {Si DEVELOP_AHEAD == 0 et MAIN_AHEAD == 0:}
-  ✓ Synchronise: develop et main sont identiques
---------------------------------------------------------------------------------
+ℹ️ Creer une release (10 commits prets pour production)
+/gitflow:start release v1.6.0
 
-DERNIER TAG: {tag}
+✓ Merger feature/add-users dans develop (prete, 0 conflit)
+/gitflow:finish feature/add-users
 
-EF CORE (branche courante)
-  Migrations: {total} total, {pending} pending
-  [Pending] {liste}
+↻ Mettre a jour feature/add-orders (15 commits a recuperer de develop)
+/gitflow:rebase feature/add-orders
 
---------------------------------------------------------------------------------
-BRANCHES ACTIVES ({features} features, {releases} releases, {hotfixes} hotfixes)
---------------------------------------------------------------------------------
-{Si branches actives avec migrations:}
-  feature/add-users        +1 migration  (AddUsersTable)      Conflit: NON
-  feature/add-orders       +1 migration  (AddOrdersTable)     Conflit: NON
-  feature/add-products     +2 migrations (AddProducts, AddFK) Conflit: OUI
+🗑️ Nettoyer release/v1.5.1 (terminee, supprimable)
+/gitflow:cleanup release/v1.5.1
 
-  ORDRE DE MERGE RECOMMANDE:
-  1. feature/add-users (independant)
-  2. feature/add-orders (independant)
-  3. feature/add-products (conflit ModelSnapshot - rebase requis)
---------------------------------------------------------------------------------
+🗑️ Nettoyer release/v1.4.2 (terminee, supprimable)
+/gitflow:cleanup release/v1.4.2
 
-PLANS: {n} active | OPERATIONS: {none|rebase|merge} | RISKS: {liste}
+💾 Sauvegarder les modifications en cours (3 fichiers modifies)
+/gitflow:commit "description des changements"
+
+↑ Envoyer develop vers le serveur (5 commits non publies)
+/gitflow:sync develop
 
-================================================================================
-Actions: /gitflow:13-sync | /gitflow:14-rebase | /gitflow:3-commit | /gitflow:4-plan
-================================================================================
+══════════════════════════════════════════════════════════════════════════════
 ```
 
 ---