diff --git a/homeassistant/components/conversation/__init__.py b/homeassistant/components/conversation/__init__.py index ac3057769f1..2796e51c27d 100644 --- a/homeassistant/components/conversation/__init__.py +++ b/homeassistant/components/conversation/__init__.py @@ -442,7 +442,7 @@ class AgentManager: agents.append( AgentInfo( id=agent_id, - name=config_entry.title, + name=config_entry.title or config_entry.domain, ) ) return agents diff --git a/tests/components/conversation/snapshots/test_init.ambr b/tests/components/conversation/snapshots/test_init.ambr index 017ee004a84..7284b83cb77 100644 --- a/tests/components/conversation/snapshots/test_init.ambr +++ b/tests/components/conversation/snapshots/test_init.ambr @@ -17,6 +17,12 @@ 'name': 'Mock Title', }) # --- +# name: test_get_agent_info.3 + dict({ + 'id': 'mock-entry', + 'name': 'test', + }) +# --- # name: test_get_agent_list dict({ 'agents': list([ diff --git a/tests/components/conversation/test_init.py b/tests/components/conversation/test_init.py index 4bcfcdbf3dc..4d49b2d21ea 100644 --- a/tests/components/conversation/test_init.py +++ b/tests/components/conversation/test_init.py @@ -1642,6 +1642,13 @@ async def test_get_agent_info( assert conversation.async_get_agent_info(hass, mock_agent.agent_id) == snapshot assert conversation.async_get_agent_info(hass, "not exist") is None + # Test the name when config entry title is empty + agent_entry = hass.config_entries.async_get_entry("mock-entry") + hass.config_entries.async_update_entry(agent_entry, title="") + + agent_info = conversation.async_get_agent_info(hass) + assert agent_info == snapshot + async def test_ws_get_agent_info( hass: HomeAssistant,