Skip to content

[Repo Assist] fix(mcp): replace hardcoded 30s with defaultConnectTimeout constant, fix <= 0 guard #3946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lpcox merged 2 commits into from
Apr 16, 2026
+8 −3
Merged

[Repo Assist] fix(mcp): replace hardcoded 30s with defaultConnectTimeout constant, fix <= 0 guard #3946

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
774e62d
fix(mcp): replace hardcoded 30s with defaultConnectTimeout constant, …
github-actions[bot] Apr 16, 2026
1e5db88
Update internal/mcp/connection.go
lpcox Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions internal/mcp/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ import (

var logConn = logger.New("mcp:connection")

// defaultConnectTimeout is the fallback connect timeout used when the configured timeout
// is non-positive or otherwise invalid.
// Kept in sync with config.DefaultConnectTimeout (30 s) to avoid importing the config package.
const defaultConnectTimeout = 30 * time.Second

// ContextKey for session ID
type ContextKey string

Expand Down Expand Up @@ -199,7 +204,7 @@ func NewConnection(ctx context.Context, serverID, command string, args []string,
func NewHTTPConnection(ctx context.Context, serverID, url string, headers map[string]string, oidcProvider *oidc.Provider, oidcAudience string, keepAlive time.Duration, connectTimeout time.Duration) (*Connection, error) {
// Apply default connect timeout when not specified
if connectTimeout <= 0 {
connectTimeout = 30 * time.Second
connectTimeout = defaultConnectTimeout
}
logger.LogInfo("backend", "Creating HTTP MCP connection with transport fallback, url=%s, connectTimeout=%v", url, connectTimeout)
ctx, cancel := context.WithCancel(ctx)
Expand Down Expand Up @@ -379,8 +384,8 @@ func (c *Connection) reconnectSDKTransport() error {
}

timeout := c.connectTimeout
if timeout == 0 {
timeout = 30 * time.Second
if timeout <= 0 {
timeout = defaultConnectTimeout
}
connectCtx, cancel := context.WithTimeout(c.ctx, timeout)
defer cancel()
Expand Down
Loading