release(#277,#298,#301): renumber 1.7.0 -> 1.6.3 + v1.6.3 doc/screenshot sweep

belinea4071 · belinea4071 · commit b90001d8f048 · 2026-05-30T14:15:40.000Z
Renumbers the in-flight release from 1.7.0 to 1.6.3. The entity removals (`night_charging`, `smart_night_charging`, `tariff_optimized` switches; `ev_charging_mode` select) are treated as a patch by the maintainer's policy — the named `Charge mode` selector carries the same intent so existing automations only need an entity rename, not a behaviour rewrite. Doc sweep for the renamed entities so first-touch users land on the new model: - README — Charging Modes section rewritten around the 5 named modes (Solar only / Solar + cheapest hours / Min + Solar / Always (max) / Off). Cheap-tariff example automation switched from `switch.turn_on` on `night_charging` to `select.select_option` on `charge_mode`. - EV_CHARGING_LOGIC.md — v1.6.3 banner at top with the new mode table; the legacy toggle-architecture body kept as historical reference for migrating users. Embeds the refreshed EV-tab screenshot. - QUICK_START / SETUP_GUIDE / MULTI_DEVICE_GUIDE — entity tables now show `select.sem_charger_<id>_charge_mode` instead of the removed switches. - images/ — sem_ev_tab.png and sem_home_tab.png recaptured from HA-PROD on v1.6.3; the EV card screenshot is the canonical visual for the new Charge mode selector (label, value, hint line all localized — visual proof the #301 cache-bust fix lands). - CHANGELOG — the prose reference to "v1.7.0 Phase C makes min_plus_solar zone-adaptive" reads as "v1.6.3 Phase C" so the in-section narration matches the header. - tests/test_dashboard_generator.py — version literal in the `_content_hash_cache_bust` fixtures bumped to 1.6.3 for consistency (behaviour unchanged; the helper accepts any version string). manifest.json: 1.7.0 -> 1.6.3. 2136 / 2136 tests passing.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to SEM are documented here.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.7.0] — 2026-05-30
+## [1.6.3] — 2026-05-30
 
 The **EV charge UX consolidation** release (#277). Replaces the
 four-toggle soup (``ev_charging_mode`` × ``night_charging`` ×
@@ -33,7 +33,7 @@ A small population of users explicitly set the legacy
 ``ev_charging_mode`` to ``minpv`` (the "force Min from grid + solar
 to Max" mode). The Phase A migration mapped them to
 ``min_plus_solar``, which in v1.6.x kept their daytime behaviour
-unchanged (the strategy machine still read the legacy field). v1.7.0
+unchanged (the strategy machine still read the legacy field). v1.6.3
 Phase C makes ``min_plus_solar`` **zone-adaptive during the day** —
 the Min guarantee now comes from NIGHT charging top-up only, not
 from forced grid pull at noon. The Min target itself is unchanged;
diff --git a/README.md b/README.md
@@ -192,33 +192,42 @@ Enable peak load management if your utility bills based on peak demand:
 
 ## User Controls
 
-SEM is designed to be mostly automatic. The switches that matter:
+SEM is designed to be mostly automatic. The controls that matter (v1.6.3 — toggle-soup replaced by a single named selector, #277):
 
-| Switch | Default | What it does |
+| Entity | Default | What it does |
 |--------|---------|-------------|
 | `switch.sem_observer_mode` | OFF | Read-only mode — SEM monitors but doesn't control hardware (global) |
-| `switch.sem_charger_<id>_night_charging` | OFF | **Per-charger** (#255). Enable/disable overnight grid charging for that charger (opt-in — solar surplus only until you turn it on; #256) |
-| `switch.sem_charger_<id>_smart_night_charging` | OFF | **Per-charger** (#255). Intelligently skip/reduce that charger's night charge based on EV SOC, solar forecast, temperature, and learned patterns |
+| `select.sem_charger_<id>_charge_mode` | `Min + Solar` | **Per-charger.** One named selector carries the night-charging, smart-night, and tariff-window intent that used to live on three separate switches. Options: *Solar only* / *Solar + cheapest hours* / *Min + Solar* / *Always (max)* / *Off*. |
 
-EV charge targets, charging mode, currents, phases and consumption are all **per-charger** entities too (`number.sem_charger_<id>_…`, `select.sem_charger_<id>_…`) — the global EV settings were removed in #255 (per-charger is the source of truth; globals are read-only summaries). Everything else — solar charging, surplus distribution, battery protection, peak management — is fully automatic.
+EV charge targets, currents, phases and consumption are all **per-charger** entities too (`number.sem_charger_<id>_…`, `select.sem_charger_<id>_…`) — the global EV settings were removed in #255 (per-charger is the source of truth; globals are read-only summaries). Everything else — solar charging, surplus distribution, battery protection, peak management — is fully automatic.
 
 ---
 
-## Charging Modes
+## Charging Modes (v1.6.3)
 
-### Solar Charging (default)
+The per-charger `Charge mode` selector replaces the four-toggle soup with five named modes. Each mode composes with the existing Charge Target range (Min / Max) and the Charge by HH:MM deadline.
 
-During the day, SEM dynamically adjusts the EV charging current (6-32A) to match real-time solar surplus. If surplus drops below the minimum threshold, charging pauses until surplus returns. The battery's SOC determines how aggressively SEM uses stored energy to help the EV (see [Setup Guide — SOC Zones](docs/SETUP_GUIDE.md#soc-zone-strategy)).
+### Solar only
 
-### Min+PV (Minimum + Solar)
+Pure surplus, never grid. Equivalent to the legacy `self_consumption` + `night_charging=OFF`. Pick this if you only ever want to charge from sun.
 
-Guarantees a minimum charging current (6A) from the grid and adds solar surplus on top. Use this when you need the car charged by a deadline but still want to maximize solar usage.
+### Solar + cheapest hours
 
-Set via integration options: `ev_charging_mode = "minpv"`.
+Surplus by day, grid only in the cheapest contiguous tariff window at night (Min still guaranteed by the deadline). Hidden if no dynamic tariff is configured. Equivalent to `auto` + `tariff_optimized=ON`.
 
-### Night Charging
+### Min + Solar (default)
 
-**Opt-in (off by default).** SEM charges on solar surplus only until you enable overnight grid charging — so a fresh install never pulls from the grid unasked. Once enabled with `switch.sem_night_charging` (and the per-charger switch in a multi-charger setup), overnight grid charging starts automatically after sunset, runs at a peak-managed rate to avoid demand spikes, and stops when the daily EV target is reached. Battery discharge protection prevents the home battery from powering the EV overnight. Upgrading users keep their existing setting.
+Guarantees Min by deadline, solar adds up to Max. **Zone-adaptive during the day** — the Min guarantee comes from NIGHT charging top-up, not forced grid pull at noon. During the day the strategy machine still consults the SOC zone (battery priority when low, surplus when high, battery-assist in Zone 4). Most users want this.
+
+### Always (max)
+
+Charge at maximum regardless of source. Strict "Min from grid at all times" behaviour — equivalent to the legacy `minpv` mode.
+
+### Off
+
+No charging. SEM monitors but issues no commands to the charger.
+
+Battery discharge protection prevents the home battery from powering the EV overnight regardless of mode.
 
 ### Battery-Assisted Charging
 
@@ -310,7 +319,7 @@ SEM creates 70+ sensors organized by category:
 
 ## EV Intelligence
 
-SEM learns your EV's charging behavior and makes smart decisions about when to charge. Enable via `switch.sem_smart_night_charging`.
+SEM learns your EV's charging behavior and makes smart decisions about when to charge. Implicit in the `Min + Solar` and `Solar + cheapest hours` Charge modes (v1.6.3); was the standalone `smart_night_charging` switch in v1.6.x.
 
 **How it works:**
 
@@ -350,7 +359,7 @@ automation:
             ({{ states('sensor.sem_daily_solar_energy') }} kWh)
 ```
 
-### Force charge EV when electricity is cheap
+### Force charge EV when electricity is cheap (v1.6.3)
 
 ```yaml
 automation:
@@ -364,11 +373,15 @@ automation:
         entity_id: binary_sensor.sem_ev_connected
         state: "on"
     action:
-      - service: switch.turn_on
+      - service: select.select_option
         target:
-          entity_id: switch.sem_night_charging
+          entity_id: select.sem_charger_ev_charger_charge_mode
+        data:
+          option: always_max
 ```
 
+Switch the mode back to `min_plus_solar` when the price level leaves "cheap" to return to normal solar-prioritized behaviour.
+
 ### Alert when grid peak approaches limit
 
 ```yaml
diff --git a/docs/EV_CHARGING_LOGIC.md b/docs/EV_CHARGING_LOGIC.md
@@ -1,5 +1,32 @@
 # EV Charging Logic — How SEM decides
 
+![New EV card (v1.6.3) — single Charge mode selector replaces the legacy night/smart-night/tariff switches](images/sem_ev_tab.png)
+
+> **⚠️ Updated for v1.6.3 — the toggle-soup is gone.**
+>
+> v1.6.3 (#277) replaces the four-switch architecture this guide
+> describes (``ev_charging_mode`` × ``night_charging`` ×
+> ``smart_night_charging`` × ``tariff_optimized``) with one named
+> per-charger ``Charge mode`` selector. The five modes are:
+>
+> | Mode | What it does | When to pick |
+> |---|---|---|
+> | **Solar only** | Pure surplus, never grid | Solar maximalist |
+> | **Solar + cheapest hours** | Surplus by day, grid only in the cheapest tariff windows (hidden if no dynamic tariff configured) | Dynamic-tariff users |
+> | **Min + Solar** (default) | Guarantee Min from grid/night top-up, solar adds up to Max. Zone-adaptive during the day — Min comes from night charging, not forced grid pull at noon. | Daily commuter needing a baseline |
+> | **Always (max)** | Charge at maximum regardless of source | "Just charge the car" / strict legacy-``minpv`` behaviour |
+> | **Off** | No charging | Disabled |
+>
+> Plus the existing **Charge Target range** (Min / Max), **Charge by HH:MM** deadline, and **Set as default** button as the per-mode detail. The old standalone switches (``night_charging``, ``smart_night_charging``, ``tariff_optimized``, ``ev_charging_mode``) are **removed** — automations that read them must read the new ``select.sem_charger_<id>_charge_mode`` instead.
+>
+> The behavioural-priority cascade below (Min ▷ Charge by ▷ Cheapest hours ▷ Smart night ▷ Mode ▷ Surplus) still applies — the **intent** moved into the mode selector. A full rewrite of this guide tracking the new model is tracked separately; the historical detail below remains accurate for the pre-v1.6.3 toggle layout but the entity names have changed.
+
+---
+
+## Legacy reference (pre-v1.6.3)
+
+The sections below describe the toggle architecture that v1.6.3 consolidated. Kept for now so existing dashboards and automations migrating off the old switches have a reference; will be rewritten in a follow-up release to describe only the new mode selector.
+
 SEM's EV controller takes input from up to **6 user controls** plus solar, battery, grid, and (optionally) tariff prices. This guide is the canonical reference for how those inputs interact.
 
 > **TL;DR — the priority cascade:**
diff --git a/docs/MULTI_DEVICE_GUIDE.md b/docs/MULTI_DEVICE_GUIDE.md
@@ -77,18 +77,19 @@ This guide covers setting up SEM with different hardware combinations. SEM auto-
 
 > **Important**: Use EITHER the number entity OR the service. Leave the other blank.
 
-### Per-Charger Settings (v1.5.2+)
+### Per-Charger Settings (v1.5.2+; consolidated in v1.6.3)
 
-Each charger gets its own night charging configuration:
+Each charger gets its own EV charging configuration:
 
 | Entity | Description |
 |--------|-------------|
 | `number.sem_charger_{id}_daily_ev_target` | Night charging target (kWh) per charger |
+| `number.sem_charger_{id}_daily_ev_target_max` | Solar-surplus ceiling (kWh) per charger |
 | `number.sem_charger_{id}_night_initial_current` | Start amps for night charging |
 | `number.sem_charger_{id}_minimum_current` | Minimum charging current (A) |
-| `switch.sem_charger_{id}_night_charging` | Enable/disable night charging per charger |
+| `select.sem_charger_{id}_charge_mode` | Per-charger Charge mode (Solar only / Solar + cheapest hours / Min + Solar / Always (max) / Off). v1.6.3 replacement for the legacy `night_charging`, `smart_night_charging`, `tariff_optimized` switches. |
 
-You can set different targets per car — e.g., 15 kWh for a large EV, 8 kWh for a plug-in hybrid. These settings are also editable in the config flow (Settings → Integrations → SEM → Configure → Edit charger).
+You can set different modes and targets per car — e.g., *Min + Solar* with 15 kWh Min for a daily commuter, *Solar only* with 8 kWh Max for a plug-in hybrid. These settings are also editable in the config flow (Settings → Integrations → SEM → Configure → Edit charger).
 
 ### Per-Charger Sensors
 
diff --git a/docs/QUICK_START.md b/docs/QUICK_START.md
@@ -150,13 +150,12 @@ Once installed, SEM runs without manual intervention:
 - **Night charging** — *opt-in (off by default)*; when enabled, grid-charges the EV to your daily-target floor
 - **Smart forecast** — if tomorrow is sunny, tonight's grid charging is reduced or skipped
 
-The three switches that matter most:
+The controls that matter most (v1.6.3 — `night_charging` and `smart_night_charging` switches replaced by the per-charger `Charge mode` selector):
 
-| Switch | Default | Purpose |
+| Entity | Default | Purpose |
 |--------|---------|---------|
-| `switch.sem_night_charging` | OFF | Opt-in: grid-charges EV overnight to the daily-target floor (off by default → solar surplus only) |
+| `select.sem_charger_<id>_charge_mode` | `Min + Solar` | Per-charger intent: Solar only / Solar + cheapest hours / Min + Solar / Always (max) / Off. The named mode carries the night-charging and tariff-window intent that used to live on separate switches. |
 | `switch.sem_observer_mode` | OFF | Monitor-only, no hardware control |
-| `switch.sem_smart_night_charging` | OFF | Reduces overnight charging when a good solar forecast exists |
 
 Everything else is automatic.
 
diff --git a/docs/SETUP_GUIDE.md b/docs/SETUP_GUIDE.md
@@ -341,13 +341,12 @@ must be stable for 60 seconds before a notification fires).
 | Update interval (s) | 10 | How often SEM reads sensors and adjusts devices. Lower values are more responsive but use more CPU. Values below 5 are not recommended. Raise it to 30 if you are on low-powered hardware and SEM is using too much CPU. |
 | Power delta (W) | 50 | Minimum power change before SEM updates a device. Prevents constant small adjustments. Raise it if you see too many small current adjustments to the EV charger. |
 
-### Switches for use in automations
+### Controls for use in automations
 
-| Switch | Purpose |
+| Entity | Purpose |
 |--------|---------|
-| `switch.sem_night_charging` | Enable or disable overnight EV charging |
+| `select.sem_charger_<id>_charge_mode` | Per-charger EV intent (v1.6.3) — Solar only / Solar + cheapest hours / Min + Solar / Always (max) / Off. Replaces the legacy `night_charging`, `smart_night_charging`, `tariff_optimized` switches and `ev_charging_mode` select. |
 | `switch.sem_observer_mode` | Toggle read-only mode without reinstalling |
-| `switch.sem_smart_night_charging` | Toggle forecast-aware night charge evaluation |
 
 ### Dashboard settings
 
@@ -477,13 +476,16 @@ EV charger card — one place, per charger, no config-flow round-trips:
   Max handle of the range slider — solar-surplus charging stops once this ceiling is
   reached. Defaults to full (charge freely from sun); lower it to cap surplus. (Replaces
   the former *Limit surplus* switch.)
-- **Night charging** (`switch.sem_charger_<id>_night_charging`): when on, off-peak/night
-  charging tops the car up to the target.
-
-These three controls are independent, so all eight combinations of
-target type × surplus-limit × night-charging are supported. (The old `surplus_target`
-device mode and scattered config-flow toggles have been removed; existing
-`ev_target_mode` settings are migrated to `ev_target_type` automatically.)
+- **Charge mode** (`select.sem_charger_<id>_charge_mode`, v1.6.3): the per-charger
+  intent that carries the night-charging + tariff-window decision. Picking
+  *Min + Solar* (the default) or *Solar + cheapest hours* implicitly enables
+  the night-window top-up to the Min target; picking *Solar only* skips it.
+
+These controls compose freely (Target type × Solar-max × Charge mode). The legacy
+`switch.sem_charger_<id>_night_charging`, `..._smart_night_charging`,
+`..._tariff_optimized`, and `select.sem_charger_<id>_ev_charging_mode` have been
+removed in v1.6.3 — their intent now lives in the single Charge mode selector.
+Existing `ev_target_mode` settings are migrated to `ev_target_type` automatically.
 
 ### Controllable and Critical toggles
 
diff --git a/docs/images/sem_ev_tab.png b/docs/images/sem_ev_tab.png
diff --git a/docs/images/sem_home_tab.png b/docs/images/sem_home_tab.png
diff --git a/manifest.json b/manifest.json
@@ -22,5 +22,5 @@
   ],
   "quality_scale": "platinum",
   "requirements": [],
-  "version": "1.7.0"
+  "version": "1.6.3"
 }
diff --git a/tests/test_dashboard_generator.py b/tests/test_dashboard_generator.py
@@ -134,14 +134,14 @@ def test_url_includes_version_and_short_hash(self, tmp_path):
         (card_root / "sem-localize.js").write_bytes(b"const x = 1;")
         base = "/local/custom_components/solar_energy_management/dashboard/card/sem-localize.js"
 
-        bust = self._bust(str(card_root), base, "1.7.0")
+        bust = self._bust(str(card_root), base, "1.6.3")
 
         # Format must be ``{version}-{8-hex-char hash}`` — matches the
         # _async_register_frontend_resources bundle path so both registration
         # paths produce identical URLs for the same file content.
         assert "-" in bust
         version, short = bust.split("-", 1)
-        assert version == "1.7.0"
+        assert version == "1.6.3"
         assert len(short) == 8
         assert all(c in "0123456789abcdef" for c in short)
 
@@ -152,10 +152,10 @@ def test_url_changes_when_content_changes(self, tmp_path):
         base = "/local/custom_components/solar_energy_management/dashboard/card/sem-localize.js"
 
         f.write_bytes(b'{"charge_mode": "Charge mode"}')
-        before = self._bust(str(card_root), base, "1.7.0")
+        before = self._bust(str(card_root), base, "1.6.3")
 
         f.write_bytes(b'{"charge_mode": "Charge mode", "charge_mode_min_plus_solar": "Min + Solar"}')
-        after = self._bust(str(card_root), base, "1.7.0")
+        after = self._bust(str(card_root), base, "1.6.3")
 
         assert before != after, (
             "cache-bust must track file content — adding a new translation key "
@@ -169,8 +169,8 @@ def test_url_stable_across_calls_when_content_unchanged(self, tmp_path):
         (card_root / "sem-localize.js").write_bytes(b"const x = 1;")
         base = "/local/custom_components/solar_energy_management/dashboard/card/sem-localize.js"
 
-        first = self._bust(str(card_root), base, "1.7.0")
-        second = self._bust(str(card_root), base, "1.7.0")
+        first = self._bust(str(card_root), base, "1.6.3")
+        second = self._bust(str(card_root), base, "1.6.3")
 
         assert first == second
 
@@ -181,10 +181,10 @@ def test_url_for_nested_bundle_path(self, tmp_path):
         (card_root / "dist" / "sem-cards.js").write_bytes(b"// bundle")
         base = "/local/custom_components/solar_energy_management/dashboard/card/dist/sem-cards.js"
 
-        bust = self._bust(str(card_root), base, "1.7.0")
+        bust = self._bust(str(card_root), base, "1.6.3")
 
         version, short = bust.split("-", 1)
-        assert version == "1.7.0"
+        assert version == "1.6.3"
         assert len(short) == 8
 
     def test_missing_file_falls_back_to_bare_version(self, tmp_path):
@@ -193,9 +193,9 @@ def test_missing_file_falls_back_to_bare_version(self, tmp_path):
         card_root = tmp_path
         base = "/local/custom_components/solar_energy_management/dashboard/card/sem-localize.js"
 
-        bust = self._bust(str(card_root), base, "1.7.0")
+        bust = self._bust(str(card_root), base, "1.6.3")
 
-        assert bust == "1.7.0"
+        assert bust == "1.6.3"
 
     def test_no_timestamp_anti_pattern_in_service_path(self):
         """Guard the regression: the legacy ``int(time.time())`` cache-bust

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@`
`22`	`22`	`],`
`23`	`23`	`"quality_scale": "platinum",`
`24`	`24`	`"requirements": [],`
`25`		`- "version": "1.7.0"`
	`25`	`+ "version": "1.6.3"`
`26`	`26`	`}`