Co-authored with Claude Code, but I've closely reviewed/modified/vetted
all changes; ready for final review.
## Summary
This PR adds LocalTransport and RemoteTransport separation with URL
template variable support for remote servers, enabling e.g. multi-tenant
deployments with configurable endpoints.
**Key additions:**
- LocalTransport (for Packages) and RemoteTransport (for Remotes)
- URL template variables for remote transports (e.g., `{tenant_id}` in
URLs)
- Pattern validation ensuring URLs are URL-like while allowing templates
- Full test coverage via Go validator tests and documentation examples
## ⚠️ server.json Update
This PR updates the `server.json` schema. A new schema version will be
cut after this lands.
## Problem
The current schema describes URL templating with `{curly_braces}` for
transports but provides no mechanism for Remote contexts to define what
those variables should resolve to, making the feature unusable for
remote servers.
Referenced issue: #394
- Users need multi-tenant remote servers with different endpoints per
deployment
- Each tenant/region has its own URL (e.g., `us-cell1.example.com`,
`emea-cell1.example.com`)
- Current schema doesn't support parameterized remote URLs
## Solution
### Schema Architecture
**LocalTransport** (for Package context):
```typescript
LocalTransport = StdioTransport | StreamableHttpTransport | SseTransport
```
- Used in Package context (non-breaking rename of existing behavior)
- Variables in `{curly_braces}` reference parent Package
arguments/environment variables
- Supports all three transport types including stdio
**RemoteTransport** (for Remote context):
```typescript
RemoteTransport = (StreamableHttpTransport | SseTransport) + { variables: object }
```
- Extends StreamableHttp/Sse via `allOf` composition - no duplication!
- Adds `variables` object for URL templating
- Only supports streamable-http and sse (stdio not valid for remotes)
### Key Changes
**1. Schema Updates** (`openapi.yaml`, `server.schema.json`):
- Added `LocalTransport` union type for Package context
- Added `RemoteTransport` with `allOf` composition extending base
transports
- Updated Package to reference `LocalTransport`
- Updated remotes to reference `RemoteTransport`
- Added URL pattern validation: `^https?://[^\\s]+$` to both
StreamableHttp and SSE
- Removed `format: uri` from SSE (was blocking template variables)
**2. Go Types** (`pkg/model/types.go`):
- Base `Transport` struct unchanged for Package context
- `RemoteTransport` struct for remotes with `Variables` field
- Both work with existing validation infrastructure
**3. Validators** (`internal/validators/`):
- `validateRemoteTransport()` validates Remote-specific constraints
- `collectRemoteTransportVariables()` extracts available variables
- `IsValidTemplatedURL()` validates template variables reference defined
variables
- `IsValidRemoteURL()` handles template variable substitution before
localhost check
- 6 new test cases for remote transport variable validation
**4. Documentation Examples** (`generic-server-json.md`):
- Remote Server with URL Templating (StreamableHttp with `{tenant_id}`)
- SSE Remote with URL Templating (SSE with `{tenant_id}`)
- Local Server with URL Templating (Package with `{port}`)
- All examples validate via existing `validate-examples` tool
## Example: Remote Transport with Variables
```json
{
"remotes": [
{
"type": "streamable-http",
"url": "https://api.example.com/mcp/{tenant_id}/{region}",
"variables": {
"tenant_id": {
"description": "Tenant identifier",
"isRequired": true,
"choices": ["us-cell1", "emea-cell1", "apac-cell1"]
},
"region": {
"description": "Deployment region",
"isRequired": true
}
}
}
]
}
```
Clients configure the variables, and `{tenant_id}` and `{region}` get
replaced to connect to tenant-specific endpoints like
`https://api.example.com/mcp/us-cell1/east`.
## Architecture Details
**Context-based variable resolution:**
- **Package + LocalTransport**: `{port}` references `--port` argument or
`PORT` env var from parent Package
- **Remote + RemoteTransport**: `{tenant_id}` references
`variables.tenant_id` defined in the transport itself
- **Code reuse**: StreamableHttp/Sse definitions shared via `allOf`, not
duplicated
- **Validation**: Template variables validated against available
variables for each context
---
## Follow-on Work
Follow-on work will be done to adopt the feedback in
https://github.com/modelcontextprotocol/registry/pull/570#issuecomment-3367417636
regarding variable naming/prioritzation/scoping conventions, but should
not have any impact on the shape being introduced here (just
validations).
---------
Co-authored-by: yuna0x0 <yuna@yuna0x0.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Connor Peet <connor@peet.io>
240 lines
6.7 KiB
Go
240 lines
6.7 KiB
Go
// validate-examples validates JSON examples in documentation files
|
|
// against both schema.json and Go validators.
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"log"
|
|
"os"
|
|
"path/filepath"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/modelcontextprotocol/registry/internal/validators"
|
|
apiv0 "github.com/modelcontextprotocol/registry/pkg/api/v0"
|
|
jsonschema "github.com/santhosh-tekuri/jsonschema/v5"
|
|
)
|
|
|
|
type validationTarget struct {
|
|
path string
|
|
requireSchema bool
|
|
expectedCount *int
|
|
}
|
|
|
|
func main() {
|
|
log.SetFlags(0) // Remove timestamp from logs
|
|
|
|
if err := runValidation(); err != nil {
|
|
log.Fatalf("Error: %v", err)
|
|
}
|
|
}
|
|
|
|
func runValidation() error {
|
|
// Define what we validate and how
|
|
expectedServerJSONCount := 15
|
|
targets := []validationTarget{
|
|
{
|
|
path: filepath.Join("docs", "reference", "server-json", "generic-server-json.md"),
|
|
requireSchema: false,
|
|
expectedCount: &expectedServerJSONCount,
|
|
},
|
|
{
|
|
path: filepath.Join("docs", "modelcontextprotocol-io", "package-types.mdx"),
|
|
requireSchema: true,
|
|
expectedCount: nil, // No count validation for guide
|
|
},
|
|
{
|
|
path: filepath.Join("docs", "modelcontextprotocol-io", "quickstart.mdx"),
|
|
requireSchema: true,
|
|
expectedCount: nil, // No count validation for guide
|
|
},
|
|
{
|
|
path: filepath.Join("docs", "modelcontextprotocol-io", "remote-servers.mdx"),
|
|
requireSchema: true,
|
|
expectedCount: nil, // No count validation for guide
|
|
},
|
|
}
|
|
|
|
schemaPath := filepath.Join("docs", "reference", "server-json", "server.schema.json")
|
|
baseSchema, err := compileSchema(schemaPath)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to compile server.schema.json: %w", err)
|
|
}
|
|
|
|
for _, target := range targets {
|
|
if err := validateFile(target, baseSchema); err != nil {
|
|
return err
|
|
}
|
|
log.Println()
|
|
}
|
|
|
|
log.Println("All validations passed!")
|
|
return nil
|
|
}
|
|
|
|
func validateFile(target validationTarget, baseSchema *jsonschema.Schema) error {
|
|
examples, err := extractExamples(target.path, target.requireSchema)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to extract examples from %s: %w", target.path, err)
|
|
}
|
|
|
|
log.Printf("Validating %s: found %d examples\n", target.path, len(examples))
|
|
|
|
if target.expectedCount != nil && len(examples) != *target.expectedCount {
|
|
return fmt.Errorf("expected %d examples in %s but found %d - if this is intentional, update expectedCount in tools/validate-examples/main.go",
|
|
*target.expectedCount, target.path, len(examples))
|
|
}
|
|
|
|
if len(examples) == 0 {
|
|
log.Println(" No examples to validate")
|
|
return nil
|
|
}
|
|
|
|
log.Println()
|
|
|
|
validatedCount := 0
|
|
for i, example := range examples {
|
|
log.Printf(" Example %d (line %d):", i+1, example.line)
|
|
|
|
if validateExample(example, baseSchema) {
|
|
validatedCount++
|
|
}
|
|
|
|
log.Println()
|
|
}
|
|
|
|
if validatedCount != len(examples) {
|
|
return fmt.Errorf("validation failed for %s: expected %d examples to pass but only %d did",
|
|
target.path, len(examples), validatedCount)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func validateExample(ex example, baseSchema *jsonschema.Schema) bool {
|
|
var data any
|
|
if err := json.Unmarshal([]byte(ex.content), &data); err != nil {
|
|
log.Printf(" ❌ Invalid JSON: %v", err)
|
|
return false
|
|
}
|
|
|
|
// Extract server portion if this is a PublishRequest format
|
|
serverData := data
|
|
publishRequestValid := true
|
|
if dataMap, ok := data.(map[string]any); ok {
|
|
if server, exists := dataMap["server"]; exists {
|
|
// This is a PublishRequest format - validate only expected properties exist
|
|
for key := range dataMap {
|
|
if key != "server" && key != "x-publisher" {
|
|
log.Printf(" Invalid PublishRequest property: ❌ %s (only 'server' and optional 'x-publisher' are allowed)", key)
|
|
publishRequestValid = false
|
|
}
|
|
}
|
|
serverData = server
|
|
}
|
|
}
|
|
|
|
baseValid := validateAgainstSchema(serverData, baseSchema, "server.schema.json")
|
|
goValidatorValid := validateWithObjectValidator(serverData)
|
|
|
|
// Only count as validated if all validations passed
|
|
return publishRequestValid && baseValid && goValidatorValid
|
|
}
|
|
|
|
func validateAgainstSchema(data any, schema *jsonschema.Schema, schemaName string) bool {
|
|
if err := schema.Validate(data); err != nil {
|
|
log.Printf(" Validating against %s: ❌", schemaName)
|
|
log.Printf(" Error: %v", err)
|
|
return false
|
|
}
|
|
log.Printf(" Validating against %s: ✅", schemaName)
|
|
return true
|
|
}
|
|
|
|
func validateWithObjectValidator(serverData any) bool {
|
|
var serverDetail apiv0.ServerJSON
|
|
serverDataBytes, err := json.Marshal(serverData)
|
|
if err != nil {
|
|
log.Printf(" Validating with Go Validator: ❌")
|
|
log.Printf(" Error marshaling server data: %v", err)
|
|
return false
|
|
}
|
|
|
|
if err := json.Unmarshal(serverDataBytes, &serverDetail); err != nil {
|
|
log.Printf(" Validating with Go Validator: ❌")
|
|
log.Printf(" Error unmarshaling to ServerDetail: %v", err)
|
|
return false
|
|
}
|
|
|
|
if err := validators.ValidateServerJSON(&serverDetail); err != nil {
|
|
log.Printf(" Validating with Go Validator: ❌")
|
|
log.Printf(" Error: %v", err)
|
|
return false
|
|
}
|
|
|
|
log.Printf(" Validating with Go Validator: ✅")
|
|
return true
|
|
}
|
|
|
|
type example struct {
|
|
content string
|
|
line int
|
|
}
|
|
|
|
func extractExamples(path string, requireSchema bool) ([]example, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
content := string(data)
|
|
|
|
// Regex to match JSON code blocks in markdown
|
|
re := regexp.MustCompile("(?s)```json(?: [^\r\n]+)?\r?\n(.*?)\r?\n```")
|
|
matches := re.FindAllStringSubmatchIndex(content, -1)
|
|
|
|
var examples []example
|
|
for _, match := range matches {
|
|
if len(match) < 4 {
|
|
return nil, fmt.Errorf("invalid match - expected at least 4 indices but got %d", len(match))
|
|
}
|
|
start, end := match[2], match[3]
|
|
jsonContent := content[start:end]
|
|
|
|
// Filter by $schema if required
|
|
if requireSchema && !strings.Contains(jsonContent, "$schema") {
|
|
continue
|
|
}
|
|
|
|
line := 1 + strings.Count(content[:start], "\n")
|
|
examples = append(examples, example{
|
|
content: jsonContent,
|
|
line: line,
|
|
})
|
|
}
|
|
|
|
return examples, nil
|
|
}
|
|
|
|
func compileSchema(path string) (*jsonschema.Schema, error) {
|
|
compiler := jsonschema.NewCompiler()
|
|
compiler.Draft = jsonschema.Draft7
|
|
|
|
// For registry-schema.json, we need to register the base schema it references
|
|
if strings.Contains(path, "registry-schema.json") {
|
|
basePath := filepath.Join(filepath.Dir(path), "server.schema.json")
|
|
baseData, err := os.ReadFile(basePath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to read base schema: %w", err)
|
|
}
|
|
|
|
// Add the base schema to the compiler with the expected URL
|
|
if err := compiler.AddResource("https://static.modelcontextprotocol.io/schemas/2025-09-16/server.schema.json", bytes.NewReader(baseData)); err != nil {
|
|
return nil, fmt.Errorf("failed to add base schema resource: %w", err)
|
|
}
|
|
}
|
|
|
|
return compiler.Compile(path)
|
|
}
|