Add user-configurable MCP startup timeouts#6399
Open
calvinmclean wants to merge 26 commits intoobot-platform:mainfrom
Open
Add user-configurable MCP startup timeouts#6399calvinmclean wants to merge 26 commits intoobot-platform:mainfrom
calvinmclean wants to merge 26 commits intoobot-platform:mainfrom
Conversation
calvinmclean
force-pushed
the
feature/mcp-server-timeouts
branch
from
905b5db to
8f140d2
Compare
calvinmclean
commented
Apr 22, 2026
| } | ||
|
|
||
| func toolsForServer(ctx context.Context, mcpSessionManager *mcp.SessionManager, server v1.MCPServer, serverConfig mcp.ServerConfig, allowedTools []string) ([]types.MCPServerTool, error) { | ||
| ctx, cancel := context.WithTimeout(ctx, time.Minute) |
Contributor
Author
There was a problem hiding this comment.
timeout is removed because this calls mcpSessionManager.ListTools -> sm.clientForMCPServer -> sm.clientForMCPServerWithClientScope -> sm.clientForServerWithScope -> sm.clientForServerWithOptions -> sm.ensureDeployment -> sm.backend.ensureServerDeployment which is finally the Docker/K8s implementation which handles timeouts
calvinmclean
commented
Apr 22, 2026
|
|
||
| func ensureServerReady(ctx context.Context, url string, server ServerConfig) error { | ||
| // Ensure we can actually hit the service URL. | ||
| ctx, cancel := context.WithTimeout(ctx, time.Minute) |
Contributor
Author
There was a problem hiding this comment.
timeout removed because this is called by Docker/K8s implementation with a context timeout already
calvinmclean
force-pushed
the
feature/mcp-server-timeouts
branch
6 times, most recently
from
00c83c0 to
8ed2ce6
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 14 out of 15 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
calvinmclean
force-pushed
the
feature/mcp-server-timeouts
branch
from
8ed2ce6 to
d6b052f
Compare
calvinmclean
force-pushed
the
feature/mcp-server-timeouts
branch
from
db8fe05 to
0a31e71
Compare
![entelligence-ai-pr-reviews[bot]](https://avatars.githubusercontent.com/in/932812?s=60&v=4){kind=small}
There was a problem hiding this comment.
This PR fixes bugs and improves code correctness across MCP configuration, pod name resolution, and wait logic.
pkg/mcp/kubernetes.go: Removed redundantctx.Done()select block; context cancellation handled byclient.Listpkg/mcp/types.go: Fixedelse iflogic to preventMaxMCPServerStartupTimeoutfrom validating against default (zero-value) startup timeoutspkg/wait/waitfor.go: Replaced nestedfor/selectwithfor rangeloop; moved unreachable error return to correct post-loop positionpkg/mcp/kubernetes_test.go: IntroducedfakeWithWatchto satisfy Watch interface in tests; updated goroutine-based event emission and aligned error message assertion with new retry timeout format
- This simplifies rather than checking and converting to Duration every time it is used
- This was originally removed to allow `ensureDeployment` to control its own timeout - Now I added timeouts to paths from toolsForServer that do not share the timeout with ensureDeployment
calvinmclean
force-pushed
the
feature/mcp-server-timeouts
branch
from
1556684 to
953674e
Compare
There was a problem hiding this comment.
Introduces a configurable startupTimeoutSeconds field (default 60s, max 600s) for MCP server startup across the full stack, from API types to UI forms, with proper validation and context propagation.
- Adds
StartupTimeoutSecondstoMCPServerManifest,MCPServerCatalogEntryManifest, andSystemMCPServerManifestAPI types and OpenAPI schemas - Introduces
StartupTimeout(time.Duration) inServerConfigwith default/max enforcement intypes.go - Propagates configurable timeout into Docker and Kubernetes backends, replacing hardcoded 1-minute values
- Fixes context propagation bugs in
backend.go(HTTP requests, SSE loop) and removes redundant fixed timeouts inmcp.go,client.go, andtools.go - Adds
validateStartupTimeoutinmcpvalidators.gowith integration into all three manifest validators - Adds UI input fields for
startupTimeoutSecondsin NPX, UVX, and containerized runtime forms with validation - Adds unit tests for pod status analysis, deployment watch timeout, and
startupTimeoutSecondsvalidation boundaries
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Addresses #6185
Testing
In order to test this, I created a simple npx MCP server with a configurable sleep before serving:
This screenshot shows how the configuration can be set. In this case, the server will have a slow startup which would have previously timed-out. Now it will still succeed due to the 90s timeout.
