homeassistant 2025.9.3__py3-none-any.whl → 2025.10.0__py3-none-any.whl

homeassistant/components/zimi/translations/pt.json

@@ -5,7 +5,7 @@
         },
         "error": {
             "cannot_connect": "A liga\u00e7\u00e3o falhou",
-            "connection_refused": "Connection refused",
+            "connection_refused": "Liga\u00e7\u00e3o recusada",
             "invalid_host": "Endere\u00e7o IP ou anfitri\u00e3o inv\u00e1lido.",
             "timeout": "Excedido o tempo limite para estabelecer liga\u00e7\u00e3o",
             "unknown": "Erro inesperado"

homeassistant/components/zone/translations/uk.json

@@ -1,6 +1,7 @@
 {
     "services": {
         "reload": {
+            "description": "\u041f\u0435\u0440\u0435\u0437\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0443\u0454 \u0437\u043e\u043d\u0438 \u0437 YAML-\u043a\u043e\u043d\u0444\u0456\u0433\u0443\u0440\u0430\u0446\u0456\u0457.",
             "name": "\u041e\u043d\u043e\u0432\u0438\u0442\u0438"
         }
     }

homeassistant/components/zwave_js/__init__.py

@@ -91,6 +91,7 @@ from .const import (
     CONF_ADDON_S2_ACCESS_CONTROL_KEY,
     CONF_ADDON_S2_AUTHENTICATED_KEY,
     CONF_ADDON_S2_UNAUTHENTICATED_KEY,
+    CONF_ADDON_SOCKET,
     CONF_DATA_COLLECTION_OPTED_IN,
     CONF_INSTALLER_MODE,
     CONF_INTEGRATION_CREATED_ADDON,
@@ -102,9 +103,11 @@ from .const import (
     CONF_S2_ACCESS_CONTROL_KEY,
     CONF_S2_AUTHENTICATED_KEY,
     CONF_S2_UNAUTHENTICATED_KEY,
+    CONF_SOCKET_PATH,
     CONF_USB_PATH,
     CONF_USE_ADDON,
     DOMAIN,
+    ESPHOME_ADDON_VERSION,
     EVENT_DEVICE_ADDED_TO_REGISTRY,
     EVENT_VALUE_UPDATED,
     LIB_LOGGER,
@@ -1174,7 +1177,16 @@ async def async_ensure_addon_running(
     except AddonError as err:
         raise ConfigEntryNotReady(err) from err
 
-    usb_path: str = entry.data[CONF_USB_PATH]
+    addon_has_lr = (
+        addon_info.version and AwesomeVersion(addon_info.version) >= LR_ADDON_VERSION
+    )
+    addon_has_esphome = (
+        addon_info.version
+        and AwesomeVersion(addon_info.version) >= ESPHOME_ADDON_VERSION
+    )
+
+    usb_path: str | None = entry.data[CONF_USB_PATH]
+    socket_path: str | None = entry.data.get(CONF_SOCKET_PATH)
     # s0_legacy_key was saved as network_key before s2 was added.
     s0_legacy_key: str = entry.data.get(CONF_S0_LEGACY_KEY, "")
     if not s0_legacy_key:
@@ -1186,15 +1198,18 @@ async def async_ensure_addon_running(
     lr_s2_authenticated_key: str = entry.data.get(CONF_LR_S2_AUTHENTICATED_KEY, "")
     addon_state = addon_info.state
     addon_config = {
-        CONF_ADDON_DEVICE: usb_path,
         CONF_ADDON_S0_LEGACY_KEY: s0_legacy_key,
         CONF_ADDON_S2_ACCESS_CONTROL_KEY: s2_access_control_key,
         CONF_ADDON_S2_AUTHENTICATED_KEY: s2_authenticated_key,
         CONF_ADDON_S2_UNAUTHENTICATED_KEY: s2_unauthenticated_key,
     }
-    if addon_info.version and AwesomeVersion(addon_info.version) >= LR_ADDON_VERSION:
+    if usb_path is not None:
+        addon_config[CONF_ADDON_DEVICE] = usb_path
+    if addon_has_lr:
         addon_config[CONF_ADDON_LR_S2_ACCESS_CONTROL_KEY] = lr_s2_access_control_key
         addon_config[CONF_ADDON_LR_S2_AUTHENTICATED_KEY] = lr_s2_authenticated_key
+    if addon_has_esphome and socket_path is not None:
+        addon_config[CONF_ADDON_SOCKET] = socket_path
 
     if addon_state == AddonState.NOT_INSTALLED:
         addon_manager.async_schedule_install_setup_addon(
@@ -1211,7 +1226,7 @@ async def async_ensure_addon_running(
         raise ConfigEntryNotReady
 
     addon_options = addon_info.options
-    addon_device = addon_options[CONF_ADDON_DEVICE]
+    addon_device = addon_options.get(CONF_ADDON_DEVICE)
     # s0_legacy_key was saved as network_key before s2 was added.
     addon_s0_legacy_key = addon_options.get(CONF_ADDON_S0_LEGACY_KEY, "")
     if not addon_s0_legacy_key:
@@ -1235,9 +1250,7 @@ async def async_ensure_addon_running(
     if s2_unauthenticated_key != addon_s2_unauthenticated_key:
         updates[CONF_S2_UNAUTHENTICATED_KEY] = addon_s2_unauthenticated_key
 
-    if addon_info.version and AwesomeVersion(addon_info.version) >= AwesomeVersion(
-        LR_ADDON_VERSION
-    ):
+    if addon_has_lr:
         addon_lr_s2_access_control_key = addon_options.get(
             CONF_ADDON_LR_S2_ACCESS_CONTROL_KEY, ""
         )
@@ -1249,6 +1262,11 @@ async def async_ensure_addon_running(
         if lr_s2_authenticated_key != addon_lr_s2_authenticated_key:
             updates[CONF_LR_S2_AUTHENTICATED_KEY] = addon_lr_s2_authenticated_key
 
+    if addon_has_esphome:
+        addon_socket = addon_options.get(CONF_ADDON_SOCKET)
+        if socket_path != addon_socket:
+            updates[CONF_SOCKET_PATH] = addon_socket
+
     if updates:
         hass.config_entries.async_update_entry(entry, data={**entry.data, **updates})
 

homeassistant/components/zwave_js/config_flow.py

@@ -26,6 +26,7 @@ from homeassistant.components.hassio import (
     AddonState,
 )
 from homeassistant.config_entries import (
+    SOURCE_ESPHOME,
     SOURCE_USB,
     ConfigEntryState,
     ConfigFlow,
@@ -37,6 +38,7 @@ from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import selector
 from homeassistant.helpers.hassio import is_hassio
+from homeassistant.helpers.service_info.esphome import ESPHomeServiceInfo
 from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 from homeassistant.helpers.service_info.usb import UsbServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
@@ -52,6 +54,7 @@ from .const import (
     CONF_ADDON_S2_ACCESS_CONTROL_KEY,
     CONF_ADDON_S2_AUTHENTICATED_KEY,
     CONF_ADDON_S2_UNAUTHENTICATED_KEY,
+    CONF_ADDON_SOCKET,
     CONF_INTEGRATION_CREATED_ADDON,
     CONF_KEEP_OLD_DEVICES,
     CONF_LR_S2_ACCESS_CONTROL_KEY,
@@ -60,6 +63,7 @@ from .const import (
     CONF_S2_ACCESS_CONTROL_KEY,
     CONF_S2_AUTHENTICATED_KEY,
     CONF_S2_UNAUTHENTICATED_KEY,
+    CONF_SOCKET_PATH,
     CONF_USB_PATH,
     CONF_USE_ADDON,
     DOMAIN,
@@ -81,6 +85,7 @@ ADDON_SETUP_TIMEOUT_ROUNDS = 40
 
 ADDON_USER_INPUT_MAP = {
     CONF_ADDON_DEVICE: CONF_USB_PATH,
+    CONF_ADDON_SOCKET: CONF_SOCKET_PATH,
     CONF_ADDON_S0_LEGACY_KEY: CONF_S0_LEGACY_KEY,
     CONF_ADDON_S2_ACCESS_CONTROL_KEY: CONF_S2_ACCESS_CONTROL_KEY,
     CONF_ADDON_S2_AUTHENTICATED_KEY: CONF_S2_AUTHENTICATED_KEY,
@@ -129,7 +134,7 @@ def get_manual_schema(user_input: dict[str, Any]) -> vol.Schema:
 def get_on_supervisor_schema(user_input: dict[str, Any]) -> vol.Schema:
     """Return a schema for the on Supervisor step."""
     default_use_addon = user_input[CONF_USE_ADDON]
-    return vol.Schema({vol.Optional(CONF_USE_ADDON, default=default_use_addon): bool})
+    return vol.Schema({vol.Required(CONF_USE_ADDON, default=default_use_addon): bool})
 
 
 async def validate_input(hass: HomeAssistant, user_input: dict) -> VersionInfo:
@@ -197,6 +202,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
         self.lr_s2_access_control_key: str | None = None
         self.lr_s2_authenticated_key: str | None = None
         self.usb_path: str | None = None
+        self.socket_path: str | None = None  # ESPHome socket
         self.ws_address: str | None = None
         self.restart_addon: bool = False
         # If we install the add-on we should uninstall it on entry remove.
@@ -214,7 +220,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
         self._addon_config_updates: dict[str, Any] = {}
         self._migrating = False
         self._reconfigure_config_entry: ZwaveJSConfigEntry | None = None
-        self._usb_discovery = False
+        self._adapter_discovered = False
         self._recommended_install = False
         self._rf_region: str | None = None
 
@@ -370,6 +376,11 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
 
         new_addon_config = addon_config | config_updates
 
+        if new_addon_config.get(CONF_ADDON_DEVICE) is None:
+            new_addon_config.pop(CONF_ADDON_DEVICE, None)
+        if new_addon_config.get(CONF_ADDON_SOCKET) is None:
+            new_addon_config.pop(CONF_ADDON_SOCKET, None)
+
         if new_addon_config == addon_config:
             return
 
@@ -542,7 +553,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             title = human_name.split(" - ")[0].strip()
         self.context["title_placeholders"] = {CONF_NAME: title}
 
-        self._usb_discovery = True
+        self._adapter_discovered = True
         if current_config_entries:
             return await self.async_step_confirm_usb_migration()
 
@@ -658,7 +669,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Select custom installation type."""
-        if self._usb_discovery:
+        if self._adapter_discovered:
             return await self.async_step_on_supervisor({CONF_USE_ADDON: True})
         return await self.async_step_on_supervisor()
 
@@ -706,7 +717,8 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
 
         if addon_info.state == AddonState.RUNNING:
             addon_config = addon_info.options
-            self.usb_path = addon_config[CONF_ADDON_DEVICE]
+            self.usb_path = addon_config.get(CONF_ADDON_DEVICE)
+            self.socket_path = addon_config.get(CONF_ADDON_SOCKET)
             self.s0_legacy_key = addon_config.get(CONF_ADDON_S0_LEGACY_KEY, "")
             self.s2_access_control_key = addon_config.get(
                 CONF_ADDON_S2_ACCESS_CONTROL_KEY, ""
@@ -736,14 +748,13 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
         """Ask for config for Z-Wave JS add-on."""
 
         if user_input is not None:
-            self.usb_path = user_input[CONF_USB_PATH]
+            self.usb_path = user_input.get(CONF_USB_PATH)
+            self.socket_path = user_input.get(CONF_SOCKET_PATH)
             return await self.async_step_network_type()
 
-        if self._usb_discovery:
+        if self._adapter_discovered:
             return await self.async_step_network_type()
 
-        usb_path = self.usb_path or ""
-
         try:
             ports = await async_get_usb_ports(self.hass)
         except OSError as err:
@@ -752,7 +763,13 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
 
         data_schema = vol.Schema(
             {
-                vol.Required(CONF_USB_PATH, default=usb_path): vol.In(ports),
+                vol.Optional(
+                    CONF_USB_PATH, description={"suggested_value": self.usb_path}
+                ): vol.In(ports),
+                vol.Optional(
+                    CONF_SOCKET_PATH,
+                    description={"suggested_value": self.socket_path or ""},
+                ): str,
             }
         )
 
@@ -780,6 +797,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
 
                 addon_config_updates = {
                     CONF_ADDON_DEVICE: self.usb_path,
+                    CONF_ADDON_SOCKET: self.socket_path,
                     CONF_ADDON_S0_LEGACY_KEY: self.s0_legacy_key,
                     CONF_ADDON_S2_ACCESS_CONTROL_KEY: self.s2_access_control_key,
                     CONF_ADDON_S2_AUTHENTICATED_KEY: self.s2_authenticated_key,
@@ -851,6 +869,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
 
             addon_config_updates = {
                 CONF_ADDON_DEVICE: self.usb_path,
+                CONF_ADDON_SOCKET: self.socket_path,
                 CONF_ADDON_S0_LEGACY_KEY: self.s0_legacy_key,
                 CONF_ADDON_S2_ACCESS_CONTROL_KEY: self.s2_access_control_key,
                 CONF_ADDON_S2_AUTHENTICATED_KEY: self.s2_authenticated_key,
@@ -899,7 +918,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             discovery_info = await self._async_get_addon_discovery_info()
             self.ws_address = f"ws://{discovery_info['host']}:{discovery_info['port']}"
 
-        if not self.unique_id or self.source == SOURCE_USB:
+        if not self.unique_id or self.source in (SOURCE_USB, SOURCE_ESPHOME):
             if not self.version_info:
                 try:
                     self.version_info = await async_get_version_info(
@@ -916,6 +935,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             updates={
                 CONF_URL: self.ws_address,
                 CONF_USB_PATH: self.usb_path,
+                CONF_SOCKET_PATH: self.socket_path,
                 CONF_S0_LEGACY_KEY: self.s0_legacy_key,
                 CONF_S2_ACCESS_CONTROL_KEY: self.s2_access_control_key,
                 CONF_S2_AUTHENTICATED_KEY: self.s2_authenticated_key,
@@ -938,6 +958,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             data={
                 CONF_URL: self.ws_address,
                 CONF_USB_PATH: self.usb_path,
+                CONF_SOCKET_PATH: self.socket_path,
                 CONF_S0_LEGACY_KEY: self.s0_legacy_key,
                 CONF_S2_ACCESS_CONTROL_KEY: self.s2_access_control_key,
                 CONF_S2_AUTHENTICATED_KEY: self.s2_authenticated_key,
@@ -974,7 +995,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
         """Confirm the user wants to reset their current controller."""
         config_entry = self._reconfigure_config_entry
         assert config_entry is not None
-        if not self._usb_discovery and not config_entry.data.get(CONF_USE_ADDON):
+        if not self._adapter_discovered and not config_entry.data.get(CONF_USE_ADDON):
             return self.async_abort(
                 reason="addon_required",
                 description_placeholders={
@@ -1062,9 +1083,10 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
         """Instruct the user to unplug the old controller."""
 
         if user_input is not None:
-            if self.usb_path:
-                # USB discovery was used, so the device is already known.
+            if self._adapter_discovered:
+                # Discovery was used, so the device is already known.
                 self._addon_config_updates[CONF_ADDON_DEVICE] = self.usb_path
+                self._addon_config_updates[CONF_ADDON_SOCKET] = self.socket_path
                 return await self.async_step_start_addon()
             # Now that the old controller is gone, we can scan for serial ports again
             return await self.async_step_choose_serial_port()
@@ -1184,10 +1206,12 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             self.s2_unauthenticated_key = user_input[CONF_S2_UNAUTHENTICATED_KEY]
             self.lr_s2_access_control_key = user_input[CONF_LR_S2_ACCESS_CONTROL_KEY]
             self.lr_s2_authenticated_key = user_input[CONF_LR_S2_AUTHENTICATED_KEY]
-            self.usb_path = user_input[CONF_USB_PATH]
+            self.usb_path = user_input.get(CONF_USB_PATH)
+            self.socket_path = user_input.get(CONF_SOCKET_PATH)
 
             addon_config_updates = {
                 CONF_ADDON_DEVICE: self.usb_path,
+                CONF_ADDON_SOCKET: self.socket_path,
                 CONF_ADDON_S0_LEGACY_KEY: self.s0_legacy_key,
                 CONF_ADDON_S2_ACCESS_CONTROL_KEY: self.s2_access_control_key,
                 CONF_ADDON_S2_AUTHENTICATED_KEY: self.s2_authenticated_key,
@@ -1198,6 +1222,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
 
             addon_config_updates = self._addon_config_updates | addon_config_updates
             self._addon_config_updates = {}
+
             await self._async_set_addon_config(addon_config_updates)
 
             if addon_info.state == AddonState.RUNNING and not self.restart_addon:
@@ -1212,6 +1237,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             return await self.async_step_start_addon()
 
         usb_path = addon_config.get(CONF_ADDON_DEVICE, self.usb_path or "")
+        socket_path = addon_config.get(CONF_ADDON_SOCKET, self.socket_path or "")
         s0_legacy_key = addon_config.get(
             CONF_ADDON_S0_LEGACY_KEY, self.s0_legacy_key or ""
         )
@@ -1237,24 +1263,42 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             _LOGGER.error("Failed to get USB ports: %s", err)
             return self.async_abort(reason="usb_ports_failed")
 
+        # Insert empty option in ports to allow setting a socket
+        ports = {
+            "": "Use Socket",
+            **ports,
+        }
+
         data_schema = vol.Schema(
             {
-                vol.Required(CONF_USB_PATH, default=usb_path): vol.In(ports),
-                vol.Optional(CONF_S0_LEGACY_KEY, default=s0_legacy_key): str,
                 vol.Optional(
-                    CONF_S2_ACCESS_CONTROL_KEY, default=s2_access_control_key
+                    CONF_USB_PATH, description={"suggested_value": usb_path}
+                ): vol.In(ports),
+                vol.Optional(
+                    CONF_SOCKET_PATH, description={"suggested_value": socket_path}
                 ): str,
                 vol.Optional(
-                    CONF_S2_AUTHENTICATED_KEY, default=s2_authenticated_key
+                    CONF_S0_LEGACY_KEY, description={"suggested_value": s0_legacy_key}
                 ): str,
                 vol.Optional(
-                    CONF_S2_UNAUTHENTICATED_KEY, default=s2_unauthenticated_key
+                    CONF_S2_ACCESS_CONTROL_KEY,
+                    description={"suggested_value": s2_access_control_key},
                 ): str,
                 vol.Optional(
-                    CONF_LR_S2_ACCESS_CONTROL_KEY, default=lr_s2_access_control_key
+                    CONF_S2_AUTHENTICATED_KEY,
+                    description={"suggested_value": s2_authenticated_key},
                 ): str,
                 vol.Optional(
-                    CONF_LR_S2_AUTHENTICATED_KEY, default=lr_s2_authenticated_key
+                    CONF_S2_UNAUTHENTICATED_KEY,
+                    description={"suggested_value": s2_unauthenticated_key},
+                ): str,
+                vol.Optional(
+                    CONF_LR_S2_ACCESS_CONTROL_KEY,
+                    description={"suggested_value": lr_s2_access_control_key},
+                ): str,
+                vol.Optional(
+                    CONF_LR_S2_AUTHENTICATED_KEY,
+                    description={"suggested_value": lr_s2_authenticated_key},
                 ): str,
             }
         )
@@ -1268,8 +1312,10 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Choose a serial port."""
         if user_input is not None:
-            self.usb_path = user_input[CONF_USB_PATH]
+            self.usb_path = user_input.get(CONF_USB_PATH)
+            self.socket_path = user_input.get(CONF_SOCKET_PATH)
             self._addon_config_updates[CONF_ADDON_DEVICE] = self.usb_path
+            self._addon_config_updates[CONF_ADDON_SOCKET] = self.socket_path
             return await self.async_step_start_addon()
 
         try:
@@ -1286,10 +1332,16 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             await self.hass.async_add_executor_job(usb.get_serial_by_id, old_usb_path),
             None,
         )
+        # Insert empty option in ports to allow setting a socket
+        ports = {
+            "": "Use Socket",
+            **ports,
+        }
 
         data_schema = vol.Schema(
             {
-                vol.Required(CONF_USB_PATH): vol.In(ports),
+                vol.Optional(CONF_USB_PATH): vol.In(ports),
+                vol.Optional(CONF_SOCKET_PATH): str,
             }
         )
         return self.async_show_form(
@@ -1347,6 +1399,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
                 **config_entry.data,
                 CONF_URL: ws_address,
                 CONF_USB_PATH: self.usb_path,
+                CONF_SOCKET_PATH: self.socket_path,
                 CONF_S0_LEGACY_KEY: self.s0_legacy_key,
                 CONF_S2_ACCESS_CONTROL_KEY: self.s2_access_control_key,
                 CONF_S2_AUTHENTICATED_KEY: self.s2_authenticated_key,
@@ -1396,6 +1449,7 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
             {
                 CONF_URL: self.ws_address,
                 CONF_USB_PATH: self.usb_path,
+                CONF_SOCKET_PATH: self.socket_path,
                 CONF_S0_LEGACY_KEY: self.s0_legacy_key,
                 CONF_S2_ACCESS_CONTROL_KEY: self.s2_access_control_key,
                 CONF_S2_AUTHENTICATED_KEY: self.s2_authenticated_key,
@@ -1409,6 +1463,49 @@ class ZWaveJSConfigFlow(ConfigFlow, domain=DOMAIN):
 
         return self.async_abort(reason="reconfigure_successful")
 
+    async def async_step_esphome(
+        self, discovery_info: ESPHomeServiceInfo
+    ) -> ConfigFlowResult:
+        """Handle a ESPHome discovery."""
+        if not is_hassio(self.hass):
+            return self.async_abort(reason="not_hassio")
+
+        if (
+            discovery_info.zwave_home_id
+            and (
+                current_config_entries := self._async_current_entries(
+                    include_ignore=False
+                )
+            )
+            and (home_id := str(discovery_info.zwave_home_id))
+            and (
+                existing_entry := next(
+                    (
+                        entry
+                        for entry in current_config_entries
+                        if entry.unique_id == home_id
+                    ),
+                    None,
+                )
+            )
+            # Only update existing entries that are configured via sockets
+            and existing_entry.data.get(CONF_SOCKET_PATH)
+        ):
+            await self._async_set_addon_config(
+                {CONF_ADDON_SOCKET: discovery_info.socket_path}
+            )
+            # Reloading will sync add-on options to config entry data
+            self.hass.config_entries.async_schedule_reload(existing_entry.entry_id)
+            return self.async_abort(reason="already_configured")
+
+        self.socket_path = discovery_info.socket_path
+        self.context["title_placeholders"] = {
+            CONF_NAME: f"{discovery_info.name} via ESPHome"
+        }
+        self._adapter_discovered = True
+
+        return await self.async_step_installation_type()
+
     async def async_revert_addon_config(self, reason: str) -> ConfigFlowResult:
         """Abort the options flow.
 

homeassistant/components/zwave_js/const.py

@@ -12,6 +12,7 @@ from zwave_js_server.const.command_class.window_covering import (
 from homeassistant.const import APPLICATION_NAME, __version__ as HA_VERSION
 
 LR_ADDON_VERSION = AwesomeVersion("0.5.0")
+ESPHOME_ADDON_VERSION = AwesomeVersion("0.24.0")
 
 USER_AGENT = {APPLICATION_NAME: HA_VERSION}
 
@@ -23,6 +24,7 @@ CONF_ADDON_S2_AUTHENTICATED_KEY = "s2_authenticated_key"
 CONF_ADDON_S2_UNAUTHENTICATED_KEY = "s2_unauthenticated_key"
 CONF_ADDON_LR_S2_ACCESS_CONTROL_KEY = "lr_s2_access_control_key"
 CONF_ADDON_LR_S2_AUTHENTICATED_KEY = "lr_s2_authenticated_key"
+CONF_ADDON_SOCKET = "socket"
 CONF_INSTALLER_MODE = "installer_mode"
 CONF_INTEGRATION_CREATED_ADDON = "integration_created_addon"
 CONF_KEEP_OLD_DEVICES = "keep_old_devices"
@@ -33,6 +35,7 @@ CONF_S2_AUTHENTICATED_KEY = "s2_authenticated_key"
 CONF_S2_UNAUTHENTICATED_KEY = "s2_unauthenticated_key"
 CONF_LR_S2_ACCESS_CONTROL_KEY = "lr_s2_access_control_key"
 CONF_LR_S2_AUTHENTICATED_KEY = "lr_s2_authenticated_key"
+CONF_SOCKET_PATH = "socket_path"
 CONF_USB_PATH = "usb_path"
 CONF_USE_ADDON = "use_addon"
 CONF_DATA_COLLECTION_OPTED_IN = "data_collection_opted_in"

homeassistant/components/zwave_js/device_trigger.py

@@ -16,6 +16,7 @@ from homeassistant.const import (
     CONF_DEVICE_ID,
     CONF_DOMAIN,
     CONF_ENTITY_ID,
+    CONF_OPTIONS,
     CONF_PLATFORM,
     CONF_TYPE,
 )
@@ -434,12 +435,13 @@ async def async_attach_trigger(
 
     if trigger_platform == VALUE_UPDATED_PLATFORM_TYPE:
         zwave_js_config = {
-            state.CONF_PLATFORM: trigger_platform,
-            CONF_DEVICE_ID: config[CONF_DEVICE_ID],
+            CONF_OPTIONS: {
+                CONF_DEVICE_ID: config[CONF_DEVICE_ID],
+            },
         }
         copy_available_params(
             config,
-            zwave_js_config,
+            zwave_js_config[CONF_OPTIONS],
             [
                 ATTR_COMMAND_CLASS,
                 ATTR_PROPERTY,
@@ -453,7 +455,7 @@ async def async_attach_trigger(
             hass, zwave_js_config
         )
         return await attach_value_updated_trigger(
-            hass, zwave_js_config, action, trigger_info
+            hass, zwave_js_config[CONF_OPTIONS], action, trigger_info
         )
 
     raise HomeAssistantError(f"Unhandled trigger type {trigger_type}")

homeassistant/components/zwave_js/strings.json

@@ -14,14 +14,15 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "config_entry_not_loaded": "The Z-Wave configuration entry is not loaded. Please try again when the configuration entry is loaded.",
       "different_device": "The connected USB device is not the same as previously configured for this config entry. Please instead create a new config entry for the new device.",
-      "discovery_requires_supervisor": "Discovery requires the supervisor.",
+      "discovery_requires_supervisor": "Discovery requires the Home Assistant Supervisor.",
       "migration_low_sdk_version": "The SDK version of the old adapter is lower than {ok_sdk_version}. This means it's not possible to migrate the non-volatile memory (NVM) of the old adapter to another adapter.\n\nCheck the documentation on the manufacturer support pages of the old adapter, if it's possible to upgrade the firmware of the old adapter to a version that is built with SDK version {ok_sdk_version} or higher.",
       "migration_successful": "Migration successful.",
       "not_zwave_device": "Discovered device is not a Z-Wave device.",
       "not_zwave_js_addon": "Discovered add-on is not the official Z-Wave add-on.",
       "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
       "reset_failed": "Failed to reset adapter.",
-      "usb_ports_failed": "Failed to get USB devices."
+      "usb_ports_failed": "Failed to get USB devices.",
+      "not_hassio": "ESPHome discovery requires Home Assistant to configure the Z-Wave add-on."
     },
     "error": {
       "addon_start_failed": "Failed to start the Z-Wave add-on. Check the configuration.",
@@ -140,6 +141,10 @@
         "menu_options": {
           "intent_migrate": "Migrate to a new adapter",
           "intent_reconfigure": "Re-configure the current adapter"
+        },
+        "menu_option_descriptions": {
+          "intent_migrate": "This will move your Z-Wave network to a new adapter.",
+          "intent_reconfigure": "This will let you change the adapter configuration."
         }
       },
       "instruct_unplug": {

homeassistant/components/zwave_js/translations/ca.json

@@ -4,7 +4,6 @@
             "already_configured": "El dispositiu ja est\u00e0 configurat",
             "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
             "cannot_connect": "Ha fallat la connexi\u00f3",
-            "discovery_requires_supervisor": "El descobriment requereix el supervisor.",
             "not_zwave_device": "El dispositiu descobert no \u00e9s un dispositiu Z-Wave.",
             "reconfigure_successful": "Reconfiguraci\u00f3 realitzada correctament"
         },

homeassistant/components/zwave_js/translations/cs.json

@@ -14,9 +14,10 @@
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "config_entry_not_loaded": "Konfigura\u010dn\u00ed polo\u017eka Z-Wave se nena\u010detla. Zkuste to znovu, a\u017e se na\u010dte.",
             "different_device": "P\u0159ipojen\u00e9 za\u0159\u00edzen\u00ed USB nen\u00ed stejn\u00e9 jako d\u0159\u00edve nastaven\u00e9 pro tuto polo\u017eku nastaven\u00ed. M\u00edsto toho vytvo\u0159te nov\u00fd konfigura\u010dn\u00ed z\u00e1znam pro nov\u00e9 za\u0159\u00edzen\u00ed.",
-            "discovery_requires_supervisor": "Zji\u0161\u0165ov\u00e1n\u00ed vy\u017eaduje Supervizora.",
+            "discovery_requires_supervisor": "Zji\u0161\u0165ov\u00e1n\u00ed vy\u017eaduje Supervizora Home Assistanta.",
             "migration_low_sdk_version": "Verze SDK star\u00e9ho adapt\u00e9ru je ni\u017e\u0161\u00ed ne\u017e {ok_sdk_version}. To znamen\u00e1, \u017ee nen\u00ed mo\u017en\u00e9 migrovat energeticky nez\u00e1vislou pam\u011b\u0165 (NVM) star\u00e9ho adapt\u00e9ru do jin\u00e9ho adapt\u00e9ru.\n \nZkontrolujte dokumentaci na str\u00e1nk\u00e1ch podpory v\u00fdrobce star\u00e9ho adapt\u00e9ru, zda je mo\u017en\u00e9 aktualizovat firmware star\u00e9ho adapt\u00e9ru na verzi, kter\u00e1 je sestavena s verz\u00ed SDK {ok_sdk_version} nebo vy\u0161\u0161\u00ed.",
             "migration_successful": "Migrace byla \u00fasp\u011b\u0161n\u00e1.",
+            "not_hassio": "Pro zji\u0161\u0165ov\u00e1n\u00ed ESPHome je nutn\u00e9, aby dopln\u011bk Z-Wave nastavil dopln\u011bk v Home Assistantovi.",
             "not_zwave_device": "Zji\u0161t\u011bn\u00e9 za\u0159\u00edzen\u00ed nen\u00ed za\u0159\u00edzen\u00ed Z-Wave.",
             "not_zwave_js_addon": "Zji\u0161t\u011bn\u00fd dopln\u011bk nen\u00ed ofici\u00e1ln\u00edm dopl\u0148kem Z-Wave.",
             "reconfigure_successful": "P\u0159enastaven\u00ed bylo \u00fasp\u011b\u0161n\u00e9",
@@ -137,6 +138,10 @@
             },
             "reconfigure": {
                 "description": "Migrujete na nov\u00fd \u0159adi\u010d nebo m\u011bn\u00edte nastaven\u00ed st\u00e1vaj\u00edc\u00edho \u0159adi\u010de?",
+                "menu_option_descriptions": {
+                    "intent_migrate": "T\u00edm se va\u0161e Z-Wave s\u00ed\u0165 p\u0159esune na nov\u00fd adapt\u00e9r.",
+                    "intent_reconfigure": "To v\u00e1m umo\u017en\u00ed zm\u011bnit nastaven\u00ed adapt\u00e9ru."
+                },
                 "menu_options": {
                     "intent_migrate": "Migrovat na nov\u00fd \u0159adi\u010d",
                     "intent_reconfigure": "P\u0159enastavit aktu\u00e1ln\u00ed \u0159adi\u010d"

homeassistant/components/zwave_js/translations/de.json

@@ -14,9 +14,10 @@
             "cannot_connect": "Verbindung fehlgeschlagen",
             "config_entry_not_loaded": "Der Z-Wave-Konfigurationseintrag wurde nicht geladen. Bitte versuche es erneut, wenn der Konfigurationseintrag geladen ist.",
             "different_device": "Das angeschlossene USB-Ger\u00e4t ist nicht dasselbe, das zuvor f\u00fcr diesen Konfigurationseintrag konfiguriert wurde. Bitte erstelle stattdessen einen neuen Konfigurationseintrag f\u00fcr das neue Ger\u00e4t.",
-            "discovery_requires_supervisor": "Discovery erfordert den Supervisor.",
+            "discovery_requires_supervisor": "Discovery erfordert den Home Assistant Supervisor.",
             "migration_low_sdk_version": "Die SDK-Version des alten Adapters ist niedriger als {ok_sdk_version}. Das bedeutet, dass es nicht m\u00f6glich ist, den nichtfl\u00fcchtigen Speicher (NVM) des alten Adapters auf einen anderen Adapter zu migrieren. \n\nPr\u00fcfe in der Dokumentation auf den Supportseiten des Herstellers des alten Adapters, ob es m\u00f6glich ist, die Firmware des alten Adapters auf eine Version zu aktualisieren, die mit der SDK-Version {ok_sdk_version} oder h\u00f6her erstellt wurde.",
             "migration_successful": "Migration erfolgreich.",
+            "not_hassio": "F\u00fcr die ESPHome-Erkennung muss Home Assistant das Z-Wave-Add-on konfigurieren.",
             "not_zwave_device": "Entdecktes Ger\u00e4t ist kein Z-Wave-Ger\u00e4t.",
             "not_zwave_js_addon": "Das entdeckte Add-on ist nicht das offizielle Z-Wave-Add-on.",
             "reconfigure_successful": "Die Neukonfiguration war erfolgreich",
@@ -137,6 +138,10 @@
             },
             "reconfigure": {
                 "description": "Migrierst du zu einem neuen Adapter oder konfigurierst du den aktuellen Adapter neu?",
+                "menu_option_descriptions": {
+                    "intent_migrate": "Dies verschiebt dein Z-Wave-Netzwerk auf einen neuen Adapter.",
+                    "intent_reconfigure": "Dies erlaubt dir, die Adapterkonfiguration zu \u00e4ndern."
+                },
                 "menu_options": {
                     "intent_migrate": "Zu einem neuen Adapter migrieren",
                     "intent_reconfigure": "Den aktuellen Adapter neu konfigurieren"

homeassistant/components/zwave_js/translations/el.json

@@ -13,7 +13,6 @@
             "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2",
             "config_entry_not_loaded": "\u0397 \u03ba\u03b1\u03c4\u03b1\u03c7\u03ce\u03c1\u03b7\u03c3\u03b7 \u03b4\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7\u03c2 Z-Wave \u03b4\u03b5\u03bd \u03ad\u03c7\u03b5\u03b9 \u03c6\u03bf\u03c1\u03c4\u03c9\u03b8\u03b5\u03af. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03c0\u03c1\u03bf\u03c3\u03c0\u03b1\u03b8\u03ae\u03c3\u03c4\u03b5 \u03be\u03b1\u03bd\u03ac \u03cc\u03c4\u03b1\u03bd \u03c6\u03bf\u03c1\u03c4\u03c9\u03b8\u03b5\u03af \u03b7 \u03ba\u03b1\u03c4\u03b1\u03c7\u03ce\u03c1\u03b7\u03c3\u03b7 \u03b4\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7\u03c2.",
             "different_device": "\u0397 \u03c3\u03c5\u03bd\u03b4\u03b5\u03b4\u03b5\u03bc\u03ad\u03bd\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae USB \u03b4\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b7 \u03af\u03b4\u03b9\u03b1 \u03bc\u03b5 \u03b1\u03c5\u03c4\u03ae \u03c0\u03bf\u03c5 \u03b4\u03b9\u03b1\u03bc\u03bf\u03c1\u03c6\u03ce\u03b8\u03b7\u03ba\u03b5 \u03c0\u03c1\u03bf\u03b7\u03b3\u03bf\u03c5\u03bc\u03ad\u03bd\u03c9\u03c2 \u03b3\u03b9\u03b1 \u03b1\u03c5\u03c4\u03ae\u03bd \u03c4\u03b7\u03bd \u03ba\u03b1\u03c4\u03b1\u03c7\u03ce\u03c1\u03b7\u03c3\u03b7 \u03b4\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7\u03c2. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03c3\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03bd\u03ad\u03b1 \u03ba\u03b1\u03c4\u03b1\u03c7\u03ce\u03c1\u03b7\u03c3\u03b7 \u03b4\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7\u03c2 \u03b3\u03b9\u03b1 \u03c4\u03b7 \u03bd\u03ad\u03b1 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae.",
-            "discovery_requires_supervisor": "\u0397 \u03b1\u03bd\u03b1\u03ba\u03ac\u03bb\u03c5\u03c8\u03b7 \u03b1\u03c0\u03b1\u03b9\u03c4\u03b5\u03af \u03c4\u03bf Supervisor.",
             "migration_low_sdk_version": "\u0397 \u03ad\u03ba\u03b4\u03bf\u03c3\u03b7 SDK \u03c4\u03bf\u03c5 \u03c0\u03b1\u03bb\u03b1\u03b9\u03bf\u03cd \u03c0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ad\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c0\u03b1\u03bb\u03b1\u03b9\u03cc\u03c4\u03b5\u03c1\u03b7 \u03b1\u03c0\u03cc {ok_sdk_version}. \u0391\u03c5\u03c4\u03cc \u03c3\u03b7\u03bc\u03b1\u03af\u03bd\u03b5\u03b9 \u03cc\u03c4\u03b9 \u03b4\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03bc\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03b7\u03c2 \u03bc\u03b7 \u03c0\u03c4\u03b7\u03c4\u03b9\u03ba\u03ae\u03c2 \u03bc\u03bd\u03ae\u03bc\u03b7\u03c2 (NVM) \u03c4\u03bf\u03c5 \u03c0\u03b1\u03bb\u03b1\u03b9\u03bf\u03cd \u03c0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ad\u03b1 \u03c3\u03b5 \u03ac\u03bb\u03bb\u03bf\u03bd \u03c0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ad\u03b1.\n\n\u0395\u03bb\u03ad\u03b3\u03be\u03c4\u03b5 \u03c4\u03b7\u03bd \u03c4\u03b5\u03ba\u03bc\u03b7\u03c1\u03af\u03c9\u03c3\u03b7 \u03c3\u03c4\u03b9\u03c2 \u03c3\u03b5\u03bb\u03af\u03b4\u03b5\u03c2 \u03c5\u03c0\u03bf\u03c3\u03c4\u03ae\u03c1\u03b9\u03be\u03b7\u03c2 \u03c4\u03bf\u03c5 \u03ba\u03b1\u03c4\u03b1\u03c3\u03ba\u03b5\u03c5\u03b1\u03c3\u03c4\u03ae \u03c4\u03bf\u03c5 \u03c0\u03b1\u03bb\u03b1\u03b9\u03bf\u03cd \u03c0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ad\u03b1, \u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b1\u03bd\u03b1\u03b2\u03ac\u03b8\u03bc\u03b9\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03c5\u03bb\u03b9\u03ba\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03b9\u03ba\u03bf\u03cd \u03c4\u03bf\u03c5 \u03c0\u03b1\u03bb\u03b1\u03b9\u03bf\u03cd \u03c0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ad\u03b1 \u03c3\u03b5 \u03ad\u03ba\u03b4\u03bf\u03c3\u03b7 \u03c0\u03bf\u03c5 \u03ad\u03c7\u03b5\u03b9 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03b7\u03b8\u03b5\u03af \u03bc\u03b5 \u03c4\u03b7\u03bd \u03ad\u03ba\u03b4\u03bf\u03c3\u03b7 SDK {ok_sdk_version} \u03ae \u03bd\u03b5\u03cc\u03c4\u03b5\u03c1\u03b7.",
             "migration_successful": "\u0397 \u03bc\u03b5\u03c4\u03b5\u03b3\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03ae\u03c4\u03b1\u03bd \u03b5\u03c0\u03b9\u03c4\u03c5\u03c7\u03ae\u03c2.",
             "not_zwave_device": "\u0397 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03c0\u03bf\u03c5 \u03b1\u03bd\u03b1\u03ba\u03b1\u03bb\u03cd\u03c6\u03b8\u03b7\u03ba\u03b5 \u03b4\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae Z-Wave.",