fix(crow_alarm_panel): address Copilot review comments on PR #6

Decouple last_confirmed_acp_state_/alarm_control_panel_ updates in the
ARMED_STATE handler from the armed_state_ text-sensor null check, so
watchdog-abort recovery works even when only alarm_control_panel: is
configured. Reword the field's comment to note it's also set
heuristically from zone activity, not only ARMED_STATE broadcasts.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: dan-s-github

components/crow_alarm_panel/crow_alarm_panel.cpp

@@ -384,35 +384,39 @@ void CrowAlarmPanel::loop() {
           ESP_LOGW(TAG, "[%-*s] Armed state too short, discarding", this->keypad_label_width_, CONTROLLER_LABEL);
           break;
         }
-        if (armed_state_ != nullptr) {
-          if (data[0] == 0x00 && data[1] == 0x01) {
+        if (data[0] == 0x00 && data[1] == 0x01) {
+          if (this->armed_state_ != nullptr) {
             this->armed_state_->publish_state("arming");
-            ESP_LOGD(TAG, "[%-*s] Arming [%02x.%s]", this->keypad_label_width_, CONTROLLER_LABEL, type,
-                     format_hex_pretty(data).c_str());
-            this->last_confirmed_acp_state_ = alarm_control_panel::ACP_STATE_ARMING;
-            if (this->alarm_control_panel_ != nullptr) {
-              this->alarm_control_panel_->publish_state(alarm_control_panel::ACP_STATE_ARMING);
-            }
-          } else if (data[0] == 0x01 && data[1] == 0x00) {
+          }
+          ESP_LOGD(TAG, "[%-*s] Arming [%02x.%s]", this->keypad_label_width_, CONTROLLER_LABEL, type,
+                   format_hex_pretty(data).c_str());
+          this->last_confirmed_acp_state_ = alarm_control_panel::ACP_STATE_ARMING;
+          if (this->alarm_control_panel_ != nullptr) {
+            this->alarm_control_panel_->publish_state(alarm_control_panel::ACP_STATE_ARMING);
+          }
+        } else if (data[0] == 0x01 && data[1] == 0x00) {
+          if (this->armed_state_ != nullptr) {
             this->armed_state_->publish_state("armed_away");
-            ESP_LOGD(TAG, "[%-*s] Armed Away [%02x.%s]", this->keypad_label_width_, CONTROLLER_LABEL, type,
-                     format_hex_pretty(data).c_str());
-            this->last_confirmed_acp_state_ = alarm_control_panel::ACP_STATE_ARMED_AWAY;
-            if (this->alarm_control_panel_ != nullptr) {
-              this->alarm_control_panel_->publish_state(alarm_control_panel::ACP_STATE_ARMED_AWAY);
-            }
-          } else if (data[0] == 0x00 && data[1] == 0x00) {
+          }
+          ESP_LOGD(TAG, "[%-*s] Armed Away [%02x.%s]", this->keypad_label_width_, CONTROLLER_LABEL, type,
+                   format_hex_pretty(data).c_str());
+          this->last_confirmed_acp_state_ = alarm_control_panel::ACP_STATE_ARMED_AWAY;
+          if (this->alarm_control_panel_ != nullptr) {
+            this->alarm_control_panel_->publish_state(alarm_control_panel::ACP_STATE_ARMED_AWAY);
+          }
+        } else if (data[0] == 0x00 && data[1] == 0x00) {
+          if (this->armed_state_ != nullptr) {
             this->armed_state_->publish_state("disarmed");
-            ESP_LOGD(TAG, "[%-*s] Disarmed [%02x.%s]", this->keypad_label_width_, CONTROLLER_LABEL, type,
-                     format_hex_pretty(data).c_str());
-            this->last_confirmed_acp_state_ = alarm_control_panel::ACP_STATE_DISARMED;
-            if (this->alarm_control_panel_ != nullptr) {
-              this->alarm_control_panel_->publish_state(alarm_control_panel::ACP_STATE_DISARMED);
-            }
-          } else {
-            ESP_LOGD(TAG, "[%-*s] Armed state unknown [%02x.%s]", this->keypad_label_width_, CONTROLLER_LABEL, type,
-                     format_hex_pretty(data).c_str());
           }
+          ESP_LOGD(TAG, "[%-*s] Disarmed [%02x.%s]", this->keypad_label_width_, CONTROLLER_LABEL, type,
+                   format_hex_pretty(data).c_str());
+          this->last_confirmed_acp_state_ = alarm_control_panel::ACP_STATE_DISARMED;
+          if (this->alarm_control_panel_ != nullptr) {
+            this->alarm_control_panel_->publish_state(alarm_control_panel::ACP_STATE_DISARMED);
+          }
+        } else {
+          ESP_LOGD(TAG, "[%-*s] Armed state unknown [%02x.%s]", this->keypad_label_width_, CONTROLLER_LABEL, type,
+                   format_hex_pretty(data).c_str());
         }
         // ARMED_STATE is the controller's own authoritative state broadcast, independent of the
         // arm/disarm state machine below — this is the only signal CODE_ENTER_PENDING treats as

components/crow_alarm_panel/crow_alarm_panel.h

@@ -300,11 +300,13 @@ class CrowAlarmPanel : public Component {
   std::string code_;
   text_sensor::TextSensor *armed_state_{nullptr};
   alarm_control_panel::AlarmControlPanel *alarm_control_panel_{nullptr};
-  // Last state the controller itself confirmed via an ARMED_STATE broadcast — unlike
-  // alarm_control_panel_->get_state(), never overwritten by the optimistic ACP_STATE_ARMING /
-  // ACP_STATE_DISARMING publish in CrowAlarmControlPanel::control(). Used to restore the entity
-  // to ground truth if the arm/disarm watchdog aborts a sequence, so a failed disarm doesn't
-  // strand the entity in ACP_STATE_DISARMING forever (see arm_disarm_state_machine.md).
+  // Last state we're confident is ground truth — set from the controller's own ARMED_STATE
+  // broadcasts, and also from heuristic zone-activity publishes (zone motion -> DISARMED, zone
+  // alarm -> PENDING) in the ZONE_STATE handler. Unlike alarm_control_panel_->get_state(), never
+  // overwritten by the optimistic ACP_STATE_ARMING / ACP_STATE_DISARMING publish in
+  // CrowAlarmControlPanel::control(). Used to restore the entity to ground truth if the
+  // arm/disarm watchdog aborts a sequence, so a failed disarm doesn't strand the entity in
+  // ACP_STATE_DISARMING forever (see arm_disarm_state_machine.md).
   alarm_control_panel::AlarmControlPanelState last_confirmed_acp_state_{alarm_control_panel::ACP_STATE_DISARMED};
   Trigger<uint8_t, std::vector<uint8_t>> *on_message_trigger_{new Trigger<uint8_t, std::vector<uint8_t>>()};