Add one-shot basic-to-advanced upgrade flow

Author: liamvibecodes

README.md

@@ -97,6 +97,16 @@ Optional flags when running from a local clone:
 bash bootstrap.sh --media-dir /Volumes/T9/Media --install-dir ~/mac-media-stack-advanced --non-interactive
 ```
 
+## Upgrading From Basic
+
+Already running `mac-media-stack` and want to keep your existing library/configs?
+
+Use the one-shot upgrader: [UPGRADE.md](UPGRADE.md)
+
+```bash
+bash scripts/upgrade-from-basic.sh
+```
+
 <details>
 <summary>See it in action</summary>
 <br>
@@ -165,6 +175,8 @@ bash scripts/vpn-mode.sh nord
 |--------|---------|
 | `scripts/setup.sh` | Creates folders, generates .env, copies config templates |
 | `scripts/doctor.sh` | Runs preflight checks (runtime, env, compose, ports) |
+| `scripts/upgrade-from-basic.sh` | One-shot migration from basic stack to advanced |
+| `scripts/doctor.sh` | Runs preflight checks (runtime, env, compose, ports) |
 | `scripts/configure.sh` | Auto-configures all service connections via API |
 | `scripts/health-check.sh` | Full stack health diagnostic |
 | `scripts/install-launchd-jobs.sh` | Installs all automation as background jobs |

SETUP.md

@@ -22,6 +22,8 @@ To run from a local clone with custom paths:
 bash bootstrap.sh --media-dir /Volumes/T9/Media --install-dir ~/mac-media-stack-advanced
 ```
 
+Already running the basic stack and want an in-place migration? Use [UPGRADE.md](UPGRADE.md).
+
 ---
 
 ## Prerequisites
@@ -217,6 +219,7 @@ bash scripts/install-launchd-jobs.sh
 This installs:
 - Auto-healer (hourly VPN/container health check + restart)
 - Nightly backup (configs + databases, 14-day retention)
+- Log prune (daily cleanup, removes logs older than 30 days)
 - Download watchdog (stalled torrent auto-fix every 15 min)
 - Kometa scheduler (metadata refresh every 4 hours)
 - Log prune (daily log cleanup with 30-day retention)

UPGRADE.md

@@ -1,130 +1,101 @@
 # Upgrade Guide: Basic -> Advanced
 
-This guide upgrades an existing `mac-media-stack` install to `mac-media-stack-advanced` without losing your media library or app config.
+This guide upgrades an existing `mac-media-stack` install to `mac-media-stack-advanced` without moving your media library.
 
-## Before You Start
+## Recommended: One-shot upgrader
 
-- Stop any active downloads first (recommended).
-- Keep your existing `MEDIA_DIR` path exactly the same.
-- Do not run basic and advanced at the same time.
+Use the built-in migration script:
 
-## What Carries Over
-
-If you reuse the same `MEDIA_DIR`, advanced will reuse your existing:
-
-- Movies/TV library files
-- Radarr/Sonarr/Prowlarr/qBittorrent/Bazarr/Seerr configs
-- API keys and existing app state inside `${MEDIA_DIR}/config`
+```bash
+cd ~/mac-media-stack-advanced
+bash scripts/upgrade-from-basic.sh
+```
 
-## 1. Backup (Required)
+### Common flags
 
 ```bash
-# adjust if your media path is not ~/Media
-MEDIA_DIR=~/Media
+# Non-default basic repo location
+bash scripts/upgrade-from-basic.sh --basic-dir /path/to/mac-media-stack
 
-# backup media stack config/state quickly
-mkdir -p ~/media-stack-upgrade-backup
-cp -a "$MEDIA_DIR/config" ~/media-stack-upgrade-backup/config
-cp -a "$MEDIA_DIR/state" ~/media-stack-upgrade-backup/state 2>/dev/null || true
-cp -a "$MEDIA_DIR/logs" ~/media-stack-upgrade-backup/logs 2>/dev/null || true
-```
+# Override MEDIA_DIR (if different from basic .env)
+bash scripts/upgrade-from-basic.sh --media-dir /Volumes/T9/Media
 
-If you already use the advanced backup repo/tooling, run that instead.
+# Fully non-interactive run (skips Seerr sign-in prompt in configure.sh)
+bash scripts/upgrade-from-basic.sh --yes --non-interactive
 
-## 2. Stop Basic Stack
+# Skip backup snapshot (not recommended)
+bash scripts/upgrade-from-basic.sh --yes --skip-backup
 
-```bash
-cd ~/mac-media-stack
-docker compose down
+# Start watchtower profile after upgrade
+bash scripts/upgrade-from-basic.sh --enable-watchtower
 ```
 
-## 3. Clone Advanced
+What the upgrader does:
 
-```bash
-cd ~
-git clone https://github.com/liamvibecodes/mac-media-stack-advanced.git
-cd mac-media-stack-advanced
-```
+1. Validates basic + advanced repo paths
+2. Creates a backup snapshot (env + config/state/logs)
+3. Migrates shared env keys from basic to advanced
+4. Stops basic stack
+5. Runs advanced setup + preflight doctor checks
+6. Starts advanced stack
+7. Runs auto-configuration
+8. Installs launchd automation jobs
+9. Runs health checks
 
-## 4. Configure `.env` for Existing Media Path
+## Manual upgrade (step-by-step)
 
-Generate a starter `.env` if needed:
+If you prefer full manual control:
 
+1. Backup:
 ```bash
-bash scripts/setup.sh
+MEDIA_DIR=~/Media
+mkdir -p ~/media-stack-upgrade-backup
+cp -a "$MEDIA_DIR/config" ~/media-stack-upgrade-backup/config
+cp -a "$MEDIA_DIR/state" ~/media-stack-upgrade-backup/state 2>/dev/null || true
+cp -a "$MEDIA_DIR/logs" ~/media-stack-upgrade-backup/logs 2>/dev/null || true
 ```
-
-Open `.env` and confirm:
-
-- `MEDIA_DIR` points to your existing library path from basic
-- your VPN keys are set (`WIREGUARD_PRIVATE_KEY`, `WIREGUARD_ADDRESSES`)
-
+2. Stop basic:
 ```bash
-open -a TextEdit .env
+cd ~/mac-media-stack
+docker compose down
 ```
-
-## 5. Run Preflight + Start Advanced
-
+3. Prepare advanced:
 ```bash
+cd ~/mac-media-stack-advanced
+bash scripts/setup.sh
 bash scripts/doctor.sh
-docker compose up -d
 ```
-
-## 6. Run Auto-Configuration
-
+4. Start and configure:
 ```bash
+docker compose up -d
 bash scripts/configure.sh
-```
-
-This auto-wires:
-
-- qBittorrent, Radarr, Sonarr, Prowlarr, Seerr
-- Recyclarr API keys
-- Unpackerr API keys (+ Unpackerr restart)
-
-## 7. Complete Advanced-Only Manual Setup
-
-Still manual by design:
-
-- Kometa: add `PLEX_TOKEN` + TMDB API key in `${MEDIA_DIR}/config/kometa/config.yml`
-- Tdarr: configure libraries/plugins in Web UI (`http://localhost:8265`)
-
-## 8. Install Automation Jobs
-
-```bash
 bash scripts/install-launchd-jobs.sh
 ```
-
-This installs auto-heal, backup, watchdog, Kometa runner, and log-prune.
-
-## 9. Validate
-
+5. Validate:
 ```bash
 bash scripts/health-check.sh
 ```
 
-Confirm:
+## Advanced-only follow-up
 
-- core services show `OK`
-- VPN shows healthy
-- Plex can still see your existing libraries
+After either upgrade path, confirm:
 
-## Optional: Enable Watchtower
+1. `~/Media/config/kometa/config.yml` has `PLEX_TOKEN` + TMDB key
+2. Tdarr libraries/plugins are configured at `http://localhost:8265`
+3. `bash scripts/health-check.sh` reports clean results
 
-```bash
-docker compose --profile autoupdate up -d watchtower
-```
+## Rollback
 
-## Rollback (If Needed)
+Quick rollback:
 
 ```bash
-# stop advanced
 cd ~/mac-media-stack-advanced
 docker compose down
 
-# bring basic back
 cd ~/mac-media-stack
 docker compose up -d
 ```
 
-Because both stacks use the same `MEDIA_DIR`, rollback is quick.
+If you used the one-shot script, backup snapshots are saved under:
+
+`~/media-stack-upgrade-backup/YYYYMMDD-HHMMSS/`

scripts/install-launchd-jobs.sh

@@ -3,6 +3,7 @@
 # - Auto-heal (hourly)
 # - Nightly backup
 # - Download watchdog (every 15 min)
+# - Log prune (daily)
 # - VPN failover (every 2 min, optional)
 # - Kometa (every 4 hours)
 # Usage: bash scripts/install-launchd-jobs.sh [--help]
@@ -98,6 +99,7 @@ echo ""
 
 install_plist "auto-heal" 3600 "$SCRIPT_DIR/auto-heal.sh"
 install_plist "backup" 86400 "$SCRIPT_DIR/backup.sh"
+install_plist "log-prune" 86400 "$SCRIPT_DIR/log-prune.sh"
 install_plist "download-watchdog" 900 "$SCRIPT_DIR/download-watchdog.py" "false"
 
 # Kometa one-shot (every 4 hours = 14400s)