Address Copilot review feedback

- Use TEMP_SOURCE_INTERNAL/REMOTE constants instead of hardcoded strings
- Call set_remote_temp_mode() in fallback scenarios to persist state changes
- Clear remote_temp_mode when experimental features are disabled
- Update constants to use title case for UI display

Author: ashleigh-hopkins

custom_components/mitsubishi/config_flow.py

@@ -296,11 +296,17 @@ async def _async_save_options(self, external_temp_entity: str | None) -> Any:
         new_options: dict[str, Any] = {
             CONF_EXPERIMENTAL_FEATURES: self._experimental_features,
         }
-        if self._experimental_features and external_temp_entity:
-            new_options[CONF_EXTERNAL_TEMP_ENTITY] = external_temp_entity
-        # Preserve remote_temp_mode from existing options
-        if CONF_REMOTE_TEMP_MODE in self.config_entry.options:
-            new_options[CONF_REMOTE_TEMP_MODE] = self.config_entry.options[CONF_REMOTE_TEMP_MODE]
+        if self._experimental_features:
+            # Only preserve experimental settings when experimental features are enabled
+            if external_temp_entity:
+                new_options[CONF_EXTERNAL_TEMP_ENTITY] = external_temp_entity
+            # Preserve remote_temp_mode from existing options
+            if CONF_REMOTE_TEMP_MODE in self.config_entry.options:
+                new_options[CONF_REMOTE_TEMP_MODE] = self.config_entry.options[
+                    CONF_REMOTE_TEMP_MODE
+                ]
+        # When experimental features are disabled, don't preserve remote_temp_mode
+        # This ensures a clean state when the feature is turned off
 
         return self.async_create_entry(title="", data=new_options)
 

custom_components/mitsubishi/const.py

@@ -22,5 +22,5 @@
 CONF_REMOTE_TEMP_MODE = "remote_temp_mode"
 
 # Temperature Source Modes
-TEMP_SOURCE_INTERNAL = "internal"
-TEMP_SOURCE_REMOTE = "remote"
+TEMP_SOURCE_INTERNAL = "Internal"
+TEMP_SOURCE_REMOTE = "Remote"

custom_components/mitsubishi/coordinator.py

@@ -115,7 +115,7 @@ async def _send_remote_temperature(self) -> None:
                 "falling back to internal sensor"
             )
             await self.hass.async_add_executor_job(self.controller.set_current_temperature, None)
-            self._remote_temp_mode = False
+            self.set_remote_temp_mode(False)
             return
 
         state = self.hass.states.get(external_entity_id)
@@ -126,7 +126,7 @@ async def _send_remote_temperature(self) -> None:
                 external_entity_id,
             )
             await self.hass.async_add_executor_job(self.controller.set_current_temperature, None)
-            self._remote_temp_mode = False
+            self.set_remote_temp_mode(False)
             return
 
         if state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
@@ -136,7 +136,7 @@ async def _send_remote_temperature(self) -> None:
                 state.state,
             )
             await self.hass.async_add_executor_job(self.controller.set_current_temperature, None)
-            self._remote_temp_mode = False
+            self.set_remote_temp_mode(False)
             return
 
         try:
@@ -157,4 +157,4 @@ async def _send_remote_temperature(self) -> None:
                 e,
             )
             await self.hass.async_add_executor_job(self.controller.set_current_temperature, None)
-            self._remote_temp_mode = False
+            self.set_remote_temp_mode(False)

custom_components/mitsubishi/select.py

@@ -15,6 +15,8 @@
     CONF_EXPERIMENTAL_FEATURES,
     CONF_EXTERNAL_TEMP_ENTITY,
     DOMAIN,
+    TEMP_SOURCE_INTERNAL,
+    TEMP_SOURCE_REMOTE,
 )
 from .coordinator import MitsubishiDataUpdateCoordinator
 from .entity import MitsubishiEntity
@@ -82,7 +84,7 @@ class MitsubishiTemperatureSourceSelect(MitsubishiEntity, SelectEntity):
 
     _attr_name = "Temperature Source"
     _attr_icon = "mdi:thermometer"
-    _attr_options = ["Internal", "Remote"]
+    _attr_options = [TEMP_SOURCE_INTERNAL, TEMP_SOURCE_REMOTE]
 
     def __init__(
         self,
@@ -96,11 +98,11 @@ def __init__(
     @property
     def current_option(self) -> str | None:
         """Return the current temperature source mode."""
-        return "Remote" if self.coordinator.remote_temp_mode else "Internal"
+        return TEMP_SOURCE_REMOTE if self.coordinator.remote_temp_mode else TEMP_SOURCE_INTERNAL
 
     async def async_select_option(self, option: str) -> None:
         """Set the temperature source mode."""
-        if option == "Internal":
+        if option == TEMP_SOURCE_INTERNAL:
             # Switch to internal sensor
             self.coordinator.set_remote_temp_mode(False)
             await self.hass.async_add_executor_job(