- Resolve dns-hole conflicts (keep simplified polling, no per-query opts) - Calendar hover/pin UI and docker column visibility preserved - Subscriptions from dev (docker, calendar) correctly excluded by auto-merge - Error boundary invalidateQueries fix preserved alongside context menu - Add "Refresh" button to widget context menu with live "Xs ago" indicator