various tidyups

packages/free_power_time_actions.yaml

@@ -2,6 +2,11 @@
 # PACKAGE: Free Power Time Automation                                                     #
 #:########################################################################################:#
 # VERSION:
+#   1.2.1 - 2026-08-17
+#     - Allow the configured end-time trigger to run without waiting for the
+#       Free Power Time Active template sensor to update at the same instant.
+#       The inactive-window check now applies only to startup catch-up.
+#
 #   1.2.0 - 2026-07-24
 #     - Added startup catch-up to end_actions: when HA starts outside the
 #       free power window, the end actions (chargers off, dehumidifier off)
@@ -321,11 +326,15 @@ automation:
     triggers:
       - trigger: time
         at: input_datetime.free_power_end_time
+        id: scheduled_end
       - trigger: homeassistant
         event: start
+        id: startup
     conditions:
-      - condition: state
-        entity_id: binary_sensor.free_power_time_active
-        state: "off"
+      # The scheduled end must not race the template sensor's minute update.
+      # Startup catch-up still runs only outside the free power window.
+      - condition: template
+        value_template: >-
+          {{ trigger.id == 'scheduled_end' or is_state('binary_sensor.free_power_time_active', 'off') }}
     actions:
       - action: script.free_power_end_actions