Codex updated: Fix discovery crash from quirk removing ZCL attributes

[dmulcahey]

This pull request was created with Codex and is an updated version of the pull request it supersedes.

Original pull request: #788

DRAFT.

Proposed change

This fixes an issue where a (custom) quirk can remove standard ZCL attributes. Most entity platforms already have guards checking if the attribute even exists, but some do not. This adds them.

Additional information

I'm not sure if this is something we should add – quirks shouldn't misbehave like this. Or are there valid use-cases for deleting ZCL attributes...? But currently, ZHA startup breaks completely when using these custom quirks.

Should address:

• ZHA fails to start with 2026.6.x due to custom quirks home-assistant/core#173265

This "regression" was introduced with:

• Replace cluster handlers with entity attributes #657

AI summary

Issue and fix summary (CLICK TO EXPAND)

Issue

Some custom v1 quirks fully replace a standard cluster's attribute definitions, e.g. the widely used ts0601_trv_moes.py from jacekk015/zha_quirks does:

class MoesWindowDetection(LocalDataCluster, OnOff):
    attributes = LocalDataCluster.attributes.copy()  # empty dict
    attributes.update({
        0x6000: ("window_detection_temperature", t.int16s),
        0x6001: ("window_detection_timeout_minutes", t.uint8_t),
    })

The resulting OnOff cluster has no on_off/start_up_on_off attribute definitions. Cluster.is_attribute_unsupported() (and find_attribute()) raise KeyError for attribute names without a definition.

Since #657, Switch._is_supported() calls cluster.is_attribute_unsupported("on_off") during entity discovery. The KeyError propagated through Device._add_pending_entities() → Gateway.load_devices() → HA's async_setup_entry, so one broken custom quirk prevented the entire ZHA integration from starting (ConfigEntryNotReady retry loop). Previously, the cluster-handler-based code tolerated these clusters.

Affected code paths

• Switch._is_supported() was the only _is_supported implementation missing the attributes_by_name guard that all other platforms already had (the crash from the linked issue).
• WindowCoveringInversionSwitch._is_supported() had the guard, but evaluated is_attribute_unsupported() first.
• configure_cluster_configs() called find_attribute() unguarded on reporting attributes aggregated from entities not yet filtered by is_supported(), failing on device join/reconfigure.
• AggregatedClusterPoller.async_update() called is_attribute_unsupported() unguarded on sibling entities' cluster-config attributes during polling.

Fix

Check attr_name in cluster.attributes_by_name before calling is_attribute_unsupported()/find_attribute() at the four sites above, treating attributes without definitions as unsupported (entity not created / reporting skipped with a debug log).

A regression test joins a device with a quirks v2 quirk (local registry) that replaces the OnOff cluster with one whose AttributeDefs does not inherit the standard definitions, reproducing the exact KeyError: 'on_off' from the issue on unfixed code, and asserts device initialization succeeds with no switch entity created.

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 97.27%. Comparing base (c38e03e) to head (71d9acd).

Additional details and impacted files

@@           Coverage Diff           @@
##              dev     #833   +/-   ##
=======================================
  Coverage   97.27%   97.27%           
=======================================
  Files          55       55           
  Lines       10930    10940   +10     
=======================================
+ Hits        10632    10642   +10     
  Misses        298      298           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.