@aiassesstech/mighty-mark 0.6.17 → 0.6.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiassesstech/mighty-mark",
-  "version": "0.6.17",
+  "version": "0.6.18",
   "description": "System Health Sentinel for AI Assess Tech Fleet — autonomous monitoring, watchdog recovery, and fleet infrastructure oversight.",
   "type": "module",
   "main": "dist/index.js",

package/src/watchdog/fleet-backup/fleet-backup.sh

@@ -305,17 +305,17 @@ if [[ "${PUSH_TO_GITHUB:-false}" == "true" ]] && [[ -d "${GITHUB_REPO_DIR:-}" ]]
       exit 1
     fi
 
-    git fetch origin "$GITHUB_BACKUP_BRANCH" 2>/dev/null || true
-
     CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
     if [[ "$CURRENT_BRANCH" != "$GITHUB_BACKUP_BRANCH" ]]; then
-      if git rev-parse --verify "origin/$GITHUB_BACKUP_BRANCH" >/dev/null 2>&1; then
-        git checkout -B "$GITHUB_BACKUP_BRANCH" "origin/$GITHUB_BACKUP_BRANCH" 2>/dev/null || true
-      else
-        git checkout --orphan "$GITHUB_BACKUP_BRANCH"
-      fi
-    else
-      git reset --hard "origin/$GITHUB_BACKUP_BRANCH" 2>/dev/null || true
+      git checkout "$GITHUB_BACKUP_BRANCH" 2>/dev/null || git checkout -b "$GITHUB_BACKUP_BRANCH" 2>/dev/null || true
+    fi
+
+    git pull origin "$GITHUB_BACKUP_BRANCH" --ff-only 2>/dev/null || true
+
+    # Ensure .tar.gz files are not gitignored (archives must be committed)
+    if grep -q '^\*\.tar\.gz$' .gitignore 2>/dev/null; then
+      sed -i '/^\*\.tar\.gz$/d' .gitignore
+      log "  Removed *.tar.gz from .gitignore"
     fi
 
     # Split large archives into chunks under GitHub's file size limit