From 91020ba8edc7342ecd0672f046a84e06b87af4a5 Mon Sep 17 00:00:00 2001
From: Jos Nienhuis <6952249+joszz@users.noreply.github.com>
Date: Sun, 11 Oct 2026 22:52:35 +0200
Subject: [PATCH] feat(notifications): alerts you can trust

Switching a notification type off only hid it in the panel: the server
pushed every alert to every device and the service worker showed them
all. Each subscription now carries the types its device switched off
(new ExcludedCategories column), and the Worker leaves that device out
of the push. The panel still records every alert for everyone.

Settings gains a "Push notifications on this device" switch. Before, a
fresh device only subscribed when the number of unticked types changed,
so turning push on meant unticking and re-ticking a type. The checklist
no longer subscribes or unsubscribes; it only tells the server which
types to leave out, so ticking a box never brings up a permission
prompt. The settings section is now called Notifications.

Tyre and low EV alerts went out every hour while the latest data still
showed the problem, so a car asleep overnight with a soft tyre pushed
all night. Level alerts now go out once per report, judged by the
gateway's own poll stamps, so a replayed message cannot re-arm them.

New alerts, all switchable per device:
- Low 12V battery: below AUX_BATTERY_LOW_VOLT (12.0 V) on several polls
  in a row while parked.
- Low fuel: below LOW_FUEL_PERCENT (15 %), hybrids and plug-in hybrids.
- No data from the car: nothing reported for STALE_DATA_HOURS (48).
- MG sign-in failed: the gateway's account/lastLoginError, once per
  outage (until the next account/lastLogin). Account topics were dropped
  before any handler saw them; MqttTopicParser now parses them.

LOW_EV_PERCENT (20) replaces the hardcoded low EV level. Zero switches
any of these alerts off. The variables are in compose, .env.example,
CONFIGURATION.md, the README and the Unraid template.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .env.example                                  |  10 +
 README.md                                     |  10 +-
 docker-compose.yml                            |   5 +
 documentation/CONFIGURATION.md                |   4 +
 frontend/src/assets/main.css                  |   2 +-
 frontend/src/components/NotificationPanel.vue |   4 +
 frontend/src/components/SettingsToggle.vue    |   2 +
 .../settings/NotificationTypeSettings.vue     |  45 +-
 .../NotificationTypeSettings.spec.ts          |  29 +-
 .../__tests__/useNotificationPushSync.spec.ts | 164 ++-
 .../src/composables/__tests__/usePush.spec.ts |  69 +-
 .../composables/useNotificationPushSync.ts    |  54 +-
 frontend/src/composables/usePush.ts           |  34 +-
 frontend/src/locales/en.json                  |  14 +-
 frontend/src/locales/nl.json                  |  14 +-
 frontend/src/plugins/icons.ts                 |   1 +
 frontend/src/services/pushApi.ts              |   9 +-
 .../__tests__/notificationCategories.spec.ts  |   8 +-
 frontend/src/utils/levels.ts                  |   3 +-
 frontend/src/utils/notificationCategories.ts  |  16 +-
 .../Endpoints/PushEndpoints.cs                |  21 +-
 .../Configuration/AlertThresholds.cs          |  18 +
 .../Configuration/EnvironmentAliases.cs       |   6 +
 .../Configuration/HostingExtensions.cs        |  33 +-
 .../Models/NotificationCategories.cs          |  38 +
 .../Models/PushSubscription.cs                |   6 +
 src/GarageStack.Data/AppDbContext.cs          |   2 +
 .../NotificationHistoryExtensions.cs          |   5 +-
 ...SubscriptionExcludedCategories.Designer.cs | 985 ++++++++++++++++++
 ...6_AddPushSubscriptionExcludedCategories.cs |  30 +
 .../Migrations/AppDbContextModelSnapshot.cs   |   7 +
 .../AccountStatusHandlerTests.cs              | 110 ++
 .../HostingExtensionsTests.cs                 |  20 +
 src/GarageStack.Tests/MqttTopicParserTests.cs |  18 +
 .../NotificationCategoriesTests.cs            |  53 +
 .../PushNotificationCheckServiceTests.cs      | 244 ++++-
 .../PushSubscriptionUpsertTests.cs            |  42 +
 .../Mqtt/AccountStatusHandler.cs              |  89 ++
 .../Mqtt/MqttConsumerService.cs               |   4 +-
 src/GarageStack.Worker/Mqtt/MqttMessage.cs    |   3 +
 .../Mqtt/MqttTopicParser.cs                   |  20 +
 src/GarageStack.Worker/Program.cs             |   1 +
 .../Resources/NotificationStrings.nl.resx     |  24 +
 .../Resources/NotificationStrings.resx        |  24 +
 .../Services/PushNotificationCheckService.cs  |  93 +-
 .../Services/PushSenderService.cs             |   6 +-
 unraid/garagestack.xml                        |  44 +
 47 files changed, 2244 insertions(+), 199 deletions(-)
 create mode 100644 src/GarageStack.Core/Configuration/AlertThresholds.cs
 create mode 100644 src/GarageStack.Data/Migrations/20261011201756_AddPushSubscriptionExcludedCategories.Designer.cs
 create mode 100644 src/GarageStack.Data/Migrations/20261011201756_AddPushSubscriptionExcludedCategories.cs
 create mode 100644 src/GarageStack.Tests/AccountStatusHandlerTests.cs
 create mode 100644 src/GarageStack.Tests/NotificationCategoriesTests.cs
 create mode 100644 src/GarageStack.Worker/Mqtt/AccountStatusHandler.cs

diff --git a/.env.example b/.env.example
index 0884ff09..63646936 100644
--- a/.env.example
+++ b/.env.example
@@ -228,6 +228,16 @@ OPENCHARGEMAP_API_KEY=
 # TYRE_PRESSURE_GOOD_BAR=2.6
 # TYRE_PRESSURE_HIGH_BAR=3.2
 
+# ── Alert levels ───────────────────────────────────────────────────────────────
+# When the low 12V battery, low fuel, low EV battery and "no data from the car"
+# notifications fire. The defaults match the dashboard's own warning colours.
+# 0 switches an alert off. STALE_DATA_HOURS should stay above the gateway's poll
+# of a sleeping car (once a day by default).
+# AUX_BATTERY_LOW_VOLT=12.0
+# LOW_FUEL_PERCENT=15
+# LOW_EV_PERCENT=20
+# STALE_DATA_HOURS=48
+
 # ── High-voltage battery capacity ──────────────────────────────────────────────
 # Usable capacity of the traction battery, in kWh. The MQTT gateway does not read
 # this off the pack: it scales the BMS percentage by an EV-sized default, so the
diff --git a/README.md b/README.md
index 685661fd..c96bff00 100644
--- a/README.md
+++ b/README.md
@@ -309,14 +309,18 @@ Telemetry older than a year is folded into one row per quarter of an hour, so th
 
 ## Push notifications
 
-GarageStack checks your vehicle's state every 5 minutes and sends both a browser push notification and an in-app notification (bell icon) when any of the following conditions are detected. "Engine started" and MG app messages go out the moment they arrive over MQTT instead. Each alert has a 1-hour cooldown per vehicle to avoid repeated notifications.
+GarageStack checks your vehicle's state every 5 minutes and sends both a browser push notification and an in-app notification (bell icon) when any of the following conditions are detected. "Engine started", MG app messages and a failed MG sign-in go out the moment they arrive over MQTT instead. Each alert has a 1-hour cooldown per vehicle to avoid repeated notifications, and goes out once per report from the car: a car that sleeps for days with a soft tyre is reported once, not every hour.
 
 | Alert | Condition |
 | ------- | --------- |
 | Engine started | Engine transitions from off to running |
 | Low tyre pressure | Any tyre below `TYRE_PRESSURE_LOW_BAR` (default 2.2 bar) |
 | High tyre pressure | Any tyre above `TYRE_PRESSURE_HIGH_BAR` (default 3.2 bar) |
-| Low EV battery | EV state-of-charge below 20 % (plug-in vehicles) |
+| Low EV battery | EV state-of-charge below `LOW_EV_PERCENT` (default 20 %, plug-in vehicles) |
+| Low fuel | Fuel level below `LOW_FUEL_PERCENT` (default 15 %, hybrids and plug-in hybrids) |
+| Low 12V battery | 12V battery below `AUX_BATTERY_LOW_VOLT` (default 12.0 V) on several polls in a row while the engine is off |
+| No data from the car | Nothing reported for `STALE_DATA_HOURS` (default 48 hours): the MG session, the gateway or the car's connection needs a look |
+| MG sign-in failed | The gateway could not sign in to the MG account, so no new data arrives (sent once per outage, as it happens) |
 | Car left unlocked | `doors/locked = false` while engine is off |
 | Door left open | Any door, boot, or bonnet open while engine is off |
 | Window left open | Any window open while engine is off |
@@ -327,7 +331,7 @@ GarageStack checks your vehicle's state every 5 minutes and sends both a browser
 
 Push notifications require VAPID keys to be configured (`VAPID_PUBLIC_KEY` / `VAPID_PRIVATE_KEY`). Without them, alerts still appear in the in-app notification panel. While GarageStack is open in a browser that allowed notifications but is not subscribed to push, the same alerts show up as system notifications too; a subscribed browser gets them through push instead, so nothing arrives twice.
 
-Settings has a per-type checklist for these alerts, which offers only the types the car's drivetrain can produce: the two plug-in alerts (low EV battery, charging complete) are left out for a plain hybrid. Deselecting every type offered unsubscribes the browser from push entirely; selecting one again resubscribes.
+Settings has a push switch for the device you are on and a per-type checklist for these alerts, which offers only the types the car's drivetrain can produce: the two plug-in alerts (low EV battery, charging complete) are left out for a plain hybrid. Both are kept per device: a type switched off on your phone still reaches your laptop, and still shows up in the notification panel. Only the switch turns push on or off; the checklist never asks the browser for permission.
 
 Notification texts are written by the background worker, which has no browser to take a language from, so their language is a deployment setting: `NOTIFICATION_LANGUAGE=en` (default) or `nl`. The web UI's own language toggle does not affect them.
 
diff --git a/docker-compose.yml b/docker-compose.yml
index caea2003..c7303ed9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -119,6 +119,11 @@ services:
       NOTIFICATION_LANGUAGE: "${NOTIFICATION_LANGUAGE:-}"
       # Days of telemetry kept at full detail before the Worker compacts it. See .env.example.
       TELEMETRY_FULL_DETAIL_DAYS: "${TELEMETRY_FULL_DETAIL_DAYS:-}"
+      # When the Worker's level alerts fire. See .env.example.
+      AUX_BATTERY_LOW_VOLT: "${AUX_BATTERY_LOW_VOLT:-}"
+      LOW_FUEL_PERCENT: "${LOW_FUEL_PERCENT:-}"
+      LOW_EV_PERCENT: "${LOW_EV_PERCENT:-}"
+      STALE_DATA_HOURS: "${STALE_DATA_HOURS:-}"
     volumes:
       - worker_logs:/app/logs
 
diff --git a/documentation/CONFIGURATION.md b/documentation/CONFIGURATION.md
index 8da7cbb1..91492dac 100644
--- a/documentation/CONFIGURATION.md
+++ b/documentation/CONFIGURATION.md
@@ -96,6 +96,10 @@ The full guide, with provider examples, is [`AUTHENTICATION.md`](AUTHENTICATION.
 | Variable | Default | What it does |
 | --- | --- | --- |
 | `TYRE_PRESSURE_LOW_BAR` / `TYRE_PRESSURE_GOOD_BAR` / `TYRE_PRESSURE_HIGH_BAR` | `2.2` / `2.6` / `3.2` | Tyre pressure bands in bar, for the diagram's colours and the tyre notifications. Set them from your car's placard. |
+| `AUX_BATTERY_LOW_VOLT` | `12.0` | 12V battery voltage a parked car is warned below, once several polls in a row show it. `0` switches the alert off. |
+| `LOW_FUEL_PERCENT` | `15` | Fuel level, in percent, a hybrid or plug-in hybrid is warned below. `0` switches the alert off. |
+| `LOW_EV_PERCENT` | `20` | Charge level, in percent, a plug-in car is warned below. `0` switches the alert off. |
+| `STALE_DATA_HOURS` | `48` | Hours without a report from the car before GarageStack warns that data has stopped arriving. Keep it above the gateway's poll of a sleeping car, once a day by default. `0` switches the alert off. |
 | `HV_BATTERY_CAPACITY_KWH` | none | Usable size of the traction battery in kWh. The gateway assumes an EV-sized pack, so its kWh figures are far too large on a plain hybrid (an MG HS Hybrid+ carries 1.83 and is reported as 72.5). Empty keeps the gateway's figure on a plug-in car and shows a hybrid's charge as a percentage only. |
 
 ## Stored data
diff --git a/frontend/src/assets/main.css b/frontend/src/assets/main.css
index 0329c715..9d64ad42 100644
--- a/frontend/src/assets/main.css
+++ b/frontend/src/assets/main.css
@@ -1528,7 +1528,7 @@ textarea.form-control {
 /* Own internal scroll so a long category list never pushes the rest of the settings modal's
    sections down. minmax(170px, 1fr) against .detail-modal's actual width budget: the mobile
    bottom-sheet content is ~300-335px wide -> 1 column; the desktop dialog is capped at
-   max-width: 440px -> 2 columns, where all 9 categories fit in 5 rows with no scrollbar at all.
+   max-width: 440px -> 2 columns, where the up to 15 categories take 8 rows and scroll a little.
    max-height keeps the 1-column mobile case to ~5-6 visible rows before scrolling. */
 .notif-type-checklist {
   display: grid;
diff --git a/frontend/src/components/NotificationPanel.vue b/frontend/src/components/NotificationPanel.vue
index 02fd0aeb..8f53e101 100644
--- a/frontend/src/components/NotificationPanel.vue
+++ b/frontend/src/components/NotificationPanel.vue
@@ -19,6 +19,10 @@ const CATEGORY_ICONS: Record<string, string[]> = {
   'windows-open-parked': ['fas', 'wind'],
   'vehicle-message': ['fas', 'message'],
   'climate-schedule': ['fas', 'calendar-days'],
+  'low-12v': ['fas', 'car-battery'],
+  'low-fuel': ['fas', 'gas-pump'],
+  'gateway-login': ['fas', 'triangle-exclamation'],
+  'data-stale': ['fas', 'clock'],
 }
 
 function categoryIcon(category: string | null): string[] {
diff --git a/frontend/src/components/SettingsToggle.vue b/frontend/src/components/SettingsToggle.vue
index d1582ac3..00b180c1 100644
--- a/frontend/src/components/SettingsToggle.vue
+++ b/frontend/src/components/SettingsToggle.vue
@@ -5,6 +5,7 @@ defineProps<{
   inputId?: string
   /** FontAwesome icon shown before the label. */
   icon?: string
+  disabled?: boolean
 }>()
 
 const model = defineModel<boolean>()
@@ -31,6 +32,7 @@ const model = defineModel<boolean>()
             type="checkbox"
             role="switch"
             :aria-label="label"
+            :disabled="disabled"
           />
         </div>
       </slot>
diff --git a/frontend/src/components/settings/NotificationTypeSettings.vue b/frontend/src/components/settings/NotificationTypeSettings.vue
index ddc43d6b..d8abbc4a 100644
--- a/frontend/src/components/settings/NotificationTypeSettings.vue
+++ b/frontend/src/components/settings/NotificationTypeSettings.vue
@@ -4,17 +4,23 @@ import { useI18n } from 'vue-i18n'
 import { useUiSettingsStore } from '@/stores/settingsUi'
 import { useVehicleStore } from '@/stores/vehicle'
 import { useNotificationPushSync } from '@/composables/useNotificationPushSync'
+import SettingsToggle from '../SettingsToggle.vue'
 import {
   notificationCategoryIdsFor,
   type NotificationCategoryId,
 } from '@/utils/notificationCategories'
 
-// The notification types to show and to be pushed. This also drives the push subscription:
-// deselecting every type unsubscribes, selecting at least one (re)subscribes.
+// Push for this device, and the notification types it shows and gets pushed.
 const { t } = useI18n()
 const settings = useUiSettingsStore()
 const vehicleStore = useVehicleStore()
-const { showPermissionDeniedNotice, showSubscribeFailedNotice } = useNotificationPushSync()
+const {
+  pushSupported,
+  pushEnabled,
+  pushSwitchDisabled,
+  showPermissionDeniedNotice,
+  showSubscribeFailedNotice,
+} = useNotificationPushSync()
 
 const NOTIFICATION_CATEGORY_LABEL_KEYS: Record<NotificationCategoryId, string> = {
   'low-tyre': 'lowTyre',
@@ -27,6 +33,10 @@ const NOTIFICATION_CATEGORY_LABEL_KEYS: Record<NotificationCategoryId, string> =
   'windows-open-parked': 'windowsOpenParked',
   'vehicle-message': 'vehicleMessage',
   'climate-schedule': 'climateSchedule',
+  'low-12v': 'low12v',
+  'low-fuel': 'lowFuel',
+  'gateway-login': 'gatewayLogin',
+  'data-stale': 'dataStale',
   maintenance: 'maintenance',
 }
 
@@ -67,6 +77,24 @@ function toggleNotificationType(id: NotificationCategoryId, checked: boolean) {
 </script>
 
 <template>
+  <div v-if="pushSupported" class="settings-toggles">
+    <SettingsToggle
+      v-model="pushEnabled"
+      :label="t('push.enable')"
+      :desc="t('push.enableDesc')"
+      :disabled="pushSwitchDisabled"
+      input-id="settings-toggle-push"
+    />
+  </div>
+
+  <div v-if="showPermissionDeniedNotice" class="notif-type-filter__denied text-danger text-sm">
+    {{ t('push.permissionDenied') }}
+  </div>
+
+  <div v-else-if="showSubscribeFailedNotice" class="notif-type-filter__denied text-danger text-sm">
+    {{ t('push.subscribeFailed') }}
+  </div>
+
   <div class="notif-type-filter">
     <div class="notif-type-filter__header">
       <div class="settings-toggle__info">
@@ -91,17 +119,6 @@ function toggleNotificationType(id: NotificationCategoryId, checked: boolean) {
       </div>
     </div>
 
-    <div v-if="showPermissionDeniedNotice" class="notif-type-filter__denied text-danger text-sm">
-      {{ t('push.permissionDenied') }}
-    </div>
-
-    <div
-      v-else-if="showSubscribeFailedNotice"
-      class="notif-type-filter__denied text-danger text-sm"
-    >
-      {{ t('push.subscribeFailed') }}
-    </div>
-
     <div class="notif-type-checklist">
       <label
         v-for="opt in notificationTypeOptions"
diff --git a/frontend/src/components/settings/__tests__/NotificationTypeSettings.spec.ts b/frontend/src/components/settings/__tests__/NotificationTypeSettings.spec.ts
index 313337a2..c62b3b47 100644
--- a/frontend/src/components/settings/__tests__/NotificationTypeSettings.spec.ts
+++ b/frontend/src/components/settings/__tests__/NotificationTypeSettings.spec.ts
@@ -14,8 +14,13 @@ vi.mock('@/stores/settingsUi', () => ({
   useUiSettingsStore: () => ({ notificationTypeExclusions: [] }),
 }))
 
+const pushSupported = vi.hoisted(() => ({ value: true }))
+
 vi.mock('@/composables/useNotificationPushSync', () => ({
   useNotificationPushSync: () => ({
+    pushSupported: pushSupported.value,
+    pushEnabled: ref(false),
+    pushSwitchDisabled: ref(false),
     showPermissionDeniedNotice: ref(false),
     showSubscribeFailedNotice: ref(false),
   }),
@@ -23,8 +28,12 @@ vi.mock('@/composables/useNotificationPushSync', () => ({
 
 const i18n = createI18n({ legacy: false, locale: 'en', missingWarn: false, fallbackWarn: false })
 
-function labels() {
+function mountSettings() {
   return shallowMount(NotificationTypeSettings, { global: { plugins: [i18n] } })
+}
+
+function labels() {
+  return mountSettings()
     .findAll('.notif-type-checklist__label')
     .map((el) => el.text())
 }
@@ -32,6 +41,7 @@ function labels() {
 describe('NotificationTypeSettings', () => {
   beforeEach(() => {
     vehicleType.value = 'unknown'
+    pushSupported.value = true
   })
 
   it('hides the charging notification types for a hybrid', () => {
@@ -48,4 +58,21 @@ describe('NotificationTypeSettings', () => {
     expect(labels()).toContain('notifications.categories.chargingComplete')
     expect(labels()).toContain('notifications.categories.lowEv')
   })
+
+  it('hides low fuel for a BEV', () => {
+    vehicleType.value = 'bev'
+
+    expect(labels()).not.toContain('notifications.categories.lowFuel')
+    expect(labels()).toContain('notifications.categories.low12v')
+  })
+
+  it('offers the push switch where the browser supports push', () => {
+    expect(mountSettings().findComponent({ name: 'SettingsToggle' }).exists()).toBe(true)
+  })
+
+  it('leaves the push switch out where the browser has no push', () => {
+    pushSupported.value = false
+
+    expect(mountSettings().findComponent({ name: 'SettingsToggle' }).exists()).toBe(false)
+  })
 })
diff --git a/frontend/src/composables/__tests__/useNotificationPushSync.spec.ts b/frontend/src/composables/__tests__/useNotificationPushSync.spec.ts
index eb6696b2..a9410172 100644
--- a/frontend/src/composables/__tests__/useNotificationPushSync.spec.ts
+++ b/frontend/src/composables/__tests__/useNotificationPushSync.spec.ts
@@ -1,28 +1,33 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest'
 import { ref, nextTick } from 'vue'
 import { setActivePinia, createPinia } from 'pinia'
-import {
-  NOTIFICATION_CATEGORY_IDS,
-  notificationCategoryIdsFor,
-} from '@/utils/notificationCategories'
 
 const mockTogglePush = vi.fn<() => Promise<void>>()
+const mockSyncExclusions = vi.fn<() => Promise<void>>()
 const mockPushState = ref<'unknown' | 'subscribed' | 'unsubscribed' | 'denied'>('unknown')
+const mockPushError = ref(false)
 let mockPushSupported = true
-
-const mockVehicle = vi.hoisted(() => ({ effectiveVehicleType: 'unknown' as string }))
+let passedOptions: { excludedCategories?: () => readonly string[] } | undefined
 
 vi.mock('@/composables/usePush', () => ({
-  usePush: () => ({
-    pushSupported: mockPushSupported,
-    pushState: mockPushState,
-    togglePush: mockTogglePush,
-  }),
+  usePush: (options?: { excludedCategories?: () => readonly string[] }) => {
+    passedOptions = options
+    return {
+      pushSupported: mockPushSupported,
+      pushState: mockPushState,
+      pushError: mockPushError,
+      togglePush: mockTogglePush,
+      syncExclusions: mockSyncExclusions,
+    }
+  },
 }))
 
-vi.mock('@/stores/vehicle', () => ({
-  useVehicleStore: () => mockVehicle,
-}))
+async function setUp() {
+  const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
+  const { useUiSettingsStore } = await import('@/stores/settingsUi')
+  const sync = useNotificationPushSync()
+  return { sync, settings: useUiSettingsStore() }
+}
 
 describe('useNotificationPushSync', () => {
   beforeEach(() => {
@@ -30,123 +35,103 @@ describe('useNotificationPushSync', () => {
     setActivePinia(createPinia())
     localStorage.clear()
     mockTogglePush.mockReset()
+    mockSyncExclusions.mockReset()
     mockPushState.value = 'unknown'
+    mockPushError.value = false
     mockPushSupported = true
-    mockVehicle.effectiveVehicleType = 'unknown'
+    passedOptions = undefined
   })
 
-  it('does not call togglePush on initial mount, even if desired state disagrees with actual state', async () => {
+  it('switching push on subscribes, the one way a permission prompt can come up', async () => {
     mockPushState.value = 'unsubscribed'
-    const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
-    useNotificationPushSync()
-    await nextTick()
+    const { sync } = await setUp()
 
-    expect(mockTogglePush).not.toHaveBeenCalled()
+    sync.pushEnabled.value = true
+
+    expect(mockTogglePush).toHaveBeenCalledOnce()
   })
 
-  it('calls togglePush on the very first checklist interaction, regardless of which box', async () => {
-    mockPushState.value = 'unsubscribed'
-    const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
-    const { useUiSettingsStore } = await import('@/stores/settingsUi')
-    useNotificationPushSync()
-    const settings = useUiSettingsStore()
+  it('switching push off unsubscribes', async () => {
+    mockPushState.value = 'subscribed'
+    const { sync } = await setUp()
 
-    settings.notificationTypeExclusions = ['low-tyre']
-    await nextTick()
+    sync.pushEnabled.value = false
 
     expect(mockTogglePush).toHaveBeenCalledOnce()
   })
 
-  it('does not call togglePush again for changes that keep the same exclusion count', async () => {
+  it('reads as on only while subscribed', async () => {
+    const { sync } = await setUp()
+
     mockPushState.value = 'subscribed'
-    const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
-    const { useUiSettingsStore } = await import('@/stores/settingsUi')
-    useNotificationPushSync()
-    const settings = useUiSettingsStore()
+    expect(sync.pushEnabled.value).toBe(true)
+    mockPushState.value = 'unsubscribed'
+    expect(sync.pushEnabled.value).toBe(false)
+  })
+
+  it.each(['unknown', 'denied'] as const)('disables the switch while push is %s', async (state) => {
+    mockPushState.value = state
+    const { sync } = await setUp()
+
+    expect(sync.pushSwitchDisabled.value).toBe(true)
+  })
+
+  it('never subscribes or unsubscribes from the checklist', async () => {
+    mockPushState.value = 'unsubscribed'
+    const { settings } = await setUp()
 
     settings.notificationTypeExclusions = ['low-tyre']
     await nextTick()
-    settings.notificationTypeExclusions = ['engine-start']
-    await nextTick()
-    settings.notificationTypeExclusions = ['low-tyre', 'engine-start']
+    settings.notificationTypeExclusions = []
     await nextTick()
 
     expect(mockTogglePush).not.toHaveBeenCalled()
   })
 
-  it('calls togglePush to unsubscribe when deselecting every type', async () => {
+  it('tells the server whenever a different set of types is switched off', async () => {
     mockPushState.value = 'subscribed'
-    const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
-    const { useUiSettingsStore } = await import('@/stores/settingsUi')
-    useNotificationPushSync()
-    const settings = useUiSettingsStore()
+    const { settings } = await setUp()
 
-    settings.notificationTypeExclusions = [...NOTIFICATION_CATEGORY_IDS]
+    settings.notificationTypeExclusions = ['low-tyre']
+    await nextTick()
+    settings.notificationTypeExclusions = ['engine-start']
     await nextTick()
 
-    expect(mockTogglePush).toHaveBeenCalledOnce()
+    expect(mockSyncExclusions).toHaveBeenCalledTimes(2)
   })
 
-  it('calls togglePush to resubscribe when selecting at least one type after deselect-all', async () => {
+  it('leaves the server alone when the same types arrive in another order', async () => {
     localStorage.setItem(
       'garagestack-settings-ui',
-      JSON.stringify({ notificationTypeExclusions: [...NOTIFICATION_CATEGORY_IDS] }),
+      JSON.stringify({ notificationTypeExclusions: ['engine-start', 'low-tyre'] }),
     )
-    mockPushState.value = 'unsubscribed'
-    const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
-    const { useUiSettingsStore } = await import('@/stores/settingsUi')
-    useNotificationPushSync()
-    const settings = useUiSettingsStore()
-
-    settings.notificationTypeExclusions = []
-    await nextTick()
+    const { settings } = await setUp()
 
-    expect(mockTogglePush).toHaveBeenCalledOnce()
-  })
-
-  it('unsubscribes a hybrid once every type it is offered is deselected', async () => {
-    mockVehicle.effectiveVehicleType = 'hev'
-    mockPushState.value = 'subscribed'
-    const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
-    const { useUiSettingsStore } = await import('@/stores/settingsUi')
-    useNotificationPushSync()
-    const settings = useUiSettingsStore()
-
-    // Short of the full category list: a hybrid is never offered the charging types
-    settings.notificationTypeExclusions = [...notificationCategoryIdsFor('hev')]
+    settings.notificationTypeExclusions = ['low-tyre', 'engine-start']
     await nextTick()
 
-    expect(mockTogglePush).toHaveBeenCalledOnce()
+    expect(mockSyncExclusions).not.toHaveBeenCalled()
   })
 
-  it('does not call togglePush while pushState is denied', async () => {
-    mockPushState.value = 'denied'
-    const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
-    const { useUiSettingsStore } = await import('@/stores/settingsUi')
-    useNotificationPushSync()
-    const settings = useUiSettingsStore()
+  it('hands usePush the checklist, so every registration carries it', async () => {
+    const { settings } = await setUp()
 
-    settings.notificationTypeExclusions = ['low-tyre']
-    await nextTick()
+    settings.notificationTypeExclusions = ['maintenance']
 
-    expect(mockTogglePush).not.toHaveBeenCalled()
+    expect(passedOptions?.excludedCategories?.()).toEqual(['maintenance'])
   })
 
   it('registers no push side effects when pushSupported is false', async () => {
     mockPushSupported = false
-    const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
-    const { useUiSettingsStore } = await import('@/stores/settingsUi')
-    useNotificationPushSync()
-    const settings = useUiSettingsStore()
+    const { settings } = await setUp()
 
-    settings.notificationTypeExclusions = [...NOTIFICATION_CATEGORY_IDS]
+    settings.notificationTypeExclusions = ['low-tyre']
     await nextTick()
 
-    expect(mockTogglePush).not.toHaveBeenCalled()
+    expect(mockSyncExclusions).not.toHaveBeenCalled()
   })
 
   it('showPermissionDeniedNotice is true only when push is supported and permission was denied', async () => {
-    mockPushSupported = true
     mockPushState.value = 'denied'
     const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
     expect(useNotificationPushSync().showPermissionDeniedNotice.value).toBe(true)
@@ -158,17 +143,4 @@ describe('useNotificationPushSync', () => {
     mockPushState.value = 'denied'
     expect(useNotificationPushSync().showPermissionDeniedNotice.value).toBe(false)
   })
-
-  it('still attempts togglePush on first interaction if pushState is still unknown (async initPushState race)', async () => {
-    mockPushState.value = 'unknown'
-    const { useNotificationPushSync } = await import('@/composables/useNotificationPushSync')
-    const { useUiSettingsStore } = await import('@/stores/settingsUi')
-    useNotificationPushSync()
-    const settings = useUiSettingsStore()
-
-    settings.notificationTypeExclusions = ['low-tyre']
-    await nextTick()
-
-    expect(mockTogglePush).toHaveBeenCalledOnce()
-  })
 })
diff --git a/frontend/src/composables/__tests__/usePush.spec.ts b/frontend/src/composables/__tests__/usePush.spec.ts
index 55cee639..05154ef0 100644
--- a/frontend/src/composables/__tests__/usePush.spec.ts
+++ b/frontend/src/composables/__tests__/usePush.spec.ts
@@ -2,12 +2,12 @@ import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest'
 import { defineComponent, h, nextTick } from 'vue'
 import { mount } from '@vue/test-utils'
 import { pushApi } from '@/services/pushApi'
-import { usePush } from '@/composables/usePush'
+import { usePush, type UsePushOptions } from '@/composables/usePush'
 
 vi.mock('@/services/pushApi', () => ({
   pushApi: {
     getVapidPublicKey: vi.fn<() => Promise<{ publicKey: string }>>(),
-    subscribe: vi.fn<(e: string, p: string, a: string) => Promise<void>>(),
+    subscribe: vi.fn<(e: string, p: string, a: string, x?: readonly string[]) => Promise<void>>(),
     unsubscribe: vi.fn<(e: string) => Promise<void>>(),
   },
 }))
@@ -41,12 +41,12 @@ function setPermission(permission: NotificationPermission) {
 
 // usePush registers initPushState with onMounted, so the composable has to run inside a real
 // component for the load-time path to be exercised at all.
-function mountUsePush() {
+function mountUsePush(options?: UsePushOptions) {
   const state: { api: ReturnType<typeof usePush> | null } = { api: null }
   const wrapper = mount(
     defineComponent({
       setup() {
-        state.api = usePush()
+        state.api = usePush(options)
         return () => h('div')
       },
     }),
@@ -95,7 +95,12 @@ describe('usePush on load', () => {
     const { api } = mountUsePush()
     await flush()
 
-    expect(subscribeMock).toHaveBeenCalledWith('https://push.example/abc', 'p256dh-key', 'auth-key')
+    expect(subscribeMock).toHaveBeenCalledWith(
+      'https://push.example/abc',
+      'p256dh-key',
+      'auth-key',
+      undefined,
+    )
     expect(pushManager.subscribe).not.toHaveBeenCalled()
     expect(api().pushState.value).toBe('subscribed')
   })
@@ -111,7 +116,12 @@ describe('usePush on load', () => {
     await flush()
 
     expect(pushManager.subscribe).toHaveBeenCalledOnce()
-    expect(subscribeMock).toHaveBeenCalledWith('https://push.example/abc', 'p256dh-key', 'auth-key')
+    expect(subscribeMock).toHaveBeenCalledWith(
+      'https://push.example/abc',
+      'p256dh-key',
+      'auth-key',
+      undefined,
+    )
     expect(api().pushState.value).toBe('subscribed')
   })
 
@@ -172,6 +182,7 @@ describe('usePush on load', () => {
       'https://push.example/fresh',
       'p256dh-key',
       'auth-key',
+      undefined,
     )
     expect(api().pushState.value).toBe('subscribed')
   })
@@ -228,6 +239,7 @@ describe('usePush togglePush', () => {
       'https://push.example/abc',
       'p256dh-key',
       'auth-key',
+      undefined,
     )
     expect(api().pushState.value).toBe('subscribed')
     expect(api().pushError.value).toBe(false)
@@ -249,3 +261,48 @@ describe('usePush togglePush', () => {
     expect(api().pushState.value).toBe('unsubscribed')
   })
 })
+
+describe('usePush and the types this device switched off', () => {
+  it('sends them along whenever the subscription is registered', async () => {
+    pushManager.getSubscription.mockResolvedValue(makeSubscription())
+    setPermission('granted')
+
+    mountUsePush({ excludedCategories: () => ['engine-start'] })
+    await flush()
+
+    expect(subscribeMock).toHaveBeenCalledWith(
+      'https://push.example/abc',
+      'p256dh-key',
+      'auth-key',
+      ['engine-start'],
+    )
+  })
+
+  it('registers the subscription again when they change', async () => {
+    pushManager.getSubscription.mockResolvedValue(makeSubscription())
+    setPermission('granted')
+    let excluded = ['engine-start']
+
+    const { api } = mountUsePush({ excludedCategories: () => excluded })
+    await flush()
+    excluded = ['engine-start', 'maintenance']
+    await api().syncExclusions()
+
+    expect(subscribeMock).toHaveBeenLastCalledWith(
+      'https://push.example/abc',
+      'p256dh-key',
+      'auth-key',
+      ['engine-start', 'maintenance'],
+    )
+  })
+
+  it('leaves the server alone while this device is not subscribed', async () => {
+    setPermission('default')
+
+    const { api } = mountUsePush({ excludedCategories: () => ['engine-start'] })
+    await flush()
+    await api().syncExclusions()
+
+    expect(subscribeMock).not.toHaveBeenCalled()
+  })
+})
diff --git a/frontend/src/composables/useNotificationPushSync.ts b/frontend/src/composables/useNotificationPushSync.ts
index b5a3fe24..7954db5d 100644
--- a/frontend/src/composables/useNotificationPushSync.ts
+++ b/frontend/src/composables/useNotificationPushSync.ts
@@ -1,43 +1,45 @@
 import { computed, watch } from 'vue'
 import { useUiSettingsStore } from '@/stores/settingsUi'
-import { useVehicleStore } from '@/stores/vehicle'
 import { usePush } from '@/composables/usePush'
-import { notificationCategoryIdsFor } from '@/utils/notificationCategories'
 
-// Keeps the browser push subscription in sync with the notification-type checklist: deselecting
-// every type unsubscribes, (re)selecting at least one type resubscribes. Watching the exclusion
-// count (rather than the array with `deep: true`) means a plain, non-immediate watch never fires
-// on initial mount (no uninvited permission prompt on load), and swapping which single category
-// is excluded is a free no-op since the count doesn't change.
+// Keeps this device's push subscription in step with its settings. The push switch subscribes and
+// unsubscribes; the notification-type checklist only tells the server which types to leave out,
+// so ticking a box never brings up a permission prompt or turns push back on.
 export function useNotificationPushSync() {
   const settings = useUiSettingsStore()
-  const vehicleStore = useVehicleStore()
-  const { pushSupported, pushState, pushError, togglePush } = usePush()
+  const { pushSupported, pushState, pushError, togglePush, syncExclusions } = usePush({
+    excludedCategories: () => settings.notificationTypeExclusions,
+  })
 
   const showPermissionDeniedNotice = computed(() => pushSupported && pushState.value === 'denied')
   const showSubscribeFailedNotice = computed(() => pushSupported && pushError.value)
 
-  // "Every type deselected" is measured against the types the checklist offers for this
-  // drivetrain, not the full category list: a hybrid has no charging switches to turn off, so
-  // waiting for all of them would leave it subscribed however much the user deselects.
-  function allOfferedTypesExcluded() {
-    const excluded = settings.notificationTypeExclusions
-    return notificationCategoryIdsFor(vehicleStore.effectiveVehicleType).every((id) =>
-      excluded.includes(id),
-    )
-  }
+  // Asks for permission the first time it is switched on.
+  const pushEnabled = computed({
+    get: () => pushState.value === 'subscribed',
+    set: (enabled: boolean) => {
+      if (enabled !== (pushState.value === 'subscribed')) void togglePush()
+    },
+  })
+
+  // Nothing to switch while the browser is still being asked what it holds, or once it refused.
+  const pushSwitchDisabled = computed(
+    () => pushState.value === 'unknown' || pushState.value === 'denied',
+  )
 
   if (pushSupported) {
+    // As a sorted string, so only a change in which types are off reaches the server.
     watch(
-      () => settings.notificationTypeExclusions.length,
-      () => {
-        if (pushState.value === 'denied') return
-        const shouldBeSubscribed = !allOfferedTypesExcluded()
-        const isSubscribed = pushState.value === 'subscribed'
-        if (shouldBeSubscribed !== isSubscribed) togglePush()
-      },
+      () => [...settings.notificationTypeExclusions].sort().join(),
+      () => void syncExclusions(),
     )
   }
 
-  return { showPermissionDeniedNotice, showSubscribeFailedNotice }
+  return {
+    pushSupported,
+    pushEnabled,
+    pushSwitchDisabled,
+    showPermissionDeniedNotice,
+    showSubscribeFailedNotice,
+  }
 }
diff --git a/frontend/src/composables/usePush.ts b/frontend/src/composables/usePush.ts
index e097e489..ab957eb1 100644
--- a/frontend/src/composables/usePush.ts
+++ b/frontend/src/composables/usePush.ts
@@ -12,20 +12,31 @@ function urlBase64ToUint8Array(base64String: string): Uint8Array<ArrayBuffer> {
 
 export type PushState = 'unknown' | 'subscribed' | 'unsubscribed' | 'denied'
 
-// Hands a browser subscription to the server. The API upserts on the endpoint, so sending one it
-// already holds is a no-op and this can safely run on every load.
-function registerWithServer(sub: PushSubscription): Promise<void> {
-  const json = sub.toJSON()
-  return pushApi.subscribe(sub.endpoint, json.keys?.['p256dh'] ?? '', json.keys?.['auth'] ?? '')
+export interface UsePushOptions {
+  /** The notification types this device switched off, so the server leaves them out of its pushes. */
+  excludedCategories?: () => readonly string[]
 }
 
-export function usePush() {
+export function usePush(options: UsePushOptions = {}) {
   const pushSupported = 'serviceWorker' in navigator && 'PushManager' in window
   const pushState = ref<PushState>('unknown')
   // Set when an explicit subscribe attempt failed for any reason other than a refused permission.
   // Without it the UI would just show "off" again and give no hint that anything went wrong.
   const pushError = ref(false)
 
+  // Hands a browser subscription to the server, with the types this device switched off. The API
+  // upserts on the endpoint, so sending one it already holds is a no-op and this can safely run on
+  // every load.
+  function registerWithServer(sub: PushSubscription): Promise<void> {
+    const json = sub.toJSON()
+    return pushApi.subscribe(
+      sub.endpoint,
+      json.keys?.['p256dh'] ?? '',
+      json.keys?.['auth'] ?? '',
+      options.excludedCategories?.(),
+    )
+  }
+
   // Subscribes against the server's current VAPID key. A subscription left over from an earlier
   // key pair makes subscribe() reject with InvalidStateError, which would otherwise leave the
   // browser permanently unable to resubscribe: drop that one and retry instead.
@@ -118,7 +129,16 @@ export function usePush() {
     }
   }
 
+  // Tells the server which types this device now switched off. Nothing is surfaced on failure:
+  // every load registers the subscription again, so the server only learns the change later.
+  async function syncExclusions() {
+    if (!pushSupported || pushState.value !== 'subscribed') return
+    const reg = await navigator.serviceWorker.ready
+    const sub = await reg.pushManager.getSubscription()
+    if (sub) await registerWithServer(sub).catch(() => {})
+  }
+
   onMounted(initPushState)
 
-  return { pushSupported, pushState, pushError, togglePush }
+  return { pushSupported, pushState, pushError, togglePush, syncExclusions }
 }
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 380638be..8abd0809 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -324,7 +324,9 @@
   },
   "push": {
     "permissionDenied": "Permission denied, allow notifications in your browser settings",
-    "subscribeFailed": "Could not register for push notifications. Check that the server is reachable, then try again."
+    "subscribeFailed": "Could not register for push notifications. Check that the server is reachable, then try again.",
+    "enable": "Push notifications on this device",
+    "enableDesc": "Alerts arrive as system notifications, even while GarageStack is closed."
   },
   "notifications": {
     "title": "Notifications",
@@ -342,7 +344,7 @@
     "minutesAgo": "{n} min ago",
     "hoursAgo": "{n}h ago",
     "typeFilter": "Type filter",
-    "typeFilterDesc": "Choose which notification types to show and receive push alerts for. Deselect all to turn push notifications off completely.",
+    "typeFilterDesc": "Choose which notification types this device shows and gets pushed.",
     "selectAll": "Select all",
     "deselectAll": "Deselect all",
     "categories": {
@@ -356,7 +358,11 @@
       "windowsOpenParked": "Windows open while parked",
       "vehicleMessage": "MG app messages",
       "climateSchedule": "Scheduled climate",
-      "maintenance": "Maintenance reminders"
+      "maintenance": "Maintenance reminders",
+      "low12v": "Low 12V battery",
+      "lowFuel": "Low fuel",
+      "gatewayLogin": "MG sign-in failed",
+      "dataStale": "No data from the car"
     }
   },
   "auth": {
@@ -454,7 +460,7 @@
       "bev": "BEV (Full Electric)"
     },
     "notificationTypes": {
-      "title": "Notification types"
+      "title": "Notifications"
     },
     "units": {
       "title": "Region and units",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index dc4a18f8..914ba3bd 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -324,7 +324,9 @@
   },
   "push": {
     "permissionDenied": "Toestemming geweigerd, sta meldingen toe in je browserinstellingen",
-    "subscribeFailed": "Aanmelden voor pushmeldingen is mislukt. Controleer of de server bereikbaar is en probeer het opnieuw."
+    "subscribeFailed": "Aanmelden voor pushmeldingen is mislukt. Controleer of de server bereikbaar is en probeer het opnieuw.",
+    "enable": "Pushmeldingen op dit apparaat",
+    "enableDesc": "Meldingen komen binnen als systeemmelding, ook als GarageStack gesloten is."
   },
   "notifications": {
     "title": "Meldingen",
@@ -342,7 +344,7 @@
     "minutesAgo": "{n} min geleden",
     "hoursAgo": "{n}u geleden",
     "typeFilter": "Typefilter",
-    "typeFilterDesc": "Kies voor welke meldingstypen je meldingen in de app en pushmeldingen wilt ontvangen. Deselecteer alles om pushmeldingen volledig uit te schakelen.",
+    "typeFilterDesc": "Kies welke meldingstypen dit apparaat toont en als pushmelding krijgt.",
     "selectAll": "Alles selecteren",
     "deselectAll": "Alles deselecteren",
     "categories": {
@@ -356,7 +358,11 @@
       "windowsOpenParked": "Raam open terwijl geparkeerd",
       "vehicleMessage": "Berichten uit de MG-app",
       "climateSchedule": "Geplande klimaatregeling",
-      "maintenance": "Onderhoudsherinneringen"
+      "maintenance": "Onderhoudsherinneringen",
+      "low12v": "Lage 12V-accu",
+      "lowFuel": "Weinig brandstof",
+      "gatewayLogin": "Inloggen bij MG mislukt",
+      "dataStale": "Geen data van de auto"
     }
   },
   "auth": {
@@ -454,7 +460,7 @@
       "bev": "BEV (Volledig elektrisch)"
     },
     "notificationTypes": {
-      "title": "Meldingstypen"
+      "title": "Meldingen"
     },
     "units": {
       "title": "Regio en eenheden",
diff --git a/frontend/src/plugins/icons.ts b/frontend/src/plugins/icons.ts
index e064c1a6..ad8fe7d2 100644
--- a/frontend/src/plugins/icons.ts
+++ b/frontend/src/plugins/icons.ts
@@ -22,6 +22,7 @@ export {
   faCalendarDays,
   faCamera,
   faCar,
+  faCarBattery,
   faCarBurst,
   faCarRear,
   faCarSide,
diff --git a/frontend/src/services/pushApi.ts b/frontend/src/services/pushApi.ts
index 28529ab1..af1005a8 100644
--- a/frontend/src/services/pushApi.ts
+++ b/frontend/src/services/pushApi.ts
@@ -2,7 +2,12 @@ import { request, send } from '@/services/apiCore'
 
 export const pushApi = {
   getVapidPublicKey: () => request<{ publicKey: string }>('/api/push/vapid-public-key'),
-  subscribe: (endpoint: string, p256DhKey: string, authKey: string) =>
-    send('/api/push/subscribe', 'POST', { endpoint, p256DhKey, authKey }),
+  // Left out, excludedCategories keeps whatever the server holds for this subscription.
+  subscribe: (
+    endpoint: string,
+    p256DhKey: string,
+    authKey: string,
+    excludedCategories?: readonly string[],
+  ) => send('/api/push/subscribe', 'POST', { endpoint, p256DhKey, authKey, excludedCategories }),
   unsubscribe: (endpoint: string) => send('/api/push/unsubscribe', 'POST', { endpoint }),
 }
diff --git a/frontend/src/utils/__tests__/notificationCategories.spec.ts b/frontend/src/utils/__tests__/notificationCategories.spec.ts
index ef02c353..681d98a8 100644
--- a/frontend/src/utils/__tests__/notificationCategories.spec.ts
+++ b/frontend/src/utils/__tests__/notificationCategories.spec.ts
@@ -41,7 +41,13 @@ describe('notificationCategoryIdsFor', () => {
     },
   )
 
-  it.each(['phev', 'bev', 'unknown'] as const)('offers every category for %s', (type) => {
+  it('drops low fuel for a BEV, keeping the order of the rest', () => {
+    expect(notificationCategoryIdsFor('bev')).toEqual(
+      NOTIFICATION_CATEGORY_IDS.filter((id) => id !== 'low-fuel'),
+    )
+  })
+
+  it.each(['phev', 'unknown'] as const)('offers every category for %s', (type) => {
     expect(notificationCategoryIdsFor(type)).toEqual([...NOTIFICATION_CATEGORY_IDS])
   })
 })
diff --git a/frontend/src/utils/levels.ts b/frontend/src/utils/levels.ts
index 203b615f..abf15030 100644
--- a/frontend/src/utils/levels.ts
+++ b/frontend/src/utils/levels.ts
@@ -1,7 +1,8 @@
 /**
  * How a tank or battery level reads at a glance. Every place that colours a level goes through
  * here, so the dashboard card and the car diagram cannot disagree about when a battery counts as
- * low. The battery's danger line matches the Worker's low-battery notification (below 20 %).
+ * low. The danger lines match the Worker's default notification levels (LOW_FUEL_PERCENT and
+ * LOW_EV_PERCENT), which a deployment can move.
  */
 export type LevelVariant = 'success' | 'warning' | 'danger'
 
diff --git a/frontend/src/utils/notificationCategories.ts b/frontend/src/utils/notificationCategories.ts
index cd318510..5fead0b5 100644
--- a/frontend/src/utils/notificationCategories.ts
+++ b/frontend/src/utils/notificationCategories.ts
@@ -1,5 +1,5 @@
 import type { VehicleType } from '@/services/vehicleApi'
-import { mayPlugIn } from '@/utils/vehicleType'
+import { mayBurnFuel, mayPlugIn } from '@/utils/vehicleType'
 
 export const NOTIFICATION_CATEGORY_IDS = [
   'low-tyre',
@@ -12,6 +12,10 @@ export const NOTIFICATION_CATEGORY_IDS = [
   'windows-open-parked',
   'vehicle-message',
   'climate-schedule',
+  'low-12v',
+  'low-fuel',
+  'gateway-login',
+  'data-stale',
   'maintenance',
 ] as const
 
@@ -22,6 +26,9 @@ export type NotificationCategoryId = (typeof NOTIFICATION_CATEGORY_IDS)[number]
 // plain hybrid these are checklist rows that can never match a notification.
 const PLUG_IN_ONLY_CATEGORY_IDS: readonly NotificationCategoryId[] = ['low-ev', 'charging-complete']
 
+// The Worker's CheckFuelLevel only runs for a car with a combustion engine.
+const FUEL_ONLY_CATEGORY_IDS: readonly NotificationCategoryId[] = ['low-fuel']
+
 /**
  * The categories worth offering for a drivetrain. 'unknown' keeps the full list: while detection
  * is still pending, hiding a type the car does support is worse than offering one it doesn't.
@@ -29,8 +36,11 @@ const PLUG_IN_ONLY_CATEGORY_IDS: readonly NotificationCategoryId[] = ['low-ev',
 export function notificationCategoryIdsFor(
   vehicleType: VehicleType,
 ): readonly NotificationCategoryId[] {
-  if (mayPlugIn(vehicleType)) return NOTIFICATION_CATEGORY_IDS
-  return NOTIFICATION_CATEGORY_IDS.filter((id) => !PLUG_IN_ONLY_CATEGORY_IDS.includes(id))
+  return NOTIFICATION_CATEGORY_IDS.filter(
+    (id) =>
+      (mayPlugIn(vehicleType) || !PLUG_IN_ONLY_CATEGORY_IDS.includes(id)) &&
+      (mayBurnFuel(vehicleType) || !FUEL_ONLY_CATEGORY_IDS.includes(id)),
+  )
 }
 
 // Maintenance notifications carry a dynamic per-item suffix (maintenance-<id>) rather than a
diff --git a/src/GarageStack.Api/Endpoints/PushEndpoints.cs b/src/GarageStack.Api/Endpoints/PushEndpoints.cs
index 3b766ee7..c610a531 100644
--- a/src/GarageStack.Api/Endpoints/PushEndpoints.cs
+++ b/src/GarageStack.Api/Endpoints/PushEndpoints.cs
@@ -63,15 +63,23 @@ internal static async Task UpsertSubscriptionAsync(
         var existing = await db.PushSubscriptions
             .FirstOrDefaultAsync(s => s.Endpoint == req.Endpoint, ct);
 
+        // A request without the list comes from a page that predates it: it says nothing about
+        // which types the device wants, so whatever the row holds stays.
+        var excluded = req.ExcludedCategories is { } requested ? KnownGroups(requested) : null;
+
         if (existing is not null)
         {
-            // Keys are rewritten only when they actually changed, so the common case (the same
+            // Rewritten only when something actually changed, so the common case (the same
             // subscription arriving again on the next load) costs one read and no write at all.
-            if (existing.P256DhKey == req.P256DhKey && existing.AuthKey == req.AuthKey)
+            var keysChanged = existing.P256DhKey != req.P256DhKey || existing.AuthKey != req.AuthKey;
+            var exclusionsChanged = excluded is not null && !excluded.SequenceEqual(existing.ExcludedCategories);
+            if (!keysChanged && !exclusionsChanged)
                 return;
 
             existing.P256DhKey = req.P256DhKey;
             existing.AuthKey = req.AuthKey;
+            if (excluded is not null)
+                existing.ExcludedCategories = excluded;
             await db.SaveChangesAsync(ct);
             return;
         }
@@ -81,6 +89,7 @@ internal static async Task UpsertSubscriptionAsync(
             Endpoint = req.Endpoint,
             P256DhKey = req.P256DhKey,
             AuthKey = req.AuthKey,
+            ExcludedCategories = excluded ?? [],
         });
 
         try
@@ -100,7 +109,13 @@ internal static async Task UpsertSubscriptionAsync(
             if (!raced) throw;
         }
     }
+
+    // Only the types the checklist offers, once each and in one order, so an unchanged list
+    // compares equal to the stored one whatever order the page sent it in.
+    private static List<string> KnownGroups(IEnumerable<string> requested) =>
+        [.. requested.Where(NotificationCategories.Groups.Contains).Distinct().Order(StringComparer.Ordinal)];
 }
 
-public record PushSubscribeRequest(string Endpoint, string P256DhKey, string AuthKey);
+// ExcludedCategories: the notification types this device switched off. Null leaves the stored list as it is.
+public record PushSubscribeRequest(string Endpoint, string P256DhKey, string AuthKey, IReadOnlyList<string>? ExcludedCategories = null);
 public record PushUnsubscribeRequest(string Endpoint);
diff --git a/src/GarageStack.Core/Configuration/AlertThresholds.cs b/src/GarageStack.Core/Configuration/AlertThresholds.cs
new file mode 100644
index 00000000..af34cef9
--- /dev/null
+++ b/src/GarageStack.Core/Configuration/AlertThresholds.cs
@@ -0,0 +1,18 @@
+namespace GarageStack.Core.Configuration;
+
+/// <summary>
+/// When the Worker's level alerts fire. The defaults match the dashboard's own warning colours, so
+/// a card turns red about when its alert goes out. Zero switches an alert off: no reading is below
+/// zero, and no car is ever silent for zero hours.
+/// </summary>
+/// <param name="AuxBatteryLowVolt">The 12V battery voltage a parked car is warned below.</param>
+/// <param name="LowFuelPercent">The fuel level a car that burns fuel is warned below.</param>
+/// <param name="LowEvPercent">The charge level a plug-in is warned below.</param>
+/// <param name="StaleDataHours">How long the car may go without reporting before that is an alert.</param>
+public record AlertThresholds(double AuxBatteryLowVolt, double LowFuelPercent, double LowEvPercent, double StaleDataHours)
+{
+    // The gateway polls a sleeping car once a day by default, so two days of silence means at
+    // least one of those polls failed rather than a quiet car.
+    public static readonly AlertThresholds Default = new(
+        AuxBatteryLowVolt: 12.0, LowFuelPercent: 15, LowEvPercent: 20, StaleDataHours: 48);
+}
diff --git a/src/GarageStack.Core/Configuration/EnvironmentAliases.cs b/src/GarageStack.Core/Configuration/EnvironmentAliases.cs
index e72fc9ae..1175c6ee 100644
--- a/src/GarageStack.Core/Configuration/EnvironmentAliases.cs
+++ b/src/GarageStack.Core/Configuration/EnvironmentAliases.cs
@@ -34,6 +34,12 @@ public static class EnvironmentAliases
         ["TYRE_PRESSURE_HIGH_BAR"] = "TyrePressure:HighBar",
         ["HV_BATTERY_CAPACITY_KWH"] = "HvBattery:CapacityKwh",
 
+        // When the Worker's level alerts fire.
+        ["AUX_BATTERY_LOW_VOLT"] = "Alerts:AuxBatteryLowVolt",
+        ["LOW_FUEL_PERCENT"] = "Alerts:LowFuelPercent",
+        ["LOW_EV_PERCENT"] = "Alerts:LowEvPercent",
+        ["STALE_DATA_HOURS"] = "Alerts:StaleDataHours",
+
         // How much detail old telemetry keeps.
         ["TELEMETRY_FULL_DETAIL_DAYS"] = "TelemetryRetention:FullDetailDays",
 
diff --git a/src/GarageStack.Core/Configuration/HostingExtensions.cs b/src/GarageStack.Core/Configuration/HostingExtensions.cs
index 41eb1880..706bb767 100644
--- a/src/GarageStack.Core/Configuration/HostingExtensions.cs
+++ b/src/GarageStack.Core/Configuration/HostingExtensions.cs
@@ -61,16 +61,33 @@ public static IServiceCollection AddTyrePressureThresholds(
         var defaults = TyrePressureThresholds.Default;
 
         return services.AddSingleton(new TyrePressureThresholds(
-            Value(section, "LowBar", defaults.LowBar),
-            Value(section, "GoodBar", defaults.GoodBar),
-            Value(section, "HighBar", defaults.HighBar)));
-
-        static double Value(IConfiguration section, string key, double fallback) =>
-            double.TryParse(section[key], NumberStyles.Float, CultureInfo.InvariantCulture, out var parsed)
-                ? parsed
-                : fallback;
+            DoubleOrDefault(section, "LowBar", defaults.LowBar),
+            DoubleOrDefault(section, "GoodBar", defaults.GoodBar),
+            DoubleOrDefault(section, "HighBar", defaults.HighBar)));
     }
 
+    /// <summary>
+    /// The levels the Worker's alerts fire at, from configuration, falling back per value to
+    /// <see cref="AlertThresholds.Default"/>.
+    /// </summary>
+    public static IServiceCollection AddAlertThresholds(
+        this IServiceCollection services, IConfiguration configuration)
+    {
+        var section = configuration.GetSection("Alerts");
+        var defaults = AlertThresholds.Default;
+
+        return services.AddSingleton(new AlertThresholds(
+            DoubleOrDefault(section, "AuxBatteryLowVolt", defaults.AuxBatteryLowVolt),
+            DoubleOrDefault(section, "LowFuelPercent", defaults.LowFuelPercent),
+            DoubleOrDefault(section, "LowEvPercent", defaults.LowEvPercent),
+            DoubleOrDefault(section, "StaleDataHours", defaults.StaleDataHours)));
+    }
+
+    private static double DoubleOrDefault(IConfiguration section, string key, double fallback) =>
+        double.TryParse(section[key], NumberStyles.Float, CultureInfo.InvariantCulture, out var parsed)
+            ? parsed
+            : fallback;
+
     /// <summary>
     /// The traction battery's real capacity from configuration, or
     /// <see cref="HvBatteryCapacity.Unknown"/> when the deployment has not said. A value of zero
diff --git a/src/GarageStack.Core/Models/NotificationCategories.cs b/src/GarageStack.Core/Models/NotificationCategories.cs
index 39cb6ac3..19a7ab02 100644
--- a/src/GarageStack.Core/Models/NotificationCategories.cs
+++ b/src/GarageStack.Core/Models/NotificationCategories.cs
@@ -19,9 +19,47 @@ public static class NotificationCategories
     public const string VehicleMessage = "vehicle-message";
     // A climate schedule started climate, or could not.
     public const string ClimateSchedule = "climate-schedule";
+    public const string Low12V = "low-12v";
+    public const string LowFuel = "low-fuel";
+    // The gateway could not sign in to the MG account, so no data arrives until it can.
+    public const string GatewayLogin = "gateway-login";
+    // The car has not reported for longer than it should.
+    public const string DataStale = "data-stale";
+
+    // What the maintenance categories below are grouped as wherever the user picks types.
+    public const string Maintenance = "maintenance";
 
     /// <summary>Maintenance categories carry the item id so one item's alert cannot suppress another's.</summary>
     public static string MaintenanceOverdue(int itemId) => $"maintenance-overdue-{itemId}";
 
     public static string MaintenanceDueSoon(int itemId) => $"maintenance-due-soon-{itemId}";
+
+    /// <summary>The types a user can switch off, as the frontend's notification checklist offers them.</summary>
+    public static readonly IReadOnlySet<string> Groups = new HashSet<string>(StringComparer.Ordinal)
+    {
+        LowTyre, HighTyre, LowEv, ChargingComplete, EngineStart, UnlockedParked, DoorsOpenParked,
+        WindowsOpenParked, VehicleMessage, ClimateSchedule, Low12V, LowFuel, GatewayLogin, DataStale,
+        Maintenance,
+    };
+
+    /// <summary>
+    /// The type <paramref name="category"/> is switched off as: itself, or "maintenance" for the
+    /// per-item maintenance categories. Mirrors notificationCategoryId in the frontend.
+    /// </summary>
+    public static string? GroupOf(string? category) =>
+        category switch
+        {
+            null => null,
+            _ when category.StartsWith(Maintenance + "-", StringComparison.Ordinal) => Maintenance,
+            _ when Groups.Contains(category) => category,
+            _ => null,
+        };
+
+    /// <summary>
+    /// Whether a device that switched off <paramref name="excludedGroups"/> still wants a
+    /// <paramref name="category"/> notification. One without a known type always goes out: the
+    /// checklist offers no way to switch it off.
+    /// </summary>
+    public static bool IsWanted(string? category, IReadOnlyCollection<string> excludedGroups) =>
+        GroupOf(category) is not { } group || !excludedGroups.Contains(group);
 }
diff --git a/src/GarageStack.Core/Models/PushSubscription.cs b/src/GarageStack.Core/Models/PushSubscription.cs
index 0475d6aa..50ba5f13 100644
--- a/src/GarageStack.Core/Models/PushSubscription.cs
+++ b/src/GarageStack.Core/Models/PushSubscription.cs
@@ -7,4 +7,10 @@ public class PushSubscription
     public string P256DhKey { get; set; } = string.Empty;
     public string AuthKey { get; set; } = string.Empty;
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+
+    /// <summary>
+    /// The notification types this device switched off (<see cref="NotificationCategories.Groups"/>).
+    /// The checklist is kept per device, so each browser's subscription carries its own.
+    /// </summary>
+    public List<string> ExcludedCategories { get; set; } = [];
 }
diff --git a/src/GarageStack.Data/AppDbContext.cs b/src/GarageStack.Data/AppDbContext.cs
index c4e5f4ff..aafc6719 100644
--- a/src/GarageStack.Data/AppDbContext.cs
+++ b/src/GarageStack.Data/AppDbContext.cs
@@ -77,6 +77,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             e.HasKey(p => p.Id);
             e.HasIndex(p => p.Endpoint).IsUnique();
+            // Subscriptions from before devices could switch types off want every type.
+            e.PrimitiveCollection(p => p.ExcludedCategories).HasDefaultValueSql("'{}'::text[]");
         });
 
         modelBuilder.Entity<AppNotification>(e =>
diff --git a/src/GarageStack.Data/Extensions/NotificationHistoryExtensions.cs b/src/GarageStack.Data/Extensions/NotificationHistoryExtensions.cs
index 550188f7..ac0f66a5 100644
--- a/src/GarageStack.Data/Extensions/NotificationHistoryExtensions.cs
+++ b/src/GarageStack.Data/Extensions/NotificationHistoryExtensions.cs
@@ -6,12 +6,13 @@ public static class NotificationHistoryExtensions
 {
     /// <summary>
     /// Checks whether an <c>AppNotification</c> matching <paramref name="category"/> and
-    /// <paramref name="vehicleId"/> was created after <paramref name="cutoff"/> - the standard
+    /// <paramref name="vehicleId"/> (null for one about the MG account rather than a car) was
+    /// created after <paramref name="cutoff"/> - the standard
     /// "is this a duplicate" query behind <c>NotificationCooldownGate.ShouldNotifyAsync</c>'s
     /// DB fallback, kept here in one place so both notification-check services query it the
     /// same way.
     /// </summary>
     public static Task<bool> WasNotificationSentSinceAsync(
-        this AppDbContext db, string category, int vehicleId, DateTime cutoff, CancellationToken ct = default) =>
+        this AppDbContext db, string category, int? vehicleId, DateTime cutoff, CancellationToken ct = default) =>
         db.AppNotifications.AnyAsync(n => n.Category == category && n.VehicleId == vehicleId && n.CreatedAt > cutoff, ct);
 }
diff --git a/src/GarageStack.Data/Migrations/20261011201756_AddPushSubscriptionExcludedCategories.Designer.cs b/src/GarageStack.Data/Migrations/20261011201756_AddPushSubscriptionExcludedCategories.Designer.cs
new file mode 100644
index 00000000..851dc3ab
--- /dev/null
+++ b/src/GarageStack.Data/Migrations/20261011201756_AddPushSubscriptionExcludedCategories.Designer.cs
@@ -0,0 +1,985 @@
+// <auto-generated />
+using System;
+using System.Collections.Generic;
+using GarageStack.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace GarageStack.Data.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20261011201756_AddPushSubscriptionExcludedCategories")]
+    partial class AddPushSubscriptionExcludedCategories
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "10.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("GarageStack.Core.Models.AppNotification", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int?>("VehicleId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedAt");
+
+                    b.HasIndex("IsDeleted", "CreatedAt");
+
+                    b.ToTable("AppNotifications");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.ClimateSchedule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Days")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastRunAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("LastRunDetail")
+                        .HasMaxLength(300)
+                        .HasColumnType("character varying(300)");
+
+                    b.Property<string>("LastRunFailedCommand")
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("LastRunOutcome")
+                        .HasMaxLength(24)
+                        .HasColumnType("character varying(24)");
+
+                    b.Property<string>("Mode")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("NextRunUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double?>("OnlyAboveC")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("OnlyBelowC")
+                        .HasColumnType("double precision");
+
+                    b.Property<bool>("RearDefroster")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("SeatLeftLevel")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("SeatRightLevel")
+                        .HasColumnType("integer");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time without time zone");
+
+                    b.Property<int>("TemperatureC")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("TimeZoneId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<int>("VehicleId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Version")
+                        .IsConcurrencyToken()
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("VehicleId");
+
+                    b.ToTable("ClimateSchedules");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.GeocodeCacheEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CachedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("CellLat")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("CellLng")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("City")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)");
+
+                    b.Property<string>("CountryCode")
+                        .HasMaxLength(8)
+                        .HasColumnType("character varying(8)");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(300)
+                        .HasColumnType("character varying(300)");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("HouseNumber")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)");
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasMaxLength(8)
+                        .HasColumnType("character varying(8)");
+
+                    b.Property<string>("Postcode")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)");
+
+                    b.Property<string>("Precision")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)");
+
+                    b.Property<string>("Road")
+                        .HasMaxLength(120)
+                        .HasColumnType("character varying(120)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExpiresAt")
+                        .HasDatabaseName("IX_GeocodeCacheEntries_ExpiresAt");
+
+                    b.HasIndex("Precision", "Language", "CellLat", "CellLng")
+                        .IsUnique()
+                        .HasDatabaseName("IX_GeocodeCacheEntries_Precision_Language_CellLatLng");
+
+                    b.ToTable("GeocodeCacheEntries");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.MaintenanceItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double?>("IntervalKm")
+                        .HasColumnType("double precision");
+
+                    b.Property<int?>("IntervalMonths")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("LastServiceDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double?>("LastServiceOdometerKm")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<int>("VehicleId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("VehicleId");
+
+                    b.ToTable("MaintenanceItems");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.MaintenanceLogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("MaintenanceItemId")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<double?>("OdometerKm")
+                        .HasColumnType("double precision");
+
+                    b.Property<DateTime>("PerformedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MaintenanceItemId", "PerformedAt");
+
+                    b.ToTable("MaintenanceLogEntries");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.MapMatchCacheEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CachedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double>("MatchedKm")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("PointIndexesJson")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Provider")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("Shape")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SpeedLimitRunsJson")
+                        .HasColumnType("text");
+
+                    b.Property<string>("TraceHash")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExpiresAt")
+                        .HasDatabaseName("IX_MapMatchCacheEntries_ExpiresAt");
+
+                    b.HasIndex("Provider", "TraceHash")
+                        .IsUnique()
+                        .HasDatabaseName("IX_MapMatchCacheEntries_Provider_TraceHash");
+
+                    b.ToTable("MapMatchCacheEntries");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.PoiCacheTile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CachedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("CellLat")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("CellLng")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("ExpiresAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("PoiType")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExpiresAt")
+                        .HasDatabaseName("IX_PoiCacheTiles_ExpiresAt");
+
+                    b.HasIndex("Source", "PoiType", "CellLat", "CellLng")
+                        .IsUnique()
+                        .HasDatabaseName("IX_PoiCacheTiles_Source_PoiType_CellLatLng");
+
+                    b.ToTable("PoiCacheTiles");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.PoiItem", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<string>("Brand")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<int>("CellLat")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("CellLng")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ExternalId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<double>("Latitude")
+                        .HasColumnType("double precision");
+
+                    b.Property<double>("Longitude")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("MetaJson")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PoiType")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("character varying(32)");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Source", "ExternalId")
+                        .IsUnique()
+                        .HasDatabaseName("IX_PoiItems_Source_ExternalId");
+
+                    b.HasIndex("Source", "PoiType", "Brand")
+                        .HasDatabaseName("IX_PoiItems_Source_PoiType_Brand");
+
+                    b.HasIndex("Source", "PoiType", "CellLat", "CellLng")
+                        .HasDatabaseName("IX_PoiItems_Source_PoiType_CellLatLng");
+
+                    b.HasIndex("Source", "PoiType", "Latitude", "Longitude")
+                        .HasDatabaseName("IX_PoiItems_Source_PoiType_LatLon");
+
+                    b.ToTable("PoiItems");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.PushSubscription", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AuthKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Endpoint")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.PrimitiveCollection<List<string>>("ExcludedCategories")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text[]")
+                        .HasDefaultValueSql("'{}'::text[]");
+
+                    b.Property<string>("P256DhKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Endpoint")
+                        .IsUnique();
+
+                    b.ToTable("PushSubscriptions");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.RevokedToken", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("ExpiresAtUtc")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Jti")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Jti")
+                        .IsUnique();
+
+                    b.ToTable("RevokedTokens");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.TelemetrySnapshot", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<bool?>("BatteryHeating")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("BatteryHeatingScheduleMode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BatteryHeatingScheduleStartTime")
+                        .HasColumnType("text");
+
+                    b.Property<double?>("BatteryVoltage")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("BmsChargeStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("BonnetOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("ChargerConnected")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("ChargingCableLock")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("ChargingLastEndAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ChargingScheduleEndTime")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChargingScheduleMode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChargingScheduleStartTime")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChargingType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClimateMode")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("ClimateOn")
+                        .HasColumnType("boolean");
+
+                    b.Property<double?>("CurrentJourneyDistance")
+                        .HasColumnType("double precision");
+
+                    b.Property<bool?>("DriverDoorOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("DriverWindowOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<double?>("ElectricRangeKm")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("Elevation")
+                        .HasColumnType("double precision");
+
+                    b.Property<bool?>("EngineRunning")
+                        .HasColumnType("boolean");
+
+                    b.Property<double?>("EvSocPercent")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("ExteriorTemperature")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("FuelLevelPercent")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("FuelRangeKm")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("Heading")
+                        .HasColumnType("double precision");
+
+                    b.Property<int?>("HeatedSeatFrontLeft")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("HeatedSeatFrontRight")
+                        .HasColumnType("integer");
+
+                    b.Property<bool?>("HvBatteryActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<double?>("HvCurrent")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("HvPower")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("HvSocKwh")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("HvTotalCapacityKwh")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("HvVoltage")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("InteriorTemperature")
+                        .HasColumnType("double precision");
+
+                    b.Property<bool?>("IsAvailable")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("IsCharging")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("IsLocked")
+                        .HasColumnType("boolean");
+
+                    b.Property<double?>("LastChargeEndingPower")
+                        .HasColumnType("double precision");
+
+                    b.Property<DateTime?>("LastChargeStateAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("LastVehicleStateAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double?>("Latitude")
+                        .HasColumnType("double precision");
+
+                    b.Property<bool?>("LightsDippedBeam")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("LightsMainBeam")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("LightsSide")
+                        .HasColumnType("boolean");
+
+                    b.Property<double?>("Longitude")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("MileageOfTheDay")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("MileageSinceLastCharge")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("ObcCurrent")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("ObcPowerSinglePhase")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("ObcPowerThreePhase")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("ObcVoltage")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("OdometerKm")
+                        .HasColumnType("double precision");
+
+                    b.Property<int?>("OffboardChargerPlugStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("OnboardChargerPlugStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<bool?>("PassengerDoorOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("PassengerWindowOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<double?>("PowerUsageOfDay")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("PowerUsageSinceLastCharge")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("RawTopic")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RearLeftDoorOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("RearLeftWindowOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("RearRightDoorOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("RearRightWindowOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("RearWindowDefroster")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime>("RecordedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int?>("RemainingChargingTime")
+                        .HasColumnType("integer");
+
+                    b.Property<double?>("RemoteTemperature")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("Speed")
+                        .HasColumnType("double precision");
+
+                    b.Property<bool?>("SunRoofOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool?>("TrunkOpen")
+                        .HasColumnType("boolean");
+
+                    b.Property<double?>("TyrePressureFrontLeft")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("TyrePressureFrontRight")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("TyrePressureRearLeft")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("TyrePressureRearRight")
+                        .HasColumnType("double precision");
+
+                    b.Property<int>("VehicleId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("VehicleId", "RecordedAt");
+
+                    b.HasIndex("VehicleId", "Latitude", "Longitude", "RecordedAt")
+                        .HasDatabaseName("IX_TelemetrySnapshots_VehicleId_LatLon_RecordedAt")
+                        .HasFilter("\"Latitude\" IS NOT NULL AND \"Longitude\" IS NOT NULL");
+
+                    b.HasIndex(new[] { "VehicleId", "RecordedAt" }, "IX_TelemetrySnapshots_VehicleId_RecordedAt_Schedule")
+                        .HasFilter("\"ChargingScheduleMode\" IS NOT NULL OR \"ChargingScheduleStartTime\" IS NOT NULL OR \"ChargingScheduleEndTime\" IS NOT NULL OR \"BatteryHeatingScheduleMode\" IS NOT NULL OR \"BatteryHeatingScheduleStartTime\" IS NOT NULL");
+
+                    b.ToTable("TelemetrySnapshots");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.Trip", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<double>("DistanceKm")
+                        .HasColumnType("double precision");
+
+                    b.Property<double>("EndLatitude")
+                        .HasColumnType("double precision");
+
+                    b.Property<double>("EndLongitude")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("EndPlaceJson")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("EndedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Notes")
+                        .HasMaxLength(500)
+                        .HasColumnType("character varying(500)");
+
+                    b.Property<double?>("OdometerEndKm")
+                        .HasColumnType("double precision");
+
+                    b.Property<double?>("OdometerStartKm")
+                        .HasColumnType("double precision");
+
+                    b.Property<int>("PointCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PointsJson")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Purpose")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)");
+
+                    b.Property<double>("StartLatitude")
+                        .HasColumnType("double precision");
+
+                    b.Property<double>("StartLongitude")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("StartPlaceJson")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("StartedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("VehicleId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("VehicleId", "StartedAt")
+                        .IsUnique();
+
+                    b.ToTable("Trips");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.UserSettings", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<string>("AccountKey")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Section")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Version")
+                        .IsConcurrencyToken()
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountKey", "Section")
+                        .IsUnique();
+
+                    b.ToTable("UserSettings");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.Vehicle", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ConfigJson")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("LastMessageId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTime?>("LastParkedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Model")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SaicUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Series")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("TelemetryCompactedUntil")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("TripsRecordedUntil")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Vin")
+                        .IsRequired()
+                        .HasMaxLength(17)
+                        .HasColumnType("character varying(17)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Vin")
+                        .IsUnique();
+
+                    b.ToTable("Vehicles");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.ClimateSchedule", b =>
+                {
+                    b.HasOne("GarageStack.Core.Models.Vehicle", "Vehicle")
+                        .WithMany()
+                        .HasForeignKey("VehicleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Vehicle");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.MaintenanceItem", b =>
+                {
+                    b.HasOne("GarageStack.Core.Models.Vehicle", "Vehicle")
+                        .WithMany()
+                        .HasForeignKey("VehicleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Vehicle");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.MaintenanceLogEntry", b =>
+                {
+                    b.HasOne("GarageStack.Core.Models.MaintenanceItem", "MaintenanceItem")
+                        .WithMany("LogEntries")
+                        .HasForeignKey("MaintenanceItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MaintenanceItem");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.TelemetrySnapshot", b =>
+                {
+                    b.HasOne("GarageStack.Core.Models.Vehicle", "Vehicle")
+                        .WithMany("TelemetrySnapshots")
+                        .HasForeignKey("VehicleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Vehicle");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.Trip", b =>
+                {
+                    b.HasOne("GarageStack.Core.Models.Vehicle", "Vehicle")
+                        .WithMany()
+                        .HasForeignKey("VehicleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Vehicle");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.MaintenanceItem", b =>
+                {
+                    b.Navigation("LogEntries");
+                });
+
+            modelBuilder.Entity("GarageStack.Core.Models.Vehicle", b =>
+                {
+                    b.Navigation("TelemetrySnapshots");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/GarageStack.Data/Migrations/20261011201756_AddPushSubscriptionExcludedCategories.cs b/src/GarageStack.Data/Migrations/20261011201756_AddPushSubscriptionExcludedCategories.cs
new file mode 100644
index 00000000..d1488665
--- /dev/null
+++ b/src/GarageStack.Data/Migrations/20261011201756_AddPushSubscriptionExcludedCategories.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace GarageStack.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddPushSubscriptionExcludedCategories : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<List<string>>(
+                name: "ExcludedCategories",
+                table: "PushSubscriptions",
+                type: "text[]",
+                nullable: false,
+                defaultValueSql: "'{}'::text[]");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ExcludedCategories",
+                table: "PushSubscriptions");
+        }
+    }
+}
diff --git a/src/GarageStack.Data/Migrations/AppDbContextModelSnapshot.cs b/src/GarageStack.Data/Migrations/AppDbContextModelSnapshot.cs
index 218d2c59..70d5782e 100644
--- a/src/GarageStack.Data/Migrations/AppDbContextModelSnapshot.cs
+++ b/src/GarageStack.Data/Migrations/AppDbContextModelSnapshot.cs
@@ -1,5 +1,6 @@
 // <auto-generated />
 using System;
+using System.Collections.Generic;
 using GarageStack.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -463,6 +464,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.PrimitiveCollection<List<string>>("ExcludedCategories")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text[]")
+                        .HasDefaultValueSql("'{}'::text[]");
+
                     b.Property<string>("P256DhKey")
                         .IsRequired()
                         .HasColumnType("text");
diff --git a/src/GarageStack.Tests/AccountStatusHandlerTests.cs b/src/GarageStack.Tests/AccountStatusHandlerTests.cs
new file mode 100644
index 00000000..a966df66
--- /dev/null
+++ b/src/GarageStack.Tests/AccountStatusHandlerTests.cs
@@ -0,0 +1,110 @@
+using GarageStack.Core.Models;
+using GarageStack.Data;
+using GarageStack.Worker.Mqtt;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace GarageStack.Tests;
+
+// The gateway publishes the time of each failed sign-in on account/lastLoginError (retained) and
+// tries again every fifteen minutes. The user should hear about an outage once.
+public sealed class AccountStatusHandlerTests : IDisposable
+{
+    private static readonly DateTimeOffset Now = new(2026, 10, 11, 20, 0, 0, TimeSpan.Zero);
+    private const string Prefix = "saic/user@example.com/account/";
+
+    private readonly ServiceProvider _services;
+    private readonly FakePushSender _push = new();
+    private readonly AccountStatusHandler _handler;
+
+    public AccountStatusHandlerTests()
+    {
+        var root = new InMemoryDatabaseRoot();
+        var name = Guid.NewGuid().ToString();
+        _services = new ServiceCollection()
+            .AddDbContext<AppDbContext>(o => o.UseInMemoryDatabase(name, root))
+            .BuildServiceProvider();
+        _handler = new AccountStatusHandler(
+            NullLogger.Instance,
+            _services.GetRequiredService<IServiceScopeFactory>(),
+            _push,
+            WorkerLocalizer.Notifications(),
+            new FixedTimeProvider(Now));
+    }
+
+    public void Dispose() => _services.Dispose();
+
+    private Task<bool> ReceiveAsync(string subtopic, string payload, bool retained = false) =>
+        _handler.TryHandleAsync(new MqttMessage(Prefix + subtopic, payload, retained), TestContext.Current.CancellationToken);
+
+    private async Task AlreadyAlertedAtAsync(DateTimeOffset at)
+    {
+        using var scope = _services.CreateScope();
+        var db = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+        db.AppNotifications.Add(new AppNotification
+        {
+            Title = "MG sign-in failed",
+            Category = NotificationCategories.GatewayLogin,
+            CreatedAt = at.UtcDateTime,
+        });
+        await db.SaveChangesAsync(TestContext.Current.CancellationToken);
+    }
+
+    [Fact]
+    public async Task FailedSignIn_SendsTheAlert()
+    {
+        var claimed = await ReceiveAsync("lastLoginError", "2026-10-11T19:59:00+00:00");
+
+        Assert.True(claimed);
+        Assert.Equal(NotificationCategories.GatewayLogin, Assert.Single(_push.Sent).Category);
+    }
+
+    // Retained: the broker's copy of an old failure, replayed when the Worker subscribes.
+    [Fact]
+    public async Task RetainedFailure_SendsNothing()
+    {
+        await ReceiveAsync("lastLoginError", "2026-10-01T08:00:00+00:00", retained: true);
+
+        Assert.Empty(_push.Sent);
+    }
+
+    [Fact]
+    public async Task RetryInTheSameOutage_SendsNothingMore()
+    {
+        await ReceiveAsync("lastLogin", "2026-10-11T10:00:00+00:00", retained: true);
+        await AlreadyAlertedAtAsync(Now.AddMinutes(-15));
+
+        await ReceiveAsync("lastLoginError", "2026-10-11T19:59:00+00:00");
+
+        Assert.Empty(_push.Sent);
+    }
+
+    // The gateway signed in again after the last alert, so this failure starts a new outage.
+    [Fact]
+    public async Task FailureAfterTheGatewaySignedInAgain_SendsTheAlert()
+    {
+        await AlreadyAlertedAtAsync(Now.AddDays(-2));
+        await ReceiveAsync("lastLogin", "2026-10-10T09:00:00+00:00");
+
+        await ReceiveAsync("lastLoginError", "2026-10-11T19:59:00+00:00");
+
+        Assert.Single(_push.Sent);
+    }
+
+    [Fact]
+    public void OutageStart_WithoutAKnownSignIn_LooksBackOneDay()
+    {
+        Assert.Equal((Now - AccountStatusHandler.UnknownLoginWindow).UtcDateTime, _handler.OutageStart("user@example.com"));
+    }
+
+    [Fact]
+    public async Task OtherAccountTopics_AreLeftForTheNextHandler()
+    {
+        Assert.False(await ReceiveAsync("gatewayVersion", "0.12.0"));
+        Assert.False(await _handler.TryHandleAsync(
+            new MqttMessage("saic/user/vehicles/FAKEVN00000000001/drivetrain/soc", "80", false),
+            TestContext.Current.CancellationToken));
+    }
+}
diff --git a/src/GarageStack.Tests/HostingExtensionsTests.cs b/src/GarageStack.Tests/HostingExtensionsTests.cs
index 62ea0af4..0955519e 100644
--- a/src/GarageStack.Tests/HostingExtensionsTests.cs
+++ b/src/GarageStack.Tests/HostingExtensionsTests.cs
@@ -70,6 +70,26 @@ public void TyrePressureThresholds_ReadsDecimalsThesameWayInEveryLocale()
         }
     }
 
+    private static AlertThresholds ResolveAlerts(IConfiguration configuration) =>
+        new ServiceCollection()
+            .AddAlertThresholds(configuration)
+            .BuildServiceProvider()
+            .GetRequiredService<AlertThresholds>();
+
+    [Fact]
+    public void AlertThresholds_WithNothingConfigured_UsesTheBuiltInDefaults()
+    {
+        Assert.Equal(AlertThresholds.Default, ResolveAlerts(Config()));
+    }
+
+    [Fact]
+    public void AlertThresholds_OverridesOnlyTheValuesThatAreSet()
+    {
+        var thresholds = ResolveAlerts(Config(("Alerts:AuxBatteryLowVolt", "11.8"), ("Alerts:StaleDataHours", "")));
+
+        Assert.Equal(AlertThresholds.Default with { AuxBatteryLowVolt = 11.8 }, thresholds);
+    }
+
     private static HvBatteryCapacity ResolveCapacity(IConfiguration configuration) =>
         new ServiceCollection()
             .AddHvBatteryCapacity(configuration)
diff --git a/src/GarageStack.Tests/MqttTopicParserTests.cs b/src/GarageStack.Tests/MqttTopicParserTests.cs
index 011524ec..54d676dc 100644
--- a/src/GarageStack.Tests/MqttTopicParserTests.cs
+++ b/src/GarageStack.Tests/MqttTopicParserTests.cs
@@ -34,4 +34,22 @@ public void TryParse_NotAVehicleTopicWithAWellFormedVin_ReturnsFalse(string topi
     {
         Assert.False(MqttTopicParser.TryParse(topic, out _));
     }
+
+    [Fact]
+    public void TryParseAccount_AccountTopic_ReturnsUserAndSubtopic()
+    {
+        Assert.True(MqttTopicParser.TryParseAccount("saic/user@example.com/account/lastLoginError", out var parsed));
+
+        Assert.Equal("user@example.com", parsed.User);
+        Assert.Equal("lastLoginError", parsed.Subtopic);
+    }
+
+    [Theory]
+    [InlineData("saic/user/vehicles/FAKEVN00000000001/drivetrain/soc")]
+    [InlineData("saic/user/account")]
+    [InlineData("homeassistant/sensor/account/state")]
+    public void TryParseAccount_NotAnAccountTopic_ReturnsFalse(string topic)
+    {
+        Assert.False(MqttTopicParser.TryParseAccount(topic, out _));
+    }
 }
diff --git a/src/GarageStack.Tests/NotificationCategoriesTests.cs b/src/GarageStack.Tests/NotificationCategoriesTests.cs
new file mode 100644
index 00000000..5d3ae16e
--- /dev/null
+++ b/src/GarageStack.Tests/NotificationCategoriesTests.cs
@@ -0,0 +1,53 @@
+using GarageStack.Core.Models;
+
+namespace GarageStack.Tests;
+
+// Each device switches notification types off for itself, and the Worker leaves that device out
+// of the push. These are the rules it decides by, matching the frontend's notificationCategoryId.
+public class NotificationCategoriesTests
+{
+    [Theory]
+    [InlineData("low-tyre", "low-tyre")]
+    [InlineData("low-12v", "low-12v")]
+    [InlineData("gateway-login", "gateway-login")]
+    [InlineData("maintenance-overdue-7", "maintenance")]
+    [InlineData("maintenance-due-soon-12", "maintenance")]
+    public void GroupOf_KnownCategory_IsTheTypeTheChecklistOffers(string category, string group)
+    {
+        Assert.Equal(group, NotificationCategories.GroupOf(category));
+    }
+
+    [Theory]
+    [InlineData(null)]
+    [InlineData("")]
+    [InlineData("something-new")]
+    public void GroupOf_CategoryWithoutAType_IsNull(string? category)
+    {
+        Assert.Null(NotificationCategories.GroupOf(category));
+    }
+
+    [Fact]
+    public void IsWanted_TypeSwitchedOff_IsLeftOut()
+    {
+        Assert.False(NotificationCategories.IsWanted("engine-start", ["engine-start"]));
+    }
+
+    [Fact]
+    public void IsWanted_MaintenanceSwitchedOff_LeavesOutEveryItemsAlert()
+    {
+        Assert.False(NotificationCategories.IsWanted("maintenance-overdue-3", ["maintenance"]));
+    }
+
+    [Fact]
+    public void IsWanted_OtherTypeSwitchedOff_StillGoesOut()
+    {
+        Assert.True(NotificationCategories.IsWanted("low-tyre", ["engine-start"]));
+    }
+
+    // The checklist cannot switch such a notification off, so it must never be lost.
+    [Fact]
+    public void IsWanted_NotificationWithoutAType_AlwaysGoesOut()
+    {
+        Assert.True(NotificationCategories.IsWanted(null, ["engine-start"]));
+    }
+}
diff --git a/src/GarageStack.Tests/PushNotificationCheckServiceTests.cs b/src/GarageStack.Tests/PushNotificationCheckServiceTests.cs
index 850e1bbf..1fa5b2c9 100644
--- a/src/GarageStack.Tests/PushNotificationCheckServiceTests.cs
+++ b/src/GarageStack.Tests/PushNotificationCheckServiceTests.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using GarageStack.Core.Configuration;
 using GarageStack.Core.Models;
 using GarageStack.Data;
@@ -13,12 +14,13 @@ namespace GarageStack.Tests;
 public class PushNotificationCheckServiceTests
 {
     private static PushNotificationCheckService CreateService(
-        TyrePressureThresholds? thresholds = null, FakePushSender? push = null) =>
+        TyrePressureThresholds? thresholds = null, FakePushSender? push = null, AlertThresholds? alertThresholds = null) =>
         new(
             NullLogger<PushNotificationCheckService>.Instance,
             new FakeServiceScopeFactory(),
             push ?? new FakePushSender(),
             thresholds ?? TyrePressureThresholds.Default,
+            alertThresholds ?? AlertThresholds.Default,
             WorkerLocalizer.Notifications());
 
     private static TelemetrySnapshot Parked(Action<TelemetrySnapshot>? configure = null)
@@ -373,4 +375,244 @@ public void CheckTyrePressure_UsesConfiguredThresholds_NotHardcodedDefaults()
         Assert.Single(alerts);
         Assert.Equal("low-tyre", alerts[0].Item1);
     }
+
+    // ---------------------------------------------------------------------------
+    // CheckEvSoc and CheckFuelLevel: configurable levels, per drivetrain
+    // ---------------------------------------------------------------------------
+
+    [Fact]
+    public void CheckEvSoc_BelowTheConfiguredLevel_FiresAlert()
+    {
+        var svc = CreateService(alertThresholds: AlertThresholds.Default with { LowEvPercent = 30 });
+        var alerts = new List<(string, string, string)>();
+
+        // 25 % is above the default 20 % (no alert with defaults) but below the configured 30 %.
+        svc.CheckEvSoc(new TelemetrySnapshot { EvSocPercent = 25 }, "bev", alerts);
+
+        Assert.Equal("low-ev", Assert.Single(alerts).Item1);
+    }
+
+    [Fact]
+    public void CheckEvSoc_ThresholdZero_NeverFires()
+    {
+        var svc = CreateService(alertThresholds: AlertThresholds.Default with { LowEvPercent = 0 });
+        var alerts = new List<(string, string, string)>();
+
+        svc.CheckEvSoc(new TelemetrySnapshot { EvSocPercent = 0 }, "bev", alerts);
+
+        Assert.Empty(alerts);
+    }
+
+    [Theory]
+    [InlineData("hev")]
+    [InlineData("phev")]
+    public void CheckFuelLevel_CarThatBurnsFuel_BelowTheLevel_FiresAlertWithTheLevel(string vehicleType)
+    {
+        var alerts = new List<(string, string, string)>();
+
+        CreateService().CheckFuelLevel(new TelemetrySnapshot { FuelLevelPercent = 9 }, vehicleType, alerts);
+
+        var (category, _, body) = Assert.Single(alerts);
+        Assert.Equal("low-fuel", category);
+        Assert.Contains("9%", body);
+    }
+
+    [Fact]
+    public void CheckFuelLevel_AtTheLevel_NoAlert()
+    {
+        var alerts = new List<(string, string, string)>();
+
+        CreateService().CheckFuelLevel(new TelemetrySnapshot { FuelLevelPercent = 15 }, "hev", alerts);
+
+        Assert.Empty(alerts);
+    }
+
+    // A full EV can report a fuel level of zero, and a car not yet detected has no known tank.
+    [Theory]
+    [InlineData("bev")]
+    [InlineData("unknown")]
+    public void CheckFuelLevel_CarWithoutAKnownTank_NoAlert(string vehicleType)
+    {
+        var alerts = new List<(string, string, string)>();
+
+        CreateService().CheckFuelLevel(new TelemetrySnapshot { FuelLevelPercent = 0 }, vehicleType, alerts);
+
+        Assert.Empty(alerts);
+    }
+
+    // ---------------------------------------------------------------------------
+    // CheckDataStale and NewestReportAt: the gateway's poll stamps
+    // ---------------------------------------------------------------------------
+
+    private static readonly DateTime Now = new(2026, 10, 11, 12, 0, 0, DateTimeKind.Utc);
+
+    [Fact]
+    public void NewestReportAt_TakesTheLaterOfTheTwoPollStamps()
+    {
+        var s = new TelemetrySnapshot { RecordedAt = Now, LastVehicleStateAt = Now.AddHours(-5), LastChargeStateAt = Now.AddHours(-3) };
+
+        Assert.Equal(Now.AddHours(-3), PushNotificationCheckService.NewestReportAt(s));
+    }
+
+    [Fact]
+    public void NewestReportAt_WithoutPollStamps_FallsBackToWhenTheRowWasWritten()
+    {
+        Assert.Equal(Now, PushNotificationCheckService.NewestReportAt(new TelemetrySnapshot { RecordedAt = Now }));
+    }
+
+    [Fact]
+    public void CheckDataStale_SilentLongerThanTheThreshold_FiresAlertWithTheHours()
+    {
+        var alerts = new List<(string, string, string)>();
+
+        CreateService().CheckDataStale(new TelemetrySnapshot { LastVehicleStateAt = Now.AddHours(-50) }, Now, alerts);
+
+        var (category, _, body) = Assert.Single(alerts);
+        Assert.Equal("data-stale", category);
+        Assert.Contains("50", body);
+    }
+
+    // The gateway polls a sleeping car once a day, so a day of silence is normal.
+    [Fact]
+    public void CheckDataStale_ADayOfSilence_NoAlert()
+    {
+        var alerts = new List<(string, string, string)>();
+
+        CreateService().CheckDataStale(new TelemetrySnapshot { LastVehicleStateAt = Now.AddHours(-25) }, Now, alerts);
+
+        Assert.Empty(alerts);
+    }
+
+    // A message replayed on reconnect is written now but carries the poll stamp it was sent with.
+    [Fact]
+    public void CheckDataStale_ReplayedOldPoll_StillCountsAsSilent()
+    {
+        var alerts = new List<(string, string, string)>();
+
+        CreateService().CheckDataStale(new TelemetrySnapshot { RecordedAt = Now, LastVehicleStateAt = Now.AddDays(-3) }, Now, alerts);
+
+        Assert.Equal("data-stale", Assert.Single(alerts).Item1);
+    }
+
+    [Fact]
+    public void CheckDataStale_ThresholdZero_NeverFires()
+    {
+        var svc = CreateService(alertThresholds: AlertThresholds.Default with { StaleDataHours = 0 });
+        var alerts = new List<(string, string, string)>();
+
+        svc.CheckDataStale(new TelemetrySnapshot { LastVehicleStateAt = Now.AddDays(-30) }, Now, alerts);
+
+        Assert.Empty(alerts);
+    }
+
+    // ---------------------------------------------------------------------------
+    // CheckAuxBatteryWhileParked: low on poll after poll, not one dip
+    // ---------------------------------------------------------------------------
+
+    private static TelemetrySnapshot Volts(double? voltage) => Locked(s => s.BatteryVoltage = voltage);
+
+    [Fact]
+    public void CheckAuxBatteryWhileParked_LowOnEveryPoll_FiresAlertWithTheNewestVoltage()
+    {
+        var alerts = new List<(string, string, string)>();
+
+        CreateService().CheckAuxBatteryWhileParked(Polls(Volts(11.9), Volts(11.8), Volts(11.8), Volts(11.7)), alerts);
+
+        var (category, _, body) = Assert.Single(alerts);
+        Assert.Equal("low-12v", category);
+        Assert.Contains(11.7.ToString("0.0", CultureInfo.CurrentUICulture), body);
+    }
+
+    [Fact]
+    public void CheckAuxBatteryWhileParked_OneLowPoll_NoAlert()
+    {
+        var alerts = new List<(string, string, string)>();
+
+        CreateService().CheckAuxBatteryWhileParked(Polls(Volts(12.4), Volts(12.4), Volts(12.4), Volts(11.6)), alerts);
+
+        Assert.Empty(alerts);
+    }
+
+    [Fact]
+    public void CheckAuxBatteryWhileParked_NoVoltageReported_NoAlert()
+    {
+        var alerts = new List<(string, string, string)>();
+
+        CreateService().CheckAuxBatteryWhileParked(Polls(Volts(null), Volts(null), Volts(null), Volts(null)), alerts);
+
+        Assert.Empty(alerts);
+    }
+
+    [Fact]
+    public void CheckAuxBatteryWhileParked_UsesTheConfiguredVoltage()
+    {
+        var svc = CreateService(alertThresholds: AlertThresholds.Default with { AuxBatteryLowVolt = 12.3 });
+        var alerts = new List<(string, string, string)>();
+
+        svc.CheckAuxBatteryWhileParked(Polls(Volts(12.2), Volts(12.2), Volts(12.2), Volts(12.2)), alerts);
+
+        Assert.Equal("low-12v", Assert.Single(alerts).Item1);
+    }
+
+    // ---------------------------------------------------------------------------
+    // CheckLevelsAsync: one alert per report, however long the car sleeps
+    // ---------------------------------------------------------------------------
+
+    private static async Task<Vehicle> AddVehicleAsync(AppDbContext db, CancellationToken ct)
+    {
+        var vehicle = new Vehicle { Vin = "FAKEVN00000000001" };
+        db.Vehicles.Add(vehicle);
+        await db.SaveChangesAsync(ct);
+        return vehicle;
+    }
+
+    private static TelemetrySnapshot SoftTyreReportedAt(DateTime polledAt) =>
+        new() { RecordedAt = polledAt, LastVehicleStateAt = polledAt, TyrePressureFrontLeft = 1.9 };
+
+    // The overnight case: the alert went out after the last poll, over an hour ago, and the car
+    // has sent nothing since. The cooldown has run out, but there is nothing new to report.
+    [Fact]
+    public async Task CheckLevelsAsync_AlreadyAlertedOnTheLastReport_SendsNothing()
+    {
+        var ct = TestContext.Current.CancellationToken;
+        var now = DateTime.UtcNow;
+        await using var db = CreateDb();
+        var vehicle = await AddVehicleAsync(db, ct);
+        var polledAt = now.AddHours(-6);
+        db.AppNotifications.Add(new AppNotification
+        {
+            Title = "Low tyre",
+            Category = NotificationCategories.LowTyre,
+            VehicleId = vehicle.Id,
+            CreatedAt = polledAt.AddMinutes(4),
+        });
+        await db.SaveChangesAsync(ct);
+        var push = new FakePushSender();
+
+        await CreateService(push: push).CheckLevelsAsync(vehicle, SoftTyreReportedAt(polledAt), db, now, ct);
+
+        Assert.Empty(push.Sent);
+    }
+
+    [Fact]
+    public async Task CheckLevelsAsync_NewReportStillLow_SendsAgainOnceTheCooldownHasPassed()
+    {
+        var ct = TestContext.Current.CancellationToken;
+        var now = DateTime.UtcNow;
+        await using var db = CreateDb();
+        var vehicle = await AddVehicleAsync(db, ct);
+        db.AppNotifications.Add(new AppNotification
+        {
+            Title = "Low tyre",
+            Category = NotificationCategories.LowTyre,
+            VehicleId = vehicle.Id,
+            CreatedAt = now.AddHours(-3),
+        });
+        await db.SaveChangesAsync(ct);
+        var push = new FakePushSender();
+
+        await CreateService(push: push).CheckLevelsAsync(vehicle, SoftTyreReportedAt(now.AddMinutes(-2)), db, now, ct);
+
+        Assert.Equal("low-tyre", Assert.Single(push.Sent).Category);
+    }
 }
diff --git a/src/GarageStack.Tests/PushSubscriptionUpsertTests.cs b/src/GarageStack.Tests/PushSubscriptionUpsertTests.cs
index e4c247c1..3a5fd7d6 100644
--- a/src/GarageStack.Tests/PushSubscriptionUpsertTests.cs
+++ b/src/GarageStack.Tests/PushSubscriptionUpsertTests.cs
@@ -88,4 +88,46 @@ await PushEndpoints.UpsertSubscriptionAsync(
             .SingleAsync(s => s.Endpoint == "https://push.example/other", ct);
         Assert.Equal("other-p256dh", other.P256DhKey);
     }
+
+    // ── The types each device switched off ─────────────────────────────────────
+
+    [Fact]
+    public async Task StoresTheTypesTheDeviceSwitchedOff_KnownOnesOnlyAndInOneOrder()
+    {
+        var ct = TestContext.Current.CancellationToken;
+        await using var db = CreateDb();
+
+        await PushEndpoints.UpsertSubscriptionAsync(
+            db, new PushSubscribeRequest(Endpoint, "p256dh", "auth", ["low-tyre", "engine-start", "not-a-type", "low-tyre"]), ct);
+
+        var stored = await db.PushSubscriptions.SingleAsync(ct);
+        Assert.Equal(["engine-start", "low-tyre"], stored.ExcludedCategories);
+    }
+
+    [Fact]
+    public async Task UpdatesTheTypesWhenTheDeviceChangedThem()
+    {
+        var ct = TestContext.Current.CancellationToken;
+        await using var db = CreateDb();
+        await PushEndpoints.UpsertSubscriptionAsync(db, new PushSubscribeRequest(Endpoint, "p256dh", "auth", ["engine-start"]), ct);
+
+        await PushEndpoints.UpsertSubscriptionAsync(db, new PushSubscribeRequest(Endpoint, "p256dh", "auth", ["maintenance"]), ct);
+
+        var stored = await db.PushSubscriptions.SingleAsync(ct);
+        Assert.Equal(["maintenance"], stored.ExcludedCategories);
+    }
+
+    // A page that predates the list sends none: that says nothing about the device's choice.
+    [Fact]
+    public async Task ARequestWithoutTheList_KeepsTheStoredTypes()
+    {
+        var ct = TestContext.Current.CancellationToken;
+        await using var db = CreateDb();
+        await PushEndpoints.UpsertSubscriptionAsync(db, new PushSubscribeRequest(Endpoint, "p256dh", "auth", ["engine-start"]), ct);
+
+        await PushEndpoints.UpsertSubscriptionAsync(db, new PushSubscribeRequest(Endpoint, "p256dh", "auth"), ct);
+
+        var stored = await db.PushSubscriptions.SingleAsync(ct);
+        Assert.Equal(["engine-start"], stored.ExcludedCategories);
+    }
 }
diff --git a/src/GarageStack.Worker/Mqtt/AccountStatusHandler.cs b/src/GarageStack.Worker/Mqtt/AccountStatusHandler.cs
new file mode 100644
index 00000000..11f7aa0a
--- /dev/null
+++ b/src/GarageStack.Worker/Mqtt/AccountStatusHandler.cs
@@ -0,0 +1,89 @@
+using System.Collections.Concurrent;
+using System.Globalization;
+using GarageStack.Core.Interfaces;
+using GarageStack.Core.Models;
+using GarageStack.Data;
+using GarageStack.Data.Extensions;
+using Microsoft.Extensions.Localization;
+
+namespace GarageStack.Worker.Mqtt;
+
+/// <summary>
+/// Tells the user when the gateway cannot sign in to the MG account, which stops all data until it
+/// can (a changed password, or SAIC ending the session).
+///
+/// The gateway publishes the time of every failed sign-in on account/lastLoginError and of every
+/// good one on account/lastLogin, both retained. It tries again every fifteen minutes, so the alert
+/// goes out once per outage: not again while one has gone out since the last good sign-in.
+/// </summary>
+public sealed class AccountStatusHandler(
+    ILogger logger,
+    IServiceScopeFactory scopeFactory,
+    IPushSender pushSender,
+    IStringLocalizer<NotificationStrings> strings,
+    TimeProvider timeProvider) : IMqttMessageHandler
+{
+    internal const string LastLoginSubtopic = "lastLogin";
+    internal const string LastLoginErrorSubtopic = "lastLoginError";
+
+    // When no good sign-in is known yet, an outage is taken to have started no earlier than this.
+    internal static readonly TimeSpan UnknownLoginWindow = TimeSpan.FromDays(1);
+
+    // Per MG account, when the gateway last signed in. Written and read by concurrent MQTT dispatches.
+    private readonly ConcurrentDictionary<string, DateTimeOffset> _lastLogin = new();
+
+    public async Task<bool> TryHandleAsync(MqttMessage message, CancellationToken ct)
+    {
+        if (message.Account is not { } topic)
+            return false;
+
+        switch (topic.Subtopic)
+        {
+            case LastLoginSubtopic:
+                if (TryParseTime(message.Payload, out var signedInAt))
+                    _lastLogin[topic.User] = signedInAt;
+                return true;
+
+            case LastLoginErrorSubtopic:
+                // A retained failure is one the broker held before this Worker subscribed: it says
+                // when the gateway last failed, not that it is failing now. A live one is news, and
+                // the gateway sends another every time it tries again.
+                if (!message.Retain)
+                    await AlertAsync(topic.User, ct);
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    /// <summary>The moment the current outage can have started at the earliest: the last good sign-in.</summary>
+    internal DateTime OutageStart(string saicUser) =>
+        _lastLogin.TryGetValue(saicUser, out var signedInAt)
+            ? signedInAt.UtcDateTime
+            : (timeProvider.GetUtcNow() - UnknownLoginWindow).UtcDateTime;
+
+    private async Task AlertAsync(string saicUser, CancellationToken ct)
+    {
+        // The account is an email address, so it stays out of the log.
+        logger.LogWarning("The gateway could not sign in to the MG account");
+        try
+        {
+            using var scope = scopeFactory.CreateScope();
+            var db = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            if (await db.WasNotificationSentSinceAsync(NotificationCategories.GatewayLogin, vehicleId: null, OutageStart(saicUser), ct))
+                return;
+
+            await pushSender.SendToAllAsync(
+                strings["GatewayLoginTitle"], strings["GatewayLoginBody"], ct, NotificationCategories.GatewayLogin);
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, "Failed to send the gateway sign-in alert");
+        }
+    }
+
+    // The gateway writes these as ISO 8601 in UTC.
+    private static bool TryParseTime(string payload, out DateTimeOffset at) =>
+        DateTimeOffset.TryParse(payload, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out at);
+}
diff --git a/src/GarageStack.Worker/Mqtt/MqttConsumerService.cs b/src/GarageStack.Worker/Mqtt/MqttConsumerService.cs
index 949d45bc..7762bae4 100644
--- a/src/GarageStack.Worker/Mqtt/MqttConsumerService.cs
+++ b/src/GarageStack.Worker/Mqtt/MqttConsumerService.cs
@@ -9,7 +9,8 @@ namespace GarageStack.Worker.Mqtt;
 
 /// <summary>
 /// Holds the Worker's MQTT connection and hands every message to the first handler that claims
-/// it: Home Assistant discovery, capability config, MG app messages, command results, and last
+/// it: the gateway's sign-in state, Home Assistant discovery, capability config, MG app messages,
+/// command results, and last
 /// the telemetry itself. Reconnects for as long as the Worker runs.
 /// </summary>
 public class MqttConsumerService : BackgroundService
@@ -32,6 +33,7 @@ public MqttConsumerService(
         var vehicles = new VehicleResolver(scopeFactory);
         _handlers =
         [
+            new AccountStatusHandler(logger, scopeFactory, pushSender, strings, TimeProvider.System),
             new HaDiscoveryHandler(logger, vehicles),
             new VehicleConfigHandler(logger, vehicles),
             new VehicleMessageHandler(logger, scopeFactory, pushSender, strings, TimeProvider.System),
diff --git a/src/GarageStack.Worker/Mqtt/MqttMessage.cs b/src/GarageStack.Worker/Mqtt/MqttMessage.cs
index 789f3b66..64781802 100644
--- a/src/GarageStack.Worker/Mqtt/MqttMessage.cs
+++ b/src/GarageStack.Worker/Mqtt/MqttMessage.cs
@@ -8,6 +8,9 @@ public sealed record MqttMessage(string Topic, string Payload, bool Retain)
     /// other topic (Home Assistant discovery, a malformed VIN).
     /// </summary>
     public ParsedSaicTopic? Vehicle { get; } = MqttTopicParser.TryParse(Topic, out var parsed) ? parsed : null;
+
+    /// <summary>The account and subtopic of a saic/{user}/account/... topic, or null for any other topic.</summary>
+    public ParsedAccountTopic? Account { get; } = MqttTopicParser.TryParseAccount(Topic, out var account) ? account : null;
 }
 
 /// <summary>
diff --git a/src/GarageStack.Worker/Mqtt/MqttTopicParser.cs b/src/GarageStack.Worker/Mqtt/MqttTopicParser.cs
index 61acc494..6394fd23 100644
--- a/src/GarageStack.Worker/Mqtt/MqttTopicParser.cs
+++ b/src/GarageStack.Worker/Mqtt/MqttTopicParser.cs
@@ -5,6 +5,9 @@ namespace GarageStack.Worker.Mqtt;
 /// <summary>The parts of a saic-mqtt-gateway topic: saic/{user}/vehicles/{vin}/{subtopic}.</summary>
 public readonly record struct ParsedSaicTopic(string User, string Vin, string Subtopic);
 
+/// <summary>The parts of a gateway account topic: saic/{user}/account/{subtopic}.</summary>
+public readonly record struct ParsedAccountTopic(string User, string Subtopic);
+
 public static partial class MqttTopicParser
 {
     // VIN is exactly 17 alphanumeric characters (I, O, Q excluded per ISO 3779).
@@ -30,4 +33,21 @@ public static bool TryParse(string topic, out ParsedSaicTopic parsed)
         parsed = default;
         return false;
     }
+
+    /// <summary>
+    /// Splits an account topic (the gateway's sign-in state, shared by every car on the MG
+    /// account) into its user and subtopic. Returns false for anything else.
+    /// </summary>
+    public static bool TryParseAccount(string topic, out ParsedAccountTopic parsed)
+    {
+        var parts = topic.Split('/');
+        if (parts.Length >= 4 && parts[0] == "saic" && parts[2] == "account")
+        {
+            parsed = new ParsedAccountTopic(User: parts[1], Subtopic: string.Join('/', parts[3..]));
+            return true;
+        }
+
+        parsed = default;
+        return false;
+    }
 }
diff --git a/src/GarageStack.Worker/Program.cs b/src/GarageStack.Worker/Program.cs
index d0e4f6fb..b8006782 100644
--- a/src/GarageStack.Worker/Program.cs
+++ b/src/GarageStack.Worker/Program.cs
@@ -28,6 +28,7 @@
     builder.Services.AddGarageStackData(connectionString);
     builder.Services.Configure<MqttOptions>(builder.Configuration.GetSection(MqttOptions.SectionName));
     builder.Services.AddTyrePressureThresholds(builder.Configuration);
+    builder.Services.AddAlertThresholds(builder.Configuration);
     builder.Services.AddSingleton(VapidOptions.From(builder.Configuration));
     builder.Services.AddSingleton<IPushSender, PushSenderService>();
     builder.Services.AddHostedService<MqttConsumerService>();
diff --git a/src/GarageStack.Worker/Resources/NotificationStrings.nl.resx b/src/GarageStack.Worker/Resources/NotificationStrings.nl.resx
index b351d193..9f2603b0 100644
--- a/src/GarageStack.Worker/Resources/NotificationStrings.nl.resx
+++ b/src/GarageStack.Worker/Resources/NotificationStrings.nl.resx
@@ -162,4 +162,28 @@
   <data name="ClimateScheduleCommandSeatRight" xml:space="preserve">
     <value>de stoelverwarming van de passagier</value>
   </data>
+  <data name="Low12VTitle" xml:space="preserve">
+    <value>Lage 12V-accu</value>
+  </data>
+  <data name="Low12VBody" xml:space="preserve">
+    <value>12V-accu op {0} V terwijl de auto geparkeerd staat</value>
+  </data>
+  <data name="LowFuelTitle" xml:space="preserve">
+    <value>Weinig brandstof</value>
+  </data>
+  <data name="LowFuelBody" xml:space="preserve">
+    <value>Brandstoftank op {0}%</value>
+  </data>
+  <data name="GatewayLoginTitle" xml:space="preserve">
+    <value>Inloggen bij MG mislukt</value>
+  </data>
+  <data name="GatewayLoginBody" xml:space="preserve">
+    <value>De gateway kan niet inloggen op je MG-account, dus er komt geen nieuwe data binnen. Controleer het wachtwoord van het MG-account.</value>
+  </data>
+  <data name="DataStaleTitle" xml:space="preserve">
+    <value>Geen data van de auto</value>
+  </data>
+  <data name="DataStaleBody" xml:space="preserve">
+    <value>De auto heeft al {0} uur niets gemeld. Controleer de gateway en het MG-account.</value>
+  </data>
 </root>
diff --git a/src/GarageStack.Worker/Resources/NotificationStrings.resx b/src/GarageStack.Worker/Resources/NotificationStrings.resx
index 87306f3d..522738f1 100644
--- a/src/GarageStack.Worker/Resources/NotificationStrings.resx
+++ b/src/GarageStack.Worker/Resources/NotificationStrings.resx
@@ -162,4 +162,28 @@
   <data name="ClimateScheduleCommandSeatRight" xml:space="preserve">
     <value>passenger seat heating</value>
   </data>
+  <data name="Low12VTitle" xml:space="preserve">
+    <value>Low 12V Battery</value>
+  </data>
+  <data name="Low12VBody" xml:space="preserve">
+    <value>12V battery at {0} V while parked</value>
+  </data>
+  <data name="LowFuelTitle" xml:space="preserve">
+    <value>Low Fuel</value>
+  </data>
+  <data name="LowFuelBody" xml:space="preserve">
+    <value>Fuel tank at {0}%</value>
+  </data>
+  <data name="GatewayLoginTitle" xml:space="preserve">
+    <value>MG Sign-in Failed</value>
+  </data>
+  <data name="GatewayLoginBody" xml:space="preserve">
+    <value>The gateway could not sign in to your MG account, so no new data arrives. Check the MG account password.</value>
+  </data>
+  <data name="DataStaleTitle" xml:space="preserve">
+    <value>No Data From the Car</value>
+  </data>
+  <data name="DataStaleBody" xml:space="preserve">
+    <value>The car has not reported for {0} hours. Check the gateway and the MG account.</value>
+  </data>
 </root>
diff --git a/src/GarageStack.Worker/Services/PushNotificationCheckService.cs b/src/GarageStack.Worker/Services/PushNotificationCheckService.cs
index f058240a..822d0588 100644
--- a/src/GarageStack.Worker/Services/PushNotificationCheckService.cs
+++ b/src/GarageStack.Worker/Services/PushNotificationCheckService.cs
@@ -1,3 +1,4 @@
+using System.Globalization;
 using GarageStack.Core.Configuration;
 using GarageStack.Core.Helpers;
 using GarageStack.Core.Interfaces;
@@ -13,6 +14,7 @@ public class PushNotificationCheckService(
     IServiceScopeFactory scopeFactory,
     IPushSender pushSender,
     TyrePressureThresholds tyrePressureThresholds,
+    AlertThresholds alertThresholds,
     IStringLocalizer<NotificationStrings> strings) : PeriodicBackgroundService(logger)
 {
     private readonly NotificationCooldownGate _cooldownGate = new(TimeSpan.FromHours(1));
@@ -72,21 +74,50 @@ protected override async Task RunOnceAsync(CancellationToken ct)
             var snapshot = await telemetry.GetMergedLatestAsync(vehicle.Id, ct);
             if (snapshot is null) continue;
 
-            var vehicleType = VehicleTypeHelper.GetVehicleType(vehicle);
-            var alerts = new List<(string key, string title, string body)>();
-            CheckTyrePressure(snapshot, alerts);
-            CheckEvSoc(snapshot, vehicleType, alerts);
-            CheckChargingComplete(snapshot, vehicle.Vin, vehicleType, alerts);
-            await SendAsync(vehicle, alerts, db, ct);
-
-            await CheckParkedAsync(vehicle, snapshot, telemetry, db, DateTime.UtcNow, ct);
+            var now = DateTime.UtcNow;
+            await CheckLevelsAsync(vehicle, snapshot, db, now, ct);
+            await CheckParkedAsync(vehicle, snapshot, telemetry, db, now, ct);
         }
     }
 
     /// <summary>
-    /// Warns about a car parked unlocked or with a door or window open, once its polls have shown
-    /// it for a while. Every warning rests on the newest poll and goes out once for it: a car
-    /// asleep overnight would otherwise be reported every hour on the one poll it last sent.
+    /// Warns about tyres, fuel and charge out of bounds, a finished charge, and a car gone quiet.
+    /// Each warning goes out once per report: a car asleep overnight would otherwise be reported
+    /// every hour on the one reading it last sent.
+    /// </summary>
+    internal async Task CheckLevelsAsync(Vehicle vehicle, TelemetrySnapshot snapshot, AppDbContext db, DateTime now, CancellationToken ct)
+    {
+        var vehicleType = VehicleTypeHelper.GetVehicleType(vehicle);
+        var alerts = new List<(string key, string title, string body)>();
+        CheckTyrePressure(snapshot, alerts);
+        CheckEvSoc(snapshot, vehicleType, alerts);
+        CheckFuelLevel(snapshot, vehicleType, alerts);
+        CheckChargingComplete(snapshot, vehicle.Vin, vehicleType, alerts);
+        CheckDataStale(snapshot, now, alerts);
+        if (alerts.Count == 0) return;
+
+        await SendAsync(vehicle, alerts, db, ct, onceSince: NewestReportAt(snapshot));
+    }
+
+    /// <summary>
+    /// When the car last reported, by the gateway's stamps on its polls. A message the broker
+    /// replays on reconnect carries its old stamp, so it does not count as a new report the way
+    /// the time its row was written would.
+    /// </summary>
+    internal static DateTime NewestReportAt(TelemetrySnapshot s) =>
+        (s.LastVehicleStateAt, s.LastChargeStateAt) switch
+        {
+            ({ } vehicleState, { } chargeState) => vehicleState > chargeState ? vehicleState : chargeState,
+            ({ } vehicleState, null) => vehicleState,
+            (null, { } chargeState) => chargeState,
+            _ => s.RecordedAt,
+        };
+
+    /// <summary>
+    /// Warns about a car parked unlocked, with a door or window open, or with a low 12V battery,
+    /// once its polls have shown it for a while. Every warning rests on the newest poll and goes
+    /// out once for it: a car asleep overnight would otherwise be reported every hour on the one
+    /// poll it last sent.
     /// </summary>
     internal async Task CheckParkedAsync(
         Vehicle vehicle, TelemetrySnapshot snapshot, ITelemetryRepository telemetry, AppDbContext db, DateTime now, CancellationToken ct)
@@ -101,6 +132,7 @@ internal async Task CheckParkedAsync(
         CheckUnlockedWhileParked(readings, alerts);
         CheckDoorsOpenWhileParked(readings, alerts);
         CheckWindowsOpenWhileParked(readings, alerts);
+        CheckAuxBatteryWhileParked(readings, alerts);
         if (alerts.Count == 0) return;
 
         await SendAsync(vehicle, alerts, db, ct, onceSince: readings[0].ArrivedAt);
@@ -143,11 +175,34 @@ internal void CheckTyrePressure(TelemetrySnapshot s, List<(string, string, strin
             alerts.Add((NotificationCategories.HighTyre, strings["HighTyreTitle"], strings["HighTyreBody", string.Join(", ", high)]));
     }
 
-    private void CheckEvSoc(TelemetrySnapshot s, string vehicleType, List<(string, string, string)> alerts)
+    internal void CheckEvSoc(TelemetrySnapshot s, string vehicleType, List<(string, string, string)> alerts)
     {
         if (!VehicleTypeHelper.CanCharge(vehicleType)) return;
-        if (s.EvSocPercent is not null && s.EvSocPercent < 20)
-            alerts.Add((NotificationCategories.LowEv, strings["LowEvTitle"], strings["LowEvBody", $"{s.EvSocPercent:F0}"]));
+        if (s.EvSocPercent is { } soc && soc < alertThresholds.LowEvPercent)
+            alerts.Add((NotificationCategories.LowEv, strings["LowEvTitle"], strings["LowEvBody", $"{soc:F0}"]));
+    }
+
+    // A car without a combustion engine can still report a fuel level of zero.
+    internal void CheckFuelLevel(TelemetrySnapshot s, string vehicleType, List<(string, string, string)> alerts)
+    {
+        if (!VehicleTypeHelper.HasCombustionEngine(vehicleType)) return;
+        if (s.FuelLevelPercent is { } fuel && fuel < alertThresholds.LowFuelPercent)
+            alerts.Add((NotificationCategories.LowFuel, strings["LowFuelTitle"], strings["LowFuelBody", $"{fuel:F0}"]));
+    }
+
+    /// <summary>
+    /// Warns when the car has gone quiet for longer than the gateway's daily poll of a sleeping
+    /// car explains: the MG session has lapsed, the gateway is down, or the car is out of reach.
+    /// Fresh data moves the newest report on and re-arms it.
+    /// </summary>
+    internal void CheckDataStale(TelemetrySnapshot s, DateTime now, List<(string, string, string)> alerts)
+    {
+        if (alertThresholds.StaleDataHours <= 0) return;
+
+        var silentFor = now - NewestReportAt(s);
+        if (silentFor.TotalHours < alertThresholds.StaleDataHours) return;
+
+        alerts.Add((NotificationCategories.DataStale, strings["DataStaleTitle"], strings["DataStaleBody", $"{silentFor.TotalHours:F0}"]));
     }
 
     internal void CheckChargingComplete(TelemetrySnapshot s, string vin, string vehicleType, List<(string, string, string)> alerts)
@@ -183,6 +238,16 @@ internal void CheckUnlockedWhileParked(IReadOnlyList<StatusReading> readings, Li
             alerts.Add((NotificationCategories.UnlockedParked, strings["UnlockedParkedTitle"], strings["UnlockedParkedBody"]));
     }
 
+    // While the car is on, the traction battery tops the 12V battery up, so only a parked car's
+    // voltage says how the battery is doing. Several polls in a row keep one dip from counting.
+    internal void CheckAuxBatteryWhileParked(IReadOnlyList<StatusReading> readings, List<(string, string, string)> alerts)
+    {
+        if (!ParkedProblem.Persists(readings, s => s.BatteryVoltage < alertThresholds.AuxBatteryLowVolt)) return;
+
+        var voltage = readings[0].State.BatteryVoltage!.Value.ToString("0.0", CultureInfo.CurrentUICulture);
+        alerts.Add((NotificationCategories.Low12V, strings["Low12VTitle"], strings["Low12VBody", voltage]));
+    }
+
     internal void CheckDoorsOpenWhileParked(IReadOnlyList<StatusReading> readings, List<(string, string, string)> alerts) =>
         CheckOpenWhileParked(readings, DoorPositions, alerts, NotificationCategories.DoorsOpenParked, "DoorsOpenTitle", "DoorsOpenBody");
 
diff --git a/src/GarageStack.Worker/Services/PushSenderService.cs b/src/GarageStack.Worker/Services/PushSenderService.cs
index b4fb48cc..e60bd6b2 100644
--- a/src/GarageStack.Worker/Services/PushSenderService.cs
+++ b/src/GarageStack.Worker/Services/PushSenderService.cs
@@ -84,7 +84,11 @@ public async Task SendToAllAsync(string title, string body, CancellationToken ct
 
         using var scope = _scopeFactory.CreateScope();
         var db = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-        var subscriptions = await db.PushSubscriptions.AsNoTracking().ToListAsync(ct);
+        // Each device switched its own types off. The in-app record above is shared and kept
+        // regardless; only the push to a device that does not want this type is left out.
+        var subscriptions = (await db.PushSubscriptions.AsNoTracking().ToListAsync(ct))
+            .Where(s => NotificationCategories.IsWanted(category, s.ExcludedCategories))
+            .ToList();
         if (subscriptions.Count == 0) return;
 
         // Only re-queried if persistence above failed before it could compute this itself.
diff --git a/unraid/garagestack.xml b/unraid/garagestack.xml
index f4d3f5e6..f31bc4c7 100644
--- a/unraid/garagestack.xml
+++ b/unraid/garagestack.xml
@@ -521,6 +521,50 @@
     Required="false"
     Mask="false">3.2</Config>
 
+  <Config
+    Name="Alert - Low 12V Battery (V)"
+    Target="AUX_BATTERY_LOW_VOLT"
+    Default="12.0"
+    Mode=""
+    Description="12V battery voltage a parked car is warned below, once several polls in a row show it. 0 switches the alert off."
+    Type="Variable"
+    Display="advanced"
+    Required="false"
+    Mask="false">12.0</Config>
+
+  <Config
+    Name="Alert - Low Fuel (%)"
+    Target="LOW_FUEL_PERCENT"
+    Default="15"
+    Mode=""
+    Description="Fuel level a hybrid or plug-in hybrid is warned below. 0 switches the alert off."
+    Type="Variable"
+    Display="advanced"
+    Required="false"
+    Mask="false">15</Config>
+
+  <Config
+    Name="Alert - Low EV Battery (%)"
+    Target="LOW_EV_PERCENT"
+    Default="20"
+    Mode=""
+    Description="Charge level a plug-in car is warned below. 0 switches the alert off."
+    Type="Variable"
+    Display="advanced"
+    Required="false"
+    Mask="false">20</Config>
+
+  <Config
+    Name="Alert - No Data From the Car (hours)"
+    Target="STALE_DATA_HOURS"
+    Default="48"
+    Mode=""
+    Description="Hours without a report from the car before GarageStack warns that data has stopped arriving. Keep it above the gateway's poll of a sleeping car (once a day by default). 0 switches the alert off."
+    Type="Variable"
+    Display="advanced"
+    Required="false"
+    Mask="false">48</Config>
+
   <Config
     Name="HV Battery Capacity (kWh)"
     Target="HV_BATTERY_CAPACITY_KWH"