Address review feedback: use internal wrappers and add conflict detection

- Use async_internal_get_usercodes/async_internal_clear_usercode instead
  of direct provider calls for rate limiting and availability checks
- Add comment noting provider limitation for slot detection
- Add PIN conflict detection in adopt step: first-seen PIN wins, skip
  conflicting values with warning log

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Entire-Checkpoint: 732e178917ee

Author: raman325

custom_components/lock_code_manager/config_flow.py

@@ -146,14 +146,18 @@ async def _async_get_unmanaged_codes(
             hass, dev_reg, ent_reg, lock_config_entry, lock_entry
         )
         try:
-            usercodes = await lock_instance.async_get_usercodes()
+            usercodes = await lock_instance.async_internal_get_usercodes()
         except Exception:  # noqa: BLE001
             _LOGGER.debug(
                 "Failed to get usercodes from %s during lock reset check",
                 lock_entity_id,
                 exc_info=True,
             )
             continue
+        # Note: some providers (Matter, Virtual) only return slots already
+        # configured in a Lock Code Manager config entry, so unmanaged codes
+        # on those providers will not be detected here. This reset step is
+        # most useful for Z-Wave locks which return all occupied slots.
         unmanaged = {
             slot: code
             for slot, code in usercodes.items()
@@ -266,7 +270,9 @@ async def async_step_lock_reset_clear(
                 continue
             for slot in codes:
                 try:
-                    await lock_instance.async_clear_usercode(slot)
+                    await lock_instance.async_internal_clear_usercode(
+                        slot, source="direct"
+                    )
                 except Exception:  # noqa: BLE001
                     _LOGGER.warning(
                         "Failed to clear slot %s on %s",
@@ -283,11 +289,22 @@ async def async_step_lock_reset_adopt(
     ) -> dict[str, Any]:
         """Adopt readable unmanaged codes into the Lock Code Manager configuration."""
         self.data.setdefault(CONF_SLOTS, {})
-        for codes in self._unmanaged_codes.values():
+        for lock_entity_id, codes in self._unmanaged_codes.items():
             for slot, code in codes.items():
                 if code is SlotCode.UNKNOWN:
                     continue
-                self.data[CONF_SLOTS][int(slot)] = {
+                int_slot = int(slot)
+                if int_slot in self.data[CONF_SLOTS]:
+                    existing_pin = self.data[CONF_SLOTS][int_slot].get(CONF_PIN)
+                    if existing_pin != str(code):
+                        _LOGGER.warning(
+                            "Slot %s has conflicting PINs across locks "
+                            "(keeping first seen PIN, skipping %s)",
+                            slot,
+                            lock_entity_id,
+                        )
+                        continue
+                self.data[CONF_SLOTS][int_slot] = {
                     CONF_NAME: f"Slot {slot}",
                     CONF_PIN: str(code),
                     CONF_ENABLED: True,
@@ -303,7 +320,9 @@ async def async_step_lock_reset_adopt(
                 continue
             for slot in masked_slots:
                 try:
-                    await lock_instance.async_clear_usercode(slot)
+                    await lock_instance.async_internal_clear_usercode(
+                        slot, source="direct"
+                    )
                 except Exception:  # noqa: BLE001
                     _LOGGER.warning(
                         "Failed to clear masked slot %s on %s",

tests/test_config_flow.py

@@ -319,7 +319,7 @@ async def test_lock_reset_readable_codes_clear(hass: HomeAssistant):
     """Test clearing unmanaged readable codes."""
     mock_clear = AsyncMock(return_value=True)
     mock_lock = AsyncMock()
-    mock_lock.async_clear_usercode = mock_clear
+    mock_lock.async_internal_clear_usercode = mock_clear
     unmanaged = {LOCK_1_ENTITY_ID: {3: "9999", 4: "8888"}}
     lock_instances = {LOCK_1_ENTITY_ID: mock_lock}
 
@@ -439,7 +439,7 @@ async def test_lock_reset_mixed_codes_adopt_clears_masked(hass: HomeAssistant):
     """Test that adopt with mixed codes adopts readable and clears masked."""
     mock_clear = AsyncMock(return_value=True)
     mock_lock = AsyncMock()
-    mock_lock.async_clear_usercode = mock_clear
+    mock_lock.async_internal_clear_usercode = mock_clear
     unmanaged = {LOCK_1_ENTITY_ID: {3: "9999", 4: SlotCode.UNKNOWN}}
     lock_instances = {LOCK_1_ENTITY_ID: mock_lock}
 
@@ -461,4 +461,4 @@ async def test_lock_reset_mixed_codes_adopt_clears_masked(hass: HomeAssistant):
     assert result["type"] == "menu"
     assert result["step_id"] == "choose_path"
     # Only the masked slot (4) should have been cleared
-    mock_clear.assert_called_once_with(4)
+    mock_clear.assert_called_once_with(4, source="direct")