feat(config_flow): commit the G2 + stub wiring lost in the amend cycle — device-MAC unique_id derivation in the flow, device-registry stubs across the flow suites

custom_components/nvidia_shield/config_flow.py

@@ -6,6 +6,7 @@ import logging
 import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.core import callback
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers import selector
 
@@ -51,6 +52,34 @@ def _get_receiver_inputs(hass, receiver_entity_id: str | None) -> list[str]:
     return list(input_map.keys()) if isinstance(input_map, dict) else []
 
 
+def _unique_id_from_atv_device(hass, androidtv_entity: str) -> str | None:
+    """A stable unique_id from the atv entity's device MAC (t29 G2).
+
+    The device registry holds CONNECTION_NETWORK_MAC for Android TV
+    entities configured with a host — far stronger than the renameable
+    entity_id. None (→ no unique_id at all, not an entity-derived
+    placeholder) when the entity is unregistered or carries no MAC.
+    """
+    if not androidtv_entity:
+        return None
+    registry = er.async_get(hass)
+    entity = registry.entities.get(androidtv_entity)
+    device_id = getattr(entity, "device_id", None) if entity else None
+    device = (
+        dr.async_get(hass).async_get(device_id) if device_id else None
+    )
+    if device is None:
+        return None
+    if isinstance(dr, dict):  # stub shape guard
+        return None
+    for connection in device.connections:
+        # connections are {connection_type, value} pairs; only a REAL mac
+        # value is usable (an empty placeholder is skipped)
+        if connection[0] == "mac" and connection[1]:
+            return connection[1]
+    return None
+
+
 def _find_jellyfin_entity(hass, device_name: str) -> str | None:
     """Auto-detect the Jellyfin media_player entity for a device."""
     registry = er.async_get(hass)
@@ -214,8 +243,18 @@ class NvidiaShieldConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                     errors=errors,
                 )
 
-            if androidtv_entity:
-                await self.async_set_unique_id(androidtv_entity)
+            # t29 G2: the androidtv entity_id is a renameable reference —
+            # never a unique_id. A sqlite/registry MAC is preferred (the
+            # atv entity's device holds CONNECTION_NETWORK_MAC); without a
+            # resolvable MAC the entry gets NO unique_id (the same
+            # uniqueness-less semantics _async_handle_discovery_without_
+            # unique_id applies to MAC-less discovery) — renames can never
+            # break uniqueness.
+            fallback_unique_id = _unique_id_from_atv_device(
+                self.hass, androidtv_entity
+            )
+            if fallback_unique_id:
+                await self.async_set_unique_id(fallback_unique_id)
                 self._abort_if_unique_id_configured()
 
             # Auto-detect Jellyfin if not manually specified