@aiassesstech/mighty-mark 0.5.12 → 0.5.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiassesstech/mighty-mark",
-  "version": "0.5.12",
+  "version": "0.5.13",
   "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/config.sh

@@ -13,8 +13,8 @@ FULL_BACKUP_DAY="0"  # 0=Sunday, 1=Monday, ... 6=Saturday
 # Where to store backup archives
 BACKUP_DIR="/opt/fleet-backup/backups"
 
-# How many days to keep backups (covers 5+ weekly fulls)
-RETENTION_DAYS=35
+# How many days to keep backups (2 weekly fulls + daily lights)
+RETENTION_DAYS=14
 
 # Log file
 LOG_FILE="/opt/fleet-backup/logs/backup.log"

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

@@ -85,8 +85,14 @@ notify_telegram() {
   fi
 }
 
+PUSH_WORK=""
+
 cleanup() {
-  rm -rf "$STAGING_DIR"
+  [[ -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() {
@@ -101,6 +107,10 @@ on_error() {
 trap on_error ERR
 trap cleanup EXIT
 
+# Clean up stale staging dirs from previous failed runs
+find /tmp -maxdepth 1 -name 'fleet-backup-staging-*' -mmin +120 -exec rm -rf {} \; 2>/dev/null || true
+find /tmp -maxdepth 1 -name 'fleet-backup-push-*' -mmin +120 -exec rm -rf {} \; 2>/dev/null || true
+
 # ─── Collect backup contents ──────────────────────────────────────
 
 log "Starting $TIER backup for $DATE"
@@ -290,12 +300,6 @@ if [[ "${PUSH_TO_GITHUB:-false}" == "true" ]] && [[ -d "${GITHUB_REPO_DIR:-}" ]]
 
   PUSH_WORK=$(mktemp -d "/tmp/fleet-backup-push-XXXXXX")
 
-  push_cleanup() {
-    rm -rf "$PUSH_WORK"
-    git -C "$GITHUB_REPO_DIR" worktree prune 2>/dev/null || true
-  }
-  trap push_cleanup EXIT
-
   (
     cd "$GITHUB_REPO_DIR"
 
@@ -359,5 +363,4 @@ Agent: mighty-mark (sentinel duty — fleet safety checkpoint)"
     notify_telegram "🟡 *MIGHTY MARK — GitHub Push Failed*%0A%0ATier: ${TIER} | Size: ${ARCHIVE_SIZE_MB} MB%0ABackup saved locally but GitHub push failed.%0A%0ACheck logs: /opt/fleet-backup/logs/backup.log%0AServer: $(hostname)%0ATime: $(date)"
   fi
 
-  push_cleanup
 fi