Fix _meta field format for MCP spec compliance

domdomegg · domdomegg · commit 4ac652827eb5 · 2025-09-07T10:38:38.000Z
Updates the _meta field structure to comply with MCP specification: - Changes from "io.modelcontextprotocol.registry" to "io.modelcontextprotocol.registry/official" - Changes from "publisher" to "io.modelcontextprotocol.registry/publisher-provided" The new format uses proper prefix/name structure as required by the MCP spec for vendor extensions, resolving naming collision with planned top-level publisher field. Includes database migration to update existing indexes for new field paths. Fixes #356 🏠 Remote-Dev: homespace
diff --git a/data/seed.json b/data/seed.json
diff --git a/internal/api/handlers/v0/edit_test.go b/internal/api/handlers/v0/edit_test.go
@@ -42,9 +42,9 @@ func TestEditServerEndpoint(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, published)
 	assert.NotNil(t, published.Meta)
-	assert.NotNil(t, published.Meta.IOModelContextProtocolRegistry)
+	assert.NotNil(t, published.Meta.Official)
 
-	testServerID := published.Meta.IOModelContextProtocolRegistry.ID
+	testServerID := published.Meta.Official.ID
 
 	// Publish a second server for permission testing
 	otherServer := apiv0.ServerJSON{
@@ -64,9 +64,9 @@ func TestEditServerEndpoint(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, otherPublished)
 	assert.NotNil(t, otherPublished.Meta)
-	assert.NotNil(t, otherPublished.Meta.IOModelContextProtocolRegistry)
+	assert.NotNil(t, otherPublished.Meta.Official)
 
-	otherServerID := otherPublished.Meta.IOModelContextProtocolRegistry.ID
+	otherServerID := otherPublished.Meta.Official.ID
 
 	// Publish a deleted server for undelete testing
 	deletedServer := apiv0.ServerJSON{
@@ -86,9 +86,9 @@ func TestEditServerEndpoint(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, deletedPublished)
 	assert.NotNil(t, deletedPublished.Meta)
-	assert.NotNil(t, deletedPublished.Meta.IOModelContextProtocolRegistry)
+	assert.NotNil(t, deletedPublished.Meta.Official)
 
-	deletedServerID := deletedPublished.Meta.IOModelContextProtocolRegistry.ID
+	deletedServerID := deletedPublished.Meta.Official.ID
 
 	testCases := []struct {
 		name           string
diff --git a/internal/api/handlers/v0/servers_test.go b/internal/api/handlers/v0/servers_test.go
@@ -175,8 +175,8 @@ func TestServersListEndpoint(t *testing.T) {
 						assert.NotEmpty(t, server.Name)
 						assert.NotEmpty(t, server.Description)
 						assert.NotNil(t, server.Meta)
-						assert.NotNil(t, server.Meta.IOModelContextProtocolRegistry)
-						assert.NotEmpty(t, server.Meta.IOModelContextProtocolRegistry.ID)
+						assert.NotNil(t, server.Meta.Official)
+						assert.NotEmpty(t, server.Meta.Official.ID)
 					}
 				}
 
@@ -223,7 +223,7 @@ func TestServersDetailEndpoint(t *testing.T) {
 	}{
 		{
 			name:           "successful get server detail",
-			serverID:       testServer.Meta.IOModelContextProtocolRegistry.ID,
+			serverID:       testServer.Meta.Official.ID,
 			expectedStatus: http.StatusOK,
 		},
 		{
@@ -305,7 +305,7 @@ func TestServersEndpointsIntegration(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, published)
 
-	serverID := published.Meta.IOModelContextProtocolRegistry.ID
+	serverID := published.Meta.Official.ID
 	servers := []apiv0.ServerJSON{*published}
 	serverDetail := published
 
diff --git a/internal/api/handlers/v0/telemetry_test.go b/internal/api/handlers/v0/telemetry_test.go
@@ -53,7 +53,7 @@ func TestPrometheusHandler(t *testing.T) {
 	mux.Handle("/metrics", metrics.PrometheusHandler())
 
 	// Create request
-	url := "/v0/servers/" + server.Meta.IOModelContextProtocolRegistry.ID
+	url := "/v0/servers/" + server.Meta.Official.ID
 	req := httptest.NewRequest(http.MethodGet, url, nil)
 	w := httptest.NewRecorder()
 
diff --git a/internal/database/memory.go b/internal/database/memory.go
@@ -103,11 +103,11 @@ func (db *MemoryDB) CreateServer(ctx context.Context, server *apiv0.ServerJSON)
 	}
 
 	// Get the ID from the registry metadata
-	if server.Meta == nil || server.Meta.IOModelContextProtocolRegistry == nil {
+	if server.Meta == nil || server.Meta.Official == nil {
 		return nil, fmt.Errorf("server must have registry metadata with ID")
 	}
 
-	id := server.Meta.IOModelContextProtocolRegistry.ID
+	id := server.Meta.Official.ID
 
 	db.mu.Lock()
 	defer db.mu.Unlock()
@@ -193,8 +193,8 @@ func (db *MemoryDB) matchesFilter(entry *apiv0.ServerJSON, filter *ServerFilter)
 
 // getRegistryID safely extracts the registry ID from an entry
 func (db *MemoryDB) getRegistryID(entry *apiv0.ServerJSON) string {
-	if entry.Meta != nil && entry.Meta.IOModelContextProtocolRegistry != nil {
-		return entry.Meta.IOModelContextProtocolRegistry.ID
+	if entry.Meta != nil && entry.Meta.Official != nil {
+		return entry.Meta.Official.ID
 	}
 	return ""
 }
diff --git a/internal/database/migrations/004_update_meta_field_format.sql b/internal/database/migrations/004_update_meta_field_format.sql
@@ -0,0 +1,11 @@
+-- Update database indexes to use new MCP spec compliant _meta field paths
+-- Data has been updated manually, only need to update indexes
+
+-- Drop old indexes that reference the old paths
+DROP INDEX IF EXISTS idx_servers_name_latest;
+DROP INDEX IF EXISTS idx_servers_updated_at;
+
+-- Create new indexes with updated paths
+CREATE INDEX idx_servers_name_latest ON servers ((value->>'name'), (value->'_meta'->'io.modelcontextprotocol.registry/official'->>'is_latest'))
+    WHERE (value->'_meta'->'io.modelcontextprotocol.registry/official'->>'is_latest')::boolean = true;
+CREATE INDEX idx_servers_updated_at ON servers ((value->'_meta'->'io.modelcontextprotocol.registry/official'->>'updated_at'));
diff --git a/internal/database/postgres.go b/internal/database/postgres.go
@@ -131,8 +131,8 @@ func (db *PostgreSQL) List(
 	nextCursor := ""
 	if len(results) > 0 && len(results) >= limit {
 		lastResult := results[len(results)-1]
-		if lastResult.Meta != nil && lastResult.Meta.IOModelContextProtocolRegistry != nil {
-			nextCursor = lastResult.Meta.IOModelContextProtocolRegistry.ID
+		if lastResult.Meta != nil && lastResult.Meta.Official != nil {
+			nextCursor = lastResult.Meta.Official.ID
 		}
 	}
 
@@ -177,11 +177,11 @@ func (db *PostgreSQL) CreateServer(ctx context.Context, server *apiv0.ServerJSON
 	}
 
 	// Get the ID from the registry metadata
-	if server.Meta == nil || server.Meta.IOModelContextProtocolRegistry == nil {
+	if server.Meta == nil || server.Meta.Official == nil {
 		return nil, fmt.Errorf("server must have registry metadata with ID")
 	}
 
-	id := server.Meta.IOModelContextProtocolRegistry.ID
+	id := server.Meta.Official.ID
 
 	// Marshal the complete server to JSONB
 	valueJSON, err := json.Marshal(server)
diff --git a/internal/importer/importer_test.go b/internal/importer/importer_test.go
@@ -33,7 +33,7 @@ func TestImportService_LocalFile(t *testing.T) {
 				Version: "1.0.0",
 			},
 			Meta: &apiv0.ServerMeta{
-				IOModelContextProtocolRegistry: &apiv0.RegistryExtensions{
+				Official: &apiv0.RegistryExtensions{
 					ID:          "test-id-1",
 					PublishedAt: time.Now(),
 					UpdatedAt:   time.Now(),
@@ -79,7 +79,7 @@ func TestImportService_HTTPFile(t *testing.T) {
 				Version: "2.0.0",
 			},
 			Meta: &apiv0.ServerMeta{
-				IOModelContextProtocolRegistry: &apiv0.RegistryExtensions{
+				Official: &apiv0.RegistryExtensions{
 					ID:          "test-id-2",
 					PublishedAt: time.Now(),
 					UpdatedAt:   time.Now(),
@@ -124,7 +124,7 @@ func TestImportService_RegistryAPI(t *testing.T) {
 				Version: "1.0.0",
 			},
 			Meta: &apiv0.ServerMeta{
-				IOModelContextProtocolRegistry: &apiv0.RegistryExtensions{
+				Official: &apiv0.RegistryExtensions{
 					ID:          "api-test-id-1",
 					PublishedAt: time.Now(),
 					UpdatedAt:   time.Now(),
@@ -144,7 +144,7 @@ func TestImportService_RegistryAPI(t *testing.T) {
 				Version: "2.0.0",
 			},
 			Meta: &apiv0.ServerMeta{
-				IOModelContextProtocolRegistry: &apiv0.RegistryExtensions{
+				Official: &apiv0.RegistryExtensions{
 					ID:          "api-test-id-2",
 					PublishedAt: time.Now(),
 					UpdatedAt:   time.Now(),
diff --git a/internal/service/registry_service.go b/internal/service/registry_service.go
@@ -113,8 +113,8 @@ func (s *registryServiceImpl) Publish(req apiv0.ServerJSON) (*apiv0.ServerJSON,
 	isNewLatest := true
 	if existingLatest != nil {
 		var existingPublishedAt time.Time
-		if existingLatest.Meta != nil && existingLatest.Meta.IOModelContextProtocolRegistry != nil {
-			existingPublishedAt = existingLatest.Meta.IOModelContextProtocolRegistry.PublishedAt
+		if existingLatest.Meta != nil && existingLatest.Meta.Official != nil {
+			existingPublishedAt = existingLatest.Meta.Official.PublishedAt
 		}
 		isNewLatest = CompareVersions(
 			serverJSON.VersionDetail.Version,
@@ -133,7 +133,7 @@ func (s *registryServiceImpl) Publish(req apiv0.ServerJSON) (*apiv0.ServerJSON,
 	}
 
 	// Set registry metadata
-	server.Meta.IOModelContextProtocolRegistry = &apiv0.RegistryExtensions{
+	server.Meta.Official = &apiv0.RegistryExtensions{
 		ID:          uuid.New().String(),
 		PublishedAt: publishTime,
 		UpdatedAt:   publishTime,
@@ -150,13 +150,13 @@ func (s *registryServiceImpl) Publish(req apiv0.ServerJSON) (*apiv0.ServerJSON,
 	// Mark previous latest as no longer latest
 	if isNewLatest && existingLatest != nil {
 		var existingLatestID string
-		if existingLatest.Meta != nil && existingLatest.Meta.IOModelContextProtocolRegistry != nil {
-			existingLatestID = existingLatest.Meta.IOModelContextProtocolRegistry.ID
+		if existingLatest.Meta != nil && existingLatest.Meta.Official != nil {
+			existingLatestID = existingLatest.Meta.Official.ID
 		}
 		if existingLatestID != "" {
 			// Update the existing server to set is_latest = false
-			existingLatest.Meta.IOModelContextProtocolRegistry.IsLatest = false
-			existingLatest.Meta.IOModelContextProtocolRegistry.UpdatedAt = time.Now()
+			existingLatest.Meta.Official.IsLatest = false
+			existingLatest.Meta.Official.UpdatedAt = time.Now()
 			if _, err := s.db.UpdateServer(ctx, existingLatestID, existingLatest); err != nil {
 				return nil, err
 			}
@@ -193,8 +193,8 @@ func (s *registryServiceImpl) validateNoDuplicateRemoteURLs(ctx context.Context,
 // getCurrentLatestVersion finds the current latest version from existing server versions
 func (s *registryServiceImpl) getCurrentLatestVersion(existingServerVersions []*apiv0.ServerJSON) *apiv0.ServerJSON {
 	for _, server := range existingServerVersions {
-		if server.Meta != nil && server.Meta.IOModelContextProtocolRegistry != nil &&
-			server.Meta.IOModelContextProtocolRegistry.IsLatest {
+		if server.Meta != nil && server.Meta.Official != nil &&
+			server.Meta.Official.IsLatest {
 			return server
 		}
 	}
diff --git a/internal/validators/validators.go b/internal/validators/validators.go
@@ -251,21 +251,21 @@ func ValidatePublishRequest(req apiv0.ServerJSON, cfg *config.Config) error {
 func validatePublisherExtensions(req apiv0.ServerJSON) error {
 	const maxExtensionSize = 4 * 1024 // 4KB limit
 
-	// Check size limit for _meta.publisher extension
-	if req.Meta != nil && req.Meta.Publisher != nil {
-		extensionsJSON, err := json.Marshal(req.Meta.Publisher)
+	// Check size limit for _meta publisher-provided extension
+	if req.Meta != nil && req.Meta.PublisherProvided != nil {
+		extensionsJSON, err := json.Marshal(req.Meta.PublisherProvided)
 		if err != nil {
-			return fmt.Errorf("failed to marshal _meta.publisher extension: %w", err)
+			return fmt.Errorf("failed to marshal _meta.io.modelcontextprotocol.registry/publisher-provided extension: %w", err)
 		}
 		if len(extensionsJSON) > maxExtensionSize {
-			return fmt.Errorf("_meta.publisher extension exceeds 4KB limit (%d bytes)", len(extensionsJSON))
+			return fmt.Errorf("_meta.io.modelcontextprotocol.registry/publisher-provided extension exceeds 4KB limit (%d bytes)", len(extensionsJSON))
 		}
 	}
 
 	if req.Meta != nil {
-		// Validate that only "publisher" is allowed in _meta during publish (no registry metadata should be present)
-		if req.Meta.IOModelContextProtocolRegistry != nil {
-			return fmt.Errorf("registry metadata '_meta.io.modelcontextprotocol.registry' is not allowed during publish")
+		// Validate that only publisher-provided data is allowed in _meta during publish (no official registry metadata should be present)
+		if req.Meta.Official != nil {
+			return fmt.Errorf("official registry metadata '_meta.io.modelcontextprotocol.registry/official' is not allowed during publish")
 		}
 	}
 
diff --git a/pkg/api/v0/types.go b/pkg/api/v0/types.go
@@ -23,8 +23,8 @@ type ServerListResponse struct {
 
 // ServerMeta represents the structured metadata with known extension fields
 type ServerMeta struct {
-	Publisher                      map[string]interface{} `json:"publisher,omitempty"`
-	IOModelContextProtocolRegistry *RegistryExtensions    `json:"io.modelcontextprotocol.registry,omitempty"`
+	Official         *RegistryExtensions    `json:"io.modelcontextprotocol.registry/official,omitempty"`
+	PublisherProvided map[string]interface{} `json:"io.modelcontextprotocol.registry/publisher-provided,omitempty"`
 }
 
 // ServerJSON represents complete server information as defined in the MCP spec, with extension support
diff --git a/tests/integration/main.go b/tests/integration/main.go
@@ -217,8 +217,8 @@ func findServerIDByName(serverName string) (string, error) {
 
 	// Find the server with matching name
 	for _, server := range serverList.Servers {
-		if server.Name == serverName && server.Meta.IOModelContextProtocolRegistry.IsLatest {
-			return server.Meta.IOModelContextProtocolRegistry.ID, nil
+		if server.Name == serverName && server.Meta.Official.IsLatest {
+			return server.Meta.Official.ID, nil
 		}
 	}
 
@@ -324,12 +324,12 @@ func compareServerJSON(expected, actual *apiv0.ServerJSON) error {
 	}
 
 	// Compare only publisher metadata if present
-	if expected.Meta != nil && expected.Meta.Publisher != nil {
-		if actual.Meta == nil || actual.Meta.Publisher == nil {
+	if expected.Meta != nil && expected.Meta.PublisherProvided != nil {
+		if actual.Meta == nil || actual.Meta.PublisherProvided == nil {
 			return fmt.Errorf("expected publisher metadata, but got none")
 		}
-		if !reflect.DeepEqual(expected.Meta.Publisher, actual.Meta.Publisher) {
-			return fmt.Errorf("publisher metadata mismatch: expected %+v, got %+v", expected.Meta.Publisher, actual.Meta.Publisher)
+		if !reflect.DeepEqual(expected.Meta.PublisherProvided, actual.Meta.PublisherProvided) {
+			return fmt.Errorf("publisher metadata mismatch: expected %+v, got %+v", expected.Meta.PublisherProvided, actual.Meta.PublisherProvided)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,8 @@ func TestServersListEndpoint(t *testing.T) {`
`175`	`175`	`assert.NotEmpty(t, server.Name)`
`176`	`176`	`assert.NotEmpty(t, server.Description)`
`177`	`177`	`assert.NotNil(t, server.Meta)`
`178`		`- assert.NotNil(t, server.Meta.IOModelContextProtocolRegistry)`
`179`		`- assert.NotEmpty(t, server.Meta.IOModelContextProtocolRegistry.ID)`
	`178`	`+ assert.NotNil(t, server.Meta.Official)`
	`179`	`+ assert.NotEmpty(t, server.Meta.Official.ID)`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
`@@ -223,7 +223,7 @@ func TestServersDetailEndpoint(t *testing.T) {`
`223`	`223`	`}{`
`224`	`224`	`{`
`225`	`225`	`name: "successful get server detail",`
`226`		`- serverID: testServer.Meta.IOModelContextProtocolRegistry.ID,`
	`226`	`+ serverID: testServer.Meta.Official.ID,`
`227`	`227`	`expectedStatus: http.StatusOK,`
`228`	`228`	`},`
`229`	`229`	`{`
`@@ -305,7 +305,7 @@ func TestServersEndpointsIntegration(t *testing.T) {`
`305`	`305`	`assert.NoError(t, err)`
`306`	`306`	`assert.NotNil(t, published)`
`307`	`307`
`308`		`- serverID := published.Meta.IOModelContextProtocolRegistry.ID`
	`308`	`+ serverID := published.Meta.Official.ID`
`309`	`309`	`servers := []apiv0.ServerJSON{*published}`
`310`	`310`	`serverDetail := published`
`311`	`311`
Original file line number	Diff line number	Diff line change
`@@ -103,11 +103,11 @@ func (db MemoryDB) CreateServer(ctx context.Context, server apiv0.ServerJSON)`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`// Get the ID from the registry metadata`
`106`		`- if server.Meta == nil \|\| server.Meta.IOModelContextProtocolRegistry == nil {`
	`106`	`+ if server.Meta == nil \|\| server.Meta.Official == nil {`
`107`	`107`	`return nil, fmt.Errorf("server must have registry metadata with ID")`
`108`	`108`	`}`
`109`	`109`
`110`		`- id := server.Meta.IOModelContextProtocolRegistry.ID`
	`110`	`+ id := server.Meta.Official.ID`
`111`	`111`
`112`	`112`	`db.mu.Lock()`
`113`	`113`	`defer db.mu.Unlock()`
`@@ -193,8 +193,8 @@ func (db MemoryDB) matchesFilter(entry apiv0.ServerJSON, filter *ServerFilter)`
`193`	`193`
`194`	`194`	`// getRegistryID safely extracts the registry ID from an entry`
`195`	`195`	`func (db MemoryDB) getRegistryID(entry apiv0.ServerJSON) string {`
`196`		`- if entry.Meta != nil && entry.Meta.IOModelContextProtocolRegistry != nil {`
`197`		`- return entry.Meta.IOModelContextProtocolRegistry.ID`
	`196`	`+ if entry.Meta != nil && entry.Meta.Official != nil {`
	`197`	`+ return entry.Meta.Official.ID`
`198`	`198`	`}`
`199`	`199`	`return ""`
`200`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,8 @@ func (db *PostgreSQL) List(`
`131`	`131`	`nextCursor := ""`
`132`	`132`	`if len(results) > 0 && len(results) >= limit {`
`133`	`133`	`lastResult := results[len(results)-1]`
`134`		`- if lastResult.Meta != nil && lastResult.Meta.IOModelContextProtocolRegistry != nil {`
`135`		`- nextCursor = lastResult.Meta.IOModelContextProtocolRegistry.ID`
	`134`	`+ if lastResult.Meta != nil && lastResult.Meta.Official != nil {`
	`135`	`+ nextCursor = lastResult.Meta.Official.ID`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`@@ -177,11 +177,11 @@ func (db PostgreSQL) CreateServer(ctx context.Context, server apiv0.ServerJSON`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`// Get the ID from the registry metadata`
`180`		`- if server.Meta == nil \|\| server.Meta.IOModelContextProtocolRegistry == nil {`
	`180`	`+ if server.Meta == nil \|\| server.Meta.Official == nil {`
`181`	`181`	`return nil, fmt.Errorf("server must have registry metadata with ID")`
`182`	`182`	`}`
`183`	`183`
`184`		`- id := server.Meta.IOModelContextProtocolRegistry.ID`
	`184`	`+ id := server.Meta.Official.ID`
`185`	`185`
`186`	`186`	`// Marshal the complete server to JSONB`
`187`	`187`	`valueJSON, err := json.Marshal(server)`
Original file line number	Diff line number	Diff line change
`@@ -251,21 +251,21 @@ func ValidatePublishRequest(req apiv0.ServerJSON, cfg *config.Config) error {`
`251`	`251`	`func validatePublisherExtensions(req apiv0.ServerJSON) error {`
`252`	`252`	`const maxExtensionSize = 4 * 1024 // 4KB limit`
`253`	`253`
`254`		`- // Check size limit for _meta.publisher extension`
`255`		`- if req.Meta != nil && req.Meta.Publisher != nil {`
`256`		`- extensionsJSON, err := json.Marshal(req.Meta.Publisher)`
	`254`	`+ // Check size limit for _meta publisher-provided extension`
	`255`	`+ if req.Meta != nil && req.Meta.PublisherProvided != nil {`
	`256`	`+ extensionsJSON, err := json.Marshal(req.Meta.PublisherProvided)`
`257`	`257`	`if err != nil {`
`258`		`- return fmt.Errorf("failed to marshal _meta.publisher extension: %w", err)`
	`258`	`+ return fmt.Errorf("failed to marshal _meta.io.modelcontextprotocol.registry/publisher-provided extension: %w", err)`
`259`	`259`	`}`
`260`	`260`	`if len(extensionsJSON) > maxExtensionSize {`
`261`		`- return fmt.Errorf("_meta.publisher extension exceeds 4KB limit (%d bytes)", len(extensionsJSON))`
	`261`	`+ return fmt.Errorf("_meta.io.modelcontextprotocol.registry/publisher-provided extension exceeds 4KB limit (%d bytes)", len(extensionsJSON))`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`if req.Meta != nil {`
`266`		`- // Validate that only "publisher" is allowed in _meta during publish (no registry metadata should be present)`
`267`		`- if req.Meta.IOModelContextProtocolRegistry != nil {`
`268`		`- return fmt.Errorf("registry metadata '_meta.io.modelcontextprotocol.registry' is not allowed during publish")`
	`266`	`+ // Validate that only publisher-provided data is allowed in _meta during publish (no official registry metadata should be present)`
	`267`	`+ if req.Meta.Official != nil {`
	`268`	`+ return fmt.Errorf("official registry metadata '_meta.io.modelcontextprotocol.registry/official' is not allowed during publish")`
`269`	`269`	`}`
`270`	`270`	`}`
`271`	`271`