CarPlay sensor states fix + remove domains as default tab (#4467)

<!-- Thank you for submitting a Pull Request and helping to improve Home
Assistant. Please complete the following sections to help the processing
and review of your changes. Please do not delete anything from this
template. -->

## Summary
<!-- Provide a brief summary of the changes you have made and most
importantly what they aim to achieve -->

## Screenshots
<!-- If this is a user-facing change not in the frontend, please include
screenshots in light and dark mode. -->

## Link to pull request in Documentation repository
<!-- Pull requests that add, change or remove functionality must have a
corresponding pull request in the Companion App Documentation repository
(https://github.com/home-assistant/companion.home-assistant). Please add
the number of this pull request after the "#" -->
Documentation: home-assistant/companion.home-assistant#

## Any other notes
<!-- If there is any other information of note, like if this Pull
Request is part of a bigger change, please include it here. -->

Author: bgoncal

Sources/App/Scenes/CarPlaySceneDelegate.swift

@@ -49,6 +49,7 @@ class CarPlaySceneDelegate: UIResponder {
     private var cachedConfig: CarPlayConfig?
     private var configObservation: AnyDatabaseCancellable?
     private var latestStates: HACachedStates?
+    private var latestStatesServerId: String?
     private var latestQuickAccessStatesPerServer: [String: HACachedStates] = [:]
 
     private var preferredServerId: String {
@@ -71,6 +72,23 @@ class CarPlaySceneDelegate: UIResponder {
             guard config != cachedConfig else { return }
             cachedConfig = config
             subscribeToQuickAccessEntitiesChanges(configEntities: cachedConfig?.quickAccessItems ?? [])
+
+            // Tabs can be removed from the configuration while their template instances are still
+            // cached on the scene delegate. Clear those references before rebuilding so hidden
+            // tabs stop receiving replays and state updates through `allTemplates`.
+            if !config.tabs.contains(.quickAccess) {
+                quickAccessListTemplate = nil
+            }
+            if !config.tabs.contains(.areas) {
+                areasZonesListTemplate = nil
+            }
+            if !config.tabs.contains(.domains) {
+                domainsListTemplate = nil
+            }
+            if !config.tabs.contains(.settings) {
+                serversListTemplate = nil
+            }
+
             visibleTemplates = config.tabs.compactMap {
                 switch $0 {
                 case .quickAccess:
@@ -99,10 +117,15 @@ class CarPlaySceneDelegate: UIResponder {
         setInterfaceControllerForChildren()
         interfaceController?.setRootTemplate(tabBar, animated: true, completion: nil)
         updateTemplates()
+        // The selected-server subscription may already have usable data when tabs are rebuilt.
+        // Replay it so controls/areas do not flash empty while waiting for the next cache event.
+        replaySelectedServerStates()
     }
 
     private func buildQuickAccessTab() {
         quickAccessListTemplate = CarPlayQuickAccessTemplate.build()
+        // Quick access keeps a separate per-server cache for its mixed-server entities,
+        // so restore that snapshot immediately when the template is recreated.
         replayQuickAccessStates()
     }
 
@@ -126,6 +149,8 @@ class CarPlaySceneDelegate: UIResponder {
     private func subscribeToEntitiesChanges() {
         guard let server = Current.servers.server(forServerIdentifier: preferredServerId) ?? Current.servers.all.first else { return }
         entitiesSubscriptionToken?.cancel()
+        latestStates = nil
+        latestStatesServerId = nil
 
         var filter: [String: Any] = [:]
         if server.info.version > .canSubscribeEntitiesChangesWithFilter {
@@ -140,8 +165,9 @@ class CarPlaySceneDelegate: UIResponder {
         Current.api(for: server)?.connection.disconnect()
         entitiesSubscriptionToken = Current.api(for: server)?.connection.caches.states(filter)
             .subscribe { [weak self] _, states in
+                self?.latestStates = states
+                self?.latestStatesServerId = server.identifier.rawValue
                 self?.allTemplates.forEach {
-                    self?.latestStates = states
                     $0.entitiesStateChange(serverId: server.identifier.rawValue, entities: states)
                 }
             }
@@ -189,6 +215,18 @@ class CarPlaySceneDelegate: UIResponder {
         }
     }
 
+    private func replaySelectedServerStates() {
+        guard let latestStates, let latestStatesServerId else { return }
+
+        [
+            areasZonesListTemplate,
+            domainsListTemplate,
+            serversListTemplate,
+        ].compactMap({ $0 }).forEach {
+            $0.entitiesStateChange(serverId: latestStatesServerId, entities: latestStates)
+        }
+    }
+
     private func observeCarPlayConfigChanges() {
         configObservation?.cancel()
         let observation = ValueObservation.tracking(CarPlayConfig.fetchOne)
@@ -232,6 +270,11 @@ extension CarPlaySceneDelegate: CPInterfaceControllerDelegate {
         if quickAccessListTemplate?.template == aTemplate {
             replayQuickAccessStates()
         }
+        if domainsListTemplate?.template == aTemplate || areasZonesListTemplate?.template == aTemplate {
+            // Navigating back to controls/areas does not guarantee a fresh websocket emission.
+            // Reusing the latest selected-server snapshot keeps those tabs populated.
+            replaySelectedServerStates()
+        }
         allTemplates.forEach { $0.templateWillAppear(template: aTemplate) }
     }
 }

Sources/App/Settings/CarPlay/CarPlayConfig.swift

@@ -4,13 +4,13 @@ import GRDB
 public struct CarPlayConfig: Codable, FetchableRecord, PersistableRecord, Equatable {
     public static var carPlayConfigId = "carplay-config"
     public var id = CarPlayConfig.carPlayConfigId
-    public var tabs: [CarPlayTab] = [.quickAccess, .areas, .domains, .settings]
+    public var tabs: [CarPlayTab] = [.quickAccess, .areas, .settings]
     public var quickAccessItems: [MagicItem] = []
     public var quickAccessLayout: CarPlayQuickAccessLayout?
 
     public init(
         id: String = CarPlayConfig.carPlayConfigId,
-        tabs: [CarPlayTab] = [.quickAccess, .areas, .domains, .settings],
+        tabs: [CarPlayTab] = [.quickAccess, .areas, .settings],
         quickAccessItems: [MagicItem] = [],
         quickAccessLayout: CarPlayQuickAccessLayout? = nil
     ) {

Sources/CarPlay/Templates/QuickAccess/CarPlayQuickAccessTemplate.swift

@@ -34,6 +34,7 @@ final class CarPlayQuickAccessTemplate: CarPlayTemplateProvider {
     private var currentItems: [MagicItem] = []
     private var currentLayout: CarPlayQuickAccessLayout = .grid
     private var entitiesPerServer: [String: HACachedStates] = [:]
+    private var lastKnownEntities: [String: HAEntity] = [:]
     private var executingItemIds: Set<String> = []
     private var executingStartedAt: [String: Date] = [:]
     private var pendingExecutingClearWorkItems: [String: DispatchWorkItem] = [:]
@@ -140,6 +141,7 @@ final class CarPlayQuickAccessTemplate: CarPlayTemplateProvider {
     func updateList(for items: [MagicItem], layout: CarPlayQuickAccessLayout) {
         currentItems = items
         currentLayout = layout
+        pruneLastKnownEntities(for: items)
         guard !items.isEmpty else {
             presentIntroductionItem()
             return
@@ -169,17 +171,16 @@ final class CarPlayQuickAccessTemplate: CarPlayTemplateProvider {
             let info = info(for: magicItem)
             switch magicItem.type {
             case .entity:
-                guard let placeholderItem = entitiesPerServer[magicItem.serverId]?.all
-                    .first(where: { $0.entityId == magicItem.id }) ?? placeholderEntity(id: magicItem.id),
-                    let rowDisplayItem = rowDisplayItem(for: magicItem, entityToAreaMap: entityToAreaMap) else {
+                guard let entity = resolvedEntity(for: magicItem),
+                      let rowDisplayItem = rowDisplayItem(for: magicItem, entityToAreaMap: entityToAreaMap) else {
                     return .init(text: "", detailText: "")
                 }
                 let entityProvider = CarPlayEntityListItem(
                     serverId: magicItem.serverId,
-                    entity: placeholderItem,
+                    entity: entity,
                     magicItem: magicItem,
                     magicItemInfo: info,
-                    area: entityToAreaMap[placeholderItem.entityId]
+                    area: entityToAreaMap[entity.entityId]
                 )
                 let listItem = entityProvider.template
                 if isExecuting(magicItem) {
@@ -404,6 +405,34 @@ final class CarPlayQuickAccessTemplate: CarPlayTemplateProvider {
         isExecuting(magicItem) ? CarPlayEntityListItem.executingSubtitle : defaultSubtitle
     }
 
+    private func entityCacheKey(serverId: String, entityId: String) -> String {
+        "\(serverId)::\(entityId)"
+    }
+
+    private func pruneLastKnownEntities(for items: [MagicItem]) {
+        let validKeys = Set(
+            items
+                .filter { $0.type == .entity }
+                .map { entityCacheKey(serverId: $0.serverId, entityId: $0.id) }
+        )
+        lastKnownEntities = lastKnownEntities.filter { validKeys.contains($0.key) }
+    }
+
+    private func resolvedEntity(for magicItem: MagicItem) -> HAEntity? {
+        let cacheKey = entityCacheKey(serverId: magicItem.serverId, entityId: magicItem.id)
+
+        if let entity = entitiesPerServer[magicItem.serverId]?[magicItem.id] {
+            lastKnownEntities[cacheKey] = entity
+            return entity
+        }
+
+        if let entity = lastKnownEntities[cacheKey] {
+            return entity
+        }
+
+        return placeholderEntity(id: magicItem.id)
+    }
+
     private func rowDisplayItem(
         for magicItem: MagicItem,
         entityToAreaMap: [String: String]
@@ -412,16 +441,15 @@ final class CarPlayQuickAccessTemplate: CarPlayTemplateProvider {
 
         switch magicItem.type {
         case .entity:
-            guard let placeholderItem = entitiesPerServer[magicItem.serverId]?.all
-                .first(where: { $0.entityId == magicItem.id }) ?? placeholderEntity(id: magicItem.id) else {
+            guard let entity = resolvedEntity(for: magicItem) else {
                 Current.Log.error("Failed to create placeholder entity for magic item id: \(magicItem.id)")
                 return nil
             }
 
-            let area = entityToAreaMap[placeholderItem.entityId]
+            let area = entityToAreaMap[entity.entityId]
             let entityProvider = CarPlayEntityListItem(
                 serverId: magicItem.serverId,
-                entity: placeholderItem,
+                entity: entity,
                 magicItem: magicItem,
                 magicItemInfo: info,
                 area: area