feat: Implement MCP client and refactor MCP module structure

ai/component/agent/react/react.go

@@ -290,26 +290,34 @@ func ActFlow(g *genkit.Genkit, actPrompt ai.Prompt) agent.NormalFlow {
 				runtime.GetLogger().Info("Act Done.", "output", out, "error", err)
 			}()
 
-			// Beacause the input is in the history, so don't need to use, just check the type
-			input, ok := in.(ActIn)
-			if !ok {
-				return nil, fmt.Errorf("input is not of type ActIn, got %T", in)
+			// Try to get input from orchestrator or parse from history
+			var input ActIn
+			var hasInput bool
+			if inTyped, ok := in.(ActIn); ok {
+				input = inTyped
+				hasInput = true
 			}
-			if input.Intent == schema.GeneralInquiry || len(input.SuggestedTools) == 0 {
-				actOuts := ActOut{
-					Outputs: []toolEngine.ToolOutput{
-						{
-							ToolName: "no_need_tool_call",
-							Summary:  "no need tool call",
-							Result: map[string]any{
-								"reason": "general inquiry or no suggested tools",
+			// If no valid input from orchestrator, we'll skip the general inquiry check
+			// and let the LLM decide based on history
+			if !hasInput || (input.Intent == schema.GeneralInquiry || len(input.SuggestedTools) == 0) {
+				// Only skip if we actually have input and it indicates general inquiry
+				if hasInput && (input.Intent == schema.GeneralInquiry || len(input.SuggestedTools) == 0) {
+					actOuts := ActOut{
+						Outputs: []toolEngine.ToolOutput{
+							{
+								ToolName: "no_need_tool_call",
+								Summary:  "no need tool call",
+								Result: map[string]any{
+									"reason": "general inquiry or no suggested tools",
+								},
 							},
 						},
-					},
-					UsageInfo: &ai.GenerationUsage{},
+						UsageInfo: &ai.GenerationUsage{},
+					}
+					schema.AccumulateUsage(actOuts.UsageInfo, in.Usage())
+					return actOuts, nil
 				}
-				schema.AccumulateUsage(actOuts.UsageInfo, in.Usage())
-				return actOuts, nil
+				// If no valid input, continue to let LLM decide from history
 			}
 
 			history, ok := ctx.Value(memory.ChatHistoryKey).(*memory.HistoryMemory)
@@ -333,7 +341,7 @@ func ActFlow(g *genkit.Genkit, actPrompt ai.Prompt) agent.NormalFlow {
 			}
 
 			// If the model returns no tool requests while suggested_tools is non-empty, surface the real cause.
-			if len(toolReqs.ToolRequests()) == 0 && input.SuggestedTools != nil && len(input.SuggestedTools) > 0 {
+			if hasInput && len(toolReqs.ToolRequests()) == 0 && input.SuggestedTools != nil && len(input.SuggestedTools) > 0 {
 				return nil, fmt.Errorf("model returned no tool calls for suggested_tools=%v", input.SuggestedTools)
 			}
 			runtime.GetLogger().Info("tool requests:", "req", toolReqs.ToolRequests())

ai/component/tools/component.go

@@ -52,8 +52,11 @@ func (t *ToolsComponent) SetName(name string) {
 }
 
 func (t *ToolsComponent) Validate() error {
-	if t.config.EnableMCPTools && t.config.MCPHostName == "" {
-		return fmt.Errorf("mcp_host_name is required when mcp tools are enabled")
+	if t.config.EnableMCPTools && t.config.MCP.Host == "" {
+		return fmt.Errorf("mcp.host is required when mcp tools are enabled")
+	}
+	if t.config.MCP.Port <= 0 || t.config.MCP.Port > 65535 {
+		return fmt.Errorf("mcp.port must be between 1 and 65535")
 	}
 	if t.config.MCPTimeout <= 0 {
 		return fmt.Errorf("mcp_timeout must be greater than 0")
@@ -82,7 +85,7 @@ func (t *ToolsComponent) Init(rt *runtime.Runtime) error {
 	}
 
 	if t.config.EnableMCPTools {
-		mcpToolManager, err := engine.NewMCPToolManager(rt, t.config.MCPHostName)
+		mcpToolManager, err := engine.NewMCPToolManager(rt, t.config.MCP.Host, t.config.MCP.Port, t.config.MCP.APIKey, t.config.MCPMaxRetries)
 		if err != nil {
 			return fmt.Errorf("failed to create MCP tool manager: %w", err)
 		}
@@ -94,7 +97,7 @@ func (t *ToolsComponent) Init(rt *runtime.Runtime) error {
 	rt.GetLogger().Info("Tools component initialized",
 		"total_tools", len(t.toolRefs),
 		"total_managers", len(t.toolManagers),
-		"mcp_host", t.config.MCPHostName)
+		"mcp_endpoint", fmt.Sprintf("http://%s:%d/api/mcp", t.config.MCP.Host, t.config.MCP.Port))
 
 	return nil
 }

ai/component/tools/config.go

@@ -27,12 +27,12 @@ type ToolsConfig struct {
 
 // ToolConfig defines the tool configuration
 type ToolConfig struct {
-	EnableMockTools     bool   `yaml:"enable_mock_tools"`
-	EnableInternalTools bool   `yaml:"enable_internal_tools"`
-	EnableMCPTools      bool   `yaml:"enable_mcp_tools"`
-	MCPHostName         string `yaml:"mcp_host_name"`
-	MCPTimeout          int    `yaml:"mcp_timeout"`
-	MCPMaxRetries       int    `yaml:"mcp_max_retries"`
+	EnableMockTools     bool      `yaml:"enable_mock_tools"`
+	EnableInternalTools bool      `yaml:"enable_internal_tools"`
+	EnableMCPTools      bool      `yaml:"enable_mcp_tools"`
+	MCP                 MCPConfig `yaml:"mcp"`
+	MCPTimeout          int       `yaml:"mcp_timeout"`
+	MCPMaxRetries       int       `yaml:"mcp_max_retries"`
 }
 
 // MemoryConfig defines the memory configuration
@@ -59,6 +59,7 @@ type MCPConfig struct {
 	Enabled bool   `yaml:"enabled"`
 	Host    string `yaml:"host"`
 	Port    int    `yaml:"port"`
+	APIKey  string `yaml:"apiKey"`
 }
 
 // DefaultToolsConfig returns default tools configuration
@@ -67,7 +68,7 @@ func DefaultToolsConfig() ToolsConfig {
 		Memory:   DefaultMemoryConfig(),
 		Mock:     MockConfig{Enabled: true},
 		Internal: InternalConfig{Enabled: true},
-		MCP:      MCPConfig{Enabled: true, Host: "mcp_host", Port: 8080},
+		MCP:      MCPConfig{Enabled: true, Host: "localhost", Port: 8888, APIKey: ""},
 	}
 }
 
@@ -77,7 +78,7 @@ func DefaultToolConfig() *ToolConfig {
 		EnableMockTools:     true,
 		EnableInternalTools: true,
 		EnableMCPTools:      true,
-		MCPHostName:         "mcp_host",
+		MCP:                 MCPConfig{Enabled: true, Host: "localhost", Port: 8888},
 		MCPTimeout:          30,
 		MCPMaxRetries:       3,
 	}