various tidyups

packages/Lighting_2Way_Sync/office_lights_ha_fallback_sync.yaml

@@ -1,26 +1,28 @@
 #:########################################################################################:#
 # PACKAGE: Office Lights Home Assistant Fallback Synchronization
 # FILE:    Lighting_2Way_Sync/office_lights_ha_fallback_sync.yaml
-# VERSION: v1.0.0
-# DATE:    2026-08-16
+# VERSION: v1.2.0
+# DATE:    2026-09-12
 #:########################################################################################:#
 #
 # PURPOSE:
-#   Provides the Home Assistant API transport for Office two-way light control
-#   when MQTT is unavailable. Direct MQTT remains the HA-down transport.
+#   Provides Home Assistant-primary synchronization for the Office two-way
+#   light controls. Direct MQTT peer control is the HA-down transport.
 #
 # OPERATION:
 #   - Synchronizes the Office bunker and overhead control pairs in both directions.
-#   - Uses idempotent Home Assistant actions, so MQTT and HA may both be online
-#     without creating a control loop.
+#   - ESPHome permits direct MQTT peer synchronization only while HA's native
+#     API state subscription is disconnected, preventing competing controllers.
 #   - Does not reconcile state during Home Assistant startup, preventing a stale
 #     restored entity state from changing a physical light.
 #
 # DEPENDENCIES:
 #   - Blueprint: zorruno/two_three_way_sync.yaml
-#   - esp-officelights and esp-officeduallights native ESPHome API connections.
+#   - esp-officelights v3.2 and esp-officeduallights v3.0 or later.
 #
 # VERSION HISTORY:
+#   - v1.2.0 (2026-09-12): Enable after guarded HA-primary firmware deployment.
+#   - v1.1.0 (2026-09-12): Disabled until guarded HA-primary firmware deployment.
 #   - v1.0.0 (2026-08-16): Initial MQTT-down HA fallback for Office lights.
 #:########################################################################################:#
 

packages/Lighting_2Way_Sync/office_lights_ha_fallback_sync.yaml.bak

@@ -0,0 +1,57 @@
+#:########################################################################################:#
+# PACKAGE: Office Lights Home Assistant Fallback Synchronization
+# FILE:    Lighting_2Way_Sync/office_lights_ha_fallback_sync.yaml
+# VERSION: v1.1.0
+# DATE:    2026-09-12
+#:########################################################################################:#
+#
+# PURPOSE:
+#   Provides the Home Assistant API transport for Office two-way light control
+#   when MQTT is unavailable. Direct MQTT remains the HA-down transport.
+#
+# OPERATION:
+#   - Synchronizes the Office bunker and overhead control pairs in both directions.
+#   - The automations remain disabled until both ESPHome devices enforce the
+#     HA-primary/MQTT-fallback authority boundary.
+#   - Does not reconcile state during Home Assistant startup, preventing a stale
+#     restored entity state from changing a physical light.
+#
+# DEPENDENCIES:
+#   - Blueprint: zorruno/two_three_way_sync.yaml
+#   - esp-officelights and esp-officeduallights native ESPHome API connections.
+#
+# VERSION HISTORY:
+#   - v1.1.0 (2026-09-12): Disable until guarded HA-primary firmware is deployed.
+#   - v1.0.0 (2026-08-16): Initial MQTT-down HA fallback for Office lights.
+#:########################################################################################:#
+
+automation:
+  #:##########################################################################:#
+  # BUNKER LIGHTS
+  #:##########################################################################:#
+  - id: office_bunker_lights_ha_fallback_sync
+    alias: "Office Bunker Lights HA Fallback Sync"
+    initial_state: false
+    use_blueprint:
+      path: zorruno/two_three_way_sync.yaml
+      input:
+        members:
+          - switch.office_office_main_lightswitch_3_relay_1_bunker_lights
+          - light.esp_officeduallights_light_1_right_hand_bunker_light
+        sync_on_start: false
+        startup_delay: 5
+
+  #:##########################################################################:#
+  # OVERHEAD LIGHTS
+  #:##########################################################################:#
+  - id: office_overhead_lights_ha_fallback_sync
+    alias: "Office Overhead Lights HA Fallback Sync"
+    initial_state: false
+    use_blueprint:
+      path: zorruno/two_three_way_sync.yaml
+      input:
+        members:
+          - switch.office_office_main_lightswitch_3_relay_2_overhead_lights
+          - light.esp_officeduallights_light_2_cool_white_overhead_lights
+        sync_on_start: false
+        startup_delay: 5