Extract shared MCP types and fix merge issue with test

Author: peteski22

internal/api/mcp.go

@@ -0,0 +1,43 @@
+package api
+
+import "github.com/mark3labs/mcp-go/mcp"
+
+// methodNotFoundMessage is the error message returned by MCP servers when a method is not implemented.
+// TODO: This string matching is fragile and should be replaced with proper JSON-RPC error code checking.
+// Once mcp-go preserves JSON-RPC error codes, use errors.Is(err, mcp.ErrMethodNotFound) instead.
+// See: https://github.com/mark3labs/mcp-go/issues/593
+const methodNotFoundMessage = "Method not found"
+
+// DomainMeta wraps mcp.Meta for API conversion.
+type DomainMeta mcp.Meta
+
+// Meta represents metadata in API responses.
+type Meta map[string]any
+
+// ToAPIType converts a domain meta to an API meta type.
+// This creates a flat _meta object structure as defined by the MCP specification.
+// Returns empty Meta{} if domain type is nil.
+// See: https://modelcontextprotocol.io/specification/2025-06-18/basic/index#meta
+func (d DomainMeta) ToAPIType() (Meta, error) {
+	if (*mcp.Meta)(&d) == nil {
+		return Meta{}, nil
+	}
+
+	// The _meta field is MCP's reserved extensibility mechanism that allows both:
+	// - progressToken: for out-of-band progress notifications (defined by spec)
+	// - Additional fields: custom metadata from servers/clients (extensible)
+	// Both types of fields are merged at the same level in the resulting map.
+	result := make(Meta)
+
+	// Add progressToken if present (using MCP spec-defined field name).
+	if d.ProgressToken != nil {
+		result["progressToken"] = d.ProgressToken
+	}
+
+	// Merge additional fields at the same level.
+	for k, v := range d.AdditionalFields {
+		result[k] = v
+	}
+
+	return result, nil
+}

internal/api/prompts.go

@@ -13,10 +13,6 @@ import (
 	"github.com/mozilla-ai/mcpd/v2/internal/errors"
 )
 
-// TODO: Remove this const once mcp-go preserves JSON-RPC error codes.
-// See: https://github.com/mark3labs/mcp-go/issues/593
-const methodNotFoundMessage = "Method not found"
-
 // DomainPrompt wraps mcp.Prompt for API conversion.
 type DomainPrompt mcp.Prompt
 
@@ -26,12 +22,6 @@ type DomainPromptArgument mcp.PromptArgument
 // DomainPromptMessage wraps mcp.PromptMessage for API conversion.
 type DomainPromptMessage mcp.PromptMessage
 
-// DomainMeta wraps mcp.Meta for API conversion.
-type DomainMeta mcp.Meta
-
-// Meta represents metadata in API responses.
-type Meta map[string]any
-
 // Prompts represents a collection of Prompt types.
 type Prompts struct {
 	Prompts    []Prompt `json:"prompts"`
@@ -108,34 +98,6 @@ type GeneratePromptResponse struct {
 	}
 }
 
-// ToAPIType converts a domain meta to an API meta type.
-// This creates a flat _meta object structure as defined by the MCP specification.
-// Returns empty Meta{} if domain type is nil.
-// See: https://modelcontextprotocol.io/specification/2025-06-18/basic/index#meta
-func (d DomainMeta) ToAPIType() (Meta, error) {
-	if (*mcp.Meta)(&d) == nil {
-		return Meta{}, nil
-	}
-
-	// The _meta field is MCP's reserved extensibility mechanism that allows both:
-	// - progressToken: for out-of-band progress notifications (defined by spec)
-	// - Additional fields: custom metadata from servers/clients (extensible)
-	// Both types of fields are merged at the same level in the resulting map.
-	result := make(Meta)
-
-	// Add progressToken if present (using MCP spec-defined field name).
-	if d.ProgressToken != nil {
-		result["progressToken"] = d.ProgressToken
-	}
-
-	// Merge additional fields at the same level.
-	for k, v := range d.AdditionalFields {
-		result[k] = v
-	}
-
-	return result, nil
-}
-
 // ToAPIType converts a domain prompt to an API prompt.
 func (d DomainPrompt) ToAPIType() (Prompt, error) {
 	var meta Meta

internal/api/resources.go

@@ -13,22 +13,12 @@ import (
 	"github.com/mozilla-ai/mcpd/v2/internal/errors"
 )
 
-// TODO: Remove this const once mcp-go preserves JSON-RPC error codes.
-// See: https://github.com/mark3labs/mcp-go/issues/593
-const methodNotFoundMessage = "Method not found"
-
 // DomainResource wraps mcp.Resource for API conversion.
 type DomainResource mcp.Resource
 
 // DomainResourceTemplate wraps mcp.ResourceTemplate for API conversion.
 type DomainResourceTemplate mcp.ResourceTemplate
 
-// DomainMeta wraps mcp.Meta for API conversion.
-type DomainMeta mcp.Meta
-
-// Meta represents metadata in API responses.
-type Meta map[string]any
-
 // Resources represents a collection of Resource types.
 type Resources struct {
 	Resources  []Resource `json:"resources"`
@@ -128,34 +118,6 @@ type ResourceContentResponse struct {
 	Body []ResourceContent
 }
 
-// ToAPIType converts a domain meta to an API meta type.
-// This creates a flat _meta object structure as defined by the MCP specification.
-// Returns empty Meta{} if domain type is nil.
-// See: https://modelcontextprotocol.io/specification/2025-06-18/basic/index#meta
-func (d DomainMeta) ToAPIType() (Meta, error) {
-	if (*mcp.Meta)(&d) == nil {
-		return Meta{}, nil
-	}
-
-	// The _meta field is MCP's reserved extensibility mechanism that allows both:
-	// - progressToken: for out-of-band progress notifications (defined by spec)
-	// - Additional fields: custom metadata from servers/clients (extensible)
-	// Both types of fields are merged at the same level in the resulting map.
-	result := make(Meta)
-
-	// Add progressToken if present (using MCP spec-defined field name).
-	if d.ProgressToken != nil {
-		result["progressToken"] = d.ProgressToken
-	}
-
-	// Merge additional fields at the same level.
-	for k, v := range d.AdditionalFields {
-		result[k] = v
-	}
-
-	return result, nil
-}
-
 // ToAPIType converts a domain resource to an API resource.
 func (d DomainResource) ToAPIType() (Resource, error) {
 	var meta Meta

internal/daemon/api_server_test.go

@@ -339,7 +339,6 @@ func TestMapError(t *testing.T) {
 			expectedStatus: 502,
 		},
 		{
-<<<<<<< HEAD
 			name:           "ErrPromptNotFound maps to 404",
 			err:            errors.ErrPromptNotFound,
 			expectedStatus: 404,
@@ -362,7 +361,9 @@ func TestMapError(t *testing.T) {
 		{
 			name:           "ErrPromptsNotImplemented maps to 501",
 			err:            errors.ErrPromptsNotImplemented,
-=======
+			expectedStatus: 501,
+		},
+		{
 			name:           "ErrResourceNotFound maps to 404",
 			err:            errors.ErrResourceNotFound,
 			expectedStatus: 404,
@@ -390,7 +391,6 @@ func TestMapError(t *testing.T) {
 		{
 			name:           "ErrResourcesNotImplemented maps to 501",
 			err:            errors.ErrResourcesNotImplemented,
->>>>>>> 7854d9b (Map resource domain errors to HTTP status codes)
 			expectedStatus: 501,
 		},
 		{