various tidyups

packages/jobs_tracker_appliance_completion_triggers.yaml

@@ -9,7 +9,7 @@
 #   jobs_tracker_appliance_completion_triggers.yaml
 #
 # VERSION:
-#   V1.0 2026-08-15
+#   V1.1 2026-09-03
 #
 # PURPOSE:
 #   Provides time-qualified appliance door and lid triggers for Jobs Tracker completion.
@@ -19,9 +19,13 @@
 #
 # OPERATION:
 #   Each contact must remain open for five seconds before its corresponding Jobs Tracker
-#   completion route is called. The job registry owns the completion entity mappings.
+#   completion route is called. Starting the dryer or washer clears only a previous Due
+#   unload job, so the next finished cycle creates its own new unload task.
 #
 # VERSION HISTORY:
+#   V1.1 2026-09-03
+#     - Clear a pending dryer or washer unload job when its next cycle starts.
+#
 #   V1.0 2026-08-15
 #     - Added five-second door and lid open completion triggers for dryer and washer jobs.
 #
@@ -63,3 +67,43 @@ automation:
         data:
           completion_entity: binary_sensor.washing_machine_lid_status_x39rs_contact
           completion_to_state: "on"
+
+  - id: jobs_tracker_clear_dryer_unload_on_start
+    alias: "Jobs Tracker - Clear Dryer Unload on Start"
+    description: "Clears an outstanding Empty the Dryer job when a new dryer cycle starts."
+    mode: single
+
+    triggers:
+      - trigger: state
+        entity_id: sensor.appliance_monitor_dryer_monitor
+        to: Operating
+
+    conditions:
+      - condition: state
+        entity_id: sensor.jobs_tracker_empty_dryer
+        state: Due
+
+    actions:
+      - action: script.jobs_tracker_dispatch
+        data:
+          job_id: empty_dryer
+
+  - id: jobs_tracker_clear_washer_unload_on_start
+    alias: "Jobs Tracker - Clear Washer Unload on Start"
+    description: "Clears an outstanding Empty the Washer job when a new washer cycle starts."
+    mode: single
+
+    triggers:
+      - trigger: state
+        entity_id: sensor.appliance_monitor_washing_machine_monitor
+        to: Operating
+
+    conditions:
+      - condition: state
+        entity_id: sensor.jobs_tracker_empty_washing_machine
+        state: Due
+
+    actions:
+      - action: script.jobs_tracker_dispatch
+        data:
+          job_id: empty_washing_machine