feat(mcp): Robust remote server handling & DI

michiosw · michiosw · commit 21fe6bce2751 · 2025-04-12T12:35:26.000-07:00
- Health monitoring (30s) &amp; auto-recovery with exp backoff
- Smart tool management based on server state
- Continues operation during remote failures
- Moved to config.go with fx integration
- Consolidated to NewMCPComponents

Breaking: NewMCPServer/SSEServer -&gt; NewMCPComponents
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -65,7 +65,7 @@ var DatabaseModule = fx.Module("database",
 // ConfigModule provides configuration loading services.
 var ConfigModule = fx.Module("config",
 	fx.Provide(
-		config.NewExporter,
+		mcp.NewMCPConfig,
 	),
 )
 
@@ -86,8 +86,7 @@ var BackendModule = fx.Module("backend",
 // MCPClientModule provides the MCP client (distinct from server frontend).
 var MCPClientModule = fx.Module("mcp_client",
 	fx.Provide(
-		mcp.NewMCPServer,
-		mcp.NewSSEServer,
+		mcp.NewMCPComponents,
 	),
 	fx.Invoke(mcp.RegisterMCPServerHooks),
 )
diff --git a/internal/mcp/config.go b/internal/mcp/config.go
@@ -0,0 +1,61 @@
+// Package mcp implements the MCP server logic.
+package mcp
+
+import (
+	"github.com/co-browser/agent-browser/internal/log"
+	"go.uber.org/fx"
+)
+
+// RemoteMCPServer defines a remote MCP server to connect to
+type RemoteMCPServer struct {
+	URL         string `json:"url"`
+	Name        string `json:"name"`
+	Description string `json:"description"`
+}
+
+// MCPServerConfig holds the configuration for the MCP server
+type MCPServerConfig struct {
+	RemoteServers []RemoteMCPServer `json:"remote_servers"`
+	Port          int               `json:"port" default:"8087"`
+}
+
+// ConfigParams contains the parameters needed for configuration
+type ConfigParams struct {
+	fx.In
+
+	Logger log.Logger
+}
+
+// ConfigResult contains the configuration output
+type ConfigResult struct {
+	fx.Out
+
+	Config MCPServerConfig
+}
+
+// NewMCPConfig creates a new MCP configuration
+func NewMCPConfig(p ConfigParams) (ConfigResult, error) {
+	// TODO: Load from environment or config file
+	config := MCPServerConfig{
+		Port: 8087,
+		RemoteServers: []RemoteMCPServer{
+			{
+				URL:         "https://0.0.0.0:8001/sse",
+				Name:        "Local Test Server",
+				Description: "Local MCP test server",
+			},
+			{
+				URL:         "https://api-gateway.cobrowser.xyz/mcp/api/sse?api_key=REDACTED_API_KEY",
+				Name:        "API Gateway",
+				Description: "API Gateway MCP server",
+			},
+		},
+	}
+
+	p.Logger.Info().
+		Int("port", config.Port).
+		Int("remote_servers", len(config.RemoteServers)).
+		Msg("MCP configuration loaded")
+
+	return ConfigResult{Config: config}, nil
+}
diff --git a/internal/mcp/server.go b/internal/mcp/server.go
