@atlashub/smartstack-cli 1.18.0 → 1.20.0

package/package.json

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

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
 ```