@atlashub/smartstack-cli 1.4.1 → 1.5.1

package/templates/commands/efcore/_env-check.md

@@ -1,153 +1,153 @@
-# EF Core Environment Check (Shared Step)
-
-> **Usage:** Include ce step dans toutes les commandes EF Core qui interagissent avec la base de donnees.
-
----
-
-## STEP 0: Verification environnement et connexion
-
-### 0.1 Detecter les fichiers appsettings disponibles
-
-```bash
-# Scanner les fichiers appsettings dans le projet API
-API_DIR=$(find . -type d -name "*.Api" -o -name "*Web" | head -1)
-if [ -z "$API_DIR" ]; then
-  API_DIR="."
-fi
-
-# Lister tous les appsettings
-APPSETTINGS_FILES=$(find "$API_DIR" -maxdepth 1 -name "appsettings*.json" 2>/dev/null | sort)
-```
-
-### 0.2 Determiner l'environnement a utiliser
-
-**Priorite:**
-1. Flag `--env {Environment}` si fourni
-2. `appsettings.Local.json` (defaut recommande)
-3. Erreur si aucun fichier trouve
-
-```bash
-# Logique de selection
-ENV_FLAG="$1"  # --env Development par exemple
-
-if [ -n "$ENV_FLAG" ]; then
-  SELECTED_ENV="appsettings.${ENV_FLAG}.json"
-elif [ -f "$API_DIR/appsettings.Local.json" ]; then
-  SELECTED_ENV="appsettings.Local.json"
-else
-  echo "ERROR: Aucun fichier appsettings trouve"
-  echo "  Creez appsettings.Local.json ou utilisez --env {Environment}"
-  exit 1
-fi
-
-# Verifier que le fichier existe
-if [ ! -f "$API_DIR/$SELECTED_ENV" ]; then
-  echo "ERROR: $SELECTED_ENV non trouve dans $API_DIR"
-  exit 1
-fi
-```
-
-### 0.3 Extraire et afficher la connection string
-
-```bash
-# Extraire la connection string (PowerShell pour parsing JSON fiable)
-CONNECTION_STRING=$(powershell -Command "
-  \$json = Get-Content '$API_DIR/$SELECTED_ENV' | ConvertFrom-Json
-  \$json.ConnectionStrings.DefaultConnection
-")
-
-# Extraire le nom de la base de donnees
-DATABASE_NAME=$(echo "$CONNECTION_STRING" | grep -oP 'Database=\K[^;]+' || echo "Unknown")
-SERVER_NAME=$(echo "$CONNECTION_STRING" | grep -oP 'Server=\K[^;]+' || echo "Unknown")
-
-# Masquer le mot de passe si present
-CONNECTION_MASKED=$(echo "$CONNECTION_STRING" | sed 's/Password=[^;]*/Password=****/g')
-```
-
-### 0.4 Afficher le resume
-
-```
-================================================================================
-                         EF CORE - ENVIRONNEMENT
-================================================================================
-
-FICHIERS DISPONIBLES:
-{liste des appsettings detectes}
-
-SELECTION: {SELECTED_ENV} {(defaut) si Local}
-
-CONNEXION:
-  Server:   {SERVER_NAME}
-  Database: {DATABASE_NAME}
-  String:   {CONNECTION_MASKED}
-
-================================================================================
-```
-
-### 0.5 Protection Production
-
-```bash
-# Bloquer si Production detecte (sauf pour db-status qui est read-only)
-if [[ "$SELECTED_ENV" == *"Production"* ]]; then
-  echo "================================================================================
-                         BLOQUE - ENVIRONNEMENT PRODUCTION
-================================================================================
-
-Cette commande est bloquee pour proteger les donnees de production.
-
-OPTIONS:
-1. Utilisez un environnement non-production
-2. Contactez support@atlshub.ch pour assistance
-
-================================================================================
-"
-  exit 1
-fi
-```
-
-### 0.6 Confirmation (pour commandes destructives)
-
-> **Note:** Utiliser uniquement pour db-reset, db-seed, et autres commandes destructives.
-
-```javascript
-AskUserQuestion({
-  questions: [{
-    question: "Confirmer l'execution sur cette base de donnees?",
-    header: "Confirm",
-    options: [
-      { label: "Oui, continuer", description: "Executer sur " + DATABASE_NAME },
-      { label: "Non, annuler", description: "Arreter l'execution" }
-    ],
-    multiSelect: false
-  }]
-})
-```
-
----
-
-## Variables exportees
-
-Apres ce step, les variables suivantes sont disponibles:
-
-| Variable | Description |
-|----------|-------------|
-| `SELECTED_ENV` | Fichier appsettings utilise |
-| `CONNECTION_STRING` | Connection string complete |
-| `CONNECTION_MASKED` | Connection string masquee |
-| `DATABASE_NAME` | Nom de la base de donnees |
-| `SERVER_NAME` | Nom du serveur |
-| `API_DIR` | Repertoire du projet API |
-
----
-
-## Utilisation dans les commandes
-
-```markdown
-## STEP 0: Verification environnement
-
-> **Include:** `_env-check.md`
-
-{Executer les etapes 0.1 a 0.4}
-{Executer 0.5 si commande modifie la base}
-{Executer 0.6 si commande est destructive}
-```
+# EF Core Environment Check (Shared Step)
+
+> **Usage:** Include ce step dans toutes les commandes EF Core qui interagissent avec la base de donnees.
+
+---
+
+## STEP 0: Verification environnement et connexion
+
+### 0.1 Detecter les fichiers appsettings disponibles
+
+```bash
+# Scanner les fichiers appsettings dans le projet API
+API_DIR=$(find . -type d -name "*.Api" -o -name "*Web" | head -1)
+if [ -z "$API_DIR" ]; then
+  API_DIR="."
+fi
+
+# Lister tous les appsettings
+APPSETTINGS_FILES=$(find "$API_DIR" -maxdepth 1 -name "appsettings*.json" 2>/dev/null | sort)
+```
+
+### 0.2 Determiner l'environnement a utiliser
+
+**Priorite:**
+1. Flag `--env {Environment}` si fourni
+2. `appsettings.Local.json` (defaut recommande)
+3. Erreur si aucun fichier trouve
+
+```bash
+# Logique de selection
+ENV_FLAG="$1"  # --env Development par exemple
+
+if [ -n "$ENV_FLAG" ]; then
+  SELECTED_ENV="appsettings.${ENV_FLAG}.json"
+elif [ -f "$API_DIR/appsettings.Local.json" ]; then
+  SELECTED_ENV="appsettings.Local.json"
+else
+  echo "ERROR: Aucun fichier appsettings trouve"
+  echo "  Creez appsettings.Local.json ou utilisez --env {Environment}"
+  exit 1
+fi
+
+# Verifier que le fichier existe
+if [ ! -f "$API_DIR/$SELECTED_ENV" ]; then
+  echo "ERROR: $SELECTED_ENV non trouve dans $API_DIR"
+  exit 1
+fi
+```
+
+### 0.3 Extraire et afficher la connection string
+
+```bash
+# Extraire la connection string (PowerShell pour parsing JSON fiable)
+CONNECTION_STRING=$(powershell -Command "
+  \$json = Get-Content '$API_DIR/$SELECTED_ENV' | ConvertFrom-Json
+  \$json.ConnectionStrings.DefaultConnection
+")
+
+# Extraire le nom de la base de donnees
+DATABASE_NAME=$(echo "$CONNECTION_STRING" | grep -oP 'Database=\K[^;]+' || echo "Unknown")
+SERVER_NAME=$(echo "$CONNECTION_STRING" | grep -oP 'Server=\K[^;]+' || echo "Unknown")
+
+# Masquer le mot de passe si present
+CONNECTION_MASKED=$(echo "$CONNECTION_STRING" | sed 's/Password=[^;]*/Password=****/g')
+```
+
+### 0.4 Afficher le resume
+
+```
+================================================================================
+                         EF CORE - ENVIRONNEMENT
+================================================================================
+
+FICHIERS DISPONIBLES:
+{liste des appsettings detectes}
+
+SELECTION: {SELECTED_ENV} {(defaut) si Local}
+
+CONNEXION:
+  Server:   {SERVER_NAME}
+  Database: {DATABASE_NAME}
+  String:   {CONNECTION_MASKED}
+
+================================================================================
+```
+
+### 0.5 Protection Production
+
+```bash
+# Bloquer si Production detecte (sauf pour db-status qui est read-only)
+if [[ "$SELECTED_ENV" == *"Production"* ]]; then
+  echo "================================================================================
+                         BLOQUE - ENVIRONNEMENT PRODUCTION
+================================================================================
+
+Cette commande est bloquee pour proteger les donnees de production.
+
+OPTIONS:
+1. Utilisez un environnement non-production
+2. Contactez support@atlshub.ch pour assistance
+
+================================================================================
+"
+  exit 1
+fi
+```
+
+### 0.6 Confirmation (pour commandes destructives)
+
+> **Note:** Utiliser uniquement pour db-reset, db-seed, et autres commandes destructives.
+
+```javascript
+AskUserQuestion({
+  questions: [{
+    question: "Confirmer l'execution sur cette base de donnees?",
+    header: "Confirm",
+    options: [
+      { label: "Oui, continuer", description: "Executer sur " + DATABASE_NAME },
+      { label: "Non, annuler", description: "Arreter l'execution" }
+    ],
+    multiSelect: false
+  }]
+})
+```
+
+---
+
+## Variables exportees
+
+Apres ce step, les variables suivantes sont disponibles:
+
+| Variable | Description |
+|----------|-------------|
+| `SELECTED_ENV` | Fichier appsettings utilise |
+| `CONNECTION_STRING` | Connection string complete |
+| `CONNECTION_MASKED` | Connection string masquee |
+| `DATABASE_NAME` | Nom de la base de donnees |
+| `SERVER_NAME` | Nom du serveur |
+| `API_DIR` | Repertoire du projet API |
+
+---
+
+## Utilisation dans les commandes
+
+```markdown
+## STEP 0: Verification environnement
+
+> **Include:** `_env-check.md`
+
+{Executer les etapes 0.1 a 0.4}
+{Executer 0.5 si commande modifie la base}
+{Executer 0.6 si commande est destructive}
+```

package/templates/commands/efcore/conflicts.md

@@ -6,257 +6,149 @@ model: sonnet
 
 # EF Core Conflicts - Cross-Branch Conflict Analysis
 
-Analyzes potential conflicts between current branch and develop. **BLOCKING** if conflict detected.
+Analyzes potential conflicts between current branch and target branch using **SmartStack MCP**.
 
 **USAGE:** Before a merge or commit to ensure there are no migration conflicts.
 
 **BEHAVIOR:** Returns exit code 1 if conflict detected (blocks merge/commit).
 
----
-
-## STEP 1: Check current branch
-
-```bash
-CURRENT_BRANCH=$(git branch --show-current)
-echo "Current branch: $CURRENT_BRANCH"
-
-if [ "$CURRENT_BRANCH" = "main" ] || [ "$CURRENT_BRANCH" = "develop" ]; then
-  echo "No analysis needed on $CURRENT_BRANCH"
-  exit 0
-fi
-```
+**INTEGRATION:** Uses `mcp__smartstack__check_migrations` for structured analysis.
 
 ---
 
-## STEP 2: Locate ModelSnapshots
+## STEP 1: Invoke MCP check_migrations
 
-```bash
-# Find local ModelSnapshot
-LOCAL_SNAPSHOT=$(find . -name "*ModelSnapshot.cs" -not -path "*/node_modules/*" 2>/dev/null | head -1)
-
-if [ -z "$LOCAL_SNAPSHOT" ]; then
-  echo "No ModelSnapshot found - no EF Core migrations"
-  exit 0
-fi
+> **MCP INTEGRATION:** This command delegates conflict analysis to the SmartStack MCP server
+> which provides structured, consistent analysis across all SmartStack projects.
 
-echo "Local ModelSnapshot: $LOCAL_SNAPSHOT"
+```
+CALL mcp__smartstack__check_migrations WITH:
+  - branch: {current branch}
+  - compareBranch: "develop" (or specified target)
+```
 
-# Find develop's ModelSnapshot
-WORKTREE_BASE=$(git config --get gitflow.worktrees.basePath 2>/dev/null || echo "../worktrees")
-DEVELOP_SNAPSHOT="$WORKTREE_BASE/develop/$(dirname $LOCAL_SNAPSHOT)/*ModelSnapshot.cs"
+**Claude instruction:** Use the MCP tool `mcp__smartstack__check_migrations` with parameters:
 
-if [ ! -f "$DEVELOP_SNAPSHOT" ]; then
-  # Fallback: get from git
-  DEVELOP_SNAPSHOT_CONTENT=$(git show develop:$LOCAL_SNAPSHOT 2>/dev/null)
-  if [ -z "$DEVELOP_SNAPSHOT_CONTENT" ]; then
-    echo "Cannot find develop's ModelSnapshot"
-    exit 1
-  fi
-fi
+```json
+{
+  "branch": "<current_branch>",
+  "compareBranch": "develop"
+}
 ```
 
 ---
 
-## STEP 3: Compare ModelSnapshots
+## STEP 2: Parse MCP Response
 
-```bash
-echo ""
-echo "MODELSNAPSHOT COMPARISON"
-echo "========================="
-
-# Create temporary file for develop if needed
-if [ -n "$DEVELOP_SNAPSHOT_CONTENT" ]; then
-  TEMP_DEVELOP=$(mktemp)
-  echo "$DEVELOP_SNAPSHOT_CONTENT" > "$TEMP_DEVELOP"
-  DEVELOP_SNAPSHOT="$TEMP_DEVELOP"
-fi
+The MCP returns a structured `MigrationCheckResult`:
 
-# Compare
-if diff -q "$LOCAL_SNAPSHOT" "$DEVELOP_SNAPSHOT" > /dev/null 2>&1; then
-  echo "Identical ModelSnapshots - No conflict"
-  CONFLICT_LEVEL="NONE"
-else
-  # Analyze differences
-  DIFF_OUTPUT=$(diff "$DEVELOP_SNAPSHOT" "$LOCAL_SNAPSHOT" 2>/dev/null)
-  DIFF_LINES=$(echo "$DIFF_OUTPUT" | wc -l)
+```typescript
+interface MigrationCheckResult {
+  hasConflicts: boolean;
+  migrations: MigrationInfo[];
+  conflicts: MigrationConflict[];
+  suggestions: string[];
+}
 
-  echo "Differences detected: $DIFF_LINES lines"
-fi
+interface MigrationConflict {
+  type: 'order' | 'snapshot' | 'dependency' | 'naming';
+  description: string;
+  files: string[];
+  resolution: string;
+}
 ```
 
 ---
 
-## STEP 4: Analyze conflict type
+## STEP 3: Evaluate Conflict Level
 
-```bash
-if [ "$CONFLICT_LEVEL" != "NONE" ]; then
-  # Extract modified entities
-  LOCAL_ENTITIES=$(grep -E "entity\.(Property|HasKey|HasIndex|ToTable)" "$LOCAL_SNAPSHOT" | sort -u)
-  DEVELOP_ENTITIES=$(grep -E "entity\.(Property|HasKey|HasIndex|ToTable)" "$DEVELOP_SNAPSHOT" | sort -u)
-
-  # Find locally modified tables
-  LOCAL_TABLES=$(grep -oE 'ToTable\("([^"]+)"' "$LOCAL_SNAPSHOT" | sort -u)
-  DEVELOP_TABLES=$(grep -oE 'ToTable\("([^"]+)"' "$DEVELOP_SNAPSHOT" | sort -u)
-
-  # Compare tables
-  COMMON_MODIFIED=$(comm -12 <(echo "$LOCAL_TABLES") <(echo "$DEVELOP_TABLES"))
-
-  if [ -n "$COMMON_MODIFIED" ]; then
-    echo ""
-    echo "TABLES MODIFIED ON BOTH SIDES:"
-    echo "$COMMON_MODIFIED"
-    CONFLICT_LEVEL="HIGH"
-  else
-    CONFLICT_LEVEL="LOW"
-  fi
-
-  # Check columns
-  LOCAL_COLUMNS=$(grep -oE 'Property<[^>]+>\("([^"]+)"' "$LOCAL_SNAPSHOT" | sort -u)
-  DEVELOP_COLUMNS=$(grep -oE 'Property<[^>]+>\("([^"]+)"' "$DEVELOP_SNAPSHOT" | sort -u)
-
-  # New local columns
-  NEW_LOCAL_COLUMNS=$(comm -23 <(echo "$LOCAL_COLUMNS") <(echo "$DEVELOP_COLUMNS"))
-
-  if [ -n "$NEW_LOCAL_COLUMNS" ]; then
-    echo ""
-    echo "NEW COLUMNS (this branch):"
-    echo "$NEW_LOCAL_COLUMNS" | head -10
-  fi
-fi
-```
+Based on MCP response:
+
+| Conflict Type | Level | Action |
+|---------------|-------|--------|
+| `naming` | LOW | Warning only |
+| `order` | MEDIUM | Warning, suggest reorder |
+| `dependency` | HIGH | Block merge |
+| `snapshot` | CRITICAL | Block merge, require rebase |
 
 ---
 
-## STEP 5: Scan other active branches
+## STEP 4: Display Results
+
+**If `hasConflicts: false`:**
 
-```bash
-echo ""
-echo "OTHER BRANCHES WITH MIGRATIONS"
-echo "==============================="
-
-for worktree in $(git worktree list --porcelain | grep "^worktree" | cut -d' ' -f2); do
-  BRANCH=$(git -C "$worktree" branch --show-current 2>/dev/null)
-
-  if [ "$BRANCH" = "$CURRENT_BRANCH" ] || [ "$BRANCH" = "develop" ] || [ "$BRANCH" = "main" ]; then
-    continue
-  fi
-
-  OTHER_SNAPSHOT=$(find "$worktree" -name "*ModelSnapshot.cs" 2>/dev/null | head -1)
-
-  if [ -n "$OTHER_SNAPSHOT" ]; then
-    if ! diff -q "$LOCAL_SNAPSHOT" "$OTHER_SNAPSHOT" > /dev/null 2>&1; then
-      echo "$BRANCH: Different ModelSnapshot"
-
-      # Check if same table modified
-      OTHER_TABLES=$(grep -oE 'ToTable\("([^"]+)"' "$OTHER_SNAPSHOT" | sort -u)
-      OVERLAP=$(comm -12 <(echo "$LOCAL_TABLES") <(echo "$OTHER_TABLES"))
-
-      if [ -n "$OVERLAP" ]; then
-        echo "  WARNING: Common tables modified with $BRANCH"
-        CONFLICT_LEVEL="HIGH"
-      fi
-    fi
-  fi
-done
 ```
+================================================================================
+                    EF CORE CONFLICT ANALYSIS (via MCP)
+================================================================================
 
----
+BRANCH: {current_branch}
+TARGET: develop
 
-## STEP 6: Final verdict
+STATUS: OK - No conflicts detected
+
+Migrations: {count}
+ModelSnapshot: Synchronized
 
-```bash
-echo ""
-echo "================================================================================
-                    ANALYSIS RESULT
 ================================================================================
-"
-
-case $CONFLICT_LEVEL in
-  "NONE")
-    echo "STATUS: OK"
-    echo "No conflict detected. Merge allowed."
-    exit 0
-    ;;
-  "LOW")
-    echo "STATUS: OK (with caution)"
-    echo "Modifications on different tables. Merge allowed."
-    exit 0
-    ;;
-  "MEDIUM")
-    echo "STATUS: CAUTION"
-    echo "FK to same tables. Check merge order."
-    exit 0
-    ;;
-  "HIGH")
-    echo "STATUS: CONFLICT DETECTED"
-    echo ""
-    echo "RESOLUTION REQUIRED:"
-    echo "  1. /efcore:rebase-snapshot   (recommended)"
-    echo "  2. /efcore:conflicts --force (not recommended)"
-    echo "  3. Merge other branch first"
-    echo ""
-    echo "BLOCKING: Merge not allowed."
-    exit 1
-    ;;
-  "CRITICAL")
-    echo "STATUS: CRITICAL CONFLICT"
-    echo ""
-    echo "Same column modified on both sides."
-    echo "Manual intervention required."
-    echo ""
-    exit 1
-    ;;
-esac
 ```
 
----
-
-## Output Format
+**If `hasConflicts: true`:**
 
 ```
 ================================================================================
-                    EF CORE CONFLICT ANALYSIS
+                    EF CORE CONFLICT ANALYSIS (via MCP)
 ================================================================================
 
-BRANCH: feature/user-auth
+BRANCH: {current_branch}
 TARGET: develop
 
-MODELSNAPSHOT
-  Local:   a1b2c3d4 (13 migrations)
-  Develop: e5f6g7h8 (12 migrations)
-  Status:  DIFFERENT
-
-MODIFIED TABLES
-  Local:   Users, Roles, UserRoles
-  Develop: Users, Permissions
+STATUS: CONFLICT DETECTED
 
-CONFLICT DETECTED
-  Table "Users" modified on both sides
+CONFLICTS FOUND:
+{for each conflict in conflicts}
+  [{conflict.type}] {conflict.description}
+    Files: {conflict.files.join(', ')}
+    Resolution: {conflict.resolution}
+{end for}
 
-OTHER BRANCHES
-  feature/add-products: OK (different tables)
+SUGGESTIONS:
+{for each suggestion in suggestions}
+  - {suggestion}
+{end for}
 
 ================================================================================
-STATUS: CONFLICT - EXIT CODE 1
+BLOCKING: Merge not allowed until conflicts are resolved.
 ================================================================================
 
-RESOLUTION:
-  /efcore:rebase-snapshot    Rebase on develop (recommended)
-  /efcore:conflicts --force  Force (not recommended)
+RESOLUTION OPTIONS:
+  /efcore:rebase-snapshot    Rebase ModelSnapshot on develop (recommended)
+  /efcore:conflicts --force  Ignore and proceed (not recommended)
 
 ================================================================================
 ```
 
 ---
 
+## STEP 5: Exit Code
+
+```bash
+if [ "$HAS_CONFLICTS" = "true" ]; then
+  exit 1  # BLOCKING
+else
+  exit 0  # OK
+fi
+```
+
+---
+
 ## Options
 
 | Option | Description |
 |--------|-------------|
 | `--force` | Ignore conflict (not recommended) |
-| `--verbose` | Display detailed differences |
-| `--json` | JSON output for CI/CD |
 | `--target <branch>` | Compare with branch other than develop |
+| `--json` | Output raw MCP JSON response |
 
 ---
 
@@ -266,4 +158,29 @@ RESOLUTION:
 |------|---------|
 | 0 | No conflict or minor conflict |
 | 1 | Conflict detected - merge blocked |
-| 2 | Technical error |
+| 2 | MCP connection error |
+
+---
+
+## MCP Tool Reference
+
+**Tool:** `mcp__smartstack__check_migrations`
+
+**Description:** Analyze EF Core migrations for conflicts, ordering issues, and ModelSnapshot discrepancies between branches
+
+**Parameters:**
+
+| Parameter | Type | Description |
+|-----------|------|-------------|
+| `projectPath` | string | EF Core project path (default: auto-detect) |
+| `branch` | string | Git branch to check (default: current) |
+| `compareBranch` | string | Branch to compare against |
+
+---
+
+## Why MCP Integration?
+
+1. **Consistency:** Same analysis logic across CLI, CI/CD, and IDE
+2. **Maintainability:** Single source of truth in MCP server
+3. **Structured Output:** Typed responses instead of bash text parsing
+4. **Extensibility:** Easy to add new conflict types in one place