@atlashub/smartstack-cli 1.16.0 → 1.18.0

package/templates/commands/efcore/migration.md

@@ -29,12 +29,31 @@ Options: `--force`, `--no-cross-check`, `--rebase-first`
 
 ---
 
-## STEP 1: Contexte Git
+## STEP 1: Contexte Git et DbContext
 
 ```bash
 CURRENT_BRANCH=$(git branch --show-current)
 # Extraire type (feature/hotfix/release) et nom
-detect_efcore_project
+detect_efcore_project   # Appelle detect_dbcontext() automatiquement
+
+echo "DbContext: $DBCONTEXT ($DBCONTEXT_TYPE)"
+echo "Schema: $SCHEMA"
+```
+
+**Si DbContext non détecté automatiquement :**
+
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "Quel DbContext utiliser pour cette migration ?",
+    header: "DbContext",
+    options: [
+      { label: "CoreDbContext", description: "Entités SmartStack (User, Role, Navigation...)" },
+      { label: "ExtensionsDbContext", description: "Entités client spécifiques" }
+    ],
+    multiSelect: false
+  }]
+})
 ```
 
 ---
@@ -68,32 +87,61 @@ AskUserQuestion({
 
 ---
 
-## STEP 4: Nom Migration
+## STEP 4: Nom Migration (via MCP)
+
+**OBLIGATOIRE : Utiliser le MCP pour le nommage conforme**
 
 Pattern: `{context}_v{version}_{sequence}_{Description}`
 
+**4.1 Demander la description à l'utilisateur :**
+
 ```javascript
 AskUserQuestion({
   questions: [{
-    question: "Description courte (ex: AddUserRoles)",
+    question: "Description courte de la migration (ex: Add User Roles)",
     header: "Description",
     options: [
-      { label: "Add", description: "Ajout tables/colonnes" },
-      { label: "Update", description: "Modification structure" },
-      { label: "Fix", description: "Correction schéma" },
-      { label: "Remove", description: "Suppression éléments" }
+      { label: "Add...", description: "Ajout tables/colonnes" },
+      { label: "Update...", description: "Modification structure" },
+      { label: "Fix...", description: "Correction schéma" },
+      { label: "Remove...", description: "Suppression éléments" }
     ],
     multiSelect: false
   }]
 })
+// L'utilisateur peut aussi saisir un texte libre
 ```
 
+**4.2 Appeler le MCP pour obtenir le nom conforme :**
+
+```javascript
+// $DESCRIPTION = réponse de l'utilisateur (ex: "Add User Roles")
+// $DBCONTEXT_TYPE = "core" ou "extensions" (de detect_dbcontext)
+
+mcp__smartstack__suggest_migration({
+  description: DESCRIPTION,
+  context: DBCONTEXT_TYPE
+})
+
+// Résultat: core_v1.8.0_001_AddUserRoles
+```
+
+> **INTERDIT :** Calculer le nom manuellement. Toujours déléguer au MCP.
+
 ---
 
 ## STEP 5: Création
 
 ```bash
-dotnet ef migrations add "$MIGRATION_NAME" -o Persistence/Migrations --verbose
+# $MIGRATION_NAME = résultat du MCP
+# $DBCONTEXT = CoreDbContext ou ExtensionsDbContext (de detect_dbcontext)
+
+dotnet ef migrations add "$MIGRATION_NAME" \
+  --context "$DBCONTEXT" \
+  --project "$INFRA_PROJECT" \
+  --startup-project "$STARTUP_PROJECT" \
+  -o Persistence/Migrations \
+  --verbose
 ```
 
 ---

package/templates/commands/efcore/rebase-snapshot.md

@@ -18,7 +18,29 @@ model: sonnet
 CURRENT_BRANCH=$(git branch --show-current)
 [[ ! $CURRENT_BRANCH =~ ^(feature|release|hotfix)/ ]] && exit 1
 [ -n "$(git status --porcelain)" ] && { echo "Working directory non clean"; exit 1; }
-detect_efcore_project
+
+# Détecte projet ET DbContext (core vs extensions)
+detect_efcore_project   # Appelle detect_dbcontext() automatiquement
+determine_base_branch   # Détermine la branche parente
+
+echo "DbContext: $DBCONTEXT ($DBCONTEXT_TYPE)"
+echo "Branche parente: $BASE_BRANCH"
+```
+
+**Si DbContext non détecté automatiquement :**
+
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "Quel DbContext utiliser ?",
+    header: "DbContext",
+    options: [
+      { label: "CoreDbContext", description: "Entités SmartStack" },
+      { label: "ExtensionsDbContext", description: "Entités client" }
+    ],
+    multiSelect: false
+  }]
+})
 ```
 
 ---
@@ -69,11 +91,42 @@ done
 
 ## STEP 6: Régénérer Migration Consolidée
 
+**OBLIGATOIRE : Utiliser le MCP pour le nommage conforme**
+
+```bash
+# Construire la description
+BRANCH_NAME_CLEAN=$(echo "$CURRENT_BRANCH" | sed 's|.*/||' | sed 's/-/ /g')
+DESCRIPTION="${BRANCH_NAME_CLEAN} Consolidated"
+```
+
+**Appel MCP OBLIGATOIRE :**
+
+```javascript
+// Obtenir le nom conforme via MCP
+mcp__smartstack__suggest_migration({
+  description: DESCRIPTION,           // Ex: "user auth Consolidated"
+  context: DBCONTEXT_TYPE             // "core" ou "extensions" (de detect_dbcontext)
+})
+
+// Résultat: core_v1.7.0_001_UserAuthConsolidated
+```
+
+**Puis créer la migration :**
+
 ```bash
-MIGRATION_NAME="${BRANCH_TYPE}_${VERSION}_${BRANCH_NAME}_Consolidated"
-dotnet ef migrations add "$MIGRATION_NAME" -o Persistence/Migrations --verbose
+# $MIGRATION_NAME = résultat du MCP
+# $DBCONTEXT = CoreDbContext ou ExtensionsDbContext
+
+dotnet ef migrations add "$MIGRATION_NAME" \
+  --context "$DBCONTEXT" \
+  --project "$INFRA_PROJECT" \
+  --startup-project "$STARTUP_PROJECT" \
+  -o Persistence/Migrations \
+  --verbose
 ```
 
+> **Convention :** `{context}_v{version}_{sequence}_{Description}` - Jamais de nom hardcodé
+
 ---
 
 ## STEP 7: Validation

package/templates/commands/efcore/squash.md

@@ -48,7 +48,10 @@ determine_base_branch  # Voir _shared.md
 ```bash
 CURRENT_BRANCH=$(git branch --show-current)
 [ -n "$(git status --porcelain)" ] && { echo "Working directory non propre"; exit 1; }
-detect_efcore_project
+detect_efcore_project   # Appelle detect_dbcontext() → $DBCONTEXT, $DBCONTEXT_TYPE, $SCHEMA
+
+echo "DbContext: $DBCONTEXT ($DBCONTEXT_TYPE)"
+echo "Schema: $SCHEMA"
 
 # Compter migrations LOCALES uniquement (pas celles héritées)
 git fetch origin "$BASE_BRANCH" --quiet
@@ -103,24 +106,52 @@ echo "Backup: $BACKUP_DIR"
 
 ---
 
-## STEP 4: Récupérer ModelSnapshot de la Branche Parente (CRUCIAL)
+## STEP 4: Récupérer Migrations ET Snapshot de la Branche Parente (CRUCIAL)
 
 ```bash
 # Sauvegarder snapshot actuel
 cp "$MIGRATIONS_DIR"/*ModelSnapshot.cs "$BACKUP_DIR/"
 
-# Récupérer le snapshot de la branche parente
+# Récupérer TOUTES les migrations de la branche parente
 git fetch origin "$BASE_BRANCH" --quiet
+
+# 1. Récupérer le ModelSnapshot
 git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_DIR"/*ModelSnapshot.cs
 
-echo "ModelSnapshot récupéré depuis: origin/$BASE_BRANCH"
+# 2. Récupérer les fichiers de migration de la branche parente
+# (pour ne pas perdre les migrations déjà présentes sur develop/main)
+for base_mig in $BASE_MIGRATIONS; do
+  base_file=$(basename "$base_mig")
+  base_name="${base_file%.cs}"
+
+  # Récupérer le fichier migration ET son Designer
+  git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_DIR/${base_name}.cs" 2>/dev/null || true
+  git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_DIR/${base_name}.Designer.cs" 2>/dev/null || true
+done
+
+echo "Récupéré depuis origin/$BASE_BRANCH:"
+echo "  - ModelSnapshot"
+echo "  - $(echo "$BASE_MIGRATIONS" | wc -l) migrations"
 ```
 
 **Pourquoi c'est crucial:**
 - Le snapshot de `$BASE_BRANCH` contient l'état VALIDÉ et COMPLET
+- Les **migrations existantes** de `$BASE_BRANCH` doivent être conservées
 - Les migrations parallèles sur d'autres branches sont incluses
 - Évite la perte d'information de schéma (cf. [Bokio best practices](https://www.bokio.se/engineering-blog/how-to-squash-ef-core-migrations/))
 
+**Résultat attendu:**
+```
+feature/multitenant après squash:
+├── core_v1.8.0_001_InitialSchema.cs          ← De develop (conservé)
+├── core_v1.8.0_001_InitialSchema.Designer.cs
+├── core_v1.9.0_001_MultitenantConsolidated.cs     ← Squash de la feature (MCP)
+├── core_v1.9.0_001_MultitenantConsolidated.Designer.cs
+└── CoreDbContextModelSnapshot.cs             ← De develop
+```
+
+⚠️ **ATTENTION:** Si le résultat ne montre pas les migrations de develop, le squash a échoué!
+
 ---
 
 ## STEP 5: Supprimer Migrations de la Branche (pas celles héritées)
@@ -139,36 +170,64 @@ echo "Supprimé: ${#BRANCH_ONLY_MIGRATIONS[@]} migrations"
 
 ## STEP 6: Créer Migration Consolidée
 
+**OBLIGATOIRE: Utiliser le MCP pour le nommage conforme**
+
 ```bash
-# Nommage selon contexte
+# Construire la description selon le contexte
 case "$BRANCH_TYPE" in
   feature)
-    BRANCH_NAME=$(echo "$CURRENT_BRANCH" | sed 's|feature/||')
-    MIGRATION_NAME="Feature_${BRANCH_NAME}_Consolidated"
+    BRANCH_NAME=$(echo "$CURRENT_BRANCH" | sed 's|feature/||' | sed 's/-/ /g')
+    DESCRIPTION="${BRANCH_NAME} Consolidated"
     ;;
   release)
-    VERSION=$(echo "$CURRENT_BRANCH" | sed 's|release/||' | tr '.' '_')
-    MIGRATION_NAME="Release_${VERSION}_Initial"
+    VERSION=$(echo "$CURRENT_BRANCH" | sed 's|release/||')
+    DESCRIPTION="Release ${VERSION} Initial"
     ;;
   hotfix)
-    VERSION=$(echo "$CURRENT_BRANCH" | sed 's|hotfix/||' | tr '.' '_')
-    MIGRATION_NAME="Hotfix_${VERSION}_Fix"
+    VERSION=$(echo "$CURRENT_BRANCH" | sed 's|hotfix/||')
+    DESCRIPTION="Hotfix ${VERSION} Fix"
     ;;
   develop)
-    MIGRATION_NAME="Develop_Consolidated_$(date +%Y%m%d)"
+    DESCRIPTION="Develop Consolidated"
     ;;
   *)
-    MIGRATION_NAME="Consolidated_$(date +%Y%m%d_%H%M%S)"
+    DESCRIPTION="Consolidated"
     ;;
 esac
+```
+
+**Appel MCP OBLIGATOIRE:**
+
+```javascript
+// $DESCRIPTION = construit ci-dessus (ex: "multitenant Consolidated")
+// $DBCONTEXT_TYPE = "core" ou "extensions" (de detect_dbcontext)
+
+mcp__smartstack__suggest_migration({
+  description: DESCRIPTION,
+  context: DBCONTEXT_TYPE    // JAMAIS hardcodé!
+})
+
+// Résultat: core_v1.9.0_001_MultitenantConsolidated
+```
+
+> **INTERDIT :** Calculer le nom manuellement ou hardcoder le context.
+
+**Puis créer la migration:**
+
+```bash
+# MIGRATION_NAME = résultat du MCP (ex: core_v1.9.0_001_MultitenantConsolidated)
+# DBCONTEXT = CoreDbContext ou ExtensionsDbContext (de detect_dbcontext)
 
 dotnet ef migrations add "$MIGRATION_NAME" \
+  --context "$DBCONTEXT" \
   --project "$INFRA_PROJECT" \
   --startup-project "$STARTUP_PROJECT" \
   -o Persistence/Migrations \
   --verbose
 ```
 
+> **Convention:** `{context}_v{version}_{sequence}_{Description}` - Jamais de nom hardcodé
+
 ---
 
 ## STEP 7: Validation
@@ -192,11 +251,19 @@ dotnet ef migrations script --no-build --idempotent > /dev/null
 
 ```
 SQUASH - {CURRENT_BRANCH}
-  Base:       {BASE_BRANCH} (snapshot récupéré)
-  Backup:     {BACKUP_DIR}
-  Avant:      {MIGRATION_COUNT} migrations
-  Apres:      1 migration ({MIGRATION_NAME})
-  Conformite: EF Core CLI, Pas de .sql, Snapshot parent
+  Base:         {BASE_BRANCH}
+  Backup:       {BACKUP_DIR}
+
+  Récupéré de {BASE_BRANCH}:
+    - ModelSnapshot
+    - {BASE_MIGRATION_COUNT} migrations (conservées)
+
+  Consolidé:
+    - Avant:  {MIGRATION_COUNT} migrations (propres à la branche)
+    - Après:  1 migration ({MIGRATION_NAME})
+
+  Total final: {BASE_MIGRATION_COUNT + 1} migrations
+  Conformité:  MCP suggest_migration, EF Core CLI, Snapshot parent
 
 Prochains: /efcore:db-reset, /efcore:db-deploy, /gitflow:3-commit
 ```

package/templates/skills/efcore/SKILL.md

@@ -0,0 +1,162 @@
+---
+name: efcore
+description: EF Core Commands - Migration and database management
+argument-hint: "<command> [options]"
+---
+
+<objective>
+Manage EF Core migrations and database operations with progressive step loading, MCP validation, and DbContext auto-detection.
+</objective>
+
+<quick_start>
+**Database operations:**
+```bash
+/efcore db-status          # Check migration status
+/efcore db-deploy          # Apply pending migrations
+/efcore db-reset           # Drop + recreate database
+/efcore db-seed            # Populate with test data
+```
+
+**Migration operations:**
+```bash
+/efcore migration          # Create migration for current branch
+/efcore squash             # Consolidate branch migrations
+/efcore rebase-snapshot    # Sync snapshot with parent branch
+/efcore scan               # Scan for cross-branch conflicts
+/efcore conflicts          # Analyze migration conflicts
+```
+</quick_start>
+
+<parameters>
+
+<subcommands>
+| Command | Description | Steps |
+|---------|-------------|-------|
+| `db-status` | Display migrations and database status | steps/db/status/ |
+| `db-deploy` | Apply pending migrations | steps/db/deploy/ |
+| `db-reset` | Drop + recreate database | steps/db/reset/ |
+| `db-seed` | Populate with test data | steps/db/seed/ |
+| `migration` | Create/recreate migration | steps/migration/ |
+| `squash` | Consolidate migrations | steps/squash/ |
+| `rebase-snapshot` | Sync snapshot with parent | steps/rebase-snapshot/ |
+| `scan` | Scan for conflicts | (MCP-centric) |
+| `conflicts` | Analyze conflicts | (MCP-centric) |
+</subcommands>
+
+<flags>
+| Flag | Description |
+|------|-------------|
+| `--context <name>` | Specify DbContext (CoreDbContext/ExtensionsDbContext) |
+| `--env <name>` | Use appsettings.{name}.json |
+| `--verbose` | Show detailed output |
+| `--force` | Skip confirmations |
+| `--dry-run` | Preview without executing |
+</flags>
+
+</parameters>
+
+<state_variables>
+**Shared state across all steps:**
+
+| Variable | Type | Description |
+|----------|------|-------------|
+| `{command}` | string | Current subcommand |
+| `{dbcontext}` | string | CoreDbContext or ExtensionsDbContext |
+| `{dbcontext_type}` | string | "core" or "extensions" |
+| `{schema}` | string | Database schema |
+| `{infra_project}` | string | Path to Infrastructure project |
+| `{startup_project}` | string | Path to API/Web project |
+| `{migrations_dir}` | string | Path to Migrations folder |
+| `{base_branch}` | string | Parent branch (develop/main) |
+| `{branch_type}` | string | feature/release/hotfix |
+| `{auto_mode}` | boolean | Skip confirmations |
+</state_variables>
+
+<entry_point>
+
+**ROUTING LOGIC:**
+
+1. Parse command and flags from input
+2. Load shared init step: `steps/shared/step-00-init.md`
+3. Route to command-specific steps:
+
+| Command | Route To |
+|---------|----------|
+| `db-status` | `steps/db/step-status.md` |
+| `db-deploy` | `steps/db/step-deploy.md` |
+| `db-reset` | `steps/db/step-reset.md` |
+| `db-seed` | `steps/db/step-seed.md` |
+| `migration` | `steps/migration/step-00-init.md` |
+| `squash` | `steps/squash/step-00-init.md` |
+| `rebase-snapshot` | `steps/rebase-snapshot/step-00-init.md` |
+| `scan` | Use `commands/efcore/scan.md` (MCP-centric, no steps) |
+| `conflicts` | Use `commands/efcore/conflicts.md` (MCP-centric, no steps) |
+
+</entry_point>
+
+<shared_functions>
+**Always load first:** `steps/shared/step-00-init.md`
+
+This step provides:
+- `detect_efcore_project()` - Find EF Core project files
+- `detect_dbcontext()` - Auto-detect Core vs Extensions
+- `detect_environment()` - Load connection string
+- `determine_base_branch()` - Find parent branch
+- `block_production()` - Safety check
+
+**MCP Integration:**
+- `mcp__smartstack__suggest_migration` - Generate compliant names
+- `mcp__smartstack__check_migrations` - Analyze conflicts
+- `mcp__smartstack__validate_conventions` - Validate structure
+</shared_functions>
+
+<dual_dbcontext>
+SmartStack uses **two separate DbContexts**:
+
+| Context | DbContext | Schema | History Table |
+|---------|-----------|--------|---------------|
+| `core` | `CoreDbContext` | `core` | `core.__EFMigrationsHistory` |
+| `extensions` | `ExtensionsDbContext` | `extensions` | `extensions.__EFMigrationsHistory` |
+
+**Auto-detection priority:**
+1. SmartStack.Domain exists → CoreDbContext
+2. Client with SmartStack NuGet → ExtensionsDbContext
+3. Code scan for DbContext classes
+4. Ask user if ambiguous
+</dual_dbcontext>
+
+<naming_convention>
+**Migration naming (MCP MANDATORY):**
+
+Pattern: `{context}_v{version}_{sequence}_{Description}`
+
+Examples:
+- `core_v1.9.0_001_AddUserRoles`
+- `extensions_v1.2.0_001_AddCustomFields`
+
+**FORBIDDEN:** Manual name calculation. Always use MCP.
+</naming_convention>
+
+<safety_rules>
+1. **Backup MANDATORY** for destructive operations
+2. **Production BLOCKED** - Never run on production
+3. **1 migration per feature** - Recreate, don't accumulate
+4. **Snapshot + Migrations** - Always recover BOTH from parent
+5. **MCP for naming** - Never hardcode migration names
+</safety_rules>
+
+<execution_rules>
+- **Load one step at a time** - Progressive loading
+- **State persists** - Variables carry across steps
+- **Follow next_step** - Each step defines next
+- **MCP validation** - Use SmartStack tools
+- **Safety > Correctness > Speed**
+</execution_rules>
+
+<success_criteria>
+- DbContext correctly detected
+- Migrations created with MCP naming
+- Database operations succeed
+- Parent migrations preserved (for squash/rebase)
+- Build passes after changes
+</success_criteria>