Fix registry data corruption and normalize server ID handling (#184)

* Fix Mozilla.ai registry entry for monday.com

* Update Mozilla.ai registry validation to catch any future issues

* registry: fix resolve/search issue for ID vs. Name

* Align test expectations with fixes

Author: peteski22

internal/provider/mcpm/registry.go

@@ -205,6 +205,9 @@ func (r *Registry) Search(
 // Returns the transformed result, and a flag to indicate if the transformation was successful.
 // If the server cannot be transformed due to unsupported or malformed runtime installations, false is returned.
 func (r *Registry) serverForID(pkgKey string) (packages.Server, bool) {
+	// Normalize pkgKey to ensure consistency with map keys.
+	pkgKey = filter.NormalizeString(pkgKey)
+
 	// Sanity check to ensure things work when a random ID gets supplied.
 	sd, foundServer := r.mcpServers[pkgKey]
 	if !foundServer {
@@ -243,7 +246,7 @@ func (r *Registry) serverForID(pkgKey string) (packages.Server, bool) {
 		Description:   sd.Description,
 		DisplayName:   sd.DisplayName,
 		Homepage:      sd.Homepage,
-		ID:            sd.Name,
+		ID:            pkgKey,
 		Installations: installations,
 		IsOfficial:    sd.IsOfficial,
 		License:       sd.License,

internal/provider/mozilla_ai/data/registry.json

@@ -219,7 +219,7 @@ func (m *MCPRegistry) UnmarshalJSON(data []byte) error {
 	return nil
 }
 
-// UnmarshalJSON implements custom JSON unmarshaling for Server to normalize the Name field.
+// UnmarshalJSON implements custom JSON unmarshaling for Server to normalize the ID field.
 func (s *Server) UnmarshalJSON(data []byte) error {
 	// Create a temporary struct with the same fields to avoid infinite recursion.
 	type serverAlias Server
@@ -228,10 +228,10 @@ func (s *Server) UnmarshalJSON(data []byte) error {
 		return err
 	}
 
-	// Normalize the name field.
-	alias.Name = filter.NormalizeString(alias.Name)
+	// Normalize the ID field.
+	alias.ID = filter.NormalizeString(alias.ID)
 
-	// Assign the normalized values to the receiver.
+	// Assign the values to the receiver.
 	*s = Server(alias)
 	return nil
 }

internal/provider/mozilla_ai/model.go

@@ -11,29 +11,34 @@ func TestServer_UnmarshalJSON(t *testing.T) {
 	t.Parallel()
 
 	tests := []struct {
-		name     string
-		input    string
-		expected string
+		name         string
+		input        string
+		expectedID   string
+		expectedName string
 	}{
 		{
-			name:     "Normalize mixed case name",
-			input:    `{"name": "GitHub-Server", "description": "Test server"}`,
-			expected: "github-server",
+			name:         "Normalize mixed case ID, keep original name",
+			input:        `{"id": "GitHub-Server", "name": "GitHub Server", "description": "Test server"}`,
+			expectedID:   "github-server",
+			expectedName: "GitHub Server",
 		},
 		{
-			name:     "Normalize uppercase name",
-			input:    `{"name": "TIME_SERVER", "description": "Test server"}`,
-			expected: "time_server",
+			name:         "Normalize uppercase ID, keep original name",
+			input:        `{"id": "TIME_SERVER", "name": "Time Server", "description": "Test server"}`,
+			expectedID:   "time_server",
+			expectedName: "Time Server",
 		},
 		{
-			name:     "Normalize name with spaces",
-			input:    `{"name": " Mixed Case Server ", "description": "Test server"}`,
-			expected: "mixed case server",
+			name:         "Normalize ID with spaces, keep original name",
+			input:        `{"id": " Mixed Case Server ", "name": "Mixed Case Server", "description": "Test server"}`,
+			expectedID:   "mixed case server",
+			expectedName: "Mixed Case Server",
 		},
 		{
-			name:     "Already normalized name unchanged",
-			input:    `{"name": "simple-server", "description": "Test server"}`,
-			expected: "simple-server",
+			name:         "Already normalized ID unchanged, keep original name",
+			input:        `{"id": "simple-server", "name": "Simple Server", "description": "Test server"}`,
+			expectedID:   "simple-server",
+			expectedName: "Simple Server",
 		},
 	}
 
@@ -44,7 +49,8 @@ func TestServer_UnmarshalJSON(t *testing.T) {
 			var server Server
 			err := json.Unmarshal([]byte(tc.input), &server)
 			require.NoError(t, err)
-			require.Equal(t, tc.expected, server.Name)
+			require.Equal(t, tc.expectedID, server.ID)
+			require.Equal(t, tc.expectedName, server.Name)
 			require.Equal(t, "Test server", server.Description)
 		})
 	}

internal/provider/mozilla_ai/model_test.go

@@ -204,6 +204,9 @@ func (r *Registry) Search(
 // serverForID attempts to convert the Server associated with the specified ID, into a packages.Server.
 // Returns the packages.Server and a boolean value indicating success.
 func (r *Registry) serverForID(pkgKey string) (packages.Server, bool) {
+	// Normalize pkgKey to ensure consistency with map keys.
+	pkgKey = filter.NormalizeString(pkgKey)
+
 	// Sanity check to ensure things work when a random ID gets supplied.
 	sd, foundServer := r.mcpServers[pkgKey]
 	if !foundServer {
@@ -238,7 +241,7 @@ func (r *Registry) serverForID(pkgKey string) (packages.Server, bool) {
 
 	return packages.Server{
 		Source:        RegistryName,
-		ID:            sd.Name,
+		ID:            sd.ID,
 		Name:          sd.Name,
 		DisplayName:   sd.DisplayName,
 		Description:   sd.Description,

internal/provider/mozilla_ai/registry.go

@@ -301,7 +301,7 @@ func TestRegistry_BuildPackageResult_ValidServer(t *testing.T) {
 	// Test building package result
 	pkg, ok := registry.serverForID(validServerKey)
 	require.True(t, ok, "Should successfully build package result")
-	require.Equal(t, validServerKey, pkg.Name)
+	require.Equal(t, validServerKey, pkg.ID)
 	require.Equal(t, RegistryName, pkg.Source)
 }
 
@@ -684,9 +684,9 @@ func TestNewRegistry_NormalizationIntegration(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, results, 1)
 
-	// Verify server name (and ID) was normalized.
+	// Verify server ID was normalized, name kept original.
 	result := results[0]
-	require.Equal(t, "github-server", result.Name)
+	require.Equal(t, "GitHub-Server", result.Name)
 	require.Equal(t, "github-server", result.ID)
 
 	// Verify tool names were normalized.

internal/provider/mozilla_ai/registry_test.go

@@ -4,6 +4,7 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 
@@ -12,7 +13,10 @@ import (
 
 func main() {
 	if len(os.Args) != 3 {
-		fmt.Fprintf(os.Stderr, "Usage: go run -tags=validate_registry ./tools/validate/registry.go <schema.json> <data.json>\n")
+		fmt.Fprintf(
+			os.Stderr,
+			"Usage: go run -tags=validate_registry ./tools/validate/registry.go <schema.json> <data.json>\n",
+		)
 		os.Exit(1)
 	}
 
@@ -50,5 +54,37 @@ func main() {
 		os.Exit(1)
 	}
 
+	// Additional business rule validation: check that map keys match server IDs
+	var registry map[string]any
+	err = json.Unmarshal(absDataPath, &registry)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error parsing registry data for business rule validation: %v\n", err)
+		os.Exit(1)
+	}
+
+	for key, value := range registry {
+		server, ok := value.(map[string]any)
+		if !ok {
+			continue
+		}
+
+		id, exists := server["id"].(string)
+		// This should never be able to happen as we've validated the schema, but no harm in the sanity check.
+		if !exists {
+			fmt.Fprintf(os.Stderr, "❌ Server at key '%s' missing required ID field\n", key)
+			os.Exit(1)
+		}
+
+		if id != key {
+			fmt.Fprintf(
+				os.Stderr,
+				"❌ Registry inconsistency: registry key '%s' does not match server ID '%s'\n",
+				key,
+				id,
+			)
+			os.Exit(1)
+		}
+	}
+
 	fmt.Println("✅ Mozilla AI registry validation succeeded")
 }