From 318728991324c6009645f8470a0edd4df2e76348 Mon Sep 17 00:00:00 2001
From: Max Michels <6703026+maxmichels@users.noreply.github.com>
Date: Thu, 21 May 2026 23:18:54 +0200
Subject: [PATCH] Replace duplicate constants with homeassistant.const imports
 (#171776)

---
 homeassistant/components/mcp/__init__.py    |  3 ++-
 homeassistant/components/mcp/config_flow.py | 10 ++--------
 homeassistant/components/mcp/const.py       |  2 --
 tests/components/mcp/conftest.py            |  3 +--
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/homeassistant/components/mcp/__init__.py b/homeassistant/components/mcp/__init__.py
index 6eec73d3331e..21ae6bedff2b 100644
--- a/homeassistant/components/mcp/__init__.py
+++ b/homeassistant/components/mcp/__init__.py
@@ -4,12 +4,13 @@ from dataclasses import dataclass
 from typing import cast
 
 from homeassistant.components.application_credentials import AuthorizationServer
+from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_entry_oauth2_flow, llm
 
 from .application_credentials import authorization_server_context
-from .const import CONF_ACCESS_TOKEN, CONF_AUTHORIZATION_URL, CONF_TOKEN_URL, DOMAIN
+from .const import CONF_AUTHORIZATION_URL, CONF_TOKEN_URL, DOMAIN
 from .coordinator import ModelContextProtocolCoordinator, TokenManager
 from .types import ModelContextProtocolConfigEntry
 
diff --git a/homeassistant/components/mcp/config_flow.py b/homeassistant/components/mcp/config_flow.py
index e3a176dd6d7d..9fcf038cd747 100644
--- a/homeassistant/components/mcp/config_flow.py
+++ b/homeassistant/components/mcp/config_flow.py
@@ -13,7 +13,7 @@ from yarl import URL
 
 from homeassistant.components.application_credentials import AuthorizationServer
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.const import CONF_TOKEN, CONF_URL
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN, CONF_URL
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
@@ -24,13 +24,7 @@ from homeassistant.helpers.config_entry_oauth2_flow import (
 
 from . import async_get_config_entry_implementation
 from .application_credentials import authorization_server_context
-from .const import (
-    CONF_ACCESS_TOKEN,
-    CONF_AUTHORIZATION_URL,
-    CONF_SCOPE,
-    CONF_TOKEN_URL,
-    DOMAIN,
-)
+from .const import CONF_AUTHORIZATION_URL, CONF_SCOPE, CONF_TOKEN_URL, DOMAIN
 from .coordinator import TokenManager, mcp_client
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/mcp/const.py b/homeassistant/components/mcp/const.py
index e33e32e6d828..2170976e084a 100644
--- a/homeassistant/components/mcp/const.py
+++ b/homeassistant/components/mcp/const.py
@@ -2,8 +2,6 @@
 
 DOMAIN = "mcp"
 
-# pylint: disable-next=home-assistant-duplicate-const
-CONF_ACCESS_TOKEN = "access_token"
 CONF_AUTHORIZATION_URL = "authorization_url"
 CONF_TOKEN_URL = "token_url"
 CONF_SCOPE = "scope"
diff --git a/tests/components/mcp/conftest.py b/tests/components/mcp/conftest.py
index a156f06f326e..eadd592e7f94 100644
--- a/tests/components/mcp/conftest.py
+++ b/tests/components/mcp/conftest.py
@@ -13,13 +13,12 @@ from homeassistant.components.application_credentials import (
     async_import_client_credential,
 )
 from homeassistant.components.mcp.const import (
-    CONF_ACCESS_TOKEN,
     CONF_AUTHORIZATION_URL,
     CONF_SCOPE,
     CONF_TOKEN_URL,
     DOMAIN,
 )
-from homeassistant.const import CONF_TOKEN, CONF_URL
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN, CONF_URL
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component