Make MCP client initialization timeout configurable via ToolOptions

[Rodrigo Matiazo (matiazo)]

Summary

• Add nullable McpClientInitializationTimeoutSeconds property to ToolOptions so consumers can override the MCP client initialization timeout
• When not set (null), the MCP SDK default (60s) is used — no behavioral change for existing consumers
• When set, both McpClientOptions.InitializationTimeout and HttpClient.Timeout are configured to match

Motivation

Consumers connecting to the MCP platform may experience OperationCanceledException when downstream dependencies are slow. The MCP SDK's default 60-second initialization timeout is not configurable through ToolOptions, leaving no way for consumers to adjust it for their agents.

Usage

// Default behavior — no change needed, SDK default timeout applies
var options = new ToolOptions();
await configService.GetMcpClientToolsAsync(turnContext, serverConfig, token, options);

// Custom timeout for slow environments
var options = new ToolOptions
{
    McpClientInitializationTimeoutSeconds = 180 // 3 minutes
};
await configService.GetMcpClientToolsAsync(turnContext, serverConfig, token, options);

Changes

• src/Tooling/Core/Models/ToolOptions.cs — Add int? McpClientInitializationTimeoutSeconds property
• src/Tooling/Core/Services/McpToolServerConfigurationService.cs — Apply timeout only when explicitly set

Test plan

• Verified default behavior (null) uses MCP SDK default timeout
• Verified explicit value is applied to both McpClientOptions.InitializationTimeout and HttpClient.Timeout
• Built and tested end-to-end with sample-agent against MCP platform

---

Generated with Claude Code

[Copilot]

Pull request overview

This PR adds an opt-in configuration surface to the Tooling layer so SDK consumers can override the MCP client initialization timeout (handshake/connection setup) via ToolOptions, helping environments where MCP initialization regularly exceeds the SDK default.

Changes:

• Added ToolOptions.McpClientInitializationTimeoutSeconds (nullable) to allow overriding MCP initialization timeout.
• When set, applies the timeout to both HttpClient.Timeout and McpClientOptions.InitializationTimeout during MCP client creation.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.

File	Description
src/Tooling/Core/Models/ToolOptions.cs	Introduces a new nullable option to configure MCP client initialization timeout (in seconds).
src/Tooling/Core/Services/McpToolServerConfigurationService.cs	Applies the configured timeout when creating the HTTP client and MCP client options for MCP client initialization.

[Copilot]

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 6 comments.

[Copilot]

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

[Copilot]

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.