2.3.0

New Crowdin translations by GitHub Action (#7090 )
Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>
2026-09-10 06:08:40 -07:00 · 2026-09-09 14:45:28 -07:00 · 2026-09-09 14:43:53 -07:00 · 2026-09-09 14:43:02 -07:00 · 2026-09-08 09:25:58 -07:00 · 2026-09-06 18:35:01 -07:00
82 changed files with 1754 additions and 804 deletions
@@ -23,7 +23,7 @@ jobs:
    - name: Checkout
      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
    - name: crowdin action
-      uses: crowdin/github-action@8f01d54f70f1713ee3f09d82c2bbb2daeac28689 # v2
+      uses: crowdin/github-action@e4a6c1338b4063c77d46a81875265f9e8bd76f95 # v3.0.0
      with:
        upload_translations: false
        download_translations: true
@@ -69,6 +69,11 @@ For OIDC login (overrides password login):
 - `HOMEPAGE_OIDC_CLIENT_ID`
 - `HOMEPAGE_OIDC_CLIENT_SECRET`
 - Optional: `HOMEPAGE_OIDC_NAME` (display name), `HOMEPAGE_OIDC_SCOPE` (defaults to `openid email profile`)
+- Optional: `HOMEPAGE_OIDC_AUTO_LOGIN=true` to skip the login page and send unauthenticated visitors straight to the provider
+
+!!! tip
+
+    With auto-login enabled, visit `/auth/signin?autologin=0` to reach the login page without being redirected, e.g. in case something goes wrong!

 !!! warning

@@ -13,8 +13,8 @@ Allowed fields: `["movies", "series", "episodes", "songs", "albums"]`.

 | Jellyfin Version | Homepage Widget Version |
 | ---------------- | ----------------------- |
-| < 10.12          | 1 (default)             |
-| >= 10.12         | 2                       |
+| < 12 (10.12)     | 1 (default)             |
+| >= 12 (10.12)    | 2                       |

 ```yaml
 widget:
@@ -1,6 +1,6 @@
 {
  "name": "homepage",
-  "version": "2.2.0",
+  "version": "2.3.0",
  "private": true,
  "scripts": {
    "preinstall": "npx only-allow pnpm",
@@ -21,7 +21,7 @@
        "seconds": "s"
    },
    "auth": {
-        "signout": "Sign out"
+        "signout": "Teken uit"
    },
    "widget": {
        "missing_type": "Ontbrekende legstuk-tipe: {{type}}",
@@ -40,8 +40,8 @@
    },
    "search": {
        "placeholder": "Soek…",
-        "provider": "Search engine: {{name}}",
-        "select_provider": "Select search engine"
+        "provider": "Soekenjin: {{name}}",
+        "select_provider": "Kies soekenjin"
    },
    "resources": {
        "cpu": "SVE",
@@ -99,7 +99,12 @@
        "unhealthy": "Ongesond",
        "not_found": "Nie Gevind Nie",
        "exited": "Verlaat",
-        "partial": "Gedeeltelik"
+        "partial": "Gedeeltelik",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Fout",
@@ -474,7 +479,7 @@
        "users": "Gebruikers",
        "loginsLast24H": "Aantekenings (24h)",
        "failedLoginsLast24H": "Mislukte Aantekenings (24h)",
-        "authorizationsLast24H": "Auths (24h)"
+        "authorizationsLast24H": "Magtigings (24h)"
    },
    "proxmox": {
        "mem": "GEH",
@@ -99,7 +99,12 @@
        "unhealthy": "غير سليم",
        "not_found": "غير موجود",
        "exited": "خرجت",
-        "partial": "جزئي"
+        "partial": "جزئي",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "خطأ",
@@ -99,7 +99,12 @@
        "unhealthy": "Нездравословен",
        "not_found": "Не е открит",
        "exited": "Напуснал",
-        "partial": "Частично"
+        "partial": "Частично",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Грешка",
@@ -99,7 +99,12 @@
        "unhealthy": "No saludable",
        "not_found": "No trobat",
        "exited": "Tancat",
-        "partial": "Parcial"
+        "partial": "Parcial",
+        "created": "Creat",
+        "paused": "Pausat",
+        "restarting": "Reiniciant",
+        "removing": "Eliminant",
+        "dead": "Mort"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Nezdravý",
        "not_found": "Nenalezen",
        "exited": "Ukončen",
-        "partial": "Částečný"
+        "partial": "Částečný",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Chyba",
@@ -99,7 +99,12 @@
        "unhealthy": "Usund",
        "not_found": "Ikke Fundet",
        "exited": "Forladt",
-        "partial": "Delvis"
+        "partial": "Delvis",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Fehlerhaft",
        "not_found": "Nicht gefunden",
        "exited": "Beendet",
-        "partial": "Teilweise"
+        "partial": "Teilweise",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Fehler",
@@ -21,7 +21,7 @@
        "seconds": "s"
    },
    "auth": {
-        "signout": "Sign out"
+        "signout": "Αποσύνδεση"
    },
    "widget": {
        "missing_type": "Λείπει ο τύπος widget: {{type}}",
@@ -41,7 +41,7 @@
    "search": {
        "placeholder": "Αναζήτηση…",
        "provider": "Search engine: {{name}}",
-        "select_provider": "Select search engine"
+        "select_provider": "Επιλέξτε τις μηχανές αναζήτησης"
    },
    "resources": {
        "cpu": "Επεξεργαστής",
@@ -66,24 +66,24 @@
        "wlan_devices": "WLAN Συσκευές",
        "lan_users": "LAN Χρήστες",
        "wlan_users": "WLAN Χρήστες",
-        "up": "UP",
+        "up": "ΕΠΑΝΩ",
        "down": "ΚΑΤΩ",
-        "wait": "Please wait",
+        "wait": "Παρακαλώ περιμένετε",
        "empty_data": "Άγνωστη κατάσταση υποσυστήματος"
    },
    "unifi_drive": {
-        "healthy": "Healthy",
+        "healthy": "Υγειές",
        "degraded": "Degraded",
        "no_data": "No storage data available"
    },
    "duplicati": {
-        "jobs": "Jobs",
-        "stored": "Stored",
-        "lastBackup": "Last Run",
-        "nextRun": "Next Run",
-        "running": "Running",
-        "warnings": "Warnings",
-        "errors": "Errors"
+        "jobs": "Εργασίες",
+        "stored": "Αποθηκευμένα",
+        "lastBackup": "Τελευταία εκτέλεση",
+        "nextRun": "Επόμενη εκτέλεση",
+        "running": "Εκτελείται",
+        "warnings": "Προειδοποιήσεις",
+        "errors": "Σφάλματα"
    },
    "docker": {
        "rx": "RX",
@@ -99,10 +99,15 @@
        "unhealthy": "Άρρωστο",
        "not_found": "Δεν βρέθηκε",
        "exited": "Έκλεισε",
-        "partial": "Μερικό"
+        "partial": "Μερικό",
+        "created": "Δημιουργήθηκε",
+        "paused": "Σε παύση",
+        "restarting": "Γίνεται επανεκκίνηση",
+        "removing": "Αφαιρείται",
+        "dead": "Dead"
    },
    "ping": {
-        "error": "Error",
+        "error": "Σφάλμα",
        "ping": "Ping",
        "down": "Ping down",
        "up": "Ping up",
@@ -110,11 +115,11 @@
    },
    "siteMonitor": {
        "http_status": "Κατάσταση HTTP",
-        "error": "Error",
+        "error": "Σφάλμα",
        "response": "Απόκριση",
        "down": "Down",
        "up": "Up",
-        "not_available": "Not Available"
+        "not_available": "Μη Διαθέσιμο"
    },
    "emby": {
        "playing": "Παίζει",
@@ -127,7 +132,7 @@
        "songs": "Τραγούδια"
    },
    "jellyfin": {
-        "playing": "Playing",
+        "playing": "Γίνεται αναπαραγωγή",
        "transcoding": "Transcoding",
        "bitrate": "Bitrate",
        "no_active": "No Active Streams",
@@ -99,7 +99,12 @@
        "unhealthy": "Unhealthy",
        "not_found": "Not Found",
        "exited": "Exited",
-        "partial": "Partial"
+        "partial": "Partial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Malsana",
        "not_found": "Ne trovita",
        "exited": "Eliris",
-        "partial": "Parta"
+        "partial": "Parta",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "No saludable",
        "not_found": "No encontrado",
        "exited": "Terminado",
-        "partial": "Parcial"
+        "partial": "Parcial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Unhealthy",
        "not_found": "Not Found",
        "exited": "Exited",
-        "partial": "Partial"
+        "partial": "Partial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Unhealthy",
        "not_found": "Not Found",
        "exited": "Exited",
-        "partial": "Partial"
+        "partial": "Partial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Mauvaise santé",
        "not_found": "Inconnu",
        "exited": "Arrêté",
-        "partial": "Partiel"
+        "partial": "Partiel",
+        "created": "Créé",
+        "paused": "En pause",
+        "restarting": "Redémarrage",
+        "removing": "Suppression",
+        "dead": "Mort"
    },
    "ping": {
        "error": "Erreur",
@@ -21,7 +21,7 @@
        "seconds": "שניות"
    },
    "auth": {
-        "signout": "Sign out"
+        "signout": "התנתק"
    },
    "widget": {
        "missing_type": "סוג ווידג'ט חסר: {{type}}",
@@ -40,8 +40,8 @@
    },
    "search": {
        "placeholder": "חיפוש…",
-        "provider": "Search engine: {{name}}",
-        "select_provider": "Select search engine"
+        "provider": "מנוע חיפוש: {{name}}",
+        "select_provider": "בחר מנוע חיפוש"
    },
    "resources": {
        "cpu": "מעבד",
@@ -72,18 +72,18 @@
        "empty_data": "מצב תת-מערכת לא ידוע"
    },
    "unifi_drive": {
-        "healthy": "Healthy",
-        "degraded": "Degraded",
-        "no_data": "No storage data available"
+        "healthy": "בריא",
+        "degraded": "ירוד",
+        "no_data": "אין אחסון זמין"
    },
    "duplicati": {
-        "jobs": "Jobs",
-        "stored": "Stored",
+        "jobs": "משימות",
+        "stored": "שמור",
        "lastBackup": "Last Run",
        "nextRun": "Next Run",
        "running": "Running",
-        "warnings": "Warnings",
-        "errors": "Errors"
+        "warnings": "הזהרות",
+        "errors": "שגיאות"
    },
    "docker": {
        "rx": "RX",
@@ -99,7 +99,12 @@
        "unhealthy": "לא בריא",
        "not_found": "לא נמצא",
        "exited": "יצא",
-        "partial": "חלקי"
+        "partial": "חלקי",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "שגיאה",
@@ -127,15 +132,15 @@
        "songs": "שירים"
    },
    "jellyfin": {
-        "playing": "Playing",
+        "playing": "מנגן",
        "transcoding": "Transcoding",
        "bitrate": "Bitrate",
-        "no_active": "No Active Streams",
-        "movies": "Movies",
-        "series": "Series",
-        "episodes": "Episodes",
-        "songs": "Songs",
-        "albums": "Albums"
+        "no_active": "אין מדיה פעילה",
+        "movies": "סרטים",
+        "series": "סדרות",
+        "episodes": "פרקים",
+        "songs": "שירים",
+        "albums": "אלבומים"
    },
    "esphome": {
        "offline": "מכובה",
@@ -310,11 +315,11 @@
        "available": "זמין"
    },
    "seerr": {
-        "pending": "Pending",
-        "approved": "Approved",
-        "available": "Available",
-        "completed": "Completed",
-        "processing": "Processing",
+        "pending": "ממתין",
+        "approved": "מאושר",
+        "available": "זמין",
+        "completed": "הסתיים",
+        "processing": "מעבד",
        "issues": "Open Issues"
    },
    "netalertx": {
@@ -359,16 +364,16 @@
        "address": "כתובת",
        "expires": "תאריך תפוגה",
        "never": "אף פעם",
-        "user": "User",
+        "user": "משתמש",
        "hostname": "Hostname",
-        "name": "Name",
+        "name": "שם",
        "client_version": "Client Version",
-        "os": "OS",
-        "created": "Created",
-        "authorized": "Authorized",
-        "is_external": "Is External",
-        "update_available": "Update Available",
-        "tags": "Tags",
+        "os": "מערכת הפעלה",
+        "created": "יוצר",
+        "authorized": "מורשה",
+        "is_external": "האם חיצוני",
+        "update_available": "עדכון זמין",
+        "tags": "תגיות",
        "last_seen": "נראה לאחרונה",
        "now": "כעת",
        "years": "{{number}}y",
@@ -378,8 +383,8 @@
        "minutes": "{{number}}m",
        "seconds": "{{number}}s",
        "ago": "{{value}} Ago",
-        "true": "Yes",
-        "false": "No"
+        "true": "כן",
+        "false": "לא"
    },
    "technitium": {
        "totalQueries": "שאילתות",
@@ -484,7 +489,7 @@
    },
    "pulse": {
        "nodes": "Nodes",
-        "vms": "VMs",
+        "vms": "מכונות וירטואליות",
        "lxcs": "LXCs"
    },
    "glances": {
@@ -584,7 +589,7 @@
        "up": "למעלה",
        "pending": "ממתין",
        "down": "למטה",
-        "ok": "Ok"
+        "ok": "אוקיי"
    },
    "healthchecks": {
        "new": "חדש",
@@ -653,9 +658,9 @@
    },
    "pangolin": {
        "orgs": "Orgs",
-        "sites": "Sites",
-        "resources": "Resources",
-        "targets": "Targets",
+        "sites": "אתרים",
+        "resources": "משאבים",
+        "targets": "מטרות",
        "traffic": "Traffic",
        "in": "In",
        "out": "Out"
@@ -757,7 +762,7 @@
        "volumeAvailable": "זמין"
    },
    "dispatcharr": {
-        "channels": "Channels",
+        "channels": "ערוצים",
        "streams": "Streams"
    },
    "mylar": {
@@ -1182,9 +1187,9 @@
        "nextRenewingSubscription": "תשלום הבא"
    },
    "unraid": {
-        "STARTED": "Started",
-        "STOPPED": "Stopped",
-        "NEW_ARRAY": "New Array",
+        "STARTED": "התחיל",
+        "STOPPED": "נעצר",
+        "NEW_ARRAY": "מערך חדש",
        "RECON_DISK": "Reconstructing Disk",
        "DISABLE_DISK": "Disk Disabled",
        "SWAP_DSBL": "Swap Disable",
@@ -1196,31 +1201,31 @@
        "notifications": "Notifications",
        "status": "Status",
        "cpu": "CPU",
-        "memoryUsed": "Memory Used",
-        "memoryAvailable": "Memory Available",
+        "memoryUsed": "זיכרון בשימוש",
+        "memoryAvailable": "זיכרון זמין",
        "arrayUsed": "Array Used",
        "arrayFree": "Array Free",
        "poolUsed": "{{pool}} Used",
        "poolFree": "{{pool}} Free"
    },
    "backrest": {
-        "num_plans": "Plans",
-        "num_success_30": "Successes",
-        "num_failure_30": "Failures",
+        "num_plans": "תוכניות",
+        "num_success_30": "הצלחות",
+        "num_failure_30": "כשלונות",
        "num_success_latest": "Succeeding",
        "num_failure_latest": "Failing",
        "bytes_added_30": "Bytes Added"
    },
    "yourspotify": {
-        "songs": "Songs",
-        "time": "Time",
-        "artists": "Artists"
+        "songs": "שירים",
+        "time": "זמן",
+        "artists": "אומנים"
    },
    "arcane": {
        "containers": "Containers",
        "images": "Images",
        "image_updates": "Image Updates",
-        "images_unused": "Unused",
+        "images_unused": "לא בשימוש",
        "environment_required": "Environment ID Required"
    },
    "dockhand": {
@@ -1230,7 +1235,7 @@
        "memory": "Memory",
        "images": "Images",
        "volumes": "Volumes",
-        "events_today": "Events Today",
+        "events_today": "אירועים היום",
        "pending_updates": "Pending Updates",
        "stacks": "Stacks",
        "paused": "Paused",
@@ -1238,16 +1243,16 @@
        "environment_not_found": "Environment Not Found"
    },
    "sparkyfitness": {
-        "eaten": "Eaten",
-        "burned": "Burned",
-        "remaining": "Remaining",
-        "steps": "Steps"
+        "eaten": "נאכלו",
+        "burned": "נשרפו",
+        "remaining": "נותרו",
+        "steps": "צעדים"
    },
    "syncthing": {
        "connected": "Connected",
-        "synced": "Synced",
-        "errors": "Errors",
-        "storage": "Storage"
+        "synced": "מסונכרן",
+        "errors": "שגיאות",
+        "storage": "אחסון"
    },
    "sportarr": {
        "wanted": "Wanted",
@@ -99,7 +99,12 @@
        "unhealthy": "Unhealthy",
        "not_found": "Not Found",
        "exited": "Exited",
-        "partial": "Partial"
+        "partial": "Partial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Nefunkcionalno",
        "not_found": "Nepronađeno",
        "exited": "Zatoreno",
-        "partial": "Djelomično"
+        "partial": "Djelomično",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Greška",
@@ -99,7 +99,12 @@
        "unhealthy": "Egészségtelen",
        "not_found": "Nem található",
        "exited": "Kilépett",
-        "partial": "Részleges"
+        "partial": "Részleges",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Hiba",
@@ -99,7 +99,12 @@
        "unhealthy": "Tidak Lancar",
        "not_found": "Tidak Ditemukan",
        "exited": "Terkeluar",
-        "partial": "Sebagian"
+        "partial": "Sebagian",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Non sano",
        "not_found": "Non trovato",
        "exited": "Uscito",
-        "partial": "Parziale"
+        "partial": "Parziale",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Errore",
@@ -99,7 +99,12 @@
        "unhealthy": "非健全",
        "not_found": "不明",
        "exited": "停止しました",
-        "partial": "部分的"
+        "partial": "部分的",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "エラー",
@@ -40,8 +40,8 @@
    },
    "search": {
        "placeholder": "검색…",
-        "provider": "Search engine: {{name}}",
-        "select_provider": "Select search engine"
+        "provider": "검색 엔진: {{name}}",
+        "select_provider": "검색 엔진 선택"
    },
    "resources": {
        "cpu": "CPU",
@@ -99,7 +99,12 @@
        "unhealthy": "비정상",
        "not_found": "찾을 수 없음",
        "exited": "종료됨",
-        "partial": "부분적"
+        "partial": "부분적",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "오류",
@@ -99,7 +99,12 @@
        "unhealthy": "Unhealthy",
        "not_found": "Not Found",
        "exited": "Exited",
-        "partial": "Partial"
+        "partial": "Partial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Kurang sihat",
        "not_found": "Tidak dijumpai",
        "exited": "Dimatikan",
-        "partial": "Sebahagian"
+        "partial": "Sebahagian",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Ongezond",
        "not_found": "Niet Gevonden",
        "exited": "Gestopt",
-        "partial": "Gedeeltelijk"
+        "partial": "Gedeeltelijk",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Fout",
@@ -99,7 +99,12 @@
        "unhealthy": "Usunn",
        "not_found": "Not Found",
        "exited": "Exited",
-        "partial": "Delvis"
+        "partial": "Delvis",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Niezdrowy",
        "not_found": "Nie znaleziono",
        "exited": "Zakończony",
-        "partial": "Częściowy"
+        "partial": "Częściowy",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Błąd",
@@ -99,7 +99,12 @@
        "unhealthy": "Não-saudável",
        "not_found": "Não Encontrado",
        "exited": "Saiu",
-        "partial": "Parcial"
+        "partial": "Parcial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Erro",
@@ -99,7 +99,12 @@
        "unhealthy": "Não-saudável",
        "not_found": "Não Encontrado",
        "exited": "Encerrado",
-        "partial": "Parcial"
+        "partial": "Parcial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Erro",
@@ -99,7 +99,12 @@
        "unhealthy": "Nesănătos",
        "not_found": "Negăsit",
        "exited": "Ieşit",
-        "partial": "Parțial"
+        "partial": "Parțial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Нездоровый",
        "not_found": "Не найдено",
        "exited": "Вышел",
-        "partial": "Частичный"
+        "partial": "Частичный",
+        "created": "Создан",
+        "paused": "Приостановлен",
+        "restarting": "Перезапуск",
+        "removing": "Удаление",
+        "dead": "Мёртв"
    },
    "ping": {
        "error": "Ошибка",
@@ -99,7 +99,12 @@
        "unhealthy": "Nezdravý",
        "not_found": "Nenájdené",
        "exited": "Ukončené",
-        "partial": "Čiastočný"
+        "partial": "Čiastočný",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Chyba",
@@ -99,7 +99,12 @@
        "unhealthy": "Ni zdrav",
        "not_found": "Ni najden",
        "exited": "V izhodu",
-        "partial": "Delni"
+        "partial": "Delni",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Нездравих",
        "not_found": "Није пронађено",
        "exited": "Напуштених",
-        "partial": "Делимично"
+        "partial": "Делимично",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Грешка",
@@ -99,7 +99,12 @@
        "unhealthy": "Unhealthy",
        "not_found": "Not Found",
        "exited": "Exited",
-        "partial": "Partial"
+        "partial": "Partial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Unhealthy",
        "not_found": "Not Found",
        "exited": "Exited",
-        "partial": "Partial"
+        "partial": "Partial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Unhealthy",
        "not_found": "Not Found",
        "exited": "Exited",
-        "partial": "Partial"
+        "partial": "Partial",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "Sağlıksız",
        "not_found": "Bulunamadı",
        "exited": "Kapandı",
-        "partial": "Kısmi"
+        "partial": "Kısmi",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Hata",
@@ -99,7 +99,12 @@
        "unhealthy": "Нездоровий",
        "not_found": "Не знайдено",
        "exited": "Вийшов",
-        "partial": "Частковий"
+        "partial": "Частковий",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Помилка",
@@ -99,7 +99,12 @@
        "unhealthy": "Bất thường",
        "not_found": "Không tìm thấy",
        "exited": "Đã thoát",
-        "partial": "Một phần"
+        "partial": "Một phần",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Lỗi",
@@ -99,7 +99,12 @@
        "unhealthy": "不健康的",
        "not_found": "未找到",
        "exited": "已退出",
-        "partial": "部分"
+        "partial": "部分",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -99,7 +99,12 @@
        "unhealthy": "不健康",
        "not_found": "未找到",
        "exited": "已退出",
-        "partial": "部分"
+        "partial": "部分",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "错误",
@@ -99,7 +99,12 @@
        "unhealthy": "不健康的",
        "not_found": "找不到",
        "exited": "已退出",
-        "partial": "部分"
+        "partial": "部分",
+        "created": "Created",
+        "paused": "Paused",
+        "restarting": "Restarting",
+        "removing": "Removing",
+        "dead": "Dead"
    },
    "ping": {
        "error": "Error",
@@ -0,0 +1,60 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import createMockRes from "test-utils/create-mock-res";
+
+const { getDockerStats, logger } = vi.hoisted(() => ({
+  getDockerStats: vi.fn(),
+  logger: { error: vi.fn() },
+}));
+
+vi.mock("utils/docker/stats", () => ({ getDockerStats }));
+
+vi.mock("utils/logger", () => ({
+  default: () => logger,
+}));
+
+import handler from "pages/api/docker/stats";
+
+describe("pages/api/docker/stats", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it("returns the stats map for the requested server", async () => {
+    getDockerStats.mockResolvedValue({ stats: { app: { cpu: 20, mem: 900, rx: 4, tx: 6 } } });
+
+    const req = { query: { server: "local" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(getDockerStats).toHaveBeenCalledWith("local");
+    expect(res.statusCode).toBe(200);
+    expect(res.body).toEqual({ stats: { app: { cpu: 20, mem: 900, rx: 4, tx: 6 } } });
+  });
+
+  it("returns 500 when the stats lookup reports an error", async () => {
+    getDockerStats.mockResolvedValue({ error: "query failed" });
+
+    const req = { query: { server: "local" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.statusCode).toBe(500);
+    expect(res.body).toEqual({ error: "query failed" });
+  });
+
+  it("logs and returns 500 when the stats lookup throws", async () => {
+    getDockerStats.mockRejectedValue(new Error("boom"));
+
+    const req = { query: { server: "local" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.statusCode).toBe(500);
+    expect(res.body).toEqual({ error: { message: "boom" } });
+    expect(logger.error).toHaveBeenCalled();
+  });
+});
@@ -1,153 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import createMockRes from "test-utils/create-mock-res";
-
-const { state, DockerCtor, getDockerArguments, logger } = vi.hoisted(() => {
-  const state = {
-    docker: null,
-    dockerArgs: { conn: { socketPath: "/var/run/docker.sock" }, swarm: false },
-  };
-
-  function DockerCtor() {
-    return state.docker;
-  }
-
-  return {
-    state,
-    DockerCtor,
-    getDockerArguments: vi.fn(() => state.dockerArgs),
-    logger: { error: vi.fn() },
-  };
-});
-
-vi.mock("dockerode", () => ({
-  default: DockerCtor,
-}));
-
-vi.mock("utils/config/docker", () => ({
-  default: getDockerArguments,
-}));
-
-vi.mock("utils/logger", () => ({
-  default: () => logger,
-}));
-
-import handler from "pages/api/docker/stats/[...service]";
-
-describe("pages/api/docker/stats/[...service]", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    state.dockerArgs = { conn: { socketPath: "/var/run/docker.sock" }, swarm: false };
-    state.docker = {
-      listContainers: vi.fn(),
-      getContainer: vi.fn(),
-      listTasks: vi.fn(),
-    };
-  });
-
-  it("returns 400 when container name/server params are missing", async () => {
-    const req = { query: { service: [] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(400);
-    expect(res.body).toEqual({ error: "docker query parameters are required" });
-  });
-
-  it("returns 500 when docker returns a non-array containers payload", async () => {
-    state.docker.listContainers.mockResolvedValue(Buffer.from("bad"));
-
-    const req = { query: { service: ["c", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(500);
-    expect(res.body).toEqual({ error: "query failed" });
-  });
-
-  it("returns stats for an existing container", async () => {
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/myapp"], Id: "cid1" }]);
-    const containerStats = { cpu_stats: { cpu_usage: { total_usage: 1 } } };
-    state.docker.getContainer.mockReturnValue({
-      stats: vi.fn().mockResolvedValue(containerStats),
-    });
-
-    const req = { query: { service: ["myapp", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(200);
-    expect(res.body).toEqual({ stats: containerStats });
-  });
-
-  it("uses swarm tasks to locate a container and reports a friendly error when stats cannot be retrieved", async () => {
-    state.dockerArgs.swarm = true;
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/other"], Id: "local1" }]);
-    state.docker.listTasks.mockResolvedValue([
-      { Status: { ContainerStatus: { ContainerID: "local1" } } },
-      { Status: { ContainerStatus: { ContainerID: "remote1" } } },
-    ]);
-    state.docker.getContainer.mockReturnValue({
-      stats: vi.fn().mockRejectedValue(new Error("nope")),
-    });
-
-    const req = { query: { service: ["svc", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(200);
-    expect(res.body).toEqual({ error: "Unable to retrieve stats" });
-  });
-
-  it("returns stats for a swarm task container when present locally", async () => {
-    state.dockerArgs.swarm = true;
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/other"], Id: "local1" }]);
-    state.docker.listTasks.mockResolvedValue([{ Status: { ContainerStatus: { ContainerID: "local1" } } }]);
-
-    const containerStats = { cpu_stats: { cpu_usage: { total_usage: 2 } } };
-    state.docker.getContainer.mockReturnValue({
-      stats: vi.fn().mockResolvedValue(containerStats),
-    });
-
-    const req = { query: { service: ["svc", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(200);
-    expect(res.body).toEqual({ stats: containerStats });
-  });
-
-  it("returns 404 when no container or swarm task is found", async () => {
-    state.dockerArgs.swarm = true;
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/other"], Id: "local1" }]);
-    state.docker.listTasks.mockResolvedValue([]);
-
-    const req = { query: { service: ["missing", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(404);
-    expect(res.body).toEqual({ error: "not found" });
-  });
-
-  it("logs and returns 500 when the docker query throws", async () => {
-    getDockerArguments.mockImplementationOnce(() => {
-      throw new Error("boom");
-    });
-
-    const req = { query: { service: ["myapp", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(500);
-    expect(res.body).toEqual({ error: { message: "boom" } });
-    expect(logger.error).toHaveBeenCalled();
-  });
-});
@@ -1,211 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import createMockRes from "test-utils/create-mock-res";
-
-const { state, DockerCtor, getDockerArguments, logger } = vi.hoisted(() => {
-  const state = {
-    docker: null,
-    dockerCtorArgs: [],
-    dockerArgs: { conn: { socketPath: "/var/run/docker.sock" }, swarm: false },
-  };
-
-  function DockerCtor(conn) {
-    state.dockerCtorArgs.push(conn);
-    return state.docker;
-  }
-
-  return {
-    state,
-    DockerCtor,
-    getDockerArguments: vi.fn(() => state.dockerArgs),
-    logger: { error: vi.fn() },
-  };
-});
-
-vi.mock("dockerode", () => ({
-  default: DockerCtor,
-}));
-
-vi.mock("utils/config/docker", () => ({
-  default: getDockerArguments,
-}));
-
-vi.mock("utils/logger", () => ({
-  default: () => logger,
-}));
-
-import handler from "pages/api/docker/status/[...service]";
-
-describe("pages/api/docker/status/[...service]", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    state.dockerCtorArgs.length = 0;
-    state.dockerArgs = { conn: { socketPath: "/var/run/docker.sock" }, swarm: false };
-    state.docker = {
-      listContainers: vi.fn(),
-      getContainer: vi.fn(),
-      getService: vi.fn(),
-      listTasks: vi.fn(),
-    };
-  });
-
-  it("returns 400 when container name/server params are missing", async () => {
-    const req = { query: { service: [] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(400);
-    expect(res.body).toEqual({ error: "docker query parameters are required" });
-  });
-
-  it("returns 500 when docker returns a non-array containers payload", async () => {
-    state.docker.listContainers.mockResolvedValue(Buffer.from("bad"));
-
-    const req = { query: { service: ["c", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(500);
-    expect(res.body).toEqual({ error: "query failed" });
-  });
-
-  it("inspects an existing container and returns status + health", async () => {
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/myapp"], Id: "cid1" }]);
-    state.docker.getContainer.mockReturnValue({
-      inspect: vi.fn().mockResolvedValue({ State: { Status: "running", Health: { Status: "healthy" } } }),
-    });
-
-    const req = { query: { service: ["myapp", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(getDockerArguments).toHaveBeenCalledWith("local");
-    expect(state.dockerCtorArgs).toHaveLength(1);
-    expect(res.statusCode).toBe(200);
-    expect(res.body).toEqual({ status: "running", health: "healthy" });
-  });
-
-  it("returns 404 when container does not exist and swarm is disabled", async () => {
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/other"], Id: "cid1" }]);
-
-    const req = { query: { service: ["missing", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(404);
-    expect(res.body).toEqual({ status: "not found" });
-  });
-
-  it("reports replicated swarm service status based on desired replicas", async () => {
-    state.dockerArgs.swarm = true;
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/other"], Id: "cid1" }]);
-    state.docker.getService.mockReturnValue({
-      inspect: vi.fn().mockResolvedValue({ Spec: { Mode: { Replicated: { Replicas: "2" } } } }),
-    });
-    state.docker.listTasks.mockResolvedValue([{ Status: {} }, { Status: {} }]);
-
-    const req = { query: { service: ["svc", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(200);
-    expect(res.body).toEqual({ status: "running 2/2" });
-  });
-
-  it("reports partial status for replicated services with fewer running tasks", async () => {
-    state.dockerArgs.swarm = true;
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/other"], Id: "cid1" }]);
-    state.docker.getService.mockReturnValue({
-      inspect: vi.fn().mockResolvedValue({ Spec: { Mode: { Replicated: { Replicas: "3" } } } }),
-    });
-    state.docker.listTasks.mockResolvedValue([{ Status: {} }]);
-
-    const req = { query: { service: ["svc", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(200);
-    expect(res.body).toEqual({ status: "partial 1/3" });
-  });
-
-  it("handles global services by inspecting a local task container when possible", async () => {
-    state.dockerArgs.swarm = true;
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/other"], Id: "local1" }]);
-    state.docker.getService.mockReturnValue({
-      inspect: vi.fn().mockResolvedValue({ Spec: { Mode: { Global: {} } } }),
-    });
-    state.docker.listTasks.mockResolvedValue([
-      { Status: { ContainerStatus: { ContainerID: "local1" }, State: "running" } },
-    ]);
-    state.docker.getContainer.mockReturnValue({
-      inspect: vi.fn().mockResolvedValue({ State: { Status: "running", Health: { Status: "unhealthy" } } }),
-    });
-
-    const req = { query: { service: ["svc", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(200);
-    expect(res.body).toEqual({ status: "running", health: "unhealthy" });
-  });
-
-  it("falls back to task status when global service container inspect fails", async () => {
-    state.dockerArgs.swarm = true;
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/other"], Id: "local1" }]);
-    state.docker.getService.mockReturnValue({
-      inspect: vi.fn().mockResolvedValue({ Spec: { Mode: { Global: {} } } }),
-    });
-    state.docker.listTasks.mockResolvedValue([
-      { Status: { ContainerStatus: { ContainerID: "local1" }, State: "pending" } },
-    ]);
-    state.docker.getContainer.mockReturnValue({
-      inspect: vi.fn().mockRejectedValue(new Error("nope")),
-    });
-
-    const req = { query: { service: ["svc", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(200);
-    expect(res.body).toEqual({ status: "pending" });
-  });
-
-  it("returns 404 when swarm is enabled but the service does not exist", async () => {
-    state.dockerArgs.swarm = true;
-    state.docker.listContainers.mockResolvedValue([{ Names: ["/other"], Id: "cid1" }]);
-    state.docker.getService.mockReturnValue({
-      inspect: vi.fn().mockRejectedValue(new Error("not found")),
-    });
-
-    const req = { query: { service: ["svc", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(404);
-    expect(res.body).toEqual({ status: "not found" });
-  });
-
-  it("logs and returns 500 when the docker query throws", async () => {
-    getDockerArguments.mockImplementationOnce(() => {
-      throw new Error("boom");
-    });
-
-    const req = { query: { service: ["svc", "local"] } };
-    const res = createMockRes();
-
-    await handler(req, res);
-
-    expect(res.statusCode).toBe(500);
-    expect(res.body).toEqual({ error: { message: "boom" } });
-    expect(logger.error).toHaveBeenCalled();
-  });
-});
@@ -0,0 +1,265 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import createMockRes from "test-utils/create-mock-res";
+
+const { state, DockerCtor, getDockerArguments, containersFromConfig, hasHomepageLabels, getSettings, logger } =
+  vi.hoisted(() => {
+    const state = {
+      docker: null,
+      containers: [],
+      health: {},
+      containers: [],
+      health: {},
+      dockerArgs: { conn: { socketPath: "/var/run/docker.sock" }, swarm: false },
+    };
+
+    function DockerCtor() {
+      return state.docker;
+    }
+
+    return {
+      state,
+      DockerCtor,
+      getDockerArguments: vi.fn(() => state.dockerArgs),
+      containersFromConfig: vi.fn(async () => new Set()),
+      hasHomepageLabels: vi.fn(() => false),
+      getSettings: vi.fn(() => ({ instanceName: undefined })),
+      logger: { error: vi.fn() },
+    };
+  });
+
+vi.mock("dockerode", () => ({
+  default: DockerCtor,
+}));
+
+vi.mock("utils/config/docker", () => ({
+  default: getDockerArguments,
+}));
+
+vi.mock("utils/config/service-helpers", () => ({
+  containersFromConfig,
+  hasHomepageLabels,
+}));
+
+vi.mock("utils/config/config", () => ({
+  getSettings,
+}));
+
+vi.mock("utils/logger", () => ({
+  default: () => logger,
+}));
+
+import handler from "pages/api/docker/statuses";
+
+describe("pages/api/docker/statuses", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    state.dockerArgs = { conn: { socketPath: "/var/run/docker.sock" }, swarm: false };
+    state.containers = [];
+    state.health = {};
+    state.docker = {
+      listContainers: vi.fn(async (options) => {
+        const health = options?.filters?.health?.[0];
+        return health ? (state.health[health] ?? []) : state.containers;
+      }),
+      listServices: vi.fn(),
+      listTasks: vi.fn(),
+    };
+    containersFromConfig.mockResolvedValue(new Set());
+    hasHomepageLabels.mockReturnValue(false);
+    getSettings.mockReturnValue({ instanceName: undefined });
+  });
+
+  it("returns configured container statuses with health from the docker health filters", async () => {
+    containersFromConfig.mockResolvedValue(new Set(["glance", "share"]));
+    state.containers = [
+      { Names: ["/glance"], Id: "cid-glance", State: "running" },
+      { Names: ["/share"], Id: "cid-share", State: "exited" },
+    ];
+    state.health = { healthy: [{ Id: "cid-glance" }] };
+
+    const req = { query: { server: "local" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(getDockerArguments).toHaveBeenCalledWith("local");
+    expect(containersFromConfig).toHaveBeenCalledWith("local");
+    // one list plus one per health state, constant regardless of container count
+    expect(state.docker.listContainers).toHaveBeenCalledTimes(4);
+    expect(state.docker.listServices).not.toHaveBeenCalled();
+    expect(res.statusCode).toBe(200);
+    expect(res.body).toEqual({
+      statuses: {
+        glance: { status: "running", health: "healthy" },
+        share: { status: "exited" },
+      },
+    });
+  });
+
+  it("takes health from the filter results rather than the status string", async () => {
+    containersFromConfig.mockResolvedValue(new Set(["app"]));
+    state.containers = [{ Names: ["/app"], Id: "cid1", State: "running", Status: "Up 2 hours (healthy)" }];
+    state.health = { unhealthy: [{ Id: "cid1" }] };
+
+    const req = { query: { server: "local" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.body).toEqual({ statuses: { app: { status: "running", health: "unhealthy" } } });
+  });
+
+  it("omits health when the docker daemon rejects the health filter", async () => {
+    containersFromConfig.mockResolvedValue(new Set(["app"]));
+    state.containers = [{ Names: ["/app"], Id: "cid1", State: "running", Status: "Up 2 hours (healthy)" }];
+    state.docker.listContainers.mockImplementation(async (options) => {
+      if (options?.filters?.health) throw new Error("filter unsupported");
+      return state.containers;
+    });
+
+    const req = { query: { server: "local" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.body).toEqual({ statuses: { app: { status: "running" } } });
+  });
+
+  it("omits containers that are neither configured nor labelled for homepage", async () => {
+    containersFromConfig.mockResolvedValue(new Set(["glance"]));
+    state.containers = [
+      { Names: ["/glance"], State: "running", Status: "Up" },
+      { Names: ["/secret-db"], State: "running", Status: "Up" },
+    ];
+
+    const req = { query: { server: "local" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.body).toEqual({ statuses: { glance: { status: "running" } } });
+    expect(res.body.statuses["secret-db"]).toBeUndefined();
+  });
+
+  it("includes containers discovered through homepage labels", async () => {
+    hasHomepageLabels.mockImplementation((labels) => labels?.["homepage.name"] !== undefined);
+    state.containers = [
+      { Names: ["/labelled"], State: "running", Status: "Up", Labels: { "homepage.name": "App" } },
+      { Names: ["/unlabelled"], State: "running", Status: "Up", Labels: {} },
+    ];
+
+    const req = { query: { server: "local" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.body).toEqual({ statuses: { labelled: { status: "running" } } });
+  });
+
+  it("includes swarm services when the server is in swarm mode", async () => {
+    state.dockerArgs.swarm = true;
+    containersFromConfig.mockResolvedValue(new Set(["web", "api"]));
+    state.containers = [{ Names: ["/web"], Id: "cid1", State: "running", Status: "Up" }];
+    state.docker.listServices.mockResolvedValue([
+      { ID: "sid", Spec: { Name: "api", Mode: { Replicated: { Replicas: "2" } } } },
+    ]);
+    state.docker.listTasks.mockResolvedValue([
+      { ServiceID: "sid", Status: {} },
+      { ServiceID: "sid", Status: {} },
+    ]);
+
+    const req = { query: { server: "swarm" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.statusCode).toBe(200);
+    expect(res.body).toEqual({
+      statuses: {
+        web: { status: "running" },
+        api: { status: "running 2/2" },
+      },
+    });
+  });
+
+  it("omits swarm services that are neither configured nor labelled", async () => {
+    state.dockerArgs.swarm = true;
+    containersFromConfig.mockResolvedValue(new Set());
+    state.containers = [];
+    state.docker.listServices.mockResolvedValue([
+      { ID: "sid", Spec: { Name: "internal", Mode: { Replicated: { Replicas: "1" } } } },
+    ]);
+    state.docker.listTasks.mockResolvedValue([{ ServiceID: "sid", Status: {} }]);
+
+    const req = { query: { server: "swarm" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.body).toEqual({ statuses: {} });
+  });
+
+  it("includes swarm services discovered through homepage labels", async () => {
+    state.dockerArgs.swarm = true;
+    hasHomepageLabels.mockImplementation((labels) => labels?.["homepage.name"] !== undefined);
+    state.containers = [];
+    state.docker.listServices.mockResolvedValue([
+      {
+        ID: "sid",
+        Spec: { Name: "api", Labels: { "homepage.name": "Api" }, Mode: { Replicated: { Replicas: "1" } } },
+      },
+    ]);
+    state.docker.listTasks.mockResolvedValue([{ ServiceID: "sid", Status: {} }]);
+
+    const req = { query: { server: "swarm" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.body).toEqual({ statuses: { api: { status: "running 1/1" } } });
+  });
+
+  it("returns only listed containers when swarm queries fail", async () => {
+    state.dockerArgs.swarm = true;
+    containersFromConfig.mockResolvedValue(new Set(["web"]));
+    state.containers = [{ Names: ["/web"], Id: "cid1", State: "running", Status: "Up" }];
+    state.docker.listServices.mockRejectedValue(new Error("no services"));
+    state.docker.listTasks.mockRejectedValue(new Error("no tasks"));
+
+    const req = { query: { server: "swarm" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.statusCode).toBe(200);
+    expect(res.body).toEqual({ statuses: { web: { status: "running" } } });
+  });
+
+  it("returns 500 when docker returns a non-array containers payload", async () => {
+    state.containers = Buffer.from("bad");
+
+    const req = { query: { server: "local" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.statusCode).toBe(500);
+    expect(res.body).toEqual({ error: "query failed" });
+  });
+
+  it("logs and returns 500 when the docker query throws", async () => {
+    getDockerArguments.mockImplementationOnce(() => {
+      throw new Error("boom");
+    });
+
+    const req = { query: { server: "local" } };
+    const res = createMockRes();
+
+    await handler(req, res);
+
+    expect(res.statusCode).toBe(500);
+    expect(res.body).toEqual({ error: { message: "boom" } });
+    expect(logger.error).toHaveBeenCalled();
+  });
+});
@@ -1,11 +1,15 @@
 // @vitest-environment jsdom

 import { render, screen, waitFor } from "@testing-library/react";
-import { describe, expect, it, vi } from "vitest";
+import { StrictMode } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";

-const { getSettingsMock, authOptionsMock } = vi.hoisted(() => ({
+const { getSettingsMock, authOptionsMock, signInMock, replaceMock, routerQuery } = vi.hoisted(() => ({
  getSettingsMock: vi.fn(),
  authOptionsMock: vi.fn(),
+  signInMock: vi.fn(),
+  replaceMock: vi.fn(),
+  routerQuery: {},
 }));

 vi.mock("utils/config/config", () => ({
@@ -20,13 +24,25 @@ vi.mock("pages/api/auth/[...nextauth]", () => ({

 vi.mock("next/router", () => ({
  useRouter: () => ({
-    query: {},
+    query: routerQuery,
+    replace: replaceMock,
  }),
 }));

+vi.mock("next-auth/react", () => ({ signIn: signInMock }));
+
 import SignInPage, { getServerSideProps } from "pages/auth/signin";

+const OIDC_PROVIDERS = { "homepage-oidc": { id: "homepage-oidc", name: "Homepage OIDC", type: "oauth" } };
+const SETTINGS = { theme: "dark", color: "slate", title: "Homepage" };
+
 describe("pages/auth/signin", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    Object.keys(routerQuery).forEach((key) => delete routerQuery[key]);
+    window.sessionStorage.clear();
+  });
+
  it("renders an error state when no providers are configured", async () => {
    render(
      <SignInPage
@@ -66,6 +82,67 @@ describe("pages/auth/signin", () => {
    expect(screen.getByRole("button", { name: /login via oidc/i })).toBeInTheDocument();
  });

+  it("redirects to the provider when auto-login is enabled", () => {
+    routerQuery.callbackUrl = "/some/page";
+
+    render(<SignInPage providers={OIDC_PROVIDERS} settings={SETTINGS} autoLogin />);
+
+    expect(signInMock).toHaveBeenCalledWith("homepage-oidc", { callbackUrl: "/some/page" });
+    expect(screen.getByText(/redirecting to homepage oidc/i)).toBeInTheDocument();
+    expect(screen.queryByRole("button", { name: /login via/i })).not.toBeInTheDocument();
+  });
+
+  it("does not auto-login when the provider returned an error", () => {
+    routerQuery.error = "OAuthCallback";
+
+    render(<SignInPage providers={OIDC_PROVIDERS} settings={SETTINGS} autoLogin />);
+
+    expect(signInMock).not.toHaveBeenCalled();
+    expect(screen.getByRole("button", { name: /login via homepage oidc/i })).toBeInTheDocument();
+  });
+
+  it("does not auto-login when it is explicitly disabled in the url", () => {
+    routerQuery.autologin = "0";
+
+    render(<SignInPage providers={OIDC_PROVIDERS} settings={SETTINGS} autoLogin />);
+
+    expect(signInMock).not.toHaveBeenCalled();
+    expect(screen.getByRole("button", { name: /login via homepage oidc/i })).toBeInTheDocument();
+  });
+
+  it("redirects once under strict mode, rather than tripping its own loop guard", () => {
+    render(
+      <StrictMode>
+        <SignInPage providers={OIDC_PROVIDERS} settings={SETTINGS} autoLogin />
+      </StrictMode>,
+    );
+
+    expect(signInMock).toHaveBeenCalledTimes(1);
+    expect(replaceMock).not.toHaveBeenCalled();
+  });
+
+  it("stops auto-login and hands back the page when the session never sticks", () => {
+    routerQuery.callbackUrl = "/some/page";
+
+    render(<SignInPage providers={OIDC_PROVIDERS} settings={SETTINGS} autoLogin />);
+    render(<SignInPage providers={OIDC_PROVIDERS} settings={SETTINGS} autoLogin />);
+
+    expect(signInMock).toHaveBeenCalledTimes(1);
+    expect(replaceMock).toHaveBeenCalledWith("/auth/signin?autologin=0&callbackUrl=%2Fsome%2Fpage");
+  });
+
+  it("does not auto-login the password provider", () => {
+    render(
+      <SignInPage
+        providers={{ credentials: { id: "credentials", name: "Password", type: "credentials" } }}
+        settings={SETTINGS}
+        autoLogin
+      />,
+    );
+
+    expect(signInMock).not.toHaveBeenCalled();
+  });
+
  it("getServerSideProps returns providers and only public sign-in settings", async () => {
    authOptionsMock.mockReturnValueOnce({ providers: [{ id: "foo", name: "Foo", type: "oauth" }] });
    getSettingsMock.mockReturnValueOnce({
@@ -88,6 +165,7 @@ describe("pages/auth/signin", () => {
    expect(getSettingsMock).toHaveBeenCalled();
    expect(res).toEqual({
      props: {
+        autoLogin: false,
        providers: { foo: { id: "foo", name: "Foo", type: "oauth" } },
        settings: {
          theme: "dark",
@@ -102,6 +180,17 @@ describe("pages/auth/signin", () => {
    expect(res.props.settings).not.toHaveProperty("layout");
  });

+  it("getServerSideProps enables auto-login from the environment", async () => {
+    authOptionsMock.mockReturnValueOnce({ providers: [] });
+    getSettingsMock.mockReturnValueOnce({ theme: "dark" });
+    vi.stubEnv("HOMEPAGE_OIDC_AUTO_LOGIN", "true");
+
+    const res = await getServerSideProps({});
+
+    expect(res.props.autoLogin).toBe(true);
+    vi.unstubAllEnvs();
+  });
+
  it("getServerSideProps falls back to no providers when auth options fail to load", async () => {
    const consoleError = vi.spyOn(console, "error").mockImplementation(() => {});
    authOptionsMock.mockImplementationOnce(() => {
@@ -124,8 +124,8 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea
    ? MOBILE_BUTTON_POSITIONS[settings.quicklaunch.mobileButtonPosition]
    : null;

-  function openCurrentItem(newWindow) {
-    const result = results[activeItemIndex];
+  function openCurrentItem(newWindow, index = activeItemIndex) {
+    const result = results[index];
    window.open(
      result.href,
      newWindow ? "_blank" : (result.target ?? searchProvider?.target ?? settings.target ?? "_blank"),
@@ -180,7 +180,8 @@ export default function QuickLaunch({ servicesAndBookmarks, searchString, setSea

  function handleItemClick(event) {
    closeAndReset();
-    openCurrentItem(event.metaKey);
+    // in case hover doesnt fire, use the clicked item, not the highlighted one
+    openCurrentItem(event.metaKey, parseInt(event.currentTarget.dataset.index, 10));
  }

  function handleItemKeyDown(event) {
@@ -263,6 +263,37 @@ describe("components/quicklaunch", () => {
    openSpy.mockRestore();
  });

+  it("opens the clicked result even without a preceding hover event", async () => {
+    const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
+
+    renderWithProviders(
+      <Wrapper
+        servicesAndBookmarks={[
+          { name: "Alpha", href: "https://alpha.example" },
+          { name: "Alpine", href: "https://alpine.example" },
+          { name: "Almond", href: "https://almond.example" },
+        ]}
+      />,
+      { settings: { target: "_self", quicklaunch: { showSearchSuggestions: false } } },
+    );
+
+    const input = screen.getByPlaceholderText("Search");
+    await waitFor(() => expect(input).toHaveFocus());
+
+    fireEvent.change(input, { target: { value: "al" } });
+    await waitFor(() => expect(document.querySelector('button[data-index="2"]')).toBeTruthy());
+
+    // touch devices don't fire mouseEnter, so the highlighted item is still the first one
+    fireEvent.click(document.querySelector('button[data-index="2"]'));
+
+    await act(async () => {
+      await new Promise((r) => setTimeout(r, 350));
+    });
+
+    expect(openSpy).toHaveBeenCalledWith("https://almond.example", "_self", "noreferrer");
+    openSpy.mockRestore();
+  });
+
  it("handles Escape on a result button (not just the input)", async () => {
    renderWithProviders(<Wrapper servicesAndBookmarks={[{ name: "Alpha", href: "https://alpha.example" }]} />, {
      settings: { quicklaunch: { showSearchSuggestions: false } },
@@ -1,45 +1,61 @@
 import { useTranslation } from "next-i18next/pages";
 import useSWR from "swr";

+const WARNING_CLASS = "text-orange-400/50 dark:text-orange-400/80";
+
+// docker container states other than running
+const STATE_LABELS = {
+  created: "docker.created",
+  dead: "docker.dead",
+  exited: "docker.exited",
+  "not found": "docker.not_found",
+  paused: "docker.paused",
+  removing: "docker.removing",
+  restarting: "docker.restarting",
+};
+
+// states that mean something is wrong rather than merely not started
+const WARNING_STATES = new Set(["dead", "exited", "not found", "restarting"]);
+
 export default function Status({ service, style }) {
  const { t } = useTranslation();

-  const { data, error } = useSWR(`/api/docker/status/${service.container}/${service.server || ""}`);
+  const { data: response, error } = useSWR(`/api/docker/statuses?server=${encodeURIComponent(service.server || "")}`);
+  const statusError = error ?? response?.error;
+  const { statuses } = response ?? {};
+  const data = statuses ? (statuses[service.container] ?? { status: "not found" }) : undefined;

  let statusLabel = t("docker.unknown");
  let backgroundClass = "px-1.5 py-0.5 bg-theme-500/10 dark:bg-theme-900/50";
  let colorClass = "text-black/20 dark:text-white/40 ";

-  if (error) {
+  if (statusError) {
    statusLabel = t("docker.error");
    colorClass = "text-rose-500/80";
-  } else if (data) {
-    if (data.status?.includes("running")) {
-      colorClass = "text-emerald-500/80";
+  } else if (data?.status?.includes("running")) {
+    colorClass = "text-emerald-500/80";

-      if (!data.health) {
-        statusLabel = data.status.replace("running", t("docker.running"));
-      } else {
-        statusLabel = data.health === "healthy" ? t("docker.healthy") : data.health;
+    if (!data.health) {
+      statusLabel = data.status.replace("running", t("docker.running"));
+    } else {
+      statusLabel = data.health === "healthy" ? t("docker.healthy") : data.health;

-        if (data.health === "starting") {
-          statusLabel = t("docker.starting");
-          colorClass = "text-blue-500/80";
-        }
+      if (data.health === "starting") {
+        statusLabel = t("docker.starting");
+        colorClass = "text-blue-500/80";
+      }

-        if (data.health === "unhealthy") {
-          statusLabel = t("docker.unhealthy");
-          colorClass = "text-orange-400/50 dark:text-orange-400/80";
-        }
+      if (data.health === "unhealthy") {
+        statusLabel = t("docker.unhealthy");
+        colorClass = WARNING_CLASS;
      }
    }
-
-    if (data.status === "not found" || data.status === "exited" || data.status?.startsWith("partial")) {
-      if (data.status === "not found") statusLabel = t("docker.not_found");
-      else if (data.status === "exited") statusLabel = t("docker.exited");
-      else statusLabel = data.status.replace("partial", t("docker.partial"));
-      colorClass = "text-orange-400/50 dark:text-orange-400/80";
-    }
+  } else if (data?.status?.startsWith("partial")) {
+    statusLabel = data.status.replace("partial", t("docker.partial"));
+    colorClass = WARNING_CLASS;
+  } else if (data && STATE_LABELS[data.status]) {
+    statusLabel = t(STATE_LABELS[data.status]);
+    if (WARNING_STATES.has(data.status)) colorClass = WARNING_CLASS;
  }

  if (style === "dot") {
@@ -21,8 +21,11 @@ describe("components/services/status", () => {

    render(<Status service={{ container: "c", server: "s" }} />);

-    expect(useSWR).toHaveBeenCalledWith("/api/docker/status/c/s");
+    expect(useSWR).toHaveBeenCalledWith("/api/docker/statuses?server=s");
    expect(screen.getByText("docker.unknown")).toBeInTheDocument();
+
+    render(<Status service={{ container: "c" }} />);
+    expect(useSWR).toHaveBeenCalledWith("/api/docker/statuses?server=");
  });

  it("renders error when SWR fails", () => {
@@ -33,38 +36,87 @@ describe("components/services/status", () => {
    expect(screen.getByText("docker.error")).toBeInTheDocument();
  });

+  it("renders error when the api returns an error payload with a 200-parsed body", () => {
+    useSWR.mockReturnValue({ data: { error: "query failed" }, error: undefined });
+
+    render(<Status service={{ container: "c", server: "s" }} />);
+
+    expect(screen.getByText("docker.error")).toBeInTheDocument();
+    expect(screen.queryByText("docker.not_found")).not.toBeInTheDocument();
+  });
+
  it("renders healthy/unhealthy and partial/exited/not found statuses", () => {
-    useSWR.mockReturnValue({ data: { status: "running", health: "healthy" }, error: undefined });
+    useSWR.mockReturnValue({ data: { statuses: { c: { status: "running", health: "healthy" } } }, error: undefined });
    render(<Status service={{ container: "c", server: "s" }} />);
    expect(screen.getByText("docker.healthy")).toBeInTheDocument();

-    useSWR.mockReturnValue({ data: { status: "running", health: "unhealthy" }, error: undefined });
+    useSWR.mockReturnValue({ data: { statuses: { c: { status: "running", health: "unhealthy" } } }, error: undefined });
    render(<Status service={{ container: "c", server: "s" }} />);
    expect(screen.getByText("docker.unhealthy")).toBeInTheDocument();

-    useSWR.mockReturnValue({ data: { status: "partial 1/2" }, error: undefined });
+    useSWR.mockReturnValue({ data: { statuses: { c: { status: "partial 1/2" } } }, error: undefined });
    render(<Status service={{ container: "c", server: "s" }} />);
    expect(screen.getByText("docker.partial 1/2")).toBeInTheDocument();

-    useSWR.mockReturnValue({ data: { status: "exited" }, error: undefined });
+    useSWR.mockReturnValue({ data: { statuses: { c: { status: "exited" } } }, error: undefined });
    render(<Status service={{ container: "c", server: "s" }} />);
    expect(screen.getByText("docker.exited")).toBeInTheDocument();

-    useSWR.mockReturnValue({ data: { status: "not found" }, error: undefined });
+    useSWR.mockReturnValue({ data: { statuses: {} }, error: undefined });
    render(<Status service={{ container: "c", server: "s" }} />);
    expect(screen.getByText("docker.not_found")).toBeInTheDocument();
  });

  it("renders starting health when container is running and starting", () => {
-    useSWR.mockReturnValue({ data: { status: "running", health: "starting" }, error: undefined });
+    useSWR.mockReturnValue({ data: { statuses: { c: { status: "running", health: "starting" } } }, error: undefined });

    render(<Status service={{ container: "c", server: "s" }} />);

    expect(screen.getByText("docker.starting")).toBeInTheDocument();
  });

+  it("renders the remaining container states instead of falling through to unknown", () => {
+    const states = {
+      created: "docker.created",
+      paused: "docker.paused",
+      restarting: "docker.restarting",
+      removing: "docker.removing",
+      dead: "docker.dead",
+    };
+
+    Object.entries(states).forEach(([status, label]) => {
+      useSWR.mockReturnValue({ data: { statuses: { c: { status } } }, error: undefined });
+      render(<Status service={{ container: "c", server: "s" }} />);
+      expect(screen.getByText(label)).toBeInTheDocument();
+    });
+
+    expect(screen.queryByText("docker.unknown")).not.toBeInTheDocument();
+  });
+
+  it("colors problem states as warnings and merely stopped states neutrally", () => {
+    useSWR.mockReturnValue({ data: { statuses: { c: { status: "restarting" } } }, error: undefined });
+    const { container: restarting } = render(<Status service={{ container: "c", server: "s" }} style="dot" />);
+    expect(restarting.querySelector(".bg-orange-400")).toBeInTheDocument();
+
+    useSWR.mockReturnValue({ data: { statuses: { c: { status: "paused" } } }, error: undefined });
+    const { container: paused } = render(<Status service={{ container: "c", server: "s" }} style="dot" />);
+    expect(paused.querySelector(".bg-orange-400")).not.toBeInTheDocument();
+  });
+
+  it("does not surface health for containers that are not running", () => {
+    useSWR.mockReturnValue({
+      data: { statuses: { c: { status: "paused", health: "unhealthy" } } },
+      error: undefined,
+    });
+
+    render(<Status service={{ container: "c", server: "s" }} />);
+
+    expect(screen.getByText("docker.paused")).toBeInTheDocument();
+    expect(screen.queryByText("docker.unhealthy")).not.toBeInTheDocument();
+  });
+
  it("renders a dot when style is dot", () => {
-    useSWR.mockReturnValue({ data: { status: "running" }, error: undefined });
+    useSWR.mockReturnValue({ data: { statuses: { c: { status: "running" } } }, error: undefined });

    const { container } = render(<Status service={{ container: "c", server: "s" }} style="dot" />);

@@ -12,7 +12,11 @@ export default function SignOut() {

  return (
    <div id="signout" className="rounded-full flex align-middle self-center mr-3">
-      <button type="button" onClick={() => signOut({ callbackUrl: "/" })} className="outline-hidden">
+      <button
+        type="button"
+        onClick={() => signOut({ callbackUrl: "/auth/signin?autologin=0" })}
+        className="outline-hidden"
+      >
        <MdLogout className="text-theme-800 dark:text-theme-200 w-6 h-6 cursor-pointer" aria-hidden="true" />
        <span className="sr-only">{t("auth.signout")}</span>
      </button>
@@ -32,6 +32,7 @@ describe("components/toggles/signout", () => {
    const { getByRole } = render(<SignOut />);
    fireEvent.click(getByRole("button"));

-    expect(signOut).toHaveBeenCalledWith({ callbackUrl: "/" });
+    // Not "/", which would bounce straight back into the provider when auto-login is on
+    expect(signOut).toHaveBeenCalledWith({ callbackUrl: "/auth/signin?autologin=0" });
  });
 });
@@ -139,6 +139,8 @@ export default function Search({ options }) {
  }, [selectedProvider, options, query, searchSuggestions]);

  function doSearch(value) {
+    if (!value) return;
+
    const q = encodeURIComponent(value);
    const { url } = selectedProvider;
    if (url) {
@@ -24,7 +24,19 @@ vi.mock("@headlessui/react", async () => {
        <div>{children}</div>
      </ComboboxContext.Provider>
    ),
-    ComboboxInput: (props) => <input {...props} />,
+    ComboboxInput: (props) => {
+      const ctx = useContext(ComboboxContext);
+      // real headlessui fires onChange(null) when the input is cleared
+      return (
+        <input
+          {...props}
+          onChange={(event) => {
+            props.onChange?.(event);
+            if (event.target.value === "") ctx?.onChange?.(null);
+          }}
+        />
+      );
+    },
    ComboboxOption: ({ as: As = "div", value, children, ...props }) => {
      const ctx = useContext(ComboboxContext);
      const content = typeof children === "function" ? children({ active: false }) : children;
@@ -83,6 +95,21 @@ describe("components/widgets/search", () => {
    openSpy.mockRestore();
  });

+  it("does not search when the input is cleared", () => {
+    const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);
+
+    renderWithProviders(<Search options={{ provider: ["google"], showSearchSuggestions: false, target: "_self" }} />, {
+      settings: {},
+    });
+
+    const input = screen.getByPlaceholderText("search.placeholder");
+    fireEvent.change(input, { target: { value: "a" } });
+    fireEvent.change(input, { target: { value: "" } });
+
+    expect(openSpy).not.toHaveBeenCalled();
+    openSpy.mockRestore();
+  });
+
  it("accepts provider configured as a string", () => {
    const openSpy = vi.spyOn(window, "open").mockImplementation(() => null);

@@ -32,7 +32,7 @@ export async function middleware(req) {
    return NextResponse.json({ error: "Host validation failed. See logs for more details." }, { status: 400 });
  }

-  const pathname = new URL(req.url).pathname;
+  const { pathname, search } = new URL(req.url);
  const isPublicAuthPath = pathname.startsWith("/api/healthcheck") || pathname === "/api/config/custom.css";
  if (authEnabled && !isPublicAuthPath) {
    // The MCP API handler authorizes both bearer tokens and Homepage sessions.
@@ -43,7 +43,8 @@ export async function middleware(req) {
    const token = await getToken({ req, secret: authSecret });
    if (!token) {
      const signInUrl = new URL("/auth/signin", req.url);
-      signInUrl.searchParams.set("callbackUrl", "/");
+      // Same-origin by construction, so this cannot be used as an open redirect
+      signInUrl.searchParams.set("callbackUrl", `${pathname}${search}`);
      return withPrivateCache(NextResponse.redirect(signInUrl));
    }
  }
@@ -153,6 +153,18 @@ describe("middleware", () => {
    expect(String(res.url)).toContain("/auth/signin");
  });

+  it("preserves the requested path and query as the callback url", async () => {
+    process.env.HOMEPAGE_AUTH_ENABLED = "true";
+    process.env.HOMEPAGE_AUTH_SECRET = "secret";
+
+    getToken.mockResolvedValueOnce(null);
+
+    const middleware = await loadMiddleware();
+    const res = await middleware(createReq("localhost:3000", "http://localhost:3000/some/page?tab=2"));
+
+    expect(new URL(res.url).searchParams.get("callbackUrl")).toBe("/some/page?tab=2");
+  });
+
  it("allows requests when auth is enabled and a token is present", async () => {
    process.env.HOMEPAGE_AUTH_ENABLED = "true";
    process.env.HOMEPAGE_AUTH_SECRET = "secret";
@@ -0,0 +1,21 @@
+import { getDockerStats } from "utils/docker/stats";
+import createLogger from "utils/logger";
+
+const logger = createLogger("dockerStats");
+
+export default async function handler(req, res) {
+  try {
+    const result = await getDockerStats(req.query.server);
+
+    if (result.error) {
+      return res.status(500).send({ error: result.error });
+    }
+
+    return res.status(200).json(result);
+  } catch (e) {
+    if (e) logger.error(e);
+    return res.status(500).send({
+      error: { message: e?.message ?? "Unknown error" },
+    });
+  }
+}
@@ -1,88 +0,0 @@
-import Docker from "dockerode";
-
-import getDockerArguments from "utils/config/docker";
-import createLogger from "utils/logger";
-
-const logger = createLogger("dockerStatsService");
-
-export default async function handler(req, res) {
-  const { service } = req.query;
-  const [containerName, containerServer] = service;
-
-  if (!containerName && !containerServer) {
-    return res.status(400).send({
-      error: "docker query parameters are required",
-    });
-  }
-
-  try {
-    const dockerArgs = getDockerArguments(containerServer);
-    const docker = new Docker(dockerArgs.conn);
-    const containers = await docker.listContainers({
-      all: true,
-    });
-
-    // bad docker connections can result in a <Buffer ...> object?
-    // in any case, this ensures the result is the expected array
-    if (!Array.isArray(containers)) {
-      return res.status(500).send({
-        error: "query failed",
-      });
-    }
-
-    const containerNames = containers.flatMap((container) => container.Names.map((name) => name.replace(/^\//, "")));
-    const containerExists = containerNames.includes(containerName);
-
-    if (containerExists) {
-      const container = docker.getContainer(containerName);
-      const stats = await container.stats({ stream: false });
-
-      return res.status(200).json({
-        stats,
-      });
-    }
-
-    // Try with a service deployed in Docker Swarm, if enabled
-    if (dockerArgs.swarm) {
-      const tasks = await docker
-        .listTasks({
-          filters: {
-            service: [containerName],
-            // A service can have several offline containers, so we only look for an active one.
-            "desired-state": ["running"],
-          },
-        })
-        .catch(() => []);
-
-      // TODO: Show the result for all replicas/containers?
-      // We can only get stats for 'local' containers so try to find one
-      const localContainerIDs = containers.map((c) => c.Id);
-      const task = tasks.find((t) => localContainerIDs.includes(t.Status?.ContainerStatus?.ContainerID)) ?? tasks.at(0);
-      const taskContainerId = task?.Status?.ContainerStatus?.ContainerID;
-
-      if (taskContainerId) {
-        try {
-          const container = docker.getContainer(taskContainerId);
-          const stats = await container.stats({ stream: false });
-
-          return res.status(200).json({
-            stats,
-          });
-        } catch (e) {
-          return res.status(200).json({
-            error: "Unable to retrieve stats",
-          });
-        }
-      }
-    }
-
-    return res.status(404).send({
-      error: "not found",
-    });
-  } catch (e) {
-    if (e) logger.error(e);
-    return res.status(500).send({
-      error: { message: e?.message ?? "Unknown error" },
-    });
-  }
-}
@@ -1,116 +0,0 @@
-import Docker from "dockerode";
-
-import getDockerArguments from "utils/config/docker";
-import createLogger from "utils/logger";
-
-const logger = createLogger("dockerStatusService");
-
-export default async function handler(req, res) {
-  const { service } = req.query;
-  const [containerName, containerServer] = service;
-
-  if (!containerName && !containerServer) {
-    return res.status(400).send({
-      error: "docker query parameters are required",
-    });
-  }
-
-  try {
-    const dockerArgs = getDockerArguments(containerServer);
-    const docker = new Docker(dockerArgs.conn);
-    const containers = await docker.listContainers({
-      all: true,
-    });
-
-    // bad docker connections can result in a <Buffer ...> object?
-    // in any case, this ensures the result is the expected array
-    if (!Array.isArray(containers)) {
-      return res.status(500).send({
-        error: "query failed",
-      });
-    }
-
-    const containerNames = containers.flatMap((container) => container.Names.map((name) => name.replace(/^\//, "")));
-    const containerExists = containerNames.includes(containerName);
-
-    if (containerExists) {
-      const container = docker.getContainer(containerName);
-      const info = await container.inspect();
-
-      return res.status(200).json({
-        status: info.State.Status,
-        health: info.State.Health?.Status,
-      });
-    }
-
-    if (dockerArgs.swarm) {
-      const serviceInfo = await docker
-        .getService(containerName)
-        .inspect()
-        .catch(() => undefined);
-
-      if (!serviceInfo) {
-        return res.status(404).send({
-          status: "not found",
-        });
-      }
-
-      const tasks = await docker
-        .listTasks({
-          filters: {
-            service: [containerName],
-            "desired-state": ["running"],
-          },
-        })
-        .catch(() => []);
-
-      if (serviceInfo.Spec.Mode?.Replicated) {
-        // Replicated service, check n replicas
-        const replicas = parseInt(serviceInfo.Spec.Mode?.Replicated?.Replicas, 10);
-        if (tasks.length === replicas) {
-          return res.status(200).json({
-            status: `running ${tasks.length}/${replicas}`,
-          });
-        }
-        if (tasks.length > 0) {
-          return res.status(200).json({
-            status: `partial ${tasks.length}/${replicas}`,
-          });
-        }
-      } else {
-        // Global service, prefer 'local' containers
-        const localContainerIDs = containers.map((c) => c.Id);
-        const task =
-          tasks.find((t) => localContainerIDs.includes(t.Status?.ContainerStatus?.ContainerID)) ?? tasks.at(0);
-        const taskContainerId = task?.Status?.ContainerStatus?.ContainerID;
-
-        if (taskContainerId) {
-          try {
-            const container = docker.getContainer(taskContainerId);
-            const info = await container.inspect();
-
-            return res.status(200).json({
-              status: info.State.Status,
-              health: info.State.Health?.Status,
-            });
-          } catch (e) {
-            if (task) {
-              return res.status(200).json({
-                status: task.Status.State,
-              });
-            }
-          }
-        }
-      }
-    }
-
-    return res.status(404).send({
-      status: "not found",
-    });
-  } catch (e) {
-    if (e) logger.error(e);
-    return res.status(500).send({
-      error: { message: e?.message ?? "Unknown error" },
-    });
-  }
-}
@@ -0,0 +1,21 @@
+import { getDockerStatuses } from "utils/docker/status";
+import createLogger from "utils/logger";
+
+const logger = createLogger("dockerStatuses");
+
+export default async function handler(req, res) {
+  try {
+    const result = await getDockerStatuses(req.query.server);
+
+    if (result.error) {
+      return res.status(500).send({ error: result.error });
+    }
+
+    return res.status(200).json(result);
+  } catch (e) {
+    if (e) logger.error(e);
+    return res.status(500).send({
+      error: { message: e?.message ?? "Unknown error" },
+    });
+  }
+}
@@ -1,14 +1,16 @@
 import classNames from "classnames";
 import { signIn } from "next-auth/react";
 import { useRouter } from "next/router";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { BiShieldQuarter } from "react-icons/bi";

 import { getSettings } from "utils/config/config";

 const PUBLIC_SIGN_IN_SETTINGS = ["theme", "color", "title", "background", "backgroundOpacity"];
+const AUTO_LOGIN_KEY = "homepage-autologin-attempt";
+const AUTO_LOGIN_RETRY_MS = 10000;

-export default function SignIn({ providers, settings }) {
+export default function SignIn({ providers, settings, autoLogin }) {
  const router = useRouter();
  const [password, setPassword] = useState("");
  const theme = settings?.theme || "dark";
@@ -20,6 +22,36 @@ export default function SignIn({ providers, settings }) {
  }, [router.query?.callbackUrl]);
  const error = router.query?.error;

+  const oidcProvider = useMemo(
+    () => Object.values(providers ?? {}).find((provider) => provider.type !== "credentials"),
+    [providers],
+  );
+  // Try to avoid auto-login loop, e.g. if there was an error (or explicitly disabled via query param)
+  const autoLoginBlocked = Boolean(error) || router.query?.autologin === "0";
+  const redirecting = Boolean(autoLogin && oidcProvider && !autoLoginBlocked);
+
+  const attempted = useRef(false);
+
+  useEffect(() => {
+    if (!redirecting || attempted.current) return;
+    attempted.current = true;
+
+    let lastAttempt = 0;
+    try {
+      lastAttempt = Number(window.sessionStorage.getItem(AUTO_LOGIN_KEY)) || 0;
+      window.sessionStorage.setItem(AUTO_LOGIN_KEY, String(Date.now()));
+    } catch {
+      // sessionStorage throws when site data is blocked, fall through and redirect anyway
+    }
+    // Getting here quickly means the session never stuck, hand it back to the user
+    if (Date.now() - lastAttempt < AUTO_LOGIN_RETRY_MS) {
+      router.replace(`/auth/signin?autologin=0&callbackUrl=${encodeURIComponent(callbackUrl)}`);
+      return;
+    }
+
+    signIn(oidcProvider.id, { callbackUrl });
+  }, [redirecting, oidcProvider, callbackUrl, router]);
+
  let backgroundImage = "";
  let opacity = settings?.backgroundOpacity ?? 0;
  let backgroundBlur = false;
@@ -143,7 +175,12 @@ export default function SignIn({ providers, settings }) {
              <div className="rounded-2xl border border-white/60 bg-white/70 p-6 shadow-lg shadow-black/5 dark:border-white/10 dark:bg-slate-900/70">
                <h2 className="text-lg font-semibold text-gray-900 dark:text-slate-100">Sign in</h2>
                <div className="mt-6 space-y-3">
-                  {hasPasswordProvider && (
+                  {redirecting && (
+                    <p className="text-sm text-gray-600 dark:text-slate-300">
+                      Redirecting to {oidcProvider?.name}&hellip;
+                    </p>
+                  )}
+                  {!redirecting && hasPasswordProvider && (
                    <form
                      className="space-y-3"
                      onSubmit={async (event) => {
@@ -173,7 +210,8 @@ export default function SignIn({ providers, settings }) {
                      </button>
                    </form>
                  )}
-                  {!hasPasswordProvider &&
+                  {!redirecting &&
+                    !hasPasswordProvider &&
                    Object.values(providers).map((provider) => (
                      <button
                        key={provider.id}
@@ -218,6 +256,6 @@ export async function getServerSideProps(context) {
    ]),
  );
  return {
-    props: { providers, settings },
+    props: { providers, settings, autoLogin: process.env.HOMEPAGE_OIDC_AUTO_LOGIN === "true" },
  };
 }
@@ -60,6 +60,46 @@ export async function servicesFromConfig() {
  return parseServicesToGroups(services);
 }

+function flattenServices(groups, services = []) {
+  groups.forEach((group) => {
+    (group.services ?? []).forEach((service) => services.push(service));
+    flattenServices(group.groups ?? [], services);
+  });
+  return services;
+}
+
+function dockerWidgets(service) {
+  const widgets = service.widget ? [service.widget, ...(service.widgets ?? [])] : (service.widgets ?? []);
+  return widgets.filter((widget) => widget?.type === "docker");
+}
+
+export async function containersFromConfig(server) {
+  const target = server || "";
+  const services = flattenServices(await servicesFromConfig());
+  // services and docker widgets both carry container + server
+  const refs = services.flatMap((service) => [service, ...dockerWidgets(service)]);
+  const matching = refs.filter((ref) => ref.container && (ref.server || "") === target);
+
+  return new Set(matching.map((ref) => ref.container));
+}
+
+// homepage.foo -> foo, homepage.instance.<this instance>.foo -> foo, another instance -> null
+export function homepageLabelValue(label, instanceName) {
+  if (!label.startsWith("homepage.")) return null;
+
+  const value = label.replace("homepage.", "");
+  if (!value.startsWith("instance.")) return value;
+  if (instanceName && value.startsWith(`instance.${instanceName}.`)) {
+    return value.replace(`instance.${instanceName}.`, "");
+  }
+
+  return null;
+}
+
+export function hasHomepageLabels(labels, instanceName) {
+  return Object.keys(labels ?? {}).some((label) => homepageLabelValue(label, instanceName) !== null);
+}
+
 export async function servicesFromDocker() {
  checkAndCopyConfig("docker.yaml");

@@ -95,29 +135,23 @@ export async function servicesFromDocker() {
          const containerLabels = isSwarm ? shvl.get(container, "Spec.Labels") : container.Labels;
          const containerName = isSwarm ? shvl.get(container, "Spec.Name") : container.Names[0];

-          Object.keys(containerLabels).forEach((label) => {
-            if (label.startsWith("homepage.")) {
-              let value = label.replace("homepage.", "");
-              if (instanceName && value.startsWith(`instance.${instanceName}.`)) {
-                value = value.replace(`instance.${instanceName}.`, "");
-              } else if (value.startsWith("instance.")) {
-                return;
-              }
+          Object.keys(containerLabels ?? {}).forEach((label) => {
+            const value = homepageLabelValue(label, instanceName);
+            if (value === null) return;

-              if (!constructedService) {
-                constructedService = {
-                  container: containerName.replace(/^\//, ""),
-                  server: serverName,
-                  weight: 0,
-                  type: "service",
-                };
-              }
-              let substitutedVal = substituteEnvironmentVars(containerLabels[label]);
-              if (value === "widget.version" || /^widgets\[\d+\]\.version$/.test(value)) {
-                substitutedVal = parseVersionForUrl(substitutedVal);
-              }
-              shvl.set(constructedService, value, substitutedVal);
+            if (!constructedService) {
+              constructedService = {
+                container: containerName.replace(/^\//, ""),
+                server: serverName,
+                weight: 0,
+                type: "service",
+              };
            }
+            let substitutedVal = substituteEnvironmentVars(containerLabels[label]);
+            if (value === "widget.version" || /^widgets\[\d+\]\.version$/.test(value)) {
+              substitutedVal = parseVersionForUrl(substitutedVal);
+            }
+            shvl.set(constructedService, value, substitutedVal);
          });

          if (constructedService && (!constructedService.name || !constructedService.group)) {
@@ -103,6 +103,119 @@ describe("utils/config/service-helpers", () => {
    expect(await mod.servicesFromConfig()).toEqual([]);
  });

+  it("containersFromConfig returns an empty set when services.yaml is empty", async () => {
+    state.servicesYaml = null;
+
+    const mod = await import("./service-helpers");
+    expect(await mod.containersFromConfig("local")).toEqual(new Set());
+  });
+
+  it("containersFromConfig only returns containers for the requested server", async () => {
+    state.servicesYaml = [
+      { Group: [{ App: { container: "app", server: "local" } }, { Other: { container: "other", server: "remote" } }] },
+    ];
+
+    const mod = await import("./service-helpers");
+    expect(await mod.containersFromConfig("local")).toEqual(new Set(["app"]));
+    expect(await mod.containersFromConfig("remote")).toEqual(new Set(["other"]));
+  });
+
+  it("containersFromConfig maps a service without a server to the default connection", async () => {
+    state.servicesYaml = [{ Group: [{ App: { container: "app" } }] }];
+
+    const mod = await import("./service-helpers");
+    expect(await mod.containersFromConfig("")).toEqual(new Set(["app"]));
+    expect(await mod.containersFromConfig(undefined)).toEqual(new Set(["app"]));
+    expect(await mod.containersFromConfig("local")).toEqual(new Set());
+  });
+
+  it("containersFromConfig recurses into nested groups", async () => {
+    state.servicesYaml = [
+      {
+        Main: [
+          { Child: [{ Deep: { container: "deep", server: "local" } }] },
+          { Root: { container: "top", server: "local" } },
+        ],
+      },
+    ];
+
+    const mod = await import("./service-helpers");
+    expect(await mod.containersFromConfig("local")).toEqual(new Set(["top", "deep"]));
+  });
+
+  it("containersFromConfig includes docker widget containers in both widget and widgets forms", async () => {
+    state.servicesYaml = [
+      {
+        Group: [
+          { WidgetOnly: { widget: { type: "docker", container: "widgetapp", server: "local" } } },
+          {
+            WithArray: {
+              container: "app",
+              server: "local",
+              widgets: [
+                { type: "docker", container: "sidecar", server: "local" },
+                { type: "docker", container: "elsewhere", server: "remote" },
+              ],
+            },
+          },
+        ],
+      },
+    ];
+
+    const mod = await import("./service-helpers");
+    expect(await mod.containersFromConfig("local")).toEqual(new Set(["widgetapp", "app", "sidecar"]));
+  });
+
+  it("containersFromConfig ignores non docker widgets that carry a container field", async () => {
+    state.servicesYaml = [
+      { Group: [{ App: { widget: { type: "portainer", container: "sneaky", server: "local" } } }] },
+    ];
+
+    const mod = await import("./service-helpers");
+    expect(await mod.containersFromConfig("local")).toEqual(new Set());
+  });
+
+  it("homepageLabelValue strips the prefix and honors instance scoping", async () => {
+    const mod = await import("./service-helpers");
+
+    expect(mod.homepageLabelValue("com.docker.compose.project", "foo")).toBeNull();
+    expect(mod.homepageLabelValue("homepage.name", undefined)).toBe("name");
+    expect(mod.homepageLabelValue("homepage.instance.foo.name", "foo")).toBe("name");
+    expect(mod.homepageLabelValue("homepage.instance.bar.name", "foo")).toBeNull();
+    expect(mod.homepageLabelValue("homepage.instance.bar.name", undefined)).toBeNull();
+  });
+
+  it("hasHomepageLabels reports whether a container opts in for this instance", async () => {
+    const mod = await import("./service-helpers");
+
+    expect(mod.hasHomepageLabels(undefined, "foo")).toBe(false);
+    expect(mod.hasHomepageLabels({}, "foo")).toBe(false);
+    expect(mod.hasHomepageLabels({ "com.docker.compose.project": "x" }, "foo")).toBe(false);
+    expect(mod.hasHomepageLabels({ "homepage.name": "X" }, undefined)).toBe(true);
+    expect(mod.hasHomepageLabels({ "homepage.instance.foo.name": "X" }, "foo")).toBe(true);
+    expect(mod.hasHomepageLabels({ "homepage.instance.bar.name": "X" }, "foo")).toBe(false);
+  });
+
+  it("servicesFromDocker skips containers without labels instead of failing the whole server", async () => {
+    state.dockerYaml = { "docker-local": {} };
+    state.dockerContainersByServer["docker-local"] = [
+      { Names: ["/nolabels"] },
+      { Names: ["/labelled"], Labels: { "homepage.group": "G", "homepage.name": "Svc" } },
+    ];
+
+    const mod = await import("./service-helpers");
+    const discovered = await mod.servicesFromDocker();
+
+    expect(discovered).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          name: "G",
+          services: [expect.objectContaining({ name: "Svc", container: "labelled" })],
+        }),
+      ]),
+    );
+  });
+
  it("servicesFromDocker returns [] when docker.yaml is empty", async () => {
    state.dockerYaml = null;

@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";

 import { calculateCPUPercent, calculateThroughput, calculateUsedMemory } from "./stats-helpers";

-describe("widgets/docker/stats-helpers", () => {
+describe("utils/docker/stats-helpers", () => {
  it("calculateCPUPercent returns 0 when deltas are not positive", () => {
    expect(
      calculateCPUPercent({
@@ -0,0 +1,92 @@
+import Docker from "dockerode";
+
+import { getSettings } from "utils/config/config";
+import getDockerArguments from "utils/config/docker";
+import { containersFromConfig, hasHomepageLabels } from "utils/config/service-helpers";
+import { calculateCPUPercent, calculateThroughput, calculateUsedMemory } from "utils/docker/stats-helpers";
+
+// mem and network are omitted when docker does not report them, so the widget can skip those blocks
+async function statsForContainer(docker, id) {
+  try {
+    const raw = await docker.getContainer(id).stats({ stream: false });
+    const stats = { cpu: calculateCPUPercent(raw) };
+
+    if (raw.memory_stats?.usage) {
+      stats.mem = calculateUsedMemory(raw);
+    }
+
+    if (raw.networks) {
+      const { rxBytes, txBytes } = calculateThroughput(raw);
+      stats.rx = rxBytes;
+      stats.tx = txBytes;
+    }
+
+    return stats;
+  } catch (e) {
+    // ensure one failed call does not look like an absent container
+    return { error: e?.message ?? "stats unavailable" };
+  }
+}
+
+export async function getDockerStats(server) {
+  const dockerArgs = getDockerArguments(server);
+  const docker = new Docker(dockerArgs.conn);
+
+  const [containers, configured] = await Promise.all([
+    docker.listContainers({ all: true }),
+    containersFromConfig(server),
+  ]);
+
+  if (!Array.isArray(containers)) {
+    return { error: "query failed" };
+  }
+
+  const { instanceName } = getSettings();
+  const targets = {};
+  const localIds = new Set();
+
+  containers.forEach((container) => {
+    localIds.add(container.Id);
+    if (container.State !== "running") return;
+
+    const labelled = hasHomepageLabels(container.Labels, instanceName);
+    container.Names.forEach((name) => {
+      const containerName = name.replace(/^\//, "");
+      if (labelled || configured.has(containerName)) targets[containerName] = container.Id;
+    });
+  });
+
+  if (dockerArgs.swarm) {
+    const [services, tasks] = await Promise.all([
+      docker.listServices().catch(() => []),
+      docker.listTasks({ filters: { "desired-state": ["running"] } }).catch(() => []),
+    ]);
+
+    const tasksByService = {};
+    tasks.forEach((task) => {
+      (tasksByService[task.ServiceID] ??= []).push(task);
+    });
+
+    services.forEach((service) => {
+      const name = service.Spec?.Name;
+      if (!name || targets[name]) return;
+      if (!configured.has(name) && !hasHomepageLabels(service.Spec?.Labels, instanceName)) return;
+
+      // stats are only available for containers running on this node
+      const serviceTasks = tasksByService[service.ID] ?? [];
+      const task = serviceTasks.find((candidate) => localIds.has(candidate.Status?.ContainerStatus?.ContainerID));
+      const containerId = task?.Status?.ContainerStatus?.ContainerID;
+      if (containerId) targets[name] = containerId;
+    });
+  }
+
+  const names = Object.keys(targets);
+  const results = await Promise.all(names.map((name) => statsForContainer(docker, targets[name])));
+
+  const stats = {};
+  names.forEach((name, index) => {
+    stats[name] = results[index];
+  });
+
+  return { stats };
+}
@@ -0,0 +1,173 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const { state, DockerCtor, getDockerArguments, containersFromConfig, hasHomepageLabels, getSettings } = vi.hoisted(
+  () => {
+    const state = {
+      docker: null,
+      containers: [],
+      statsById: {},
+      dockerArgs: { conn: { socketPath: "/var/run/docker.sock" }, swarm: false },
+    };
+
+    function DockerCtor() {
+      return state.docker;
+    }
+
+    return {
+      state,
+      DockerCtor,
+      getDockerArguments: vi.fn(() => state.dockerArgs),
+      containersFromConfig: vi.fn(async () => new Set()),
+      hasHomepageLabels: vi.fn(() => false),
+      getSettings: vi.fn(() => ({ instanceName: undefined })),
+    };
+  },
+);
+
+vi.mock("dockerode", () => ({ default: DockerCtor }));
+vi.mock("utils/config/docker", () => ({ default: getDockerArguments }));
+vi.mock("utils/config/service-helpers", () => ({ containersFromConfig, hasHomepageLabels }));
+vi.mock("utils/config/config", () => ({ getSettings }));
+
+import { getDockerStats } from "./stats";
+
+// cpu 20%, mem 900, rx 4, tx 6
+const rawStats = (overrides = {}) => ({
+  cpu_stats: { cpu_usage: { total_usage: 200 }, system_cpu_usage: 2000, online_cpus: 2 },
+  precpu_stats: { cpu_usage: { total_usage: 100 }, system_cpu_usage: 1000 },
+  memory_stats: { usage: 1000, total_inactive_file: 100 },
+  networks: { eth0: { rx_bytes: 1, tx_bytes: 2 }, eth1: { rx_bytes: 3, tx_bytes: 4 } },
+  ...overrides,
+});
+
+describe("utils/docker/stats", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    state.dockerArgs = { conn: { socketPath: "/var/run/docker.sock" }, swarm: false };
+    state.containers = [];
+    state.statsById = {};
+    state.docker = {
+      listContainers: vi.fn(async () => state.containers),
+      listServices: vi.fn(async () => []),
+      listTasks: vi.fn(async () => []),
+      getContainer: vi.fn((id) => ({
+        stats: vi.fn(async () => {
+          const entry = state.statsById[id];
+          if (entry instanceof Error) throw entry;
+          if (!entry) throw new Error(`no stats for ${id}`);
+          return entry;
+        }),
+      })),
+    };
+    containersFromConfig.mockResolvedValue(new Set());
+    hasHomepageLabels.mockReturnValue(false);
+    getSettings.mockReturnValue({ instanceName: undefined });
+  });
+
+  it("returns computed stats for configured running containers", async () => {
+    containersFromConfig.mockResolvedValue(new Set(["app"]));
+    state.containers = [{ Names: ["/app"], Id: "cid1", State: "running" }];
+    state.statsById.cid1 = rawStats();
+
+    expect(await getDockerStats("local")).toEqual({ stats: { app: { cpu: 20, mem: 900, rx: 4, tx: 6 } } });
+    expect(getDockerArguments).toHaveBeenCalledWith("local");
+    expect(containersFromConfig).toHaveBeenCalledWith("local");
+  });
+
+  it("omits containers that are neither configured nor labelled", async () => {
+    containersFromConfig.mockResolvedValue(new Set(["app"]));
+    state.containers = [
+      { Names: ["/app"], Id: "cid1", State: "running" },
+      { Names: ["/secret-db"], Id: "cid2", State: "running" },
+    ];
+    state.statsById.cid1 = rawStats();
+    state.statsById.cid2 = rawStats();
+
+    const result = await getDockerStats("local");
+
+    expect(Object.keys(result.stats)).toEqual(["app"]);
+    expect(state.docker.getContainer).not.toHaveBeenCalledWith("cid2");
+  });
+
+  it("includes containers discovered through homepage labels", async () => {
+    hasHomepageLabels.mockImplementation((labels) => labels?.["homepage.name"] !== undefined);
+    state.containers = [{ Names: ["/labelled"], Id: "cid1", State: "running", Labels: { "homepage.name": "App" } }];
+    state.statsById.cid1 = rawStats();
+
+    expect(Object.keys((await getDockerStats("local")).stats)).toEqual(["labelled"]);
+  });
+
+  it("does not collect stats for containers that are not running", async () => {
+    containersFromConfig.mockResolvedValue(new Set(["app"]));
+    state.containers = [{ Names: ["/app"], Id: "cid1", State: "exited" }];
+
+    expect(await getDockerStats("local")).toEqual({ stats: {} });
+    expect(state.docker.getContainer).not.toHaveBeenCalled();
+  });
+
+  it("keeps a per container stats failure without failing the rest", async () => {
+    containersFromConfig.mockResolvedValue(new Set(["ok", "broken"]));
+    state.containers = [
+      { Names: ["/ok"], Id: "cid1", State: "running" },
+      { Names: ["/broken"], Id: "cid2", State: "running" },
+    ];
+    state.statsById.cid1 = rawStats();
+    state.statsById.cid2 = new Error("stats unavailable");
+
+    expect(await getDockerStats("local")).toEqual({
+      stats: { ok: { cpu: 20, mem: 900, rx: 4, tx: 6 }, broken: { error: "stats unavailable" } },
+    });
+  });
+
+  it("omits mem and network when docker does not report them", async () => {
+    containersFromConfig.mockResolvedValue(new Set(["app"]));
+    state.containers = [{ Names: ["/app"], Id: "cid1", State: "running" }];
+    state.statsById.cid1 = rawStats({ memory_stats: {}, networks: undefined });
+
+    expect(await getDockerStats("local")).toEqual({ stats: { app: { cpu: 20 } } });
+  });
+
+  it("returns an error when docker returns a non-array containers payload", async () => {
+    state.containers = Buffer.from("bad");
+
+    expect(await getDockerStats("local")).toEqual({ error: "query failed" });
+  });
+
+  it("resolves a swarm service through its local task container", async () => {
+    state.dockerArgs.swarm = true;
+    containersFromConfig.mockResolvedValue(new Set(["svc"]));
+    state.containers = [{ Names: ["/other"], Id: "local1", State: "running" }];
+    state.statsById.local1 = rawStats();
+    state.docker.listServices.mockResolvedValue([{ ID: "sid", Spec: { Name: "svc" } }]);
+    state.docker.listTasks.mockResolvedValue([
+      { ServiceID: "sid", Status: { ContainerStatus: { ContainerID: "remote1" } } },
+      { ServiceID: "sid", Status: { ContainerStatus: { ContainerID: "local1" } } },
+    ]);
+
+    expect(await getDockerStats("swarm")).toEqual({ stats: { svc: { cpu: 20, mem: 900, rx: 4, tx: 6 } } });
+  });
+
+  it("skips a swarm service with no container on this node", async () => {
+    state.dockerArgs.swarm = true;
+    containersFromConfig.mockResolvedValue(new Set(["svc"]));
+    state.containers = [{ Names: ["/other"], Id: "local1", State: "running" }];
+    state.docker.listServices.mockResolvedValue([{ ID: "sid", Spec: { Name: "svc" } }]);
+    state.docker.listTasks.mockResolvedValue([
+      { ServiceID: "sid", Status: { ContainerStatus: { ContainerID: "remote1" } } },
+    ]);
+
+    expect(await getDockerStats("swarm")).toEqual({ stats: {} });
+  });
+
+  it("omits swarm services that are neither configured nor labelled", async () => {
+    state.dockerArgs.swarm = true;
+    state.containers = [{ Names: ["/other"], Id: "local1", State: "running" }];
+    state.statsById.local1 = rawStats();
+    state.docker.listServices.mockResolvedValue([{ ID: "sid", Spec: { Name: "internal" } }]);
+    state.docker.listTasks.mockResolvedValue([
+      { ServiceID: "sid", Status: { ContainerStatus: { ContainerID: "local1" } } },
+    ]);
+
+    expect(await getDockerStats("swarm")).toEqual({ stats: {} });
+  });
+});
@@ -0,0 +1,104 @@
+import Docker from "dockerode";
+
+import { getSettings } from "utils/config/config";
+import getDockerArguments from "utils/config/docker";
+import { containersFromConfig, hasHomepageLabels } from "utils/config/service-helpers";
+
+const HEALTH_STATES = ["healthy", "unhealthy", "starting"];
+
+function statusEntry(state, health) {
+  return health ? { status: state, health } : { status: state };
+}
+
+// docker exposes health only as a filter on the list endpoint, never as a field
+async function healthByContainerId(docker) {
+  const results = await Promise.all(
+    HEALTH_STATES.map((state) => docker.listContainers({ all: true, filters: { health: [state] } }).catch(() => [])),
+  );
+
+  const health = {};
+  results.forEach((containers, index) => {
+    if (!Array.isArray(containers)) return;
+    containers.forEach((container) => {
+      health[container.Id] = HEALTH_STATES[index];
+    });
+  });
+
+  return health;
+}
+
+export async function getDockerStatuses(server) {
+  const dockerArgs = getDockerArguments(server);
+  const docker = new Docker(dockerArgs.conn);
+
+  const [containers, health, configured] = await Promise.all([
+    docker.listContainers({ all: true }),
+    healthByContainerId(docker),
+    containersFromConfig(server),
+  ]);
+
+  if (!Array.isArray(containers)) {
+    return { error: "query failed" };
+  }
+
+  const { instanceName } = getSettings();
+  const statuses = {};
+  const byId = {};
+
+  containers.forEach((container) => {
+    const info = statusEntry(container.State, health[container.Id]);
+    // keyed by id for every container so swarm tasks can resolve their local container
+    byId[container.Id] = info;
+
+    const labelled = hasHomepageLabels(container.Labels, instanceName);
+    container.Names.forEach((name) => {
+      const containerName = name.replace(/^\//, "");
+      if (labelled || configured.has(containerName)) statuses[containerName] = info;
+    });
+  });
+
+  if (!dockerArgs.swarm) {
+    return { statuses };
+  }
+
+  const [services, tasks] = await Promise.all([
+    docker.listServices().catch(() => []),
+    docker.listTasks({ filters: { "desired-state": ["running"] } }).catch(() => []),
+  ]);
+
+  const localIds = new Set(containers.map((container) => container.Id));
+  const tasksByService = {};
+  tasks.forEach((task) => {
+    (tasksByService[task.ServiceID] ??= []).push(task);
+  });
+
+  services.forEach((service) => {
+    const name = service.Spec?.Name;
+    if (!name || statuses[name]) return;
+    if (!configured.has(name) && !hasHomepageLabels(service.Spec?.Labels, instanceName)) return;
+
+    const serviceTasks = tasksByService[service.ID] ?? [];
+
+    if (service.Spec.Mode?.Replicated) {
+      const replicas = parseInt(service.Spec.Mode.Replicated.Replicas, 10);
+      if (serviceTasks.length === replicas) {
+        statuses[name] = { status: `running ${serviceTasks.length}/${replicas}` };
+      } else if (serviceTasks.length > 0) {
+        statuses[name] = { status: `partial ${serviceTasks.length}/${replicas}` };
+      }
+      return;
+    }
+
+    const task =
+      serviceTasks.find((candidate) => localIds.has(candidate.Status?.ContainerStatus?.ContainerID)) ??
+      serviceTasks.at(0);
+    const containerId = task?.Status?.ContainerStatus?.ContainerID;
+    if (containerId && byId[containerId]) {
+      statuses[name] = byId[containerId];
+    } else if (task) {
+      statuses[name] = { status: task.Status.State };
+    }
+  });
+
+  return { statuses };
+}
@@ -21,7 +21,7 @@ export default function Component({ service }) {
    return <Container service={service} error={alertsError ?? bansError} />;
  }

-  if (!alerts && !bans) {
+  if (alerts === undefined && bans === undefined) {
    return (
      <Container service={service}>
        <Block label="crowdsec.alerts" />
@@ -86,4 +86,15 @@ describe("widgets/crowdsec/component", () => {

    expectBlockValue(container, "crowdsec.alerts", 499);
  });
+
+  it("renders null responses as 0 counts", () => {
+    useWidgetAPI.mockImplementation(() => ({ data: null, error: undefined }));
+
+    const { container } = renderWithProviders(<Component service={{ widget: { type: "crowdsec" } }} />, {
+      settings: { hideErrors: false },
+    });
+
+    expectBlockValue(container, "crowdsec.alerts", 0);
+    expectBlockValue(container, "crowdsec.bans", 0);
+  });
 });
@@ -102,6 +102,11 @@ export default async function crowdsecProxyHandler(req, res) {
      return res.status(status).json({ error: "Crowdsec API Error", data });
    }

+    // Crowdsec returns a literal null instead of an empty array when nothing matches
+    if (data?.toString().trim() === "null") {
+      return res.status(status).json([]);
+    }
+
    return res.status(status).send(data);
  } catch (error) {
    logger.error("Exception calling Crowdsec API: %s", error.message);
@@ -161,4 +161,29 @@ describe("widgets/crowdsec/proxy", () => {
    expect(res.statusCode).toBe(500);
    expect(res.body).toEqual({ error: "Failed to authenticate with Crowdsec" });
  });
+
+  it("normalizes a literal null response to an empty array", async () => {
+    getServiceWidget.mockResolvedValue({
+      type: "crowdsec",
+      url: "http://cs",
+      username: "machine",
+      password: "pw",
+    });
+
+    httpProxy
+      .mockResolvedValueOnce([
+        200,
+        "application/json",
+        JSON.stringify({ token: "tok", expire: new Date(Date.now() + 60_000).toISOString() }),
+      ])
+      .mockResolvedValueOnce([200, "application/json", Buffer.from("null")]);
+
+    const req = { query: { group: "g", service: "svc", endpoint: "alerts", index: "0" } };
+    const res = createMockRes();
+
+    await crowdsecProxyHandler(req, res);
+
+    expect(res.statusCode).toBe(200);
+    expect(res.body).toEqual([]);
+  });
 });
@@ -1,8 +1,6 @@
 import { useTranslation } from "next-i18next/pages";
 import useSWR from "swr";

-import { calculateCPUPercent, calculateThroughput, calculateUsedMemory } from "./stats-helpers";
-
 import Block from "components/services/widget/block";
 import Container from "components/services/widget/container";

@@ -10,15 +8,18 @@ export default function Component({ service }) {
  const { t } = useTranslation();

  const { widget } = service;
+  const server = encodeURIComponent(widget.server || "");

-  const { data: statusData, error: statusError } = useSWR(
-    `/api/docker/status/${widget.container}/${widget.server || ""}`,
-  );
+  const { data: statusResponse, error: statusError } = useSWR(`/api/docker/statuses?server=${server}`);
+  const { statuses } = statusResponse ?? {};
+  const statusData = statuses ? (statuses[widget.container] ?? { status: "not found" }) : undefined;

-  const { data: statsData, error: statsError } = useSWR(`/api/docker/stats/${widget.container}/${widget.server || ""}`);
+  const { data: statsResponse, error: statsError } = useSWR(`/api/docker/stats?server=${server}`);
+  const { stats } = statsResponse ?? {};
+  const statsData = stats?.[widget.container];

-  if (statsError || statsData?.error || statusError || statusData?.error) {
-    const finalError = statsError ?? statsData?.error ?? statusError ?? statusData?.error;
+  if (statsError || statsResponse?.error || statsData?.error || statusError || statusResponse?.error) {
+    const finalError = statsError ?? statsResponse?.error ?? statsData?.error ?? statusError ?? statusResponse?.error;
    return <Container service={service} error={finalError} />;
  }

@@ -30,6 +31,11 @@ export default function Component({ service }) {
    );
  }

+  // running, but reporting no stats: a swarm service whose container is on another node
+  if (statusData && stats && !statsData) {
+    return <Container service={service} error="not found" />;
+  }
+
  if (!statsData || !statusData) {
    return (
      <Container service={service}>
@@ -41,20 +47,16 @@ export default function Component({ service }) {
    );
  }

-  const { rxBytes, txBytes } = calculateThroughput(statsData.stats);
-  const cpuPercent = calculateCPUPercent(statsData.stats);
-  const usedMemory = calculateUsedMemory(statsData.stats);
+  const { cpu, mem, rx, tx } = statsData;

  return (
    <Container service={service}>
-      <Block label="docker.cpu" value={t("common.percent", { value: cpuPercent })} highlightValue={cpuPercent} />
-      {statsData.stats.memory_stats.usage && (
-        <Block label="docker.mem" value={t("common.bytes", { value: usedMemory })} highlightValue={usedMemory} />
-      )}
-      {statsData.stats.networks && (
+      <Block label="docker.cpu" value={t("common.percent", { value: cpu })} highlightValue={cpu} />
+      {mem !== undefined && <Block label="docker.mem" value={t("common.bytes", { value: mem })} highlightValue={mem} />}
+      {rx !== undefined && (
        <>
-          <Block label="docker.rx" value={t("common.bytes", { value: rxBytes })} highlightValue={rxBytes} />
-          <Block label="docker.tx" value={t("common.bytes", { value: txBytes })} highlightValue={txBytes} />
+          <Block label="docker.rx" value={t("common.bytes", { value: rx })} highlightValue={rx} />
+          <Block label="docker.tx" value={t("common.bytes", { value: tx })} highlightValue={tx} />
        </>
      )}
    </Container>
@@ -20,8 +20,8 @@ describe("widgets/docker/component", () => {

  it("renders offline status when container is not running", () => {
    useSWR
-      .mockReturnValueOnce({ data: { status: "exited" }, error: undefined }) // status
-      .mockReturnValueOnce({ data: undefined, error: undefined }); // stats
+      .mockReturnValueOnce({ data: { statuses: { c: { status: "exited" } } }, error: undefined })
+      .mockReturnValueOnce({ data: undefined, error: undefined });

    renderWithProviders(<Component service={{ widget: { type: "docker", container: "c" } }} />, {
      settings: { hideErrors: false },
@@ -31,31 +31,97 @@ describe("widgets/docker/component", () => {
    expect(screen.getByText("docker.offline")).toBeInTheDocument();
  });

+  it("surfaces a docker error payload instead of reporting the container offline", () => {
+    useSWR
+      .mockReturnValueOnce({ data: { error: { message: "socket unreachable" } }, error: undefined })
+      .mockReturnValueOnce({ data: undefined, error: undefined });
+
+    renderWithProviders(<Component service={{ widget: { type: "docker", container: "c", server: "s" } }} />, {
+      settings: { hideErrors: false },
+    });
+
+    expect(screen.queryByText("docker.offline")).not.toBeInTheDocument();
+  });
+
+  it("treats a missing container in the bulk status map as offline", () => {
+    useSWR
+      .mockReturnValueOnce({ data: { statuses: {} }, error: undefined })
+      .mockReturnValueOnce({ data: undefined, error: undefined });
+
+    renderWithProviders(<Component service={{ widget: { type: "docker", container: "c", server: "s" } }} />, {
+      settings: { hideErrors: false },
+    });
+
+    expect(useSWR).toHaveBeenCalledWith("/api/docker/statuses?server=s");
+    expect(screen.getByText("docker.offline")).toBeInTheDocument();
+  });
+
  it("renders cpu/mem/rx/tx values when stats are available", () => {
    useSWR
-      .mockReturnValueOnce({ data: { status: "running" }, error: undefined }) // status
-      .mockReturnValueOnce({
-        data: {
-          stats: {
-            cpu_stats: { cpu_usage: { total_usage: 200 }, system_cpu_usage: 2000, online_cpus: 2 },
-            precpu_stats: { cpu_usage: { total_usage: 100 }, system_cpu_usage: 1000 },
-            memory_stats: { usage: 1000, total_inactive_file: 100 },
-            networks: { eth0: { rx_bytes: 1, tx_bytes: 2 }, eth1: { rx_bytes: 3, tx_bytes: 4 } },
-          },
-        },
-        error: undefined,
-      });
+      .mockReturnValueOnce({ data: { statuses: { c: { status: "running" } } }, error: undefined })
+      .mockReturnValueOnce({ data: { stats: { c: { cpu: 20, mem: 900, rx: 4, tx: 6 } } }, error: undefined });

    const { container } = renderWithProviders(<Component service={{ widget: { type: "docker", container: "c" } }} />, {
      settings: { hideErrors: false },
    });

-    // cpu: (100/1000)*2*100=20
+    expect(useSWR).toHaveBeenCalledWith("/api/docker/stats?server=");
    expect(container.textContent).toContain("20");
-    // mem used: 1000-100=900
    expect(container.textContent).toContain("900");
-    // rx=4, tx=6
    expect(container.textContent).toContain("4");
    expect(container.textContent).toContain("6");
  });
+
+  it("omits the mem and network blocks when the api omits those fields", () => {
+    useSWR
+      .mockReturnValueOnce({ data: { statuses: { c: { status: "running" } } }, error: undefined })
+      .mockReturnValueOnce({ data: { stats: { c: { cpu: 20 } } }, error: undefined });
+
+    renderWithProviders(<Component service={{ widget: { type: "docker", container: "c" } }} />, {
+      settings: { hideErrors: false },
+    });
+
+    expect(screen.getByText("docker.cpu")).toBeInTheDocument();
+    expect(screen.queryByText("docker.mem")).not.toBeInTheDocument();
+    expect(screen.queryByText("docker.rx")).not.toBeInTheDocument();
+  });
+
+  it("surfaces a per container stats error rather than reporting it missing", () => {
+    useSWR
+      .mockReturnValueOnce({ data: { statuses: { c: { status: "running" } } }, error: undefined })
+      .mockReturnValueOnce({ data: { stats: { c: { error: "connect ETIMEDOUT" } } }, error: undefined });
+
+    renderWithProviders(<Component service={{ widget: { type: "docker", container: "c", server: "s" } }} />, {
+      settings: { hideErrors: false },
+    });
+
+    expect(screen.getAllByText(/widget.api_error/).length).toBeGreaterThan(0);
+    expect(screen.queryByText("docker.cpu")).not.toBeInTheDocument();
+  });
+
+  it("waits for the status before treating absence from the stats map as an error", () => {
+    useSWR
+      .mockReturnValueOnce({ data: undefined, error: undefined })
+      .mockReturnValueOnce({ data: { stats: {} }, error: undefined });
+
+    renderWithProviders(<Component service={{ widget: { type: "docker", container: "c", server: "s" } }} />, {
+      settings: { hideErrors: false },
+    });
+
+    expect(screen.queryAllByText(/widget.api_error/)).toHaveLength(0);
+    expect(screen.getByText("docker.cpu")).toBeInTheDocument();
+  });
+
+  it("reports an error when a running container is absent from the stats map", () => {
+    useSWR
+      .mockReturnValueOnce({ data: { statuses: { c: { status: "running" } } }, error: undefined })
+      .mockReturnValueOnce({ data: { stats: {} }, error: undefined });
+
+    renderWithProviders(<Component service={{ widget: { type: "docker", container: "c", server: "s" } }} />, {
+      settings: { hideErrors: false },
+    });
+
+    expect(screen.getAllByText(/widget.api_error/).length).toBeGreaterThan(0);
+    expect(screen.queryByText("docker.cpu")).not.toBeInTheDocument();
+  });
 });
@@ -55,7 +55,7 @@ export default function Component({ service }) {
      {includeNetWorth && (
        <Block
          label="ghostfolio.net_worth"
-          value={`${performanceToday.performance.currentNetWorth.toFixed(2)} ${userInfo?.settings?.currency ?? ""}`}
+          value={`${performanceToday.performance.currentNetWorth.toFixed(2)} ${userInfo?.settings?.baseCurrency ?? userInfo?.settings?.currency ?? ""}`}
        />
      )}
    </Container>
@@ -64,7 +64,7 @@ describe("widgets/ghostfolio/component", () => {
        data: { performance: { currentGrossPerformancePercent: 0 } },
        error: undefined,
      })
-      .mockReturnValueOnce({ data: { settings: { currency: "USD" } }, error: undefined });
+      .mockReturnValueOnce({ data: { settings: { baseCurrency: "EUR", currency: "USD" } }, error: undefined });

    const { container } = renderWithProviders(
      <Component
@@ -82,6 +82,38 @@ describe("widgets/ghostfolio/component", () => {
    expectBlockValue(container, "ghostfolio.gross_percent_today", "+10");
    expectBlockValue(container, "ghostfolio.gross_percent_1y", "-5");
    expectBlockValue(container, "ghostfolio.gross_percent_max", "0");
-    expectBlockValue(container, "ghostfolio.net_worth", "123.46 USD");
+    expectBlockValue(container, "ghostfolio.net_worth", "123.46 EUR");
+  });
+
+  it("uses the currency as fallback for net worth", () => {
+    useWidgetAPI
+      .mockReturnValueOnce({
+        data: { performance: { netPerformancePercentageWithCurrencyEffect: 0.1, currentNetWorth: 123.456 } },
+        error: undefined,
+      })
+      .mockReturnValueOnce({
+        data: { performance: { grossPerformancePercentage: -0.05 } },
+        error: undefined,
+      })
+      .mockReturnValueOnce({
+        data: { performance: { currentGrossPerformancePercent: 0 } },
+        error: undefined,
+      })
+      .mockReturnValueOnce({ data: { settings: { currency: "EUR" } }, error: undefined });
+
+    const { container } = renderWithProviders(
+      <Component
+        service={{
+          widget: {
+            type: "ghostfolio",
+            url: "http://x",
+            fields: ["gross_percent_today", "gross_percent_1y", "gross_percent_max", "net_worth"],
+          },
+        }}
+      />,
+      { settings: { hideErrors: false } },
+    );
+
+    expectBlockValue(container, "ghostfolio.net_worth", "123.46 EUR");
  });
 });
Author	SHA1	Message	Date
shamoon	541b2fe9f1	2.3.0 Docker CI / Docker Build & Push (push) Waiting to run Details Docs / Test Build Docs (push) Waiting to run Details Docs / Build & Deploy Docs (push) Waiting to run Details Lint / Linting Checks (push) Waiting to run Details Tests / vitest (1) (push) Waiting to run Details Tests / vitest (2) (push) Waiting to run Details Tests / vitest (3) (push) Waiting to run Details Tests / vitest (4) (push) Waiting to run Details	2026-09-09 14:45:28 -07:00
github-actions[bot]	574ba2c7cb	New Crowdin translations by GitHub Action (#7090 ) Co-authored-by: Crowdin Bot <support+bot@crowdin.com> Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>	2026-09-09 14:43:53 -07:00
shamoon	f78cab7557	Documentation: update jellyfin versioning	2026-09-09 14:43:02 -07:00
shamoon	2cd77eae1f	Fixhancement: use ghostfolio baseCurrency for net worth (#7116 ) Docker CI / Docker Build & Push (push) Has been cancelled Details Lint / Linting Checks (push) Has been cancelled Details Release Drafter / Update Release Draft (push) Has been cancelled Details Release Drafter / Auto Label PR (push) Has been cancelled Details Tests / vitest (1) (push) Has been cancelled Details Tests / vitest (2) (push) Has been cancelled Details Tests / vitest (3) (push) Has been cancelled Details Tests / vitest (4) (push) Has been cancelled Details	2026-09-08 09:25:58 -07:00
shamoon	6ab83b0b5f	Tweak: handle QL selection without hover (#7105 ) Release Drafter / Auto Label PR (push) Has been cancelled Details Docker CI / Docker Build & Push (push) Has been cancelled Details Lint / Linting Checks (push) Has been cancelled Details Release Drafter / Update Release Draft (push) Has been cancelled Details Tests / vitest (1) (push) Has been cancelled Details Tests / vitest (2) (push) Has been cancelled Details Tests / vitest (3) (push) Has been cancelled Details Tests / vitest (4) (push) Has been cancelled Details	2026-09-06 18:35:01 -07:00
shamoon	9aa5a79c41	Fix: dont fire search on empty field (#7101 ) Release Drafter / Update Release Draft (push) Has been cancelled Details Release Drafter / Auto Label PR (push) Has been cancelled Details Tests / vitest (1) (push) Has been cancelled Details Docker CI / Docker Build & Push (push) Has been cancelled Details Lint / Linting Checks (push) Has been cancelled Details Tests / vitest (2) (push) Has been cancelled Details Tests / vitest (3) (push) Has been cancelled Details Tests / vitest (4) (push) Has been cancelled Details	2026-09-05 16:07:12 -07:00
shamoon	1c2cb76702	Enhancement: render more docker states (#7099 ) Docker CI / Docker Build & Push (push) Has been cancelled Details Lint / Linting Checks (push) Has been cancelled Details Release Drafter / Update Release Draft (push) Has been cancelled Details Release Drafter / Auto Label PR (push) Has been cancelled Details Tests / vitest (1) (push) Has been cancelled Details Tests / vitest (2) (push) Has been cancelled Details Tests / vitest (3) (push) Has been cancelled Details Tests / vitest (4) (push) Has been cancelled Details	2026-09-05 10:24:59 -07:00
shamoon	7de1faa769	Performance: use bulk request for docker stats (#7098 )	2026-09-05 10:08:20 -07:00
shamoon	1024a382ee	Enhancement: allow OIDC auto-login (#7096 )	2026-09-05 08:25:00 -07:00
DaddyBoard	438788240b	Performance: fetch all docker container statuses in one request (#7092 ) Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>	2026-09-05 15:17:52 +00:00
dependabot[bot]	df34927198	Chore(deps): Bump crowdin/github-action from 2.17.1 to 3.0.0 (#7091 ) Docker CI / Docker Build & Push (push) Has been cancelled Details Lint / Linting Checks (push) Has been cancelled Details Release Drafter / Update Release Draft (push) Has been cancelled Details Release Drafter / Auto Label PR (push) Has been cancelled Details Tests / vitest (1) (push) Has been cancelled Details Tests / vitest (2) (push) Has been cancelled Details Tests / vitest (3) (push) Has been cancelled Details Tests / vitest (4) (push) Has been cancelled Details Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-09-05 02:21:31 -07:00
shamoon	ddc5adc91c	Fix: handle literal null from crowdsec api alerts (#7088 ) Docker CI / Docker Build & Push (push) Has been cancelled Details Lint / Linting Checks (push) Has been cancelled Details Release Drafter / Update Release Draft (push) Has been cancelled Details Release Drafter / Auto Label PR (push) Has been cancelled Details Tests / vitest (1) (push) Has been cancelled Details Tests / vitest (2) (push) Has been cancelled Details Tests / vitest (3) (push) Has been cancelled Details Tests / vitest (4) (push) Has been cancelled Details	2026-09-02 12:40:40 -07:00