@atlashub/smartstack-cli 1.17.0 → 1.19.0

package/templates/skills/efcore/steps/squash/step-02-fetch.md

@@ -0,0 +1,168 @@
+---
+name: step-02-fetch
+description: Fetch ModelSnapshot AND migrations from parent branch (CRITICAL)
+next_step: step-03-create.md
+---
+
+# Step 2: Fetch Parent State (CRITICAL)
+
+## YOUR TASK:
+
+Recover BOTH the ModelSnapshot AND all migrations from the parent branch.
+
+**THIS IS THE MOST CRITICAL STEP.** Recovering only the snapshot loses parent migrations!
+
+**Previous step:** `step-01-backup.md`
+
+---
+
+## PRINCIPLE:
+
+```
+GOLDEN RULE: Fetch SNAPSHOT + MIGRATIONS from PARENT branch
+
+feature/* → snapshot + migrations from develop
+develop   → snapshot + migrations from main
+release/* → snapshot + migrations from main
+hotfix/*  → snapshot + migrations from main
+
+NEVER fetch only the snapshot without migrations!
+```
+
+---
+
+## EXECUTION SEQUENCE:
+
+### 1. Fetch Parent Branch
+
+```bash
+echo "Fetching origin/$BASE_BRANCH..."
+git fetch origin "$BASE_BRANCH" --quiet
+```
+
+### 2. Recover ModelSnapshot
+
+```bash
+echo ""
+echo "Recovering ModelSnapshot from origin/$BASE_BRANCH..."
+
+SNAPSHOT_FILE=$(git ls-tree -r --name-only "origin/$BASE_BRANCH" -- "$MIGRATIONS_DIR" | grep "ModelSnapshot.cs$" | head -1)
+
+if [ -n "$SNAPSHOT_FILE" ]; then
+  git checkout "origin/$BASE_BRANCH" -- "$SNAPSHOT_FILE"
+  echo "  Snapshot: $(basename "$SNAPSHOT_FILE")"
+else
+  echo "  WARNING: No snapshot found on origin/$BASE_BRANCH"
+fi
+```
+
+### 3. Recover ALL Parent Migrations (CRUCIAL!)
+
+```bash
+echo ""
+echo "Recovering migrations from origin/$BASE_BRANCH..."
+
+RECOVERED_COUNT=0
+
+for base_mig in $BASE_MIGRATIONS; do
+  base_name=$(basename "${base_mig%.cs}")
+
+  # Recover migration file
+  git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_DIR/${base_name}.cs" 2>/dev/null && {
+    echo "  ${base_name}.cs"
+    RECOVERED_COUNT=$((RECOVERED_COUNT + 1))
+  }
+
+  # Recover Designer file
+  git checkout "origin/$BASE_BRANCH" -- "$MIGRATIONS_DIR/${base_name}.Designer.cs" 2>/dev/null && {
+    echo "  ${base_name}.Designer.cs"
+  }
+done
+
+echo ""
+echo "Recovered: $RECOVERED_COUNT migrations from origin/$BASE_BRANCH"
+```
+
+### 4. Delete Branch-Only Migrations
+
+```bash
+echo ""
+echo "Removing branch-specific migrations..."
+
+for mig in "${BRANCH_ONLY_MIGRATIONS[@]}"; do
+  mig_name="${mig%.cs}"
+
+  rm -f "$MIGRATIONS_DIR/${mig_name}.cs"
+  rm -f "$MIGRATIONS_DIR/${mig_name}.Designer.cs"
+
+  echo "  Removed: $mig_name"
+done
+
+echo ""
+echo "Removed: ${#BRANCH_ONLY_MIGRATIONS[@]} branch-specific migrations"
+```
+
+### 5. Verify State
+
+```bash
+echo ""
+echo "Current state after fetch:"
+echo ""
+
+ls -la "$MIGRATIONS_DIR"/*.cs 2>/dev/null | while read line; do
+  echo "  $line"
+done
+
+CURRENT_MIGS=$(find "$MIGRATIONS_DIR" -name "*.cs" 2>/dev/null | grep -v "Designer\|Snapshot" | wc -l)
+echo ""
+echo "Migrations remaining: $CURRENT_MIGS (all from $BASE_BRANCH)"
+```
+
+---
+
+## EXPECTED RESULT:
+
+```
+After step-02-fetch:
+├── {base_migration_1}.cs              ← From parent (preserved)
+├── {base_migration_1}.Designer.cs
+├── {base_migration_N}.cs              ← From parent (preserved)
+├── {base_migration_N}.Designer.cs
+└── {DbContext}ModelSnapshot.cs        ← From parent (recovered)
+
+Branch-specific migrations: DELETED (will be recreated consolidated)
+```
+
+---
+
+## STATE OUTPUT:
+
+| Variable | Description |
+|----------|-------------|
+| `{recovered_count}` | Number of parent migrations recovered |
+| `{snapshot_recovered}` | true if snapshot was recovered |
+
+---
+
+## FAILURE HANDLING:
+
+If this step fails:
+
+```bash
+# Restore from backup
+cp "{BACKUP_DIR}"/*.cs "{MIGRATIONS_DIR}/"
+echo "Restored from backup"
+```
+
+---
+
+## SUCCESS CRITERIA:
+
+- ModelSnapshot recovered from parent
+- ALL parent migrations recovered
+- Branch-specific migrations removed
+- No migration loss from parent
+
+## NEXT STEP:
+
+→ `step-03-create.md`

package/templates/skills/efcore/steps/squash/step-03-create.md

@@ -0,0 +1,178 @@
+---
+name: step-03-create
+description: Create consolidated migration using MCP for naming
+next_step: step-04-validate.md
+---
+
+# Step 3: Create Consolidated Migration
+
+## YOUR TASK:
+
+Create a single consolidated migration that captures all changes from the branch.
+
+**MANDATORY:** Use MCP `suggest_migration` for compliant naming. NEVER hardcode names.
+
+**Previous step:** `step-02-fetch.md`
+
+---
+
+## EXECUTION SEQUENCE:
+
+### 1. Build Description from Branch Context
+
+```bash
+case "$BRANCH_TYPE" in
+  feature)
+    # Extract feature name: feature/user-auth → UserAuth
+    FEATURE_NAME=$(echo "$CURRENT_BRANCH" | sed 's|feature/||' | sed 's/-/ /g' | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2))}1' | tr -d ' ')
+    DESCRIPTION="${FEATURE_NAME}Consolidated"
+    ;;
+  release)
+    VERSION=$(echo "$CURRENT_BRANCH" | sed 's|release/v\?||')
+    DESCRIPTION="Release${VERSION}Initial"
+    ;;
+  hotfix)
+    VERSION=$(echo "$CURRENT_BRANCH" | sed 's|hotfix/v\?||')
+    DESCRIPTION="Hotfix${VERSION}Fix"
+    ;;
+  develop)
+    DESCRIPTION="DevelopConsolidated"
+    ;;
+  *)
+    DESCRIPTION="Consolidated"
+    ;;
+esac
+
+echo "Description: $DESCRIPTION"
+echo "DbContext Type: $DBCONTEXT_TYPE"
+```
+
+### 2. Get Migration Name from MCP (MANDATORY)
+
+```javascript
+// DBCONTEXT_TYPE = "core" or "extensions" (from detect_dbcontext)
+// DESCRIPTION = built above (e.g., "MultitenantConsolidated")
+
+const result = await mcp__smartstack__suggest_migration({
+  description: DESCRIPTION,
+  context: DBCONTEXT_TYPE    // NEVER hardcode!
+});
+
+// Result example: core_v1.9.0_001_MultitenantConsolidated
+MIGRATION_NAME = result.migrationName;
+```
+
+**FORBIDDEN:**
+- Calculating name manually
+- Hardcoding context as "core"
+- Using underscores instead of dots in version
+
+### 3. Create Migration with EF Core
+
+```bash
+# MIGRATION_NAME = result from MCP (e.g., core_v1.9.0_001_MultitenantConsolidated)
+# DBCONTEXT = CoreDbContext or ExtensionsDbContext (from detect_dbcontext)
+
+echo ""
+echo "Creating migration: $MIGRATION_NAME"
+echo "Context: $DBCONTEXT"
+echo ""
+
+dotnet ef migrations add "$MIGRATION_NAME" \
+  --context "$DBCONTEXT" \
+  --project "$INFRA_PROJECT" \
+  --startup-project "$STARTUP_PROJECT" \
+  -o Persistence/Migrations \
+  --verbose
+```
+
+### 4. Verify Migration Created
+
+```bash
+# Check migration files exist
+MIGRATION_FILE="$MIGRATIONS_DIR/${MIGRATION_NAME}.cs"
+DESIGNER_FILE="$MIGRATIONS_DIR/${MIGRATION_NAME}.Designer.cs"
+
+if [ ! -f "$MIGRATION_FILE" ]; then
+  echo "ERROR: Migration file not created"
+  echo "Expected: $MIGRATION_FILE"
+
+  # Restore from backup
+  cp "$BACKUP_DIR"/*.cs "$MIGRATIONS_DIR/"
+  echo "Restored from backup"
+  exit 1
+fi
+
+if [ ! -f "$DESIGNER_FILE" ]; then
+  echo "ERROR: Designer file not created"
+  exit 1
+fi
+
+echo ""
+echo "Migration created:"
+echo "  $MIGRATION_FILE"
+echo "  $DESIGNER_FILE"
+```
+
+### 5. Check Migration Content
+
+```bash
+# Verify migration has content (not empty)
+UP_METHODS=$(grep -c "protected override void Up" "$MIGRATION_FILE" || echo "0")
+DOWN_METHODS=$(grep -c "protected override void Down" "$MIGRATION_FILE" || echo "0")
+
+if [ "$UP_METHODS" -eq 0 ]; then
+  echo "WARNING: Migration may be empty (no Up method found)"
+fi
+
+echo ""
+echo "Migration content:"
+echo "  Up methods: $UP_METHODS"
+echo "  Down methods: $DOWN_METHODS"
+```
+
+---
+
+## EXPECTED RESULT:
+
+```
+After step-03-create:
+├── {base_migration_1}.cs              ← From parent (preserved)
+├── {base_migration_1}.Designer.cs
+├── {NEW_MIGRATION_NAME}.cs            ← NEW: Consolidated migration
+├── {NEW_MIGRATION_NAME}.Designer.cs   ← NEW: Designer file
+└── {DbContext}ModelSnapshot.cs        ← Updated with new migration
+```
+
+---
+
+## STATE OUTPUT:
+
+| Variable | Description |
+|----------|-------------|
+| `{migration_name}` | Name from MCP (e.g., core_v1.9.0_001_...) |
+| `{migration_file}` | Full path to .cs file |
+| `{designer_file}` | Full path to .Designer.cs file |
+
+---
+
+## ERROR HANDLING:
+
+| Error | Resolution |
+|-------|------------|
+| MCP fails | Check MCP connectivity, retry |
+| Migration creation fails | Restore from backup, check errors |
+| Empty migration | Warning only, may be valid |
+
+---
+
+## SUCCESS CRITERIA:
+
+- MCP called for migration name
+- Migration file created
+- Designer file created
+- Snapshot updated
+
+## NEXT STEP:
+
+→ `step-04-validate.md`

package/templates/skills/efcore/steps/squash/step-04-validate.md

@@ -0,0 +1,174 @@
+---
+name: step-04-validate
+description: Validate squash - build and generate script
+next_step: null
+---
+
+# Step 4: Validate
+
+## YOUR TASK:
+
+Validate the squash by building the project and generating an idempotent script.
+
+**Previous step:** `step-03-create.md`
+
+---
+
+## EXECUTION SEQUENCE:
+
+### 1. Build Project
+
+```bash
+echo "Building project..."
+echo ""
+
+dotnet build "$INFRA_PROJECT" --no-restore
+
+if [ $? -ne 0 ]; then
+  echo ""
+  echo "ERROR: Build FAILED"
+  echo ""
+  echo "Restoring from backup..."
+  cp "$BACKUP_DIR"/*.cs "$MIGRATIONS_DIR/"
+  echo "Restored. Please fix issues and retry."
+  exit 1
+fi
+
+echo ""
+echo "Build: OK"
+```
+
+### 2. List Migrations
+
+```bash
+echo ""
+echo "Migration list:"
+echo ""
+
+dotnet ef migrations list \
+  --context "$DBCONTEXT" \
+  --project "$INFRA_PROJECT" \
+  --startup-project "$STARTUP_PROJECT" \
+  --no-build
+```
+
+### 3. Generate Idempotent Script (Validation)
+
+```bash
+echo ""
+echo "Generating idempotent script..."
+echo ""
+
+SCRIPT_FILE="$BACKUP_DIR/migration_script.sql"
+
+dotnet ef migrations script \
+  --context "$DBCONTEXT" \
+  --project "$INFRA_PROJECT" \
+  --startup-project "$STARTUP_PROJECT" \
+  --idempotent \
+  --no-build \
+  -o "$SCRIPT_FILE"
+
+if [ $? -ne 0 ]; then
+  echo ""
+  echo "ERROR: Script generation FAILED"
+  echo ""
+  echo "This indicates a migration problem."
+  echo "Restoring from backup..."
+  cp "$BACKUP_DIR"/*.cs "$MIGRATIONS_DIR/"
+  exit 1
+fi
+
+echo "Script generated: $SCRIPT_FILE"
+```
+
+### 4. Final Summary
+
+```bash
+# Count final migrations
+FINAL_MIGRATION_COUNT=$(find "$MIGRATIONS_DIR" -name "*.cs" 2>/dev/null | grep -v "Designer\|Snapshot" | wc -l)
+
+echo ""
+echo "==========================================="
+echo "SQUASH COMPLETE"
+echo "==========================================="
+echo ""
+echo "Branch:      $CURRENT_BRANCH"
+echo "Parent:      $BASE_BRANCH"
+echo "DbContext:   $DBCONTEXT ($DBCONTEXT_TYPE)"
+echo ""
+echo "Recovered from $BASE_BRANCH:"
+echo "  - ModelSnapshot"
+echo "  - $BASE_MIGRATION_COUNT migrations"
+echo ""
+echo "Consolidated:"
+echo "  - Before: $MIGRATION_COUNT migrations (branch-specific)"
+echo "  - After:  1 migration ($MIGRATION_NAME)"
+echo ""
+echo "Total:       $FINAL_MIGRATION_COUNT migrations"
+echo ""
+echo "Backup:      $BACKUP_DIR"
+echo "Script:      $SCRIPT_FILE"
+echo ""
+echo "==========================================="
+echo ""
+echo "Next steps:"
+echo "  /efcore db-reset      # Reset local database"
+echo "  /efcore db-deploy     # Apply migrations"
+echo "  /gitflow commit       # Commit changes"
+echo ""
+```
+
+---
+
+## OUTPUT FORMAT:
+
+```
+SQUASH COMPLETE
+===============
+Branch:      {current_branch}
+Parent:      {base_branch}
+DbContext:   {dbcontext} ({dbcontext_type})
+
+Recovered from {base_branch}:
+  - ModelSnapshot
+  - {base_migration_count} migrations
+
+Consolidated:
+  - Before: {migration_count} migrations (branch-specific)
+  - After:  1 migration ({migration_name})
+
+Total:       {final_migration_count} migrations
+
+Backup:      {backup_dir}
+Script:      {backup_dir}/migration_script.sql
+
+Next: /efcore db-reset, /efcore db-deploy, /gitflow commit
+```
+
+---
+
+## ERROR HANDLING:
+
+| Error | Action |
+|-------|--------|
+| Build fails | Restore backup, show errors |
+| Script fails | Restore backup, investigate |
+
+**Restore command:**
+```bash
+cp "{BACKUP_DIR}"/*.cs "{MIGRATIONS_DIR}/"
+```
+
+---
+
+## SUCCESS CRITERIA:
+
+- Build passes
+- Migration list shows correct migrations
+- Idempotent script generates successfully
+- Summary displayed
+
+## COMPLETION:
+
+Squash workflow complete. Database not modified (use `/efcore db-deploy` to apply).

package/templates/skills/gitflow/steps/step-commit.md

@@ -206,8 +206,20 @@ AskUserQuestion:
 **If user chooses "Yes":**
 ```bash
 git push origin $CURRENT
-PUSHED="yes"
-echo "✅ Pushed to origin/$CURRENT"
+
+# CRITICAL: Verify push and update tracking refs
+git fetch origin $CURRENT:refs/remotes/origin/$CURRENT --force --quiet
+LOCAL_SHA=$(git rev-parse HEAD)
+REMOTE_SHA=$(git rev-parse origin/$CURRENT)
+if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
+  PUSHED="yes"
+  echo "✅ Pushed and verified - origin/$CURRENT in sync"
+else
+  PUSHED="partial"
+  echo "⚠️ Push may have failed - refs mismatch"
+  echo "  Local:  $LOCAL_SHA"
+  echo "  Remote: $REMOTE_SHA"
+fi
 ```
 
 **If user chooses "No":**

package/templates/skills/gitflow/steps/step-finish.md

@@ -126,6 +126,20 @@ if [ "$BRANCH_TYPE" = "release" ] || [ "$BRANCH_TYPE" = "hotfix" ]; then
   }
 
   git push origin develop
+
+  # CRITICAL: Verify push and update tracking refs
+  git fetch origin develop:refs/remotes/origin/develop --force --quiet
+  LOCAL_SHA=$(git rev-parse HEAD)
+  REMOTE_SHA=$(git rev-parse origin/develop)
+  if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
+    echo "✅ Push verified - local/remote in sync"
+  else
+    echo "⚠️ Push verification FAILED"
+    echo "  Local:  $LOCAL_SHA"
+    echo "  Remote: $REMOTE_SHA"
+    echo "  → Try: git push origin develop --force-with-lease"
+  fi
+
   echo "✅ Merged back to develop"
 fi
 ```
@@ -149,6 +163,18 @@ if [ "$BRANCH_TYPE" = "release" ]; then
   git commit -m "chore: bump version to $NEXT_VERSION for development"
   git push origin develop
 
+  # CRITICAL: Verify push and update tracking refs
+  git fetch origin develop:refs/remotes/origin/develop --force --quiet
+  LOCAL_SHA=$(git rev-parse HEAD)
+  REMOTE_SHA=$(git rev-parse origin/develop)
+  if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
+    echo "✅ Push verified - local/remote in sync"
+  else
+    echo "⚠️ Push verification FAILED"
+    echo "  Local:  $LOCAL_SHA"
+    echo "  Remote: $REMOTE_SHA"
+  fi
+
   echo "✅ Version bumped to $NEXT_VERSION"
 fi
 ```

package/templates/skills/gitflow/steps/step-merge.md

@@ -172,12 +172,17 @@ esac
 ### 8. Verify Merge
 
 ```bash
-git fetch origin
+# CRITICAL: Force update tracking refs to get accurate state
+git fetch origin $TARGET_BRANCH:refs/remotes/origin/$TARGET_BRANCH --force --quiet
+git fetch origin --prune --quiet
+
 MERGED=$(git branch -r --merged origin/$TARGET_BRANCH | grep "$CURRENT" | wc -l)
 
 [ "$MERGED" -eq 0 ] && {
-  echo "⚠️ Merge verification failed"
-  # Check if PR is actually merged
+  echo "⚠️ Merge verification failed - branch may not be merged"
+  echo "  → Check PR status on remote"
+} || {
+  echo "✅ Merge verified - branch merged to $TARGET_BRANCH"
 }
 ```
 

package/templates/skills/gitflow/steps/step-pr.md

@@ -58,6 +58,16 @@ REMOTE_EXISTS=$(git branch -r --list "origin/$CURRENT")
 [ -z "$REMOTE_EXISTS" ] && {
   echo "Branch not pushed to remote. Pushing..."
   git push -u origin $CURRENT
+
+  # CRITICAL: Verify push and update tracking refs
+  git fetch origin $CURRENT:refs/remotes/origin/$CURRENT --force --quiet
+  LOCAL_SHA=$(git rev-parse HEAD)
+  REMOTE_SHA=$(git rev-parse origin/$CURRENT)
+  if [ "$LOCAL_SHA" != "$REMOTE_SHA" ]; then
+    echo "⚠️ Push verification failed - local/remote mismatch"
+    STOP
+  fi
+  echo "✅ Push verified - branch in sync"
 }
 
 # Check for uncommitted changes

package/templates/skills/gitflow/steps/step-start.md

@@ -157,7 +157,18 @@ git checkout -b "$FULL_BRANCH"
 **ALWAYS push immediately after branch creation:**
 ```bash
 git push -u origin "$FULL_BRANCH"
-echo "✅ Branch pushed to origin/$FULL_BRANCH"
+
+# CRITICAL: Verify push and update tracking refs
+git fetch origin $FULL_BRANCH:refs/remotes/origin/$FULL_BRANCH --force --quiet
+LOCAL_SHA=$(git rev-parse HEAD)
+REMOTE_SHA=$(git rev-parse origin/$FULL_BRANCH)
+if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
+  echo "✅ Branch pushed and verified - origin/$FULL_BRANCH in sync"
+else
+  echo "⚠️ Push verification failed"
+  echo "  Local:  $LOCAL_SHA"
+  echo "  Remote: $REMOTE_SHA"
+fi
 ```
 
 ### 7. Create Local Environment Config (Backend + Frontend)

package/templates/skills/gitflow/steps/step-sync.md

@@ -69,6 +69,18 @@ Sync Status: {CURRENT}
 [ "$AHEAD" -gt 0 ] && {
   echo "Pushing $AHEAD commit(s) to origin/$CURRENT..."
   git push origin $CURRENT
+
+  # CRITICAL: Verify push and update tracking refs
+  git fetch origin $CURRENT:refs/remotes/origin/$CURRENT --force --quiet
+  LOCAL_SHA=$(git rev-parse HEAD)
+  REMOTE_SHA=$(git rev-parse origin/$CURRENT)
+  if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
+    echo "✅ Push verified - local/remote in sync"
+  else
+    echo "⚠️ Push verification FAILED - refs may be stale"
+    echo "  Local:  $LOCAL_SHA"
+    echo "  Remote: $REMOTE_SHA"
+  fi
 }
 ```
 
@@ -153,6 +165,18 @@ fi
 if [ "$REBASED" = true ]; then
   echo "Rebase complete. Force pushing..."
   git push --force-with-lease origin $CURRENT
+
+  # CRITICAL: Verify push and update tracking refs
+  git fetch origin $CURRENT:refs/remotes/origin/$CURRENT --force --quiet
+  LOCAL_SHA=$(git rev-parse HEAD)
+  REMOTE_SHA=$(git rev-parse origin/$CURRENT)
+  if [ "$LOCAL_SHA" = "$REMOTE_SHA" ]; then
+    echo "✅ Force push verified - local/remote in sync"
+  else
+    echo "⚠️ Force push verification FAILED"
+    echo "  Local:  $LOCAL_SHA"
+    echo "  Remote: $REMOTE_SHA"
+  fi
 fi
 ```