From 19446cb864694afb8b05300a8fcaf80c7e016f51 Mon Sep 17 00:00:00 2001
From: Per Weijnitz <per.weijnitz@gmail.com>
Date: Wed, 19 Mar 2025 06:47:02 +0100
Subject: [PATCH] =?UTF-8?q?=E2=8C=9B=20feat:=20`initTimeout`=20for=20Slow?=
 =?UTF-8?q?=20Starting=20MCP=20Servers=20(#6383)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: make mcp server connect timeout configurable with initTimeout

* style: add missing semicolon to connection.ts
---
 packages/data-provider/src/mcp.ts | 1 +
 packages/mcp/src/connection.ts    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/data-provider/src/mcp.ts b/packages/data-provider/src/mcp.ts
index 4f3225838f..c52ca7d15a 100644
--- a/packages/data-provider/src/mcp.ts
+++ b/packages/data-provider/src/mcp.ts
@@ -4,6 +4,7 @@ import { extractEnvVariable } from './utils';
 const BaseOptionsSchema = z.object({
   iconPath: z.string().optional(),
   timeout: z.number().optional(),
+  initTimeout: z.number().optional(),
 });
 
 export const StdioOptionsSchema = BaseOptionsSchema.extend({
diff --git a/packages/mcp/src/connection.ts b/packages/mcp/src/connection.ts
index 72c4b472d3..4531ae777d 100644
--- a/packages/mcp/src/connection.ts
+++ b/packages/mcp/src/connection.ts
@@ -269,7 +269,7 @@ export class MCPConnection extends EventEmitter {
         this.transport = this.constructTransport(this.options);
         this.setupTransportDebugHandlers();
 
-        const connectTimeout = 10000;
+	const connectTimeout = this.options.initTimeout ?? 10000;
         await Promise.race([
           this.client.connect(this.transport),
           new Promise((_resolve, reject) =>