From c5fa3634bc2e95fe1201bc671ae542a1ebe83d6e Mon Sep 17 00:00:00 2001
From: Aleksander Grygier <aleksander.grygier@gmail.com>
Date: Thu, 5 Feb 2026 17:01:03 +0100
Subject: [PATCH] feat: Enable added MCP Server by default

---
 .../src/lib/components/app/mcp/McpServersSettings.svelte  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/server/webui/src/lib/components/app/mcp/McpServersSettings.svelte b/tools/server/webui/src/lib/components/app/mcp/McpServersSettings.svelte
index 9c6ce42289..3eabb7e8bd 100644
--- a/tools/server/webui/src/lib/components/app/mcp/McpServersSettings.svelte
+++ b/tools/server/webui/src/lib/components/app/mcp/McpServersSettings.svelte
@@ -6,6 +6,7 @@
 	import { mcpStore } from '$lib/stores/mcp.svelte';
 	import { conversationsStore } from '$lib/stores/conversations.svelte';
 	import { McpServerCard, McpServerCardSkeleton, McpServerForm } from '$lib/components/app/mcp';
+	import { MCP_SERVER_ID_PREFIX } from '$lib/constants/mcp';
 
 	let servers = $derived(mcpStore.getServersSorted());
 
@@ -56,12 +57,19 @@
 	function saveNewServer() {
 		if (newServerUrlError) return;
 
+		const newServerId = crypto.randomUUID
+			? crypto.randomUUID()
+			: `${MCP_SERVER_ID_PREFIX}${Date.now()}`;
+
 		mcpStore.addServer({
+			id: newServerId,
 			enabled: true,
 			url: newServerUrl.trim(),
 			headers: newServerHeaders.trim() || undefined
 		});
 
+		conversationsStore.setMcpServerOverride(newServerId, true);
+
 		isAddingServer = false;
 		newServerUrl = '';
 		newServerHeaders = '';