From 14787fd5a401c6dbc64bc5b3aca122e9ee36cfdc Mon Sep 17 00:00:00 2001
From: Emanuel Isaac Afanador <32755400+ManuLasker@users.noreply.github.com>
Date: Tue, 12 Aug 2025 02:25:19 -0500
Subject: [PATCH] fix(core): Populate MCP endpoints in frontend settings
 (#17939)

---
 packages/frontend/@n8n/stores/src/useRootStore.ts      | 10 ++++++++++
 .../editor-ui/src/stores/settings.store.test.ts        |  2 ++
 .../frontend/editor-ui/src/stores/settings.store.ts    |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/packages/frontend/@n8n/stores/src/useRootStore.ts b/packages/frontend/@n8n/stores/src/useRootStore.ts
index b3742aae38..26aed6d313 100644
--- a/packages/frontend/@n8n/stores/src/useRootStore.ts
+++ b/packages/frontend/@n8n/stores/src/useRootStore.ts
@@ -157,6 +157,14 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 		state.value.endpointWebhookWaiting = value;
 	};
 
+	const setEndpointMcp = (value: string) => {
+		state.value.endpointMcp = value;
+	};
+
+	const setEndpointMcpTest = (value: string) => {
+		state.value.endpointMcpTest = value;
+	};
+
 	const setTimezone = (value: string) => {
 		state.value.timezone = value;
 		setGlobalState({ defaultTimezone: value });
@@ -226,6 +234,8 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 		setEndpointWebhook,
 		setEndpointWebhookTest,
 		setEndpointWebhookWaiting,
+		setEndpointMcp,
+		setEndpointMcpTest,
 		setTimezone,
 		setExecutionTimeout,
 		setMaxExecutionTimeout,
diff --git a/packages/frontend/editor-ui/src/stores/settings.store.test.ts b/packages/frontend/editor-ui/src/stores/settings.store.test.ts
index a6df77fa7c..28910fce34 100644
--- a/packages/frontend/editor-ui/src/stores/settings.store.test.ts
+++ b/packages/frontend/editor-ui/src/stores/settings.store.test.ts
@@ -32,6 +32,8 @@ vi.mock('@n8n/stores/useRootStore', () => ({
 		setEndpointWebhook: vi.fn(),
 		setEndpointWebhookTest: vi.fn(),
 		setEndpointWebhookWaiting: vi.fn(),
+		setEndpointMcp: vi.fn(),
+		setEndpointMcpTest: vi.fn(),
 		setTimezone: vi.fn(),
 		setExecutionTimeout: vi.fn(),
 		setMaxExecutionTimeout: vi.fn(),
diff --git a/packages/frontend/editor-ui/src/stores/settings.store.ts b/packages/frontend/editor-ui/src/stores/settings.store.ts
index 83cf8d8954..c787da8de1 100644
--- a/packages/frontend/editor-ui/src/stores/settings.store.ts
+++ b/packages/frontend/editor-ui/src/stores/settings.store.ts
@@ -253,6 +253,8 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		rootStore.setEndpointWebhook(fetchedSettings.endpointWebhook);
 		rootStore.setEndpointWebhookTest(fetchedSettings.endpointWebhookTest);
 		rootStore.setEndpointWebhookWaiting(fetchedSettings.endpointWebhookWaiting);
+		rootStore.setEndpointMcp(fetchedSettings.endpointMcp);
+		rootStore.setEndpointMcpTest(fetchedSettings.endpointMcpTest);
 		rootStore.setTimezone(fetchedSettings.timezone);
 		rootStore.setExecutionTimeout(fetchedSettings.executionTimeout);
 		rootStore.setMaxExecutionTimeout(fetchedSettings.maxExecutionTimeout);