@atlashub/smartstack-cli 1.17.0 → 1.18.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlashub/smartstack-cli",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "description": "SmartStack Claude Code automation toolkit - GitFlow, APEX, EF Core migrations, prompts and more",
   "author": {
     "name": "SmartStack",

package/templates/agents/efcore/db-deploy.md

@@ -4,12 +4,17 @@ description: EF Core database deploy - apply pending migrations
 color: green
 model: haiku
 tools: Bash, Glob
+steps:
+  - steps/shared/step-00-init.md
+  - steps/db/step-deploy.md
 ---
 
 # EF Core Database Deploy Agent
 
 Applies pending migrations to the local database.
 
+**Progressive Steps:** Load `steps/db/step-deploy.md` for detailed instructions.
+
 ## Workflow
 
 1. **Verify** appsettings.Local.json exists

package/templates/agents/efcore/db-reset.md

@@ -4,12 +4,17 @@ description: EF Core database reset - drop and recreate (DESTRUCTIVE)
 color: red
 model: sonnet
 tools: Bash, Glob, Read
+steps:
+  - steps/shared/step-00-init.md
+  - steps/db/step-reset.md
 ---
 
 # EF Core Database Reset Agent
 
 **WARNING: Destructive operation - deletes all data!**
 
+**Progressive Steps:** Load `steps/db/step-reset.md` for detailed instructions.
+
 > **CLAUDE INSTRUCTION:** The `AskUserQuestion({...})` blocks are instructions to use the `AskUserQuestion` tool **interactively**. You MUST execute the tool with these parameters to get the user's response BEFORE continuing.
 
 ## Workflow

package/templates/agents/efcore/db-seed.md

@@ -4,12 +4,17 @@ description: EF Core database seed - populate test data
 color: yellow
 model: haiku
 tools: Bash, Glob, Read
+steps:
+  - steps/shared/step-00-init.md
+  - steps/db/step-seed.md
 ---
 
 # EF Core Database Seed Agent
 
 Populates the database with test data.
 
+**Progressive Steps:** Load `steps/db/step-seed.md` for detailed instructions.
+
 ## Workflow
 
 1. **Detect** available seeding method:

package/templates/agents/efcore/db-status.md

@@ -5,12 +5,17 @@ color: blue
 model: haiku
 tools: Bash, Glob
 mcp: mcp__smartstack__check_migrations
+steps:
+  - steps/shared/step-00-init.md
+  - steps/db/step-status.md
 ---
 
 # EF Core Database Status Agent
 
 Fast check of EF Core migration state using **SmartStack MCP**.
 
+**Progressive Steps:** Load `steps/db/step-status.md` for detailed instructions.
+
 ## Workflow
 
 1. **Invoke MCP** for migration list and naming validation

package/templates/agents/efcore/migration.md

@@ -4,12 +4,20 @@ description: EF Core migration manager - orchestrates MCP for naming (1 per feat
 color: magenta
 model: sonnet
 tools: Bash, Glob, Read, Edit
+steps:
+  - steps/shared/step-00-init.md
+  - steps/migration/step-00-init.md
+  - steps/migration/step-01-check.md
+  - steps/migration/step-02-create.md
+  - steps/migration/step-03-validate.md
 ---
 
 # EF Core Migration Agent
 
 Orchestrates migration creation with the "1 migration per feature" rule.
 
+**Progressive Steps:** Load `steps/migration/` for detailed instructions.
+
 > **IMPORTANT:** Cet agent **ORCHESTRE** uniquement. Le nommage est **DÉLÉGUÉ AU MCP**.
 
 > **CLAUDE INSTRUCTION:** The `AskUserQuestion({...})` blocks are instructions to use the `AskUserQuestion` tool **interactively**. You MUST execute the tool with these parameters to get the user's response BEFORE continuing.

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

@@ -4,12 +4,21 @@ description: EF Core snapshot rebaser - resync ModelSnapshot with develop
 color: yellow
 model: sonnet
 tools: Bash, Glob, Read, Edit
+steps:
+  - steps/shared/step-00-init.md
+  - steps/rebase-snapshot/step-00-init.md
+  - steps/rebase-snapshot/step-01-backup.md
+  - steps/rebase-snapshot/step-02-fetch.md
+  - steps/rebase-snapshot/step-03-create.md
+  - steps/rebase-snapshot/step-04-validate.md
 ---
 
 # EF Core Rebase-Snapshot Agent
 
 Rebases ModelSnapshot on develop to resolve conflicts.
 
+**Progressive Steps:** Load `steps/rebase-snapshot/` for detailed instructions.
+
 ## Workflow
 
 1. **Backup** all migrations

package/templates/agents/efcore/squash.md

@@ -4,22 +4,33 @@ description: EF Core migration squasher - combine multiple migrations into one
 color: magenta
 model: sonnet
 tools: Bash, Glob, Read
+steps:
+  - steps/shared/step-00-init.md
+  - steps/squash/step-00-init.md
+  - steps/squash/step-01-backup.md
+  - steps/squash/step-02-fetch.md
+  - steps/squash/step-03-create.md
+  - steps/squash/step-04-validate.md
 ---
 
 # EF Core Squash Agent
 
-Consolide plusieurs migrations en une seule, en récupérant le ModelSnapshot de la branche parente.
+Consolide plusieurs migrations en une seule, en récupérant le ModelSnapshot **ET les migrations** de la branche parente.
+
+**Progressive Steps:** Load `steps/squash/` for detailed instructions.
 
 ## Principe Fondamental
 
 ```
-RÈGLE D'OR: Toujours récupérer le snapshot de la branche PARENTE
+RÈGLE D'OR: Récupérer SNAPSHOT + MIGRATIONS de la branche PARENTE
 
-feature/* → snapshot de develop
-develop   → snapshot de main
-release/* → snapshot de main
-hotfix/*  → snapshot de main
+feature/* → snapshot + migrations de develop
+develop   → snapshot + migrations de main
+release/* → snapshot + migrations de main
+hotfix/*  → snapshot + migrations de main
 main      → BLOQUÉ (jamais squash)
+
+⚠️ Ne JAMAIS récupérer uniquement le snapshot sans les migrations!
 ```
 
 ## Workflow
@@ -28,16 +39,17 @@ main      → BLOQUÉ (jamais squash)
 2. **List**: Migrations propres à cette branche (pas héritées)
 3. **Confirm**: Demander validation utilisateur
 4. **Backup**: Sauvegarder tous les fichiers
-5. **Fetch**: Récupérer ModelSnapshot de branche parente
-6. **Delete**: Supprimer migrations de la branche
-7. **Create**: Créer migration consolidée
+5. **Fetch**: Récupérer **ModelSnapshot ET migrations** de branche parente (CRUCIAL!)
+6. **Delete**: Supprimer migrations de la branche UNIQUEMENT
+7. **Create**: Créer migration consolidée (MCP obligatoire)
 8. **Validate**: Build + script OK
 
 ## Commandes Clés
 
 ```bash
-# Déterminer branche parente
-determine_base_branch  # → BASE_BRANCH, BRANCH_TYPE
+# Déterminer branche parente et DbContext
+determine_base_branch   # → BASE_BRANCH, BRANCH_TYPE
+detect_efcore_project   # → $DBCONTEXT, $DBCONTEXT_TYPE, $SCHEMA
 
 # Identifier migrations propres à la branche
 BASE_MIGS=$(git ls-tree -r --name-only "origin/$BASE_BRANCH" -- Migrations/ | grep "\.cs$" | grep -v "Designer\|Snapshot")
@@ -47,16 +59,24 @@ LOCAL_MIGS=$(find Migrations -name "*.cs" | grep -v Designer | grep -v Snapshot)
 BACKUP_DIR=".claude/gitflow/backup/migrations/squash_$(date +%Y%m%d_%H%M%S)"
 mkdir -p "$BACKUP_DIR" && cp Migrations/*.cs "$BACKUP_DIR/"
 
-# CRUCIAL: Récupérer snapshot ET migrations de la branche parente
+# ═══════════════════════════════════════════════════════════════════════════
+# CRUCIAL: Récupérer SNAPSHOT + MIGRATIONS de la branche parente
+# ═══════════════════════════════════════════════════════════════════════════
 git fetch origin "$BASE_BRANCH"
+
+# 1. Récupérer le ModelSnapshot
 git checkout "origin/$BASE_BRANCH" -- Migrations/*ModelSnapshot.cs
+echo "✅ Snapshot récupéré de origin/$BASE_BRANCH"
 
-# Récupérer les migrations de la branche parente (pour ne pas les perdre)
+# 2. Récupérer TOUTES les migrations de la branche parente
+# ⚠️ OBLIGATOIRE: Sans ça, les migrations de develop/main seront perdues!
 for base_mig in $BASE_MIGS; do
   base_name=$(basename "${base_mig%.cs}")
   git checkout "origin/$BASE_BRANCH" -- "Migrations/${base_name}.cs" 2>/dev/null || true
   git checkout "origin/$BASE_BRANCH" -- "Migrations/${base_name}.Designer.cs" 2>/dev/null || true
+  echo "  ✅ $base_name récupéré"
 done
+echo "✅ $(echo "$BASE_MIGS" | wc -l) migrations récupérées de origin/$BASE_BRANCH"
 
 # Supprimer migrations de la branche uniquement
 for mig in $BRANCH_ONLY_MIGRATIONS; do
@@ -64,10 +84,11 @@ for mig in $BRANCH_ONLY_MIGRATIONS; do
 done
 
 # Créer migration consolidée - UTILISER MCP OBLIGATOIRE
-mcp__smartstack__suggest_migration({ description: "...", context: "core" })
-# Résultat: core_v1.0.0_001_Description
+# $DBCONTEXT_TYPE = "core" ou "extensions" (de detect_efcore_project)
+mcp__smartstack__suggest_migration({ description: "...", context: DBCONTEXT_TYPE })
+# Résultat: core_v1.9.0_001_Description
 
-dotnet ef migrations add "$MIGRATION_NAME_FROM_MCP"
+dotnet ef migrations add "$MIGRATION_NAME_FROM_MCP" --context "$DBCONTEXT"
 
 # Valider
 dotnet build && dotnet ef migrations script --idempotent > /dev/null
@@ -79,7 +100,9 @@ dotnet build && dotnet ef migrations script --idempotent > /dev/null
 - [ ] main/master = BLOQUÉ
 - [ ] User confirmation obtenue
 - [ ] Backup créé
-- [ ] Snapshot parent récupéré
+- [ ] **Snapshot parent récupéré** (origin/$BASE_BRANCH)
+- [ ] **Migrations parent récupérées** (fichiers .cs ET .Designer.cs)
+- [ ] Migrations de la branche supprimées (pas celles héritées!)
 - [ ] Build OK après squash
 - [ ] Script générable
 
@@ -87,9 +110,16 @@ dotnet build && dotnet ef migrations script --idempotent > /dev/null
 
 ```
 SQUASH - {current_branch}
-  Base:   {BASE_BRANCH} (snapshot récupéré)
-  Avant:  {N} migrations (propres à cette branche)
-  Apres:  1 migration consolidée
+  Base:   origin/{BASE_BRANCH}
+
+  Récupéré de {BASE_BRANCH}:
+    ✅ ModelSnapshot
+    ✅ {N} migrations (fichiers .cs + .Designer.cs)
+
+  Consolidé:
+    Avant:  {M} migrations (propres à cette branche)
+    Après:  1 migration ({MIGRATION_NAME} via MCP)
+
   Backup: .claude/gitflow/backup/migrations/squash_{timestamp}/
 
 Prochains: /efcore:db-reset, /efcore:db-deploy

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
@@ -139,14 +142,16 @@ echo "  - $(echo "$BASE_MIGRATIONS" | wc -l) migrations"
 
 **Résultat attendu:**
 ```
-feature/* après squash:
-├── Core_v1_9_0_001_InitialSchema.cs       ← De develop (conservé)
-├── Core_v1_9_0_001_InitialSchema.Designer.cs
-├── core_v1.0.0_001_FeatureConsolidated.cs ← Squash de la feature
-├── core_v1.0.0_001_FeatureConsolidated.Designer.cs
-└── CoreDbContextModelSnapshot.cs          ← De develop
+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)
@@ -194,20 +199,27 @@ esac
 **Appel MCP OBLIGATOIRE:**
 
 ```javascript
-// Utiliser le MCP pour obtenir le nom conforme
+// $DESCRIPTION = construit ci-dessus (ex: "multitenant Consolidated")
+// $DBCONTEXT_TYPE = "core" ou "extensions" (de detect_dbcontext)
+
 mcp__smartstack__suggest_migration({
-  description: DESCRIPTION,  // Ex: "multitenant Consolidated"
-  context: "core"            // ou "extensions" selon le projet
+  description: DESCRIPTION,
+  context: DBCONTEXT_TYPE    // JAMAIS hardcodé!
 })
 
-// Résultat: core_v1.0.0_001_MultitenantConsolidated
+// 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.0.0_001_MultitenantConsolidated)
+# 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 \

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>