DRAFT.

AI summary

When device_initialized() applies a quirk via get_device(), the raw Device object is replaced by a new BaseCustomDevice instance. However, the raw device's registered callback listeners (notably the PollControl check-in listener from Device.__init__) were never cleaned up, leaving an orphaned _req_listeners entry keyed by the dead raw device object.

This removes the raw device's _req_listeners key entirely when quirk wrapping creates a new instance. When no quirk matches (same object returned), nothing is changed.

Why _req_listeners.pop() instead of device.on_remove()

device_initialized() runs inside the device's own _initialize_task:

schedule_initialize()
  └─ _initialize_task = create_task(initialize())
       └─ initialize() → _initialize()
            ├─ _discover()
            └─ device_initialized(self)  ← here

create_task() adds the task to self._tasks and registers self._tasks.remove as a done callback. on_remove() calls self._tasks.clear(), emptying the set. When _initialize_task completes moments later, its done callback fires self._tasks.remove(task) on the now-empty set, raising KeyError.

_req_listeners.pop(device, None) directly removes the orphaned listener entry without touching tasks, avoiding this issue.

Related

Related PR that added the PollControl check-in listener:

• Enable fast polling during joins and when requests are pending #1621

Found here:

• [RFC] Add device re-interview support #1789 (comment)