@@ -757,6 +757,53 @@ async def _set_amperage(self, target_amperage: int):
 
 ## Version History
 
+### v2.9.1 (2026-07-19)
+**FIX: Brand-vocabulary status classifiers — 'available' no longer passes as "connected", 'charged' recognized as charge-complete**
+
+Closes the residual identified while root-causing the v2.9.0 incident: the same
+non-Tuya wallbox that reports `charging` also reports OCPP-style **`available`**
+(= no EV connected) and **`charged`** (= session done). Three call sites still
+compared against exact Tuya strings:
+1. The night-charge **connect gates** (evaluation + handover) rejected only
+   `charger_free` → `available` passed as "connected" and a session started
+   **with no car plugged** (observed at 00:00 in the 2026-07-19 log).
+2. **Late-arrival detection** compared `old_state == charger_free` exactly →
+   never fired on an `available` → `charging` plug-in transition.
+3. The v2.9.0 grid-monitor lifecycle blocklist matched only literal
+   `charger_free`/`charger_end`.
+
+**Fix — two centralized classifiers in [power_model.py](custom_components/ev_smart_charger/power_model.py)**
+(module-level, case/whitespace-insensitive, conservative allowlists of
+unambiguous synonyms; unknown strings default to "connected / not complete" —
+the safe failure mode, so no unknown vocabulary can ever lose night charging):
+- `is_disconnected_status()` — `charger_free`, OCPP `available`,
+  `disconnected`, `unplugged`, `not_connected`, `no_car`, … (deliberately NO
+  `idle`: ambiguous across brands).
+- `is_charge_complete_status()` — `charger_end`, `charged`, `complete(d)`,
+  `finished`, OCPP `finishing`, `full`, …
+
+Applied in `night_smart_charge.py` (both connect gates, late-arrival
+transition, both grid-monitor lifecycle paths — legacy path keeps its
+`charger_wait` + unavailable fail-safe) and in `power_model.is_charging`
+(status fallback) / `is_plugged_in`. Solar Surplus / Smart Blocker / Hybrid
+Mode `charger_free` gates intentionally untouched (skip-optimizations; wider
+blast radius for no observed defect). Tuya installs byte-for-byte unchanged
+(the Tuya strings are members of the classifier sets).
+
+**Files**: `power_model.py`, `night_smart_charge.py`, `const.py` +
+`manifest.json` (VERSION), `README.md`, this file; tests:
+`tests/test_night_smart_charge.py` (+7: classifier units incl. OCPP
+`SuspendedEV`-stays-connected, brand disconnected/charged lifecycle stops on
+both grid paths, late-arrival fires on `available`→`charging` and not on
+`charging`→`charged`). `VERSION = "2.9.1"`. Full suite green: **278 passed /
+0 failed**.
+
+**Upgrade priority**: 🟢 RECOMMENDED for non-Tuya wallboxes (companion to
+v2.9.0 — prevents phantom no-car sessions and makes plug-in late-arrival
+detection work). ⚪ NO-OP for Tuya vocabularies.
+
+---
+
 ### v2.9.0 (2026-07-19)
 **FIX: Night Smart Charge — brand-status false stop in grid mode + "completed_today" ignores user intent changes**
 
 
@@ -58,6 +58,8 @@ Most projects target one charger brand or assume a single-phase home. EV Smart C
 
 > **📱 New in v2.7.3+** — EV charging **Live Activities / Live Updates** for the Home Assistant Companion app. When enabled from **Dashboard → Settings → Notifications**, the integration keeps a single `evsc_ev_charging` activity updated for Boost Charge, Night Smart Charge, Solar Surplus, Force Charge, and normal charging detected by the shared `charging_power` / charger-status SSOT. Updates are throttled to protect the iOS push budget and the activity closes only after charging has stopped for two monitor ticks. **Default: OFF**.
 
+> **🔌 New in v2.9.1** — **brand-vocabulary status classifiers**. "Is the cable disconnected?" and "has the charge completed?" are now answered by two centralized, case-insensitive classifiers in `power_model.py` (`is_disconnected_status` / `is_charge_complete_status`) instead of exact Tuya-string comparisons. This fixes the remaining v2.9.0 blind spot: on wallboxes reporting OCPP-style statuses (`available` = no EV connected, `charged` = session done), Night Smart Charge could start a session **with no car plugged** (the connect gate only rejected `charger_free`) and the plug-in *late-arrival* detection never fired (it compared against `charger_free` exactly). The classifiers are conservative allowlists of unambiguous synonyms — an unknown brand string still defaults to "connected", so no existing setup can lose night charging. Applied to the night-charge connect gates, late-arrival detection, and the grid-monitor lifecycle stops; `power_model.is_charging` / `is_plugged_in` now share the same vocabulary.
+
 > **🛠️ New in v2.9.0** — two Night Smart Charge reliability fixes. **(1)** The grid-mode monitor no longer terminates a session because your wallbox reports a brand-specific status string: the old check accepted only the Tuya vocabulary (`charger_charging` / `charger_wait`), so a wallbox reporting e.g. `charging` had its grid session killed ~15 s after the battery→grid fallback — leaving the EV under target for the rest of the night. The check is now the same tolerant blocklist used everywhere since v2.2.0 (only the explicit `charger_free` / `charger_end` lifecycle statuses stop the session; the measured-power blind-spot check keeps protecting against a genuinely idle charger). **(2)** Changing **today's** EV SOC target or turning on **today's** *car ready* switch after a session already ended now **re-arms Night Smart Charge**: the "completed today" latch (and its 1-hour cooldown) is cleared and the session restarts within a minute if the night window is still open. Previously those changes were silently ignored until the next day. **STRONGLY RECOMMENDED for non-Tuya wallboxes.**
 
 ---
 
@@ -2,7 +2,7 @@
 
 # ========== INTEGRATION METADATA ==========
 DOMAIN = "ev_smart_charger"
-VERSION = "2.9.0"
+VERSION = "2.9.1"
 DEFAULT_NAME = "EV Smart Charger"
 FRONTEND_URL_BASE = "/api/ev_smart_charger/frontend"
 FRONTEND_CARD_FILENAME = "ev-smart-charger-dashboard.js"
 
@@ -11,5 +11,5 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/antbald/ha-ev-smart-charger/issues",
   "requirements": [],
-  "version": "2.9.0"
+  "version": "2.9.1"
 }
@@ -18,9 +18,6 @@
     CONF_EV_CHARGER_CURRENT,
     CONF_BATTERY_CAPACITY,
     CONF_ENERGY_FORECAST_TARGET,
-    CHARGER_STATUS_CHARGING,
-    CHARGER_STATUS_END,
-    CHARGER_STATUS_FREE,
     CHARGER_STATUS_WAIT,
     CHARGING_POWER_DRAWING_FLOOR_W,
     CHARGING_POWER_GRACE_SECONDS,
@@ -59,7 +56,11 @@
     has_home_battery,
 )
 from .localization import translate_runtime
-from .power_model import ChargingModel
+from .power_model import (
+    ChargingModel,
+    is_charge_complete_status,
+    is_disconnected_status,
+)
 from .runtime import EVSCRuntimeData
 from .charger_controller import CurrentControlAdapter
 from .utils.logging_helper import EVSCLogger
@@ -665,7 +666,13 @@ async def async_try_handover_from_solar_surplus(self, reason: str = "") -> bool:
         # power-based monitor stop if the car is not actually charging.
         if self._charger_status:
             charger_status = state_helper.get_state(self.hass, self._charger_status)
-            if not charger_status or charger_status in ("unknown", "unavailable", CHARGER_STATUS_FREE):
+            # v2.9.1: brand-vocabulary aware — 'available' (OCPP) etc. mean
+            # disconnected just like Tuya's 'charger_free'.
+            if (
+                not charger_status
+                or charger_status in ("unknown", "unavailable")
+                or is_disconnected_status(charger_status)
+            ):
                 self.logger.info(f"Handover rejected - charger not ready (status: {charger_status})")
                 return False
 
@@ -777,8 +784,12 @@ async def _async_charger_status_changed(self, event) -> None:
         if not new_state or not old_state:
             return
 
-        # Detect car just plugged in (from free to any other state)
-        if old_state.state == CHARGER_STATUS_FREE and new_state.state != CHARGER_STATUS_FREE:
+        # Detect car just plugged in (from a disconnected status to any other).
+        # v2.9.1: brand-vocabulary aware — the old exact 'charger_free'
+        # comparison never fired on wallboxes reporting e.g. 'available'.
+        if is_disconnected_status(old_state.state) and not is_disconnected_status(
+            new_state.state
+        ):
             self.logger.info(f"{self.logger.EV} Car plugged in (status: {new_state.state})")
 
             # Check if we're in active window and enabled
@@ -1194,7 +1205,15 @@ async def _evaluate_and_charge(self) -> None:
                 self.logger.info(f"   Charger status: {charger_status}")
 
                 # v1.3.22: Check for invalid/unavailable states
-                if not charger_status or charger_status in ["unavailable", "unknown", CHARGER_STATUS_FREE]:
+                # v2.9.1: brand-vocabulary aware disconnect detection — an
+                # OCPP-style 'available' (= no EV plugged) previously passed
+                # this gate (only 'charger_free' was rejected) and a session
+                # started with no car connected.
+                if (
+                    not charger_status
+                    or charger_status in ["unavailable", "unknown"]
+                    or is_disconnected_status(charger_status)
+                ):
                     if charger_status in ["unavailable", "unknown"]:
                         self.logger.warning(f"{self.logger.ALERT} Charger status sensor {charger_status} - cannot determine connection")
                         reason = f"sensor {charger_status}"
@@ -1885,11 +1904,9 @@ async def _async_monitor_grid_charge(self, now) -> None:
             if (
                 not charger_status
                 or charger_status in ("unknown", "unavailable")
-                or charger_status in (
-                    CHARGER_STATUS_FREE,
-                    CHARGER_STATUS_END,
-                    CHARGER_STATUS_WAIT,
-                )
+                or charger_status == CHARGER_STATUS_WAIT
+                or is_disconnected_status(charger_status)
+                or is_charge_complete_status(charger_status)
             ):
                 self.logger.warning(f"Charger no longer charging (status: {charger_status}) - ending grid mode")
                 await self._complete_night_charge(STOP_REASON_CHARGER_NOT_CHARGING, terminal=True)
@@ -1903,8 +1920,12 @@ async def _async_monitor_grid_charge(self, now) -> None:
             # explicit end-of-life statuses stop it; anything else (brand
             # strings, None, unknown/unavailable, 'charger_wait' transitional
             # decrease) falls through to the measured-power draw check below,
-            # which is the authoritative signal on this path.
-            if charger_status in (CHARGER_STATUS_FREE, CHARGER_STATUS_END):
+            # which is the authoritative signal on this path. v2.9.1: the
+            # explicit statuses are matched through the brand-vocabulary
+            # classifiers ('available' ≙ free, 'charged' ≙ end, …).
+            if is_disconnected_status(charger_status) or is_charge_complete_status(
+                charger_status
+            ):
                 self.logger.warning(f"Charger no longer charging (status: {charger_status}) - ending grid mode")
                 self._grid_drawing_low_since = None
                 await self._complete_night_charge(STOP_REASON_CHARGER_NOT_CHARGING, terminal=True)
 
@@ -53,6 +53,77 @@
 # report a brand-specific charging string (e.g. "Charging") still register.
 _IDLE_OR_DONE_STATUSES = (CHARGER_STATUS_FREE, CHARGER_STATUS_END, CHARGER_STATUS_WAIT)
 
+# ---------------------------------------------------------------------------
+# v2.9.1 — brand-vocabulary status classifiers (SSOT)
+#
+# Non-Tuya wallboxes report brand-specific status strings. Two lifecycle
+# questions keep coming up across components and were previously answered with
+# exact Tuya-string comparisons (the root cause of the 2026-07-19 incident,
+# where OCPP-style 'available' — which means NO EV connected — passed a
+# "connected" gate that only rejected 'charger_free'):
+#
+#   1. "Is the cable disconnected?"  -> is_disconnected_status()
+#   2. "Has the charge completed?"   -> is_charge_complete_status()
+#
+# Both are deliberately CONSERVATIVE allowlists of unambiguous synonyms
+# (case-insensitive): an unknown brand string classifies as "connected / not
+# complete", which is the safe failure mode — a wrong 'disconnected' verdict
+# would block night charging entirely, while a wrong 'connected' verdict at
+# worst runs a session with no draw (caught by the measured-power checks).
+# OCPP reference: 'Available' = connector not occupied; 'Finishing' = session
+# ended.
+# ---------------------------------------------------------------------------
+_DISCONNECTED_STATUSES = frozenset(
+    {
+        CHARGER_STATUS_FREE,  # Tuya
+        "available",  # OCPP: connector not occupied
+        "disconnected",
+        "unplugged",
+        "not_connected",
+        "not connected",
+        "no_car",
+        "no car",
+        "no_vehicle",
+        "car_not_connected",
+    }
+)
+
+_CHARGE_COMPLETE_STATUSES = frozenset(
+    {
+        CHARGER_STATUS_END,  # Tuya
+        "charged",
+        "complete",
+        "completed",
+        "finished",
+        "finishing",  # OCPP: session wrap-up
+        "full",
+        "charge_complete",
+        "charging_complete",
+    }
+)
+
+
+def is_disconnected_status(status: str | None) -> bool:
+    """True when the textual charger status unambiguously means 'no EV plugged'.
+
+    Tolerant of brand vocabularies (case/whitespace-insensitive). Unknown
+    strings return False (treated as connected — the safe default).
+    """
+    if not status:
+        return False
+    return str(status).strip().lower() in _DISCONNECTED_STATUSES
+
+
+def is_charge_complete_status(status: str | None) -> bool:
+    """True when the textual charger status unambiguously means 'charge done'.
+
+    Tolerant of brand vocabularies (case/whitespace-insensitive). Unknown
+    strings return False.
+    """
+    if not status:
+        return False
+    return str(status).strip().lower() in _CHARGE_COMPLETE_STATUSES
+
 # Per-quantity config keys, ordered L1, L2, L3. L1 reuses the existing single-phase
 # key so single-phase installs read exactly the same entity as before.
 _PRODUCTION_KEYS = (CONF_FV_PRODUCTION, CONF_FV_PRODUCTION_L2, CONF_FV_PRODUCTION_L3)
@@ -252,18 +323,22 @@ def is_charging(self, hass: HomeAssistant) -> bool:
         status = get_state(hass, self._charger_status_entity)
         if status in _UNAVAILABLE_STATES or status in _IDLE_OR_DONE_STATUSES:
             return False
+        # v2.9.1: brand synonyms (e.g. OCPP 'available', 'charged') are just as
+        # explicitly not-drawing as the Tuya statuses above.
+        if is_disconnected_status(status) or is_charge_complete_status(status):
+            return False
         return True
 
     def is_plugged_in(self, hass: HomeAssistant) -> bool:
         """Lifecycle, NOT draw: is a cable plugged in?
 
         Read from the textual status (measured 0 W cannot tell "paused" from
-        "unplugged"). Status present and not FREE/unknown/unavailable. Offered for
-        completeness; existing plug gates already read the status string directly
-        and are intentionally NOT refactored to this in v2.2.
+        "unplugged"). Status present and not disconnected/unknown/unavailable.
+        v2.9.1: uses the tolerant is_disconnected_status classifier so brand
+        vocabularies (OCPP 'available', …) answer correctly.
         """
         state = get_state(hass, self._charger_status_entity)
-        return state not in (*_UNAVAILABLE_STATES, CHARGER_STATUS_FREE)
+        return state not in _UNAVAILABLE_STATES and not is_disconnected_status(state)
 
     # ----- conversion -----
     def watts_to_amps(self, watts: float) -> float:
 
@@ -1331,3 +1331,108 @@ async def test_intent_ignores_availability_churn(hass, night_charge):
     )
 
     assert night_charge._session_state == "completed_today"
+
+
+# ============================================================================
+# v2.9.1 — brand-vocabulary status classifiers (OCPP 'available', 'charged', …)
+# ============================================================================
+
+from custom_components.ev_smart_charger.power_model import (
+    is_charge_complete_status,
+    is_disconnected_status,
+)
+
+
+def test_disconnected_status_classifier():
+    """Tolerant, case-insensitive; unknown strings default to connected."""
+    assert is_disconnected_status("charger_free") is True
+    assert is_disconnected_status("available") is True  # OCPP: not occupied
+    assert is_disconnected_status("Available") is True
+    assert is_disconnected_status(" unplugged ") is True
+    assert is_disconnected_status("charging") is False
+    assert is_disconnected_status("charged") is False
+    assert is_disconnected_status("SuspendedEV") is False  # OCPP: plugged
+    assert is_disconnected_status(None) is False
+    assert is_disconnected_status("") is False
+
+
+def test_charge_complete_status_classifier():
+    assert is_charge_complete_status("charger_end") is True
+    assert is_charge_complete_status("charged") is True
+    assert is_charge_complete_status("Finishing") is True  # OCPP wrap-up
+    assert is_charge_complete_status("charging") is False
+    assert is_charge_complete_status("available") is False
+    assert is_charge_complete_status(None) is False
+
+
+async def test_grid_monitor_lifecycle_stop_on_brand_disconnected(hass, night_charge):
+    """'available' (OCPP = unplugged) mid-session → immediate lifecycle stop,
+    even with a noisy >floor power reading."""
+    await _prime_grid_monitor(
+        hass,
+        night_charge,
+        status="available",
+        measured=CHARGING_POWER_DRAWING_FLOOR_W + 500,
+    )
+
+    await night_charge._async_monitor_grid_charge(None)
+
+    night_charge._complete_night_charge.assert_awaited_once()
+
+
+async def test_grid_monitor_lifecycle_stop_on_brand_charged(hass, night_charge):
+    """'charged' (brand synonym of charger_end) → immediate lifecycle stop."""
+    await _prime_grid_monitor(
+        hass,
+        night_charge,
+        status="charged",
+        measured=CHARGING_POWER_DRAWING_FLOOR_W + 500,
+    )
+
+    await night_charge._async_monitor_grid_charge(None)
+
+    night_charge._complete_night_charge.assert_awaited_once()
+
+
+async def test_grid_monitor_legacy_brand_disconnected_stops(hass, night_charge):
+    """Legacy path (no power sensor): brand 'available' → lifecycle stop."""
+    await _prime_grid_monitor(hass, night_charge, status="available", measured=None)
+
+    await night_charge._async_monitor_grid_charge(None)
+
+    night_charge._complete_night_charge.assert_awaited_once()
+
+
+async def test_late_arrival_fires_on_brand_disconnected_transition(hass, night_charge):
+    """Plug-in detection must fire on 'available' → 'charging', not only on the
+    Tuya 'charger_free' transition (the 2026-07-19 wallbox vocabulary)."""
+    night_charge._boost_charge = None
+    night_charge._is_in_active_window = AsyncMock(return_value=True)
+    night_charge.is_enabled = MagicMock(return_value=True)
+    night_charge._evaluate_and_charge = AsyncMock()
+
+    event = MagicMock()
+    event.data = {
+        "old_state": MagicMock(state="available"),
+        "new_state": MagicMock(state="charging"),
+    }
+    await night_charge._async_charger_status_changed(event)
+
+    night_charge._evaluate_and_charge.assert_awaited_once()
+
+
+async def test_late_arrival_ignores_connected_to_connected_transition(
+    hass, night_charge
+):
+    """'charging' → 'charged' is not a plug-in event."""
+    night_charge._boost_charge = None
+    night_charge._evaluate_and_charge = AsyncMock()
+
+    event = MagicMock()
+    event.data = {
+        "old_state": MagicMock(state="charging"),
+        "new_state": MagicMock(state="charged"),
+    }
+    await night_charge._async_charger_status_changed(event)
+
+    night_charge._evaluate_and_charge.assert_not_awaited()
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@`
`11`	`11`	`"iot_class": "local_push",`
`12`	`12`	`"issue_tracker": "https://github.com/antbald/ha-ev-smart-charger/issues",`
`13`	`13`	`"requirements": [],`
`14`		`- "version": "2.9.0"`
	`14`	`+ "version": "2.9.1"`
`15`	`15`	`}`