Merge branch 'dev' into loading

Author: chenyme

backend/internal/application/settings/runtime_settings.go

@@ -11,6 +11,11 @@ import (
 	"github.com/DEEIX-AI/DEEIX-Chat/backend/internal/repository"
 )
 
+const (
+	defaultMCPToolTimeoutSeconds = 10
+	maxMCPToolTimeoutSeconds     = 1800
+)
+
 // RuntimeSettings 负责把数据库中的动态配置应用到运行时配置，并维护配置缓存。
 type RuntimeSettings struct {
 	repo              repository.SettingsRepository
@@ -399,6 +404,12 @@ func (r *RuntimeSettings) normalizeConfig(cfg *config.Config) {
 	if cfg.MCPMaxSelectedToolsPerMessage > config.MaxMCPSelectedToolsPerMessage {
 		cfg.MCPMaxSelectedToolsPerMessage = config.MaxMCPSelectedToolsPerMessage
 	}
+	if cfg.MCPToolTimeoutSeconds <= 0 {
+		cfg.MCPToolTimeoutSeconds = defaultMCPToolTimeoutSeconds
+	}
+	if cfg.MCPToolTimeoutSeconds > maxMCPToolTimeoutSeconds {
+		cfg.MCPToolTimeoutSeconds = maxMCPToolTimeoutSeconds
+	}
 	if !cfg.FileFullContextLimitEnabled {
 		cfg.FileFullContextMaxBytes = 0
 		cfg.FileFullContextMaxTokens = 0

backend/internal/application/settings/service.go

@@ -475,7 +475,7 @@ func validatePatchItem(item PatchItem) error {
 	case "mcp:mcp_max_selected_tools_per_message":
 		return validateIntMinMax(value, 1, config.MaxMCPSelectedToolsPerMessage, key)
 	case "mcp:mcp_tool_timeout_seconds":
-		return validateIntMinMax(value, 1, 120, key)
+		return validateIntMinMax(value, 0, maxMCPToolTimeoutSeconds, key)
 	case "mcp:mcp_tool_retry_count":
 		return validateIntMinMax(value, 0, 5, key)
 	case "mcp:mcp_tool_prompt":

backend/internal/infra/mcp/client.go

@@ -18,7 +18,11 @@ import (
 	"github.com/DEEIX-AI/DEEIX-Chat/backend/internal/shared/security"
 )
 
-const protocolVersion = "2025-06-18"
+const (
+	protocolVersion         = "2025-06-18"
+	defaultRequestTimeoutMS = 10000
+	defaultConnectTimeout   = 10 * time.Second
+)
 
 // Client 封装 MCP Streamable HTTP JSON-RPC 客户端。
 type Client struct {
@@ -58,10 +62,9 @@ func NewClient() *Client {
 
 // NewClientWithEnv 创建带运行环境的 MCP 客户端。
 func NewClientWithEnv(env string, ssrfProtectionEnabled bool) *Client {
-	transport := security.NewOutboundHTTPTransport(env, ssrfProtectionEnabled, 10*time.Second)
+	transport := security.NewOutboundHTTPTransport(env, ssrfProtectionEnabled, defaultConnectTimeout)
 	return &Client{
 		httpClient: &http.Client{
-			Timeout:   30 * time.Second,
 			Transport: platformtracing.NewHTTPTransport(transport),
 		},
 	}
@@ -168,11 +171,7 @@ func (c *Client) rpcWithSession(
 		return nil, sessionID, err
 	}
 
-	timeoutMS := cfg.TimeoutMS
-	if timeoutMS <= 0 {
-		timeoutMS = 10000
-	}
-	requestCtx, cancel := context.WithTimeout(ctx, time.Duration(timeoutMS)*time.Millisecond)
+	requestCtx, cancel := context.WithTimeout(ctx, time.Duration(resolveRequestTimeoutMS(cfg.TimeoutMS))*time.Millisecond)
 	defer cancel()
 
 	req, err := http.NewRequestWithContext(requestCtx, http.MethodPost, endpoint, bytes.NewReader(raw))
@@ -221,6 +220,13 @@ func (c *Client) rpcWithSession(
 	return result, sessionID, nil
 }
 
+func resolveRequestTimeoutMS(timeoutMS int) int {
+	if timeoutMS <= 0 {
+		return defaultRequestTimeoutMS
+	}
+	return timeoutMS
+}
+
 func (c *Client) nextRequestID() int64 {
 	return c.nextID.Add(1)
 }