@aiassesstech/mighty-mark 0.6.15 → 0.6.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiassesstech/mighty-mark",
-  "version": "0.6.15",
+  "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

@@ -89,10 +89,6 @@ PUSH_WORK=""
 
 cleanup() {
   [[ -n "$STAGING_DIR" ]] && rm -rf "$STAGING_DIR"
-  [[ -n "$PUSH_WORK" ]] && rm -rf "$PUSH_WORK"
-  if [[ -n "${GITHUB_REPO_DIR:-}" ]]; then
-    git -C "$GITHUB_REPO_DIR" worktree prune 2>/dev/null || true
-  fi
 }
 
 on_error() {
@@ -298,7 +294,6 @@ log "Manifest: $MANIFEST_FILE"
 if [[ "${PUSH_TO_GITHUB:-false}" == "true" ]] && [[ -d "${GITHUB_REPO_DIR:-}" ]]; then
   log "Pushing backup to GitHub (branch: $GITHUB_BACKUP_BRANCH)..."
 
-  PUSH_WORK=$(mktemp -d "/tmp/fleet-backup-push-XXXXXX")
   GITHUB_RETENTION=${GITHUB_RETENTION:-14}
 
   (
@@ -310,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
+      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
 
-    if git rev-parse --verify "origin/$GITHUB_BACKUP_BRANCH" >/dev/null 2>&1; then
-      git worktree add "$PUSH_WORK" "origin/$GITHUB_BACKUP_BRANCH" 2>/dev/null || true
-      cd "$PUSH_WORK"
-      git checkout -B "$GITHUB_BACKUP_BRANCH" 2>/dev/null || true
-    else
-      cd "$PUSH_WORK"
-      git init
-      git remote add origin "$REMOTE_URL"
-      git checkout --orphan "$GITHUB_BACKUP_BRANCH"
+    # 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
@@ -344,7 +339,6 @@ if [[ "${PUSH_TO_GITHUB:-false}" == "true" ]] && [[ -d "${GITHUB_REPO_DIR:-}" ]]
       log "  Pruning $PRUNE_COUNT old backup(s) from GitHub (keeping last $GITHUB_RETENTION)..."
       ls -1t fleet-*.tar.gz | tail -n "$PRUNE_COUNT" | while read -r OLD; do
         rm -f "$OLD"
-        # Also remove any split chunks for this archive
         rm -f "${OLD}".part-* 2>/dev/null
         log "    Removed: $OLD"
       done