fix(output): keep the state in front of a warning that repeats mid-run

A warning recorded mid-run was written bare, then with the run's state in
front of it at the end, so a warning that recurs every cycle changed the
status sensor's state twice a cycle. A warning whose text repeats the one
already shown now keeps that state in front of it. Any other warning or error,
including a run bailing out without executing, is still shown bare - so two
different recurring warnings, or one whose text changes each cycle, still
change state within a cycle, as they did before.

Also stop reading Predheat's bare "Warn - ..." as a charge/export state in the
History view, and document the status format and the History red flag.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: chalfontchubby

apps/predbat/output.py

@@ -85,7 +85,7 @@ def split_status_warning(status):
     component_suffix = " with component errors"
     if lowered.startswith(component_prefix) and component_suffix in lowered:
         return status[len(component_prefix) : lowered.index(component_suffix)].strip(), status
-    if lowered.startswith("warn:") or lowered.startswith("error:"):
+    if lowered.startswith("warn:") or lowered.startswith("warn -") or lowered.startswith("error:"):
         return "", status
     for marker in (", warn:", ", error:"):
         index = lowered.find(marker)
@@ -2732,7 +2732,16 @@ def record_status(self, message, debug="", had_errors=False, notify=False, extra
         if not extra:
             extra = ""
 
-        self.current_status = message + extra
+        # A warning that repeats the one already shown behind the previous run's state keeps that
+        # state in front of it, rather than flipping the sensor back to the bare warning for the few
+        # seconds until this run's own state is put back - two state changes every cycle for as long
+        # as the warning recurs. Any different warning or error, including the ones a run records
+        # when it bails out without executing, is shown bare.
+        state_message = message
+        if had_errors and self.current_status and self.current_status != message and self.current_status.endswith(", " + message):
+            state_message = self.current_status
+
+        self.current_status = state_message + extra
         if notify and self.previous_status != message and self.set_status_notify:
             if self.had_errors and had_errors:
                 # Already in error state, do not notify second error in a single run (spam)
@@ -2758,7 +2767,7 @@ def record_status(self, message, debug="", had_errors=False, notify=False, extra
         # exactly the cycles the warning matters.
         self.dashboard_item(
             self.prefix + ".status",
-            state=message[:255],
+            state=state_message[:255],
             attributes={
                 "friendly_name": "Status",
                 "detail": extra,

apps/predbat/tests/test_calculate_yesterday.py

@@ -2186,6 +2186,7 @@ def _test_yesterday_status_core(my_predbat, failed):
         ("Error: Complete run status Hold charging with component errors: fox", "Hold charging"),
         ("Exporting, Warn: Return bad float value unavailable from car_charging_soc", "Exporting"),
         ("Freeze exporting, Hold for car, Error: Inverter 0 unable to read Export window", "Freeze exporting, Hold for car"),
+        ("Warn - Unable to fetch data from sensor.outdoor_temperature", ""),
     ]
     for status, expected in cases:
         result = yesterday_status_core(status)
@@ -2291,6 +2292,12 @@ def _test_warning_status_is_not_a_charge_state(my_predbat, failed):
         print("ERROR: the warning should be passed on to flag the slots, got {}".format(captured.get("status_warnings") and set(captured["status_warnings"].values())))
         failed = True
 
+    # The real sequence in a cycle: the bare warning mid-run, then the state put in front of it
+    captured = _reconstruct_windows_from_status(my_predbat, lambda stamp: [(0, warning), (8, "Exporting, " + warning)])
+    if captured.get("charge_window_best") or not captured.get("export_window_best"):
+        print("ERROR: a bare warning followed by 'Exporting, Warn: ...' should rebuild exports only, got {} charge and {} export windows".format(len(captured.get("charge_window_best") or []), len(captured.get("export_window_best") or [])))
+        failed = True
+
     # A freeze export under a warning stays a freeze - the exact state survives, not just its side
     captured = _reconstruct_windows_from_status(my_predbat, lambda stamp: [(0, "Freeze exporting, " + warning)])
     if not captured.get("export_limits_best") or any(export_mode_of(limit) != EXPORT_MODE_FREEZE for limit in captured["export_limits_best"]):

apps/predbat/tests/test_component_health_status.py

@@ -140,6 +140,21 @@ def test_record_status_under_warning(my_predbat):
         else:
             print("OK: state recorded in front of the warning, debug and error_count kept")
 
+        # The next run raises the same warning mid-run: the state stays in front of it, so the sensor
+        # doesn't flip to the bare warning and back every cycle
+        my_predbat.had_errors = False
+        my_predbat.status_warning = None
+        my_predbat.record_status(warning, had_errors=True)
+        if my_predbat.dashboard_values[status_entity]["state"] != "Exporting, " + warning:
+            print("ERROR: a repeated warning should keep the state in front of it, got {!r}".format(my_predbat.dashboard_values[status_entity]["state"]))
+            failed = 1
+
+        # A different warning or error - e.g. a run bailing out without executing - is shown bare
+        my_predbat.record_status("Error: Failed to fetch inverter data, not able to execute the plan", had_errors=True)
+        if my_predbat.dashboard_values[status_entity]["state"] != "Error: Failed to fetch inverter data, not able to execute the plan":
+            print("ERROR: a different error should be shown bare, got {!r}".format(my_predbat.dashboard_values[status_entity]["state"]))
+            failed = 1
+
         # had_errors set by a component thread with no warning recorded, right after a restart
         my_predbat.dashboard_values[status_entity] = {"state": "Demand", "attributes": {}}
         my_predbat.current_status = None

docs/output-data.md

@@ -269,6 +269,8 @@ If you toggle this switch in Home Assistant it will force Predbat to perform an
 
 - **predbat.status** - Gives the current status & errors and logs any changes that Predbat makes to your inverter.
 The different Predbat status values and their meanings are detailed in [what does Predbat do](what-does-predbat-do.md#predbat-status).
+When a warning is reported during a plan update, the update ends by putting the state it carried out in front of the warning, e.g. `Exporting, Warn: ...`.
+An update that stopped before carrying anything out shows the warning or error on its own.
 
 ![image](https://github.com/springfall2008/batpred/assets/48591903/e24914b8-93d9-4217-812a-ac25a569a52c)
 

docs/web-interface.md

@@ -77,6 +77,8 @@ The starting battery SoC for this simulation is carried forward from the end of
 'without Predbat' universe remains self-consistent — i.e. if Predbat had not been running, the battery may have had a different SoC at midnight than it actually did.
 This means the starting SoC shown in the 'Yesterday without Predbat' view can differ significantly from the 'History' view, which reflects what actually happened.
 
+A time slot in the 'History' view where Predbat reported a warning or error is marked with 🚩 next to its state - the state shown is still the one Predbat carried out, and hovering over it names the problem.
+
 The 'History' view also shows a **Debug** column with a download link on any time slot that has an automatically-captured [debug history snapshot](customisation.md#debug-history) from around that time - useful for grabbing the real Predbat state from the moment something looked wrong, without needing to have had debug mode switched on in advance.
 
 You can easily change Predbat's planned activity for a slot by clicking on the slot time, then selecting Manual Demand, Manual Charge, Manual Export, Manual Freeze Charge or Manual Freeze Export to set the activity.