Update dependency express to v5

.dockerignore

@@ -1,34 +0,0 @@
-# Environment files
-**/.env
-**/.env.*
-**/env.example
-
-# Node modules
-**/node_modules
-
-# Logs
-**/logs
-**/*.log
-
-# Git
-**/.git
-**/.gitignore
-
-# IDE files
-**/.vscode
-**/.idea
-**/*.swp
-**/*.swo
-
-# OS files
-**/.DS_Store
-**/Thumbs.db
-
-# Build artifacts
-**/dist
-**/build
-**/coverage
-
-# Temporary files
-**/tmp
-**/temp

agents/legacy-patchmon-agent.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# PatchMon Agent Script v1.2.8
+# PatchMon Agent Script v1.2.9
 # This script sends package update information to the PatchMon server using API credentials
 
 # Configuration
 PATCHMON_SERVER="${PATCHMON_SERVER:-http://localhost:3001}"
 API_VERSION="v1"
-AGENT_VERSION="1.2.8"
+AGENT_VERSION="1.2.9"
 CONFIG_FILE="/etc/patchmon/agent.conf"
 CREDENTIALS_FILE="/etc/patchmon/credentials"
 LOG_FILE="/var/log/patchmon-agent.log"
@@ -38,21 +38,21 @@ error() {
     exit 1
 }
 
-# Info logging (cleaner output - only stdout, no duplicate logging)
+# Info logging (cleaner output - only stderr, no duplicate logging)
 info() {
-    echo -e "${BLUE}ℹ️  $1${NC}"
+    echo -e "${BLUE}ℹ️  $1${NC}" >&2
     log "INFO: $1"
 }
 
-# Success logging (cleaner output - only stdout, no duplicate logging)
+# Success logging (cleaner output - only stderr, no duplicate logging)
 success() {
-    echo -e "${GREEN}✅ $1${NC}"
+    echo -e "${GREEN}✅ $1${NC}" >&2
     log "SUCCESS: $1"
 }
 
-# Warning logging (cleaner output - only stdout, no duplicate logging)
+# Warning logging (cleaner output - only stderr, no duplicate logging)
 warning() {
-    echo -e "${YELLOW}⚠️  $1${NC}"
+    echo -e "${YELLOW}⚠️  $1${NC}" >&2
     log "WARNING: $1"
 }
 
@@ -709,6 +709,135 @@ get_package_info() {
     echo "$packages_json"
 }
 
+# Check and handle APT locks
+handle_apt_locks() {
+    local interactive=${1:-false}  # First parameter indicates if running interactively
+    
+    local lock_files=(
+        "/var/lib/dpkg/lock"
+        "/var/lib/dpkg/lock-frontend"
+        "/var/lib/apt/lists/lock"
+        "/var/cache/apt/archives/lock"
+    )
+    
+    local processes_found=false
+    local hung_processes=()
+    
+    # Check for running APT processes
+    if pgrep -x "apt-get|apt|aptitude|dpkg|unattended-upgr" > /dev/null 2>&1; then
+        processes_found=true
+        info "Found running package management processes:"
+        echo "" >&2
+        
+        # Get process info with ACTUAL elapsed time (not CPU time)
+        # Using ps -eo format to get real elapsed time
+        while IFS= read -r line; do
+            [[ -z "$line" ]] && continue
+            
+            local pid=$(echo "$line" | awk '{print $1}')
+            local elapsed=$(echo "$line" | awk '{print $2}')
+            local cmd=$(echo "$line" | awk '{for(i=3;i<=NF;i++) printf "%s ", $i; print ""}')
+            
+            # Display process info
+            echo "  PID $pid: $cmd (running for $elapsed)" >&2
+            
+            # Parse elapsed time and convert to seconds
+            # Format can be: MM:SS, HH:MM:SS, DD-HH:MM:SS, or just SS
+            # Use 10# prefix to force base-10 (avoid octal interpretation of leading zeros)
+            local runtime_seconds=0
+            if [[ "$elapsed" =~ ^([0-9]+)-([0-9]+):([0-9]+):([0-9]+)$ ]]; then
+                # Format: DD-HH:MM:SS
+                runtime_seconds=$(( 10#${BASH_REMATCH[1]} * 86400 + 10#${BASH_REMATCH[2]} * 3600 + 10#${BASH_REMATCH[3]} * 60 + 10#${BASH_REMATCH[4]} ))
+            elif [[ "$elapsed" =~ ^([0-9]+):([0-9]+):([0-9]+)$ ]]; then
+                # Format: HH:MM:SS
+                runtime_seconds=$(( 10#${BASH_REMATCH[1]} * 3600 + 10#${BASH_REMATCH[2]} * 60 + 10#${BASH_REMATCH[3]} ))
+            elif [[ "$elapsed" =~ ^([0-9]+):([0-9]+)$ ]]; then
+                # Format: MM:SS
+                runtime_seconds=$(( 10#${BASH_REMATCH[1]} * 60 + 10#${BASH_REMATCH[2]} ))
+            elif [[ "$elapsed" =~ ^([0-9]+)$ ]]; then
+                # Format: just seconds
+                runtime_seconds=$((10#${BASH_REMATCH[1]}))
+            fi
+            
+            # Consider process hung if running for more than 5 minutes
+            if [[ $runtime_seconds -gt 300 ]]; then
+                hung_processes+=("$pid:$elapsed:$cmd")
+            fi
+        done < <(ps -eo pid,etime,cmd | grep -E "apt-get|apt[^-]|aptitude|dpkg|unattended-upgr" | grep -v grep | grep -v "ps -eo")
+        
+        echo "" >&2
+        
+        info "Detected ${#hung_processes[@]} hung process(es), interactive=$interactive"
+        
+        # If hung processes found and running interactively, offer to kill them
+        if [[ ${#hung_processes[@]} -gt 0 && "$interactive" == "true" ]]; then
+            warning "Found ${#hung_processes[@]} potentially hung process(es) (running > 5 minutes)"
+            echo "" >&2
+            
+            for process_info in "${hung_processes[@]}"; do
+                IFS=':' read -r pid elapsed cmd <<< "$process_info"
+                echo "  PID $pid: $cmd (hung for $elapsed)" >&2
+            done
+            
+            echo "" >&2
+            read -p "$(echo -e "${YELLOW}⚠️  Do you want to kill these processes? [y/N]:${NC} ")" -n 1 -r >&2
+            echo "" >&2
+            
+            if [[ $REPLY =~ ^[Yy]$ ]]; then
+                for process_info in "${hung_processes[@]}"; do
+                    IFS=':' read -r pid elapsed cmd <<< "$process_info"
+                    info "Killing process $pid..."
+                    if kill "$pid" 2>/dev/null; then
+                        success "Killed process $pid"
+                        sleep 1
+                        # Check if process is still running
+                        if kill -0 "$pid" 2>/dev/null; then
+                            warning "Process $pid still running, using SIGKILL..."
+                            kill -9 "$pid" 2>/dev/null
+                            success "Force killed process $pid"
+                        fi
+                    else
+                        warning "Could not kill process $pid (may require sudo)"
+                    fi
+                done
+                
+                # Wait a moment for locks to clear
+                sleep 2
+            else
+                info "Skipping process termination"
+            fi
+        elif [[ ${#hung_processes[@]} -gt 0 ]]; then
+            warning "Found ${#hung_processes[@]} potentially hung process(es) (running > 5 minutes)"
+            info "Run this command with sudo and interactively to kill hung processes"
+        fi
+    fi
+    
+    # Check for stale lock files (files that exist but no process is holding them)
+    for lock_file in "${lock_files[@]}"; do
+        if [[ -f "$lock_file" ]]; then
+            # Try to get the PID from the lock file if it exists
+            if lsof "$lock_file" > /dev/null 2>&1; then
+                info "Lock file $lock_file is held by an active process"
+            else
+                warning "Found stale lock file: $lock_file"
+                info "Attempting to remove stale lock..."
+                if rm -f "$lock_file" 2>/dev/null; then
+                    success "Removed stale lock: $lock_file"
+                else
+                    warning "Could not remove lock (insufficient permissions): $lock_file"
+                fi
+            fi
+        fi
+    done
+    
+    # If processes were found, return failure so caller can wait
+    if [[ "$processes_found" == true ]]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
 # Get package info for APT-based systems
 get_apt_packages() {
     local -n packages_ref=$1
@@ -725,10 +854,25 @@ get_apt_packages() {
         else
             retry_count=$((retry_count + 1))
             if [[ $retry_count -lt $max_retries ]]; then
-                warning "APT lock detected, retrying in ${retry_delay} seconds... (attempt $retry_count/$max_retries)"
+                warning "APT lock detected (attempt $retry_count/$max_retries)"
+                
+                # On first retry, try to handle locks
+                if [[ $retry_count -eq 1 ]]; then
+                    info "Checking for stale APT locks..."
+                    # Check if running interactively (stdin is a terminal OR stdout is a terminal)
+                    local is_interactive=false
+                    if [[ -t 0 ]] || [[ -t 1 ]]; then
+                        is_interactive=true
+                    fi
+                    info "Interactive mode: $is_interactive"
+                    handle_apt_locks "$is_interactive"
+                fi
+                
+                info "Waiting ${retry_delay} seconds before retry..."
                 sleep $retry_delay
             else
-                warning "APT lock persists after $max_retries attempts, continuing without update..."
+                warning "APT lock persists after $max_retries attempts"
+                warning "Continuing without updating package lists (will use cached data)"
             fi
         fi
     done
@@ -1564,9 +1708,21 @@ main() {
         "diagnostics")
             show_diagnostics
             ;;
+        "clear-locks"|"unlock")
+            check_root
+            info "Checking APT locks and hung processes..."
+            echo ""
+            handle_apt_locks true
+            echo ""
+            if [[ $? -eq 0 ]]; then
+                success "No APT locks or processes blocking package management"
+            else
+                info "APT processes are still running - they may be legitimate operations"
+            fi
+            ;;
         *)
             echo "PatchMon Agent v$AGENT_VERSION - API Credential Based"
-            echo "Usage: $0 {configure|test|update|ping|config|check-version|check-agent-update|update-agent|update-crontab|diagnostics}"
+            echo "Usage: $0 {configure|test|update|ping|config|check-version|check-agent-update|update-agent|update-crontab|clear-locks|diagnostics}"
             echo ""
             echo "Commands:"
             echo "  configure <API_ID> <API_KEY> [SERVER_URL] - Configure API credentials for this host"
@@ -1578,6 +1734,7 @@ main() {
             echo "  check-agent-update            - Check for agent updates using timestamp comparison"
             echo "  update-agent                  - Update agent to latest version"
             echo "  update-crontab                - Update crontab with current policy"
+            echo "  clear-locks                   - Check and clear APT locks (interactive)"
             echo "  diagnostics                   - Show detailed system diagnostics"
             echo ""
             echo "Setup Process:"

agents/patchmon-agent.sh

@@ -1,324 +0,0 @@
-#!/bin/bash
-
-# PatchMon Agent Migration Script v1.2.9
-# This script migrates from legacy bash agent (v1.2.8) to Go agent (v1.3.0+)
-# It acts as an intermediary during the upgrade process
-
-# Configuration
-PATCHMON_SERVER="${PATCHMON_SERVER:-http://localhost:3001}"
-API_VERSION="v1"
-AGENT_VERSION="1.2.9"
-CREDENTIALS_FILE="/etc/patchmon/credentials"
-LOG_FILE="/var/log/patchmon-agent.log"
-
-# This placeholder will be dynamically replaced by the server when serving this
-# script based on the "ignore SSL self-signed" setting. If set to -k, curl will
-# ignore certificate validation. Otherwise, it will be empty for secure default.
-CURL_FLAGS=""
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Logging function
-log() {
-    if [[ -w "$(dirname "$LOG_FILE")" ]] 2>/dev/null; then
-        echo "[$(date '+%Y-%m-%d %H:%M:%S')] MIGRATION: $1" >> "$LOG_FILE" 2>/dev/null
-    fi
-}
-
-# Error handling
-error() {
-    echo -e "${RED}ERROR: $1${NC}" >&2
-    log "ERROR: $1"
-    exit 1
-}
-
-# Info logging
-info() {
-    echo -e "${BLUE}ℹ️  $1${NC}" >&2
-    log "INFO: $1"
-}
-
-# Success logging
-success() {
-    echo -e "${GREEN}✅ $1${NC}" >&2
-    log "SUCCESS: $1"
-}
-
-# Warning logging
-warning() {
-    echo -e "${YELLOW}⚠️  $1${NC}" >&2
-    log "WARNING: $1"
-}
-
-# Check if running as root
-check_root() {
-    if [[ $EUID -ne 0 ]]; then
-        error "This migration script must be run as root"
-    fi
-}
-
-# Load API credentials from legacy format
-load_legacy_credentials() {
-    if [[ ! -f "$CREDENTIALS_FILE" ]]; then
-        error "Legacy credentials file not found at $CREDENTIALS_FILE"
-    fi
-    
-    source "$CREDENTIALS_FILE"
-    
-    if [[ -z "$API_ID" ]] || [[ -z "$API_KEY" ]]; then
-        error "API_ID and API_KEY must be configured in $CREDENTIALS_FILE"
-    fi
-    
-    # Use PATCHMON_URL from credentials if available
-    if [[ -n "$PATCHMON_URL" ]]; then
-        PATCHMON_SERVER="$PATCHMON_URL"
-    fi
-}
-
-
-# Remove cron entries
-remove_cron_entries() {
-    info "Removing legacy cron entries..."
-    
-    # Get current crontab
-    local current_crontab=$(crontab -l 2>/dev/null || echo "")
-    
-    if [[ -n "$current_crontab" ]]; then
-        # Remove any lines containing patchmon-agent
-        local new_crontab=$(echo "$current_crontab" | grep -v "patchmon-agent" || true)
-        
-        # Update crontab if it changed
-        if [[ "$current_crontab" != "$new_crontab" ]]; then
-            if [[ -n "$new_crontab" ]]; then
-                echo "$new_crontab" | crontab -
-                success "Legacy cron entries removed (kept other cron jobs)"
-            else
-                crontab -r 2>/dev/null || true
-                success "All cron entries removed"
-            fi
-        else
-            info "No patchmon cron entries found to remove"
-        fi
-    else
-        info "No crontab found"
-    fi
-}
-
-
-# Clean up legacy files (only after successful verification)
-cleanup_legacy_files() {
-    info "Cleaning up legacy files..."
-    
-    # Remove legacy script
-    if [[ -f "/usr/local/bin/patchmon-agent.sh" ]]; then
-        rm -f "/usr/local/bin/patchmon-agent.sh"
-        success "Removed legacy script"
-    fi
-    
-    # Remove legacy credentials file
-    if [[ -f "$CREDENTIALS_FILE" ]]; then
-        rm -f "$CREDENTIALS_FILE"
-        success "Removed legacy credentials file"
-    fi
-    
-    # Remove legacy config file (if it exists)
-    if [[ -f "/etc/patchmon/config" ]]; then
-        rm -f "/etc/patchmon/config"
-        success "Removed legacy config file"
-    fi
-}
-
-# Show migration summary
-show_migration_summary() {
-    echo ""
-    echo "=========================================="
-    echo "PatchMon Agent Migration Complete!"
-    echo "=========================================="
-    echo ""
-    echo "✅ Successfully migrated from bash agent to Go agent"
-    echo ""
-    echo "What was done:"
-    echo "  • Loaded legacy credentials"
-    echo "  • Downloaded and ran PatchMon install script"
-    echo "  • Installed Go agent binary and systemd service"
-    echo "  • Verified service is running"
-    echo "  • Removed legacy cron entries"
-    echo "  • Cleaned up legacy files"
-    echo ""
-    echo "Next steps:"
-    echo "  • The Go agent runs as a service, no cron needed"
-    echo "  • Use: patchmon-agent serve (to run as service)"
-    echo "  • Use: patchmon-agent report (for one-time report)"
-    echo "  • Use: patchmon-agent --help (for all commands)"
-    echo ""
-    echo "Monitoring commands:"
-    echo "  • Check status: systemctl status patchmon-agent"
-    echo "  • View logs: tail -f /etc/patchmon/logs/patchmon-agent.log"
-    echo "  • Run diagnostics: patchmon-agent diagnostics"
-    echo ""
-    echo "Configuration files:"
-    echo "  • Config: /etc/patchmon/config.yml"
-    echo "  • Credentials: /etc/patchmon/credentials.yml"
-    echo "  • Logs: /etc/patchmon/logs/patchmon-agent.log"
-    echo ""
-}
-
-# Post-migration verification
-post_migration_check() {
-    echo ""
-    echo "=========================================="
-    echo "Post-Migration Verification"
-    echo "=========================================="
-    echo ""
-    
-    # Check if patchmon-agent is running
-    info "Checking if patchmon-agent is running..."
-    if pgrep -f "patchmon-agent serve" >/dev/null 2>&1; then
-        success "PatchMon agent is running"
-    else
-        warning "PatchMon agent is not running (this is normal if not started as service)"
-        info "To start as service: patchmon-agent serve"
-    fi
-    
-    # Check WebSocket connection (if agent is running)
-    if pgrep -f "patchmon-agent serve" >/dev/null 2>&1; then
-        info "Checking WebSocket connection..."
-        if /usr/local/bin/patchmon-agent ping >/dev/null 2>&1; then
-            success "WebSocket connection is active"
-        else
-            warning "WebSocket connection test failed"
-        fi
-    else
-        info "Skipping WebSocket check (agent not running)"
-    fi
-    
-    # Run diagnostics
-    info "Running system diagnostics..."
-    echo ""
-    if [[ -f "/usr/local/bin/patchmon-agent" ]]; then
-        if /usr/local/bin/patchmon-agent diagnostics >/dev/null 2>&1; then
-            success "Diagnostics completed successfully"
-            echo ""
-            echo "Full diagnostics output:"
-            echo "----------------------------------------"
-            /usr/local/bin/patchmon-agent diagnostics
-            echo "----------------------------------------"
-        else
-            warning "Diagnostics failed to run"
-        fi
-    else
-        warning "Go agent binary not found - cannot run diagnostics"
-    fi
-    
-    echo ""
-    echo "=========================================="
-    echo "Migration Verification Complete!"
-    echo "=========================================="
-    echo ""
-    success "Thank you for using PatchMon Agent!"
-    echo ""
-}
-
-# Main migration function
-perform_migration() {
-    info "Starting PatchMon Agent migration from bash to Go..."
-    echo ""
-    
-    # Load legacy credentials
-    load_legacy_credentials
-    
-    # Set environment variables for install script
-    export API_ID="$API_ID"
-    export API_KEY="$API_KEY"
-    export PATCHMON_URL="$PATCHMON_SERVER"
-    
-    # Detect architecture
-    local arch=$(uname -m)
-    local goarch=""
-    case "$arch" in
-        "x86_64") goarch="amd64" ;;
-        "i386"|"i686") goarch="386" ;;
-        "aarch64"|"arm64") goarch="arm64" ;;
-        "armv7l"|"armv6l"|"armv5l") goarch="arm" ;;
-        *) error "Unsupported architecture: $arch" ;;
-    esac
-    
-    info "Downloading and running PatchMon install script..."
-    
-    # Download and run the install script
-    if curl $CURL_FLAGS -H "X-API-ID: $API_ID" -H "X-API-KEY: $API_KEY" \
-           "$PATCHMON_SERVER/api/v1/hosts/install?arch=$goarch" | bash; then
-        
-        success "PatchMon Go agent installed successfully"
-        
-        # Wait a moment for service to start
-        sleep 3
-        
-        # Test if the service is running
-        if systemctl is-active --quiet patchmon-agent.service; then
-            success "PatchMon agent service is running"
-            
-            # Clean up legacy files
-            remove_cron_entries
-            cleanup_legacy_files
-            
-            # Show summary
-            show_migration_summary
-            post_migration_check
-            
-            success "Migration completed successfully!"
-        else
-            warning "PatchMon agent service failed to start"
-            warning "Legacy files preserved for debugging"
-            show_migration_summary
-        fi
-    else
-        error "Failed to install PatchMon Go agent"
-    fi
-    
-    # Exit here to prevent the legacy script from continuing
-    exit 0
-}
-
-# Handle command line arguments
-case "$1" in
-    "migrate")
-        check_root
-        perform_migration
-        ;;
-    "test")
-        check_root
-        load_legacy_credentials
-        test_go_agent
-        ;;
-    "update-agent")
-        # This is called by legacy agents during update
-        check_root
-        perform_migration
-        ;;
-    *)
-        # If no arguments provided, check if we're being executed by a legacy agent
-        # Legacy agents will call this script directly during update
-        if [[ -f "$CREDENTIALS_FILE" ]]; then
-            info "Detected legacy agent execution - starting migration..."
-            check_root
-            perform_migration
-        else
-            echo "PatchMon Agent Migration Script v$AGENT_VERSION"
-            echo "Usage: $0 {migrate|test|update-agent}"
-            echo ""
-            echo "Commands:"
-            echo "  migrate      - Perform full migration from bash to Go agent"
-            echo "  test         - Test Go agent after migration"
-            echo "  update-agent - Called by legacy agents during update"
-            echo ""
-            echo "This script should be executed by the legacy agent during update."
-            exit 1
-        fi
-        ;;
-esac

agents/patchmon-docker-agent.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-# PatchMon Docker Agent Script v1.3.0
+# PatchMon Docker Agent Script v1.2.9
 # This script collects Docker container and image information and sends it to PatchMon
 
 # Configuration
 PATCHMON_SERVER="${PATCHMON_SERVER:-http://localhost:3001}"
 API_VERSION="v1"
-AGENT_VERSION="1.3.0"
+AGENT_VERSION="1.2.9"
 CONFIG_FILE="/etc/patchmon/agent.conf"
 CREDENTIALS_FILE="/etc/patchmon/credentials"
 LOG_FILE="/var/log/patchmon-docker-agent.log"

agents/patchmon_install.sh

@@ -356,7 +356,6 @@ api_version: "v1"
 credentials_file: "/etc/patchmon/credentials.yml"
 log_file: "/etc/patchmon/logs/patchmon-agent.log"
 log_level: "info"
-skip_ssl_verify: ${SKIP_SSL_VERIFY:-false}
 EOF
 
 # Create credentials file
@@ -400,7 +399,7 @@ fi
 curl $CURL_FLAGS \
     -H "X-API-ID: $API_ID" \
     -H "X-API-KEY: $API_KEY" \
-    "$PATCHMON_URL/api/v1/hosts/agent/download?arch=$ARCHITECTURE&force=binary" \
+    "$PATCHMON_URL/api/v1/hosts/agent/download?arch=$ARCHITECTURE" \
     -o /usr/local/bin/patchmon-agent
 
 chmod +x /usr/local/bin/patchmon-agent

agents/proxmox_auto_enroll.sh

@@ -153,32 +153,6 @@ while IFS= read -r line; do
     ip_address=$(timeout 5 pct exec "$vmid" -- hostname -I 2>/dev/null </dev/null | awk '{print $1}' || echo "unknown")
     os_info=$(timeout 5 pct exec "$vmid" -- cat /etc/os-release 2>/dev/null </dev/null | grep "^PRETTY_NAME=" | cut -d'"' -f2 || echo "unknown")
     
-    # Detect container architecture
-    debug "  Detecting container architecture..."
-    arch_raw=$(timeout 5 pct exec "$vmid" -- uname -m 2>/dev/null </dev/null || echo "unknown")
-    
-    # Map architecture to supported values
-    case "$arch_raw" in
-        "x86_64")
-            architecture="amd64"
-            ;;
-        "i386"|"i686")
-            architecture="386"
-            ;;
-        "aarch64"|"arm64")
-            architecture="arm64"
-            ;;
-        "armv7l"|"armv6l"|"arm")
-            architecture="arm"
-            ;;
-        *)
-            warn "  ⚠ Unknown architecture '$arch_raw', defaulting to amd64"
-            architecture="amd64"
-            ;;
-    esac
-    
-    debug "  Detected architecture: $arch_raw -> $architecture"
-    
     # Get machine ID from container
     machine_id=$(timeout 5 pct exec "$vmid" -- bash -c "cat /etc/machine-id 2>/dev/null || cat /var/lib/dbus/machine-id 2>/dev/null || echo 'proxmox-lxc-$vmid-'$(cat /proc/sys/kernel/random/uuid)" </dev/null 2>/dev/null || echo "proxmox-lxc-$vmid-unknown")
 
@@ -187,7 +161,6 @@ while IFS= read -r line; do
     info "  Hostname: $hostname"
     info "  IP Address: $ip_address"
     info "  OS: $os_info"
-    info "  Architecture: $architecture ($arch_raw)"
     info "  Machine ID: ${machine_id:0:16}..."
 
     if [[ "$DRY_RUN" == "true" ]]; then
@@ -271,13 +244,12 @@ while IFS= read -r line; do
         # Install PatchMon agent in container
         info "  Installing PatchMon agent..."
         
-        # Build install URL with force flag and architecture if enabled
-        install_url="$PATCHMON_URL/api/v1/hosts/install?arch=$architecture"
+        # Build install URL with force flag if enabled
+        install_url="$PATCHMON_URL/api/v1/hosts/install"
         if [[ "$FORCE_INSTALL" == "true" ]]; then
-            install_url="$install_url&force=true"
+            install_url="$install_url?force=true"
             info "  Using force mode - will bypass broken packages"
         fi
-        info "  Using architecture: $architecture"
         
         # Reset exit code for this container
         install_exit_code=0
@@ -428,7 +400,7 @@ if [[ ${#dpkg_error_containers[@]} -gt 0 ]]; then
                         -H \"X-API-ID: $api_id\" \
                         -H \"X-API-KEY: $api_key\" \
                         -o patchmon-install.sh \
-                        '$PATCHMON_URL/api/v1/hosts/install?arch=$architecture' && \
+                        '$PATCHMON_URL/api/v1/hosts/install' && \
                     bash patchmon-install.sh && \
                     rm -f patchmon-install.sh
                 " 2>&1 </dev/null) || install_exit_code=$?

backend/env.example

@@ -1,36 +1,22 @@
 # Database Configuration
-DATABASE_URL="postgresql://patchmon_user:your-password-here@localhost:5432/patchmon_db"
+DATABASE_URL="postgresql://patchmon_user:p@tchm0n_p@55@localhost:5432/patchmon_db"
 PM_DB_CONN_MAX_ATTEMPTS=30
 PM_DB_CONN_WAIT_INTERVAL=2
 
-# Database Connection Pool Configuration (Prisma)
-DB_CONNECTION_LIMIT=30       # Maximum connections per instance (default: 30)
-DB_POOL_TIMEOUT=20          # Seconds to wait for available connection (default: 20)
-DB_CONNECT_TIMEOUT=10       # Seconds to wait for initial connection (default: 10)
-DB_IDLE_TIMEOUT=300         # Seconds before closing idle connections (default: 300)
-DB_MAX_LIFETIME=1800        # Maximum lifetime of a connection in seconds (default: 1800)
-
-# JWT Configuration
-JWT_SECRET=your-secure-random-secret-key-change-this-in-production
-JWT_EXPIRES_IN=1h
-JWT_REFRESH_EXPIRES_IN=7d
+# Redis Configuration
+REDIS_HOST=localhost
+REDIS_PORT=6379
+REDIS_PASSWORD=your-redis-password-here
+REDIS_DB=0
 
 # Server Configuration
 PORT=3001
-NODE_ENV=production
+NODE_ENV=development
 
 # API Configuration
 API_VERSION=v1
-
-# CORS Configuration
 CORS_ORIGIN=http://localhost:3000
 
-# Session Configuration
-SESSION_INACTIVITY_TIMEOUT_MINUTES=30
-
-# User Configuration
-DEFAULT_USER_ROLE=user
-
 # Rate Limiting (times in milliseconds)
 RATE_LIMIT_WINDOW_MS=900000
 RATE_LIMIT_MAX=5000
@@ -39,18 +25,20 @@ AUTH_RATE_LIMIT_MAX=500
 AGENT_RATE_LIMIT_WINDOW_MS=60000
 AGENT_RATE_LIMIT_MAX=1000
 
-# Redis Configuration
-REDIS_HOST=localhost
-REDIS_PORT=6379
-REDIS_USER=your-redis-username-here
-REDIS_PASSWORD=your-redis-password-here
-REDIS_DB=0
-
 # Logging
 LOG_LEVEL=info
 ENABLE_LOGGING=true
 
-# TFA Configuration (optional - used if TFA is enabled)
+# User Registration
+DEFAULT_USER_ROLE=user
+
+# JWT Configuration
+JWT_SECRET=your-secure-random-secret-key-change-this-in-production
+JWT_EXPIRES_IN=1h
+JWT_REFRESH_EXPIRES_IN=7d
+SESSION_INACTIVITY_TIMEOUT_MINUTES=30
+
+# TFA Configuration
 TFA_REMEMBER_ME_EXPIRES_IN=30d
 TFA_MAX_REMEMBER_SESSIONS=5
 TFA_SUSPICIOUS_ACTIVITY_THRESHOLD=3

backend/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "patchmon-backend",
-	"version": "1.3.1",
+	"version": "1.2.9",
 	"description": "Backend API for Linux Patch Monitoring System",
 	"license": "AGPL-3.0",
 	"main": "src/server.js",
@@ -17,13 +17,12 @@
 		"@bull-board/api": "^6.13.1",
 		"@bull-board/express": "^6.13.1",
 		"@prisma/client": "^6.1.0",
-		"axios": "^1.7.9",
 		"bcryptjs": "^2.4.3",
 		"bullmq": "^5.61.0",
 		"cookie-parser": "^1.4.7",
 		"cors": "^2.8.5",
 		"dotenv": "^16.4.7",
-		"express": "^4.21.2",
+		"express": "^5.0.0",
 		"express-rate-limit": "^7.5.0",
 		"express-validator": "^7.2.0",
 		"helmet": "^8.0.0",

backend/prisma/migrations/20251026_add_color_theme_to_settings/migration.sql

@@ -1,4 +0,0 @@
--- AlterTable
--- Add color_theme field to settings table for customizable app theming
-ALTER TABLE "settings" ADD COLUMN "color_theme" TEXT NOT NULL DEFAULT 'default';
-

backend/prisma/migrations/20251026_add_metrics_telemetry/migration.sql

@@ -1,14 +0,0 @@
--- AddMetricsTelemetry
--- Add anonymous metrics and telemetry fields to settings table
-
--- Add metrics fields to settings table
-ALTER TABLE "settings" ADD COLUMN "metrics_enabled" BOOLEAN NOT NULL DEFAULT true;
-ALTER TABLE "settings" ADD COLUMN "metrics_anonymous_id" TEXT;
-ALTER TABLE "settings" ADD COLUMN "metrics_last_sent" TIMESTAMP(3);
-
--- Generate UUID for existing records (if any exist)
--- This will use PostgreSQL's gen_random_uuid() function
-UPDATE "settings" 
-SET "metrics_anonymous_id" = gen_random_uuid()::text 
-WHERE "metrics_anonymous_id" IS NULL;
-

backend/prisma/schema.prisma

@@ -170,31 +170,27 @@ model role_permissions {
 }
 
 model settings {
-  id                     String    @id
-  server_url             String    @default("http://localhost:3001")
-  server_protocol        String    @default("http")
-  server_host            String    @default("localhost")
-  server_port            Int       @default(3001)
-  created_at             DateTime  @default(now())
-  updated_at             DateTime
-  update_interval        Int       @default(60)
-  auto_update            Boolean   @default(false)
-  github_repo_url        String    @default("https://github.com/PatchMon/PatchMon.git")
-  ssh_key_path           String?
-  repository_type        String    @default("public")
-  last_update_check      DateTime?
-  latest_version         String?
-  update_available       Boolean   @default(false)
-  signup_enabled         Boolean   @default(false)
-  default_user_role      String    @default("user")
-  ignore_ssl_self_signed Boolean   @default(false)
-  logo_dark              String?   @default("/assets/logo_dark.png")
-  logo_light             String?   @default("/assets/logo_light.png")
-  favicon                String?   @default("/assets/logo_square.svg")
-  metrics_enabled        Boolean   @default(true)
-  metrics_anonymous_id   String?
-  metrics_last_sent      DateTime?
-  color_theme            String    @default("default")
+  id                String    @id
+  server_url        String    @default("http://localhost:3001")
+  server_protocol   String    @default("http")
+  server_host       String    @default("localhost")
+  server_port       Int       @default(3001)
+  created_at        DateTime  @default(now())
+  updated_at        DateTime
+  update_interval   Int       @default(60)
+  auto_update       Boolean   @default(false)
+  github_repo_url   String    @default("git@github.com:9technologygroup/patchmon.net.git")
+  ssh_key_path      String?
+  repository_type   String    @default("public")
+  last_update_check DateTime?
+  latest_version    String?
+  update_available  Boolean   @default(false)
+  signup_enabled    Boolean   @default(false)
+  default_user_role String    @default("user")
+  ignore_ssl_self_signed Boolean @default(false)
+  logo_dark         String?   @default("/assets/logo_dark.png")
+  logo_light        String?   @default("/assets/logo_light.png")
+  favicon           String?   @default("/assets/logo_square.svg")
 }
 
 model update_history {

backend/src/config/database.js

@@ -1,6 +1,6 @@
 /**
- * Centralized Prisma Client Singleton
- * Prevents multiple Prisma clients from creating connection leaks
+ * Database configuration for multiple instances
+ * Optimizes connection pooling to prevent "too many connections" errors
  */
 
 const { PrismaClient } = require("@prisma/client");
@@ -16,69 +16,32 @@ function getOptimizedDatabaseUrl() {
 	// Parse the URL
 	const url = new URL(originalUrl);
 
-	// Add connection pooling parameters - configurable via environment variables
-	const connectionLimit = process.env.DB_CONNECTION_LIMIT || "30";
-	const poolTimeout = process.env.DB_POOL_TIMEOUT || "20";
-	const connectTimeout = process.env.DB_CONNECT_TIMEOUT || "10";
-	const idleTimeout = process.env.DB_IDLE_TIMEOUT || "300";
-	const maxLifetime = process.env.DB_MAX_LIFETIME || "1800";
-
-	url.searchParams.set("connection_limit", connectionLimit);
-	url.searchParams.set("pool_timeout", poolTimeout);
-	url.searchParams.set("connect_timeout", connectTimeout);
-	url.searchParams.set("idle_timeout", idleTimeout);
-	url.searchParams.set("max_lifetime", maxLifetime);
-
-	// Log connection pool settings in development/debug mode
-	if (
-		process.env.ENABLE_LOGGING === "true" ||
-		process.env.LOG_LEVEL === "debug"
-	) {
-		console.log(
-			`[Database Pool] connection_limit=${connectionLimit}, pool_timeout=${poolTimeout}s, connect_timeout=${connectTimeout}s`,
-		);
-	}
+	// Add connection pooling parameters for multiple instances
+	url.searchParams.set("connection_limit", "5"); // Reduced from default 10
+	url.searchParams.set("pool_timeout", "10"); // 10 seconds
+	url.searchParams.set("connect_timeout", "10"); // 10 seconds
+	url.searchParams.set("idle_timeout", "300"); // 5 minutes
+	url.searchParams.set("max_lifetime", "1800"); // 30 minutes
 
 	return url.toString();
 }
 
-// Singleton Prisma client instance
-let prismaInstance = null;
+// Create optimized Prisma client
+function createPrismaClient() {
+	const optimizedUrl = getOptimizedDatabaseUrl();
 
-function getPrismaClient() {
-	if (!prismaInstance) {
-		const optimizedUrl = getOptimizedDatabaseUrl();
-
-		prismaInstance = new PrismaClient({
-			datasources: {
-				db: {
-					url: optimizedUrl,
-				},
+	return new PrismaClient({
+		datasources: {
+			db: {
+				url: optimizedUrl,
 			},
-			log:
-				process.env.PRISMA_LOG_QUERIES === "true"
-					? ["query", "info", "warn", "error"]
-					: ["warn", "error"],
-			errorFormat: "pretty",
-		});
-
-		// Handle graceful shutdown
-		process.on("beforeExit", async () => {
-			await prismaInstance.$disconnect();
-		});
-
-		process.on("SIGINT", async () => {
-			await prismaInstance.$disconnect();
-			process.exit(0);
-		});
-
-		process.on("SIGTERM", async () => {
-			await prismaInstance.$disconnect();
-			process.exit(0);
-		});
-	}
-
-	return prismaInstance;
+		},
+		log:
+			process.env.PRISMA_LOG_QUERIES === "true"
+				? ["query", "info", "warn", "error"]
+				: ["warn", "error"],
+		errorFormat: "pretty",
+	});
 }
 
 // Connection health check
@@ -87,7 +50,7 @@ async function checkDatabaseConnection(prisma) {
 		await prisma.$queryRaw`SELECT 1`;
 		return true;
 	} catch (error) {
-		console.error("Database connection check failed:", error.message);
+		console.error("Database connection failed:", error.message);
 		return false;
 	}
 }
@@ -158,8 +121,9 @@ async function disconnectPrisma(prisma, maxRetries = 3) {
 }
 
 module.exports = {
-	getPrismaClient,
+	createPrismaClient,
 	checkDatabaseConnection,
 	waitForDatabase,
 	disconnectPrisma,
+	getOptimizedDatabaseUrl,
 };

backend/src/middleware/auth.js

@@ -1,12 +1,12 @@
 const jwt = require("jsonwebtoken");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const {
 	validate_session,
 	update_session_activity,
 	is_tfa_bypassed,
 } = require("../utils/session_manager");
 
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Middleware to verify JWT token with session validation
 const authenticateToken = async (req, res, next) => {

backend/src/middleware/permissions.js

@@ -1,5 +1,5 @@
-const { getPrismaClient } = require("../config/prisma");
-const prisma = getPrismaClient();
+const { PrismaClient } = require("@prisma/client");
+const prisma = new PrismaClient();
 
 // Permission middleware factory
 const requirePermission = (permission) => {

backend/src/routes/agentVersionRoutes.js

@@ -1,419 +0,0 @@
-const express = require("express");
-const router = express.Router();
-const agentVersionService = require("../services/agentVersionService");
-const { authenticateToken } = require("../middleware/auth");
-const { requirePermission } = require("../middleware/permissions");
-
-// Test GitHub API connectivity
-router.get(
-	"/test-github",
-	authenticateToken,
-	requirePermission("can_manage_settings"),
-	async (_req, res) => {
-		try {
-			const axios = require("axios");
-			const response = await axios.get(
-				"https://api.github.com/repos/PatchMon/PatchMon-agent/releases",
-				{
-					timeout: 10000,
-					headers: {
-						"User-Agent": "PatchMon-Server/1.0",
-						Accept: "application/vnd.github.v3+json",
-					},
-				},
-			);
-
-			res.json({
-				success: true,
-				status: response.status,
-				releasesFound: response.data.length,
-				latestRelease: response.data[0]?.tag_name || "No releases",
-				rateLimitRemaining: response.headers["x-ratelimit-remaining"],
-				rateLimitLimit: response.headers["x-ratelimit-limit"],
-			});
-		} catch (error) {
-			console.error("❌ GitHub API test failed:", error.message);
-			res.status(500).json({
-				success: false,
-				error: error.message,
-				status: error.response?.status,
-				statusText: error.response?.statusText,
-				rateLimitRemaining: error.response?.headers["x-ratelimit-remaining"],
-				rateLimitLimit: error.response?.headers["x-ratelimit-limit"],
-			});
-		}
-	},
-);
-
-// Get current version information
-router.get("/version", authenticateToken, async (_req, res) => {
-	try {
-		const versionInfo = await agentVersionService.getVersionInfo();
-		console.log(
-			"📊 Version info response:",
-			JSON.stringify(versionInfo, null, 2),
-		);
-		res.json(versionInfo);
-	} catch (error) {
-		console.error("❌ Failed to get version info:", error.message);
-		res.status(500).json({
-			error: "Failed to get version information",
-			details: error.message,
-			status: "error",
-		});
-	}
-});
-
-// Refresh current version by executing agent binary
-router.post(
-	"/version/refresh",
-	authenticateToken,
-	requirePermission("can_manage_settings"),
-	async (_req, res) => {
-		try {
-			console.log("🔄 Refreshing current agent version...");
-			const currentVersion = await agentVersionService.refreshCurrentVersion();
-			console.log("📊 Refreshed current version:", currentVersion);
-			res.json({
-				success: true,
-				currentVersion: currentVersion,
-				message: currentVersion
-					? `Current version refreshed: ${currentVersion}`
-					: "No agent binary found",
-			});
-		} catch (error) {
-			console.error("❌ Failed to refresh current version:", error.message);
-			res.status(500).json({
-				success: false,
-				error: "Failed to refresh current version",
-				details: error.message,
-			});
-		}
-	},
-);
-
-// Download latest update
-router.post(
-	"/version/download",
-	authenticateToken,
-	requirePermission("can_manage_settings"),
-	async (_req, res) => {
-		try {
-			console.log("🔄 Downloading latest agent update...");
-			const downloadResult = await agentVersionService.downloadLatestUpdate();
-			console.log(
-				"📊 Download result:",
-				JSON.stringify(downloadResult, null, 2),
-			);
-			res.json(downloadResult);
-		} catch (error) {
-			console.error("❌ Failed to download latest update:", error.message);
-			res.status(500).json({
-				success: false,
-				error: "Failed to download latest update",
-				details: error.message,
-			});
-		}
-	},
-);
-
-// Check for updates
-router.post(
-	"/version/check",
-	authenticateToken,
-	requirePermission("can_manage_settings"),
-	async (_req, res) => {
-		try {
-			console.log("🔄 Manual update check triggered");
-			const updateInfo = await agentVersionService.checkForUpdates();
-			console.log(
-				"📊 Update check result:",
-				JSON.stringify(updateInfo, null, 2),
-			);
-			res.json(updateInfo);
-		} catch (error) {
-			console.error("❌ Failed to check for updates:", error.message);
-			res.status(500).json({ error: "Failed to check for updates" });
-		}
-	},
-);
-
-// Get available versions
-router.get("/versions", authenticateToken, async (_req, res) => {
-	try {
-		const versions = await agentVersionService.getAvailableVersions();
-		console.log(
-			"📦 Available versions response:",
-			JSON.stringify(versions, null, 2),
-		);
-		res.json({ versions });
-	} catch (error) {
-		console.error("❌ Failed to get available versions:", error.message);
-		res.status(500).json({ error: "Failed to get available versions" });
-	}
-});
-
-// Get binary information
-router.get(
-	"/binary/:version/:architecture",
-	authenticateToken,
-	async (_req, res) => {
-		try {
-			const { version, architecture } = req.params;
-			const binaryInfo = await agentVersionService.getBinaryInfo(
-				version,
-				architecture,
-			);
-			res.json(binaryInfo);
-		} catch (error) {
-			console.error("❌ Failed to get binary info:", error.message);
-			res.status(404).json({ error: error.message });
-		}
-	},
-);
-
-// Download agent binary
-router.get(
-	"/download/:version/:architecture",
-	authenticateToken,
-	async (_req, res) => {
-		try {
-			const { version, architecture } = req.params;
-
-			// Validate architecture
-			if (!agentVersionService.supportedArchitectures.includes(architecture)) {
-				return res.status(400).json({ error: "Unsupported architecture" });
-			}
-
-			await agentVersionService.serveBinary(version, architecture, res);
-		} catch (error) {
-			console.error("❌ Failed to serve binary:", error.message);
-			res.status(500).json({ error: "Failed to serve binary" });
-		}
-	},
-);
-
-// Get latest binary for architecture (for agents to query)
-router.get("/latest/:architecture", async (req, res) => {
-	try {
-		const { architecture } = req.params;
-
-		// Validate architecture
-		if (!agentVersionService.supportedArchitectures.includes(architecture)) {
-			return res.status(400).json({ error: "Unsupported architecture" });
-		}
-
-		const versionInfo = await agentVersionService.getVersionInfo();
-
-		if (!versionInfo.latestVersion) {
-			return res.status(404).json({ error: "No latest version available" });
-		}
-
-		const binaryInfo = await agentVersionService.getBinaryInfo(
-			versionInfo.latestVersion,
-			architecture,
-		);
-
-		res.json({
-			version: binaryInfo.version,
-			architecture: binaryInfo.architecture,
-			size: binaryInfo.size,
-			hash: binaryInfo.hash,
-			downloadUrl: `/api/v1/agent/download/${binaryInfo.version}/${binaryInfo.architecture}`,
-		});
-	} catch (error) {
-		console.error("❌ Failed to get latest binary info:", error.message);
-		res.status(500).json({ error: "Failed to get latest binary information" });
-	}
-});
-
-// Push update notification to specific agent
-router.post(
-	"/notify-update/:apiId",
-	authenticateToken,
-	requirePermission("admin"),
-	async (_req, res) => {
-		try {
-			const { apiId } = req.params;
-			const { version, force = false } = req.body;
-
-			const versionInfo = await agentVersionService.getVersionInfo();
-			const targetVersion = version || versionInfo.latestVersion;
-
-			if (!targetVersion) {
-				return res
-					.status(400)
-					.json({ error: "No version specified or available" });
-			}
-
-			// Import WebSocket service
-			const { pushUpdateNotification } = require("../services/agentWs");
-
-			// Push update notification via WebSocket
-			pushUpdateNotification(apiId, {
-				version: targetVersion,
-				force,
-				downloadUrl: `/api/v1/agent/latest/${req.body.architecture || "linux-amd64"}`,
-				message: `Update available: ${targetVersion}`,
-			});
-
-			res.json({
-				success: true,
-				message: `Update notification sent to agent ${apiId}`,
-				version: targetVersion,
-			});
-		} catch (error) {
-			console.error("❌ Failed to notify agent update:", error.message);
-			res.status(500).json({ error: "Failed to notify agent update" });
-		}
-	},
-);
-
-// Push update notification to all agents
-router.post(
-	"/notify-update-all",
-	authenticateToken,
-	requirePermission("admin"),
-	async (_req, res) => {
-		try {
-			const { version, force = false } = req.body;
-
-			const versionInfo = await agentVersionService.getVersionInfo();
-			const targetVersion = version || versionInfo.latestVersion;
-
-			if (!targetVersion) {
-				return res
-					.status(400)
-					.json({ error: "No version specified or available" });
-			}
-
-			// Import WebSocket service
-			const { pushUpdateNotificationToAll } = require("../services/agentWs");
-
-			// Push update notification to all connected agents
-			const result = await pushUpdateNotificationToAll({
-				version: targetVersion,
-				force,
-				message: `Update available: ${targetVersion}`,
-			});
-
-			res.json({
-				success: true,
-				message: `Update notification sent to ${result.notifiedCount} agents`,
-				version: targetVersion,
-				notifiedCount: result.notifiedCount,
-				failedCount: result.failedCount,
-			});
-		} catch (error) {
-			console.error("❌ Failed to notify all agents update:", error.message);
-			res.status(500).json({ error: "Failed to notify all agents update" });
-		}
-	},
-);
-
-// Check if specific agent needs update and push notification
-router.post(
-	"/check-update/:apiId",
-	authenticateToken,
-	requirePermission("can_manage_settings"),
-	async (_req, res) => {
-		try {
-			const { apiId } = req.params;
-			const { version, force = false } = req.body;
-
-			if (!version) {
-				return res.status(400).json({
-					success: false,
-					error: "Agent version is required",
-				});
-			}
-
-			console.log(
-				`🔍 Checking update for agent ${apiId} (version: ${version})`,
-			);
-			const result = await agentVersionService.checkAndPushAgentUpdate(
-				apiId,
-				version,
-				force,
-			);
-			console.log(
-				"📊 Agent update check result:",
-				JSON.stringify(result, null, 2),
-			);
-
-			res.json({
-				success: true,
-				...result,
-			});
-		} catch (error) {
-			console.error("❌ Failed to check agent update:", error.message);
-			res.status(500).json({
-				success: false,
-				error: "Failed to check agent update",
-				details: error.message,
-			});
-		}
-	},
-);
-
-// Push updates to all connected agents
-router.post(
-	"/push-updates-all",
-	authenticateToken,
-	requirePermission("can_manage_settings"),
-	async (_req, res) => {
-		try {
-			const { force = false } = req.body;
-
-			console.log(`🔄 Pushing updates to all agents (force: ${force})`);
-			const result = await agentVersionService.checkAndPushUpdatesToAll(force);
-			console.log("📊 Bulk update result:", JSON.stringify(result, null, 2));
-
-			res.json(result);
-		} catch (error) {
-			console.error("❌ Failed to push updates to all agents:", error.message);
-			res.status(500).json({
-				success: false,
-				error: "Failed to push updates to all agents",
-				details: error.message,
-			});
-		}
-	},
-);
-
-// Agent reports its version (for automatic update checking)
-router.post("/report-version", authenticateToken, async (req, res) => {
-	try {
-		const { apiId, version } = req.body;
-
-		if (!apiId || !version) {
-			return res.status(400).json({
-				success: false,
-				error: "API ID and version are required",
-			});
-		}
-
-		console.log(`📊 Agent ${apiId} reported version: ${version}`);
-
-		// Check if agent needs update and push notification if needed
-		const updateResult = await agentVersionService.checkAndPushAgentUpdate(
-			apiId,
-			version,
-		);
-
-		res.json({
-			success: true,
-			message: "Version reported successfully",
-			updateCheck: updateResult,
-		});
-	} catch (error) {
-		console.error("❌ Failed to process agent version report:", error.message);
-		res.status(500).json({
-			success: false,
-			error: "Failed to process version report",
-			details: error.message,
-		});
-	}
-});
-
-module.exports = router;

backend/src/routes/authRoutes.js

@@ -1,7 +1,7 @@
 const express = require("express");
 const bcrypt = require("bcryptjs");
 const jwt = require("jsonwebtoken");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const { body, validationResult } = require("express-validator");
 const { authenticateToken, _requireAdmin } = require("../middleware/auth");
 const {
@@ -20,7 +20,7 @@ const {
 } = require("../utils/session_manager");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 /**
  * Parse user agent string to extract browser and OS info

backend/src/routes/autoEnrollmentRoutes.js

@@ -1,5 +1,5 @@
 const express = require("express");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const crypto = require("node:crypto");
 const bcrypt = require("bcryptjs");
 const { body, validationResult } = require("express-validator");
@@ -8,7 +8,7 @@ const { requireManageSettings } = require("../middleware/permissions");
 const { v4: uuidv4 } = require("uuid");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Generate auto-enrollment token credentials
 const generate_auto_enrollment_token = () => {
@@ -570,24 +570,21 @@ router.post(
 					os_version: "unknown",
 					api_id: api_id,
 					api_key: api_key,
+					host_group_id: req.auto_enrollment_token.default_host_group_id,
 					status: "pending",
 					notes: `Auto-enrolled via ${req.auto_enrollment_token.token_name} on ${new Date().toISOString()}`,
 					updated_at: new Date(),
 				},
-			});
-
-			// Create host group membership if default host group is specified
-			let hostGroupMembership = null;
-			if (req.auto_enrollment_token.default_host_group_id) {
-				hostGroupMembership = await prisma.host_group_memberships.create({
-					data: {
-						id: uuidv4(),
-						host_id: host.id,
-						host_group_id: req.auto_enrollment_token.default_host_group_id,
-						created_at: new Date(),
+				include: {
+					host_groups: {
+						select: {
+							id: true,
+							name: true,
+							color: true,
+						},
 					},
-				});
-			}
+				},
+			});
 
 			// Update token usage stats
 			await prisma.auto_enrollment_tokens.update({
@@ -603,19 +600,6 @@ router.post(
 				`Auto-enrolled host: ${friendly_name} (${host.id}) via token: ${req.auto_enrollment_token.token_name}`,
 			);
 
-			// Get host group details for response if membership was created
-			let hostGroup = null;
-			if (hostGroupMembership) {
-				hostGroup = await prisma.host_groups.findUnique({
-					where: { id: req.auto_enrollment_token.default_host_group_id },
-					select: {
-						id: true,
-						name: true,
-						color: true,
-					},
-				});
-			}
-
 			res.status(201).json({
 				message: "Host enrolled successfully",
 				host: {
@@ -623,7 +607,7 @@ router.post(
 					friendly_name: host.friendly_name,
 					api_id: api_id,
 					api_key: api_key,
-					host_group: hostGroup,
+					host_group: host.host_groups,
 					status: host.status,
 				},
 			});
@@ -714,24 +698,13 @@ router.post(
 							os_version: "unknown",
 							api_id: api_id,
 							api_key: api_key,
+							host_group_id: req.auto_enrollment_token.default_host_group_id,
 							status: "pending",
 							notes: `Auto-enrolled via ${req.auto_enrollment_token.token_name} on ${new Date().toISOString()}`,
 							updated_at: new Date(),
 						},
 					});
 
-					// Create host group membership if default host group is specified
-					if (req.auto_enrollment_token.default_host_group_id) {
-						await prisma.host_group_memberships.create({
-							data: {
-								id: uuidv4(),
-								host_id: host.id,
-								host_group_id: req.auto_enrollment_token.default_host_group_id,
-								created_at: new Date(),
-							},
-						});
-					}
-
 					results.success.push({
 						id: host.id,
 						friendly_name: host.friendly_name,

backend/src/routes/automationRoutes.js

@@ -218,30 +218,6 @@ router.post(
 	},
 );
 
-// Trigger manual Docker inventory cleanup
-router.post(
-	"/trigger/docker-inventory-cleanup",
-	authenticateToken,
-	async (_req, res) => {
-		try {
-			const job = await queueManager.triggerDockerInventoryCleanup();
-			res.json({
-				success: true,
-				data: {
-					jobId: job.id,
-					message: "Docker inventory cleanup triggered successfully",
-				},
-			});
-		} catch (error) {
-			console.error("Error triggering Docker inventory cleanup:", error);
-			res.status(500).json({
-				success: false,
-				error: "Failed to trigger Docker inventory cleanup",
-			});
-		}
-	},
-);
-
 // Get queue health status
 router.get("/health", authenticateToken, async (_req, res) => {
 	try {
@@ -298,7 +274,6 @@ router.get("/overview", authenticateToken, async (_req, res) => {
 			queueManager.getRecentJobs(QUEUE_NAMES.SESSION_CLEANUP, 1),
 			queueManager.getRecentJobs(QUEUE_NAMES.ORPHANED_REPO_CLEANUP, 1),
 			queueManager.getRecentJobs(QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP, 1),
-			queueManager.getRecentJobs(QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP, 1),
 			queueManager.getRecentJobs(QUEUE_NAMES.AGENT_COMMANDS, 1),
 		]);
 
@@ -308,22 +283,19 @@ router.get("/overview", authenticateToken, async (_req, res) => {
 				stats[QUEUE_NAMES.GITHUB_UPDATE_CHECK].delayed +
 				stats[QUEUE_NAMES.SESSION_CLEANUP].delayed +
 				stats[QUEUE_NAMES.ORPHANED_REPO_CLEANUP].delayed +
-				stats[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP].delayed +
-				stats[QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP].delayed,
+				stats[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP].delayed,
 
 			runningTasks:
 				stats[QUEUE_NAMES.GITHUB_UPDATE_CHECK].active +
 				stats[QUEUE_NAMES.SESSION_CLEANUP].active +
 				stats[QUEUE_NAMES.ORPHANED_REPO_CLEANUP].active +
-				stats[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP].active +
-				stats[QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP].active,
+				stats[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP].active,
 
 			failedTasks:
 				stats[QUEUE_NAMES.GITHUB_UPDATE_CHECK].failed +
 				stats[QUEUE_NAMES.SESSION_CLEANUP].failed +
 				stats[QUEUE_NAMES.ORPHANED_REPO_CLEANUP].failed +
-				stats[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP].failed +
-				stats[QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP].failed,
+				stats[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP].failed,
 
 			totalAutomations: Object.values(stats).reduce((sum, queueStats) => {
 				return (
@@ -403,11 +375,10 @@ router.get("/overview", authenticateToken, async (_req, res) => {
 					stats: stats[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP],
 				},
 				{
-					name: "Docker Inventory Cleanup",
-					queue: QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP,
-					description:
-						"Removes Docker containers and images for non-existent hosts",
-					schedule: "Daily at 4 AM",
+					name: "Collect Host Statistics",
+					queue: QUEUE_NAMES.AGENT_COMMANDS,
+					description: "Collects package statistics from connected agents only",
+					schedule: `Every ${settings.update_interval} minutes (Agent-driven)`,
 					lastRun: recentJobs[4][0]?.finishedOn
 						? new Date(recentJobs[4][0].finishedOn).toLocaleString()
 						: "Never",
@@ -417,22 +388,6 @@ router.get("/overview", authenticateToken, async (_req, res) => {
 						: recentJobs[4][0]
 							? "Success"
 							: "Never run",
-					stats: stats[QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP],
-				},
-				{
-					name: "Collect Host Statistics",
-					queue: QUEUE_NAMES.AGENT_COMMANDS,
-					description: "Collects package statistics from connected agents only",
-					schedule: `Every ${settings.update_interval} minutes (Agent-driven)`,
-					lastRun: recentJobs[5][0]?.finishedOn
-						? new Date(recentJobs[5][0].finishedOn).toLocaleString()
-						: "Never",
-					lastRunTimestamp: recentJobs[5][0]?.finishedOn || 0,
-					status: recentJobs[5][0]?.failedReason
-						? "Failed"
-						: recentJobs[5][0]
-							? "Success"
-							: "Never run",
 					stats: stats[QUEUE_NAMES.AGENT_COMMANDS],
 				},
 			].sort((a, b) => {

backend/src/routes/dashboardPreferencesRoutes.js

@@ -1,11 +1,11 @@
 const express = require("express");
 const { body, validationResult } = require("express-validator");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const { authenticateToken } = require("../middleware/auth");
 const { v4: uuidv4 } = require("uuid");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Helper function to get user permissions based on role
 async function getUserPermissions(userRole) {

backend/src/routes/dashboardRoutes.js

@@ -1,5 +1,5 @@
 const express = require("express");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const moment = require("moment");
 const { authenticateToken } = require("../middleware/auth");
 const {
@@ -11,7 +11,7 @@ const {
 const { queueManager } = require("../services/automation");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Get dashboard statistics
 router.get(
@@ -61,15 +61,9 @@ router.get(
 					},
 				}),
 
-				// Total unique packages that need updates
-				prisma.packages.count({
-					where: {
-						host_packages: {
-							some: {
-								needs_update: true,
-							},
-						},
-					},
+				// Total outdated packages across all hosts
+				prisma.host_packages.count({
+					where: { needs_update: true },
 				}),
 
 				// Errored hosts (not updated within threshold based on update interval)
@@ -82,15 +76,11 @@ router.get(
 					},
 				}),
 
-				// Security updates count (unique packages)
-				prisma.packages.count({
+				// Security updates count
+				prisma.host_packages.count({
 					where: {
-						host_packages: {
-							some: {
-								needs_update: true,
-								is_security_update: true,
-							},
-						},
+						needs_update: true,
+						is_security_update: true,
 					},
 				}),
 
@@ -193,16 +183,11 @@ router.get(
 	},
 );
 
-// Get hosts with their update status - OPTIMIZED
+// Get hosts with their update status
 router.get("/hosts", authenticateToken, requireViewHosts, async (_req, res) => {
 	try {
-		// Get settings once (outside the loop)
-		const settings = await prisma.settings.findFirst();
-		const updateIntervalMinutes = settings?.update_interval || 60;
-		const thresholdMinutes = updateIntervalMinutes * 2;
-
-		// Fetch hosts with groups
 		const hosts = await prisma.hosts.findMany({
+			// Show all hosts regardless of status
 			select: {
 				id: true,
 				machine_id: true,
@@ -228,65 +213,61 @@ router.get("/hosts", authenticateToken, requireViewHosts, async (_req, res) => {
 						},
 					},
 				},
+				_count: {
+					select: {
+						host_packages: {
+							where: {
+								needs_update: true,
+							},
+						},
+					},
+				},
 			},
 			orderBy: { last_update: "desc" },
 		});
 
-		// OPTIMIZATION: Get all package counts in 2 batch queries instead of N*2 queries
-		const hostIds = hosts.map((h) => h.id);
+		// Get update counts for each host separately
+		const hostsWithUpdateInfo = await Promise.all(
+			hosts.map(async (host) => {
+				const updatesCount = await prisma.host_packages.count({
+					where: {
+						host_id: host.id,
+						needs_update: true,
+					},
+				});
 
-		const [updateCounts, totalCounts] = await Promise.all([
-			// Get update counts for all hosts at once
-			prisma.host_packages.groupBy({
-				by: ["host_id"],
-				where: {
-					host_id: { in: hostIds },
-					needs_update: true,
-				},
-				_count: { id: true },
+				// Get total packages count for this host
+				const totalPackagesCount = await prisma.host_packages.count({
+					where: {
+						host_id: host.id,
+					},
+				});
+
+				// Get the agent update interval setting for stale calculation
+				const settings = await prisma.settings.findFirst();
+				const updateIntervalMinutes = settings?.update_interval || 60;
+				const thresholdMinutes = updateIntervalMinutes * 2;
+
+				// Calculate effective status based on reporting interval
+				const isStale = moment(host.last_update).isBefore(
+					moment().subtract(thresholdMinutes, "minutes"),
+				);
+				let effectiveStatus = host.status;
+
+				// Override status if host hasn't reported within threshold
+				if (isStale && host.status === "active") {
+					effectiveStatus = "inactive";
+				}
+
+				return {
+					...host,
+					updatesCount,
+					totalPackagesCount,
+					isStale,
+					effectiveStatus,
+				};
 			}),
-			// Get total counts for all hosts at once
-			prisma.host_packages.groupBy({
-				by: ["host_id"],
-				where: {
-					host_id: { in: hostIds },
-				},
-				_count: { id: true },
-			}),
-		]);
-
-		// Create lookup maps for O(1) access
-		const updateCountMap = new Map(
-			updateCounts.map((item) => [item.host_id, item._count.id]),
 		);
-		const totalCountMap = new Map(
-			totalCounts.map((item) => [item.host_id, item._count.id]),
-		);
-
-		// Process hosts with counts from maps (no more DB queries!)
-		const hostsWithUpdateInfo = hosts.map((host) => {
-			const updatesCount = updateCountMap.get(host.id) || 0;
-			const totalPackagesCount = totalCountMap.get(host.id) || 0;
-
-			// Calculate effective status based on reporting interval
-			const isStale = moment(host.last_update).isBefore(
-				moment().subtract(thresholdMinutes, "minutes"),
-			);
-			let effectiveStatus = host.status;
-
-			// Override status if host hasn't reported within threshold
-			if (isStale && host.status === "active") {
-				effectiveStatus = "inactive";
-			}
-
-			return {
-				...host,
-				updatesCount,
-				totalPackagesCount,
-				isStale,
-				effectiveStatus,
-			};
-		});
 
 		res.json(hostsWithUpdateInfo);
 	} catch (error) {

backend/src/routes/dockerRoutes.js

@@ -1,9 +1,9 @@
 const express = require("express");
 const { authenticateToken } = require("../middleware/auth");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const { v4: uuidv4 } = require("uuid");
 
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 const router = express.Router();
 
 // Helper function to convert BigInt fields to strings for JSON serialization
@@ -522,8 +522,7 @@ router.get("/updates", authenticateToken, async (req, res) => {
 	}
 });
 
-// POST /api/v1/docker/collect - Collect Docker data from agent (DEPRECATED - kept for backward compatibility)
-// New agents should use POST /api/v1/integrations/docker
+// POST /api/v1/docker/collect - Collect Docker data from agent
 router.post("/collect", async (req, res) => {
 	try {
 		const { apiId, apiKey, containers, images, updates } = req.body;
@@ -746,322 +745,6 @@ router.post("/collect", async (req, res) => {
 	}
 });
 
-// POST /api/v1/integrations/docker - New integration endpoint for Docker data collection
-router.post("/../integrations/docker", async (req, res) => {
-	try {
-		const apiId = req.headers["x-api-id"];
-		const apiKey = req.headers["x-api-key"];
-		const {
-			containers,
-			images,
-			updates,
-			daemon_info: _daemon_info,
-			hostname,
-			machine_id,
-			agent_version: _agent_version,
-		} = req.body;
-
-		console.log(
-			`[Docker Integration] Received data from ${hostname || machine_id}`,
-		);
-
-		// Validate API credentials
-		const host = await prisma.hosts.findFirst({
-			where: { api_id: apiId, api_key: apiKey },
-		});
-
-		if (!host) {
-			console.warn("[Docker Integration] Invalid API credentials");
-			return res.status(401).json({ error: "Invalid API credentials" });
-		}
-
-		console.log(
-			`[Docker Integration] Processing for host: ${host.friendly_name}`,
-		);
-
-		const now = new Date();
-
-		// Helper function to validate and parse dates
-		const parseDate = (dateString) => {
-			if (!dateString) return now;
-			const date = new Date(dateString);
-			return Number.isNaN(date.getTime()) ? now : date;
-		};
-
-		let containersProcessed = 0;
-		let imagesProcessed = 0;
-		let updatesProcessed = 0;
-
-		// Process containers
-		if (containers && Array.isArray(containers)) {
-			console.log(
-				`[Docker Integration] Processing ${containers.length} containers`,
-			);
-			for (const containerData of containers) {
-				const containerId = uuidv4();
-
-				// Find or create image
-				let imageId = null;
-				if (containerData.image_repository && containerData.image_tag) {
-					const image = await prisma.docker_images.upsert({
-						where: {
-							repository_tag_image_id: {
-								repository: containerData.image_repository,
-								tag: containerData.image_tag,
-								image_id: containerData.image_id || "unknown",
-							},
-						},
-						update: {
-							last_checked: now,
-							updated_at: now,
-						},
-						create: {
-							id: uuidv4(),
-							repository: containerData.image_repository,
-							tag: containerData.image_tag,
-							image_id: containerData.image_id || "unknown",
-							source: containerData.image_source || "docker-hub",
-							created_at: parseDate(containerData.created_at),
-							updated_at: now,
-						},
-					});
-					imageId = image.id;
-				}
-
-				// Upsert container
-				await prisma.docker_containers.upsert({
-					where: {
-						host_id_container_id: {
-							host_id: host.id,
-							container_id: containerData.container_id,
-						},
-					},
-					update: {
-						name: containerData.name,
-						image_id: imageId,
-						image_name: containerData.image_name,
-						image_tag: containerData.image_tag || "latest",
-						status: containerData.status,
-						state: containerData.state || containerData.status,
-						ports: containerData.ports || null,
-						started_at: containerData.started_at
-							? parseDate(containerData.started_at)
-							: null,
-						updated_at: now,
-						last_checked: now,
-					},
-					create: {
-						id: containerId,
-						host_id: host.id,
-						container_id: containerData.container_id,
-						name: containerData.name,
-						image_id: imageId,
-						image_name: containerData.image_name,
-						image_tag: containerData.image_tag || "latest",
-						status: containerData.status,
-						state: containerData.state || containerData.status,
-						ports: containerData.ports || null,
-						created_at: parseDate(containerData.created_at),
-						started_at: containerData.started_at
-							? parseDate(containerData.started_at)
-							: null,
-						updated_at: now,
-					},
-				});
-				containersProcessed++;
-			}
-		}
-
-		// Process standalone images
-		if (images && Array.isArray(images)) {
-			console.log(`[Docker Integration] Processing ${images.length} images`);
-			for (const imageData of images) {
-				await prisma.docker_images.upsert({
-					where: {
-						repository_tag_image_id: {
-							repository: imageData.repository,
-							tag: imageData.tag,
-							image_id: imageData.image_id,
-						},
-					},
-					update: {
-						size_bytes: imageData.size_bytes
-							? BigInt(imageData.size_bytes)
-							: null,
-						digest: imageData.digest || null,
-						last_checked: now,
-						updated_at: now,
-					},
-					create: {
-						id: uuidv4(),
-						repository: imageData.repository,
-						tag: imageData.tag,
-						image_id: imageData.image_id,
-						digest: imageData.digest,
-						size_bytes: imageData.size_bytes
-							? BigInt(imageData.size_bytes)
-							: null,
-						source: imageData.source || "docker-hub",
-						created_at: parseDate(imageData.created_at),
-						updated_at: now,
-					},
-				});
-				imagesProcessed++;
-			}
-		}
-
-		// Process updates
-		if (updates && Array.isArray(updates)) {
-			console.log(`[Docker Integration] Processing ${updates.length} updates`);
-			for (const updateData of updates) {
-				// Find the image by repository and image_id
-				const image = await prisma.docker_images.findFirst({
-					where: {
-						repository: updateData.repository,
-						tag: updateData.current_tag,
-						image_id: updateData.image_id,
-					},
-				});
-
-				if (image) {
-					// Store digest info in changelog_url field as JSON
-					const digestInfo = JSON.stringify({
-						method: "digest_comparison",
-						current_digest: updateData.current_digest,
-						available_digest: updateData.available_digest,
-					});
-
-					// Upsert the update record
-					await prisma.docker_image_updates.upsert({
-						where: {
-							image_id_available_tag: {
-								image_id: image.id,
-								available_tag: updateData.available_tag,
-							},
-						},
-						update: {
-							updated_at: now,
-							changelog_url: digestInfo,
-							severity: "digest_changed",
-						},
-						create: {
-							id: uuidv4(),
-							image_id: image.id,
-							current_tag: updateData.current_tag,
-							available_tag: updateData.available_tag,
-							severity: "digest_changed",
-							changelog_url: digestInfo,
-							updated_at: now,
-						},
-					});
-					updatesProcessed++;
-				}
-			}
-		}
-
-		console.log(
-			`[Docker Integration] Successfully processed: ${containersProcessed} containers, ${imagesProcessed} images, ${updatesProcessed} updates`,
-		);
-
-		res.json({
-			message: "Docker data collected successfully",
-			containers_received: containersProcessed,
-			images_received: imagesProcessed,
-			updates_found: updatesProcessed,
-		});
-	} catch (error) {
-		console.error("[Docker Integration] Error collecting Docker data:", error);
-		console.error("[Docker Integration] Error stack:", error.stack);
-		res.status(500).json({
-			error: "Failed to collect Docker data",
-			message: error.message,
-			details: process.env.NODE_ENV === "development" ? error.stack : undefined,
-		});
-	}
-});
-
-// DELETE /api/v1/docker/containers/:id - Delete a container
-router.delete("/containers/:id", authenticateToken, async (req, res) => {
-	try {
-		const { id } = req.params;
-
-		// Check if container exists
-		const container = await prisma.docker_containers.findUnique({
-			where: { id },
-		});
-
-		if (!container) {
-			return res.status(404).json({ error: "Container not found" });
-		}
-
-		// Delete the container
-		await prisma.docker_containers.delete({
-			where: { id },
-		});
-
-		console.log(`🗑️  Deleted container: ${container.name} (${id})`);
-
-		res.json({
-			success: true,
-			message: `Container ${container.name} deleted successfully`,
-		});
-	} catch (error) {
-		console.error("Error deleting container:", error);
-		res.status(500).json({ error: "Failed to delete container" });
-	}
-});
-
-// DELETE /api/v1/docker/images/:id - Delete an image
-router.delete("/images/:id", authenticateToken, async (req, res) => {
-	try {
-		const { id } = req.params;
-
-		// Check if image exists
-		const image = await prisma.docker_images.findUnique({
-			where: { id },
-			include: {
-				_count: {
-					select: {
-						docker_containers: true,
-					},
-				},
-			},
-		});
-
-		if (!image) {
-			return res.status(404).json({ error: "Image not found" });
-		}
-
-		// Check if image is in use by containers
-		if (image._count.docker_containers > 0) {
-			return res.status(400).json({
-				error: `Cannot delete image: ${image._count.docker_containers} container(s) are using this image`,
-				containersCount: image._count.docker_containers,
-			});
-		}
-
-		// Delete image updates first
-		await prisma.docker_image_updates.deleteMany({
-			where: { image_id: id },
-		});
-
-		// Delete the image
-		await prisma.docker_images.delete({
-			where: { id },
-		});
-
-		console.log(`🗑️  Deleted image: ${image.repository}:${image.tag} (${id})`);
-
-		res.json({
-			success: true,
-			message: `Image ${image.repository}:${image.tag} deleted successfully`,
-		});
-	} catch (error) {
-		console.error("Error deleting image:", error);
-		res.status(500).json({ error: "Failed to delete image" });
-	}
-});
-
 // GET /api/v1/docker/agent - Serve the Docker agent installation script
 router.get("/agent", async (_req, res) => {
 	try {

backend/src/routes/gethomepageRoutes.js

@@ -1,9 +1,9 @@
 const express = require("express");
-const { getPrismaClient } = require("../config/prisma");
+const { createPrismaClient } = require("../config/database");
 const bcrypt = require("bcryptjs");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = createPrismaClient();
 
 // Middleware to authenticate API key
 const authenticateApiKey = async (req, res, next) => {
@@ -114,15 +114,9 @@ router.get("/stats", authenticateApiKey, async (_req, res) => {
 			where: { status: "active" },
 		});
 
-		// Get total unique packages that need updates (consistent with dashboard)
-		const totalOutdatedPackages = await prisma.packages.count({
-			where: {
-				host_packages: {
-					some: {
-						needs_update: true,
-					},
-				},
-			},
+		// Get total outdated packages count
+		const totalOutdatedPackages = await prisma.host_packages.count({
+			where: { needs_update: true },
 		});
 
 		// Get total repositories count
@@ -142,15 +136,11 @@ router.get("/stats", authenticateApiKey, async (_req, res) => {
 			},
 		});
 
-		// Get security updates count (unique packages - consistent with dashboard)
-		const securityUpdates = await prisma.packages.count({
+		// Get security updates count
+		const securityUpdates = await prisma.host_packages.count({
 			where: {
-				host_packages: {
-					some: {
-						needs_update: true,
-						is_security_update: true,
-					},
-				},
+				needs_update: true,
+				is_security_update: true,
 			},
 		});
 

backend/src/routes/hostGroupRoutes.js

@@ -1,12 +1,12 @@
 const express = require("express");
 const { body, validationResult } = require("express-validator");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const { randomUUID } = require("node:crypto");
 const { authenticateToken } = require("../middleware/auth");
 const { requireManageHosts } = require("../middleware/permissions");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Get all host groups
 router.get("/", authenticateToken, async (_req, res) => {

backend/src/routes/hostRoutes.js

@@ -1,5 +1,5 @@
 const express = require("express");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const { body, validationResult } = require("express-validator");
 const { v4: uuidv4 } = require("uuid");
 const crypto = require("node:crypto");
@@ -12,9 +12,9 @@ const {
 } = require("../middleware/permissions");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
-// Secure endpoint to download the agent script/binary (requires API authentication)
+// Secure endpoint to download the agent binary (requires API authentication)
 router.get("/agent/download", async (req, res) => {
 	try {
 		// Verify API credentials
@@ -34,186 +34,83 @@ router.get("/agent/download", async (req, res) => {
 			return res.status(401).json({ error: "Invalid API credentials" });
 		}
 
+		// Get architecture parameter (default to amd64)
+		const architecture = req.query.arch || "amd64";
+
+		// Validate architecture
+		const validArchitectures = ["amd64", "386", "arm64"];
+		if (!validArchitectures.includes(architecture)) {
+			return res.status(400).json({
+				error: "Invalid architecture. Must be one of: amd64, 386, arm64",
+			});
+		}
+
+		// Serve agent binary directly from file system
 		const fs = require("node:fs");
 		const path = require("node:path");
 
-		// Check if this is a legacy agent (bash script) requesting update
-		// Legacy agents will have agent_version < 1.2.9 (excluding 1.2.9 itself)
-		// But allow forcing binary download for fresh installations
-		const forceBinary = req.query.force === "binary";
-		const isLegacyAgent =
-			!forceBinary &&
-			host.agent_version &&
-			((host.agent_version.startsWith("1.2.") &&
-				host.agent_version !== "1.2.9") ||
-				host.agent_version.startsWith("1.1.") ||
-				host.agent_version.startsWith("1.0."));
+		const binaryName = `patchmon-agent-linux-${architecture}`;
+		const binaryPath = path.join(__dirname, "../../../agents", binaryName);
 
-		if (isLegacyAgent) {
-			// Serve migration script for legacy agents
-			const migrationScriptPath = path.join(
-				__dirname,
-				"../../../agents/patchmon-agent.sh",
-			);
-
-			if (!fs.existsSync(migrationScriptPath)) {
-				return res.status(404).json({ error: "Migration script not found" });
-			}
-
-			// Set appropriate headers for script download
-			res.setHeader("Content-Type", "text/plain");
-			res.setHeader(
-				"Content-Disposition",
-				'attachment; filename="patchmon-agent.sh"',
-			);
-
-			// Stream the migration script
-			const fileStream = fs.createReadStream(migrationScriptPath);
-			fileStream.pipe(res);
-
-			fileStream.on("error", (error) => {
-				console.error("Migration script stream error:", error);
-				if (!res.headersSent) {
-					res.status(500).json({ error: "Failed to stream migration script" });
-				}
-			});
-		} else {
-			// Serve Go binary for new agents
-			const architecture = req.query.arch || "amd64";
-
-			// Validate architecture
-			const validArchitectures = ["amd64", "386", "arm64", "arm"];
-			if (!validArchitectures.includes(architecture)) {
-				return res.status(400).json({
-					error: "Invalid architecture. Must be one of: amd64, 386, arm64, arm",
-				});
-			}
-
-			const binaryName = `patchmon-agent-linux-${architecture}`;
-			const binaryPath = path.join(__dirname, "../../../agents", binaryName);
-
-			if (!fs.existsSync(binaryPath)) {
-				return res.status(404).json({
-					error: `Agent binary not found for architecture: ${architecture}`,
-				});
-			}
-
-			// Set appropriate headers for binary download
-			res.setHeader("Content-Type", "application/octet-stream");
-			res.setHeader(
-				"Content-Disposition",
-				`attachment; filename="${binaryName}"`,
-			);
-
-			// Stream the binary file
-			const fileStream = fs.createReadStream(binaryPath);
-			fileStream.pipe(res);
-
-			fileStream.on("error", (error) => {
-				console.error("Binary stream error:", error);
-				if (!res.headersSent) {
-					res.status(500).json({ error: "Failed to stream agent binary" });
-				}
+		if (!fs.existsSync(binaryPath)) {
+			return res.status(404).json({
+				error: `Agent binary not found for architecture: ${architecture}`,
 			});
 		}
+
+		// Set appropriate headers for binary download
+		res.setHeader("Content-Type", "application/octet-stream");
+		res.setHeader(
+			"Content-Disposition",
+			`attachment; filename="${binaryName}"`,
+		);
+
+		// Stream the binary file
+		const fileStream = fs.createReadStream(binaryPath);
+		fileStream.pipe(res);
+
+		fileStream.on("error", (error) => {
+			console.error("Binary stream error:", error);
+			if (!res.headersSent) {
+				res.status(500).json({ error: "Failed to stream agent binary" });
+			}
+		});
 	} catch (error) {
 		console.error("Agent download error:", error);
-		res.status(500).json({ error: "Failed to serve agent" });
+		res.status(500).json({ error: "Failed to serve agent binary" });
 	}
 });
 
 // Version check endpoint for agents
-router.get("/agent/version", async (req, res) => {
+router.get("/agent/version", async (_req, res) => {
 	try {
 		const fs = require("node:fs");
 		const path = require("node:path");
-		const { exec } = require("node:child_process");
-		const { promisify } = require("node:util");
-		const execAsync = promisify(exec);
 
-		// Get architecture parameter (default to amd64 for Go agents)
-		const architecture = req.query.arch || "amd64";
-		const agentType = req.query.type || "go"; // "go" or "legacy"
+		// Read version directly from agent script file
+		const agentPath = path.join(__dirname, "../../../agents/patchmon-agent.sh");
 
-		if (agentType === "legacy") {
-			// Legacy agent version check (bash script)
-			const agentPath = path.join(
-				__dirname,
-				"../../../agents/patchmon-agent.sh",
-			);
-
-			if (!fs.existsSync(agentPath)) {
-				return res.status(404).json({ error: "Legacy agent script not found" });
-			}
-
-			const scriptContent = fs.readFileSync(agentPath, "utf8");
-			const versionMatch = scriptContent.match(/AGENT_VERSION="([^"]+)"/);
-
-			if (!versionMatch) {
-				return res
-					.status(500)
-					.json({ error: "Could not extract version from agent script" });
-			}
-
-			const currentVersion = versionMatch[1];
-
-			res.json({
-				currentVersion: currentVersion,
-				downloadUrl: `/api/v1/hosts/agent/download`,
-				releaseNotes: `PatchMon Agent v${currentVersion}`,
-				minServerVersion: null,
-			});
-		} else {
-			// Go agent version check (binary)
-			const binaryName = `patchmon-agent-linux-${architecture}`;
-			const binaryPath = path.join(__dirname, "../../../agents", binaryName);
-
-			if (!fs.existsSync(binaryPath)) {
-				return res.status(404).json({
-					error: `Go agent binary not found for architecture: ${architecture}`,
-				});
-			}
-
-			// Execute the binary to get its version
-			try {
-				const { stdout } = await execAsync(`${binaryPath} --help`, {
-					timeout: 10000,
-				});
-
-				// Parse version from help output (e.g., "PatchMon Agent v1.3.1")
-				const versionMatch = stdout.match(
-					/PatchMon Agent v([0-9]+\.[0-9]+\.[0-9]+)/i,
-				);
-
-				if (!versionMatch) {
-					return res.status(500).json({
-						error: "Could not extract version from agent binary",
-					});
-				}
-
-				const serverVersion = versionMatch[1];
-				const agentVersion = req.query.currentVersion || serverVersion;
-
-				// Simple version comparison (assuming semantic versioning)
-				const hasUpdate = agentVersion !== serverVersion;
-
-				res.json({
-					currentVersion: agentVersion,
-					latestVersion: serverVersion,
-					hasUpdate: hasUpdate,
-					downloadUrl: `/api/v1/hosts/agent/download?arch=${architecture}`,
-					releaseNotes: `PatchMon Agent v${serverVersion}`,
-					minServerVersion: null,
-					architecture: architecture,
-					agentType: "go",
-				});
-			} catch (execError) {
-				console.error("Failed to execute agent binary:", execError.message);
-				return res.status(500).json({
-					error: "Failed to get version from agent binary",
-				});
-			}
+		if (!fs.existsSync(agentPath)) {
+			return res.status(404).json({ error: "Agent script not found" });
 		}
+
+		const scriptContent = fs.readFileSync(agentPath, "utf8");
+		const versionMatch = scriptContent.match(/AGENT_VERSION="([^"]+)"/);
+
+		if (!versionMatch) {
+			return res
+				.status(500)
+				.json({ error: "Could not extract version from agent script" });
+		}
+
+		const currentVersion = versionMatch[1];
+
+		res.json({
+			currentVersion: currentVersion,
+			downloadUrl: `/api/v1/hosts/agent/download`,
+			releaseNotes: `PatchMon Agent v${currentVersion}`,
+			minServerVersion: null,
+		});
 	} catch (error) {
 		console.error("Version check error:", error);
 		res.status(500).json({ error: "Failed to get agent version" });
@@ -356,26 +253,6 @@ router.post(
 			});
 		} catch (error) {
 			console.error("Host creation error:", error);
-
-			// Check if error is related to connection pool exhaustion
-			if (
-				error.message &&
-				(error.message.includes("connection pool") ||
-					error.message.includes("Timed out fetching") ||
-					error.message.includes("pool timeout"))
-			) {
-				console.error("⚠️  DATABASE CONNECTION POOL EXHAUSTED!");
-				console.error(
-					`⚠️  Current limit: DB_CONNECTION_LIMIT=${process.env.DB_CONNECTION_LIMIT || "30"}`,
-				);
-				console.error(
-					`⚠️  Pool timeout: DB_POOL_TIMEOUT=${process.env.DB_POOL_TIMEOUT || "20"}s`,
-				);
-				console.error(
-					"⚠️  Suggestion: Increase DB_CONNECTION_LIMIT in your .env file",
-				);
-			}
-
 			res.status(500).json({ error: "Failed to create host" });
 		}
 	},
@@ -806,41 +683,19 @@ router.get("/info", validateApiCredentials, async (req, res) => {
 // Ping endpoint for health checks (now uses API credentials)
 router.post("/ping", validateApiCredentials, async (req, res) => {
 	try {
-		const now = new Date();
-		const lastUpdate = req.hostRecord.last_update;
-
-		// Detect if this is an agent startup (first ping or after long absence)
-		const timeSinceLastUpdate = lastUpdate ? now - lastUpdate : null;
-		const isStartup =
-			!timeSinceLastUpdate || timeSinceLastUpdate > 5 * 60 * 1000; // 5 minutes
-
-		// Log agent startup
-		if (isStartup) {
-			console.log(
-				`🚀 Agent startup detected: ${req.hostRecord.friendly_name} (${req.hostRecord.hostname || req.hostRecord.api_id})`,
-			);
-
-			// Check if status was previously offline
-			if (req.hostRecord.status === "offline") {
-				console.log(`✅ Agent back online: ${req.hostRecord.friendly_name}`);
-			}
-		}
-
-		// Update last update timestamp and set status to active
+		// Update last update timestamp
 		await prisma.hosts.update({
 			where: { id: req.hostRecord.id },
 			data: {
-				last_update: now,
-				updated_at: now,
-				status: "active",
+				last_update: new Date(),
+				updated_at: new Date(),
 			},
 		});
 
 		const response = {
 			message: "Ping successful",
-			timestamp: now.toISOString(),
+			timestamp: new Date().toISOString(),
 			friendlyName: req.hostRecord.friendly_name,
-			agentStartup: isStartup,
 		};
 
 		// Check if this is a crontab update trigger
@@ -908,117 +763,89 @@ router.post(
 	},
 );
 
-router.put(
-	"/bulk/groups",
-	authenticateToken,
-	requireManageHosts,
-	[
-		body("hostIds").isArray().withMessage("Host IDs must be an array"),
-		body("hostIds.*")
-			.isLength({ min: 1 })
-			.withMessage("Each host ID must be provided"),
-		body("groupIds").isArray().optional(),
-		body("groupIds.*")
-			.optional()
-			.isUUID()
-			.withMessage("Each group ID must be a valid UUID"),
-	],
-	async (req, res) => {
-		try {
-			const errors = validationResult(req);
-			if (!errors.isEmpty()) {
-				return res.status(400).json({ errors: errors.array() });
-			}
+// TODO: Admin endpoint to bulk update host groups - needs to be rewritten for many-to-many relationship
+// router.put(
+// 	"/bulk/group",
+// 	authenticateToken,
+// 	requireManageHosts,
+// 	[
+// 		body("hostIds").isArray().withMessage("Host IDs must be an array"),
+// 		body("hostIds.*")
+// 			.isLength({ min: 1 })
+// 			.withMessage("Each host ID must be provided"),
+// 		body("hostGroupId").optional(),
+// 	],
+// 	async (req, res) => {
+// 		try {
+// 			const errors = validationResult(req);
+// 			if (!errors.isEmpty()) {
+// 				return res.status(400).json({ errors: errors.array() });
+// 			}
 
-			const { hostIds, groupIds = [] } = req.body;
+// 			const { hostIds, hostGroupId } = req.body;
 
-			// Verify all groups exist if provided
-			if (groupIds.length > 0) {
-				const existingGroups = await prisma.host_groups.findMany({
-					where: { id: { in: groupIds } },
-					select: { id: true },
-				});
+// 			// If hostGroupId is provided, verify the group exists
+// 			if (hostGroupId) {
+// 				const hostGroup = await prisma.host_groups.findUnique({
+// 					where: { id: hostGroupId },
+// 				});
 
-				if (existingGroups.length !== groupIds.length) {
-					return res.status(400).json({
-						error: "One or more host groups not found",
-						provided: groupIds,
-						found: existingGroups.map((g) => g.id),
-					});
-				}
-			}
+// 				if (!hostGroup) {
+// 					return res.status(400).json({ error: "Host group not found" });
+// 				}
+// 			}
 
-			// Check if all hosts exist
-			const existingHosts = await prisma.hosts.findMany({
-				where: { id: { in: hostIds } },
-				select: { id: true, friendly_name: true },
-			});
+// 			// Check if all hosts exist
+// 			const existingHosts = await prisma.hosts.findMany({
+// 				where: { id: { in: hostIds } },
+// 				select: { id: true, friendly_name: true },
+// 			});
 
-			if (existingHosts.length !== hostIds.length) {
-				const foundIds = existingHosts.map((h) => h.id);
-				const missingIds = hostIds.filter((id) => !foundIds.includes(id));
-				return res.status(400).json({
-					error: "Some hosts not found",
-					missingHostIds: missingIds,
-				});
-			}
+// 			if (existingHosts.length !== hostIds.length) {
+// 				const foundIds = existingHosts.map((h) => h.id);
+// 				const missingIds = hostIds.filter((id) => !foundIds.includes(id));
+// 				return res.status(400).json({
+// 					error: "Some hosts not found",
+// 					missingHostIds: missingIds,
+// 				});
+// 			}
 
-			// Use transaction to update group memberships for all hosts
-			const updatedHosts = await prisma.$transaction(async (tx) => {
-				const results = [];
+// 			// Bulk update host groups
+// 			const updateResult = await prisma.hosts.updateMany({
+// 				where: { id: { in: hostIds } },
+// 				data: {
+// 					host_group_id: hostGroupId || null,
+// 					updated_at: new Date(),
+// 				},
+// 			});
 
-				for (const hostId of hostIds) {
-					// Remove existing memberships for this host
-					await tx.host_group_memberships.deleteMany({
-						where: { host_id: hostId },
-					});
+// 			// Get updated hosts with group information
+// 			const updatedHosts = await prisma.hosts.findMany({
+// 				where: { id: { in: hostIds } },
+// 				select: {
+// 					id: true,
+// 					friendly_name: true,
+// 					host_groups: {
+// 						select: {
+// 							id: true,
+// 							name: true,
+// 							color: true,
+// 						},
+// 					},
+// 				},
+// 			});
 
-					// Add new memberships for this host
-					if (groupIds.length > 0) {
-						await tx.host_group_memberships.createMany({
-							data: groupIds.map((groupId) => ({
-								id: crypto.randomUUID(),
-								host_id: hostId,
-								host_group_id: groupId,
-							})),
-						});
-					}
-
-					// Get updated host with groups
-					const updatedHost = await tx.hosts.findUnique({
-						where: { id: hostId },
-						include: {
-							host_group_memberships: {
-								include: {
-									host_groups: {
-										select: {
-											id: true,
-											name: true,
-											color: true,
-										},
-									},
-								},
-							},
-						},
-					});
-
-					results.push(updatedHost);
-				}
-
-				return results;
-			});
-
-			res.json({
-				message: `Successfully updated ${updatedHosts.length} host${updatedHosts.length !== 1 ? "s" : ""}`,
-				updatedCount: updatedHosts.length,
-				hosts: updatedHosts,
-			});
-		} catch (error) {
-			console.error("Bulk host groups update error:", error);
-			res.status(500).json({ error: "Failed to update host groups" });
-		}
-	},
-);
+// 			res.json({
+// 				message: `Successfully updated ${updateResult.count} host${updateResult.count !== 1 ? "s" : ""}`,
+// 				updatedCount: updateResult.count,
+// 				hosts: updatedHosts,
+// 			});
+// 		} catch (error) {
+// 			console.error("Bulk host group update error:", error);
+// 			res.status(500).json({ error: "Failed to update host groups" });
+// 		}
+// 	},
+// );
 
 // Admin endpoint to update host groups (many-to-many)
 router.put(
@@ -1483,12 +1310,10 @@ router.get("/install", async (req, res) => {
 
 		// Determine curl flags dynamically from settings (ignore self-signed)
 		let curlFlags = "-s";
-		let skipSSLVerify = "false";
 		try {
 			const settings = await prisma.settings.findFirst();
 			if (settings && settings.ignore_ssl_self_signed === true) {
 				curlFlags = "-sk";
-				skipSSLVerify = "true";
 			}
 		} catch (_) {}
 
@@ -1498,13 +1323,12 @@ router.get("/install", async (req, res) => {
 		// Get architecture parameter (default to amd64)
 		const architecture = req.query.arch || "amd64";
 
-		// Inject the API credentials, server URL, curl flags, SSL verify flag, force flag, and architecture into the script
+		// Inject the API credentials, server URL, curl flags, force flag, and architecture into the script
 		const envVars = `#!/bin/bash
 export PATCHMON_URL="${serverUrl}"
 export API_ID="${host.api_id}"
 export API_KEY="${host.api_key}"
 export CURL_FLAGS="${curlFlags}"
-export SKIP_SSL_VERIFY="${skipSSLVerify}"
 export FORCE_INSTALL="${forceInstall ? "true" : "false"}"
 export ARCHITECTURE="${architecture}"
 

backend/src/routes/integrationRoutes.js

@@ -1,242 +0,0 @@
-const express = require("express");
-const { getPrismaClient } = require("../config/prisma");
-const { v4: uuidv4 } = require("uuid");
-
-const prisma = getPrismaClient();
-const router = express.Router();
-
-// POST /api/v1/integrations/docker - Docker data collection endpoint
-router.post("/docker", async (req, res) => {
-	try {
-		const apiId = req.headers["x-api-id"];
-		const apiKey = req.headers["x-api-key"];
-		const {
-			containers,
-			images,
-			updates,
-			daemon_info: _daemon_info,
-			hostname,
-			machine_id,
-			agent_version: _agent_version,
-		} = req.body;
-
-		console.log(
-			`[Docker Integration] Received data from ${hostname || machine_id}`,
-		);
-
-		// Validate API credentials
-		const host = await prisma.hosts.findFirst({
-			where: { api_id: apiId, api_key: apiKey },
-		});
-
-		if (!host) {
-			console.warn("[Docker Integration] Invalid API credentials");
-			return res.status(401).json({ error: "Invalid API credentials" });
-		}
-
-		console.log(
-			`[Docker Integration] Processing for host: ${host.friendly_name}`,
-		);
-
-		const now = new Date();
-
-		// Helper function to validate and parse dates
-		const parseDate = (dateString) => {
-			if (!dateString) return now;
-			const date = new Date(dateString);
-			return Number.isNaN(date.getTime()) ? now : date;
-		};
-
-		let containersProcessed = 0;
-		let imagesProcessed = 0;
-		let updatesProcessed = 0;
-
-		// Process containers
-		if (containers && Array.isArray(containers)) {
-			console.log(
-				`[Docker Integration] Processing ${containers.length} containers`,
-			);
-			for (const containerData of containers) {
-				const containerId = uuidv4();
-
-				// Find or create image
-				let imageId = null;
-				if (containerData.image_repository && containerData.image_tag) {
-					const image = await prisma.docker_images.upsert({
-						where: {
-							repository_tag_image_id: {
-								repository: containerData.image_repository,
-								tag: containerData.image_tag,
-								image_id: containerData.image_id || "unknown",
-							},
-						},
-						update: {
-							last_checked: now,
-							updated_at: now,
-						},
-						create: {
-							id: uuidv4(),
-							repository: containerData.image_repository,
-							tag: containerData.image_tag,
-							image_id: containerData.image_id || "unknown",
-							source: containerData.image_source || "docker-hub",
-							created_at: parseDate(containerData.created_at),
-							updated_at: now,
-						},
-					});
-					imageId = image.id;
-				}
-
-				// Upsert container
-				await prisma.docker_containers.upsert({
-					where: {
-						host_id_container_id: {
-							host_id: host.id,
-							container_id: containerData.container_id,
-						},
-					},
-					update: {
-						name: containerData.name,
-						image_id: imageId,
-						image_name: containerData.image_name,
-						image_tag: containerData.image_tag || "latest",
-						status: containerData.status,
-						state: containerData.state || containerData.status,
-						ports: containerData.ports || null,
-						started_at: containerData.started_at
-							? parseDate(containerData.started_at)
-							: null,
-						updated_at: now,
-						last_checked: now,
-					},
-					create: {
-						id: containerId,
-						host_id: host.id,
-						container_id: containerData.container_id,
-						name: containerData.name,
-						image_id: imageId,
-						image_name: containerData.image_name,
-						image_tag: containerData.image_tag || "latest",
-						status: containerData.status,
-						state: containerData.state || containerData.status,
-						ports: containerData.ports || null,
-						created_at: parseDate(containerData.created_at),
-						started_at: containerData.started_at
-							? parseDate(containerData.started_at)
-							: null,
-						updated_at: now,
-					},
-				});
-				containersProcessed++;
-			}
-		}
-
-		// Process standalone images
-		if (images && Array.isArray(images)) {
-			console.log(`[Docker Integration] Processing ${images.length} images`);
-			for (const imageData of images) {
-				await prisma.docker_images.upsert({
-					where: {
-						repository_tag_image_id: {
-							repository: imageData.repository,
-							tag: imageData.tag,
-							image_id: imageData.image_id,
-						},
-					},
-					update: {
-						size_bytes: imageData.size_bytes
-							? BigInt(imageData.size_bytes)
-							: null,
-						digest: imageData.digest || null,
-						last_checked: now,
-						updated_at: now,
-					},
-					create: {
-						id: uuidv4(),
-						repository: imageData.repository,
-						tag: imageData.tag,
-						image_id: imageData.image_id,
-						digest: imageData.digest,
-						size_bytes: imageData.size_bytes
-							? BigInt(imageData.size_bytes)
-							: null,
-						source: imageData.source || "docker-hub",
-						created_at: parseDate(imageData.created_at),
-						updated_at: now,
-					},
-				});
-				imagesProcessed++;
-			}
-		}
-
-		// Process updates
-		if (updates && Array.isArray(updates)) {
-			console.log(`[Docker Integration] Processing ${updates.length} updates`);
-			for (const updateData of updates) {
-				// Find the image by repository and image_id
-				const image = await prisma.docker_images.findFirst({
-					where: {
-						repository: updateData.repository,
-						tag: updateData.current_tag,
-						image_id: updateData.image_id,
-					},
-				});
-
-				if (image) {
-					// Store digest info in changelog_url field as JSON
-					const digestInfo = JSON.stringify({
-						method: "digest_comparison",
-						current_digest: updateData.current_digest,
-						available_digest: updateData.available_digest,
-					});
-
-					// Upsert the update record
-					await prisma.docker_image_updates.upsert({
-						where: {
-							image_id_available_tag: {
-								image_id: image.id,
-								available_tag: updateData.available_tag,
-							},
-						},
-						update: {
-							updated_at: now,
-							changelog_url: digestInfo,
-							severity: "digest_changed",
-						},
-						create: {
-							id: uuidv4(),
-							image_id: image.id,
-							current_tag: updateData.current_tag,
-							available_tag: updateData.available_tag,
-							severity: "digest_changed",
-							changelog_url: digestInfo,
-							updated_at: now,
-						},
-					});
-					updatesProcessed++;
-				}
-			}
-		}
-
-		console.log(
-			`[Docker Integration] Successfully processed: ${containersProcessed} containers, ${imagesProcessed} images, ${updatesProcessed} updates`,
-		);
-
-		res.json({
-			message: "Docker data collected successfully",
-			containers_received: containersProcessed,
-			images_received: imagesProcessed,
-			updates_found: updatesProcessed,
-		});
-	} catch (error) {
-		console.error("[Docker Integration] Error collecting Docker data:", error);
-		console.error("[Docker Integration] Error stack:", error.stack);
-		res.status(500).json({
-			error: "Failed to collect Docker data",
-			message: error.message,
-			details: process.env.NODE_ENV === "development" ? error.stack : undefined,
-		});
-	}
-});
-
-module.exports = router;

backend/src/routes/metricsRoutes.js

@@ -1,148 +0,0 @@
-const express = require("express");
-const { body, validationResult } = require("express-validator");
-const { v4: uuidv4 } = require("uuid");
-const { authenticateToken } = require("../middleware/auth");
-const { requireManageSettings } = require("../middleware/permissions");
-const { getSettings, updateSettings } = require("../services/settingsService");
-const { queueManager, QUEUE_NAMES } = require("../services/automation");
-
-const router = express.Router();
-
-// Get metrics settings
-router.get("/", authenticateToken, requireManageSettings, async (_req, res) => {
-	try {
-		const settings = await getSettings();
-
-		// Generate anonymous ID if it doesn't exist
-		if (!settings.metrics_anonymous_id) {
-			const anonymousId = uuidv4();
-			await updateSettings(settings.id, {
-				metrics_anonymous_id: anonymousId,
-			});
-			settings.metrics_anonymous_id = anonymousId;
-		}
-
-		res.json({
-			metrics_enabled: settings.metrics_enabled ?? true,
-			metrics_anonymous_id: settings.metrics_anonymous_id,
-			metrics_last_sent: settings.metrics_last_sent,
-		});
-	} catch (error) {
-		console.error("Metrics settings fetch error:", error);
-		res.status(500).json({ error: "Failed to fetch metrics settings" });
-	}
-});
-
-// Update metrics settings
-router.put(
-	"/",
-	authenticateToken,
-	requireManageSettings,
-	[
-		body("metrics_enabled")
-			.isBoolean()
-			.withMessage("Metrics enabled must be a boolean"),
-	],
-	async (req, res) => {
-		try {
-			const errors = validationResult(req);
-			if (!errors.isEmpty()) {
-				return res.status(400).json({ errors: errors.array() });
-			}
-
-			const { metrics_enabled } = req.body;
-			const settings = await getSettings();
-
-			await updateSettings(settings.id, {
-				metrics_enabled,
-			});
-
-			console.log(
-				`Metrics ${metrics_enabled ? "enabled" : "disabled"} by user`,
-			);
-
-			res.json({
-				message: "Metrics settings updated successfully",
-				metrics_enabled,
-			});
-		} catch (error) {
-			console.error("Metrics settings update error:", error);
-			res.status(500).json({ error: "Failed to update metrics settings" });
-		}
-	},
-);
-
-// Regenerate anonymous ID
-router.post(
-	"/regenerate-id",
-	authenticateToken,
-	requireManageSettings,
-	async (_req, res) => {
-		try {
-			const settings = await getSettings();
-			const newAnonymousId = uuidv4();
-
-			await updateSettings(settings.id, {
-				metrics_anonymous_id: newAnonymousId,
-			});
-
-			console.log("Anonymous ID regenerated");
-
-			res.json({
-				message: "Anonymous ID regenerated successfully",
-				metrics_anonymous_id: newAnonymousId,
-			});
-		} catch (error) {
-			console.error("Anonymous ID regeneration error:", error);
-			res.status(500).json({ error: "Failed to regenerate anonymous ID" });
-		}
-	},
-);
-
-// Manually send metrics now
-router.post(
-	"/send-now",
-	authenticateToken,
-	requireManageSettings,
-	async (_req, res) => {
-		try {
-			const settings = await getSettings();
-
-			if (!settings.metrics_enabled) {
-				return res.status(400).json({
-					error: "Metrics are disabled. Please enable metrics first.",
-				});
-			}
-
-			// Trigger metrics directly (no queue delay for manual trigger)
-			const metricsReporting =
-				queueManager.automations[QUEUE_NAMES.METRICS_REPORTING];
-			const result = await metricsReporting.process(
-				{ name: "manual-send" },
-				false,
-			);
-
-			if (result.success) {
-				console.log("✅ Manual metrics sent successfully");
-				res.json({
-					message: "Metrics sent successfully",
-					data: result,
-				});
-			} else {
-				console.error("❌ Failed to send metrics:", result);
-				res.status(500).json({
-					error: "Failed to send metrics",
-					details: result.reason || result.error,
-				});
-			}
-		} catch (error) {
-			console.error("Send metrics error:", error);
-			res.status(500).json({
-				error: "Failed to send metrics",
-				details: error.message,
-			});
-		}
-	},
-);
-
-module.exports = router;

backend/src/routes/packageRoutes.js

@@ -1,8 +1,8 @@
 const express = require("express");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Get all packages with their update status
 router.get("/", async (req, res) => {
@@ -101,107 +101,74 @@ router.get("/", async (req, res) => {
 			prisma.packages.count({ where }),
 		]);
 
-		// OPTIMIZATION: Batch query all stats instead of N individual queries
-		const packageIds = packages.map((pkg) => pkg.id);
+		// Get additional stats for each package
+		const packagesWithStats = await Promise.all(
+			packages.map(async (pkg) => {
+				// Build base where clause for this package
+				const baseWhere = { package_id: pkg.id };
 
-		// Get all counts and host data in 3 batch queries instead of N*3 queries
-		const [allUpdatesCounts, allSecurityCounts, allPackageHostsData] =
-			await Promise.all([
-				// Batch count all packages that need updates
-				prisma.host_packages.groupBy({
-					by: ["package_id"],
-					where: {
-						package_id: { in: packageIds },
-						needs_update: true,
-						...(host ? { host_id: host } : {}),
-					},
-					_count: { id: true },
-				}),
-				// Batch count all packages with security updates
-				prisma.host_packages.groupBy({
-					by: ["package_id"],
-					where: {
-						package_id: { in: packageIds },
-						needs_update: true,
-						is_security_update: true,
-						...(host ? { host_id: host } : {}),
-					},
-					_count: { id: true },
-				}),
-				// Batch fetch all host data for packages
-				prisma.host_packages.findMany({
-					where: {
-						package_id: { in: packageIds },
-						...(host ? { host_id: host } : { needs_update: true }),
-					},
-					select: {
-						package_id: true,
-						hosts: {
-							select: {
-								id: true,
-								friendly_name: true,
-								hostname: true,
-								os_type: true,
-							},
+				// If host filter is specified, add host filter to all queries
+				const hostWhere = host ? { ...baseWhere, host_id: host } : baseWhere;
+
+				const [updatesCount, securityCount, packageHosts] = await Promise.all([
+					prisma.host_packages.count({
+						where: {
+							...hostWhere,
+							needs_update: true,
 						},
-						current_version: true,
-						available_version: true,
-						needs_update: true,
-						is_security_update: true,
+					}),
+					prisma.host_packages.count({
+						where: {
+							...hostWhere,
+							needs_update: true,
+							is_security_update: true,
+						},
+					}),
+					prisma.host_packages.findMany({
+						where: {
+							...hostWhere,
+							// If host filter is specified, include all packages for that host
+							// Otherwise, only include packages that need updates
+							...(host ? {} : { needs_update: true }),
+						},
+						select: {
+							hosts: {
+								select: {
+									id: true,
+									friendly_name: true,
+									hostname: true,
+									os_type: true,
+								},
+							},
+							current_version: true,
+							available_version: true,
+							needs_update: true,
+							is_security_update: true,
+						},
+						take: 10, // Limit to first 10 for performance
+					}),
+				]);
+
+				return {
+					...pkg,
+					packageHostsCount: pkg._count.host_packages,
+					packageHosts: packageHosts.map((hp) => ({
+						hostId: hp.hosts.id,
+						friendlyName: hp.hosts.friendly_name,
+						osType: hp.hosts.os_type,
+						currentVersion: hp.current_version,
+						availableVersion: hp.available_version,
+						needsUpdate: hp.needs_update,
+						isSecurityUpdate: hp.is_security_update,
+					})),
+					stats: {
+						totalInstalls: pkg._count.host_packages,
+						updatesNeeded: updatesCount,
+						securityUpdates: securityCount,
 					},
-					// Limit to first 10 per package
-					take: 100, // Increased from package-based limit
-				}),
-			]);
-
-		// Create lookup maps for O(1) access
-		const updatesCountMap = new Map(
-			allUpdatesCounts.map((item) => [item.package_id, item._count.id]),
+				};
+			}),
 		);
-		const securityCountMap = new Map(
-			allSecurityCounts.map((item) => [item.package_id, item._count.id]),
-		);
-		const packageHostsMap = new Map();
-
-		// Group host data by package_id
-		for (const hp of allPackageHostsData) {
-			if (!packageHostsMap.has(hp.package_id)) {
-				packageHostsMap.set(hp.package_id, []);
-			}
-			const hosts = packageHostsMap.get(hp.package_id);
-			hosts.push({
-				hostId: hp.hosts.id,
-				friendlyName: hp.hosts.friendly_name,
-				osType: hp.hosts.os_type,
-				currentVersion: hp.current_version,
-				availableVersion: hp.available_version,
-				needsUpdate: hp.needs_update,
-				isSecurityUpdate: hp.is_security_update,
-			});
-
-			// Limit to 10 hosts per package
-			if (hosts.length > 10) {
-				packageHostsMap.set(hp.package_id, hosts.slice(0, 10));
-			}
-		}
-
-		// Map packages with stats from lookup maps (no more DB queries!)
-		const packagesWithStats = packages.map((pkg) => {
-			const updatesCount = updatesCountMap.get(pkg.id) || 0;
-			const securityCount = securityCountMap.get(pkg.id) || 0;
-			const packageHosts = packageHostsMap.get(pkg.id) || [];
-
-			return {
-				...pkg,
-				packageHostsCount: pkg._count.host_packages,
-				packageHosts,
-				stats: {
-					totalInstalls: pkg._count.host_packages,
-					updatesNeeded: updatesCount,
-					securityUpdates: securityCount,
-				},
-			};
-		});
 
 		res.json({
 			packages: packagesWithStats,

backend/src/routes/permissionsRoutes.js

@@ -1,5 +1,5 @@
 const express = require("express");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const { authenticateToken } = require("../middleware/auth");
 const {
 	requireManageSettings,
@@ -7,7 +7,7 @@ const {
 } = require("../middleware/permissions");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Get all role permissions (allow users who can manage users to view roles)
 router.get(

backend/src/routes/repositoryRoutes.js

@@ -1,6 +1,6 @@
 const express = require("express");
 const { body, validationResult } = require("express-validator");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const { authenticateToken } = require("../middleware/auth");
 const {
 	requireViewHosts,
@@ -8,7 +8,7 @@ const {
 } = require("../middleware/permissions");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Get all repositories with host count
 router.get("/", authenticateToken, requireViewHosts, async (_req, res) => {

backend/src/routes/searchRoutes.js

@@ -1,9 +1,9 @@
 const express = require("express");
 const router = express.Router();
-const { getPrismaClient } = require("../config/prisma");
+const { createPrismaClient } = require("../config/database");
 const { authenticateToken } = require("../middleware/auth");
 
-const prisma = getPrismaClient();
+const prisma = createPrismaClient();
 
 /**
  * Global search endpoint

backend/src/routes/settingsRoutes.js

@@ -1,12 +1,12 @@
 const express = require("express");
 const { body, validationResult } = require("express-validator");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const { authenticateToken } = require("../middleware/auth");
 const { requireManageSettings } = require("../middleware/permissions");
 const { getSettings, updateSettings } = require("../services/settingsService");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // WebSocket broadcaster for agent policy updates (no longer used - queue-based delivery preferred)
 // const { broadcastSettingsUpdate } = require("../services/agentWs");
@@ -158,7 +158,6 @@ router.put(
 				logoDark,
 				logoLight,
 				favicon,
-				colorTheme,
 			} = req.body;
 
 			// Get current settings to check for update interval changes
@@ -190,7 +189,6 @@ router.put(
 			if (logoDark !== undefined) updateData.logo_dark = logoDark;
 			if (logoLight !== undefined) updateData.logo_light = logoLight;
 			if (favicon !== undefined) updateData.favicon = favicon;
-			if (colorTheme !== undefined) updateData.color_theme = colorTheme;
 
 			const updatedSettings = await updateSettings(
 				currentSettings.id,

backend/src/routes/tfaRoutes.js

@@ -1,12 +1,12 @@
 const express = require("express");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const speakeasy = require("speakeasy");
 const QRCode = require("qrcode");
 const { authenticateToken } = require("../middleware/auth");
 const { body, validationResult } = require("express-validator");
 
 const router = express.Router();
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Generate TFA secret and QR code
 router.get("/setup", authenticateToken, async (req, res) => {

backend/src/routes/versionRoutes.js

@@ -1,12 +1,12 @@
 const express = require("express");
 const { authenticateToken } = require("../middleware/auth");
 const { requireManageSettings } = require("../middleware/permissions");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Default GitHub repository URL
-const DEFAULT_GITHUB_REPO = "https://github.com/PatchMon/PatchMon.git";
+const DEFAULT_GITHUB_REPO = "https://github.com/patchMon/patchmon";
 
 const router = express.Router();
 
@@ -14,16 +14,13 @@ const router = express.Router();
 function getCurrentVersion() {
 	try {
 		const packageJson = require("../../package.json");
-		if (!packageJson?.version) {
-			throw new Error("Version not found in package.json");
-		}
-		return packageJson.version;
+		return packageJson?.version || "1.2.9";
 	} catch (packageError) {
-		console.error(
-			"Could not read version from package.json:",
+		console.warn(
+			"Could not read version from package.json, using fallback:",
 			packageError.message,
 		);
-		return "unknown";
+		return "1.2.9";
 	}
 }
 

backend/src/routes/wsRoutes.js

@@ -11,31 +11,7 @@ const {
 
 const router = express.Router();
 
-// Get WebSocket connection status for multiple hosts at once (bulk endpoint)
-router.get("/status", authenticateToken, async (req, res) => {
-	try {
-		const { apiIds } = req.query; // Comma-separated list of api_ids
-		const idArray = apiIds ? apiIds.split(",").filter((id) => id.trim()) : [];
-
-		const statusMap = {};
-		idArray.forEach((apiId) => {
-			statusMap[apiId] = getConnectionInfo(apiId);
-		});
-
-		res.json({
-			success: true,
-			data: statusMap,
-		});
-	} catch (error) {
-		console.error("Error fetching bulk WebSocket status:", error);
-		res.status(500).json({
-			success: false,
-			error: "Failed to fetch WebSocket status",
-		});
-	}
-});
-
-// Get WebSocket connection status by api_id (single endpoint)
+// Get WebSocket connection status by api_id (no database access - pure memory lookup)
 router.get("/status/:apiId", authenticateToken, async (req, res) => {
 	try {
 		const { apiId } = req.params;
@@ -77,6 +53,8 @@ router.get("/status/:apiId/stream", async (req, res) => {
 			// Validate session (same as regular auth middleware)
 			const validation = await validate_session(decoded.sessionId, token);
 			if (!validation.valid) {
+				console.error("[SSE] Session validation failed:", validation.reason);
+				console.error("[SSE] Invalid session for api_id:", apiId);
 				return res.status(401).json({ error: "Invalid or expired session" });
 			}
 
@@ -84,7 +62,9 @@ router.get("/status/:apiId/stream", async (req, res) => {
 			await update_session_activity(decoded.sessionId);
 
 			req.user = validation.user;
-		} catch (_err) {
+		} catch (err) {
+			console.error("[SSE] JWT verification failed:", err.message);
+			console.error("[SSE] Invalid token for api_id:", apiId);
 			return res.status(401).json({ error: "Invalid or expired token" });
 		}
 

backend/src/server.js

@@ -41,10 +41,10 @@ const helmet = require("helmet");
 const rateLimit = require("express-rate-limit");
 const cookieParser = require("cookie-parser");
 const {
-	getPrismaClient,
+	createPrismaClient,
 	waitForDatabase,
 	disconnectPrisma,
-} = require("./config/prisma");
+} = require("./config/database");
 const winston = require("winston");
 
 // Import routes
@@ -66,10 +66,7 @@ const autoEnrollmentRoutes = require("./routes/autoEnrollmentRoutes");
 const gethomepageRoutes = require("./routes/gethomepageRoutes");
 const automationRoutes = require("./routes/automationRoutes");
 const dockerRoutes = require("./routes/dockerRoutes");
-const integrationRoutes = require("./routes/integrationRoutes");
 const wsRoutes = require("./routes/wsRoutes");
-const agentVersionRoutes = require("./routes/agentVersionRoutes");
-const metricsRoutes = require("./routes/metricsRoutes");
 const { initSettings } = require("./services/settingsService");
 const { queueManager } = require("./services/automation");
 const { authenticateToken, requireAdmin } = require("./middleware/auth");
@@ -78,7 +75,7 @@ const { BullMQAdapter } = require("@bull-board/api/bullMQAdapter");
 const { ExpressAdapter } = require("@bull-board/express");
 
 // Initialize Prisma client with optimized connection pooling for multiple instances
-const prisma = getPrismaClient();
+const prisma = createPrismaClient();
 
 // Function to check and create default role permissions on startup
 async function checkAndCreateRolePermissions() {
@@ -265,7 +262,6 @@ const PORT = process.env.PORT || 3001;
 const http = require("node:http");
 const server = http.createServer(app);
 const { init: initAgentWs } = require("./services/agentWs");
-const agentVersionService = require("./services/agentVersionService");
 
 // Trust proxy (needed when behind reverse proxy) and remove X-Powered-By
 if (process.env.TRUST_PROXY) {
@@ -297,7 +293,7 @@ app.disable("x-powered-by");
 // Rate limiting with monitoring
 const limiter = rateLimit({
 	windowMs: parseInt(process.env.RATE_LIMIT_WINDOW_MS, 10) || 15 * 60 * 1000,
-	max: parseInt(process.env.RATE_LIMIT_MAX, 10) || 5000,
+	max: parseInt(process.env.RATE_LIMIT_MAX, 10) || 100,
 	message: {
 		error: "Too many requests from this IP, please try again later.",
 		retryAfter: Math.ceil(
@@ -347,46 +343,18 @@ const allowedOrigins = parseOrigins(
 		process.env.CORS_ORIGIN ||
 		"http://localhost:3000",
 );
-
-// Add Bull Board origin to allowed origins if not already present
-const bullBoardOrigin = process.env.CORS_ORIGIN || "http://localhost:3000";
-if (!allowedOrigins.includes(bullBoardOrigin)) {
-	allowedOrigins.push(bullBoardOrigin);
-}
-
 app.use(
 	cors({
 		origin: (origin, callback) => {
 			// Allow non-browser/SSR tools with no origin
 			if (!origin) return callback(null, true);
 			if (allowedOrigins.includes(origin)) return callback(null, true);
-
-			// Allow Bull Board requests from the same origin as CORS_ORIGIN
-			if (origin === bullBoardOrigin) return callback(null, true);
-
 			// Allow same-origin requests (e.g., Bull Board accessing its own API)
 			// This allows http://hostname:3001 to make requests to http://hostname:3001
 			if (origin?.includes(":3001")) return callback(null, true);
-
-			// Allow Bull Board requests from the frontend origin (same host, different port)
-			// This handles cases where frontend is on port 3000 and backend on 3001
-			const frontendOrigin = origin?.replace(/:3001$/, ":3000");
-			if (frontendOrigin && allowedOrigins.includes(frontendOrigin)) {
-				return callback(null, true);
-			}
-
 			return callback(new Error("Not allowed by CORS"));
 		},
 		credentials: true,
-		// Additional CORS options for better cookie handling
-		optionsSuccessStatus: 200,
-		methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
-		allowedHeaders: [
-			"Content-Type",
-			"Authorization",
-			"Cookie",
-			"X-Requested-With",
-		],
 	}),
 );
 app.use(limiter);
@@ -426,7 +394,7 @@ const apiVersion = process.env.API_VERSION || "v1";
 const authLimiter = rateLimit({
 	windowMs:
 		parseInt(process.env.AUTH_RATE_LIMIT_WINDOW_MS, 10) || 10 * 60 * 1000,
-	max: parseInt(process.env.AUTH_RATE_LIMIT_MAX, 10) || 500,
+	max: parseInt(process.env.AUTH_RATE_LIMIT_MAX, 10) || 20,
 	message: {
 		error: "Too many authentication requests, please try again later.",
 		retryAfter: Math.ceil(
@@ -440,7 +408,7 @@ const authLimiter = rateLimit({
 });
 const agentLimiter = rateLimit({
 	windowMs: parseInt(process.env.AGENT_RATE_LIMIT_WINDOW_MS, 10) || 60 * 1000,
-	max: parseInt(process.env.AGENT_RATE_LIMIT_MAX, 10) || 1000,
+	max: parseInt(process.env.AGENT_RATE_LIMIT_MAX, 10) || 120,
 	message: {
 		error: "Too many agent requests, please try again later.",
 		retryAfter: Math.ceil(
@@ -473,193 +441,30 @@ app.use(
 app.use(`/api/${apiVersion}/gethomepage`, gethomepageRoutes);
 app.use(`/api/${apiVersion}/automation`, automationRoutes);
 app.use(`/api/${apiVersion}/docker`, dockerRoutes);
-app.use(`/api/${apiVersion}/integrations`, integrationRoutes);
 app.use(`/api/${apiVersion}/ws`, wsRoutes);
-app.use(`/api/${apiVersion}/agent`, agentVersionRoutes);
-app.use(`/api/${apiVersion}/metrics`, metricsRoutes);
 
 // Bull Board - will be populated after queue manager initializes
 let bullBoardRouter = null;
-const _bullBoardSessions = new Map(); // Store authenticated sessions
+const bullBoardSessions = new Map(); // Store authenticated sessions
 
-// Mount Bull Board at /bullboard for cleaner URL
-app.use(`/bullboard`, (_req, res, next) => {
+// Mount Bull Board at /admin instead of /api/v1/admin to avoid path conflicts
+app.use(`/admin/queues`, (_req, res, next) => {
 	// Relax COOP/COEP for Bull Board in non-production to avoid browser warnings
 	if (process.env.NODE_ENV !== "production") {
 		res.setHeader("Cross-Origin-Opener-Policy", "same-origin-allow-popups");
 		res.setHeader("Cross-Origin-Embedder-Policy", "unsafe-none");
 	}
 
-	// Add headers to help with WebSocket connections
-	res.setHeader("X-Frame-Options", "SAMEORIGIN");
-	res.setHeader(
-		"Content-Security-Policy",
-		"default-src 'self' 'unsafe-inline' 'unsafe-eval' data: blob:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; connect-src 'self' ws: wss:;",
-	);
-
 	next();
 });
 
-// Simplified Bull Board authentication - just validate token once and set a simple auth cookie
-app.use(`/bullboard`, async (req, res, next) => {
-	// Skip authentication for static assets
+// Authentication middleware for Bull Board
+app.use(`/admin/queues`, async (req, res, next) => {
+	// Skip authentication for static assets only
 	if (req.path.includes("/static/") || req.path.includes("/favicon")) {
 		return next();
 	}
 
-	// Check for existing Bull Board auth cookie
-	if (req.cookies["bull-board-auth"]) {
-		// Already authenticated, allow access
-		return next();
-	}
-
-	// No auth cookie - check for token in query
-	const token = req.query.token;
-	if (!token) {
-		return res.status(401).json({
-			error:
-				"Authentication required. Please access Bull Board from the Automation page.",
-		});
-	}
-
-	// Validate token and set auth cookie
-	req.headers.authorization = `Bearer ${token}`;
-	return authenticateToken(req, res, (err) => {
-		if (err) {
-			return res.status(401).json({ error: "Invalid authentication token" });
-		}
-		return requireAdmin(req, res, (adminErr) => {
-			if (adminErr) {
-				return res.status(403).json({ error: "Admin access required" });
-			}
-
-			// Set a simple auth cookie that will persist for the session
-			res.cookie("bull-board-auth", token, {
-				httpOnly: false,
-				secure: false,
-				maxAge: 3600000, // 1 hour
-				path: "/bullboard",
-				sameSite: "lax",
-			});
-
-			console.log("Bull Board - Authentication successful, cookie set");
-			return next();
-		});
-	});
-});
-
-// Remove all the old complex middleware below and replace with the new Bull Board router setup
-app.use(`/bullboard`, (req, res, next) => {
-	if (bullBoardRouter) {
-		return bullBoardRouter(req, res, next);
-	}
-	return res.status(503).json({ error: "Bull Board not initialized yet" });
-});
-
-/*
-// OLD MIDDLEWARE - REMOVED FOR SIMPLIFICATION - DO NOT USE
-if (false) {
-		const sessionId = req.cookies["bull-board-session"];
-		console.log("Bull Board API call - Session ID:", sessionId ? "present" : "missing");
-		console.log("Bull Board API call - Cookies:", req.cookies);
-		console.log("Bull Board API call - Bull Board token cookie:", req.cookies["bull-board-token"] ? "present" : "missing");
-		console.log("Bull Board API call - Query token:", req.query.token ? "present" : "missing");
-		console.log("Bull Board API call - Auth header:", req.headers.authorization ? "present" : "missing");
-		console.log("Bull Board API call - Origin:", req.headers.origin || "missing");
-		console.log("Bull Board API call - Referer:", req.headers.referer || "missing");
-		
-		// Check if we have any authentication method available
-		const hasSession = !!sessionId;
-		const hasTokenCookie = !!req.cookies["bull-board-token"];
-		const hasQueryToken = !!req.query.token;
-		const hasAuthHeader = !!req.headers.authorization;
-		const hasReferer = !!req.headers.referer;
-		
-		console.log("Bull Board API call - Auth methods available:", {
-			session: hasSession,
-			tokenCookie: hasTokenCookie,
-			queryToken: hasQueryToken,
-			authHeader: hasAuthHeader,
-			referer: hasReferer
-		});
-		
-		// Check for valid session first
-		if (sessionId) {
-			const session = bullBoardSessions.get(sessionId);
-			console.log("Bull Board API call - Session found:", !!session);
-			if (session && Date.now() - session.timestamp < 3600000) {
-				// Valid session, extend it
-				session.timestamp = Date.now();
-				console.log("Bull Board API call - Using existing session, proceeding");
-				return next();
-			} else if (session) {
-				// Expired session, remove it
-				console.log("Bull Board API call - Session expired, removing");
-				bullBoardSessions.delete(sessionId);
-			}
-		}
-		
-		// No valid session, check for token as fallback
-		let token = req.query.token;
-		if (!token && req.headers.authorization) {
-			token = req.headers.authorization.replace("Bearer ", "");
-		}
-		if (!token && req.cookies["bull-board-token"]) {
-			token = req.cookies["bull-board-token"];
-		}
-		
-		// For API calls, also check if the token is in the referer URL
-		// This handles cases where the main page hasn't set the cookie yet
-		if (!token && req.headers.referer) {
-			try {
-				const refererUrl = new URL(req.headers.referer);
-				const refererToken = refererUrl.searchParams.get('token');
-				if (refererToken) {
-					token = refererToken;
-					console.log("Bull Board API call - Token found in referer URL:", refererToken.substring(0, 20) + "...");
-				} else {
-					console.log("Bull Board API call - No token found in referer URL");
-					// If no token in referer and no session, return 401 with redirect info
-					if (!sessionId) {
-						console.log("Bull Board API call - No authentication available, returning 401");
-						return res.status(401).json({ 
-							error: "Authentication required", 
-							message: "Please refresh the page to re-authenticate"
-						});
-					}
-				}
-			} catch (error) {
-				console.log("Bull Board API call - Error parsing referer URL:", error.message);
-			}
-		}
-		
-		if (token) {
-			console.log("Bull Board API call - Token found, authenticating");
-			// Add token to headers for authentication
-			req.headers.authorization = `Bearer ${token}`;
-			
-			// Authenticate the user
-			return authenticateToken(req, res, (err) => {
-				if (err) {
-					console.log("Bull Board API call - Token authentication failed");
-					return res.status(401).json({ error: "Authentication failed" });
-				}
-				return requireAdmin(req, res, (adminErr) => {
-					if (adminErr) {
-						console.log("Bull Board API call - Admin access required");
-						return res.status(403).json({ error: "Admin access required" });
-					}
-					console.log("Bull Board API call - Token authentication successful");
-					return next();
-				});
-			});
-		}
-		
-		// No valid session or token for API calls, deny access
-		console.log("Bull Board API call - No valid session or token, denying access");
-		return res.status(401).json({ error: "Valid Bull Board session or token required" });
-	}
-
 	// Check for bull-board-session cookie first
 	const sessionId = req.cookies["bull-board-session"];
 	if (sessionId) {
@@ -680,9 +485,6 @@ if (false) {
 	if (!token && req.headers.authorization) {
 		token = req.headers.authorization.replace("Bearer ", "");
 	}
-	if (!token && req.cookies["bull-board-token"]) {
-		token = req.cookies["bull-board-token"];
-	}
 
 	// If no token, deny access
 	if (!token) {
@@ -711,23 +513,13 @@ if (false) {
 				userId: req.user.id,
 			});
 
-			// Set session cookie with proper configuration for domain access
-			const isHttps = process.env.NODE_ENV === "production" || process.env.SERVER_PROTOCOL === "https";
-			const cookieOptions = {
+			// Set session cookie
+			res.cookie("bull-board-session", newSessionId, {
 				httpOnly: true,
-				secure: isHttps,
+				secure: process.env.NODE_ENV === "production",
+				sameSite: "lax",
 				maxAge: 3600000, // 1 hour
-				path: "/", // Set path to root so it's available for all Bull Board requests
-			};
-			
-			// Configure sameSite based on protocol and environment
-			if (isHttps) {
-				cookieOptions.sameSite = "none"; // Required for HTTPS cross-origin
-			} else {
-				cookieOptions.sameSite = "lax"; // Better for HTTP same-origin
-			}
-			
-			res.cookie("bull-board-session", newSessionId, cookieOptions);
+			});
 
 			// Clean up old sessions periodically
 			if (bullBoardSessions.size > 100) {
@@ -743,114 +535,16 @@ if (false) {
 		});
 	});
 });
-*/
 
-// Second middleware block - COMMENTED OUT - using simplified version above instead
-/*
-app.use(`/bullboard`, (req, res, next) => {
+app.use(`/admin/queues`, (req, res, next) => {
 	if (bullBoardRouter) {
-		// If this is the main Bull Board page (not an API call), inject the token and create session
-		if (!req.path.includes("/api/") && !req.path.includes("/static/") && req.path === "/bullboard") {
-			const token = req.query.token;
-			console.log("Bull Board main page - Token:", token ? "present" : "missing");
-			console.log("Bull Board main page - Query params:", req.query);
-			console.log("Bull Board main page - Origin:", req.headers.origin || "missing");
-			console.log("Bull Board main page - Referer:", req.headers.referer || "missing");
-			console.log("Bull Board main page - Cookies:", req.cookies);
-			
-			if (token) {
-				// Authenticate the user and create a session immediately on page load
-				req.headers.authorization = `Bearer ${token}`;
-				
-				return authenticateToken(req, res, (err) => {
-					if (err) {
-						console.log("Bull Board main page - Token authentication failed");
-						return res.status(401).json({ error: "Authentication failed" });
-					}
-					return requireAdmin(req, res, (adminErr) => {
-						if (adminErr) {
-							console.log("Bull Board main page - Admin access required");
-							return res.status(403).json({ error: "Admin access required" });
-						}
-						
-						console.log("Bull Board main page - Token authentication successful, creating session");
-						
-						// Create a Bull Board session immediately
-						const newSessionId = require("node:crypto")
-							.randomBytes(32)
-							.toString("hex");
-						bullBoardSessions.set(newSessionId, {
-							timestamp: Date.now(),
-							userId: req.user.id,
-						});
-
-						// Set session cookie with proper configuration for domain access
-						const sessionCookieOptions = {
-							httpOnly: true,
-							secure: false, // Always false for HTTP
-							maxAge: 3600000, // 1 hour
-							path: "/", // Set path to root so it's available for all Bull Board requests
-							sameSite: "lax", // Always lax for HTTP
-						};
-						
-						res.cookie("bull-board-session", newSessionId, sessionCookieOptions);
-						console.log("Bull Board main page - Session created:", newSessionId);
-						console.log("Bull Board main page - Cookie options:", sessionCookieOptions);
-						
-						// Also set a token cookie for API calls as a fallback
-						const tokenCookieOptions = {
-							httpOnly: false, // Allow JavaScript to access it
-							secure: false, // Always false for HTTP
-							maxAge: 3600000, // 1 hour
-							path: "/", // Set path to root for broader compatibility
-							sameSite: "lax", // Always lax for HTTP
-						};
-						
-						res.cookie("bull-board-token", token, tokenCookieOptions);
-						console.log("Bull Board main page - Token cookie also set for API fallback");
-						
-						// Clean up old sessions periodically
-						if (bullBoardSessions.size > 100) {
-							const now = Date.now();
-							for (const [sid, session] of bullBoardSessions.entries()) {
-								if (now - session.timestamp > 3600000) {
-									bullBoardSessions.delete(sid);
-								}
-							}
-						}
-						
-						// Now proceed to serve the Bull Board page
-						return bullBoardRouter(req, res, next);
-					});
-				});
-			} else {
-				console.log("Bull Board main page - No token provided, checking for existing session");
-				// Check if we have an existing session
-				const sessionId = req.cookies["bull-board-session"];
-				if (sessionId) {
-					const session = bullBoardSessions.get(sessionId);
-					if (session && Date.now() - session.timestamp < 3600000) {
-						console.log("Bull Board main page - Using existing session");
-						// Extend session
-						session.timestamp = Date.now();
-						return bullBoardRouter(req, res, next);
-					} else if (session) {
-						console.log("Bull Board main page - Session expired, removing");
-						bullBoardSessions.delete(sessionId);
-					}
-				}
-				console.log("Bull Board main page - No valid session, denying access");
-				return res.status(401).json({ error: "Access token required" });
-			}
-		}
 		return bullBoardRouter(req, res, next);
 	}
 	return res.status(503).json({ error: "Bull Board not initialized yet" });
 });
-*/
 
 // Error handler specifically for Bull Board routes
-app.use("/bullboard", (err, req, res, _next) => {
+app.use("/admin/queues", (err, req, res, _next) => {
 	console.error("Bull Board error on", req.method, req.url);
 	console.error("Error details:", err.message);
 	console.error("Stack:", err.stack);
@@ -870,15 +564,6 @@ app.use((err, _req, res, _next) => {
 	if (process.env.ENABLE_LOGGING === "true") {
 		logger.error(err.stack);
 	}
-
-	// Special handling for CORS errors - always include the message
-	if (err.message?.includes("Not allowed by CORS")) {
-		return res.status(500).json({
-			error: "Something went wrong!",
-			message: err.message, // Always include CORS error message
-		});
-	}
-
 	res.status(500).json({
 		error: "Something went wrong!",
 		message: process.env.NODE_ENV === "development" ? err.message : undefined,
@@ -1182,7 +867,7 @@ async function startServer() {
 		// Set up Bull Board for queue monitoring
 		const serverAdapter = new ExpressAdapter();
 		// Set basePath to match where we mount the router
-		serverAdapter.setBasePath("/bullboard");
+		serverAdapter.setBasePath("/admin/queues");
 
 		const { QUEUE_NAMES } = require("./services/automation");
 		const bullAdapters = Object.values(QUEUE_NAMES).map(
@@ -1196,20 +881,10 @@ async function startServer() {
 
 		// Set the router for the Bull Board middleware (secured middleware above)
 		bullBoardRouter = serverAdapter.getRouter();
-		console.log("✅ Bull Board mounted at /bullboard (secured)");
+		console.log("✅ Bull Board mounted at /admin/queues (secured)");
 
 		// Initialize WS layer with the underlying HTTP server
 		initAgentWs(server, prisma);
-		await agentVersionService.initialize();
-
-		// Send metrics on startup (silent - no console output)
-		try {
-			const metricsReporting =
-				queueManager.automations[QUEUE_NAMES.METRICS_REPORTING];
-			await metricsReporting.sendSilent();
-		} catch (_error) {
-			// Silent failure - don't block server startup if metrics fail
-		}
 
 		server.listen(PORT, () => {
 			if (process.env.ENABLE_LOGGING === "true") {

backend/src/services/agentVersionService.js

@@ -1,746 +0,0 @@
-const axios = require("axios");
-const fs = require("node:fs").promises;
-const path = require("node:path");
-const { exec, spawn } = require("node:child_process");
-const { promisify } = require("node:util");
-const _execAsync = promisify(exec);
-
-// Simple semver comparison function
-function compareVersions(version1, version2) {
-	const v1parts = version1.split(".").map(Number);
-	const v2parts = version2.split(".").map(Number);
-
-	// Ensure both arrays have the same length
-	while (v1parts.length < 3) v1parts.push(0);
-	while (v2parts.length < 3) v2parts.push(0);
-
-	for (let i = 0; i < 3; i++) {
-		if (v1parts[i] > v2parts[i]) return 1;
-		if (v1parts[i] < v2parts[i]) return -1;
-	}
-	return 0;
-}
-const crypto = require("node:crypto");
-
-class AgentVersionService {
-	constructor() {
-		this.githubApiUrl =
-			"https://api.github.com/repos/PatchMon/PatchMon-agent/releases";
-		this.agentsDir = path.resolve(__dirname, "../../../agents");
-		this.supportedArchitectures = [
-			"linux-amd64",
-			"linux-arm64",
-			"linux-386",
-			"linux-arm",
-		];
-		this.currentVersion = null;
-		this.latestVersion = null;
-		this.lastChecked = null;
-		this.checkInterval = 30 * 60 * 1000; // 30 minutes
-	}
-
-	async initialize() {
-		try {
-			// Ensure agents directory exists
-			await fs.mkdir(this.agentsDir, { recursive: true });
-
-			console.log("🔍 Testing GitHub API connectivity...");
-			try {
-				const testResponse = await axios.get(
-					"https://api.github.com/repos/PatchMon/PatchMon-agent/releases",
-					{
-						timeout: 5000,
-						headers: {
-							"User-Agent": "PatchMon-Server/1.0",
-							Accept: "application/vnd.github.v3+json",
-						},
-					},
-				);
-				console.log(
-					`✅ GitHub API accessible - found ${testResponse.data.length} releases`,
-				);
-			} catch (testError) {
-				console.error("❌ GitHub API not accessible:", testError.message);
-				if (testError.response) {
-					console.error(
-						"❌ Status:",
-						testError.response.status,
-						testError.response.statusText,
-					);
-					if (testError.response.status === 403) {
-						console.log("⚠️ GitHub API rate limit exceeded - will retry later");
-					}
-				}
-			}
-
-			// Get current agent version by executing the binary
-			await this.getCurrentAgentVersion();
-
-			// Try to check for updates, but don't fail initialization if GitHub API is unavailable
-			try {
-				await this.checkForUpdates();
-			} catch (updateError) {
-				console.log(
-					"⚠️ Failed to check for updates on startup, will retry later:",
-					updateError.message,
-				);
-			}
-
-			// Set up periodic checking
-			setInterval(() => {
-				this.checkForUpdates().catch((error) => {
-					console.log("⚠️ Periodic update check failed:", error.message);
-				});
-			}, this.checkInterval);
-
-			console.log("✅ Agent Version Service initialized");
-		} catch (error) {
-			console.error(
-				"❌ Failed to initialize Agent Version Service:",
-				error.message,
-			);
-		}
-	}
-
-	async getCurrentAgentVersion() {
-		try {
-			console.log("🔍 Getting current agent version...");
-
-			// Try to find the agent binary in agents/ folder only (what gets distributed)
-			const possiblePaths = [
-				path.join(this.agentsDir, "patchmon-agent-linux-amd64"),
-				path.join(this.agentsDir, "patchmon-agent"),
-			];
-
-			let agentPath = null;
-			for (const testPath of possiblePaths) {
-				try {
-					await fs.access(testPath);
-					agentPath = testPath;
-					console.log(`✅ Found agent binary at: ${testPath}`);
-					break;
-				} catch {
-					// Path doesn't exist, continue to next
-				}
-			}
-
-			if (!agentPath) {
-				console.log(
-					"⚠️ No agent binary found in agents/ folder, current version will be unknown",
-				);
-				console.log("💡 Use the Download Updates button to get agent binaries");
-				this.currentVersion = null;
-				return;
-			}
-
-			// Execute the agent binary with help flag to get version info
-			try {
-				const child = spawn(agentPath, ["--help"], {
-					timeout: 10000,
-				});
-
-				let stdout = "";
-				let stderr = "";
-
-				child.stdout.on("data", (data) => {
-					stdout += data.toString();
-				});
-
-				child.stderr.on("data", (data) => {
-					stderr += data.toString();
-				});
-
-				const result = await new Promise((resolve, reject) => {
-					child.on("close", (code) => {
-						resolve({ stdout, stderr, code });
-					});
-					child.on("error", reject);
-				});
-
-				if (result.stderr) {
-					console.log("⚠️ Agent help stderr:", result.stderr);
-				}
-
-				// Parse version from help output (e.g., "PatchMon Agent v1.3.0")
-				const versionMatch = result.stdout.match(
-					/PatchMon Agent v([0-9]+\.[0-9]+\.[0-9]+)/i,
-				);
-				if (versionMatch) {
-					this.currentVersion = versionMatch[1];
-					console.log(`✅ Current agent version: ${this.currentVersion}`);
-				} else {
-					console.log(
-						"⚠️ Could not parse version from agent help output:",
-						result.stdout,
-					);
-					this.currentVersion = null;
-				}
-			} catch (execError) {
-				console.error("❌ Failed to execute agent binary:", execError.message);
-				this.currentVersion = null;
-			}
-		} catch (error) {
-			console.error("❌ Failed to get current agent version:", error.message);
-			this.currentVersion = null;
-		}
-	}
-
-	async checkForUpdates() {
-		try {
-			console.log("🔍 Checking for agent updates...");
-
-			const response = await axios.get(this.githubApiUrl, {
-				timeout: 10000,
-				headers: {
-					"User-Agent": "PatchMon-Server/1.0",
-					Accept: "application/vnd.github.v3+json",
-				},
-			});
-
-			console.log(`📡 GitHub API response status: ${response.status}`);
-			console.log(`📦 Found ${response.data.length} releases`);
-
-			const releases = response.data;
-			if (releases.length === 0) {
-				console.log("ℹ️ No releases found");
-				this.latestVersion = null;
-				this.lastChecked = new Date();
-				return {
-					latestVersion: null,
-					currentVersion: this.currentVersion,
-					hasUpdate: false,
-					lastChecked: this.lastChecked,
-				};
-			}
-
-			const latestRelease = releases[0];
-			this.latestVersion = latestRelease.tag_name.replace("v", ""); // Remove 'v' prefix
-			this.lastChecked = new Date();
-
-			console.log(`📦 Latest agent version: ${this.latestVersion}`);
-
-			// Don't download binaries automatically - only when explicitly requested
-			console.log(
-				"ℹ️ Skipping automatic binary download - binaries will be downloaded on demand",
-			);
-
-			return {
-				latestVersion: this.latestVersion,
-				currentVersion: this.currentVersion,
-				hasUpdate: this.currentVersion !== this.latestVersion,
-				lastChecked: this.lastChecked,
-			};
-		} catch (error) {
-			console.error("❌ Failed to check for updates:", error.message);
-			if (error.response) {
-				console.error(
-					"❌ GitHub API error:",
-					error.response.status,
-					error.response.statusText,
-				);
-				console.error(
-					"❌ Rate limit info:",
-					error.response.headers["x-ratelimit-remaining"],
-					"/",
-					error.response.headers["x-ratelimit-limit"],
-				);
-			}
-			throw error;
-		}
-	}
-
-	async downloadBinariesToAgentsFolder(release) {
-		try {
-			console.log(
-				`⬇️ Downloading binaries for version ${release.tag_name} to agents folder...`,
-			);
-
-			for (const arch of this.supportedArchitectures) {
-				const assetName = `patchmon-agent-${arch}`;
-				const asset = release.assets.find((a) => a.name === assetName);
-
-				if (!asset) {
-					console.warn(`⚠️ Binary not found for architecture: ${arch}`);
-					continue;
-				}
-
-				const binaryPath = path.join(this.agentsDir, assetName);
-
-				console.log(`⬇️ Downloading ${assetName}...`);
-
-				const response = await axios.get(asset.browser_download_url, {
-					responseType: "stream",
-					timeout: 60000,
-				});
-
-				const writer = require("node:fs").createWriteStream(binaryPath);
-				response.data.pipe(writer);
-
-				await new Promise((resolve, reject) => {
-					writer.on("finish", resolve);
-					writer.on("error", reject);
-				});
-
-				// Make executable
-				await fs.chmod(binaryPath, "755");
-
-				console.log(`✅ Downloaded: ${assetName} to agents folder`);
-			}
-		} catch (error) {
-			console.error(
-				"❌ Failed to download binaries to agents folder:",
-				error.message,
-			);
-			throw error;
-		}
-	}
-
-	async downloadBinaryForVersion(version, architecture) {
-		try {
-			console.log(
-				`⬇️ Downloading binary for version ${version} architecture ${architecture}...`,
-			);
-
-			// Get the release info from GitHub
-			const response = await axios.get(this.githubApiUrl, {
-				timeout: 10000,
-				headers: {
-					"User-Agent": "PatchMon-Server/1.0",
-					Accept: "application/vnd.github.v3+json",
-				},
-			});
-
-			const releases = response.data;
-			const release = releases.find(
-				(r) => r.tag_name.replace("v", "") === version,
-			);
-
-			if (!release) {
-				throw new Error(`Release ${version} not found`);
-			}
-
-			const assetName = `patchmon-agent-${architecture}`;
-			const asset = release.assets.find((a) => a.name === assetName);
-
-			if (!asset) {
-				throw new Error(`Binary not found for architecture: ${architecture}`);
-			}
-
-			const binaryPath = path.join(
-				this.agentBinariesDir,
-				`${release.tag_name}-${assetName}`,
-			);
-
-			console.log(`⬇️ Downloading ${assetName}...`);
-
-			const downloadResponse = await axios.get(asset.browser_download_url, {
-				responseType: "stream",
-				timeout: 60000,
-			});
-
-			const writer = require("node:fs").createWriteStream(binaryPath);
-			downloadResponse.data.pipe(writer);
-
-			await new Promise((resolve, reject) => {
-				writer.on("finish", resolve);
-				writer.on("error", reject);
-			});
-
-			// Make executable
-			await fs.chmod(binaryPath, "755");
-
-			console.log(`✅ Downloaded: ${assetName}`);
-			return binaryPath;
-		} catch (error) {
-			console.error(
-				`❌ Failed to download binary ${version}-${architecture}:`,
-				error.message,
-			);
-			throw error;
-		}
-	}
-
-	async getBinaryPath(version, architecture) {
-		const binaryName = `patchmon-agent-${architecture}`;
-		const binaryPath = path.join(this.agentsDir, binaryName);
-
-		try {
-			await fs.access(binaryPath);
-			return binaryPath;
-		} catch {
-			throw new Error(`Binary not found: ${binaryName} version ${version}`);
-		}
-	}
-
-	async serveBinary(version, architecture, res) {
-		try {
-			// Check if binary exists, if not download it
-			const binaryPath = await this.getBinaryPath(version, architecture);
-			const stats = await fs.stat(binaryPath);
-
-			res.setHeader("Content-Type", "application/octet-stream");
-			res.setHeader(
-				"Content-Disposition",
-				`attachment; filename="patchmon-agent-${architecture}"`,
-			);
-			res.setHeader("Content-Length", stats.size);
-
-			// Add cache headers
-			res.setHeader("Cache-Control", "public, max-age=3600");
-			res.setHeader("ETag", `"${version}-${architecture}"`);
-
-			const stream = require("node:fs").createReadStream(binaryPath);
-			stream.pipe(res);
-		} catch (_error) {
-			// Binary doesn't exist, try to download it
-			console.log(
-				`⬇️ Binary not found locally, attempting to download ${version}-${architecture}...`,
-			);
-			try {
-				await this.downloadBinaryForVersion(version, architecture);
-				// Retry serving the binary
-				const binaryPath = await this.getBinaryPath(version, architecture);
-				const stats = await fs.stat(binaryPath);
-
-				res.setHeader("Content-Type", "application/octet-stream");
-				res.setHeader(
-					"Content-Disposition",
-					`attachment; filename="patchmon-agent-${architecture}"`,
-				);
-				res.setHeader("Content-Length", stats.size);
-				res.setHeader("Cache-Control", "public, max-age=3600");
-				res.setHeader("ETag", `"${version}-${architecture}"`);
-
-				const stream = require("node:fs").createReadStream(binaryPath);
-				stream.pipe(res);
-			} catch (downloadError) {
-				console.error(
-					`❌ Failed to download binary ${version}-${architecture}:`,
-					downloadError.message,
-				);
-				res
-					.status(404)
-					.json({ error: "Binary not found and could not be downloaded" });
-			}
-		}
-	}
-
-	async getVersionInfo() {
-		let hasUpdate = false;
-		let updateStatus = "unknown";
-
-		// Latest version should ALWAYS come from GitHub, not from local binaries
-		// currentVersion = what's installed locally
-		// latestVersion = what's available on GitHub
-		if (this.latestVersion) {
-			console.log(`📦 Latest version from GitHub: ${this.latestVersion}`);
-		} else {
-			console.log(
-				`⚠️ No GitHub release version available (API may be unavailable)`,
-			);
-		}
-
-		if (this.currentVersion) {
-			console.log(`💾 Current local agent version: ${this.currentVersion}`);
-		} else {
-			console.log(`⚠️ No local agent binary found`);
-		}
-
-		// Determine update status by comparing current vs latest (from GitHub)
-		if (this.currentVersion && this.latestVersion) {
-			const comparison = compareVersions(
-				this.currentVersion,
-				this.latestVersion,
-			);
-			if (comparison < 0) {
-				hasUpdate = true;
-				updateStatus = "update-available";
-			} else if (comparison > 0) {
-				hasUpdate = false;
-				updateStatus = "newer-version";
-			} else {
-				hasUpdate = false;
-				updateStatus = "up-to-date";
-			}
-		} else if (this.latestVersion && !this.currentVersion) {
-			hasUpdate = true;
-			updateStatus = "no-agent";
-		} else if (this.currentVersion && !this.latestVersion) {
-			// We have a current version but no latest version (GitHub API unavailable)
-			hasUpdate = false;
-			updateStatus = "github-unavailable";
-		} else if (!this.currentVersion && !this.latestVersion) {
-			updateStatus = "no-data";
-		}
-
-		return {
-			currentVersion: this.currentVersion,
-			latestVersion: this.latestVersion, // Always return GitHub version, not local
-			hasUpdate: hasUpdate,
-			updateStatus: updateStatus,
-			lastChecked: this.lastChecked,
-			supportedArchitectures: this.supportedArchitectures,
-			status: this.latestVersion ? "ready" : "no-releases",
-		};
-	}
-
-	async refreshCurrentVersion() {
-		await this.getCurrentAgentVersion();
-		return this.currentVersion;
-	}
-
-	async downloadLatestUpdate() {
-		try {
-			console.log("⬇️ Downloading latest agent update...");
-
-			// First check for updates to get the latest release info
-			const _updateInfo = await this.checkForUpdates();
-
-			if (!this.latestVersion) {
-				throw new Error("No latest version available to download");
-			}
-
-			// Get the release info from GitHub
-			const response = await axios.get(this.githubApiUrl, {
-				timeout: 10000,
-				headers: {
-					"User-Agent": "PatchMon-Server/1.0",
-					Accept: "application/vnd.github.v3+json",
-				},
-			});
-
-			const releases = response.data;
-			const latestRelease = releases[0];
-
-			if (!latestRelease) {
-				throw new Error("No releases found");
-			}
-
-			console.log(
-				`⬇️ Downloading binaries for version ${latestRelease.tag_name}...`,
-			);
-
-			// Download binaries for all architectures directly to agents folder
-			await this.downloadBinariesToAgentsFolder(latestRelease);
-
-			console.log("✅ Latest update downloaded successfully");
-
-			return {
-				success: true,
-				version: this.latestVersion,
-				downloadedArchitectures: this.supportedArchitectures,
-				message: `Successfully downloaded version ${this.latestVersion}`,
-			};
-		} catch (error) {
-			console.error("❌ Failed to download latest update:", error.message);
-			throw error;
-		}
-	}
-
-	async getAvailableVersions() {
-		// No local caching - only return latest from GitHub
-		if (this.latestVersion) {
-			return [this.latestVersion];
-		}
-		return [];
-	}
-
-	async getBinaryInfo(version, architecture) {
-		try {
-			// Always use local version if it matches the requested version
-			if (version === this.currentVersion && this.currentVersion) {
-				const binaryPath = await this.getBinaryPath(
-					this.currentVersion,
-					architecture,
-				);
-				const stats = await fs.stat(binaryPath);
-
-				// Calculate file hash
-				const fileBuffer = await fs.readFile(binaryPath);
-				const hash = crypto
-					.createHash("sha256")
-					.update(fileBuffer)
-					.digest("hex");
-
-				return {
-					version: this.currentVersion,
-					architecture,
-					size: stats.size,
-					hash,
-					lastModified: stats.mtime,
-					path: binaryPath,
-				};
-			}
-
-			// For other versions, try to find them in the agents folder
-			const binaryPath = await this.getBinaryPath(version, architecture);
-			const stats = await fs.stat(binaryPath);
-
-			// Calculate file hash
-			const fileBuffer = await fs.readFile(binaryPath);
-			const hash = crypto.createHash("sha256").update(fileBuffer).digest("hex");
-
-			return {
-				version,
-				architecture,
-				size: stats.size,
-				hash,
-				lastModified: stats.mtime,
-				path: binaryPath,
-			};
-		} catch (error) {
-			throw new Error(`Failed to get binary info: ${error.message}`);
-		}
-	}
-
-	/**
-	 * Check if an agent needs an update and push notification if needed
-	 * @param {string} agentApiId - The agent's API ID
-	 * @param {string} agentVersion - The agent's current version
-	 * @param {boolean} force - Force update regardless of version
-	 * @returns {Object} Update check result
-	 */
-	async checkAndPushAgentUpdate(agentApiId, agentVersion, force = false) {
-		try {
-			console.log(
-				`🔍 Checking update for agent ${agentApiId} (version: ${agentVersion})`,
-			);
-
-			// Get current server version info
-			const versionInfo = await this.getVersionInfo();
-
-			if (!versionInfo.latestVersion) {
-				console.log(`⚠️ No latest version available for agent ${agentApiId}`);
-				return {
-					needsUpdate: false,
-					reason: "no-latest-version",
-					message: "No latest version available on server",
-				};
-			}
-
-			// Compare versions
-			const comparison = compareVersions(
-				agentVersion,
-				versionInfo.latestVersion,
-			);
-			const needsUpdate = force || comparison < 0;
-
-			if (needsUpdate) {
-				console.log(
-					`📤 Agent ${agentApiId} needs update: ${agentVersion} → ${versionInfo.latestVersion}`,
-				);
-
-				// Import agentWs service to push notification
-				const { pushUpdateNotification } = require("./agentWs");
-
-				const updateInfo = {
-					version: versionInfo.latestVersion,
-					force: force,
-					downloadUrl: `/api/v1/agent/binary/${versionInfo.latestVersion}/linux-amd64`,
-					message: force
-						? "Force update requested"
-						: `Update available: ${versionInfo.latestVersion}`,
-				};
-
-				const pushed = pushUpdateNotification(agentApiId, updateInfo);
-
-				if (pushed) {
-					console.log(`✅ Update notification pushed to agent ${agentApiId}`);
-					return {
-						needsUpdate: true,
-						reason: force ? "force-update" : "version-outdated",
-						message: `Update notification sent: ${agentVersion} → ${versionInfo.latestVersion}`,
-						targetVersion: versionInfo.latestVersion,
-					};
-				} else {
-					console.log(
-						`⚠️ Failed to push update notification to agent ${agentApiId} (not connected)`,
-					);
-					return {
-						needsUpdate: true,
-						reason: "agent-offline",
-						message: "Agent needs update but is not connected",
-						targetVersion: versionInfo.latestVersion,
-					};
-				}
-			} else {
-				console.log(`✅ Agent ${agentApiId} is up to date: ${agentVersion}`);
-				return {
-					needsUpdate: false,
-					reason: "up-to-date",
-					message: `Agent is up to date: ${agentVersion}`,
-				};
-			}
-		} catch (error) {
-			console.error(
-				`❌ Failed to check update for agent ${agentApiId}:`,
-				error.message,
-			);
-			return {
-				needsUpdate: false,
-				reason: "error",
-				message: `Error checking update: ${error.message}`,
-			};
-		}
-	}
-
-	/**
-	 * Check and push updates to all connected agents
-	 * @param {boolean} force - Force update regardless of version
-	 * @returns {Object} Bulk update result
-	 */
-	async checkAndPushUpdatesToAll(force = false) {
-		try {
-			console.log(
-				`🔍 Checking updates for all connected agents (force: ${force})`,
-			);
-
-			// Import agentWs service to get connected agents
-			const { pushUpdateNotificationToAll } = require("./agentWs");
-
-			const versionInfo = await this.getVersionInfo();
-
-			if (!versionInfo.latestVersion) {
-				return {
-					success: false,
-					message: "No latest version available on server",
-					updatedAgents: 0,
-					totalAgents: 0,
-				};
-			}
-
-			const updateInfo = {
-				version: versionInfo.latestVersion,
-				force: force,
-				downloadUrl: `/api/v1/agent/binary/${versionInfo.latestVersion}/linux-amd64`,
-				message: force
-					? "Force update requested for all agents"
-					: `Update available: ${versionInfo.latestVersion}`,
-			};
-
-			const result = await pushUpdateNotificationToAll(updateInfo);
-
-			console.log(
-				`✅ Bulk update notification sent to ${result.notifiedCount} agents`,
-			);
-
-			return {
-				success: true,
-				message: `Update notifications sent to ${result.notifiedCount} agents`,
-				updatedAgents: result.notifiedCount,
-				totalAgents: result.totalAgents,
-				targetVersion: versionInfo.latestVersion,
-			};
-		} catch (error) {
-			console.error("❌ Failed to push updates to all agents:", error.message);
-			return {
-				success: false,
-				message: `Error pushing updates: ${error.message}`,
-				updatedAgents: 0,
-				totalAgents: 0,
-			};
-		}
-	}
-}
-
-module.exports = new AgentVersionService();

backend/src/services/agentWs.js

@@ -26,37 +26,7 @@ function init(server, prismaClient) {
 	server.on("upgrade", async (request, socket, head) => {
 		try {
 			const { pathname } = url.parse(request.url);
-			if (!pathname) {
-				socket.destroy();
-				return;
-			}
-
-			// Handle Bull Board WebSocket connections
-			if (pathname.startsWith("/bullboard")) {
-				// For Bull Board, we need to check if the user is authenticated
-				// Check for session cookie or authorization header
-				const sessionCookie = request.headers.cookie?.match(
-					/bull-board-session=([^;]+)/,
-				)?.[1];
-				const authHeader = request.headers.authorization;
-
-				if (!sessionCookie && !authHeader) {
-					socket.destroy();
-					return;
-				}
-
-				// Accept the WebSocket connection for Bull Board
-				wss.handleUpgrade(request, socket, head, (ws) => {
-					ws.on("message", (message) => {
-						// Echo back for Bull Board WebSocket
-						ws.send(message);
-					});
-				});
-				return;
-			}
-
-			// Handle agent WebSocket connections
-			if (!pathname.startsWith("/api/")) {
+			if (!pathname || !pathname.startsWith("/api/")) {
 				socket.destroy();
 				return;
 			}
@@ -99,22 +69,8 @@ function init(server, prismaClient) {
 				// Notify subscribers of connection
 				notifyConnectionChange(apiId, true);
 
-				ws.on("message", async (data) => {
-					// Handle incoming messages from agent (e.g., Docker status updates)
-					try {
-						const message = JSON.parse(data.toString());
-
-						if (message.type === "docker_status") {
-							// Handle Docker container status events
-							await handleDockerStatusEvent(apiId, message);
-						}
-						// Add more message types here as needed
-					} catch (err) {
-						console.error(
-							`[agent-ws] error parsing message from ${apiId}:`,
-							err,
-						);
-					}
+				ws.on("message", () => {
+					// Currently we don't need to handle agent->server messages
 				});
 
 				ws.on("close", () => {
@@ -176,66 +132,6 @@ function pushSettingsUpdate(apiId, newInterval) {
 	);
 }
 
-function pushUpdateNotification(apiId, updateInfo) {
-	const ws = apiIdToSocket.get(apiId);
-	if (ws && ws.readyState === WebSocket.OPEN) {
-		safeSend(
-			ws,
-			JSON.stringify({
-				type: "update_notification",
-				version: updateInfo.version,
-				force: updateInfo.force || false,
-				downloadUrl: updateInfo.downloadUrl,
-				message: updateInfo.message,
-			}),
-		);
-		console.log(
-			`📤 Pushed update notification to agent ${apiId}: version ${updateInfo.version}`,
-		);
-		return true;
-	} else {
-		console.log(
-			`⚠️ Agent ${apiId} not connected, cannot push update notification`,
-		);
-		return false;
-	}
-}
-
-async function pushUpdateNotificationToAll(updateInfo) {
-	let notifiedCount = 0;
-	let failedCount = 0;
-
-	for (const [apiId, ws] of apiIdToSocket) {
-		if (ws && ws.readyState === WebSocket.OPEN) {
-			try {
-				safeSend(
-					ws,
-					JSON.stringify({
-						type: "update_notification",
-						version: updateInfo.version,
-						force: updateInfo.force || false,
-						message: updateInfo.message,
-					}),
-				);
-				notifiedCount++;
-				console.log(
-					`📤 Pushed update notification to agent ${apiId}: version ${updateInfo.version}`,
-				);
-			} catch (error) {
-				failedCount++;
-				console.error(`❌ Failed to notify agent ${apiId}:`, error.message);
-			}
-		} else {
-			failedCount++;
-		}
-	}
-
-	console.log(
-		`📤 Update notification sent to ${notifiedCount} agents, ${failedCount} failed`,
-	);
-	return { notifiedCount, failedCount };
-}
-
 // Notify all subscribers when connection status changes
 function notifyConnectionChange(apiId, connected) {
 	const subscribers = connectionChangeSubscribers.get(apiId);
@@ -269,69 +165,11 @@ function subscribeToConnectionChanges(apiId, callback) {
 	};
 }
 
-// Handle Docker container status events from agent
-async function handleDockerStatusEvent(apiId, message) {
-	try {
-		const { event: _event, container_id, name, status, timestamp } = message;
-
-		console.log(
-			`[Docker Event] ${apiId}: Container ${name} (${container_id}) - ${status}`,
-		);
-
-		// Find the host
-		const host = await prisma.hosts.findUnique({
-			where: { api_id: apiId },
-		});
-
-		if (!host) {
-			console.error(`[Docker Event] Host not found for api_id: ${apiId}`);
-			return;
-		}
-
-		// Update container status in database
-		const container = await prisma.docker_containers.findUnique({
-			where: {
-				host_id_container_id: {
-					host_id: host.id,
-					container_id: container_id,
-				},
-			},
-		});
-
-		if (container) {
-			await prisma.docker_containers.update({
-				where: { id: container.id },
-				data: {
-					status: status,
-					state: status,
-					updated_at: new Date(timestamp || Date.now()),
-					last_checked: new Date(),
-				},
-			});
-
-			console.log(
-				`[Docker Event] Updated container ${name} status to ${status}`,
-			);
-		} else {
-			console.log(
-				`[Docker Event] Container ${name} not found in database (may be new)`,
-			);
-		}
-
-		// TODO: Broadcast to connected dashboard clients via SSE or WebSocket
-		// This would notify the frontend UI in real-time
-	} catch (error) {
-		console.error(`[Docker Event] Error handling Docker status event:`, error);
-	}
-}
-
 module.exports = {
 	init,
 	broadcastSettingsUpdate,
 	pushReportNow,
 	pushSettingsUpdate,
-	pushUpdateNotification,
-	pushUpdateNotificationToAll,
 	// Expose read-only view of connected agents
 	getConnectedApiIds: () => Array.from(apiIdToSocket.keys()),
 	isConnected: (apiId) => {

backend/src/services/automation/dockerInventoryCleanup.js

@@ -1,164 +0,0 @@
-const { prisma } = require("./shared/prisma");
-
-/**
- * Docker Inventory Cleanup Automation
- * Removes Docker containers and images for hosts that no longer exist
- */
-class DockerInventoryCleanup {
-	constructor(queueManager) {
-		this.queueManager = queueManager;
-		this.queueName = "docker-inventory-cleanup";
-	}
-
-	/**
-	 * Process Docker inventory cleanup job
-	 */
-	async process(_job) {
-		const startTime = Date.now();
-		console.log("🧹 Starting Docker inventory cleanup...");
-
-		try {
-			// Step 1: Find and delete orphaned containers (containers for non-existent hosts)
-			const orphanedContainers = await prisma.docker_containers.findMany({
-				where: {
-					host_id: {
-						// Find containers where the host doesn't exist
-						notIn: await prisma.hosts
-							.findMany({ select: { id: true } })
-							.then((hosts) => hosts.map((h) => h.id)),
-					},
-				},
-			});
-
-			let deletedContainersCount = 0;
-			const deletedContainers = [];
-
-			for (const container of orphanedContainers) {
-				try {
-					await prisma.docker_containers.delete({
-						where: { id: container.id },
-					});
-					deletedContainersCount++;
-					deletedContainers.push({
-						id: container.id,
-						container_id: container.container_id,
-						name: container.name,
-						image_name: container.image_name,
-						host_id: container.host_id,
-					});
-					console.log(
-						`🗑️ Deleted orphaned container: ${container.name} (host_id: ${container.host_id})`,
-					);
-				} catch (deleteError) {
-					console.error(
-						`❌ Failed to delete container ${container.id}:`,
-						deleteError.message,
-					);
-				}
-			}
-
-			// Step 2: Find and delete orphaned images (images with no containers using them)
-			const orphanedImages = await prisma.docker_images.findMany({
-				where: {
-					docker_containers: {
-						none: {},
-					},
-				},
-				include: {
-					_count: {
-						select: {
-							docker_containers: true,
-							docker_image_updates: true,
-						},
-					},
-				},
-			});
-
-			let deletedImagesCount = 0;
-			const deletedImages = [];
-
-			for (const image of orphanedImages) {
-				try {
-					// First delete any image updates associated with this image
-					if (image._count.docker_image_updates > 0) {
-						await prisma.docker_image_updates.deleteMany({
-							where: { image_id: image.id },
-						});
-					}
-
-					// Then delete the image itself
-					await prisma.docker_images.delete({
-						where: { id: image.id },
-					});
-					deletedImagesCount++;
-					deletedImages.push({
-						id: image.id,
-						repository: image.repository,
-						tag: image.tag,
-						image_id: image.image_id,
-					});
-					console.log(
-						`🗑️ Deleted orphaned image: ${image.repository}:${image.tag}`,
-					);
-				} catch (deleteError) {
-					console.error(
-						`❌ Failed to delete image ${image.id}:`,
-						deleteError.message,
-					);
-				}
-			}
-
-			const executionTime = Date.now() - startTime;
-			console.log(
-				`✅ Docker inventory cleanup completed in ${executionTime}ms - Deleted ${deletedContainersCount} containers and ${deletedImagesCount} images`,
-			);
-
-			return {
-				success: true,
-				deletedContainersCount,
-				deletedImagesCount,
-				deletedContainers,
-				deletedImages,
-				executionTime,
-			};
-		} catch (error) {
-			const executionTime = Date.now() - startTime;
-			console.error(
-				`❌ Docker inventory cleanup failed after ${executionTime}ms:`,
-				error.message,
-			);
-			throw error;
-		}
-	}
-
-	/**
-	 * Schedule recurring Docker inventory cleanup (daily at 4 AM)
-	 */
-	async schedule() {
-		const job = await this.queueManager.queues[this.queueName].add(
-			"docker-inventory-cleanup",
-			{},
-			{
-				repeat: { cron: "0 4 * * *" }, // Daily at 4 AM
-				jobId: "docker-inventory-cleanup-recurring",
-			},
-		);
-		console.log("✅ Docker inventory cleanup scheduled");
-		return job;
-	}
-
-	/**
-	 * Trigger manual Docker inventory cleanup
-	 */
-	async triggerManual() {
-		const job = await this.queueManager.queues[this.queueName].add(
-			"docker-inventory-cleanup-manual",
-			{},
-			{ priority: 1 },
-		);
-		console.log("✅ Manual Docker inventory cleanup triggered");
-		return job;
-	}
-}
-
-module.exports = DockerInventoryCleanup;

backend/src/services/automation/githubUpdateCheck.js

@@ -21,7 +21,7 @@ class GitHubUpdateCheck {
 		try {
 			// Get settings
 			const settings = await prisma.settings.findFirst();
-			const DEFAULT_GITHUB_REPO = "https://github.com/PatchMon/PatchMon.git";
+			const DEFAULT_GITHUB_REPO = "https://github.com/patchMon/patchmon";
 			const repoUrl = settings?.githubRepoUrl || DEFAULT_GITHUB_REPO;
 			let owner, repo;
 
@@ -52,24 +52,17 @@ class GitHubUpdateCheck {
 			}
 
 			// Read version from package.json
-			let currentVersion = null;
+			let currentVersion = "1.2.7"; // fallback
 			try {
 				const packageJson = require("../../../package.json");
 				if (packageJson?.version) {
 					currentVersion = packageJson.version;
 				}
 			} catch (packageError) {
-				console.error(
+				console.warn(
 					"Could not read version from package.json:",
 					packageError.message,
 				);
-				throw new Error(
-					"Could not determine current version from package.json",
-				);
-			}
-
-			if (!currentVersion) {
-				throw new Error("Version not found in package.json");
 			}
 
 			const isUpdateAvailable =

backend/src/services/automation/index.js

@@ -8,8 +8,6 @@ const GitHubUpdateCheck = require("./githubUpdateCheck");
 const SessionCleanup = require("./sessionCleanup");
 const OrphanedRepoCleanup = require("./orphanedRepoCleanup");
 const OrphanedPackageCleanup = require("./orphanedPackageCleanup");
-const DockerInventoryCleanup = require("./dockerInventoryCleanup");
-const MetricsReporting = require("./metricsReporting");
 
 // Queue names
 const QUEUE_NAMES = {
@@ -17,8 +15,6 @@ const QUEUE_NAMES = {
 	SESSION_CLEANUP: "session-cleanup",
 	ORPHANED_REPO_CLEANUP: "orphaned-repo-cleanup",
 	ORPHANED_PACKAGE_CLEANUP: "orphaned-package-cleanup",
-	DOCKER_INVENTORY_CLEANUP: "docker-inventory-cleanup",
-	METRICS_REPORTING: "metrics-reporting",
 	AGENT_COMMANDS: "agent-commands",
 };
 
@@ -95,11 +91,6 @@ class QueueManager {
 			new OrphanedRepoCleanup(this);
 		this.automations[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP] =
 			new OrphanedPackageCleanup(this);
-		this.automations[QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP] =
-			new DockerInventoryCleanup(this);
-		this.automations[QUEUE_NAMES.METRICS_REPORTING] = new MetricsReporting(
-			this,
-		);
 
 		console.log("✅ All automation classes initialized");
 	}
@@ -108,27 +99,16 @@ class QueueManager {
 	 * Initialize all workers
 	 */
 	async initializeWorkers() {
-		// Optimized worker options to reduce Redis connections
-		const workerOptions = {
-			connection: redisConnection,
-			concurrency: 1, // Keep concurrency low to reduce connections
-			// Connection optimization
-			maxStalledCount: 1,
-			stalledInterval: 30000,
-			// Reduce connection churn
-			settings: {
-				stalledInterval: 30000,
-				maxStalledCount: 1,
-			},
-		};
-
 		// GitHub Update Check Worker
 		this.workers[QUEUE_NAMES.GITHUB_UPDATE_CHECK] = new Worker(
 			QUEUE_NAMES.GITHUB_UPDATE_CHECK,
 			this.automations[QUEUE_NAMES.GITHUB_UPDATE_CHECK].process.bind(
 				this.automations[QUEUE_NAMES.GITHUB_UPDATE_CHECK],
 			),
-			workerOptions,
+			{
+				connection: redisConnection,
+				concurrency: 1,
+			},
 		);
 
 		// Session Cleanup Worker
@@ -137,7 +117,10 @@ class QueueManager {
 			this.automations[QUEUE_NAMES.SESSION_CLEANUP].process.bind(
 				this.automations[QUEUE_NAMES.SESSION_CLEANUP],
 			),
-			workerOptions,
+			{
+				connection: redisConnection,
+				concurrency: 1,
+			},
 		);
 
 		// Orphaned Repo Cleanup Worker
@@ -146,7 +129,10 @@ class QueueManager {
 			this.automations[QUEUE_NAMES.ORPHANED_REPO_CLEANUP].process.bind(
 				this.automations[QUEUE_NAMES.ORPHANED_REPO_CLEANUP],
 			),
-			workerOptions,
+			{
+				connection: redisConnection,
+				concurrency: 1,
+			},
 		);
 
 		// Orphaned Package Cleanup Worker
@@ -155,51 +141,167 @@ class QueueManager {
 			this.automations[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP].process.bind(
 				this.automations[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP],
 			),
-			workerOptions,
-		);
-
-		// Docker Inventory Cleanup Worker
-		this.workers[QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP] = new Worker(
-			QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP,
-			this.automations[QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP].process.bind(
-				this.automations[QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP],
-			),
-			workerOptions,
-		);
-
-		// Metrics Reporting Worker
-		this.workers[QUEUE_NAMES.METRICS_REPORTING] = new Worker(
-			QUEUE_NAMES.METRICS_REPORTING,
-			this.automations[QUEUE_NAMES.METRICS_REPORTING].process.bind(
-				this.automations[QUEUE_NAMES.METRICS_REPORTING],
-			),
-			workerOptions,
+			{
+				connection: redisConnection,
+				concurrency: 1,
+			},
 		);
 
 		// Agent Commands Worker
 		this.workers[QUEUE_NAMES.AGENT_COMMANDS] = new Worker(
 			QUEUE_NAMES.AGENT_COMMANDS,
 			async (job) => {
-				const { api_id, type } = job.data;
-				console.log(`Processing agent command: ${type} for ${api_id}`);
+				const { api_id, type, update_interval } = job.data || {};
+				console.log("[agent-commands] processing job", job.id, api_id, type);
 
-				// Send command via WebSocket based on type
-				if (type === "report_now") {
-					agentWs.pushReportNow(api_id);
-				} else if (type === "settings_update") {
-					// For settings update, we need additional data
-					const { update_interval } = job.data;
-					agentWs.pushSettingsUpdate(api_id, update_interval);
-				} else {
-					console.error(`Unknown agent command type: ${type}`);
+				// Log job attempt to history - use job.id as the unique identifier
+				const attemptNumber = job.attemptsMade || 1;
+				const historyId = job.id; // Single row per job, updated with each attempt
+
+				try {
+					if (!api_id || !type) {
+						throw new Error("invalid job data");
+					}
+
+					// Find host by api_id
+					const host = await prisma.hosts.findUnique({
+						where: { api_id },
+						select: { id: true },
+					});
+
+					// Ensure agent is connected; if not, retry later
+					if (!agentWs.isConnected(api_id)) {
+						const error = new Error("agent not connected");
+						// Log failed attempt
+						await prisma.job_history.upsert({
+							where: { id: historyId },
+							create: {
+								id: historyId,
+								job_id: job.id,
+								queue_name: QUEUE_NAMES.AGENT_COMMANDS,
+								job_name: type,
+								host_id: host?.id,
+								api_id,
+								status: "failed",
+								attempt_number: attemptNumber,
+								error_message: error.message,
+								created_at: new Date(),
+								updated_at: new Date(),
+							},
+							update: {
+								status: "failed",
+								attempt_number: attemptNumber,
+								error_message: error.message,
+								updated_at: new Date(),
+							},
+						});
+						console.log(
+							"[agent-commands] agent not connected, will retry",
+							api_id,
+						);
+						throw error;
+					}
+
+					// Process the command
+					let result;
+					if (type === "settings_update") {
+						agentWs.pushSettingsUpdate(api_id, update_interval);
+						console.log(
+							"[agent-commands] delivered settings_update",
+							api_id,
+							update_interval,
+						);
+						result = { delivered: true, update_interval };
+					} else if (type === "report_now") {
+						agentWs.pushReportNow(api_id);
+						console.log("[agent-commands] delivered report_now", api_id);
+						result = { delivered: true };
+					} else {
+						throw new Error("unsupported agent command");
+					}
+
+					// Log successful completion
+					await prisma.job_history.upsert({
+						where: { id: historyId },
+						create: {
+							id: historyId,
+							job_id: job.id,
+							queue_name: QUEUE_NAMES.AGENT_COMMANDS,
+							job_name: type,
+							host_id: host?.id,
+							api_id,
+							status: "completed",
+							attempt_number: attemptNumber,
+							output: result,
+							created_at: new Date(),
+							updated_at: new Date(),
+							completed_at: new Date(),
+						},
+						update: {
+							status: "completed",
+							attempt_number: attemptNumber,
+							output: result,
+							error_message: null,
+							updated_at: new Date(),
+							completed_at: new Date(),
+						},
+					});
+
+					return result;
+				} catch (error) {
+					// Log error to history (if not already logged above)
+					if (error.message !== "agent not connected") {
+						const host = await prisma.hosts
+							.findUnique({
+								where: { api_id },
+								select: { id: true },
+							})
+							.catch(() => null);
+
+						await prisma.job_history
+							.upsert({
+								where: { id: historyId },
+								create: {
+									id: historyId,
+									job_id: job.id,
+									queue_name: QUEUE_NAMES.AGENT_COMMANDS,
+									job_name: type || "unknown",
+									host_id: host?.id,
+									api_id,
+									status: "failed",
+									attempt_number: attemptNumber,
+									error_message: error.message,
+									created_at: new Date(),
+									updated_at: new Date(),
+								},
+								update: {
+									status: "failed",
+									attempt_number: attemptNumber,
+									error_message: error.message,
+									updated_at: new Date(),
+								},
+							})
+							.catch((err) =>
+								console.error("[agent-commands] failed to log error:", err),
+							);
+					}
+					throw error;
 				}
 			},
-			workerOptions,
+			{
+				connection: redisConnection,
+				concurrency: 10,
+			},
 		);
 
-		console.log(
-			"✅ All workers initialized with optimized connection settings",
-		);
+		// Add error handling for all workers
+		Object.values(this.workers).forEach((worker) => {
+			worker.on("error", (error) => {
+				console.error("Worker error:", error);
+			});
+		});
+
+		console.log("✅ All workers initialized");
 	}
 
 	/**
@@ -232,8 +334,6 @@ class QueueManager {
 		await this.automations[QUEUE_NAMES.SESSION_CLEANUP].schedule();
 		await this.automations[QUEUE_NAMES.ORPHANED_REPO_CLEANUP].schedule();
 		await this.automations[QUEUE_NAMES.ORPHANED_PACKAGE_CLEANUP].schedule();
-		await this.automations[QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP].schedule();
-		await this.automations[QUEUE_NAMES.METRICS_REPORTING].schedule();
 	}
 
 	/**
@@ -257,16 +357,6 @@ class QueueManager {
 		].triggerManual();
 	}
 
-	async triggerDockerInventoryCleanup() {
-		return this.automations[
-			QUEUE_NAMES.DOCKER_INVENTORY_CLEANUP
-		].triggerManual();
-	}
-
-	async triggerMetricsReporting() {
-		return this.automations[QUEUE_NAMES.METRICS_REPORTING].triggerManual();
-	}
-
 	/**
 	 * Get queue statistics
 	 */

backend/src/services/automation/metricsReporting.js

@@ -1,172 +0,0 @@
-const axios = require("axios");
-const { prisma } = require("./shared/prisma");
-const { updateSettings } = require("../../services/settingsService");
-
-const METRICS_API_URL =
-	process.env.METRICS_API_URL || "https://metrics.patchmon.cloud";
-
-/**
- * Metrics Reporting Automation
- * Sends anonymous usage metrics every 24 hours
- */
-class MetricsReporting {
-	constructor(queueManager) {
-		this.queueManager = queueManager;
-		this.queueName = "metrics-reporting";
-	}
-
-	/**
-	 * Process metrics reporting job
-	 */
-	async process(_job, silent = false) {
-		const startTime = Date.now();
-		if (!silent) console.log("📊 Starting metrics reporting...");
-
-		try {
-			// Fetch fresh settings directly from database (bypass cache)
-			const settings = await prisma.settings.findFirst({
-				orderBy: { updated_at: "desc" },
-			});
-
-			// Check if metrics are enabled
-			if (settings.metrics_enabled !== true) {
-				if (!silent) console.log("📊 Metrics reporting is disabled");
-				return { success: false, reason: "disabled" };
-			}
-
-			// Check if we have an anonymous ID
-			if (!settings.metrics_anonymous_id) {
-				if (!silent) console.log("📊 No anonymous ID found, skipping metrics");
-				return { success: false, reason: "no_id" };
-			}
-
-			// Get host count
-			const hostCount = await prisma.hosts.count();
-
-			// Get version
-			const packageJson = require("../../../package.json");
-			const version = packageJson.version;
-
-			// Prepare metrics data
-			const metricsData = {
-				anonymous_id: settings.metrics_anonymous_id,
-				host_count: hostCount,
-				version,
-			};
-
-			if (!silent)
-				console.log(
-					`📊 Sending metrics: ${hostCount} hosts, version ${version}`,
-				);
-
-			// Send to metrics API
-			try {
-				const response = await axios.post(
-					`${METRICS_API_URL}/metrics/submit`,
-					metricsData,
-					{
-						timeout: 10000,
-						headers: {
-							"Content-Type": "application/json",
-						},
-					},
-				);
-
-				// Update last sent timestamp
-				await updateSettings(settings.id, {
-					metrics_last_sent: new Date(),
-				});
-
-				const executionTime = Date.now() - startTime;
-				if (!silent)
-					console.log(
-						`✅ Metrics sent successfully in ${executionTime}ms:`,
-						response.data,
-					);
-
-				return {
-					success: true,
-					data: response.data,
-					hostCount,
-					version,
-					executionTime,
-				};
-			} catch (apiError) {
-				const executionTime = Date.now() - startTime;
-				if (!silent)
-					console.error(
-						`❌ Failed to send metrics to API after ${executionTime}ms:`,
-						apiError.message,
-					);
-				return {
-					success: false,
-					reason: "api_error",
-					error: apiError.message,
-					executionTime,
-				};
-			}
-		} catch (error) {
-			const executionTime = Date.now() - startTime;
-			if (!silent)
-				console.error(
-					`❌ Error in metrics reporting after ${executionTime}ms:`,
-					error.message,
-				);
-			// Don't throw on silent mode, just return failure
-			if (silent) {
-				return {
-					success: false,
-					reason: "error",
-					error: error.message,
-					executionTime,
-				};
-			}
-			throw error;
-		}
-	}
-
-	/**
-	 * Schedule recurring metrics reporting (daily at 2 AM)
-	 */
-	async schedule() {
-		const job = await this.queueManager.queues[this.queueName].add(
-			"metrics-reporting",
-			{},
-			{
-				repeat: { cron: "0 2 * * *" }, // Daily at 2 AM
-				jobId: "metrics-reporting-recurring",
-			},
-		);
-		console.log("✅ Metrics reporting scheduled (daily at 2 AM)");
-		return job;
-	}
-
-	/**
-	 * Trigger manual metrics reporting
-	 */
-	async triggerManual() {
-		const job = await this.queueManager.queues[this.queueName].add(
-			"metrics-reporting-manual",
-			{},
-			{ priority: 1 },
-		);
-		console.log("✅ Manual metrics reporting triggered");
-		return job;
-	}
-
-	/**
-	 * Send metrics immediately (silent mode)
-	 * Used for automatic sending on server startup
-	 */
-	async sendSilent() {
-		try {
-			const result = await this.process({ name: "startup-silent" }, true);
-			return result;
-		} catch (error) {
-			// Silent failure on startup
-			return { success: false, reason: "error", error: error.message };
-		}
-	}
-}
-
-module.exports = MetricsReporting;

backend/src/services/automation/shared/prisma.js

@@ -1,5 +1,5 @@
-const { getPrismaClient } = require("../../../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 module.exports = { prisma };

backend/src/services/automation/shared/redis.js

@@ -1,56 +1,16 @@
 const IORedis = require("ioredis");
 
-// Redis connection configuration with connection pooling
+// Redis connection configuration
 const redisConnection = {
 	host: process.env.REDIS_HOST || "localhost",
 	port: parseInt(process.env.REDIS_PORT, 10) || 6379,
 	password: process.env.REDIS_PASSWORD || undefined,
-	username: process.env.REDIS_USER || undefined,
 	db: parseInt(process.env.REDIS_DB, 10) || 0,
-	// Connection pooling settings
-	lazyConnect: true,
-	keepAlive: 30000,
-	connectTimeout: 30000, // Increased from 10s to 30s
-	commandTimeout: 30000, // Increased from 5s to 30s
-	enableReadyCheck: false,
-	// Reduce connection churn
-	family: 4, // Force IPv4
-	// Retry settings
-	retryDelayOnClusterDown: 300,
 	retryDelayOnFailover: 100,
 	maxRetriesPerRequest: null, // BullMQ requires this to be null
-	// Connection pool settings
-	maxLoadingTimeout: 30000,
 };
 
-// Create Redis connection with singleton pattern
-let redisInstance = null;
+// Create Redis connection
+const redis = new IORedis(redisConnection);
 
-function getRedisConnection() {
-	if (!redisInstance) {
-		redisInstance = new IORedis(redisConnection);
-
-		// Handle graceful shutdown
-		process.on("beforeExit", async () => {
-			await redisInstance.quit();
-		});
-
-		process.on("SIGINT", async () => {
-			await redisInstance.quit();
-			process.exit(0);
-		});
-
-		process.on("SIGTERM", async () => {
-			await redisInstance.quit();
-			process.exit(0);
-		});
-	}
-
-	return redisInstance;
-}
-
-module.exports = {
-	redis: getRedisConnection(),
-	redisConnection,
-	getRedisConnection,
-};
+module.exports = { redis, redisConnection };

backend/src/services/automation/shared/utils.js

@@ -33,8 +33,7 @@ async function checkPublicRepo(owner, repo) {
 	try {
 		const httpsRepoUrl = `https://api.github.com/repos/${owner}/${repo}/releases/latest`;
 
-		// Get current version for User-Agent (or use generic if unavailable)
-		let currentVersion = "unknown";
+		let currentVersion = "1.2.7"; // fallback
 		try {
 			const packageJson = require("../../../package.json");
 			if (packageJson?.version) {
@@ -42,7 +41,7 @@ async function checkPublicRepo(owner, repo) {
 			}
 		} catch (packageError) {
 			console.warn(
-				"Could not read version from package.json for User-Agent:",
+				"Could not read version from package.json for User-Agent, using fallback:",
 				packageError.message,
 			);
 		}

backend/src/services/settingsService.js

@@ -1,7 +1,7 @@
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 const { v4: uuidv4 } = require("uuid");
 
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 // Cached settings instance
 let cachedSettings = null;

backend/src/utils/session_manager.js

@@ -1,8 +1,8 @@
 const jwt = require("jsonwebtoken");
 const crypto = require("node:crypto");
-const { getPrismaClient } = require("../config/prisma");
+const { PrismaClient } = require("@prisma/client");
 
-const prisma = getPrismaClient();
+const prisma = new PrismaClient();
 
 /**
  * Session Manager - Handles secure session management with inactivity timeout

biome.json

@@ -1,13 +1,10 @@
 {
-	"$schema": "https://biomejs.dev/schemas/2.3.0/schema.json",
+	"$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
 	"vcs": {
 		"enabled": true,
 		"clientKind": "git",
 		"useIgnoreFile": true
 	},
-	"files": {
-		"includes": ["**", "!**/*.css"]
-	},
 	"formatter": {
 		"enabled": true
 	},

docker/README.md

@@ -39,15 +39,15 @@ These tags are available for both backend and frontend images as they are versio
    environment:
      DATABASE_URL: postgresql://patchmon_user:REPLACE_YOUR_POSTGRES_PASSWORD_HERE@database:5432/patchmon_db
    ```
-4. Set a Redis password in the Redis service command where it says:
+4. Set a Redis password in the Redis service where it says:
    ```yaml
-   command: redis-server --requirepass your-redis-password-here
+   environment:
+     REDIS_PASSWORD: # CREATE A STRONG REDIS PASSWORD AND PUT IT HERE
    ```
-   Note: The Redis service uses a hardcoded password in the command line for better reliability and to avoid environment variable parsing issues.
 5. Update the corresponding `REDIS_PASSWORD` in the backend service where it says:
    ```yaml
    environment:
-     REDIS_PASSWORD: your-redis-password-here
+     REDIS_PASSWORD: REPLACE_YOUR_REDIS_PASSWORD_HERE
    ```
 6. Generate a strong JWT secret. You can do this like so:
    ```bash
@@ -123,9 +123,6 @@ When you do this, updating to a new version requires manually updating the image
 | -------------- | ------------------ | ---------------- |
 | `REDIS_PASSWORD` | Redis password    | **MUST BE SET!** |
 
-> [!NOTE]
-> The Redis service uses a hardcoded password in the command line (`redis-server --requirepass your-password`) instead of environment variables or configuration files. This approach eliminates parsing issues and provides better reliability. The password must be set in both the Redis command and the backend service environment variables.
-
 #### Backend Service
 
 ##### Database Configuration
@@ -136,24 +133,6 @@ When you do this, updating to a new version requires manually updating the image
 | `PM_DB_CONN_MAX_ATTEMPTS`  | Maximum database connection attempts                 | `30`                                             |
 | `PM_DB_CONN_WAIT_INTERVAL` | Wait interval between connection attempts in seconds | `2`                                              |
 
-##### Database Connection Pool Configuration (Prisma)
-
-| Variable              | Description                                                | Default |
-| --------------------- | ---------------------------------------------------------- | ------- |
-| `DB_CONNECTION_LIMIT` | Maximum number of database connections per instance        | `30`    |
-| `DB_POOL_TIMEOUT`     | Seconds to wait for an available connection before timeout | `20`    |
-| `DB_CONNECT_TIMEOUT`  | Seconds to wait for initial database connection            | `10`    |
-| `DB_IDLE_TIMEOUT`     | Seconds before closing idle connections                    | `300`   |
-| `DB_MAX_LIFETIME`     | Maximum lifetime of a connection in seconds                | `1800`  |
-
-> [!TIP]
-> The connection pool limit should be adjusted based on your deployment size:
-> - **Small deployment (1-10 hosts)**: `DB_CONNECTION_LIMIT=15` is sufficient
-> - **Medium deployment (10-50 hosts)**: `DB_CONNECTION_LIMIT=30` (default)
-> - **Large deployment (50+ hosts)**: `DB_CONNECTION_LIMIT=50` or higher
-> 
-> Each connection pool serves one backend instance. If you have concurrent operations (multiple users, background jobs, agent checkins), increase the pool size accordingly.
-
 ##### Redis Configuration
 
 | Variable        | Description                    | Default |

docker/backend.Dockerfile

@@ -8,7 +8,7 @@ ENV NODE_ENV=development \
     PM_LOG_TO_CONSOLE=true \
     PORT=3001
 
-RUN apk add --no-cache openssl tini curl libc6-compat
+RUN apk add --no-cache openssl tini curl
 
 USER node
 
@@ -46,10 +46,8 @@ COPY --chown=node:node backend/ ./backend/
 
 WORKDIR /app/backend
 
-RUN npm cache clean --force &&\
-    rm -rf node_modules ~/.npm /root/.npm &&\
-    npm ci --ignore-scripts --legacy-peer-deps --no-audit --prefer-online --fetch-retries=0 &&\
-    PRISMA_CLI_BINARY_TYPE=binary npm run db:generate &&\
+RUN npm ci --ignore-scripts &&\
+    npx prisma generate &&\
     npm prune --omit=dev &&\
     npm cache clean --force
 
@@ -66,7 +64,7 @@ ENV NODE_ENV=production \
     JWT_REFRESH_EXPIRES_IN=7d \
     SESSION_INACTIVITY_TIMEOUT_MINUTES=30
 
-RUN apk add --no-cache openssl tini curl libc6-compat
+RUN apk add --no-cache openssl tini curl
 
 USER node
 

docker/backend.Dockerfile.dockerignore

@@ -1,3 +1 @@
 **/env.example
-**/.env
-**/.env.*

docker/backend.docker-entrypoint.sh

@@ -8,7 +8,7 @@ log() {
     echo "[$(date +'%Y-%m-%d %H:%M:%S')] $*" >&2
 }
 
-# Function to extract version from agent script (legacy)
+# Function to extract version from agent script
 get_agent_version() {
     local file="$1"
     if [ -f "$file" ]; then
@@ -18,32 +18,6 @@ get_agent_version() {
     fi
 }
 
-# Function to get version from binary using --help flag
-get_binary_version() {
-    local binary="$1"
-    if [ -f "$binary" ]; then
-        # Make sure binary is executable
-        chmod +x "$binary" 2>/dev/null || true
-        
-        # Try to execute the binary and extract version from help output
-        # The Go binary shows version in the --help output as "PatchMon Agent v1.3.0"
-        local version=$("$binary" --help 2>&1 | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | head -n 1 | tr -d 'v')
-        if [ -n "$version" ]; then
-            echo "$version"
-        else
-            # Fallback: try --version flag
-            version=$("$binary" --version 2>&1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -n 1)
-            if [ -n "$version" ]; then
-                echo "$version"
-            else
-                echo "0.0.0"
-            fi
-        fi
-    else
-        echo "0.0.0"
-    fi
-}
-
 # Function to compare versions (returns 0 if $1 > $2)
 version_greater() {
     # Use sort -V for version comparison
@@ -54,8 +28,6 @@ version_greater() {
 update_agents() {
     local backup_agent="/app/agents_backup/patchmon-agent.sh"
     local current_agent="/app/agents/patchmon-agent.sh"
-    local backup_binary="/app/agents_backup/patchmon-agent-linux-amd64"
-    local current_binary="/app/agents/patchmon-agent-linux-amd64"
     
     # Check if agents directory exists
     if [ ! -d "/app/agents" ]; then
@@ -69,72 +41,51 @@ update_agents() {
         return 0
     fi
     
-    # Get versions from both script and binary
-    local backup_script_version=$(get_agent_version "$backup_agent")
-    local current_script_version=$(get_agent_version "$current_agent")
-    local backup_binary_version=$(get_binary_version "$backup_binary")
-    local current_binary_version=$(get_binary_version "$current_binary")
+    # Get versions
+    local backup_version=$(get_agent_version "$backup_agent")
+    local current_version=$(get_agent_version "$current_agent")
     
     log "Agent version check:"
-    log "  Image script version: ${backup_script_version}"
-    log "  Volume script version: ${current_script_version}"
-    log "  Image binary version: ${backup_binary_version}"
-    log "  Volume binary version: ${current_binary_version}"
+    log "  Image version: ${backup_version}"
+    log "  Volume version: ${current_version}"
     
     # Determine if update is needed
     local needs_update=0
     
-    # Case 1: No agents in volume at all (first time setup)
-    if [ -z "$(find /app/agents -maxdepth 1 -type f 2>/dev/null | head -n 1)" ]; then
+    # Case 1: No agents in volume (first time setup)
+    if [ -z "$(find /app/agents -maxdepth 1 -type f -name '*.sh' 2>/dev/null | head -n 1)" ]; then
         log "Agents directory is empty - performing initial copy"
         needs_update=1
-    # Case 2: Binary exists but backup binary is newer
-    elif [ "$current_binary_version" != "0.0.0" ] && version_greater "$backup_binary_version" "$current_binary_version"; then
-        log "Newer agent binary available (${backup_binary_version} > ${current_binary_version})"
-        needs_update=1
-    # Case 3: No binary in volume, but shell scripts exist (legacy setup) - copy binaries
-    elif [ "$current_binary_version" = "0.0.0" ] && [ "$backup_binary_version" != "0.0.0" ]; then
-        log "No binary found in volume but backup has binaries - performing update"
+    # Case 2: Backup version is newer
+    elif version_greater "$backup_version" "$current_version"; then
+        log "Newer agent version available (${backup_version} > ${current_version})"
         needs_update=1
     else
-        log "Agents are up to date (binary: ${current_binary_version})"
+        log "Agents are up to date"
         needs_update=0
     fi
     
     # Perform update if needed
     if [ $needs_update -eq 1 ]; then
-        log "Updating agents to version ${backup_binary_version}..."
+        log "Updating agents to version ${backup_version}..."
         
         # Create backup of existing agents if they exist
-        if [ -f "$current_agent" ] || [ -f "$current_binary" ]; then
+        if [ -f "$current_agent" ]; then
             local backup_timestamp=$(date +%Y%m%d_%H%M%S)
-            mkdir -p "/app/agents/backups"
-            
-            # Backup shell script if it exists
-            if [ -f "$current_agent" ]; then
-                cp "$current_agent" "/app/agents/backups/patchmon-agent.sh.${backup_timestamp}" 2>/dev/null || true
-                log "Previous script backed up"
-            fi
-            
-            # Backup binary if it exists
-            if [ -f "$current_binary" ]; then
-                cp "$current_binary" "/app/agents/backups/patchmon-agent-linux-amd64.${backup_timestamp}" 2>/dev/null || true
-                log "Previous binary backed up"
-            fi
+            local backup_name="/app/agents/patchmon-agent.sh.backup.${backup_timestamp}"
+            cp "$current_agent" "$backup_name" 2>/dev/null || true
+            log "Previous agent backed up to: $(basename $backup_name)"
         fi
         
-        # Copy new agents (both scripts and binaries)
+        # Copy new agents
         cp -r /app/agents_backup/* /app/agents/
         
-        # Make agent binaries executable
-        chmod +x /app/agents/patchmon-agent-linux-* 2>/dev/null || true
-        
         # Verify update
-        local new_binary_version=$(get_binary_version "$current_binary")
-        if [ "$new_binary_version" = "$backup_binary_version" ]; then
-            log "✅ Agents successfully updated to version ${new_binary_version}"
+        local new_version=$(get_agent_version "$current_agent")
+        if [ "$new_version" = "$backup_version" ]; then
+            log "✅ Agents successfully updated to version ${new_version}"
         else
-            log "⚠️ Warning: Agent update may have failed (expected: ${backup_binary_version}, got: ${new_binary_version})"
+            log "⚠️ Warning: Agent update may have failed (expected: ${backup_version}, got: ${new_version})"
         fi
     fi
 }

docker/docker-compose.dev.yml

@@ -50,19 +50,6 @@ services:
       SERVER_HOST: localhost
       SERVER_PORT: 3000
       CORS_ORIGIN: http://localhost:3000
-      # Database Connection Pool Configuration (Prisma)
-      DB_CONNECTION_LIMIT: 30
-      DB_POOL_TIMEOUT: 20
-      DB_CONNECT_TIMEOUT: 10
-      DB_IDLE_TIMEOUT: 300
-      DB_MAX_LIFETIME: 1800
-      # Rate Limiting (times in milliseconds)
-      RATE_LIMIT_WINDOW_MS: 900000
-      RATE_LIMIT_MAX: 5000
-      AUTH_RATE_LIMIT_WINDOW_MS: 600000
-      AUTH_RATE_LIMIT_MAX: 500
-      AGENT_RATE_LIMIT_WINDOW_MS: 60000
-      AGENT_RATE_LIMIT_MAX: 1000
       # Redis Configuration
       REDIS_HOST: redis
       REDIS_PORT: 6379

docker/docker-compose.yml

@@ -1,19 +1,3 @@
-# Change 3 Passwords in this file:
-# Generate passwords with 'openssl rand -hex 64'
-# 
-# 1. The database password in the environment variable POSTGRES_PASSWORD
-# 2. The redis password in the command redis-server --requirepass your-redis-password-here
-# 3. The jwt secret in the environment variable JWT_SECRET
-#
-#
-# Change 2 URL areas in this file:
-# 1. Setup your CORS_ORIGIN to what url you will use for accessing PatchMon frontend url
-# 2. Setup your SERVER_PROTOCOL, SERVER_HOST and SERVER_PORT to what you will use for linux agents to access PatchMon
-#
-# This is generally the same as your CORS_ORIGIN url , in some cases it might be different - SERVER_* variables are used in the scripts for Server connection.
-# You can also change this in the front-end but in the case of docker-compose - it is overwritten by the variables set here.
-
-
 name: patchmon
 
 services:
@@ -23,7 +7,7 @@ services:
     environment:
       POSTGRES_DB: patchmon_db
       POSTGRES_USER: patchmon_user
-      POSTGRES_PASSWORD: # CREATE A STRONG DB PASSWORD AND PUT IT HERE
+      POSTGRES_PASSWORD: # CREATE A STRONG PASSWORD AND PUT IT HERE
     volumes:
       - postgres_data:/var/lib/postgresql/data
     healthcheck:
@@ -35,11 +19,14 @@ services:
   redis:
     image: redis:7-alpine
     restart: unless-stopped
-    command: redis-server --requirepass your-redis-password-here # CHANGE THIS TO YOUR REDIS PASSWORD
+    command: redis-server /usr/local/etc/redis/redis.conf
+    environment:
+      REDIS_PASSWORD: # CREATE A STRONG REDIS PASSWORD AND PUT IT HERE
     volumes:
       - redis_data:/data
+      - ./docker/redis.conf:/usr/local/etc/redis/redis.conf:ro
     healthcheck:
-      test: ["CMD", "redis-cli", "--no-auth-warning", "-a", "your-redis-password-here", "ping"] # CHANGE THIS TO YOUR REDIS PASSWORD
+      test: ["CMD", "redis-cli", "--no-auth-warning", "-a", "${REDIS_PASSWORD}", "ping"]
       interval: 3s
       timeout: 5s
       retries: 7
@@ -51,28 +38,15 @@ services:
     environment:
       LOG_LEVEL: info
       DATABASE_URL: postgresql://patchmon_user:REPLACE_YOUR_POSTGRES_PASSWORD_HERE@database:5432/patchmon_db
-      JWT_SECRET: # CREATE A STRONG SECRET AND PUT IT HERE
+      JWT_SECRET: # CREATE A STRONG SECRET AND PUT IT HERE - Generate with 'openssl rand -hex 64'
       SERVER_PROTOCOL: http
       SERVER_HOST: localhost
       SERVER_PORT: 3000
       CORS_ORIGIN: http://localhost:3000
-      # Database Connection Pool Configuration (Prisma)
-      DB_CONNECTION_LIMIT: 30
-      DB_POOL_TIMEOUT: 20
-      DB_CONNECT_TIMEOUT: 10
-      DB_IDLE_TIMEOUT: 300
-      DB_MAX_LIFETIME: 1800
-      # Rate Limiting (times in milliseconds)
-      RATE_LIMIT_WINDOW_MS: 900000
-      RATE_LIMIT_MAX: 5000
-      AUTH_RATE_LIMIT_WINDOW_MS: 600000
-      AUTH_RATE_LIMIT_MAX: 500
-      AGENT_RATE_LIMIT_WINDOW_MS: 60000
-      AGENT_RATE_LIMIT_MAX: 1000
       # Redis Configuration
       REDIS_HOST: redis
       REDIS_PORT: 6379
-      REDIS_PASSWORD: your-redis-password-here
+      REDIS_PASSWORD: REPLACE_YOUR_REDIS_PASSWORD_HERE
       REDIS_DB: 0
     volumes:
       - agent_files:/app/agents

docker/frontend.Dockerfile

@@ -17,17 +17,16 @@ CMD ["npm", "run", "dev", "--", "--host", "0.0.0.0", "--port", "3000"]
 # Builder stage for production
 FROM node:lts-alpine AS builder
 
-WORKDIR /app/frontend
+WORKDIR /app
 
-COPY frontend/package*.json ./
+COPY package*.json ./
+COPY frontend/package*.json ./frontend/
 
-RUN npm cache clean --force &&\
-    rm -rf node_modules ~/.npm /root/.npm &&\
-    npm install --ignore-scripts --legacy-peer-deps --no-audit --prefer-online --fetch-retries=0
+RUN npm ci --ignore-scripts
 
-COPY frontend/ ./
+COPY frontend/ ./frontend/
 
-RUN npm run build
+RUN npm run build:frontend
 
 # Production stage
 FROM nginxinc/nginx-unprivileged:alpine

docker/nginx.conf.template

@@ -24,38 +24,6 @@ server {
     add_header X-XSS-Protection "1; mode=block" always;
     add_header Referrer-Policy "strict-origin-when-cross-origin" always;
 
-    # Bull Board proxy - must come before the root location to avoid conflicts
-    location /bullboard {
-        proxy_pass http://${BACKEND_HOST}:${BACKEND_PORT};
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header Cookie $http_cookie;  # Forward cookies to backend
-        proxy_cache_bypass $http_upgrade;
-        proxy_read_timeout 300s;
-        proxy_connect_timeout 75s;
-        
-        # Enable cookie passthrough in both directions
-        proxy_pass_header Set-Cookie;
-        proxy_cookie_path / /;
-
-        # Preserve original client IP through proxy chain
-        proxy_set_header X-Original-Forwarded-For $http_x_forwarded_for;
-
-        # CORS headers for Bull Board - let backend handle CORS properly
-        # Note: Backend handles CORS with proper origin validation and credentials
-
-        # Handle preflight requests
-        if ($request_method = 'OPTIONS') {
-            return 204;
-        }
-    }
-
     # Handle client-side routing
     location / {
         try_files $uri $uri/ /index.html;
@@ -70,19 +38,13 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-Host $host;
 
-	# For the Websocket connection:
-	proxy_http_version 1.1;
-	proxy_set_header Upgrade $http_upgrade;
-	proxy_set_header Connection 'upgrade';
-	proxy_cache_bypass $http_upgrade;
-	proxy_read_timeout 300s;
-	proxy_connect_timeout 75s;
-
         # Preserve original client IP through proxy chain
         proxy_set_header X-Original-Forwarded-For $http_x_forwarded_for;
 
-        # CORS headers for API calls - let backend handle CORS properly
-        # Note: Backend handles CORS with proper origin validation and credentials
+        # CORS headers for API calls
+        add_header Access-Control-Allow-Origin * always;
+        add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" always;
+        add_header Access-Control-Allow-Headers "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization" always;
 
         # Handle preflight requests
         if ($request_method = 'OPTIONS') {
@@ -90,9 +52,66 @@ server {
         }
     }
 
+    # SSE (Server-Sent Events) specific configuration
+    location /api/v1/ws/status/ {
+        proxy_pass http://${BACKEND_HOST}:${BACKEND_PORT};
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $host;
 
-    # Static assets caching (exclude Bull Board assets)
-    location ~* ^/(?!bullboard).*\.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
+        # Critical SSE settings
+        proxy_buffering off;
+        proxy_cache off;
+        proxy_set_header Connection '';
+        proxy_http_version 1.1;
+        chunked_transfer_encoding off;
+
+        # Timeout settings for long-lived connections
+        proxy_read_timeout 24h;
+        proxy_send_timeout 24h;
+        proxy_connect_timeout 60s;
+
+        # Disable nginx buffering for real-time streaming
+        proxy_request_buffering off;
+        proxy_max_temp_file_size 0;
+
+        # CORS headers for SSE
+        add_header Access-Control-Allow-Origin * always;
+        add_header Access-Control-Allow-Methods "GET, OPTIONS" always;
+        add_header Access-Control-Allow-Headers "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization" always;
+
+        # Handle preflight requests
+        if ($request_method = 'OPTIONS') {
+            return 204;
+        }
+    }
+
+    # WebSocket upgrade handling
+    location /api/v1/agents/ws {
+        proxy_pass http://${BACKEND_HOST}:${BACKEND_PORT};
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $host;
+
+        # WebSocket timeout settings
+        proxy_read_timeout 24h;
+        proxy_send_timeout 24h;
+        proxy_connect_timeout 60s;
+
+        # Disable buffering for WebSocket
+        proxy_buffering off;
+        proxy_cache off;
+    }
+
+    # Static assets caching
+    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
         expires 1y;
         add_header Cache-Control "public, immutable";
     }

docker/redis.conf

@@ -0,0 +1,35 @@
+# Redis Configuration for PatchMon Production
+# Security settings
+requirepass ${REDIS_PASSWORD}
+rename-command FLUSHDB ""
+rename-command FLUSHALL ""
+rename-command DEBUG ""
+rename-command CONFIG "CONFIG_${REDIS_PASSWORD}"
+
+# Memory management
+maxmemory 256mb
+maxmemory-policy allkeys-lru
+
+# Persistence settings
+save 900 1
+save 300 10
+save 60 10000
+
+# Logging
+loglevel notice
+logfile ""
+
+# Network security
+bind 127.0.0.1
+protected-mode yes
+
+# Performance tuning
+tcp-keepalive 300
+timeout 0
+
+# Disable dangerous commands
+rename-command SHUTDOWN "SHUTDOWN_${REDIS_PASSWORD}"
+rename-command KEYS ""
+rename-command MONITOR ""
+rename-command SLAVEOF ""
+rename-command REPLICAOF ""

frontend/env.example

@@ -1,10 +0,0 @@
-# Frontend Environment Configuration
-# This file is used by Vite during build and runtime
-
-# API URL - Update this to match your backend server
-VITE_API_URL=http://localhost:3001/api/v1
-
-# Application Metadata
-VITE_APP_NAME=PatchMon
-VITE_APP_VERSION=1.3.1
-

frontend/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "patchmon-frontend",
 	"private": true,
-	"version": "1.3.1",
+	"version": "1.2.9",
 	"license": "AGPL-3.0",
 	"type": "module",
 	"scripts": {
@@ -20,20 +20,19 @@
 		"clsx": "^2.1.1",
 		"cors": "^2.8.5",
 		"date-fns": "^4.1.0",
-		"express": "^4.21.2",
+		"express": "^5.0.0",
 		"http-proxy-middleware": "^3.0.3",
 		"lucide-react": "^0.468.0",
 		"react": "^18.3.1",
 		"react-chartjs-2": "^5.2.0",
 		"react-dom": "^18.3.1",
 		"react-icons": "^5.5.0",
-		"react-router-dom": "^6.30.1",
-		"trianglify": "^4.1.1"
+		"react-router-dom": "^6.30.1"
 	},
 	"devDependencies": {
 		"@types/react": "^18.3.14",
 		"@types/react-dom": "^18.3.1",
-		"@vitejs/plugin-react": "^5.0.0",
+		"@vitejs/plugin-react": "^4.3.4",
 		"autoprefixer": "^10.4.20",
 		"postcss": "^8.5.6",
 		"tailwindcss": "^3.4.17",

frontend/src/App.jsx

@@ -7,7 +7,6 @@ import ProtectedRoute from "./components/ProtectedRoute";
 import SettingsLayout from "./components/SettingsLayout";
 import { isAuthPhase } from "./constants/authPhases";
 import { AuthProvider, useAuth } from "./contexts/AuthContext";
-import { ColorThemeProvider } from "./contexts/ColorThemeContext";
 import { ThemeProvider } from "./contexts/ThemeContext";
 import { UpdateNotificationProvider } from "./contexts/UpdateNotificationContext";
 
@@ -42,7 +41,6 @@ const SettingsServerConfig = lazy(
 	() => import("./pages/settings/SettingsServerConfig"),
 );
 const SettingsUsers = lazy(() => import("./pages/settings/SettingsUsers"));
-const SettingsMetrics = lazy(() => import("./pages/settings/SettingsMetrics"));
 
 // Loading fallback component
 const LoadingFallback = () => (
@@ -390,16 +388,6 @@ function AppRoutes() {
 						</ProtectedRoute>
 					}
 				/>
-				<Route
-					path="/settings/metrics"
-					element={
-						<ProtectedRoute requirePermission="can_manage_settings">
-							<Layout>
-								<SettingsMetrics />
-							</Layout>
-						</ProtectedRoute>
-					}
-				/>
 				<Route
 					path="/options"
 					element={
@@ -428,15 +416,13 @@ function AppRoutes() {
 function App() {
 	return (
 		<ThemeProvider>
-			<ColorThemeProvider>
-				<AuthProvider>
-					<UpdateNotificationProvider>
-						<LogoProvider>
-							<AppRoutes />
-						</LogoProvider>
-					</UpdateNotificationProvider>
-				</AuthProvider>
-			</ColorThemeProvider>
+			<AuthProvider>
+				<UpdateNotificationProvider>
+					<LogoProvider>
+						<AppRoutes />
+					</LogoProvider>
+				</UpdateNotificationProvider>
+			</AuthProvider>
 		</ThemeProvider>
 	);
 }

frontend/src/components/FirstTimeAdminSetup.jsx

@@ -2,7 +2,6 @@ import { AlertCircle, CheckCircle, Shield, UserPlus } from "lucide-react";
 import { useId, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { useAuth } from "../contexts/AuthContext";
-import { isCorsError } from "../utils/api";
 
 const FirstTimeAdminSetup = () => {
 	const { login, setAuthState } = useAuth();
@@ -122,39 +121,11 @@ const FirstTimeAdminSetup = () => {
 					}, 2000);
 				}
 			} else {
-				// Handle HTTP error responses (like 500 CORS errors)
-				console.log("HTTP error response:", response.status, data);
-
-				// Check if this is a CORS error based on the response data
-				if (
-					data.message?.includes("Not allowed by CORS") ||
-					data.message?.includes("CORS") ||
-					data.error?.includes("CORS")
-				) {
-					setError(
-						"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-					);
-				} else {
-					setError(data.error || "Failed to create admin user");
-				}
+				setError(data.error || "Failed to create admin user");
 			}
 		} catch (error) {
 			console.error("Setup error:", error);
-			// Check for CORS/network errors first
-			if (isCorsError(error)) {
-				setError(
-					"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-				);
-			} else if (
-				error.name === "TypeError" &&
-				error.message?.includes("Failed to fetch")
-			) {
-				setError(
-					"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-				);
-			} else {
-				setError("Network error. Please try again.");
-			}
+			setError("Network error. Please try again.");
 		} finally {
 			setIsLoading(false);
 		}

frontend/src/components/Layout.jsx

@@ -26,11 +26,9 @@ import {
 	Zap,
 } from "lucide-react";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { FaReddit, FaYoutube } from "react-icons/fa";
+import { FaYoutube } from "react-icons/fa";
 import { Link, useLocation, useNavigate } from "react-router-dom";
-import trianglify from "trianglify";
 import { useAuth } from "../contexts/AuthContext";
-import { useColorTheme } from "../contexts/ColorThemeContext";
 import { useUpdateNotification } from "../contexts/UpdateNotificationContext";
 import { dashboardAPI, versionAPI } from "../utils/api";
 import DiscordIcon from "./DiscordIcon";
@@ -63,9 +61,7 @@ const Layout = ({ children }) => {
 		canManageSettings,
 	} = useAuth();
 	const { updateAvailable } = useUpdateNotification();
-	const { themeConfig } = useColorTheme();
 	const userMenuRef = useRef(null);
-	const bgCanvasRef = useRef(null);
 
 	// Fetch dashboard stats for the "Last updated" info
 	const {
@@ -121,7 +117,7 @@ const Layout = ({ children }) => {
 				name: "Automation",
 				href: "/automation",
 				icon: RefreshCw,
-				new: true,
+				beta: true,
 			});
 
 			if (canViewReports()) {
@@ -237,103 +233,27 @@ const Layout = ({ children }) => {
 		navigate("/hosts?action=add");
 	};
 
-	// Generate Trianglify background for dark mode
-	useEffect(() => {
-		const generateBackground = () => {
-			if (
-				bgCanvasRef.current &&
-				themeConfig?.login &&
-				document.documentElement.classList.contains("dark")
-			) {
-				// Get current date as seed for daily variation
-				const today = new Date();
-				const dateSeed = `${today.getFullYear()}-${today.getMonth()}-${today.getDate()}`;
-
-				// Generate pattern with selected theme configuration
-				const pattern = trianglify({
-					width: window.innerWidth,
-					height: window.innerHeight,
-					cellSize: themeConfig.login.cellSize,
-					variance: themeConfig.login.variance,
-					seed: dateSeed,
-					xColors: themeConfig.login.xColors,
-					yColors: themeConfig.login.yColors,
-				});
-
-				// Render to canvas
-				pattern.toCanvas(bgCanvasRef.current);
-			}
-		};
-
-		generateBackground();
-
-		// Regenerate on window resize or theme change
-		const handleResize = () => {
-			generateBackground();
-		};
-
-		window.addEventListener("resize", handleResize);
-
-		// Watch for dark mode changes
-		const observer = new MutationObserver((mutations) => {
-			mutations.forEach((mutation) => {
-				if (mutation.attributeName === "class") {
-					generateBackground();
-				}
-			});
-		});
-
-		observer.observe(document.documentElement, {
-			attributes: true,
-			attributeFilter: ["class"],
-		});
-
-		return () => {
-			window.removeEventListener("resize", handleResize);
-			observer.disconnect();
-		};
-	}, [themeConfig]);
-
 	// Fetch GitHub stars count
 	const fetchGitHubStars = useCallback(async () => {
-		// Try to load cached star count first
-		const cachedStars = localStorage.getItem("githubStarsCount");
-		if (cachedStars) {
-			setGithubStars(parseInt(cachedStars, 10));
-		}
-
-		// Skip API call if fetched recently
+		// Skip if already fetched recently
 		const lastFetch = localStorage.getItem("githubStarsFetchTime");
 		const now = Date.now();
-		if (lastFetch && now - parseInt(lastFetch, 10) < 600000) {
-			// 10 minute cache
+		if (lastFetch && now - parseInt(lastFetch, 15) < 600000) {
+			// 15 minute cache
 			return;
 		}
 
 		try {
 			const response = await fetch(
 				"https://api.github.com/repos/9technologygroup/patchmon.net",
-				{
-					headers: {
-						Accept: "application/vnd.github.v3+json",
-					},
-				},
 			);
-
 			if (response.ok) {
 				const data = await response.json();
 				setGithubStars(data.stargazers_count);
-				localStorage.setItem(
-					"githubStarsCount",
-					data.stargazers_count.toString(),
-				);
 				localStorage.setItem("githubStarsFetchTime", now.toString());
-			} else if (response.status === 403 || response.status === 429) {
-				console.warn("GitHub API rate limit exceeded, using cached value");
 			}
 		} catch (error) {
 			console.error("Failed to fetch GitHub stars:", error);
-			// Keep using cached value if available
 		}
 	}, []);
 
@@ -383,76 +303,11 @@ const Layout = ({ children }) => {
 		fetchGitHubStars();
 	}, [fetchGitHubStars]);
 
-	// Set CSS custom properties for glassmorphism and theme colors in dark mode
-	useEffect(() => {
-		const updateThemeStyles = () => {
-			const isDark = document.documentElement.classList.contains("dark");
-			const root = document.documentElement;
-
-			if (isDark && themeConfig?.app) {
-				// Glass navigation bars - very light for pattern visibility
-				root.style.setProperty("--sidebar-bg", "rgba(0, 0, 0, 0.15)");
-				root.style.setProperty("--sidebar-blur", "blur(12px)");
-				root.style.setProperty("--topbar-bg", "rgba(0, 0, 0, 0.15)");
-				root.style.setProperty("--topbar-blur", "blur(12px)");
-				root.style.setProperty("--button-bg", "rgba(255, 255, 255, 0.15)");
-				root.style.setProperty("--button-blur", "blur(8px)");
-
-				// Theme-colored cards and buttons - darker to stand out
-				root.style.setProperty("--card-bg", themeConfig.app.cardBg);
-				root.style.setProperty("--card-border", themeConfig.app.cardBorder);
-				root.style.setProperty("--card-bg-hover", themeConfig.app.bgTertiary);
-				root.style.setProperty("--theme-button-bg", themeConfig.app.buttonBg);
-				root.style.setProperty(
-					"--theme-button-hover",
-					themeConfig.app.buttonHover,
-				);
-			} else {
-				// Light mode - standard colors
-				root.style.setProperty("--sidebar-bg", "white");
-				root.style.setProperty("--sidebar-blur", "none");
-				root.style.setProperty("--topbar-bg", "white");
-				root.style.setProperty("--topbar-blur", "none");
-				root.style.setProperty("--button-bg", "white");
-				root.style.setProperty("--button-blur", "none");
-				root.style.setProperty("--card-bg", "white");
-				root.style.setProperty("--card-border", "#e5e7eb");
-				root.style.setProperty("--card-bg-hover", "#f9fafb");
-				root.style.setProperty("--theme-button-bg", "#f3f4f6");
-				root.style.setProperty("--theme-button-hover", "#e5e7eb");
-			}
-		};
-
-		updateThemeStyles();
-
-		// Watch for dark mode changes
-		const observer = new MutationObserver(() => {
-			updateThemeStyles();
-		});
-
-		observer.observe(document.documentElement, {
-			attributes: true,
-			attributeFilter: ["class"],
-		});
-
-		return () => observer.disconnect();
-	}, [themeConfig]);
-
 	return (
-		<div className="min-h-screen bg-secondary-50 dark:bg-black relative overflow-hidden">
-			{/* Full-screen Trianglify Background (Dark Mode Only) */}
-			<canvas
-				ref={bgCanvasRef}
-				className="fixed inset-0 w-full h-full hidden dark:block"
-				style={{ zIndex: 0 }}
-			/>
-			<div
-				className="fixed inset-0 bg-gradient-to-br from-black/10 to-black/20 hidden dark:block pointer-events-none"
-				style={{ zIndex: 1 }}
-			/>
+		<div className="min-h-screen bg-secondary-50">
 			{/* Mobile sidebar */}
 			<div
-				className={`fixed inset-0 z-[60] lg:hidden ${sidebarOpen ? "block" : "hidden"}`}
+				className={`fixed inset-0 z-50 lg:hidden ${sidebarOpen ? "block" : "hidden"}`}
 			>
 				<button
 					type="button"
@@ -460,14 +315,7 @@ const Layout = ({ children }) => {
 					onClick={() => setSidebarOpen(false)}
 					aria-label="Close sidebar"
 				/>
-				<div
-					className="relative flex w-full max-w-[280px] flex-col bg-white dark:border-r dark:border-white/10 pb-4 pt-5 shadow-xl"
-					style={{
-						backgroundColor: "var(--sidebar-bg, white)",
-						backdropFilter: "var(--sidebar-blur, none)",
-						WebkitBackdropFilter: "var(--sidebar-blur, none)",
-					}}
-				>
+				<div className="relative flex w-full max-w-[280px] flex-col bg-white dark:bg-secondary-800 pb-4 pt-5 shadow-xl">
 					<div className="absolute right-0 top-0 -mr-12 pt-2">
 						<button
 							type="button"
@@ -592,11 +440,6 @@ const Layout = ({ children }) => {
 																			Beta
 																		</span>
 																	)}
-																	{subItem.new && (
-																		<span className="text-xs bg-green-100 dark:bg-green-900 text-green-600 dark:text-green-200 px-1.5 py-0.5 rounded font-medium">
-																			New
-																		</span>
-																	)}
 																</span>
 															</Link>
 														)}
@@ -686,43 +529,17 @@ const Layout = ({ children }) => {
 
 			{/* Desktop sidebar */}
 			<div
-				className={`hidden lg:fixed lg:inset-y-0 z-[100] lg:flex lg:flex-col transition-all duration-300 relative ${
+				className={`hidden lg:fixed lg:inset-y-0 lg:z-50 lg:flex lg:flex-col transition-all duration-300 relative ${
 					sidebarCollapsed ? "lg:w-16" : "lg:w-56"
-				} bg-white dark:bg-transparent`}
+				} bg-white dark:bg-secondary-800`}
 			>
-				{/* Collapse/Expand button on border */}
-				<button
-					type="button"
-					onClick={() => setSidebarCollapsed(!sidebarCollapsed)}
-					className="absolute top-5 -right-3 z-[200] flex items-center justify-center w-6 h-6 rounded-full bg-white border border-secondary-300 dark:border-white/20 shadow-md hover:bg-secondary-50 transition-colors"
-					style={{
-						backgroundColor: "var(--button-bg, white)",
-						backdropFilter: "var(--button-blur, none)",
-						WebkitBackdropFilter: "var(--button-blur, none)",
-					}}
-					title={sidebarCollapsed ? "Expand sidebar" : "Collapse sidebar"}
-				>
-					{sidebarCollapsed ? (
-						<ChevronRight className="h-4 w-4 text-secondary-700 dark:text-white" />
-					) : (
-						<ChevronLeft className="h-4 w-4 text-secondary-700 dark:text-white" />
-					)}
-				</button>
-
 				<div
-					className={`flex grow flex-col gap-y-5 border-r border-secondary-200 dark:border-white/10 bg-white ${
+					className={`flex grow flex-col gap-y-5 overflow-y-auto border-r border-secondary-200 dark:border-secondary-600 bg-white dark:bg-secondary-800 ${
 						sidebarCollapsed ? "px-2 shadow-lg" : "px-6"
 					}`}
-					style={{
-						backgroundColor: "var(--sidebar-bg, white)",
-						backdropFilter: "var(--sidebar-blur, none)",
-						WebkitBackdropFilter: "var(--sidebar-blur, none)",
-						overflowY: "auto",
-						overflowX: "visible",
-					}}
 				>
 					<div
-						className={`flex h-16 shrink-0 items-center border-b border-secondary-200 dark:border-white/10 ${
+						className={`flex h-16 shrink-0 items-center border-b border-secondary-200 dark:border-secondary-600 ${
 							sidebarCollapsed ? "justify-center" : "justify-center"
 						}`}
 					>
@@ -740,6 +557,19 @@ const Layout = ({ children }) => {
 							</Link>
 						)}
 					</div>
+					{/* Collapse/Expand button on border */}
+					<button
+						type="button"
+						onClick={() => setSidebarCollapsed(!sidebarCollapsed)}
+						className="absolute top-5 -right-3 z-10 flex items-center justify-center w-6 h-6 rounded-full bg-white dark:bg-secondary-800 border border-secondary-300 dark:border-secondary-600 shadow-md hover:bg-secondary-50 dark:hover:bg-secondary-700 transition-colors"
+						title={sidebarCollapsed ? "Expand sidebar" : "Collapse sidebar"}
+					>
+						{sidebarCollapsed ? (
+							<ChevronRight className="h-4 w-4 text-secondary-700 dark:text-white" />
+						) : (
+							<ChevronLeft className="h-4 w-4 text-secondary-700 dark:text-white" />
+						)}
+					</button>
 					<nav className="flex flex-1 flex-col">
 						<ul className="flex flex-1 flex-col gap-y-6">
 							{/* Show message for users with very limited permissions */}
@@ -886,11 +716,6 @@ const Layout = ({ children }) => {
 																				Beta
 																			</span>
 																		)}
-																		{subItem.new && (
-																			<span className="text-xs bg-green-100 dark:bg-green-900 text-green-600 dark:text-green-200 px-1.5 py-0.5 rounded font-medium">
-																				New
-																			</span>
-																		)}
 																		{subItem.showUpgradeIcon && (
 																			<UpgradeNotificationIcon className="h-3 w-3" />
 																		)}
@@ -1095,19 +920,12 @@ const Layout = ({ children }) => {
 
 			{/* Main content */}
 			<div
-				className={`flex flex-col min-h-screen transition-all duration-300 relative z-10 ${
+				className={`flex flex-col min-h-screen transition-all duration-300 ${
 					sidebarCollapsed ? "lg:pl-16" : "lg:pl-56"
 				}`}
 			>
 				{/* Top bar */}
-				<div
-					className="sticky top-0 z-[90] flex h-16 shrink-0 items-center gap-x-4 border-b border-secondary-200 dark:border-white/10 bg-white px-4 shadow-sm sm:gap-x-6 sm:px-6 lg:px-8"
-					style={{
-						backgroundColor: "var(--topbar-bg, white)",
-						backdropFilter: "var(--topbar-blur, none)",
-						WebkitBackdropFilter: "var(--topbar-blur, none)",
-					}}
-				>
+				<div className="sticky top-0 z-40 flex h-16 shrink-0 items-center gap-x-4 border-b border-secondary-200 dark:border-secondary-600 bg-white dark:bg-secondary-800 px-4 shadow-sm sm:gap-x-6 sm:px-6 lg:px-8">
 					<button
 						type="button"
 						className="-m-2.5 p-2.5 text-secondary-700 dark:text-white lg:hidden"
@@ -1159,8 +977,8 @@ const Layout = ({ children }) => {
 								>
 									<Github className="h-5 w-5 flex-shrink-0" />
 									{githubStars !== null && (
-										<div className="flex items-center gap-1">
-											<Star className="h-4 w-4 fill-current text-yellow-500" />
+										<div className="flex items-center gap-0.5">
+											<Star className="h-3 w-3 fill-current text-yellow-500" />
 											<span className="text-sm font-medium">{githubStars}</span>
 										</div>
 									)}
@@ -1231,17 +1049,7 @@ const Layout = ({ children }) => {
 								>
 									<FaYoutube className="h-5 w-5" />
 								</a>
-								{/* 8) Reddit */}
-								<a
-									href="https://www.reddit.com/r/patchmon"
-									target="_blank"
-									rel="noopener noreferrer"
-									className="flex items-center justify-center w-10 h-10 bg-gray-50 dark:bg-gray-800 text-secondary-600 dark:text-secondary-300 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors shadow-sm"
-									title="Reddit Community"
-								>
-									<FaReddit className="h-5 w-5" />
-								</a>
-								{/* 9) Web */}
+								{/* 7) Web */}
 								<a
 									href="https://patchmon.net"
 									target="_blank"
@@ -1256,7 +1064,7 @@ const Layout = ({ children }) => {
 					</div>
 				</div>
 
-				<main className="flex-1 py-6 bg-secondary-50 dark:bg-transparent">
+				<main className="flex-1 py-6 bg-secondary-50 dark:bg-secondary-800">
 					<div className="px-4 sm:px-6 lg:px-8">{children}</div>
 				</main>
 			</div>

frontend/src/components/SettingsLayout.jsx

@@ -1,5 +1,4 @@
 import {
-	BarChart3,
 	Bell,
 	ChevronLeft,
 	ChevronRight,
@@ -142,11 +141,6 @@ const SettingsLayout = ({ children }) => {
 						href: "/settings/server-version",
 						icon: Code,
 					},
-					{
-						name: "Metrics",
-						href: "/settings/metrics",
-						icon: BarChart3,
-					},
 				],
 			});
 		}

frontend/src/components/settings/AgentManagementTab.jsx

@@ -1,453 +1,388 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import {
-	AlertCircle,
-	CheckCircle,
-	Clock,
-	Download,
-	ExternalLink,
-	RefreshCw,
-	X,
-} from "lucide-react";
-import { useEffect, useState } from "react";
-import api from "../../utils/api";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { AlertCircle, Code, Download, Plus, Shield, X } from "lucide-react";
+import { useId, useState } from "react";
+import { agentFileAPI, settingsAPI } from "../../utils/api";
 
 const AgentManagementTab = () => {
-	const _queryClient = useQueryClient();
-	const [toast, setToast] = useState(null);
+	const scriptFileId = useId();
+	const scriptContentId = useId();
+	const [showUploadModal, setShowUploadModal] = useState(false);
 
-	// Auto-hide toast after 5 seconds
-	useEffect(() => {
-		if (toast) {
-			const timer = setTimeout(() => {
-				setToast(null);
-			}, 5000);
-			return () => clearTimeout(timer);
-		}
-	}, [toast]);
+	// Agent file queries and mutations
+	const {
+		data: agentFileInfo,
+		isLoading: agentFileLoading,
+		error: agentFileError,
+		refetch: refetchAgentFile,
+	} = useQuery({
+		queryKey: ["agentFile"],
+		queryFn: () => agentFileAPI.getInfo().then((res) => res.data),
+	});
 
-	const showToast = (message, type = "success") => {
-		setToast({ message, type });
+	// Fetch settings for dynamic curl flags
+	const { data: settings } = useQuery({
+		queryKey: ["settings"],
+		queryFn: () => settingsAPI.get().then((res) => res.data),
+	});
+
+	// Helper function to get curl flags based on settings
+	const _getCurlFlags = () => {
+		return settings?.ignore_ssl_self_signed ? "-sk" : "-s";
 	};
 
-	// Agent version queries
-	const {
-		data: versionInfo,
-		isLoading: versionLoading,
-		error: versionError,
-		refetch: refetchVersion,
-	} = useQuery({
-		queryKey: ["agentVersion"],
-		queryFn: async () => {
-			try {
-				const response = await api.get("/agent/version");
-				console.log("🔍 Frontend received version info:", response.data);
-				return response.data;
-			} catch (error) {
-				console.error("Failed to fetch version info:", error);
-				throw error;
-			}
-		},
-		refetchInterval: 5 * 60 * 1000, // Refetch every 5 minutes
-		enabled: true, // Always enabled
-		retry: 3, // Retry failed requests
-	});
-
-	const {
-		data: _availableVersions,
-		isLoading: _versionsLoading,
-		error: _versionsError,
-	} = useQuery({
-		queryKey: ["agentVersions"],
-		queryFn: async () => {
-			try {
-				const response = await api.get("/agent/versions");
-				console.log("🔍 Frontend received available versions:", response.data);
-				return response.data;
-			} catch (error) {
-				console.error("Failed to fetch available versions:", error);
-				throw error;
-			}
-		},
-		enabled: true,
-		retry: 3,
-	});
-
-	const checkUpdatesMutation = useMutation({
-		mutationFn: async () => {
-			// First check GitHub for updates
-			await api.post("/agent/version/check");
-			// Then refresh current agent version detection
-			await api.post("/agent/version/refresh");
-		},
+	const uploadAgentMutation = useMutation({
+		mutationFn: (scriptContent) =>
+			agentFileAPI.upload(scriptContent).then((res) => res.data),
 		onSuccess: () => {
-			refetchVersion();
-			showToast("Successfully checked for updates", "success");
+			refetchAgentFile();
+			setShowUploadModal(false);
 		},
 		onError: (error) => {
-			console.error("Check updates error:", error);
-			showToast(`Failed to check for updates: ${error.message}`, "error");
+			console.error("Upload agent error:", error);
 		},
 	});
 
-	const downloadUpdateMutation = useMutation({
-		mutationFn: async () => {
-			// Download the latest binaries
-			const downloadResult = await api.post("/agent/version/download");
-			// Refresh current agent version detection after download
-			await api.post("/agent/version/refresh");
-			// Return the download result for success handling
-			return downloadResult;
-		},
-		onSuccess: (data) => {
-			console.log("Download completed:", data);
-			console.log("Download response data:", data.data);
-			refetchVersion();
-			// Show success message
-			const message =
-				data.data?.message || "Agent binaries downloaded successfully";
-			showToast(message, "success");
-		},
-		onError: (error) => {
-			console.error("Download update error:", error);
-			showToast(`Download failed: ${error.message}`, "error");
-		},
-	});
-
-	const getVersionStatus = () => {
-		console.log("🔍 getVersionStatus called with:", {
-			versionError,
-			versionInfo,
-			versionLoading,
-		});
-
-		if (versionError) {
-			console.log("❌ Version error detected:", versionError);
-			return {
-				status: "error",
-				message: "Failed to load version info",
-				Icon: AlertCircle,
-				color: "text-red-600",
-			};
-		}
-
-		if (!versionInfo || versionLoading) {
-			console.log("⏳ Loading state:", { versionInfo, versionLoading });
-			return {
-				status: "loading",
-				message: "Loading version info...",
-				Icon: RefreshCw,
-				color: "text-gray-600",
-			};
-		}
-
-		// Use the backend's updateStatus for proper semver comparison
-		switch (versionInfo.updateStatus) {
-			case "update-available":
-				return {
-					status: "update-available",
-					message: `Update available: ${versionInfo.latestVersion}`,
-					Icon: Clock,
-					color: "text-yellow-600",
-				};
-			case "newer-version":
-				return {
-					status: "newer-version",
-					message: `Newer version running: ${versionInfo.currentVersion}`,
-					Icon: CheckCircle,
-					color: "text-blue-600",
-				};
-			case "up-to-date":
-				return {
-					status: "up-to-date",
-					message: `Up to date: ${versionInfo.latestVersion}`,
-					Icon: CheckCircle,
-					color: "text-green-600",
-				};
-			case "no-agent":
-				return {
-					status: "no-agent",
-					message: "No agent binary found",
-					Icon: AlertCircle,
-					color: "text-orange-600",
-				};
-			case "github-unavailable":
-				return {
-					status: "github-unavailable",
-					message: `Agent running: ${versionInfo.currentVersion} (GitHub API unavailable)`,
-					Icon: CheckCircle,
-					color: "text-purple-600",
-				};
-			case "no-data":
-				return {
-					status: "no-data",
-					message: "No version data available",
-					Icon: AlertCircle,
-					color: "text-gray-600",
-				};
-			default:
-				return {
-					status: "unknown",
-					message: "Version status unknown",
-					Icon: AlertCircle,
-					color: "text-gray-600",
-				};
-		}
-	};
-
-	const versionStatus = getVersionStatus();
-	const StatusIcon = versionStatus.Icon;
-
 	return (
 		<div className="space-y-6">
-			{/* Toast Notification */}
-			{toast && (
-				<div
-					className={`fixed top-4 right-4 z-50 max-w-md rounded-lg shadow-lg border-2 p-4 flex items-start space-x-3 animate-in slide-in-from-top-5 ${
-						toast.type === "success"
-							? "bg-green-50 dark:bg-green-900/90 border-green-500 dark:border-green-600"
-							: "bg-red-50 dark:bg-red-900/90 border-red-500 dark:border-red-600"
-					}`}
-				>
-					<div
-						className={`flex-shrink-0 rounded-full p-1 ${
-							toast.type === "success"
-								? "bg-green-100 dark:bg-green-800"
-								: "bg-red-100 dark:bg-red-800"
-						}`}
-					>
-						{toast.type === "success" ? (
-							<CheckCircle className="h-5 w-5 text-green-600 dark:text-green-400" />
-						) : (
-							<AlertCircle className="h-5 w-5 text-red-600 dark:text-red-400" />
-						)}
-					</div>
-					<div className="flex-1">
-						<p
-							className={`text-sm font-medium ${
-								toast.type === "success"
-									? "text-green-800 dark:text-green-100"
-									: "text-red-800 dark:text-red-100"
-							}`}
-						>
-							{toast.message}
-						</p>
+			{/* Header */}
+			<div className="flex items-center justify-between mb-6">
+				<div>
+					<div className="flex items-center mb-2">
+						<Code className="h-6 w-6 text-primary-600 mr-3" />
+						<h2 className="text-xl font-semibold text-secondary-900 dark:text-white">
+							Agent File Management
+						</h2>
 					</div>
+					<p className="text-sm text-secondary-500 dark:text-secondary-300">
+						Manage the PatchMon agent script file used for installations and
+						updates
+					</p>
+				</div>
+				<div className="flex items-center gap-2">
 					<button
 						type="button"
-						onClick={() => setToast(null)}
-						className={`flex-shrink-0 rounded-lg p-1 transition-colors ${
-							toast.type === "success"
-								? "hover:bg-green-100 dark:hover:bg-green-800 text-green-600 dark:text-green-400"
-								: "hover:bg-red-100 dark:hover:bg-red-800 text-red-600 dark:text-red-400"
-						}`}
+						onClick={() => {
+							const url = "/api/v1/hosts/agent/download";
+							const link = document.createElement("a");
+							link.href = url;
+							link.download = "patchmon-agent.sh";
+							document.body.appendChild(link);
+							link.click();
+							document.body.removeChild(link);
+						}}
+						className="btn-outline flex items-center gap-2"
 					>
-						<X className="h-4 w-4" />
+						<Download className="h-4 w-4" />
+						Download
 					</button>
+					<button
+						type="button"
+						onClick={() => setShowUploadModal(true)}
+						className="btn-primary flex items-center gap-2"
+					>
+						<Plus className="h-4 w-4" />
+						Replace Script
+					</button>
+				</div>
+			</div>
+
+			{/* Content */}
+			{agentFileLoading ? (
+				<div className="flex items-center justify-center py-8">
+					<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary-600"></div>
+				</div>
+			) : agentFileError ? (
+				<div className="text-center py-8">
+					<p className="text-red-600 dark:text-red-400">
+						Error loading agent file: {agentFileError.message}
+					</p>
+				</div>
+			) : !agentFileInfo?.exists ? (
+				<div className="text-center py-8">
+					<Code className="h-12 w-12 text-secondary-400 mx-auto mb-4" />
+					<p className="text-secondary-500 dark:text-secondary-300">
+						No agent script found
+					</p>
+					<p className="text-sm text-secondary-400 dark:text-secondary-400 mt-2">
+						Upload an agent script to get started
+					</p>
+				</div>
+			) : (
+				<div className="space-y-6">
+					{/* Agent File Info */}
+					<div className="bg-secondary-50 dark:bg-secondary-700 rounded-lg p-6">
+						<h3 className="text-lg font-medium text-secondary-900 dark:text-white mb-4">
+							Current Agent Script
+						</h3>
+						<div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+							<div className="flex items-center gap-2">
+								<Code className="h-4 w-4 text-blue-600 dark:text-blue-400" />
+								<span className="text-sm font-medium text-secondary-700 dark:text-secondary-300">
+									Version:
+								</span>
+								<span className="text-sm text-secondary-900 dark:text-white font-mono">
+									{agentFileInfo.version}
+								</span>
+							</div>
+							<div className="flex items-center gap-2">
+								<Download className="h-4 w-4 text-green-600 dark:text-green-400" />
+								<span className="text-sm font-medium text-secondary-700 dark:text-secondary-300">
+									Size:
+								</span>
+								<span className="text-sm text-secondary-900 dark:text-white">
+									{agentFileInfo.sizeFormatted}
+								</span>
+							</div>
+							<div className="flex items-center gap-2">
+								<Code className="h-4 w-4 text-yellow-600 dark:text-yellow-400" />
+								<span className="text-sm font-medium text-secondary-700 dark:text-secondary-300">
+									Modified:
+								</span>
+								<span className="text-sm text-secondary-900 dark:text-white">
+									{new Date(agentFileInfo.lastModified).toLocaleDateString()}
+								</span>
+							</div>
+						</div>
+					</div>
+
+					{/* Usage Instructions */}
+					<div className="bg-blue-50 dark:bg-blue-900 border border-blue-200 dark:border-blue-700 rounded-md p-4">
+						<div className="flex">
+							<Shield className="h-5 w-5 text-blue-400 dark:text-blue-300" />
+							<div className="ml-3">
+								<h3 className="text-sm font-medium text-blue-800 dark:text-blue-200">
+									Agent Script Usage
+								</h3>
+								<div className="mt-2 text-sm text-blue-700 dark:text-blue-300">
+									<p className="mb-2">This script is used for:</p>
+									<ul className="list-disc list-inside space-y-1">
+										<li>New agent installations via the install script</li>
+										<li>
+											Agent downloads from the /api/v1/hosts/agent/download
+											endpoint
+										</li>
+										<li>Manual agent deployments and updates</li>
+									</ul>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					{/* Uninstall Instructions */}
+					<div className="bg-red-50 dark:bg-red-900 border border-red-200 dark:border-red-700 rounded-md p-4">
+						<div className="flex">
+							<Shield className="h-5 w-5 text-red-400 dark:text-red-300" />
+							<div className="ml-3">
+								<h3 className="text-sm font-medium text-red-800 dark:text-red-200">
+									Agent Uninstall Command
+								</h3>
+								<div className="mt-2 text-sm text-red-700 dark:text-red-300">
+									<p className="mb-3">
+										To completely remove PatchMon from a host:
+									</p>
+
+									{/* Go Agent Uninstall */}
+									<div className="mb-3">
+										<div className="space-y-2">
+											<div className="flex items-center gap-2">
+												<div className="bg-red-100 dark:bg-red-800 rounded p-2 font-mono text-xs flex-1">
+													sudo patchmon-agent uninstall
+												</div>
+												<button
+													type="button"
+													onClick={() => {
+														navigator.clipboard.writeText(
+															"sudo patchmon-agent uninstall",
+														);
+													}}
+													className="px-2 py-1 bg-red-200 dark:bg-red-700 text-red-800 dark:text-red-200 rounded text-xs hover:bg-red-300 dark:hover:bg-red-600 transition-colors"
+												>
+													Copy
+												</button>
+											</div>
+											<div className="text-xs text-red-600 dark:text-red-400">
+												Options: <code>--remove-config</code>,{" "}
+												<code>--remove-logs</code>, <code>--remove-all</code>,{" "}
+												<code>--force</code>
+											</div>
+										</div>
+									</div>
+
+									<p className="mt-2 text-xs">
+										⚠️ This command will remove all PatchMon files,
+										configuration, and crontab entries
+									</p>
+								</div>
+							</div>
+						</div>
+					</div>
 				</div>
 			)}
 
-			{/* Header */}
-			<div className="mb-6">
-				<h2 className="text-2xl font-bold text-secondary-900 dark:text-white mb-2">
-					Agent Version Management
-				</h2>
-				<p className="text-secondary-600 dark:text-secondary-400">
-					Monitor and manage agent versions across your infrastructure
-				</p>
-			</div>
+			{/* Agent Upload Modal */}
+			{showUploadModal && (
+				<AgentUploadModal
+					isOpen={showUploadModal}
+					onClose={() => setShowUploadModal(false)}
+					onSubmit={uploadAgentMutation.mutate}
+					isLoading={uploadAgentMutation.isPending}
+					error={uploadAgentMutation.error}
+					scriptFileId={scriptFileId}
+					scriptContentId={scriptContentId}
+				/>
+			)}
+		</div>
+	);
+};
 
-			{/* Status Banner */}
-			<div
-				className={`rounded-xl shadow-sm p-6 border-2 ${
-					versionStatus.status === "up-to-date"
-						? "bg-green-50 dark:bg-green-900/20 border-green-200 dark:border-green-800"
-						: versionStatus.status === "update-available"
-							? "bg-yellow-50 dark:bg-yellow-900/20 border-yellow-200 dark:border-yellow-800"
-							: versionStatus.status === "no-agent"
-								? "bg-orange-50 dark:bg-orange-900/20 border-orange-200 dark:border-orange-800"
-								: "bg-white dark:bg-secondary-800 border-secondary-200 dark:border-secondary-600"
-				}`}
-			>
-				<div className="flex items-start justify-between">
-					<div className="flex items-start space-x-4">
-						<div
-							className={`p-3 rounded-lg ${
-								versionStatus.status === "up-to-date"
-									? "bg-green-100 dark:bg-green-800"
-									: versionStatus.status === "update-available"
-										? "bg-yellow-100 dark:bg-yellow-800"
-										: versionStatus.status === "no-agent"
-											? "bg-orange-100 dark:bg-orange-800"
-											: "bg-secondary-100 dark:bg-secondary-700"
-							}`}
+// Agent Upload Modal Component
+const AgentUploadModal = ({
+	isOpen,
+	onClose,
+	onSubmit,
+	isLoading,
+	error,
+	scriptFileId,
+	scriptContentId,
+}) => {
+	const [scriptContent, setScriptContent] = useState("");
+	const [uploadError, setUploadError] = useState("");
+
+	const handleSubmit = (e) => {
+		e.preventDefault();
+		setUploadError("");
+
+		if (!scriptContent.trim()) {
+			setUploadError("Script content is required");
+			return;
+		}
+
+		if (!scriptContent.trim().startsWith("#!/")) {
+			setUploadError(
+				"Script must start with a shebang (#!/bin/bash or #!/bin/sh)",
+			);
+			return;
+		}
+
+		onSubmit(scriptContent);
+	};
+
+	const handleFileUpload = (e) => {
+		const file = e.target.files[0];
+		if (file) {
+			const reader = new FileReader();
+			reader.onload = (event) => {
+				setScriptContent(event.target.result);
+				setUploadError("");
+			};
+			reader.readAsText(file);
+		}
+	};
+
+	if (!isOpen) return null;
+
+	return (
+		<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
+			<div className="bg-white dark:bg-secondary-800 rounded-lg shadow-xl max-w-4xl w-full mx-4 max-h-[90vh] overflow-y-auto">
+				<div className="px-6 py-4 border-b border-secondary-200 dark:border-secondary-600">
+					<div className="flex items-center justify-between">
+						<h3 className="text-lg font-medium text-secondary-900 dark:text-white">
+							Replace Agent Script
+						</h3>
+						<button
+							type="button"
+							onClick={onClose}
+							className="text-secondary-400 hover:text-secondary-600 dark:text-secondary-500 dark:hover:text-secondary-300"
 						>
-							{StatusIcon && (
-								<StatusIcon className={`h-6 w-6 ${versionStatus.color}`} />
-							)}
-						</div>
+							<X className="h-5 w-5" />
+						</button>
+					</div>
+				</div>
+
+				<form onSubmit={handleSubmit} className="px-6 py-4">
+					<div className="space-y-4">
 						<div>
-							<h3 className="text-lg font-semibold text-secondary-900 dark:text-white mb-1">
-								{versionStatus.message}
-							</h3>
-							<p className="text-sm text-secondary-600 dark:text-secondary-400">
-								{versionStatus.status === "up-to-date" &&
-									"All agent binaries are current"}
-								{versionStatus.status === "update-available" &&
-									"A newer version is available for download"}
-								{versionStatus.status === "no-agent" &&
-									"Download agent binaries to get started"}
-								{versionStatus.status === "github-unavailable" &&
-									"Cannot check for updates at this time"}
-								{![
-									"up-to-date",
-									"update-available",
-									"no-agent",
-									"github-unavailable",
-								].includes(versionStatus.status) &&
-									"Version information unavailable"}
+							<label
+								htmlFor={scriptFileId}
+								className="block text-sm font-medium text-secondary-700 dark:text-secondary-200 mb-2"
+							>
+								Upload Script File
+							</label>
+							<input
+								id={scriptFileId}
+								type="file"
+								accept=".sh"
+								onChange={handleFileUpload}
+								className="block w-full text-sm text-secondary-500 dark:text-secondary-400 file:mr-4 file:py-2 file:px-4 file:rounded-md file:border-0 file:text-sm file:font-medium file:bg-primary-50 file:text-primary-700 hover:file:bg-primary-100 dark:file:bg-primary-900 dark:file:text-primary-200"
+							/>
+							<p className="mt-1 text-xs text-secondary-500 dark:text-secondary-400">
+								Select a .sh file to upload, or paste the script content below
 							</p>
 						</div>
-					</div>
-					<button
-						type="button"
-						onClick={() => checkUpdatesMutation.mutate()}
-						disabled={checkUpdatesMutation.isPending}
-						className="flex items-center px-4 py-2 bg-white dark:bg-secondary-700 text-secondary-700 dark:text-secondary-200 rounded-lg hover:bg-secondary-50 dark:hover:bg-secondary-600 border border-secondary-300 dark:border-secondary-600 disabled:opacity-50 disabled:cursor-not-allowed transition-all duration-200 shadow-sm hover:shadow"
-					>
-						<RefreshCw
-							className={`h-4 w-4 mr-2 ${checkUpdatesMutation.isPending ? "animate-spin" : ""}`}
-						/>
-						{checkUpdatesMutation.isPending
-							? "Checking..."
-							: "Check for Updates"}
-					</button>
-				</div>
-			</div>
 
-			{/* Version Information Grid */}
-			<div className="grid grid-cols-1 md:grid-cols-3 gap-6">
-				{/* Current Version Card */}
-				<div className="bg-white dark:bg-secondary-800 rounded-xl shadow-sm p-6 border border-secondary-200 dark:border-secondary-600 hover:shadow-md transition-shadow duration-200">
-					<h4 className="text-sm font-medium text-secondary-500 dark:text-secondary-400 mb-2">
-						Current Version
-					</h4>
-					<p className="text-2xl font-bold text-secondary-900 dark:text-white">
-						{versionInfo?.currentVersion || (
-							<span className="text-lg text-secondary-400 dark:text-secondary-500">
-								Not detected
-							</span>
-						)}
-					</p>
-				</div>
-
-				{/* Latest Version Card */}
-				<div className="bg-white dark:bg-secondary-800 rounded-xl shadow-sm p-6 border border-secondary-200 dark:border-secondary-600 hover:shadow-md transition-shadow duration-200">
-					<h4 className="text-sm font-medium text-secondary-500 dark:text-secondary-400 mb-2">
-						Latest Available
-					</h4>
-					<p className="text-2xl font-bold text-secondary-900 dark:text-white">
-						{versionInfo?.latestVersion || (
-							<span className="text-lg text-secondary-400 dark:text-secondary-500">
-								Unknown
-							</span>
-						)}
-					</p>
-				</div>
-
-				{/* Last Checked Card */}
-				<div className="bg-white dark:bg-secondary-800 rounded-xl shadow-sm p-6 border border-secondary-200 dark:border-secondary-600 hover:shadow-md transition-shadow duration-200">
-					<h4 className="text-sm font-medium text-secondary-500 dark:text-secondary-400 mb-2">
-						Last Checked
-					</h4>
-					<p className="text-lg font-semibold text-secondary-900 dark:text-white">
-						{versionInfo?.lastChecked
-							? new Date(versionInfo.lastChecked).toLocaleString("en-US", {
-									month: "short",
-									day: "numeric",
-									hour: "2-digit",
-									minute: "2-digit",
-								})
-							: "Never"}
-					</p>
-				</div>
-			</div>
-
-			{/* Download Updates Section */}
-			<div className="bg-gradient-to-br from-primary-50 to-blue-50 dark:from-secondary-800 dark:to-secondary-800 rounded-xl shadow-sm p-8 border border-primary-200 dark:border-secondary-600">
-				<div className="flex items-center justify-between">
-					<div className="flex-1">
-						<h3 className="text-xl font-bold text-secondary-900 dark:text-white mb-3">
-							{!versionInfo?.currentVersion
-								? "Get Started with Agent Binaries"
-								: versionStatus.status === "update-available"
-									? "New Agent Version Available"
-									: "Agent Binaries"}
-						</h3>
-						<p className="text-secondary-700 dark:text-secondary-300 mb-4">
-							{!versionInfo?.currentVersion
-								? "No agent binaries detected. Download from GitHub to begin managing your agents."
-								: versionStatus.status === "update-available"
-									? `A new agent version (${versionInfo.latestVersion}) is available. Download the latest binaries from GitHub.`
-									: "Download or redownload agent binaries from GitHub."}
-						</p>
-						<div className="flex items-center space-x-4">
-							<button
-								type="button"
-								onClick={() => downloadUpdateMutation.mutate()}
-								disabled={downloadUpdateMutation.isPending}
-								className="flex items-center px-6 py-3 bg-primary-600 text-white rounded-lg hover:bg-primary-700 disabled:opacity-50 disabled:cursor-not-allowed transition-all duration-200 shadow-md hover:shadow-lg font-medium"
+						<div>
+							<label
+								htmlFor={scriptContentId}
+								className="block text-sm font-medium text-secondary-700 dark:text-secondary-200 mb-2"
 							>
-								{downloadUpdateMutation.isPending ? (
-									<>
-										<RefreshCw className="h-5 w-5 mr-2 animate-spin" />
-										Downloading...
-									</>
-								) : (
-									<>
-										<Download className="h-5 w-5 mr-2" />
-										{!versionInfo?.currentVersion
-											? "Download Binaries"
-											: versionStatus.status === "update-available"
-												? "Download New Agent Version"
-												: "Redownload Binaries"}
-									</>
-								)}
-							</button>
-							<a
-								href="https://github.com/PatchMon/PatchMon-agent/releases"
-								target="_blank"
-								rel="noopener noreferrer"
-								className="flex items-center px-4 py-3 text-secondary-700 dark:text-secondary-300 hover:text-primary-600 dark:hover:text-primary-400 transition-colors duration-200 font-medium"
-							>
-								<ExternalLink className="h-4 w-4 mr-2" />
-								View on GitHub
-							</a>
+								Script Content *
+							</label>
+							<textarea
+								id={scriptContentId}
+								value={scriptContent}
+								onChange={(e) => {
+									setScriptContent(e.target.value);
+									setUploadError("");
+								}}
+								rows={15}
+								className="block w-full border border-secondary-300 dark:border-secondary-600 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 bg-white dark:bg-secondary-700 text-secondary-900 dark:text-white font-mono text-sm"
+								placeholder="#!/bin/bash&#10;&#10;# PatchMon Agent Script&#10;VERSION=&quot;1.0.0&quot;&#10;&#10;# Your script content here..."
+							/>
 						</div>
-					</div>
-				</div>
-			</div>
 
-			{/* Supported Architectures */}
-			{versionInfo?.supportedArchitectures &&
-				versionInfo.supportedArchitectures.length > 0 && (
-					<div className="bg-white dark:bg-secondary-800 rounded-xl shadow-sm p-6 border border-secondary-200 dark:border-secondary-600">
-						<h4 className="text-lg font-semibold text-secondary-900 dark:text-white mb-4">
-							Supported Architectures
-						</h4>
-						<div className="grid grid-cols-2 md:grid-cols-4 gap-3">
-							{versionInfo.supportedArchitectures.map((arch) => (
-								<div
-									key={arch}
-									className="flex items-center justify-center px-4 py-3 bg-secondary-50 dark:bg-secondary-700 rounded-lg border border-secondary-200 dark:border-secondary-600"
-								>
-									<code className="text-sm font-mono text-secondary-700 dark:text-secondary-300">
-										{arch}
-									</code>
+						{(uploadError || error) && (
+							<div className="bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md p-3">
+								<p className="text-sm text-red-800 dark:text-red-200">
+									{uploadError ||
+										error?.response?.data?.error ||
+										error?.message}
+								</p>
+							</div>
+						)}
+
+						<div className="bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded-md p-3">
+							<div className="flex">
+								<AlertCircle className="h-4 w-4 text-yellow-600 dark:text-yellow-400 mr-2 mt-0.5" />
+								<div className="text-sm text-yellow-800 dark:text-yellow-200">
+									<p className="font-medium">Important:</p>
+									<ul className="mt-1 list-disc list-inside space-y-1">
+										<li>This will replace the current agent script file</li>
+										<li>A backup will be created automatically</li>
+										<li>All new installations will use this script</li>
+										<li>
+											Existing agents will download this version on their next
+											update
+										</li>
+									</ul>
 								</div>
-							))}
+							</div>
 						</div>
 					</div>
-				)}
+
+					<div className="flex justify-end gap-3 mt-6">
+						<button type="button" onClick={onClose} className="btn-outline">
+							Cancel
+						</button>
+						<button
+							type="submit"
+							disabled={isLoading || !scriptContent.trim()}
+							className="btn-primary"
+						>
+							{isLoading ? "Uploading..." : "Replace Script"}
+						</button>
+					</div>
+				</form>
+			</div>
 		</div>
 	);
 };

frontend/src/components/settings/BrandingTab.jsx

@@ -1,14 +1,6 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import {
-	AlertCircle,
-	Image,
-	Palette,
-	RotateCcw,
-	Upload,
-	X,
-} from "lucide-react";
+import { AlertCircle, Image, RotateCcw, Upload, X } from "lucide-react";
 import { useState } from "react";
-import { THEME_PRESETS, useColorTheme } from "../../contexts/ColorThemeContext";
 import { settingsAPI } from "../../utils/api";
 
 const BrandingTab = () => {
@@ -20,7 +12,6 @@ const BrandingTab = () => {
 	});
 	const [showLogoUploadModal, setShowLogoUploadModal] = useState(false);
 	const [selectedLogoType, setSelectedLogoType] = useState("dark");
-	const { colorTheme, setColorTheme } = useColorTheme();
 
 	const queryClient = useQueryClient();
 
@@ -84,22 +75,6 @@ const BrandingTab = () => {
 		},
 	});
 
-	// Theme update mutation
-	const updateThemeMutation = useMutation({
-		mutationFn: (theme) => settingsAPI.update({ colorTheme: theme }),
-		onSuccess: (_data, theme) => {
-			queryClient.invalidateQueries(["settings"]);
-			setColorTheme(theme);
-		},
-		onError: (error) => {
-			console.error("Update theme error:", error);
-		},
-	});
-
-	const handleThemeChange = (theme) => {
-		updateThemeMutation.mutate(theme);
-	};
-
 	if (isLoading) {
 		return (
 			<div className="flex items-center justify-center h-64">
@@ -127,110 +102,17 @@ const BrandingTab = () => {
 	}
 
 	return (
-		<div className="space-y-8">
-			{/* Header */}
-			<div>
-				<div className="flex items-center mb-6">
-					<Image className="h-6 w-6 text-primary-600 mr-3" />
-					<h2 className="text-xl font-semibold text-secondary-900 dark:text-white">
-						Logo & Branding
-					</h2>
-				</div>
-				<p className="text-sm text-secondary-500 dark:text-secondary-300 mb-6">
-					Customize your PatchMon installation with custom logos, favicon, and
-					color themes. These will be displayed throughout the application.
-				</p>
-			</div>
-
-			{/* Color Theme Selector */}
-			<div className="bg-white dark:bg-secondary-800 rounded-lg p-6 border border-secondary-200 dark:border-secondary-600">
-				<div className="flex items-center mb-4">
-					<Palette className="h-5 w-5 text-primary-600 mr-2" />
-					<h3 className="text-lg font-medium text-secondary-900 dark:text-white">
-						Color Theme
-					</h3>
-				</div>
-				<p className="text-sm text-secondary-600 dark:text-secondary-400 mb-6">
-					Choose a color theme that will be applied to the login page and
-					background areas throughout the app.
-				</p>
-
-				<div className="grid grid-cols-2 md:grid-cols-3 gap-4">
-					{Object.entries(THEME_PRESETS).map(([themeKey, theme]) => {
-						const isSelected = colorTheme === themeKey;
-						const gradientColors = theme.login.xColors;
-
-						return (
-							<button
-								key={themeKey}
-								type="button"
-								onClick={() => handleThemeChange(themeKey)}
-								disabled={updateThemeMutation.isPending}
-								className={`relative p-4 rounded-lg border-2 transition-all ${
-									isSelected
-										? "border-primary-500 ring-2 ring-primary-200 dark:ring-primary-800"
-										: "border-secondary-200 dark:border-secondary-600 hover:border-primary-300"
-								} ${updateThemeMutation.isPending ? "opacity-50 cursor-not-allowed" : "cursor-pointer"}`}
-							>
-								{/* Theme Preview */}
-								<div
-									className="h-20 rounded-md mb-3 overflow-hidden"
-									style={{
-										background: `linear-gradient(135deg, ${gradientColors.join(", ")})`,
-									}}
-								/>
-
-								{/* Theme Name */}
-								<div className="text-sm font-medium text-secondary-900 dark:text-white mb-1">
-									{theme.name}
-								</div>
-
-								{/* Selected Indicator */}
-								{isSelected && (
-									<div className="absolute top-2 right-2 bg-primary-500 text-white rounded-full p-1">
-										<svg
-											className="w-4 h-4"
-											fill="currentColor"
-											viewBox="0 0 20 20"
-											aria-label="Selected theme"
-										>
-											<title>Selected</title>
-											<path
-												fillRule="evenodd"
-												d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
-												clipRule="evenodd"
-											/>
-										</svg>
-									</div>
-								)}
-							</button>
-						);
-					})}
-				</div>
-
-				{updateThemeMutation.isPending && (
-					<div className="mt-4 flex items-center gap-2 text-sm text-primary-600 dark:text-primary-400">
-						<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-current"></div>
-						Updating theme...
-					</div>
-				)}
-
-				{updateThemeMutation.isError && (
-					<div className="mt-4 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-md p-3">
-						<p className="text-sm text-red-800 dark:text-red-200">
-							Failed to update theme: {updateThemeMutation.error?.message}
-						</p>
-					</div>
-				)}
-			</div>
-
-			{/* Logo Section Header */}
-			<div className="flex items-center mb-4">
-				<Image className="h-5 w-5 text-primary-600 mr-2" />
-				<h3 className="text-lg font-medium text-secondary-900 dark:text-white">
-					Logos
-				</h3>
+		<div className="space-y-6">
+			<div className="flex items-center mb-6">
+				<Image className="h-6 w-6 text-primary-600 mr-3" />
+				<h2 className="text-xl font-semibold text-secondary-900 dark:text-white">
+					Logo & Branding
+				</h2>
 			</div>
+			<p className="text-sm text-secondary-500 dark:text-secondary-300 mb-6">
+				Customize your PatchMon installation with custom logos and favicon.
+				These will be displayed throughout the application.
+			</p>
 
 			<div className="grid grid-cols-1 md:grid-cols-3 gap-6">
 				{/* Dark Logo */}

frontend/src/components/settings/UsersTab.jsx

@@ -54,7 +54,7 @@ const UsersTab = () => {
 	});
 
 	// Update user mutation
-	const updateUserMutation = useMutation({
+	const _updateUserMutation = useMutation({
 		mutationFn: ({ id, data }) => adminUsersAPI.update(id, data),
 		onSuccess: () => {
 			queryClient.invalidateQueries(["users"]);

frontend/src/contexts/AuthContext.jsx

@@ -7,7 +7,6 @@ import {
 } from "react";
 import { flushSync } from "react-dom";
 import { AUTH_PHASES, isAuthPhase } from "../constants/authPhases";
-import { isCorsError } from "../utils/api";
 
 const AuthContext = createContext();
 
@@ -121,50 +120,9 @@ export const AuthProvider = ({ children }) => {
 
 				return { success: true };
 			} else {
-				// Handle HTTP error responses (like 500 CORS errors)
-				console.log("HTTP error response:", response.status, data);
-
-				// Check if this is a CORS error based on the response data
-				if (
-					data.message?.includes("Not allowed by CORS") ||
-					data.message?.includes("CORS") ||
-					data.error?.includes("CORS")
-				) {
-					return {
-						success: false,
-						error:
-							"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-					};
-				}
-
 				return { success: false, error: data.error || "Login failed" };
 			}
-		} catch (error) {
-			console.log("Login error:", error);
-			console.log("Error response:", error.response);
-			console.log("Error message:", error.message);
-
-			// Check for CORS/network errors first
-			if (isCorsError(error)) {
-				return {
-					success: false,
-					error:
-						"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-				};
-			}
-
-			// Check for other network errors
-			if (
-				error.name === "TypeError" &&
-				error.message?.includes("Failed to fetch")
-			) {
-				return {
-					success: false,
-					error:
-						"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-				};
-			}
-
+		} catch {
 			return { success: false, error: "Network error occurred" };
 		}
 	};
@@ -209,46 +167,9 @@ export const AuthProvider = ({ children }) => {
 				localStorage.setItem("user", JSON.stringify(data.user));
 				return { success: true, user: data.user };
 			} else {
-				// Handle HTTP error responses (like 500 CORS errors)
-				console.log("HTTP error response:", response.status, data);
-
-				// Check if this is a CORS error based on the response data
-				if (
-					data.message?.includes("Not allowed by CORS") ||
-					data.message?.includes("CORS") ||
-					data.error?.includes("CORS")
-				) {
-					return {
-						success: false,
-						error:
-							"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-					};
-				}
-
 				return { success: false, error: data.error || "Update failed" };
 			}
-		} catch (error) {
-			// Check for CORS/network errors first
-			if (isCorsError(error)) {
-				return {
-					success: false,
-					error:
-						"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-				};
-			}
-
-			// Check for other network errors
-			if (
-				error.name === "TypeError" &&
-				error.message?.includes("Failed to fetch")
-			) {
-				return {
-					success: false,
-					error:
-						"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-				};
-			}
-
+		} catch {
 			return { success: false, error: "Network error occurred" };
 		}
 	};
@@ -269,49 +190,12 @@ export const AuthProvider = ({ children }) => {
 			if (response.ok) {
 				return { success: true };
 			} else {
-				// Handle HTTP error responses (like 500 CORS errors)
-				console.log("HTTP error response:", response.status, data);
-
-				// Check if this is a CORS error based on the response data
-				if (
-					data.message?.includes("Not allowed by CORS") ||
-					data.message?.includes("CORS") ||
-					data.error?.includes("CORS")
-				) {
-					return {
-						success: false,
-						error:
-							"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-					};
-				}
-
 				return {
 					success: false,
 					error: data.error || "Password change failed",
 				};
 			}
-		} catch (error) {
-			// Check for CORS/network errors first
-			if (isCorsError(error)) {
-				return {
-					success: false,
-					error:
-						"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-				};
-			}
-
-			// Check for other network errors
-			if (
-				error.name === "TypeError" &&
-				error.message?.includes("Failed to fetch")
-			) {
-				return {
-					success: false,
-					error:
-						"CORS_ORIGIN mismatch - please set your URL in your environment variable",
-				};
-			}
-
+		} catch {
 			return { success: false, error: "Network error occurred" };
 		}
 	};

frontend/src/contexts/ColorThemeContext.jsx

@@ -1,194 +0,0 @@
-import { createContext, useContext, useEffect, useState } from "react";
-
-const ColorThemeContext = createContext();
-
-// Theme configurations matching the login backgrounds
-export const THEME_PRESETS = {
-	default: {
-		name: "Normal Dark",
-		login: {
-			cellSize: 90,
-			variance: 0.85,
-			xColors: ["#0f172a", "#1e293b", "#334155", "#475569", "#64748b"],
-			yColors: ["#0f172a", "#1e293b", "#334155", "#475569", "#64748b"],
-		},
-		app: {
-			bgPrimary: "#1e293b",
-			bgSecondary: "#1e293b",
-			bgTertiary: "#334155",
-			borderColor: "#475569",
-			cardBg: "#1e293b",
-			cardBorder: "#334155",
-			buttonBg: "#334155",
-			buttonHover: "#475569",
-		},
-	},
-	cyber_blue: {
-		name: "Cyber Blue",
-		login: {
-			cellSize: 90,
-			variance: 0.85,
-			xColors: ["#0a0820", "#1a1f3a", "#2d3561", "#4a5584", "#667eaf"],
-			yColors: ["#0a0820", "#1a1f3a", "#2d3561", "#4a5584", "#667eaf"],
-		},
-		app: {
-			bgPrimary: "#0a0820",
-			bgSecondary: "#1a1f3a",
-			bgTertiary: "#2d3561",
-			borderColor: "#4a5584",
-			cardBg: "#1a1f3a",
-			cardBorder: "#2d3561",
-			buttonBg: "#2d3561",
-			buttonHover: "#4a5584",
-		},
-	},
-	neon_purple: {
-		name: "Neon Purple",
-		login: {
-			cellSize: 80,
-			variance: 0.9,
-			xColors: ["#0f0a1e", "#1e0f3e", "#4a0082", "#7209b7", "#b5179e"],
-			yColors: ["#0f0a1e", "#1e0f3e", "#4a0082", "#7209b7", "#b5179e"],
-		},
-		app: {
-			bgPrimary: "#0f0a1e",
-			bgSecondary: "#1e0f3e",
-			bgTertiary: "#4a0082",
-			borderColor: "#7209b7",
-			cardBg: "#1e0f3e",
-			cardBorder: "#4a0082",
-			buttonBg: "#4a0082",
-			buttonHover: "#7209b7",
-		},
-	},
-	matrix_green: {
-		name: "Matrix Green",
-		login: {
-			cellSize: 70,
-			variance: 0.7,
-			xColors: ["#001a00", "#003300", "#004d00", "#006600", "#00b300"],
-			yColors: ["#001a00", "#003300", "#004d00", "#006600", "#00b300"],
-		},
-		app: {
-			bgPrimary: "#001a00",
-			bgSecondary: "#003300",
-			bgTertiary: "#004d00",
-			borderColor: "#006600",
-			cardBg: "#003300",
-			cardBorder: "#004d00",
-			buttonBg: "#004d00",
-			buttonHover: "#006600",
-		},
-	},
-	ocean_blue: {
-		name: "Ocean Blue",
-		login: {
-			cellSize: 85,
-			variance: 0.8,
-			xColors: ["#001845", "#023e7d", "#0077b6", "#0096c7", "#00b4d8"],
-			yColors: ["#001845", "#023e7d", "#0077b6", "#0096c7", "#00b4d8"],
-		},
-		app: {
-			bgPrimary: "#001845",
-			bgSecondary: "#023e7d",
-			bgTertiary: "#0077b6",
-			borderColor: "#0096c7",
-			cardBg: "#023e7d",
-			cardBorder: "#0077b6",
-			buttonBg: "#0077b6",
-			buttonHover: "#0096c7",
-		},
-	},
-	sunset_gradient: {
-		name: "Sunset Gradient",
-		login: {
-			cellSize: 95,
-			variance: 0.75,
-			xColors: ["#1a0033", "#330066", "#4d0099", "#6600cc", "#9933ff"],
-			yColors: ["#1a0033", "#660033", "#990033", "#cc0066", "#ff0099"],
-		},
-		app: {
-			bgPrimary: "#1a0033",
-			bgSecondary: "#330066",
-			bgTertiary: "#4d0099",
-			borderColor: "#6600cc",
-			cardBg: "#330066",
-			cardBorder: "#4d0099",
-			buttonBg: "#4d0099",
-			buttonHover: "#6600cc",
-		},
-	},
-};
-
-export const ColorThemeProvider = ({ children }) => {
-	const [colorTheme, setColorTheme] = useState("default");
-	const [isLoading, setIsLoading] = useState(true);
-
-	// Fetch theme from settings on mount
-	useEffect(() => {
-		const fetchTheme = async () => {
-			try {
-				// Check localStorage first for unauthenticated pages (login)
-				const cachedTheme = localStorage.getItem("colorTheme");
-				if (cachedTheme) {
-					setColorTheme(cachedTheme);
-				}
-
-				// Try to fetch from API (will fail on login page, that's ok)
-				try {
-					const token = localStorage.getItem("token");
-					if (token) {
-						const response = await fetch("/api/v1/settings", {
-							headers: {
-								Authorization: `Bearer ${token}`,
-							},
-						});
-
-						if (response.ok) {
-							const data = await response.json();
-							if (data.color_theme) {
-								setColorTheme(data.color_theme);
-								localStorage.setItem("colorTheme", data.color_theme);
-							}
-						}
-					}
-				} catch (_apiError) {
-					// Silent fail - use cached or default theme
-					console.log("Could not fetch theme from API, using cached/default");
-				}
-			} catch (error) {
-				console.error("Error loading color theme:", error);
-			} finally {
-				setIsLoading(false);
-			}
-		};
-
-		fetchTheme();
-	}, []);
-
-	const updateColorTheme = (theme) => {
-		setColorTheme(theme);
-		localStorage.setItem("colorTheme", theme);
-	};
-
-	const value = {
-		colorTheme,
-		setColorTheme: updateColorTheme,
-		themeConfig: THEME_PRESETS[colorTheme] || THEME_PRESETS.default,
-		isLoading,
-	};
-
-	return (
-		<ColorThemeContext.Provider value={value}>
-			{children}
-		</ColorThemeContext.Provider>
-	);
-};
-
-export const useColorTheme = () => {
-	const context = useContext(ColorThemeContext);
-	if (!context) {
-		throw new Error("useColorTheme must be used within ColorThemeProvider");
-	}
-	return context;
-};

frontend/src/index.css

@@ -9,7 +9,7 @@
 	}
 
 	body {
-		@apply bg-secondary-50 dark:bg-transparent text-secondary-900 dark:text-secondary-100 antialiased;
+		@apply bg-secondary-50 dark:bg-secondary-800 text-secondary-900 dark:text-secondary-100 antialiased;
 	}
 }
 
@@ -39,46 +39,19 @@
 	}
 
 	.btn-outline {
-		@apply btn border-secondary-300 text-secondary-700 bg-white hover:bg-secondary-50 focus:ring-secondary-500;
-	}
-
-	.dark .btn-outline {
-		background-color: var(--theme-button-bg, #1e293b);
-		border-color: var(--card-border, #334155);
-		color: white;
-	}
-
-	.dark .btn-outline:hover {
-		background-color: var(--theme-button-hover, #334155);
+		@apply btn border-secondary-300 dark:border-secondary-600 text-secondary-700 dark:text-secondary-200 bg-white dark:bg-secondary-800 hover:bg-secondary-50 dark:hover:bg-secondary-700 focus:ring-secondary-500;
 	}
 
 	.card {
-		@apply bg-white rounded-lg shadow-card border border-secondary-200;
-	}
-
-	.dark .card {
-		background-color: var(--card-bg, #1e293b);
-		border-color: var(--card-border, #334155);
-		box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.3), 0 2px 4px -1px rgba(0, 0, 0, 0.2);
+		@apply bg-white dark:bg-secondary-800 rounded-lg shadow-card dark:shadow-card-dark border border-secondary-200 dark:border-secondary-600;
 	}
 
 	.card-hover {
-		@apply card transition-all duration-150;
-	}
-
-	.dark .card-hover:hover {
-		background-color: var(--card-bg-hover, #334155);
-		box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.4), 0 4px 6px -2px rgba(0, 0, 0, 0.3);
+		@apply card hover:shadow-card-hover transition-shadow duration-150;
 	}
 
 	.input {
-		@apply block w-full px-3 py-2 border border-secondary-300 rounded-md shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 sm:text-sm bg-white text-secondary-900;
-	}
-
-	.dark .input {
-		background-color: var(--card-bg, #1e293b);
-		border-color: var(--card-border, #334155);
-		color: white;
+		@apply block w-full px-3 py-2 border border-secondary-300 dark:border-secondary-600 rounded-md shadow-sm focus:outline-none focus:ring-primary-500 focus:border-primary-500 sm:text-sm bg-white dark:bg-secondary-800 text-secondary-900 dark:text-secondary-100;
 	}
 
 	.label {
@@ -111,27 +84,6 @@
 }
 
 @layer utilities {
-	/* Theme-aware backgrounds for general elements */
-	.dark .bg-secondary-800 {
-		background-color: var(--card-bg, #1e293b) !important;
-	}
-
-	.dark .bg-secondary-700 {
-		background-color: var(--card-bg-hover, #334155) !important;
-	}
-
-	.dark .bg-secondary-900 {
-		background-color: var(--theme-button-bg, #1e293b) !important;
-	}
-
-	.dark .border-secondary-600 {
-		border-color: var(--card-border, #334155) !important;
-	}
-
-	.dark .border-secondary-700 {
-		border-color: var(--theme-button-hover, #475569) !important;
-	}
-
 	.text-shadow {
 		text-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
 	}

frontend/src/pages/Automation.jsx

@@ -169,20 +169,6 @@ const Automation = () => {
 				year: "numeric",
 			});
 		}
-		if (schedule === "Daily at 4 AM") {
-			const now = new Date();
-			const tomorrow = new Date(now);
-			tomorrow.setDate(tomorrow.getDate() + 1);
-			tomorrow.setHours(4, 0, 0, 0);
-			return tomorrow.toLocaleString([], {
-				hour12: true,
-				hour: "numeric",
-				minute: "2-digit",
-				day: "numeric",
-				month: "numeric",
-				year: "numeric",
-			});
-		}
 		if (schedule === "Every hour") {
 			const now = new Date();
 			const nextHour = new Date(now);
@@ -223,13 +209,6 @@ const Automation = () => {
 			tomorrow.setHours(3, 0, 0, 0);
 			return tomorrow.getTime();
 		}
-		if (schedule === "Daily at 4 AM") {
-			const now = new Date();
-			const tomorrow = new Date(now);
-			tomorrow.setDate(tomorrow.getDate() + 1);
-			tomorrow.setHours(4, 0, 0, 0);
-			return tomorrow.getTime();
-		}
 		if (schedule === "Every hour") {
 			const now = new Date();
 			const nextHour = new Date(now);
@@ -248,34 +227,8 @@ const Automation = () => {
 
 		// Use the proxied URL through the frontend (port 3000)
 		// This avoids CORS issues as everything goes through the same origin
-		const url = `/bullboard?token=${encodeURIComponent(token)}`;
-		// Open in a new tab instead of a new window
-		const bullBoardWindow = window.open(url, "_blank");
-
-		// Add a message listener to handle authentication failures
-		if (bullBoardWindow) {
-			// Listen for authentication failures and refresh with token
-			const checkAuth = () => {
-				try {
-					// Check if the Bull Board window is still open
-					if (bullBoardWindow.closed) return;
-
-					// Inject a script to handle authentication failures
-					bullBoardWindow.postMessage(
-						{
-							type: "BULL_BOARD_TOKEN",
-							token: token,
-						},
-						window.location.origin,
-					);
-				} catch (e) {
-					console.log("Could not communicate with Bull Board window:", e);
-				}
-			};
-
-			// Send token after a short delay to ensure Bull Board is loaded
-			setTimeout(checkAuth, 1000);
-		}
+		const url = `/admin/queues?token=${encodeURIComponent(token)}`;
+		window.open(url, "_blank", "width=1200,height=800");
 	};
 
 	const triggerManualJob = async (jobType, data = {}) => {
@@ -290,8 +243,6 @@ const Automation = () => {
 				endpoint = "/automation/trigger/orphaned-repo-cleanup";
 			} else if (jobType === "orphaned-packages") {
 				endpoint = "/automation/trigger/orphaned-package-cleanup";
-			} else if (jobType === "docker-inventory") {
-				endpoint = "/automation/trigger/docker-inventory-cleanup";
 			} else if (jobType === "agent-collection") {
 				endpoint = "/automation/trigger/agent-collection";
 			}
@@ -607,10 +558,6 @@ const Automation = () => {
 																automation.queue.includes("orphaned-package")
 															) {
 																triggerManualJob("orphaned-packages");
-															} else if (
-																automation.queue.includes("docker-inventory")
-															) {
-																triggerManualJob("docker-inventory");
 															} else if (
 																automation.queue.includes("agent-commands")
 															) {

frontend/src/pages/Docker.jsx

@@ -1,4 +1,4 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 import {
 	AlertTriangle,
 	ArrowDown,
@@ -11,7 +11,6 @@ import {
 	Search,
 	Server,
 	Shield,
-	Trash2,
 	X,
 } from "lucide-react";
 import { useMemo, useState } from "react";
@@ -19,15 +18,12 @@ import { Link } from "react-router-dom";
 import api from "../utils/api";
 
 const Docker = () => {
-	const queryClient = useQueryClient();
 	const [searchTerm, setSearchTerm] = useState("");
 	const [activeTab, setActiveTab] = useState("containers");
 	const [sortField, setSortField] = useState("status");
 	const [sortDirection, setSortDirection] = useState("asc");
 	const [statusFilter, setStatusFilter] = useState("all");
 	const [sourceFilter, setSourceFilter] = useState("all");
-	const [deleteContainerModal, setDeleteContainerModal] = useState(null);
-	const [deleteImageModal, setDeleteImageModal] = useState(null);
 
 	// Fetch Docker dashboard data
 	const { data: dashboard, isLoading: dashboardLoading } = useQuery({
@@ -40,11 +36,7 @@ const Docker = () => {
 	});
 
 	// Fetch containers
-	const {
-		data: containersData,
-		isLoading: containersLoading,
-		refetch: refetchContainers,
-	} = useQuery({
+	const { data: containersData, isLoading: containersLoading } = useQuery({
 		queryKey: ["docker", "containers", statusFilter],
 		queryFn: async () => {
 			const params = new URLSearchParams();
@@ -57,11 +49,7 @@ const Docker = () => {
 	});
 
 	// Fetch images
-	const {
-		data: imagesData,
-		isLoading: imagesLoading,
-		refetch: refetchImages,
-	} = useQuery({
+	const { data: imagesData, isLoading: imagesLoading } = useQuery({
 		queryKey: ["docker", "images", sourceFilter],
 		queryFn: async () => {
 			const params = new URLSearchParams();
@@ -93,42 +81,6 @@ const Docker = () => {
 		enabled: activeTab === "updates",
 	});
 
-	// Delete container mutation
-	const deleteContainerMutation = useMutation({
-		mutationFn: async (containerId) => {
-			const response = await api.delete(`/docker/containers/${containerId}`);
-			return response.data;
-		},
-		onSuccess: () => {
-			queryClient.invalidateQueries(["docker", "containers"]);
-			queryClient.invalidateQueries(["docker", "dashboard"]);
-			setDeleteContainerModal(null);
-		},
-		onError: (error) => {
-			alert(
-				`Failed to delete container: ${error.response?.data?.error || error.message}`,
-			);
-		},
-	});
-
-	// Delete image mutation
-	const deleteImageMutation = useMutation({
-		mutationFn: async (imageId) => {
-			const response = await api.delete(`/docker/images/${imageId}`);
-			return response.data;
-		},
-		onSuccess: () => {
-			queryClient.invalidateQueries(["docker", "images"]);
-			queryClient.invalidateQueries(["docker", "dashboard"]);
-			setDeleteImageModal(null);
-		},
-		onError: (error) => {
-			alert(
-				`Failed to delete image: ${error.response?.data?.error || error.message}`,
-			);
-		},
-	});
-
 	// Filter and sort containers
 	const filteredContainers = useMemo(() => {
 		if (!containersData?.containers) return [];
@@ -336,36 +288,32 @@ const Docker = () => {
 	};
 
 	return (
-		<div className="h-[calc(100vh-7rem)] flex flex-col overflow-hidden">
+		<div className="space-y-6">
 			{/* Header */}
-			<div className="flex items-center justify-between mb-6">
+			<div className="flex justify-between items-center">
 				<div>
-					<h1 className="text-2xl font-semibold text-secondary-900 dark:text-white">
+					<h1 className="text-2xl font-bold text-secondary-900 dark:text-white">
 						Docker Inventory
 					</h1>
-					<p className="text-sm text-secondary-600 dark:text-secondary-400 mt-1">
+					<p className="mt-1 text-sm text-secondary-600 dark:text-secondary-400">
 						Monitor containers, images, and updates across your infrastructure
 					</p>
 				</div>
-				<div className="flex items-center gap-3">
-					<button
-						type="button"
-						onClick={() => {
-							// Trigger refresh based on active tab
-							if (activeTab === "containers") refetchContainers();
-							else if (activeTab === "images") refetchImages();
-							else window.location.reload();
-						}}
-						className="btn-outline flex items-center justify-center p-2"
-						title="Refresh data"
-					>
-						<RefreshCw className="h-4 w-4" />
-					</button>
-				</div>
+				<button
+					type="button"
+					onClick={() => {
+						// Trigger refresh of all queries
+						window.location.reload();
+					}}
+					className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-white bg-primary-600 hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500"
+				>
+					<RefreshCw className="h-4 w-4 mr-2" />
+					Refresh
+				</button>
 			</div>
 
-			{/* Stats Summary */}
-			<div className="grid grid-cols-1 sm:grid-cols-4 gap-4 mb-6">
+			{/* Dashboard Cards */}
+			<div className="grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-4">
 				<div className="card p-4">
 					<div className="flex items-center">
 						<div className="flex-shrink-0">
@@ -452,11 +400,11 @@ const Docker = () => {
 				</div>
 			</div>
 
-			{/* Docker List */}
-			<div className="card flex-1 flex flex-col overflow-hidden min-h-0">
+			{/* Tabs and Content */}
+			<div className="card">
 				{/* Tab Navigation */}
-				<div className="border-b border-secondary-200 dark:border-secondary-600">
-					<nav className="-mb-px flex space-x-8 px-4" aria-label="Tabs">
+				<div className="border-b border-secondary-200 dark:border-secondary-700">
+					<nav className="-mb-px flex space-x-8 px-6" aria-label="Tabs">
 						{[
 							{ id: "containers", label: "Containers", icon: Container },
 							{ id: "images", label: "Images", icon: Package },
@@ -495,7 +443,7 @@ const Docker = () => {
 				</div>
 
 				{/* Filters and Search */}
-				<div className="p-4 border-b border-secondary-200 dark:border-secondary-600">
+				<div className="p-6 border-b border-secondary-200 dark:border-secondary-700">
 					<div className="flex flex-col sm:flex-row gap-4">
 						<div className="flex-1">
 							<div className="relative">
@@ -550,7 +498,7 @@ const Docker = () => {
 				</div>
 
 				{/* Tab Content */}
-				<div className="p-4 flex-1 overflow-auto">
+				<div className="p-6">
 					{/* Containers Tab */}
 					{activeTab === "containers" && (
 						<div className="overflow-x-auto">
@@ -574,80 +522,83 @@ const Docker = () => {
 									</p>
 								</div>
 							) : (
-								<table className="min-w-full divide-y divide-secondary-200 dark:divide-secondary-600">
-									<thead className="bg-secondary-50 dark:bg-secondary-700">
+								<table className="min-w-full divide-y divide-secondary-200 dark:divide-secondary-700">
+									<thead className="bg-secondary-50 dark:bg-secondary-900">
 										<tr>
-											<th className="px-4 py-2 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-												<button
-													type="button"
-													onClick={() => handleSort("name")}
-													className="flex items-center gap-2 hover:text-secondary-700"
-												>
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider cursor-pointer hover:bg-secondary-100 dark:hover:bg-secondary-800"
+												onClick={() => handleSort("name")}
+											>
+												<div className="flex items-center gap-2">
 													Container Name
 													{getSortIcon("name")}
-												</button>
+												</div>
 											</th>
-											<th className="px-4 py-2 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-												<button
-													type="button"
-													onClick={() => handleSort("image")}
-													className="flex items-center gap-2 hover:text-secondary-700"
-												>
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider cursor-pointer hover:bg-secondary-100 dark:hover:bg-secondary-800"
+												onClick={() => handleSort("image")}
+											>
+												<div className="flex items-center gap-2">
 													Image
 													{getSortIcon("image")}
-												</button>
+												</div>
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-												<button
-													type="button"
-													onClick={() => handleSort("status")}
-													className="flex items-center gap-2 hover:text-secondary-700"
-												>
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider cursor-pointer hover:bg-secondary-100 dark:hover:bg-secondary-800"
+												onClick={() => handleSort("status")}
+											>
+												<div className="flex items-center gap-2">
 													Status
 													{getSortIcon("status")}
-												</button>
+												</div>
 											</th>
-											<th className="px-4 py-2 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-												<button
-													type="button"
-													onClick={() => handleSort("host")}
-													className="flex items-center gap-2 hover:text-secondary-700"
-												>
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider cursor-pointer hover:bg-secondary-100 dark:hover:bg-secondary-800"
+												onClick={() => handleSort("host")}
+											>
+												<div className="flex items-center gap-2">
 													Host
 													{getSortIcon("host")}
-												</button>
+												</div>
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-right text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Actions
 											</th>
 										</tr>
 									</thead>
-									<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-600">
+									<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-700">
 										{filteredContainers.map((container) => (
 											<tr
 												key={container.id}
-												className="hover:bg-secondary-50 dark:hover:bg-secondary-700 transition-colors"
+												className="hover:bg-secondary-50 dark:hover:bg-secondary-700"
 											>
-												<td className="px-4 py-2 whitespace-nowrap">
-													<div className="flex items-center gap-2">
-														<Container className="h-4 w-4 text-secondary-400 dark:text-secondary-500 flex-shrink-0" />
+												<td className="px-6 py-4 whitespace-nowrap">
+													<div className="flex items-center">
+														<Container className="h-5 w-5 text-secondary-400 mr-3" />
 														<Link
 															to={`/docker/containers/${container.id}`}
-															className="text-sm font-medium text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 truncate"
+															className="text-sm font-medium text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300"
 														>
 															{container.name}
 														</Link>
 													</div>
 												</td>
-												<td className="px-4 py-2">
+												<td className="px-6 py-4">
 													<div className="text-sm text-secondary-900 dark:text-white">
 														{container.image_name}:{container.image_tag}
 													</div>
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center">
+												<td className="px-6 py-4 whitespace-nowrap">
 													{getStatusBadge(container.status)}
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap">
+												<td className="px-6 py-4 whitespace-nowrap">
 													<Link
 														to={`/hosts/${container.host_id}`}
 														className="text-sm text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300"
@@ -657,24 +608,14 @@ const Docker = () => {
 															"Unknown"}
 													</Link>
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center">
-													<div className="flex items-center justify-center gap-3">
-														<Link
-															to={`/docker/containers/${container.id}`}
-															className="text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 inline-flex items-center gap-1"
-															title="View details"
-														>
-															<ExternalLink className="h-4 w-4" />
-														</Link>
-														<button
-															type="button"
-															onClick={() => setDeleteContainerModal(container)}
-															className="text-red-600 hover:text-red-900 dark:text-red-400 dark:hover:text-red-300 inline-flex items-center"
-															title="Delete container from inventory"
-														>
-															<Trash2 className="h-4 w-4" />
-														</button>
-													</div>
+												<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+													<Link
+														to={`/docker/containers/${container.id}`}
+														className="text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 inline-flex items-center"
+													>
+														View
+														<ExternalLink className="ml-1 h-4 w-4" />
+													</Link>
 												</td>
 											</tr>
 										))}
@@ -707,79 +648,88 @@ const Docker = () => {
 									</p>
 								</div>
 							) : (
-								<table className="min-w-full divide-y divide-secondary-200 dark:divide-secondary-600">
-									<thead className="bg-secondary-50 dark:bg-secondary-700">
+								<table className="min-w-full divide-y divide-secondary-200 dark:divide-secondary-700">
+									<thead className="bg-secondary-50 dark:bg-secondary-900">
 										<tr>
-											<th className="px-4 py-2 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-												<button
-													type="button"
-													onClick={() => handleSort("repository")}
-													className="flex items-center gap-2 hover:text-secondary-700"
-												>
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider cursor-pointer hover:bg-secondary-100 dark:hover:bg-secondary-800"
+												onClick={() => handleSort("repository")}
+											>
+												<div className="flex items-center gap-2">
 													Repository
 													{getSortIcon("repository")}
-												</button>
+												</div>
 											</th>
-											<th className="px-4 py-2 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-												<button
-													type="button"
-													onClick={() => handleSort("tag")}
-													className="flex items-center gap-2 hover:text-secondary-700"
-												>
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider cursor-pointer hover:bg-secondary-100 dark:hover:bg-secondary-800"
+												onClick={() => handleSort("tag")}
+											>
+												<div className="flex items-center gap-2">
 													Tag
 													{getSortIcon("tag")}
-												</button>
+												</div>
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Source
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-												<button
-													type="button"
-													onClick={() => handleSort("containers")}
-													className="flex items-center gap-2 hover:text-secondary-700"
-												>
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider cursor-pointer hover:bg-secondary-100 dark:hover:bg-secondary-800"
+												onClick={() => handleSort("containers")}
+											>
+												<div className="flex items-center gap-2">
 													Containers
 													{getSortIcon("containers")}
-												</button>
+												</div>
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Updates
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-right text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Actions
 											</th>
 										</tr>
 									</thead>
-									<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-600">
+									<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-700">
 										{filteredImages.map((image) => (
 											<tr
 												key={image.id}
-												className="hover:bg-secondary-50 dark:hover:bg-secondary-700 transition-colors"
+												className="hover:bg-secondary-50 dark:hover:bg-secondary-700"
 											>
-												<td className="px-4 py-2 whitespace-nowrap">
-													<div className="flex items-center gap-2">
-														<Package className="h-4 w-4 text-secondary-400 dark:text-secondary-500 flex-shrink-0" />
+												<td className="px-6 py-4 whitespace-nowrap">
+													<div className="flex items-center">
+														<Package className="h-5 w-5 text-secondary-400 mr-3" />
 														<Link
 															to={`/docker/images/${image.id}`}
-															className="text-sm font-medium text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 truncate"
+															className="text-sm font-medium text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300"
 														>
 															{image.repository}
 														</Link>
 													</div>
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap">
+												<td className="px-6 py-4 whitespace-nowrap">
 													<span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-secondary-100 text-secondary-800 dark:bg-secondary-700 dark:text-secondary-200">
 														{image.tag}
 													</span>
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center">
+												<td className="px-6 py-4 whitespace-nowrap">
 													{getSourceBadge(image.source)}
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center text-sm text-secondary-900 dark:text-white">
+												<td className="px-6 py-4 whitespace-nowrap text-sm text-secondary-900 dark:text-white">
 													{image._count?.docker_containers || 0}
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center">
+												<td className="px-6 py-4 whitespace-nowrap">
 													{image.hasUpdates ? (
 														<span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200">
 															<AlertTriangle className="h-3 w-3 mr-1" />
@@ -791,24 +741,14 @@ const Docker = () => {
 														</span>
 													)}
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center">
-													<div className="flex items-center justify-center gap-3">
-														<Link
-															to={`/docker/images/${image.id}`}
-															className="text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 inline-flex items-center"
-															title="View details"
-														>
-															<ExternalLink className="h-4 w-4" />
-														</Link>
-														<button
-															type="button"
-															onClick={() => setDeleteImageModal(image)}
-															className="text-red-600 hover:text-red-900 dark:text-red-400 dark:hover:text-red-300 inline-flex items-center"
-															title="Delete image from inventory"
-														>
-															<Trash2 className="h-4 w-4" />
-														</button>
-													</div>
+												<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+													<Link
+														to={`/docker/images/${image.id}`}
+														className="text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 inline-flex items-center"
+													>
+														View
+														<ExternalLink className="ml-1 h-4 w-4" />
+													</Link>
 												</td>
 											</tr>
 										))}
@@ -841,80 +781,86 @@ const Docker = () => {
 									</p>
 								</div>
 							) : (
-								<table className="min-w-full divide-y divide-secondary-200 dark:divide-secondary-600">
-									<thead className="bg-secondary-50 dark:bg-secondary-700">
+								<table className="min-w-full divide-y divide-secondary-200 dark:divide-secondary-700">
+									<thead className="bg-secondary-50 dark:bg-secondary-900">
 										<tr>
-											<th className="px-4 py-2 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-												<button
-													type="button"
-													onClick={() => handleSort("name")}
-													className="flex items-center gap-2 hover:text-secondary-700"
-												>
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider cursor-pointer hover:bg-secondary-100 dark:hover:bg-secondary-800"
+												onClick={() => handleSort("name")}
+											>
+												<div className="flex items-center gap-2">
 													Host Name
 													{getSortIcon("name")}
-												</button>
+												</div>
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-												<button
-													type="button"
-													onClick={() => handleSort("containers")}
-													className="flex items-center gap-2 hover:text-secondary-700"
-												>
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider cursor-pointer hover:bg-secondary-100 dark:hover:bg-secondary-800"
+												onClick={() => handleSort("containers")}
+											>
+												<div className="flex items-center gap-2">
 													Containers
 													{getSortIcon("containers")}
-												</button>
+												</div>
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Running
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
-												<button
-													type="button"
-													onClick={() => handleSort("images")}
-													className="flex items-center gap-2 hover:text-secondary-700"
-												>
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider cursor-pointer hover:bg-secondary-100 dark:hover:bg-secondary-800"
+												onClick={() => handleSort("images")}
+											>
+												<div className="flex items-center gap-2">
 													Images
 													{getSortIcon("images")}
-												</button>
+												</div>
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-right text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Actions
 											</th>
 										</tr>
 									</thead>
-									<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-600">
+									<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-700">
 										{filteredHosts.map((host) => (
 											<tr
 												key={host.id}
-												className="hover:bg-secondary-50 dark:hover:bg-secondary-700 transition-colors"
+												className="hover:bg-secondary-50 dark:hover:bg-secondary-700"
 											>
-												<td className="px-4 py-2 whitespace-nowrap">
-													<div className="flex items-center gap-2">
-														<Server className="h-4 w-4 text-secondary-400 dark:text-secondary-500 flex-shrink-0" />
+												<td className="px-6 py-4 whitespace-nowrap">
+													<div className="flex items-center">
+														<Server className="h-5 w-5 text-secondary-400 mr-3" />
 														<Link
 															to={`/docker/hosts/${host.id}`}
-															className="text-sm font-medium text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 truncate"
+															className="text-sm font-medium text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300"
 														>
 															{host.friendly_name || host.hostname}
 														</Link>
 													</div>
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center text-sm text-secondary-900 dark:text-white">
+												<td className="px-6 py-4 whitespace-nowrap text-sm text-secondary-900 dark:text-white">
 													{host.dockerStats?.totalContainers || 0}
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center text-sm text-green-600 dark:text-green-400 font-medium">
+												<td className="px-6 py-4 whitespace-nowrap text-sm text-green-600 dark:text-green-400">
 													{host.dockerStats?.runningContainers || 0}
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center text-sm text-secondary-900 dark:text-white">
+												<td className="px-6 py-4 whitespace-nowrap text-sm text-secondary-900 dark:text-white">
 													{host.dockerStats?.totalImages || 0}
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center">
+												<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
 													<Link
 														to={`/docker/hosts/${host.id}`}
-														className="text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 inline-flex items-center gap-1"
-														title="View details"
+														className="text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 inline-flex items-center"
 													>
-														<ExternalLink className="h-4 w-4" />
+														View
+														<ExternalLink className="ml-1 h-4 w-4" />
 													</Link>
 												</td>
 											</tr>
@@ -946,64 +892,82 @@ const Docker = () => {
 									</p>
 								</div>
 							) : (
-								<table className="min-w-full divide-y divide-secondary-200 dark:divide-secondary-600">
-									<thead className="bg-secondary-50 dark:bg-secondary-700">
+								<table className="min-w-full divide-y divide-secondary-200 dark:divide-secondary-700">
+									<thead className="bg-secondary-50 dark:bg-secondary-900">
 										<tr>
-											<th className="px-4 py-2 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Image
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Tag
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Detection Method
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Status
 											</th>
-											<th className="px-4 py-2 text-left text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-left text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Affected
 											</th>
-											<th className="px-4 py-2 text-center text-xs font-medium text-secondary-500 dark:text-secondary-300 uppercase tracking-wider">
+											<th
+												scope="col"
+												className="px-6 py-3 text-right text-xs font-medium text-secondary-500 dark:text-secondary-400 uppercase tracking-wider"
+											>
 												Actions
 											</th>
 										</tr>
 									</thead>
-									<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-600">
+									<tbody className="bg-white dark:bg-secondary-800 divide-y divide-secondary-200 dark:divide-secondary-700">
 										{updatesData.updates.map((update) => (
 											<tr
 												key={update.id}
-												className="hover:bg-secondary-50 dark:hover:bg-secondary-700 transition-colors"
+												className="hover:bg-secondary-50 dark:hover:bg-secondary-700"
 											>
-												<td className="px-4 py-2 whitespace-nowrap">
-													<div className="flex items-center gap-2">
-														<Package className="h-4 w-4 text-secondary-400 dark:text-secondary-500 flex-shrink-0" />
+												<td className="px-6 py-4 whitespace-nowrap">
+													<div className="flex items-center">
+														<Package className="h-5 w-5 text-secondary-400 mr-3" />
 														<Link
 															to={`/docker/images/${update.image_id}`}
-															className="text-sm font-medium text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 truncate"
+															className="text-sm font-medium text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300"
 														>
 															{update.docker_images?.repository}
 														</Link>
 													</div>
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center">
+												<td className="px-6 py-4 whitespace-nowrap">
 													<span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-secondary-100 text-secondary-800 dark:bg-secondary-700 dark:text-secondary-200">
 														{update.current_tag}
 													</span>
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center">
+												<td className="px-6 py-4 whitespace-nowrap">
 													<span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-purple-100 text-purple-800 dark:bg-purple-900 dark:text-purple-200">
 														<Package className="h-3 w-3 mr-1" />
-														Digest
+														Digest Comparison
 													</span>
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center">
+												<td className="px-6 py-4 whitespace-nowrap">
 													<span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200">
 														<AlertTriangle className="h-3 w-3 mr-1" />
-														Available
+														Update Available
 													</span>
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-sm text-secondary-900 dark:text-white">
+												<td className="px-6 py-4 whitespace-nowrap text-sm text-secondary-900 dark:text-white">
 													{update.affectedContainersCount} container
 													{update.affectedContainersCount !== 1 ? "s" : ""}
 													{update.affectedHosts?.length > 0 && (
@@ -1014,13 +978,13 @@ const Docker = () => {
 														</span>
 													)}
 												</td>
-												<td className="px-4 py-2 whitespace-nowrap text-center">
+												<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
 													<Link
 														to={`/docker/images/${update.image_id}`}
-														className="text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 inline-flex items-center gap-1"
-														title="View details"
+														className="text-primary-600 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-300 inline-flex items-center"
 													>
-														<ExternalLink className="h-4 w-4" />
+														View
+														<ExternalLink className="ml-1 h-4 w-4" />
 													</Link>
 												</td>
 											</tr>
@@ -1032,141 +996,6 @@ const Docker = () => {
 					)}
 				</div>
 			</div>
-
-			{/* Delete Container Modal */}
-			{deleteContainerModal && (
-				<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
-					<div className="bg-white dark:bg-secondary-800 rounded-lg p-6 max-w-md w-full mx-4">
-						<div className="flex items-start mb-4">
-							<div className="flex-shrink-0">
-								<AlertTriangle className="h-6 w-6 text-red-600" />
-							</div>
-							<div className="ml-3 flex-1">
-								<h3 className="text-lg font-medium text-secondary-900 dark:text-white">
-									Delete Container
-								</h3>
-								<div className="mt-2 text-sm text-secondary-600 dark:text-secondary-300">
-									<p className="mb-2">
-										Are you sure you want to delete this container from the
-										inventory?
-									</p>
-									<div className="bg-secondary-100 dark:bg-secondary-700 p-3 rounded-md">
-										<p className="font-medium text-secondary-900 dark:text-white">
-											{deleteContainerModal.name}
-										</p>
-										<p className="text-xs text-secondary-600 dark:text-secondary-400 mt-1">
-											Image: {deleteContainerModal.image_name}:
-											{deleteContainerModal.image_tag}
-										</p>
-										<p className="text-xs text-secondary-600 dark:text-secondary-400">
-											Host:{" "}
-											{deleteContainerModal.host?.friendly_name || "Unknown"}
-										</p>
-									</div>
-									<p className="mt-3 text-red-600 dark:text-red-400 font-medium">
-										⚠️ This only removes the container from PatchMon's inventory.
-										It does NOT stop or delete the actual Docker container on
-										the host.
-									</p>
-								</div>
-							</div>
-						</div>
-						<div className="mt-5 sm:mt-4 sm:flex sm:flex-row-reverse gap-3">
-							<button
-								type="button"
-								onClick={() =>
-									deleteContainerMutation.mutate(deleteContainerModal.id)
-								}
-								disabled={deleteContainerMutation.isPending}
-								className="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm disabled:opacity-50 disabled:cursor-not-allowed"
-							>
-								{deleteContainerMutation.isPending
-									? "Deleting..."
-									: "Delete from Inventory"}
-							</button>
-							<button
-								type="button"
-								onClick={() => setDeleteContainerModal(null)}
-								disabled={deleteContainerMutation.isPending}
-								className="mt-3 w-full inline-flex justify-center rounded-md border border-secondary-300 dark:border-secondary-600 shadow-sm px-4 py-2 bg-white dark:bg-secondary-700 text-base font-medium text-secondary-700 dark:text-secondary-200 hover:bg-secondary-50 dark:hover:bg-secondary-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 sm:mt-0 sm:w-auto sm:text-sm disabled:opacity-50 disabled:cursor-not-allowed"
-							>
-								Cancel
-							</button>
-						</div>
-					</div>
-				</div>
-			)}
-
-			{/* Delete Image Modal */}
-			{deleteImageModal && (
-				<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
-					<div className="bg-white dark:bg-secondary-800 rounded-lg p-6 max-w-md w-full mx-4">
-						<div className="flex items-start mb-4">
-							<div className="flex-shrink-0">
-								<AlertTriangle className="h-6 w-6 text-red-600" />
-							</div>
-							<div className="ml-3 flex-1">
-								<h3 className="text-lg font-medium text-secondary-900 dark:text-white">
-									Delete Image
-								</h3>
-								<div className="mt-2 text-sm text-secondary-600 dark:text-secondary-300">
-									<p className="mb-2">
-										Are you sure you want to delete this image from the
-										inventory?
-									</p>
-									<div className="bg-secondary-100 dark:bg-secondary-700 p-3 rounded-md">
-										<p className="font-medium text-secondary-900 dark:text-white">
-											{deleteImageModal.repository}:{deleteImageModal.tag}
-										</p>
-										<p className="text-xs text-secondary-600 dark:text-secondary-400 mt-1">
-											Source: {deleteImageModal.source}
-										</p>
-										<p className="text-xs text-secondary-600 dark:text-secondary-400">
-											Containers using this:{" "}
-											{deleteImageModal._count?.docker_containers || 0}
-										</p>
-									</div>
-									{deleteImageModal._count?.docker_containers > 0 ? (
-										<p className="mt-3 text-red-600 dark:text-red-400 font-medium">
-											⚠️ Cannot delete: This image is in use by{" "}
-											{deleteImageModal._count.docker_containers} container(s).
-											Delete the containers first.
-										</p>
-									) : (
-										<p className="mt-3 text-red-600 dark:text-red-400 font-medium">
-											⚠️ This only removes the image from PatchMon's inventory.
-											It does NOT delete the actual Docker image from hosts.
-										</p>
-									)}
-								</div>
-							</div>
-						</div>
-						<div className="mt-5 sm:mt-4 sm:flex sm:flex-row-reverse gap-3">
-							<button
-								type="button"
-								onClick={() => deleteImageMutation.mutate(deleteImageModal.id)}
-								disabled={
-									deleteImageMutation.isPending ||
-									deleteImageModal._count?.docker_containers > 0
-								}
-								className="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:w-auto sm:text-sm disabled:opacity-50 disabled:cursor-not-allowed"
-							>
-								{deleteImageMutation.isPending
-									? "Deleting..."
-									: "Delete from Inventory"}
-							</button>
-							<button
-								type="button"
-								onClick={() => setDeleteImageModal(null)}
-								disabled={deleteImageMutation.isPending}
-								className="mt-3 w-full inline-flex justify-center rounded-md border border-secondary-300 dark:border-secondary-600 shadow-sm px-4 py-2 bg-white dark:bg-secondary-700 text-base font-medium text-secondary-700 dark:text-secondary-200 hover:bg-secondary-50 dark:hover:bg-secondary-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 sm:mt-0 sm:w-auto sm:text-sm disabled:opacity-50 disabled:cursor-not-allowed"
-							>
-								Cancel
-							</button>
-						</div>
-					</div>
-				</div>
-			)}
 		</div>
 	);
 };

frontend/src/pages/HostDetail.jsx

@@ -52,7 +52,6 @@ const HostDetail = () => {
 	const [historyPage, setHistoryPage] = useState(0);
 	const [historyLimit] = useState(10);
 	const [notes, setNotes] = useState("");
-	const [notesMessage, setNotesMessage] = useState({ text: "", type: "" });
 
 	const {
 		data: host,
@@ -213,17 +212,6 @@ const HostDetail = () => {
 		onSuccess: () => {
 			queryClient.invalidateQueries(["host", hostId]);
 			queryClient.invalidateQueries(["hosts"]);
-			setNotesMessage({ text: "Notes saved successfully!", type: "success" });
-			// Clear message after 3 seconds
-			setTimeout(() => setNotesMessage({ text: "", type: "" }), 3000);
-		},
-		onError: (error) => {
-			setNotesMessage({
-				text: error.response?.data?.error || "Failed to save notes",
-				type: "error",
-			});
-			// Clear message after 5 seconds for errors
-			setTimeout(() => setNotesMessage({ text: "", type: "" }), 5000);
 		},
 	});
 
@@ -1245,37 +1233,6 @@ const HostDetail = () => {
 										Host Notes
 									</h3>
 								</div>
-
-								{/* Success/Error Message */}
-								{notesMessage.text && (
-									<div
-										className={`rounded-md p-4 ${
-											notesMessage.type === "success"
-												? "bg-green-50 dark:bg-green-900 border border-green-200 dark:border-green-700"
-												: "bg-red-50 dark:bg-red-900 border border-red-200 dark:border-red-700"
-										}`}
-									>
-										<div className="flex">
-											{notesMessage.type === "success" ? (
-												<CheckCircle className="h-5 w-5 text-green-400 dark:text-green-300" />
-											) : (
-												<AlertCircle className="h-5 w-5 text-red-400 dark:text-red-300" />
-											)}
-											<div className="ml-3">
-												<p
-													className={`text-sm font-medium ${
-														notesMessage.type === "success"
-															? "text-green-800 dark:text-green-200"
-															: "text-red-800 dark:text-red-200"
-													}`}
-												>
-													{notesMessage.text}
-												</p>
-											</div>
-										</div>
-									</div>
-								)}
-
 								<div className="bg-secondary-50 dark:bg-secondary-700 rounded-lg p-4">
 									<textarea
 										value={notes}

frontend/src/pages/Hosts.jsx

@@ -402,77 +402,111 @@ const Hosts = () => {
 		const token = localStorage.getItem("token");
 		if (!token) return;
 
-		// Fetch initial WebSocket status for all hosts
 		// Fetch initial WebSocket status for all hosts
 		const fetchInitialStatus = async () => {
-			const apiIds = hosts
+			const statusPromises = hosts
 				.filter((host) => host.api_id)
-				.map((host) => host.api_id);
+				.map(async (host) => {
+					try {
+						const response = await fetch(`/api/v1/ws/status/${host.api_id}`, {
+							headers: {
+								Authorization: `Bearer ${token}`,
+							},
+						});
+						if (response.ok) {
+							const data = await response.json();
+							return { apiId: host.api_id, status: data.data };
+						}
+					} catch (_error) {
+						// Silently handle errors
+					}
+					return {
+						apiId: host.api_id,
+						status: { connected: false, secure: false },
+					};
+				});
 
-			if (apiIds.length === 0) return;
+			const results = await Promise.all(statusPromises);
+			const initialStatusMap = {};
+			results.forEach(({ apiId, status }) => {
+				initialStatusMap[apiId] = status;
+			});
 
-			try {
-				const response = await fetch(
-					`/api/v1/ws/status?apiIds=${apiIds.join(",")}`,
-					{
-						headers: {
-							Authorization: `Bearer ${token}`,
-						},
-					},
-				);
-				if (response.ok) {
-					const result = await response.json();
-					setWsStatusMap(result.data);
-				}
-			} catch (_error) {
-				// Silently handle errors
-			}
+			setWsStatusMap(initialStatusMap);
 		};
 
 		fetchInitialStatus();
 	}, [hosts]);
 
-	// Subscribe to WebSocket status changes for all hosts via polling (lightweight alternative to SSE)
+	// Subscribe to WebSocket status changes for all hosts via SSE
 	useEffect(() => {
 		if (!hosts || hosts.length === 0) return;
 
 		const token = localStorage.getItem("token");
 		if (!token) return;
 
-		// Use polling instead of SSE to avoid connection pool issues
-		// Poll every 10 seconds instead of 19 persistent connections
-		const pollInterval = setInterval(() => {
-			const apiIds = hosts
-				.filter((host) => host.api_id)
-				.map((host) => host.api_id);
+		const eventSources = new Map();
+		let isMounted = true;
 
-			if (apiIds.length === 0) return;
+		const connectHost = (apiId) => {
+			if (!isMounted || eventSources.has(apiId)) return;
 
-			fetch(`/api/v1/ws/status?apiIds=${apiIds.join(",")}`, {
-				headers: {
-					Authorization: `Bearer ${token}`,
-				},
-			})
-				.then((response) => response.json())
-				.then((result) => {
-					if (result.success && result.data) {
-						setWsStatusMap(result.data);
+			try {
+				const es = new EventSource(
+					`/api/v1/ws/status/${apiId}/stream?token=${encodeURIComponent(token)}`,
+				);
+
+				es.onmessage = (event) => {
+					try {
+						const data = JSON.parse(event.data);
+						if (isMounted) {
+							setWsStatusMap((prev) => {
+								const newMap = { ...prev, [apiId]: data };
+								return newMap;
+							});
+						}
+					} catch (_err) {
+						// Silently handle parse errors
 					}
-				})
-				.catch(() => {
-					// Silently handle errors
-				});
-		}, 10000); // Poll every 10 seconds
+				};
+
+				es.onerror = (_error) => {
+					console.log(`[SSE] Connection error for ${apiId}, retrying...`);
+					es?.close();
+					eventSources.delete(apiId);
+					if (isMounted) {
+						// Retry connection after 5 seconds with exponential backoff
+						setTimeout(() => connectHost(apiId), 5000);
+					}
+				};
+
+				eventSources.set(apiId, es);
+			} catch (_err) {
+				// Silently handle connection errors
+			}
+		};
+
+		// Connect to all hosts
+		for (const host of hosts) {
+			if (host.api_id) {
+				connectHost(host.api_id);
+			} else {
+			}
+		}
 
 		// Cleanup function
 		return () => {
-			clearInterval(pollInterval);
+			isMounted = false;
+			for (const es of eventSources.values()) {
+				es.close();
+			}
+			eventSources.clear();
 		};
 	}, [hosts]);
 
 	const bulkUpdateGroupMutation = useMutation({
-		mutationFn: ({ hostIds, groupIds }) =>
-			adminHostsAPI.bulkUpdateGroups(hostIds, groupIds),
+		mutationFn: ({ hostIds, hostGroupId }) =>
+			adminHostsAPI.bulkUpdateGroup(hostIds, hostGroupId),
 		onSuccess: (data) => {
 			console.log("bulkUpdateGroupMutation success:", data);
 
@@ -483,7 +517,11 @@ const Hosts = () => {
 					return oldData.map((host) => {
 						const updatedHost = data.hosts.find((h) => h.id === host.id);
 						if (updatedHost) {
-							return updatedHost;
+							// Ensure hostGroupId is set correctly
+							return {
+								...updatedHost,
+								hostGroupId: updatedHost.host_groups?.id || null,
+							};
 						}
 						return host;
 					});
@@ -633,8 +671,8 @@ const Hosts = () => {
 		}
 	};
 
-	const handleBulkAssign = (groupIds) => {
-		bulkUpdateGroupMutation.mutate({ hostIds: selectedHosts, groupIds });
+	const handleBulkAssign = (hostGroupId) => {
+		bulkUpdateGroupMutation.mutate({ hostIds: selectedHosts, hostGroupId });
 	};
 
 	const handleBulkDelete = () => {
@@ -1759,7 +1797,8 @@ const BulkAssignModal = ({
 	onAssign,
 	isLoading,
 }) => {
-	const [selectedGroupIds, setSelectedGroupIds] = useState([]);
+	const [selectedGroupId, setSelectedGroupId] = useState("");
+	const bulkHostGroupId = useId();
 
 	// Fetch host groups for selection
 	const { data: hostGroups } = useQuery({
@@ -1773,17 +1812,7 @@ const BulkAssignModal = ({
 
 	const handleSubmit = (e) => {
 		e.preventDefault();
-		onAssign(selectedGroupIds);
-	};
-
-	const toggleGroup = (groupId) => {
-		setSelectedGroupIds((prev) => {
-			if (prev.includes(groupId)) {
-				return prev.filter((id) => id !== groupId);
-			} else {
-				return [...prev, groupId];
-			}
-		});
+		onAssign(selectedGroupId || null);
 	};
 
 	return (
@@ -1791,7 +1820,7 @@ const BulkAssignModal = ({
 			<div className="bg-white dark:bg-secondary-800 rounded-lg p-6 w-full max-w-md">
 				<div className="flex justify-between items-center mb-4">
 					<h3 className="text-lg font-semibold text-secondary-900 dark:text-white">
-						Assign to Host Groups
+						Assign to Host Group
 					</h3>
 					<button
 						type="button"
@@ -1821,43 +1850,27 @@ const BulkAssignModal = ({
 
 				<form onSubmit={handleSubmit} className="space-y-4">
 					<div>
-						<span className="block text-sm font-medium text-secondary-700 dark:text-secondary-200 mb-3">
-							Host Groups
-						</span>
-						<div className="space-y-2 max-h-48 overflow-y-auto">
-							{/* Host Group Options */}
+						<label
+							htmlFor={bulkHostGroupId}
+							className="block text-sm font-medium text-secondary-700 dark:text-secondary-300 mb-1"
+						>
+							Host Group
+						</label>
+						<select
+							id={bulkHostGroupId}
+							value={selectedGroupId}
+							onChange={(e) => setSelectedGroupId(e.target.value)}
+							className="w-full px-3 py-2 border border-secondary-300 dark:border-secondary-600 rounded-md bg-white dark:bg-secondary-700 text-secondary-900 dark:text-white focus:outline-none focus:ring-2 focus:ring-primary-500"
+						>
+							<option value="">No group (ungrouped)</option>
 							{hostGroups?.map((group) => (
-								<label
-									key={group.id}
-									className={`flex items-center gap-3 p-3 border-2 rounded-lg transition-all duration-200 cursor-pointer ${
-										selectedGroupIds.includes(group.id)
-											? "border-primary-500 bg-primary-50 dark:bg-primary-900/30"
-											: "border-secondary-300 dark:border-secondary-600 bg-white dark:bg-secondary-700 hover:border-secondary-400 dark:hover:border-secondary-500"
-									}`}
-								>
-									<input
-										type="checkbox"
-										checked={selectedGroupIds.includes(group.id)}
-										onChange={() => toggleGroup(group.id)}
-										className="w-4 h-4 text-primary-600 bg-gray-100 border-gray-300 rounded focus:ring-primary-500 dark:focus:ring-primary-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
-									/>
-									<div className="flex items-center gap-2 flex-1">
-										{group.color && (
-											<div
-												className="w-3 h-3 rounded-full border border-secondary-300 dark:border-secondary-500 flex-shrink-0"
-												style={{ backgroundColor: group.color }}
-											></div>
-										)}
-										<div className="text-sm font-medium text-secondary-700 dark:text-secondary-200">
-											{group.name}
-										</div>
-									</div>
-								</label>
+								<option key={group.id} value={group.id}>
+									{group.name}
+								</option>
 							))}
-						</div>
-						<p className="mt-2 text-sm text-secondary-500 dark:text-secondary-400">
-							Select one or more groups to assign these hosts to, or leave
-							ungrouped.
+						</select>
+						<p className="mt-1 text-sm text-secondary-500 dark:text-secondary-400">
+							Select a group to assign these hosts to, or leave ungrouped.
 						</p>
 					</div>
 
@@ -1871,7 +1884,7 @@ const BulkAssignModal = ({
 							Cancel
 						</button>
 						<button type="submit" className="btn-primary" disabled={isLoading}>
-							{isLoading ? "Assigning..." : "Assign to Groups"}
+							{isLoading ? "Assigning..." : "Assign to Group"}
 						</button>
 					</div>
 				</form>

frontend/src/pages/Packages.jsx

@@ -153,14 +153,6 @@ const Packages = () => {
 		}));
 	}, [packagesResponse]);
 
-	// Fetch dashboard stats for card counts (consistent with homepage)
-	const { data: dashboardStats } = useQuery({
-		queryKey: ["dashboardStats"],
-		queryFn: () => dashboardAPI.getStats().then((res) => res.data),
-		staleTime: 5 * 60 * 1000, // Data stays fresh for 5 minutes
-		refetchOnWindowFocus: false, // Don't refetch when window regains focus
-	});
-
 	// Fetch hosts data to get total packages count
 	const { data: hosts } = useQuery({
 		queryKey: ["hosts"],
@@ -454,20 +446,24 @@ const Packages = () => {
 	const uniquePackageHostsCount = uniquePackageHosts.size;
 
 	// Calculate total packages installed
-	// Show unique package count (same as table) for consistency
-	const totalPackagesCount = packages?.length || 0;
+	// When filtering by host, count each package once (since it can only be installed once per host)
+	// When not filtering, sum up all installations across all hosts
+	const totalPackagesCount =
+		hostFilter && hostFilter !== "all"
+			? packages?.length || 0
+			: packages?.reduce(
+					(sum, pkg) => sum + (pkg.stats?.totalInstalls || 0),
+					0,
+				) || 0;
 
-	// Calculate total installations across all hosts
-	const totalInstallationsCount =
-		packages?.reduce((sum, pkg) => sum + (pkg.stats?.totalInstalls || 0), 0) ||
-		0;
-
-	// Use dashboard stats for outdated packages count (consistent with homepage)
+	// Calculate outdated packages
 	const outdatedPackagesCount =
-		dashboardStats?.cards?.totalOutdatedPackages || 0;
+		packages?.filter((pkg) => (pkg.stats?.updatesNeeded || 0) > 0).length || 0;
 
-	// Use dashboard stats for security updates count (consistent with homepage)
-	const securityUpdatesCount = dashboardStats?.cards?.securityUpdates || 0;
+	// Calculate security updates
+	const securityUpdatesCount =
+		packages?.filter((pkg) => (pkg.stats?.securityUpdates || 0) > 0).length ||
+		0;
 
 	if (isLoading) {
 		return (
@@ -533,13 +529,13 @@ const Packages = () => {
 			</div>
 
 			{/* Summary Stats */}
-			<div className="grid grid-cols-1 sm:grid-cols-5 gap-4 mb-6 flex-shrink-0">
+			<div className="grid grid-cols-1 sm:grid-cols-4 gap-4 mb-6 flex-shrink-0">
 				<div className="card p-4 cursor-pointer hover:shadow-card-hover dark:hover:shadow-card-hover-dark transition-shadow duration-200">
 					<div className="flex items-center">
 						<Package className="h-5 w-5 text-primary-600 mr-2" />
 						<div>
 							<p className="text-sm text-secondary-500 dark:text-white">
-								Total Packages
+								Total Installed
 							</p>
 							<p className="text-xl font-semibold text-secondary-900 dark:text-white">
 								{totalPackagesCount}
@@ -548,20 +544,6 @@ const Packages = () => {
 					</div>
 				</div>
 
-				<div className="card p-4 cursor-pointer hover:shadow-card-hover dark:hover:shadow-card-hover-dark transition-shadow duration-200">
-					<div className="flex items-center">
-						<Package className="h-5 w-5 text-blue-600 mr-2" />
-						<div>
-							<p className="text-sm text-secondary-500 dark:text-white">
-								Total Installations
-							</p>
-							<p className="text-xl font-semibold text-secondary-900 dark:text-white">
-								{totalInstallationsCount}
-							</p>
-						</div>
-					</div>
-				</div>
-
 				<div className="card p-4 cursor-pointer hover:shadow-card-hover dark:hover:shadow-card-hover-dark transition-shadow duration-200">
 					<div className="flex items-center">
 						<Package className="h-5 w-5 text-warning-600 mr-2" />

frontend/src/pages/Profile.jsx

@@ -26,7 +26,7 @@ import { useEffect, useId, useState } from "react";
 
 import { useAuth } from "../contexts/AuthContext";
 import { useTheme } from "../contexts/ThemeContext";
-import { isCorsError, tfaAPI } from "../utils/api";
+import { tfaAPI } from "../utils/api";
 
 const Profile = () => {
 	const usernameId = useId();
@@ -88,15 +88,8 @@ const Profile = () => {
 					text: result.error || "Failed to update profile",
 				});
 			}
-		} catch (error) {
-			if (isCorsError(error)) {
-				setMessage({
-					type: "error",
-					text: "CORS_ORIGIN mismatch - please set your URL in your environment variable",
-				});
-			} else {
-				setMessage({ type: "error", text: "Network error occurred" });
-			}
+		} catch {
+			setMessage({ type: "error", text: "Network error occurred" });
 		} finally {
 			setIsLoading(false);
 		}
@@ -140,15 +133,8 @@ const Profile = () => {
 					text: result.error || "Failed to change password",
 				});
 			}
-		} catch (error) {
-			if (isCorsError(error)) {
-				setMessage({
-					type: "error",
-					text: "CORS_ORIGIN mismatch - please set your URL in your environment variable",
-				});
-			} else {
-				setMessage({ type: "error", text: "Network error occurred" });
-			}
+		} catch {
+			setMessage({ type: "error", text: "Network error occurred" });
 		} finally {
 			setIsLoading(false);
 		}

frontend/src/pages/Settings.jsx

@@ -144,7 +144,7 @@ const Settings = () => {
 				defaultUserRole: settings.default_user_role || "user",
 				githubRepoUrl:
 					settings.github_repo_url ||
-					"https://github.com/PatchMon/PatchMon.git",
+					"git@github.com:9technologygroup/patchmon.net.git",
 				repositoryType: settings.repository_type || "public",
 				sshKeyPath: settings.ssh_key_path || "",
 				useCustomSshKey: !!settings.ssh_key_path,

frontend/src/pages/settings/SettingsMetrics.jsx

@@ -1,399 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import {
-	AlertCircle,
-	BarChart3,
-	CheckCircle,
-	Eye,
-	EyeOff,
-	Globe,
-	Info,
-	RefreshCw,
-	Send,
-	Shield,
-} from "lucide-react";
-import { useState } from "react";
-import SettingsLayout from "../../components/SettingsLayout";
-
-// API functions - will be added to utils/api.js
-const metricsAPI = {
-	getSettings: () =>
-		fetch("/api/v1/metrics", {
-			headers: {
-				Authorization: `Bearer ${localStorage.getItem("token")}`,
-			},
-		}).then((res) => res.json()),
-	updateSettings: (data) =>
-		fetch("/api/v1/metrics", {
-			method: "PUT",
-			headers: {
-				"Content-Type": "application/json",
-				Authorization: `Bearer ${localStorage.getItem("token")}`,
-			},
-			body: JSON.stringify(data),
-		}).then((res) => res.json()),
-	regenerateId: () =>
-		fetch("/api/v1/metrics/regenerate-id", {
-			method: "POST",
-			headers: {
-				Authorization: `Bearer ${localStorage.getItem("token")}`,
-			},
-		}).then((res) => res.json()),
-	sendNow: () =>
-		fetch("/api/v1/metrics/send-now", {
-			method: "POST",
-			headers: {
-				Authorization: `Bearer ${localStorage.getItem("token")}`,
-			},
-		}).then((res) => res.json()),
-};
-
-const SettingsMetrics = () => {
-	const queryClient = useQueryClient();
-	const [showFullId, setShowFullId] = useState(false);
-
-	// Fetch metrics settings
-	const {
-		data: metricsSettings,
-		isLoading,
-		error,
-	} = useQuery({
-		queryKey: ["metrics-settings"],
-		queryFn: () => metricsAPI.getSettings(),
-	});
-
-	// Toggle metrics mutation
-	const toggleMetricsMutation = useMutation({
-		mutationFn: (enabled) =>
-			metricsAPI.updateSettings({ metrics_enabled: enabled }),
-		onSuccess: () => {
-			queryClient.invalidateQueries(["metrics-settings"]);
-		},
-	});
-
-	// Regenerate ID mutation
-	const regenerateIdMutation = useMutation({
-		mutationFn: () => metricsAPI.regenerateId(),
-		onSuccess: () => {
-			queryClient.invalidateQueries(["metrics-settings"]);
-		},
-	});
-
-	// Send now mutation
-	const sendNowMutation = useMutation({
-		mutationFn: () => metricsAPI.sendNow(),
-		onSuccess: () => {
-			queryClient.invalidateQueries(["metrics-settings"]);
-		},
-	});
-
-	if (isLoading) {
-		return (
-			<SettingsLayout>
-				<div className="flex items-center justify-center h-64">
-					<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary-600"></div>
-				</div>
-			</SettingsLayout>
-		);
-	}
-
-	if (error) {
-		return (
-			<SettingsLayout>
-				<div className="bg-red-50 dark:bg-red-900 border border-red-200 dark:border-red-700 rounded-md p-4">
-					<div className="flex">
-						<AlertCircle className="h-5 w-5 text-red-400 dark:text-red-300" />
-						<div className="ml-3">
-							<h3 className="text-sm font-medium text-red-800 dark:text-red-200">
-								Error loading metrics settings
-							</h3>
-							<p className="mt-1 text-sm text-red-700 dark:text-red-300">
-								{error.message || "Failed to load settings"}
-							</p>
-						</div>
-					</div>
-				</div>
-			</SettingsLayout>
-		);
-	}
-
-	const maskId = (id) => {
-		if (!id) return "";
-		if (showFullId) return id;
-		return `${id.substring(0, 8)}...${id.substring(id.length - 8)}`;
-	};
-
-	return (
-		<SettingsLayout>
-			<div className="space-y-6">
-				{/* Header */}
-				<div className="flex items-center mb-6">
-					<BarChart3 className="h-6 w-6 text-primary-600 mr-3" />
-					<div>
-						<h2 className="text-xl font-semibold text-secondary-900 dark:text-white">
-							Anonymous Metrics & Telemetry
-						</h2>
-						<p className="text-sm text-secondary-600 dark:text-secondary-400 mt-1">
-							Help us understand PatchMon's global usage (100% anonymous)
-						</p>
-					</div>
-				</div>
-
-				{/* Privacy Information */}
-				<div className="bg-blue-50 dark:bg-blue-900/30 border border-blue-200 dark:border-blue-700 rounded-lg p-6">
-					<div className="flex">
-						<Shield className="h-6 w-6 text-blue-600 dark:text-blue-400 flex-shrink-0" />
-						<div className="ml-4 flex-1">
-							<h3 className="text-base font-semibold text-blue-900 dark:text-blue-100 mb-3">
-								Your Privacy Matters
-							</h3>
-							<div className="text-sm text-blue-800 dark:text-blue-200 space-y-2">
-								<p className="flex items-start">
-									<CheckCircle className="h-4 w-4 mr-2 mt-0.5 flex-shrink-0" />
-									<span>
-										<strong>We do NOT collect:</strong> IP addresses, hostnames,
-										system details, or any personally identifiable information
-									</span>
-								</p>
-								<p className="flex items-start">
-									<CheckCircle className="h-4 w-4 mr-2 mt-0.5 flex-shrink-0" />
-									<span>
-										<strong>We ONLY collect:</strong> An anonymous UUID (for
-										deduplication) and the number of hosts you're monitoring
-									</span>
-								</p>
-								<p className="flex items-start">
-									<CheckCircle className="h-4 w-4 mr-2 mt-0.5 flex-shrink-0" />
-									<span>
-										<strong>Purpose:</strong> Display a live counter on our
-										website showing global PatchMon adoption
-									</span>
-								</p>
-								<p className="flex items-start">
-									<Globe className="h-4 w-4 mr-2 mt-0.5 flex-shrink-0" />
-									<span>
-										<strong>Open Source:</strong> All code is public and
-										auditable on GitHub
-									</span>
-								</p>
-							</div>
-						</div>
-					</div>
-				</div>
-
-				{/* Metrics Toggle */}
-				<div className="bg-white dark:bg-secondary-800 rounded-lg border border-secondary-200 dark:border-secondary-700 p-6">
-					<div className="flex items-start justify-between">
-						<div className="flex-1">
-							<h3 className="text-lg font-medium text-secondary-900 dark:text-white mb-2">
-								Enable Anonymous Metrics
-							</h3>
-							<p className="text-sm text-secondary-600 dark:text-secondary-400">
-								Share anonymous usage statistics to help us showcase PatchMon's
-								global adoption. Data is sent automatically every 24 hours.
-							</p>
-						</div>
-						<button
-							type="button"
-							onClick={() =>
-								toggleMetricsMutation.mutate(!metricsSettings?.metrics_enabled)
-							}
-							disabled={toggleMetricsMutation.isPending}
-							className={`ml-4 relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 ${
-								metricsSettings?.metrics_enabled
-									? "bg-primary-600"
-									: "bg-secondary-200 dark:bg-secondary-700"
-							} ${toggleMetricsMutation.isPending ? "opacity-50" : ""}`}
-						>
-							<span
-								className={`inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out ${
-									metricsSettings?.metrics_enabled
-										? "translate-x-5"
-										: "translate-x-0"
-								}`}
-							/>
-						</button>
-					</div>
-
-					{/* Status */}
-					<div className="mt-4 pt-4 border-t border-secondary-200 dark:border-secondary-700">
-						<div className="flex items-center text-sm">
-							{metricsSettings?.metrics_enabled ? (
-								<>
-									<CheckCircle className="h-4 w-4 text-green-500 mr-2" />
-									<span className="text-green-700 dark:text-green-400">
-										Metrics enabled - Thank you for supporting PatchMon!
-									</span>
-								</>
-							) : (
-								<>
-									<EyeOff className="h-4 w-4 text-secondary-500 mr-2" />
-									<span className="text-secondary-600 dark:text-secondary-400">
-										Metrics disabled - No data is being sent
-									</span>
-								</>
-							)}
-						</div>
-					</div>
-				</div>
-
-				{/* Anonymous ID Section */}
-				<div className="bg-white dark:bg-secondary-800 rounded-lg border border-secondary-200 dark:border-secondary-700 p-6">
-					<div className="flex items-start justify-between mb-4">
-						<div>
-							<h3 className="text-lg font-medium text-secondary-900 dark:text-white mb-2">
-								Your Anonymous Instance ID
-							</h3>
-							<p className="text-sm text-secondary-600 dark:text-secondary-400">
-								This UUID identifies your instance without revealing any
-								personal information
-							</p>
-						</div>
-					</div>
-
-					<div className="mt-4 space-y-4">
-						<div className="flex items-center gap-3">
-							<div className="flex-1 bg-secondary-50 dark:bg-secondary-700 rounded-md p-3 font-mono text-sm break-all">
-								{maskId(metricsSettings?.metrics_anonymous_id)}
-							</div>
-							<button
-								type="button"
-								onClick={() => setShowFullId(!showFullId)}
-								className="p-2 text-secondary-600 dark:text-secondary-400 hover:text-secondary-900 dark:hover:text-white"
-								title={showFullId ? "Hide ID" : "Show full ID"}
-							>
-								{showFullId ? (
-									<EyeOff className="h-5 w-5" />
-								) : (
-									<Eye className="h-5 w-5" />
-								)}
-							</button>
-						</div>
-
-						<div className="flex gap-3">
-							<button
-								type="button"
-								onClick={() => regenerateIdMutation.mutate()}
-								disabled={regenerateIdMutation.isPending}
-								className="inline-flex items-center px-4 py-2 border border-secondary-300 dark:border-secondary-600 text-sm font-medium rounded-md text-secondary-700 dark:text-secondary-200 bg-white dark:bg-secondary-700 hover:bg-secondary-50 dark:hover:bg-secondary-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 disabled:opacity-50"
-							>
-								{regenerateIdMutation.isPending ? (
-									<>
-										<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-secondary-700 dark:border-secondary-200 mr-2"></div>
-										Regenerating...
-									</>
-								) : (
-									<>
-										<RefreshCw className="h-4 w-4 mr-2" />
-										Regenerate ID
-									</>
-								)}
-							</button>
-
-							<button
-								type="button"
-								onClick={() => sendNowMutation.mutate()}
-								disabled={
-									!metricsSettings?.metrics_enabled || sendNowMutation.isPending
-								}
-								className="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-white bg-primary-600 hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 disabled:opacity-50 disabled:cursor-not-allowed"
-							>
-								{sendNowMutation.isPending ? (
-									<>
-										<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-white mr-2"></div>
-										Sending...
-									</>
-								) : (
-									<>
-										<Send className="h-4 w-4 mr-2" />
-										Send Metrics Now
-									</>
-								)}
-							</button>
-						</div>
-
-						{metricsSettings?.metrics_last_sent && (
-							<p className="text-xs text-secondary-500 dark:text-secondary-400">
-								Last sent:{" "}
-								{new Date(metricsSettings.metrics_last_sent).toLocaleString()}
-							</p>
-						)}
-					</div>
-
-					{/* Success/Error Messages */}
-					{regenerateIdMutation.isSuccess && (
-						<div className="mt-4 bg-green-50 dark:bg-green-900/30 border border-green-200 dark:border-green-700 rounded-md p-3">
-							<div className="flex">
-								<CheckCircle className="h-4 w-4 text-green-400 dark:text-green-300 mt-0.5" />
-								<p className="ml-2 text-sm text-green-700 dark:text-green-300">
-									Anonymous ID regenerated successfully
-								</p>
-							</div>
-						</div>
-					)}
-
-					{sendNowMutation.isSuccess && (
-						<div className="mt-4 bg-green-50 dark:bg-green-900/30 border border-green-200 dark:border-green-700 rounded-md p-3">
-							<div className="flex">
-								<CheckCircle className="h-4 w-4 text-green-400 dark:text-green-300 mt-0.5" />
-								<div className="ml-2 text-sm text-green-700 dark:text-green-300">
-									<p className="font-medium">Metrics sent successfully!</p>
-									{sendNowMutation.data?.data && (
-										<p className="mt-1">
-											Sent: {sendNowMutation.data.data.hostCount} hosts, version{" "}
-											{sendNowMutation.data.data.version}
-										</p>
-									)}
-								</div>
-							</div>
-						</div>
-					)}
-
-					{sendNowMutation.isError && (
-						<div className="mt-4 bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-700 rounded-md p-3">
-							<div className="flex">
-								<AlertCircle className="h-4 w-4 text-red-400 dark:text-red-300 mt-0.5" />
-								<div className="ml-2 text-sm text-red-700 dark:text-red-300">
-									{sendNowMutation.error?.message || "Failed to send metrics"}
-								</div>
-							</div>
-						</div>
-					)}
-				</div>
-
-				{/* Information Panel */}
-				<div className="bg-secondary-50 dark:bg-secondary-800/50 border border-secondary-200 dark:border-secondary-700 rounded-lg p-6">
-					<div className="flex">
-						<Info className="h-5 w-5 text-secondary-500 dark:text-secondary-400 flex-shrink-0 mt-0.5" />
-						<div className="ml-3 text-sm text-secondary-700 dark:text-secondary-300">
-							<h4 className="font-medium mb-2">How it works:</h4>
-							<ul className="space-y-1 list-disc list-inside">
-								<li>
-									Metrics are sent automatically every 24 hours when enabled
-								</li>
-								<li>
-									Only host count and version number are transmitted (no
-									sensitive data)
-								</li>
-								<li>The anonymous UUID prevents duplicate counting</li>
-								<li>You can regenerate your ID or opt-out at any time</li>
-								<li>
-									All collected data is displayed publicly on{" "}
-									<a
-										href="https://patchmon.net"
-										target="_blank"
-										rel="noopener noreferrer"
-										className="text-primary-600 dark:text-primary-400 hover:underline"
-									>
-										patchmon.net
-									</a>
-								</li>
-							</ul>
-						</div>
-					</div>
-				</div>
-			</div>
-		</SettingsLayout>
-	);
-};
-
-export default SettingsMetrics;

frontend/src/utils/api.js

@@ -5,7 +5,7 @@ const API_BASE_URL = import.meta.env.VITE_API_URL || "/api/v1";
 // Create axios instance with default config
 const api = axios.create({
 	baseURL: API_BASE_URL,
-	timeout: 10000, // 10 seconds
+	timeout: 10000,
 	headers: {
 		"Content-Type": "application/json",
 	},
@@ -221,82 +221,7 @@ export const packagesAPI = {
 };
 
 // Utility functions
-export const isCorsError = (error) => {
-	// Check for browser-level CORS errors (when request is blocked before reaching server)
-	if (error.message?.includes("Failed to fetch") && !error.response) {
-		return true;
-	}
-
-	// Check for TypeError with Failed to fetch (common CORS error pattern)
-	if (
-		error.name === "TypeError" &&
-		error.message?.includes("Failed to fetch")
-	) {
-		return true;
-	}
-
-	// Check for backend CORS errors that get converted to 500 by proxy
-	if (error.response?.status === 500) {
-		// Check if the error message contains CORS-related text
-		if (
-			error.message?.includes("Not allowed by CORS") ||
-			error.message?.includes("CORS") ||
-			error.message?.includes("cors")
-		) {
-			return true;
-		}
-
-		// Check if the response data contains CORS error information
-		if (
-			error.response?.data?.error?.includes("CORS") ||
-			error.response?.data?.error?.includes("cors") ||
-			error.response?.data?.message?.includes("CORS") ||
-			error.response?.data?.message?.includes("cors") ||
-			error.response?.data?.message?.includes("Not allowed by CORS")
-		) {
-			return true;
-		}
-
-		// Check for specific CORS error patterns from backend logs
-		if (
-			error.message?.includes("origin") &&
-			error.message?.includes("callback")
-		) {
-			return true;
-		}
-
-		// Check if this is likely a CORS error based on context
-		// If we're accessing from localhost but CORS_ORIGIN is set to fabio, this is likely CORS
-		const currentOrigin = window.location.origin;
-		if (
-			currentOrigin === "http://localhost:3000" &&
-			error.config?.url?.includes("/api/")
-		) {
-			// This is likely a CORS error when accessing from localhost
-			return true;
-		}
-	}
-
-	// Check for CORS-related errors
-	return (
-		error.message?.includes("CORS") ||
-		error.message?.includes("cors") ||
-		error.message?.includes("Access to fetch") ||
-		error.message?.includes("blocked by CORS policy") ||
-		error.message?.includes("Cross-Origin Request Blocked") ||
-		error.message?.includes("NetworkError when attempting to fetch resource") ||
-		error.message?.includes("ERR_BLOCKED_BY_CLIENT") ||
-		error.message?.includes("ERR_NETWORK") ||
-		error.message?.includes("ERR_CONNECTION_REFUSED")
-	);
-};
-
 export const formatError = (error) => {
-	// Check for CORS-related errors
-	if (isCorsError(error)) {
-		return "CORS_ORIGIN mismatch - please set your URL in your environment variable";
-	}
-
 	if (error.response?.data?.message) {
 		return error.response.data.message;
 	}

frontend/vite.config.js

@@ -1,4 +1,3 @@
-import { Agent as HttpAgent } from "node:http";
 import react from "@vitejs/plugin-react";
 import { defineConfig } from "vite";
 
@@ -15,15 +14,6 @@ export default defineConfig({
 				target: `http://${process.env.BACKEND_HOST || "localhost"}:${process.env.BACKEND_PORT || "3001"}`,
 				changeOrigin: true,
 				secure: false,
-				// Configure HTTP agent to support more concurrent connections
-				// Fixes 1000ms timeout issue when using HTTP (not HTTPS) with multiple hosts
-				agent: new HttpAgent({
-					keepAlive: true,
-					maxSockets: 50, // Increase from default 6 to handle multiple hosts
-					maxFreeSockets: 10,
-					timeout: 60000,
-					keepAliveMsecs: 1000,
-				}),
 				configure:
 					process.env.VITE_ENABLE_LOGGING === "true"
 						? (proxy, _options) => {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "patchmon",
-	"version": "1.3.1",
+	"version": "1.2.9",
 	"description": "Linux Patch Monitoring System",
 	"license": "AGPL-3.0",
 	"private": true,
@@ -25,7 +25,7 @@
 		"lint:fix": "biome check --write ."
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.3.0",
+		"@biomejs/biome": "2.2.4",
 		"concurrently": "^8.2.2",
 		"lefthook": "^1.13.4"
 	},

tools/diagnostics.sh

@@ -1,715 +0,0 @@
-#!/bin/bash
-# PatchMon Diagnostics Collection Script
-# Collects system information, logs, and configuration for troubleshooting
-# Usage: sudo bash diagnostics.sh [instance-name]
-
-# Note: Not using 'set -e' because we want to continue even if some commands fail
-set -o pipefail
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Print functions
-print_status() {
-    echo -e "${GREEN}✅ $1${NC}"
-}
-
-print_info() {
-    echo -e "${BLUE}ℹ️  $1${NC}"
-}
-
-print_error() {
-    echo -e "${RED}❌ $1${NC}"
-}
-
-print_warning() {
-    echo -e "${YELLOW}⚠️  $1${NC}"
-}
-
-print_success() {
-    echo -e "${GREEN}🎉 $1${NC}"
-}
-
-# Check if running as root
-if [[ $EUID -ne 0 ]]; then
-    print_error "This script must be run as root"
-    print_info "Please run: sudo bash $0"
-    exit 1
-fi
-
-# Function to sanitize sensitive information
-sanitize_sensitive() {
-    local input="$1"
-    # Replace passwords, secrets, and tokens with [REDACTED]
-    echo "$input" | \
-        sed -E 's/(PASSWORD|SECRET|TOKEN|KEY|PASS)=[^"]*$/\1=[REDACTED]/gi' | \
-        sed -E 's/(PASSWORD|SECRET|TOKEN|KEY|PASS)="[^"]*"/\1="[REDACTED]"/gi' | \
-        sed -E 's/(password|secret|token|key|pass)": *"[^"]*"/\1": "[REDACTED]"/gi' | \
-        sed -E 's/(>)[a-zA-Z0-9+\/=]{20,}/\1[REDACTED]/g' | \
-        sed -E 's|postgresql://([^:]+):([^@]+)@|postgresql://\1:[REDACTED]@|g' | \
-        sed -E 's|mysql://([^:]+):([^@]+)@|mysql://\1:[REDACTED]@|g' | \
-        sed -E 's|mongodb://([^:]+):([^@]+)@|mongodb://\1:[REDACTED]@|g'
-}
-
-# Function to detect PatchMon installations
-detect_installations() {
-    local installations=()
-    
-    if [ ! -d "/opt" ]; then
-        print_error "/opt directory does not exist"
-        return 1
-    fi
-    
-    for dir in /opt/*/; do
-        # Skip if no directories found
-        [ -d "$dir" ] || continue
-        
-        local dirname=$(basename "$dir")
-        
-        # Skip backup directories
-        if [[ "$dirname" =~ \.backup\. ]]; then
-            continue
-        fi
-        
-        # Check if it's a PatchMon installation
-        if [ -f "$dir/backend/package.json" ]; then
-            if grep -q "patchmon" "$dir/backend/package.json" 2>/dev/null; then
-                installations+=("$dirname")
-            fi
-        fi
-    done
-    
-    echo "${installations[@]}"
-}
-
-# Function to select installation
-select_installation() {
-    local installations=($(detect_installations))
-    
-    if [ ${#installations[@]} -eq 0 ]; then
-        print_error "No PatchMon installations found in /opt" >&2
-        exit 1
-    fi
-    
-    if [ -n "$1" ]; then
-        # Use provided instance name
-        if [[ " ${installations[@]} " =~ " $1 " ]]; then
-            echo "$1"
-            return 0
-        else
-            print_error "Instance '$1' not found" >&2
-            exit 1
-        fi
-    fi
-    
-    # Send status messages to stderr so they don't contaminate the return value
-    print_info "Found ${#installations[@]} installation(s):" >&2
-    echo "" >&2
-    
-    local i=1
-    declare -A install_map
-    for install in "${installations[@]}"; do
-        # Get service status
-        local status="unknown"
-        if systemctl is-active --quiet "$install" 2>/dev/null; then
-            status="${GREEN}running${NC}"
-        elif systemctl is-enabled --quiet "$install" 2>/dev/null; then
-            status="${RED}stopped${NC}"
-        fi
-        
-        printf "%2d. %-30s (%b)\n" "$i" "$install" "$status" >&2
-        install_map[$i]="$install"
-        i=$((i + 1))
-    done
-    
-    echo "" >&2
-    
-    # If only one installation, select it automatically
-    if [ ${#installations[@]} -eq 1 ]; then
-        print_info "Only one installation found, selecting automatically: ${installations[0]}" >&2
-        echo "${installations[0]}"
-        return 0
-    fi
-    
-    # Multiple installations - prompt user
-    printf "${BLUE}Select installation number [1]: ${NC}" >&2
-    read -r selection </dev/tty
-    
-    selection=${selection:-1}
-    
-    if [[ "$selection" =~ ^[0-9]+$ ]] && [ -n "${install_map[$selection]}" ]; then
-        echo "${install_map[$selection]}"
-        return 0
-    else
-        print_error "Invalid selection" >&2
-        exit 1
-    fi
-}
-
-# Main script
-main() {
-    # Capture the directory where script is run from at the very start
-    ORIGINAL_DIR=$(pwd)
-    
-    echo -e "${BLUE}====================================================${NC}"
-    echo -e "${BLUE}        PatchMon Diagnostics Collection${NC}"
-    echo -e "${BLUE}====================================================${NC}"
-    echo ""
-    
-    # Select instance
-    instance_name=$(select_installation "$1")
-    instance_dir="/opt/$instance_name"
-    
-    print_info "Selected instance: $instance_name"
-    print_info "Directory: $instance_dir"
-    echo ""
-    
-    # Create single diagnostics file in the original directory
-    timestamp=$(date +%Y%m%d_%H%M%S)
-    diag_file="${ORIGINAL_DIR}/patchmon_diagnostics_${instance_name}_${timestamp}.txt"
-    
-    print_info "Collecting diagnostics to: $diag_file"
-    echo ""
-    
-    # Initialize the diagnostics file with header
-    cat > "$diag_file" << EOF
-===================================================
-PatchMon Diagnostics Report
-===================================================
-Instance: $instance_name
-Generated: $(date)
-Hostname: $(hostname)
-Generated from: ${ORIGINAL_DIR}
-===================================================
-
-EOF
-    
-    # ========================================
-    # 1. System Information
-    # ========================================
-    print_info "Collecting system information..."
-    
-    cat >> "$diag_file" << EOF
-=== System Information ===
-OS: $(cat /etc/os-release 2>/dev/null | grep PRETTY_NAME | cut -d'"' -f2 || echo "Unknown")
-Kernel: $(uname -r)
-Uptime: $(uptime)
-
-=== CPU Information ===
-$(lscpu | grep -E "Model name|CPU\(s\)|Thread|Core" || echo "Not available")
-
-=== Memory Information ===
-$(free -h)
-
-=== Disk Usage ===
-$(df -h | grep -E "Filesystem|/dev/|/opt")
-
-=== Network Interfaces ===
-$(ip -br addr)
-
-===================================================
-EOF
-    
-    # ========================================
-    # 2. PatchMon Instance Information
-    # ========================================
-    print_info "Collecting instance information..."
-    
-    cat >> "$diag_file" << EOF
-
-=== PatchMon Instance Information ===
-
-=== Directory Structure ===
-$(ls -lah "$instance_dir" 2>/dev/null || echo "Cannot access directory")
-
-=== Backend Package Info ===
-$(cat "$instance_dir/backend/package.json" 2>/dev/null | grep -E "name|version" || echo "Not found")
-
-=== Frontend Package Info ===
-$(cat "$instance_dir/frontend/package.json" 2>/dev/null | grep -E "name|version" || echo "Not found")
-
-=== Deployment Info ===
-$(cat "$instance_dir/deployment-info.txt" 2>/dev/null || echo "No deployment-info.txt found")
-
-===================================================
-EOF
-    
-    # ========================================
-    # 3. Environment Configuration (Sanitized)
-    # ========================================
-    print_info "Collecting environment configuration (sanitized)..."
-    
-    echo "" >> "$diag_file"
-    echo "=== Backend Environment Configuration (Sanitized) ===" >> "$diag_file"
-    if [ -f "$instance_dir/backend/.env" ]; then
-        sanitize_sensitive "$(cat "$instance_dir/backend/.env")" >> "$diag_file"
-    else
-        echo "Backend .env file not found" >> "$diag_file"
-    fi
-    echo "" >> "$diag_file"
-    
-    # ========================================
-    # 4. Service Status and Configuration
-    # ========================================
-    print_info "Collecting service information..."
-    
-    cat >> "$diag_file" << EOF
-
-=== Service Status and Configuration ===
-
-=== Service Status ===
-$(systemctl status "$instance_name" 2>/dev/null || echo "Service not found")
-
-=== Service File ===
-$(cat "/etc/systemd/system/${instance_name}.service" 2>/dev/null || echo "Service file not found")
-
-=== Service is-enabled ===
-$(systemctl is-enabled "$instance_name" 2>/dev/null || echo "unknown")
-
-=== Service is-active ===
-$(systemctl is-active "$instance_name" 2>/dev/null || echo "unknown")
-
-===================================================
-EOF
-    
-    # ========================================
-    # 5. Service Logs
-    # ========================================
-    print_info "Collecting service logs..."
-    
-    echo "" >> "$diag_file"
-    echo "=== Service Logs (last 500 lines) ===" >> "$diag_file"
-    journalctl -u "$instance_name" -n 500 --no-pager >> "$diag_file" 2>&1 || \
-        echo "Could not retrieve service logs" >> "$diag_file"
-    echo "" >> "$diag_file"
-    
-    # ========================================
-    # 6. Nginx Configuration
-    # ========================================
-    print_info "Collecting nginx configuration..."
-    
-    cat >> "$diag_file" << EOF
-
-=== Nginx Configuration ===
-
-=== Nginx Status ===
-$(systemctl status nginx 2>/dev/null | head -20 || echo "Nginx not found")
-
-=== Site Configuration ===
-$(cat "/etc/nginx/sites-available/$instance_name" 2>/dev/null || echo "Nginx config not found")
-
-=== Nginx Error Log (last 100 lines) ===
-$(tail -100 /var/log/nginx/error.log 2>/dev/null || echo "Error log not accessible")
-
-=== Nginx Access Log (last 50 lines) ===
-$(tail -50 /var/log/nginx/access.log 2>/dev/null || echo "Access log not accessible")
-
-=== Nginx Test ===
-$(nginx -t 2>&1 || echo "Nginx test failed")
-
-===================================================
-EOF
-    
-    # ========================================
-    # 7. Database Connection Test
-    # ========================================
-    print_info "Testing database connection..."
-    
-    echo "" >> "$diag_file"
-    echo "=== Database Information ===" >> "$diag_file"
-    echo "" >> "$diag_file"
-    
-    if [ -f "$instance_dir/backend/.env" ]; then
-        # Load .env
-        set -a
-        source "$instance_dir/backend/.env"
-        set +a
-        
-        # Parse DATABASE_URL
-        if [ -n "$DATABASE_URL" ]; then
-            DB_USER=$(echo "$DATABASE_URL" | sed -n 's|postgresql://\([^:]*\):.*|\1|p')
-            DB_PASS=$(echo "$DATABASE_URL" | sed -n 's|postgresql://[^:]*:\([^@]*\)@.*|\1|p')
-            DB_HOST=$(echo "$DATABASE_URL" | sed -n 's|.*@\([^:]*\):.*|\1|p')
-            DB_PORT=$(echo "$DATABASE_URL" | sed -n 's|.*:\([0-9]*\)/.*|\1|p')
-            DB_NAME=$(echo "$DATABASE_URL" | sed -n 's|.*/\([^?]*\).*|\1|p')
-            
-            cat >> "$diag_file" << EOF
-=== Database Connection Details ===
-Host: $DB_HOST
-Port: $DB_PORT
-Database: $DB_NAME
-User: $DB_USER
-
-=== PostgreSQL Status ===
-$(systemctl status postgresql 2>/dev/null | head -20 || echo "PostgreSQL status not available")
-
-=== Connection Test ===
-EOF
-            
-            if PGPASSWORD="$DB_PASS" psql -h "$DB_HOST" -U "$DB_USER" -d "$DB_NAME" -c "SELECT version();" >> "$diag_file" 2>&1; then
-                echo "✅ Database connection: SUCCESSFUL" >> "$diag_file"
-            else
-                echo "❌ Database connection: FAILED" >> "$diag_file"
-            fi
-            
-            echo "" >> "$diag_file"
-            echo "=== Database Size ===" >> "$diag_file"
-            PGPASSWORD="$DB_PASS" psql -h "$DB_HOST" -U "$DB_USER" -d "$DB_NAME" -c "
-                SELECT 
-                    pg_size_pretty(pg_database_size('$DB_NAME')) as database_size;
-            " >> "$diag_file" 2>&1 || echo "Could not get database size" >> "$diag_file"
-            
-            echo "" >> "$diag_file"
-            echo "=== Table Sizes ===" >> "$diag_file"
-            PGPASSWORD="$DB_PASS" psql -h "$DB_HOST" -U "$DB_USER" -d "$DB_NAME" -c "
-                SELECT 
-                    schemaname,
-                    tablename,
-                    pg_size_pretty(pg_total_relation_size(schemaname||'.'||tablename)) AS size
-                FROM pg_tables
-                WHERE schemaname = 'public'
-                ORDER BY pg_total_relation_size(schemaname||'.'||tablename) DESC
-                LIMIT 10;
-            " >> "$diag_file" 2>&1 || echo "Could not get table sizes" >> "$diag_file"
-            
-            echo "" >> "$diag_file"
-            echo "=== Migration Status ===" >> "$diag_file"
-            cd "$instance_dir/backend"
-            npx prisma migrate status >> "$diag_file" 2>&1 || echo "Could not get migration status" >> "$diag_file"
-            
-            echo "===================================================" >> "$diag_file"
-        else
-            echo "DATABASE_URL not found in .env" >> "$diag_file"
-        fi
-    else
-        echo ".env file not found" >> "$diag_file"
-    fi
-    
-    # ========================================
-    # 8. Redis Connection Test
-    # ========================================
-    print_info "Testing Redis connection..."
-    
-    if [ -f "$instance_dir/backend/.env" ]; then
-        # Load .env
-        set -a
-        source "$instance_dir/backend/.env"
-        set +a
-        
-        cat >> "$diag_file" << EOF
-===================================================
-Redis Information
-===================================================
-
-=== Redis Connection Details ===
-Host: ${REDIS_HOST:-localhost}
-Port: ${REDIS_PORT:-6379}
-User: ${REDIS_USER:-(none)}
-Database: ${REDIS_DB:-0}
-
-=== Redis Status ===
-$(systemctl status redis-server 2>/dev/null | head -20 || echo "Redis status not available")
-
-=== Connection Test ===
-EOF
-        
-        # Test connection
-        if [ -n "$REDIS_USER" ] && [ -n "$REDIS_PASSWORD" ]; then
-            if redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" --user "$REDIS_USER" --pass "$REDIS_PASSWORD" --no-auth-warning -n "${REDIS_DB:-0}" ping >> "$diag_file" 2>&1; then
-                echo "✅ Redis connection (with user): SUCCESSFUL" >> "$diag_file"
-                
-                echo "" >> "$diag_file"
-                echo "=== Redis INFO ===" >> "$diag_file"
-                redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" --user "$REDIS_USER" --pass "$REDIS_PASSWORD" --no-auth-warning -n "${REDIS_DB:-0}" INFO >> "$diag_file" 2>&1
-                
-                echo "" >> "$diag_file"
-                echo "=== Redis Database Size ===" >> "$diag_file"
-                redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" --user "$REDIS_USER" --pass "$REDIS_PASSWORD" --no-auth-warning -n "${REDIS_DB:-0}" DBSIZE >> "$diag_file" 2>&1
-            else
-                echo "❌ Redis connection (with user): FAILED" >> "$diag_file"
-            fi
-        elif [ -n "$REDIS_PASSWORD" ]; then
-            if redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" -a "$REDIS_PASSWORD" --no-auth-warning -n "${REDIS_DB:-0}" ping >> "$diag_file" 2>&1; then
-                echo "✅ Redis connection (requirepass): SUCCESSFUL" >> "$diag_file"
-                
-                echo "" >> "$diag_file"
-                echo "=== Redis INFO ===" >> "$diag_file"
-                redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" -a "$REDIS_PASSWORD" --no-auth-warning -n "${REDIS_DB:-0}" INFO >> "$diag_file" 2>&1
-                
-                echo "" >> "$diag_file"
-                echo "=== Redis Database Size ===" >> "$diag_file"
-                redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" -a "$REDIS_PASSWORD" --no-auth-warning -n "${REDIS_DB:-0}" DBSIZE >> "$diag_file" 2>&1
-            else
-                echo "❌ Redis connection (requirepass): FAILED" >> "$diag_file"
-            fi
-        else
-            if redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" -n "${REDIS_DB:-0}" ping >> "$diag_file" 2>&1; then
-                echo "✅ Redis connection (no auth): SUCCESSFUL" >> "$diag_file"
-            else
-                echo "❌ Redis connection: FAILED" >> "$diag_file"
-            fi
-        fi
-        
-        echo "" >> "$diag_file"
-        echo "=== Redis ACL Users ===" >> "$diag_file"
-        if [ -n "$REDIS_USER" ] && [ -n "$REDIS_PASSWORD" ]; then
-            redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" --user "$REDIS_USER" --pass "$REDIS_PASSWORD" --no-auth-warning ACL LIST >> "$diag_file"
-        elif [ -n "$REDIS_PASSWORD" ]; then
-            redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" -a "$REDIS_PASSWORD" --no-auth-warning ACL LIST >> "$diag_file"
-        fi
-        
-        echo "===================================================" >> "$diag_file"
-    else
-        echo ".env file not found" >> "$diag_file"
-    fi
-    
-    # ========================================
-    # 9. Network and Port Information
-    # ========================================
-    print_info "Collecting network information..."
-    
-    # Get backend port from .env
-    local backend_port=$(grep '^PORT=' "$instance_dir/backend/.env" 2>/dev/null | cut -d'=' -f2 | tr -d ' ' || echo "3000")
-    
-    cat >> "$diag_file" << EOF
-===================================================
-Network and Port Information
-===================================================
-
-=== Listening Ports ===
-$(ss -tlnp | grep -E "LISTEN|nginx|node|postgres|redis" || netstat -tlnp | grep -E "LISTEN|nginx|node|postgres|redis" || echo "Could not get port information")
-
-=== Active Connections ===
-$(ss -tn state established | head -20 || echo "Could not get connection information")
-
-=== Backend Port Connections (Port $backend_port) ===
-Total connections to backend: $(ss -tn | grep ":$backend_port" | wc -l || echo "0")
-$(ss -tn | grep ":$backend_port" | head -10 || echo "No connections found")
-
-=== PostgreSQL Connections ===
-EOF
-
-    # Get PostgreSQL connection count
-    if [ -n "$DB_PASS" ] && [ -n "$DB_USER" ] && [ -n "$DB_NAME" ]; then
-        PGPASSWORD="$DB_PASS" psql -h "${DB_HOST:-localhost}" -U "$DB_USER" -d "$DB_NAME" -c "
-            SELECT 
-                count(*) as total_connections,
-                count(*) FILTER (WHERE state = 'active') as active_connections,
-                count(*) FILTER (WHERE state = 'idle') as idle_connections
-            FROM pg_stat_activity 
-            WHERE datname = '$DB_NAME';
-        " >> "$diag_file" 2>&1 || echo "Could not get PostgreSQL connection stats" >> "$diag_file"
-        
-        echo "" >> "$diag_file"
-        echo "=== PostgreSQL Connection Details ===" >> "$diag_file"
-        PGPASSWORD="$DB_PASS" psql -h "${DB_HOST:-localhost}" -U "$DB_USER" -d "$DB_NAME" -c "
-            SELECT 
-                pid,
-                usename,
-                application_name,
-                client_addr,
-                state,
-                query_start,
-                state_change
-            FROM pg_stat_activity 
-            WHERE datname = '$DB_NAME'
-            ORDER BY query_start DESC
-            LIMIT 20;
-        " >> "$diag_file" 2>&1 || echo "Could not get connection details" >> "$diag_file"
-    else
-        echo "Database credentials not available" >> "$diag_file"
-    fi
-    
-    echo "" >> "$diag_file"
-    echo "=== Redis Connections ===" >> "$diag_file"
-    
-    # Get Redis connection count
-    if [ -n "$REDIS_USER" ] && [ -n "$REDIS_PASSWORD" ]; then
-        redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" --user "$REDIS_USER" --pass "$REDIS_PASSWORD" --no-auth-warning -n "${REDIS_DB:-0}" INFO clients >> "$diag_file" 2>&1 || echo "Could not get Redis connection info" >> "$diag_file"
-    elif [ -n "$REDIS_PASSWORD" ]; then
-        redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" -a "$REDIS_PASSWORD" --no-auth-warning -n "${REDIS_DB:-0}" INFO clients >> "$diag_file" 2>&1 || echo "Could not get Redis connection info" >> "$diag_file"
-    fi
-    
-    cat >> "$diag_file" << EOF
-
-=== Firewall Status (UFW) ===
-$(ufw status 2>/dev/null || echo "UFW not available")
-
-=== Firewall Status (iptables) ===
-$(iptables -L -n | head -50 2>/dev/null || echo "iptables not available")
-
-===================================================
-EOF
-    
-    # ========================================
-    # 10. Process Information
-    # ========================================
-    print_info "Collecting process information..."
-    
-    cat >> "$diag_file" << EOF
-===================================================
-Process Information
-===================================================
-
-=== PatchMon Node Processes ===
-$(ps aux | grep -E "node.*$instance_dir|PID" | grep -v grep || echo "No processes found")
-
-=== Top Processes (CPU) ===
-$(ps aux --sort=-%cpu | head -15)
-
-=== Top Processes (Memory) ===
-$(ps aux --sort=-%mem | head -15)
-
-===================================================
-EOF
-    
-    # ========================================
-    # 11. SSL Certificate Information
-    # ========================================
-    print_info "Collecting SSL certificate information..."
-    
-    cat >> "$diag_file" << EOF
-===================================================
-SSL Certificate Information
-===================================================
-
-=== Certbot Certificates ===
-$(certbot certificates 2>/dev/null || echo "Certbot not available or no certificates")
-
-=== SSL Certificate Files ===
-$(ls -lh /etc/letsencrypt/live/$instance_name/ 2>/dev/null || echo "No SSL certificates found for $instance_name")
-
-===================================================
-EOF
-    
-    # ========================================
-    # 12. Recent System Logs
-    # ========================================
-    print_info "Collecting recent system logs..."
-    
-    journalctl -n 200 --no-pager >> "$diag_file" 2>&1 || \
-        echo "Could not retrieve system logs" >> "$diag_file"
-    
-    # ========================================
-    # 13. Installation Log (if exists)
-    # ========================================
-    print_info "Collecting installation log..."
-    
-    echo "" >> "$diag_file"
-    echo "=== Installation Log (last 200 lines) ===" >> "$diag_file"
-    if [ -f "$instance_dir/patchmon-install.log" ]; then
-        tail -200 "$instance_dir/patchmon-install.log" >> "$diag_file" 2>&1
-    else
-        echo "No installation log found" >> "$diag_file"
-    fi
-    echo "" >> "$diag_file"
-    
-    # ========================================
-    # 14. Node.js and npm Information
-    # ========================================
-    print_info "Collecting Node.js information..."
-    
-    cat >> "$diag_file" << EOF
-===================================================
-Node.js and npm Information
-===================================================
-
-=== Node.js Version ===
-$(node --version 2>/dev/null || echo "Node.js not found")
-
-=== npm Version ===
-$(npm --version 2>/dev/null || echo "npm not found")
-
-=== Backend Dependencies ===
-$(cd "$instance_dir/backend" && npm list --depth=0 2>/dev/null || echo "Could not list backend dependencies")
-
-===================================================
-EOF
-    
-    # ========================================
-    # Finalize diagnostics file
-    # ========================================
-    print_info "Finalizing diagnostics file..."
-    
-    echo "" >> "$diag_file"
-    echo "====================================================" >> "$diag_file"
-    echo "END OF DIAGNOSTICS REPORT" >> "$diag_file"
-    echo "====================================================" >> "$diag_file"
-    echo "" >> "$diag_file"
-    echo "IMPORTANT: Sensitive Information" >> "$diag_file"
-    echo "Passwords, secrets, and tokens have been sanitized" >> "$diag_file"
-    echo "and replaced with [REDACTED]. However, please review" >> "$diag_file"
-    echo "before sharing to ensure no sensitive data is included." >> "$diag_file"
-    echo "====================================================" >> "$diag_file"
-    
-    print_status "Diagnostics file created: $diag_file"
-    
-    # ========================================
-    # Display summary
-    # ========================================
-    echo ""
-    echo -e "${GREEN}====================================================${NC}"
-    echo -e "${GREEN}     Diagnostics Collection Complete!${NC}"
-    echo -e "${GREEN}====================================================${NC}"
-    echo ""
-    
-    # Get service statuses and file size
-    local service_status=$(systemctl is-active "$instance_name" 2>/dev/null || echo "unknown")
-    local nginx_status=$(systemctl is-active nginx 2>/dev/null || echo "unknown")
-    local postgres_status=$(systemctl is-active postgresql 2>/dev/null || echo "unknown")
-    local redis_status=$(systemctl is-active redis-server 2>/dev/null || echo "unknown")
-    local file_size=$(du -h "$diag_file" 2>/dev/null | cut -f1 || echo "unknown")
-    local line_count=$(wc -l < "$diag_file" 2>/dev/null || echo "unknown")
-    
-    # Get connection counts for summary
-    local backend_port=$(grep '^PORT=' "$instance_dir/backend/.env" 2>/dev/null | cut -d'=' -f2 | tr -d ' ' || echo "3000")
-    local backend_conn_count=$(ss -tn 2>/dev/null | grep ":$backend_port" | wc -l || echo "0")
-    
-    local db_conn_count="N/A"
-    if [ -n "$DB_PASS" ] && [ -n "$DB_USER" ] && [ -n "$DB_NAME" ]; then
-        db_conn_count=$(PGPASSWORD="$DB_PASS" psql -h "${DB_HOST:-localhost}" -U "$DB_USER" -d "$DB_NAME" -t -A -c "SELECT count(*) FROM pg_stat_activity WHERE datname = '$DB_NAME';" 2>/dev/null || echo "N/A")
-    fi
-    
-    local redis_conn_count="N/A"
-    if [ -n "$REDIS_USER" ] && [ -n "$REDIS_PASSWORD" ]; then
-        redis_conn_count=$(redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" --user "$REDIS_USER" --pass "$REDIS_PASSWORD" --no-auth-warning INFO clients 2>/dev/null | grep "connected_clients:" | cut -d':' -f2 | tr -d '\r' || echo "N/A")
-    elif [ -n "$REDIS_PASSWORD" ]; then
-        redis_conn_count=$(redis-cli -h "${REDIS_HOST:-localhost}" -p "${REDIS_PORT:-6379}" -a "$REDIS_PASSWORD" --no-auth-warning INFO clients 2>/dev/null | grep "connected_clients:" | cut -d':' -f2 | tr -d '\r' || echo "N/A")
-    fi
-    
-    # Compact, copyable summary
-    echo -e "${BLUE}═══════════════════════════════════════════════════${NC}"
-    echo -e "${BLUE}DIAGNOSTICS SUMMARY (copy-paste friendly)${NC}"
-    echo -e "${BLUE}═══════════════════════════════════════════════════${NC}"
-    echo "Instance: $instance_name"
-    echo "File: $diag_file"
-    echo "Size: $file_size ($line_count lines)"
-    echo "Generated: $(date '+%Y-%m-%d %H:%M:%S')"
-    echo "---"
-    echo "Service Status: $service_status"
-    echo "Nginx Status: $nginx_status"
-    echo "PostgreSQL: $postgres_status"
-    echo "Redis: $redis_status"
-    echo "---"
-    echo "Backend Port: $backend_port (Active Connections: $backend_conn_count)"
-    echo "Database Connections: $db_conn_count"
-    echo "Redis Connections: $redis_conn_count"
-    echo "---"
-    echo "View: cat $(basename "$diag_file")"
-    echo "Or: less $(basename "$diag_file")"
-    echo "Share: Send $(basename "$diag_file") to support"
-    echo -e "${BLUE}═══════════════════════════════════════════════════${NC}"
-    echo ""
-    print_warning "Review file before sharing - sensitive data has been sanitized"
-    echo ""
-    
-    print_success "Done!"
-}
-
-# Run main function
-main "$@"
-

tools/fix-migrations.sh

@@ -1,286 +0,0 @@
-#!/bin/bash
-# PatchMon Migration Fixer
-# Standalone script to detect and fix failed Prisma migrations
-# Usage: sudo bash fix-migrations.sh [instance-name]
-
-set -e
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Print functions
-print_status() {
-    echo -e "${GREEN}✅ $1${NC}"
-}
-
-print_info() {
-    echo -e "${BLUE}ℹ️  $1${NC}"
-}
-
-print_error() {
-    echo -e "${RED}❌ $1${NC}"
-}
-
-print_warning() {
-    echo -e "${YELLOW}⚠️  $1${NC}"
-}
-
-# Check if running as root
-if [[ $EUID -ne 0 ]]; then
-    print_error "This script must be run as root"
-    print_info "Please run: sudo bash $0"
-    exit 1
-fi
-
-# Function to detect PatchMon installations
-detect_installations() {
-    local installations=()
-    
-    if [ -d "/opt" ]; then
-        for dir in /opt/*/; do
-            local dirname=$(basename "$dir")
-            # Skip backup directories
-            if [[ "$dirname" =~ \.backup\. ]]; then
-                continue
-            fi
-            # Check if it's a PatchMon installation
-            if [ -f "$dir/backend/package.json" ] && grep -q "patchmon" "$dir/backend/package.json" 2>/dev/null; then
-                installations+=("$dirname")
-            fi
-        done
-    fi
-    
-    echo "${installations[@]}"
-}
-
-# Function to select installation
-select_installation() {
-    local installations=($(detect_installations))
-    
-    if [ ${#installations[@]} -eq 0 ]; then
-        print_error "No PatchMon installations found in /opt"
-        exit 1
-    fi
-    
-    if [ -n "$1" ]; then
-        # Use provided instance name
-        if [[ " ${installations[@]} " =~ " $1 " ]]; then
-            echo "$1"
-            return 0
-        else
-            print_error "Instance '$1' not found"
-            exit 1
-        fi
-    fi
-    
-    print_info "Found ${#installations[@]} installation(s):"
-    echo ""
-    
-    local i=1
-    declare -A install_map
-    for install in "${installations[@]}"; do
-        printf "%2d. %s\n" "$i" "$install"
-        install_map[$i]="$install"
-        i=$((i + 1))
-    done
-    
-    echo ""
-    echo -n -e "${BLUE}Select installation number [1]: ${NC}"
-    read -r selection
-    
-    selection=${selection:-1}
-    
-    if [[ "$selection" =~ ^[0-9]+$ ]] && [ -n "${install_map[$selection]}" ]; then
-        echo "${install_map[$selection]}"
-        return 0
-    else
-        print_error "Invalid selection"
-        exit 1
-    fi
-}
-
-# Function to check and fix failed migrations
-fix_failed_migrations() {
-    local db_name="$1"
-    local db_user="$2"
-    local db_pass="$3"
-    local db_host="${4:-localhost}"
-    
-    print_info "Checking for failed migrations in database..."
-    
-    # Query for failed migrations
-    local failed_migrations
-    failed_migrations=$(PGPASSWORD="$db_pass" psql -h "$db_host" -U "$db_user" -d "$db_name" -t -A -c \
-        "SELECT migration_name FROM _prisma_migrations WHERE finished_at IS NULL AND started_at IS NOT NULL;" 2>/dev/null || echo "")
-    
-    if [ -z "$failed_migrations" ]; then
-        print_status "No failed migrations found"
-        return 0
-    fi
-    
-    print_warning "Found failed migration(s):"
-    echo "$failed_migrations" | while read -r migration; do
-        [ -n "$migration" ] && print_warning "  - $migration"
-    done
-    echo ""
-    
-    print_info "What would you like to do?"
-    echo "  1. Clean and retry (delete failed records and re-run migration)"
-    echo "  2. Mark as completed (if schema changes are already applied)"
-    echo "  3. Show migration details only"
-    echo "  4. Cancel"
-    echo ""
-    echo -n -e "${BLUE}Select option [1]: ${NC}"
-    read -r option
-    
-    option=${option:-1}
-    
-    case $option in
-        1)
-            print_info "Cleaning failed migrations and preparing for retry..."
-            echo "$failed_migrations" | while read -r migration; do
-                if [ -n "$migration" ]; then
-                    print_info "Processing: $migration"
-                    
-                    # Mark as rolled back
-                    PGPASSWORD="$db_pass" psql -h "$db_host" -U "$db_user" -d "$db_name" -c \
-                        "UPDATE _prisma_migrations SET rolled_back_at = NOW() WHERE migration_name = '$migration' AND finished_at IS NULL;" >/dev/null 2>&1
-                    
-                    # Delete the failed record
-                    PGPASSWORD="$db_pass" psql -h "$db_host" -U "$db_user" -d "$db_name" -c \
-                        "DELETE FROM _prisma_migrations WHERE migration_name = '$migration' AND finished_at IS NULL;" >/dev/null 2>&1
-                    
-                    print_status "Cleared: $migration"
-                fi
-            done
-            print_status "Failed migrations cleared - ready to retry"
-            return 0
-            ;;
-        2)
-            print_info "Marking migrations as completed..."
-            echo "$failed_migrations" | while read -r migration; do
-                if [ -n "$migration" ]; then
-                    print_info "Marking as complete: $migration"
-                    
-                    PGPASSWORD="$db_pass" psql -h "$db_host" -U "$db_user" -d "$db_name" -c \
-                        "UPDATE _prisma_migrations SET finished_at = NOW(), logs = 'Manually resolved by fix-migrations.sh' WHERE migration_name = '$migration' AND finished_at IS NULL;" >/dev/null 2>&1
-                    
-                    print_status "Marked complete: $migration"
-                fi
-            done
-            print_status "All migrations marked as completed"
-            return 0
-            ;;
-        3)
-            print_info "Migration details:"
-            PGPASSWORD="$db_pass" psql -h "$db_host" -U "$db_user" -d "$db_name" -c \
-                "SELECT migration_name, started_at, finished_at, rolled_back_at, logs FROM _prisma_migrations WHERE finished_at IS NULL AND started_at IS NOT NULL;"
-            return 0
-            ;;
-        4)
-            print_info "Cancelled"
-            return 1
-            ;;
-        *)
-            print_error "Invalid option"
-            return 1
-            ;;
-    esac
-}
-
-# Main script
-main() {
-    echo -e "${BLUE}====================================================${NC}"
-    echo -e "${BLUE}        PatchMon Migration Fixer${NC}"
-    echo -e "${BLUE}====================================================${NC}"
-    echo ""
-    
-    # Select instance
-    instance_name=$(select_installation "$1")
-    instance_dir="/opt/$instance_name"
-    
-    print_info "Selected instance: $instance_name"
-    print_info "Directory: $instance_dir"
-    echo ""
-    
-    # Load .env to get database credentials
-    if [ ! -f "$instance_dir/backend/.env" ]; then
-        print_error "Cannot find .env file at $instance_dir/backend/.env"
-        exit 1
-    fi
-    
-    # Source .env
-    set -a
-    source "$instance_dir/backend/.env"
-    set +a
-    
-    # Parse DATABASE_URL
-    if [ -z "$DATABASE_URL" ]; then
-        print_error "DATABASE_URL not found in .env file"
-        exit 1
-    fi
-    
-    DB_USER=$(echo "$DATABASE_URL" | sed -n 's|postgresql://\([^:]*\):.*|\1|p')
-    DB_PASS=$(echo "$DATABASE_URL" | sed -n 's|postgresql://[^:]*:\([^@]*\)@.*|\1|p')
-    DB_HOST=$(echo "$DATABASE_URL" | sed -n 's|.*@\([^:]*\):.*|\1|p')
-    DB_NAME=$(echo "$DATABASE_URL" | sed -n 's|.*/\([^?]*\).*|\1|p')
-    
-    print_info "Database: $DB_NAME"
-    print_info "User: $DB_USER"
-    print_info "Host: $DB_HOST"
-    echo ""
-    
-    # Test database connection
-    print_info "Testing database connection..."
-    if ! PGPASSWORD="$DB_PASS" psql -h "$DB_HOST" -U "$DB_USER" -d "$DB_NAME" -c "SELECT 1;" >/dev/null 2>&1; then
-        print_error "Cannot connect to database"
-        exit 1
-    fi
-    print_status "Database connection successful"
-    echo ""
-    
-    # Check Prisma migration status
-    print_info "Checking Prisma migration status..."
-    cd "$instance_dir/backend"
-    
-    echo ""
-    echo -e "${YELLOW}=== Prisma Migration Status ===${NC}"
-    npx prisma migrate status 2>&1 || true
-    echo -e "${YELLOW}==============================${NC}"
-    echo ""
-    
-    # Check for failed migrations
-    fix_failed_migrations "$DB_NAME" "$DB_USER" "$DB_PASS" "$DB_HOST"
-    
-    # Ask if user wants to run migrations now
-    echo ""
-    echo -n -e "${BLUE}Do you want to run 'npx prisma migrate deploy' now? [y/N]: ${NC}"
-    read -r run_migrate
-    
-    if [[ "$run_migrate" =~ ^[Yy] ]]; then
-        print_info "Running migrations..."
-        cd "$instance_dir/backend"
-        
-        if npx prisma migrate deploy; then
-            print_status "Migrations completed successfully!"
-        else
-            print_error "Migration failed"
-            print_info "You may need to run this script again or investigate further"
-            exit 1
-        fi
-    else
-        print_info "Skipped migration deployment"
-        print_info "Run manually: cd $instance_dir/backend && npx prisma migrate deploy"
-    fi
-    
-    echo ""
-    print_status "Done!"
-}
-
-# Run main function
-main "$@"
-

tools/fixconnlimit.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# Script to update hardcoded connection pool values in prisma.js
-# Usage: ./update_pool_values.sh [connection_limit] [pool_timeout] [connect_timeout] [idle_timeout] [max_lifetime]
-
-set -e
-
-FILE="${1:-backend/src/config/prisma.js}"
-
-# Get values from arguments or use defaults
-NEW_CONN_LIMIT="${2:-30}"
-NEW_POOL_TIMEOUT="${3:-20}"
-NEW_CONNECT_TIMEOUT="${4:-10}"
-NEW_IDLE_TIMEOUT="${5:-300}"
-NEW_MAX_LIFETIME="${6:-1800}"
-
-if [ ! -f "$FILE" ]; then
-    echo "Error: File not found: $FILE"
-    exit 1
-fi
-
-# Create backup
-BACKUP_FILE="${FILE}.backup.$(date +%Y%m%d_%H%M%S)"
-cp "$FILE" "$BACKUP_FILE"
-echo "Backup created: $BACKUP_FILE"
-
-# Replace the hardcoded values
-sed -i "s|url\.searchParams\.set(\"connection_limit\", \".*\");|url.searchParams.set(\"connection_limit\", \"$NEW_CONN_LIMIT\");|g" "$FILE"
-sed -i "s|url\.searchParams\.set(\"pool_timeout\", \".*\");|url.searchParams.set(\"pool_timeout\", \"$NEW_POOL_TIMEOUT\");|g" "$FILE"
-sed -i "s|url\.searchParams\.set(\"connect_timeout\", \".*\");|url.searchParams.set(\"connect_timeout\", \"$NEW_CONNECT_TIMEOUT\");|g" "$FILE"
-sed -i "s|url\.searchParams\.set(\"idle_timeout\", \".*\");|url.searchParams.set(\"idle_timeout\", \"$NEW_IDLE_TIMEOUT\");|g" "$FILE"
-sed -i "s|url\.searchParams\.set(\"max_lifetime\", \".*\");|url.searchParams.set(\"max_lifetime\", \"$NEW_MAX_LIFETIME\");|g" "$FILE"
-
-echo "Updated values:"
-echo "  connection_limit: $NEW_CONN_LIMIT"
-echo "  pool_timeout: $NEW_POOL_TIMEOUT"
-echo "  connect_timeout: $NEW_CONNECT_TIMEOUT"
-echo "  idle_timeout: $NEW_IDLE_TIMEOUT"
-echo "  max_lifetime: $NEW_MAX_LIFETIME"
-echo ""
-echo "Changes applied to $FILE"

tools/fixconnstrings.sh

@@ -1,128 +0,0 @@
-#!/bin/bash
-
-# Script to fix HTTP connection limit issue for hosts page
-# This adds a bulk status endpoint and updates the frontend to use it
-
-set -e
-
-echo "🔧 Fixing HTTP connection limit issue..."
-
-# Backup files first
-echo "📦 Creating backups..."
-cp backend/src/routes/wsRoutes.js backend/src/routes/wsRoutes.js.bak
-cp frontend/src/pages/Hosts.jsx frontend/src/pages/Hosts.jsx.bak
-
-# Add bulk status endpoint to wsRoutes.js
-echo "➕ Adding bulk status endpoint to backend..."
-
-cat > /tmp/ws_routes_addition.txt << 'EOF'
-// Get WebSocket connection status for multiple hosts at once
-router.get("/status", authenticateToken, async (req, res) => {
-	try {
-		const { apiIds } = req.query; // Comma-separated list of api_ids
-		const idArray = apiIds ? apiIds.split(',').filter(id => id.trim()) : [];
-		
-		const statusMap = {};
-		idArray.forEach(apiId => {
-			statusMap[apiId] = getConnectionInfo(apiId);
-		});
-		
-		res.json({
-			success: true,
-			data: statusMap,
-		});
-	} catch (error) {
-		console.error("Error fetching bulk WebSocket status:", error);
-		res.status(500).json({
-			success: false,
-			error: "Failed to fetch WebSocket status",
-		});
-	}
-});
-EOF
-
-# Find the line number of the first router.get and insert after it
-LINENUM=$(grep -n "router.get.*status.*apiId" backend/src/routes/wsRoutes.js | head -1 | cut -d: -f1)
-sed -i "${LINENUM}r /tmp/ws_routes_addition.txt" backend/src/routes/wsRoutes.js
-
-# Now update the frontend to use the bulk endpoint
-echo "🔄 Updating frontend to use bulk endpoint..."
-
-# Create a sed script to replace the fetchInitialStatus function
-cat > /tmp/hosts_fix.sed << 'EOF'
-/const fetchInitialStatus = async/,\}/c\
-	const fetchInitialStatus = async () => {\
-		const apiIds = hosts\
-			.filter((host) => host.api_id)\
-			.map(host => host.api_id);\
-		\
-		if (apiIds.length === 0) return;\
-		\
-		try {\
-			const response = await fetch(`/api/v1/ws/status?apiIds=${apiIds.join(',')}`, {\
-				headers: {\
-					Authorization: `Bearer ${token}`,\
-				},\
-			});\
-			if (response.ok) {\
-				const result = await response.json();\
-				setWsStatusMap(result.data);\
-			}\
-		} catch (_error) {\
-			// Silently handle errors\
-		}\
-	};
-EOF
-
-# Apply the sed script (multiline replacement is tricky with sed, so we'll use a different approach)
-echo "✨ Using awk for multi-line replacement..."
-
-# Create a temporary awk script
-cat > /tmp/update_hosts.awk << 'AWK_EOF'
-BEGIN { in_function=0; brace_count=0 }
-/store.fetchInitialStatus/ { printing=1 }
-/const fetchInitialStatus = async/ { 
-    print "			// Fetch initial WebSocket status for all hosts"; 
-    print "			const fetchInitialStatus = async () => {"; 
-    print "				const apiIds = hosts"; 
-    print "					.filter((host) => host.api_id)"; 
-    print "					.map(host => host.api_id);"; 
-    print ""; 
-    print "				if (apiIds.length === 0) return;"; 
-    print ""; 
-    print "				try {"; 
-    print "					const response = await fetch(`/api/v1/ws/status?apiIds=${apiIds.join(',')}`, {"; 
-    print "						headers: {"; 
-    print "							Authorization: `Bearer ${token}`,"; 
-    print "						},"; 
-    print "					});"; 
-    print "					if (response.ok) {"; 
-    print "						const result = await response.json();"; 
-    print "						setWsStatusMap(result.data);"; 
-    print "					}"; 
-    print "				} catch (_error) {"; 
-    print "					// Silently handle errors"; 
-    print "				}"; 
-    print "			};"; 
-    skipping=1; 
-    next 
-}
-skipping && /^\t\t\}/ { skipping=0; next }
-skipping { next }
-{ print }
-AWK_EOF
-
-awk -f /tmp/update_hosts.awk frontend/src/pages/Hosts.jsx.bak > frontend/src/pages/Hosts.jsx
-
-# Clean up temp files
-rm /tmp/ws_routes_addition.txt /tmp/hosts_fix.sed /tmp/update_hosts.awk
-
-echo "✅ Done! Files have been modified."
-echo ""
-echo "📝 Changes made:"
-echo "   - backend/src/routes/wsRoutes.js: Added bulk status endpoint"
-echo "   - frontend/src/pages/Hosts.jsx: Updated to use bulk endpoint"
-echo ""
-echo "💾 Backups saved as:"
-echo "   - backend/src/routes/wsRoutes.js.bak"
-echo "   - frontend/src/pages/Hosts.jsx.bak"

tools/setup-redis.sh

@@ -1,263 +0,0 @@
-#!/bin/bash
-
-# redis-setup.sh - Redis Database and User Setup for PatchMon
-# This script creates a dedicated Redis database and user for a PatchMon instance
-
-set -e
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Default Redis connection details
-REDIS_HOST=${REDIS_HOST:-"localhost"}
-REDIS_PORT=${REDIS_PORT:-6379}
-REDIS_ADMIN_PASSWORD=${REDIS_ADMIN_PASSWORD:-"YOURREDISPASSHERE"}
-
-echo -e "${BLUE}🔧 PatchMon Redis Setup${NC}"
-echo "=================================="
-
-# Function to generate random strings
-generate_random_string() {
-    local length=${1:-16}
-    openssl rand -base64 $length | tr -d "=+/" | cut -c1-$length
-}
-
-# Function to check if Redis is accessible
-check_redis_connection() {
-    echo -e "${YELLOW}📡 Checking Redis connection...${NC}"
-    
-    if [ -n "$REDIS_ADMIN_PASSWORD" ]; then
-        # With password - use ACL admin user
-        if redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" --user admin --pass "$REDIS_ADMIN_PASSWORD" --no-auth-warning ping > /dev/null 2>&1; then
-            echo -e "${GREEN}✅ Redis connection successful${NC}"
-            return 0
-        else
-            echo -e "${RED}❌ Cannot connect to Redis with ACL admin user${NC}"
-            echo "Please ensure Redis is running and the admin password is correct"
-            return 1
-        fi
-    else
-        # Without password
-        if redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" ping > /dev/null 2>&1; then
-            echo -e "${GREEN}✅ Redis connection successful${NC}"
-            return 0
-        else
-            echo -e "${RED}❌ Cannot connect to Redis${NC}"
-            echo "Please ensure Redis is running"
-            return 1
-        fi
-    fi
-}
-
-# Function to find next available database number
-find_next_db() {
-    echo -e "${YELLOW}🔍 Finding next available database...${NC}" >&2
-    
-    # Start from database 0 and keep checking until we find an empty one
-    local db_num=0
-    local max_attempts=100  # Safety limit to prevent infinite loop
-    
-    while [ $db_num -lt $max_attempts ]; do
-        # Test if database is empty
-        local key_count
-        local redis_output
-        
-        if [ -n "$REDIS_ADMIN_PASSWORD" ]; then
-            # With password - use ACL admin user
-            redis_output=$(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" --user admin --pass "$REDIS_ADMIN_PASSWORD" --no-auth-warning -n "$db_num" DBSIZE 2>&1)
-        else
-            # Without password
-            redis_output=$(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" -n "$db_num" DBSIZE 2>&1)
-        fi
-        
-        # Check for authentication errors
-        if echo "$redis_output" | grep -q "NOAUTH"; then
-            echo -e "${RED}❌ Authentication required but REDIS_ADMIN_PASSWORD not set${NC}" >&2
-            echo -e "${YELLOW}💡 Please set REDIS_ADMIN_PASSWORD environment variable:${NC}" >&2
-            echo -e "${YELLOW}   export REDIS_ADMIN_PASSWORD='your_password'${NC}" >&2
-            echo -e "${YELLOW}   Or run: REDIS_ADMIN_PASSWORD='your_password' ./setup-redis.sh${NC}" >&2
-            exit 1
-        fi
-        
-        # Check for other errors
-        if echo "$redis_output" | grep -q "ERR"; then
-            if echo "$redis_output" | grep -q "invalid DB index"; then
-                echo -e "${RED}❌ Reached maximum database limit at database $db_num${NC}" >&2
-                echo -e "${YELLOW}💡 Redis is configured with $db_num databases maximum.${NC}" >&2
-                echo -e "${YELLOW}💡 Increase 'databases' setting in redis.conf or clean up unused databases.${NC}" >&2
-                exit 1
-            else
-                echo -e "${RED}❌ Error checking database $db_num: $redis_output${NC}" >&2
-                exit 1
-            fi
-        fi
-        
-        key_count="$redis_output"
-        
-        # If database is empty, use it
-        if [ "$key_count" = "0" ]; then
-            echo -e "${GREEN}✅ Found available database: $db_num (empty)${NC}" >&2
-            echo "$db_num"
-            return
-        fi
-        
-        echo -e "${BLUE}   Database $db_num has $key_count keys, checking next...${NC}" >&2
-        db_num=$((db_num + 1))
-    done
-    
-    echo -e "${RED}❌ No available databases found (checked 0-$max_attempts)${NC}" >&2
-    echo -e "${YELLOW}💡 All checked databases are in use. Consider cleaning up unused databases.${NC}" >&2
-    exit 1
-}
-
-# Function to create Redis user
-create_redis_user() {
-    local username="$1"
-    local password="$2"
-    local db_num="$3"
-    
-    echo -e "${YELLOW}👤 Creating Redis user: $username for database $db_num${NC}"
-    
-    # Create user with password and permissions
-    # Note: >password syntax is for Redis ACL, we need to properly escape it
-    local result
-    if [ -n "$REDIS_ADMIN_PASSWORD" ]; then
-        # With password - use ACL admin user
-        result=$(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" --user admin --pass "$REDIS_ADMIN_PASSWORD" --no-auth-warning ACL SETUSER "$username" on ">${password}" ~* +@all 2>&1)
-    else
-        # Without password
-        result=$(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" ACL SETUSER "$username" on ">${password}" ~* +@all 2>&1)
-    fi
-    
-    if [ $? -eq 0 ] && [ "$result" = "OK" ]; then
-        echo -e "${GREEN}✅ Redis user '$username' created successfully for database $db_num${NC}"
-        
-        # Save ACL users to file to persist across restarts
-        local save_result
-        if [ -n "$REDIS_ADMIN_PASSWORD" ]; then
-            save_result=$(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" --user admin --pass "$REDIS_ADMIN_PASSWORD" --no-auth-warning ACL SAVE 2>&1)
-        else
-            save_result=$(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" ACL SAVE 2>&1)
-        fi
-        
-        if [ "$save_result" = "OK" ]; then
-            echo -e "${GREEN}✅ Redis ACL users saved to file${NC}"
-        else
-            echo -e "${YELLOW}⚠️  Failed to save ACL users to file: $save_result${NC}"
-        fi
-        
-        # Verify user was created
-        if [ -n "$REDIS_ADMIN_PASSWORD" ]; then
-            local verify=$(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" --user admin --pass "$REDIS_ADMIN_PASSWORD" --no-auth-warning ACL GETUSER "$username" 2>&1)
-        else
-            local verify=$(redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" ACL GETUSER "$username" 2>&1)
-        fi
-        
-        if [ "$verify" = "(nil)" ]; then
-            echo -e "${RED}❌ User creation reported OK but user does not exist${NC}"
-            return 1
-        fi
-        
-        return 0
-    else
-        echo -e "${RED}❌ Failed to create Redis user${NC}"
-        echo -e "${RED}Error: $result${NC}"
-        return 1
-    fi
-}
-
-# Function to test user connection
-test_user_connection() {
-    local username="$1"
-    local password="$2"
-    local db_num="$3"
-    
-    echo -e "${YELLOW}🧪 Testing user connection...${NC}"
-    
-    if redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" --user "$username" --pass "$password" --no-auth-warning -n "$db_num" ping > /dev/null 2>&1; then
-        echo -e "${GREEN}✅ User connection test successful${NC}"
-        return 0
-    else
-        echo -e "${RED}❌ User connection test failed${NC}"
-        return 1
-    fi
-}
-
-# Function to mark database as in-use
-mark_database_in_use() {
-    local db_num="$1"
-    
-    echo -e "${YELLOW}📝 Marking database as in-use...${NC}"
-    
-    if [ -n "$REDIS_ADMIN_PASSWORD" ]; then
-        redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" --user admin --pass "$REDIS_ADMIN_PASSWORD" --no-auth-warning -n "$db_num" SET "patchmon:initialized" "$(date -u +%Y-%m-%dT%H:%M:%SZ)" > /dev/null
-    else
-        redis-cli -h "$REDIS_HOST" -p "$REDIS_PORT" -n "$db_num" SET "patchmon:initialized" "$(date -u +%Y-%m-%dT%H:%M:%SZ)" > /dev/null
-    fi
-    
-    if [ $? -eq 0 ]; then
-        echo -e "${GREEN}✅ Database marked as in-use${NC}"
-        return 0
-    else
-        echo -e "${RED}❌ Failed to mark database${NC}"
-        return 1
-    fi
-}
-
-# Main execution
-main() {
-    # Check Redis connection
-    if ! check_redis_connection; then
-        exit 1
-    fi
-    
-    # Generate random credentials
-    USERNAME="patchmon_$(generate_random_string 8)"
-    PASSWORD=$(generate_random_string 32)
-    DB_NUM=$(find_next_db)
-    
-    echo ""
-    echo -e "${BLUE}📋 Generated Configuration:${NC}"
-    echo "Username: $USERNAME"
-    echo "Password: $PASSWORD"
-    echo "Database: $DB_NUM"
-    echo ""
-    
-    # Create Redis user
-    if ! create_redis_user "$USERNAME" "$PASSWORD" "$DB_NUM"; then
-        exit 1
-    fi
-    
-    # Test user connection
-    if ! test_user_connection "$USERNAME" "$PASSWORD" "$DB_NUM"; then
-        exit 1
-    fi
-    
-    # Mark database as in-use to prevent reuse on next run
-    if ! mark_database_in_use "$DB_NUM"; then
-        exit 1
-    fi
-    
-    # Output .env configuration
-    echo ""
-    echo -e "${GREEN}🎉 Redis setup completed successfully!${NC}"
-    echo ""
-    echo -e "${BLUE}📄 Add these lines to your .env file:${NC}"
-    echo "=================================="
-    echo "REDIS_HOST=$REDIS_HOST"
-    echo "REDIS_PORT=$REDIS_PORT"
-    echo "REDIS_USER=$USERNAME"
-    echo "REDIS_PASSWORD=$PASSWORD"
-    echo "REDIS_DB=$DB_NUM"
-    echo "=================================="
-    echo ""
-    
-    echo -e "${YELLOW}💡 Copy the configuration above to your .env file${NC}"
-}
-
-# Run main function
-main "$@"