Skip to content

Commit 568748e

Browse files
domdomeggclaude
andauthored
Add tooling to auto-generate server.schema.json from OpenAPI spec (#629)
This PR adds a Go tool that extracts the ServerDetail schema from openapi.yaml and generates server.schema.json, ensuring the two specs stay in sync. ## Key Changes ### New Tooling - **Go tool** at `tools/extract-server-schema/` that auto-discovers all schemas referenced by ServerDetail and extracts them from OpenAPI - **make targets**: `generate-schema` (generates schema) and `check-schema` (verifies sync) - `check-schema` is now included in `make validate` and `make check` ### Preserved Validation Constraints The initial auto-generated schema lost many important validation rules and descriptive guidance from the hand-crafted version. The OpenAPI spec has been updated to preserve: **Security & Descriptions:** - Command injection security warning on Arguments - Detailed field descriptions with usage guidance - `placeholder` field for Input schema **Validation Constraints:** - `fileSha256` pattern validation (`^[a-f0-9]{64}$`) - Package version restrictions (minLength: 1, no "latest") - `transport` as required field in Package - ServerDetail `name` pattern and length constraints (3-200 chars) - Description, title, and version length limits **Documentation:** - Repository field descriptions (url, source, id, subfolder) - PositionalArgument `valueHint` explains transport URL substitution - Updated examples to match hand-crafted version (Weather API theme) **Intentional Changes:** - Removed `additionalProperties` constraints for flexibility - Updated schema title to be more descriptive - Added `$comment` noting auto-generation See the commit "Preserve validation constraints in auto-generated server.schema.json" for details. ### Fixed Missing Package.transport - Added `transport` field to OpenAPI Package schema (was in Go model at `pkg/model/types.go:30` but missing from OpenAPI) - Split transport types into three separate schemas with proper discriminated unions: - `StdioTransport` - Only requires `type: stdio` - `StreamableHttpTransport` - Requires `type` and `url`, supports `headers` - `SseTransport` - Requires `type` and `url`, supports `headers` - `Package.transport` uses `anyOf` with all three types - `ServerDetail.remotes` uses `anyOf` with only remote types (no stdio) ### Other Improvements - Added `GOTOOLCHAIN=auto` to Makefile for Go 1.25 compatibility - Added `DRIFT_ANALYSIS.md` documenting all schema drift issues found between specs ## Benefits **Single Source of Truth**: The OpenAPI spec now serves as the authoritative schema definition, with server.schema.json automatically derived from it. **Better Validation**: All critical validation rules (patterns, length constraints, required fields) and security warnings are preserved in the generated schema. **Improved Developer Experience**: - Schema changes only need to be made in one place (openapi.yaml) - CI validation ensures specs never drift apart - Clear auto-generation comment prevents manual edits ## Validation ✅ All 20 examples validate correctly ✅ Lint passes with 0 issues ✅ Schema is in sync with OpenAPI ✅ All validation constraints from hand-crafted schema preserved --------- Co-authored-by: Claude <[email protected]>
1 parent a09ae89 commit 568748e

File tree

4 files changed

+699
-414
lines changed

4 files changed

+699
-414
lines changed

Makefile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: help build test test-unit test-integration test-endpoints test-publish test-all lint lint-fix validate validate-schemas validate-examples check dev-compose clean publisher
1+
.PHONY: help build test test-unit test-integration test-endpoints test-publish test-all lint lint-fix validate validate-schemas validate-examples check dev-compose clean publisher generate-schema check-schema
22

33
# Default target
44
help: ## Show this help message
@@ -14,6 +14,17 @@ publisher: ## Build the publisher tool with version info
1414
@mkdir -p bin
1515
go build -ldflags="-X main.Version=dev-$(shell git rev-parse --short HEAD) -X main.GitCommit=$(shell git rev-parse HEAD) -X main.BuildTime=$(shell date -u +%Y-%m-%dT%H:%M:%SZ)" -o bin/mcp-publisher ./cmd/publisher
1616

17+
# Schema generation targets
18+
generate-schema: ## Generate server.schema.json from openapi.yaml
19+
@mkdir -p bin
20+
go build -o bin/extract-server-schema ./tools/extract-server-schema
21+
@./bin/extract-server-schema
22+
23+
check-schema: ## Check if server.schema.json is in sync with openapi.yaml
24+
@mkdir -p bin
25+
go build -o bin/extract-server-schema ./tools/extract-server-schema
26+
@./bin/extract-server-schema -check
27+
1728
# Test targets
1829
test-unit: ## Run unit tests with coverage (requires PostgreSQL)
1930
@echo "Starting PostgreSQL for unit tests..."
@@ -45,6 +56,7 @@ test-all: test-unit test-integration ## Run all tests (unit and integration)
4556
# Validation targets
4657
validate-schemas: ## Validate JSON schemas
4758
./tools/validate-schemas.sh
59+
@$(MAKE) check-schema
4860

4961
validate-examples: ## Validate examples against schemas
5062
./tools/validate-examples.sh

docs/reference/api/openapi.yaml

Lines changed: 86 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -220,23 +220,27 @@ components:
220220
schemas:
221221
Repository:
222222
type: object
223+
description: "Repository metadata for the MCP server source code. Enables users and security experts to inspect the code, improving transparency."
223224
required:
224225
- url
225226
- source
226227
properties:
227228
url:
228229
type: string
229230
format: uri
231+
description: "Repository URL for browsing source code. Should support both web browsing and git clone operations."
230232
example: "https://github.com/modelcontextprotocol/servers"
231233
source:
232234
type: string
235+
description: "Repository hosting service identifier. Used by registries to determine validation and API access methods."
233236
example: "github"
234237
id:
235238
type: string
239+
description: "Repository identifier from the hosting service (e.g., GitHub repo ID). Owned and determined by the source forge. Should remain stable across repository renames and may be used to detect repository resurrection attacks - if a repository is deleted and recreated, the ID should change. For GitHub, use: gh api repos/<owner>/<repo> --jq '.id'"
236240
example: "b94b5f7e-c7c6-d760-2c78-a5e9b8a5b8c9"
237241
subfolder:
238242
type: string
239-
description: "Optional relative path from repository root to the server location within a monorepo structure"
243+
description: "Optional relative path from repository root to the server location within a monorepo or nested package structure. Must be a clean relative path."
240244
example: "src/everything"
241245

242246
ServerList:
@@ -267,6 +271,7 @@ components:
267271
- registryType
268272
- identifier
269273
- version
274+
- transport
270275
properties:
271276
registryType:
272277
type: string
@@ -296,16 +301,26 @@ components:
296301
- "https://github.com/example/releases/download/v1.0.0/package.mcpb"
297302
version:
298303
type: string
299-
description: Package version
304+
description: "Package version. Must be a specific version. Version ranges are rejected (e.g., '^1.2.3', '~1.2.3', '>=1.2.3', '1.x', '1.*')."
300305
example: "1.0.2"
306+
minLength: 1
307+
not:
308+
const: "latest"
301309
fileSha256:
302310
type: string
303-
description: SHA-256 hash of the package file for integrity verification.
311+
description: "SHA-256 hash of the package file for integrity verification. Required for MCPB packages and optional for other package types. Authors are responsible for generating correct SHA-256 hashes when creating server.json. If present, MCP clients must validate the downloaded file matches the hash before running packages to ensure file integrity."
304312
example: "fe333e598595000ae021bd27117db32ec69af6987f507ba7a63c90638ff633ce"
313+
pattern: "^[a-f0-9]{64}$"
305314
runtimeHint:
306315
type: string
307316
description: A hint to help clients determine the appropriate runtime for the package. This field should be provided when `runtimeArguments` are present.
308-
examples: [npx, uvx, dnx]
317+
examples: [npx, uvx, docker, dnx]
318+
transport:
319+
anyOf:
320+
- $ref: '#/components/schemas/StdioTransport'
321+
- $ref: '#/components/schemas/StreamableHttpTransport'
322+
- $ref: '#/components/schemas/SseTransport'
323+
description: Transport protocol configuration for the package
309324
runtimeArguments:
310325
type: array
311326
description: A list of arguments to be passed to the package's runtime command (such as docker or npx). The `runtimeHint` field should be provided when `runtimeArguments` are present.
@@ -333,16 +348,13 @@ components:
333348
default: false
334349
format:
335350
type: string
336-
description: |
337-
Specifies the input format. Supported values include `filepath`, which should be interpreted as a file on the user's filesystem.
338-
339-
When the input is converted to a string, booleans should be represented by the strings "true" and "false", and numbers should be represented as decimal values.
351+
description: "Specifies the input format. Supported values include `filepath`, which should be interpreted as a file on the user's filesystem.\n\nWhen the input is converted to a string, booleans should be represented by the strings \"true\" and \"false\", and numbers should be represented as decimal values."
340352
enum: [string, number, boolean, filepath]
341353
default: string
342354
value:
343355
type: string
344356
description: |
345-
The default value for the input. If this is not set, the user may be prompted to provide a value. If a value is set, it should not be configurable by end users.
357+
The value for the input. If this is not set, the user may be prompted to provide a value. If a value is set, it should not be configurable by end users.
346358
347359
Identifiers wrapped in `{curly_braces}` will be replaced with the corresponding properties from the input `variables` map. If an identifier in braces is not found in `variables`, or if `variables` is not provided, the `{curly_braces}` substring should remain unchanged.
348360
isSecret:
@@ -351,7 +363,10 @@ components:
351363
default: false
352364
default:
353365
type: string
354-
description: The default value for the input.
366+
description: "The default value for the input. This should be a valid value for the input. If you want to provide input examples or guidance, use the `placeholder` field instead."
367+
placeholder:
368+
type: string
369+
description: "A placeholder for the input to be displaying during configuration. This is used to provide examples or guidance about the expected form or content of the input."
355370
choices:
356371
type: array
357372
description: A list of possible values for the input. If provided, the user must select one of these values.
@@ -384,17 +399,17 @@ components:
384399
example: "positional"
385400
valueHint:
386401
type: string
387-
description: An identifier-like hint for the value. This is not part of the command line, but can be used by client configuration and to provide hints to users.
402+
description: "An identifier for the positional argument. It is not part of the command line. It may be used by client configuration as a label identifying the argument. It is also used to identify the value in transport URL variable substitution."
388403
example: file_path
389404
isRepeated:
390405
type: boolean
391406
description: Whether the argument can be repeated multiple times in the command line.
392407
default: false
393408
anyOf:
394-
- required:
395-
- value
396409
- required:
397410
- valueHint
411+
- required:
412+
- value
398413

399414
NamedArgument:
400415
description: A command-line `--flag={value}`.
@@ -431,25 +446,58 @@ components:
431446
example: SOME_VARIABLE
432447

433448
Argument:
449+
description: "Warning: Arguments construct command-line parameters that may contain user-provided input. This creates potential command injection risks if clients execute commands in a shell environment. For example, a malicious argument value like ';rm -rf ~/Development' could execute dangerous commands. Clients should prefer non-shell execution methods (e.g., posix_spawn) when possible to eliminate injection risks entirely. Where not possible, clients should obtain consent from users or agents to run the resolved command before execution."
434450
anyOf:
435451
- $ref: '#/components/schemas/PositionalArgument'
436452
- $ref: '#/components/schemas/NamedArgument'
437453

438-
Remote:
454+
StdioTransport:
455+
type: object
456+
required:
457+
- type
458+
properties:
459+
type:
460+
type: string
461+
enum: [stdio]
462+
description: Transport type
463+
example: "stdio"
464+
465+
StreamableHttpTransport:
439466
type: object
440467
required:
441468
- type
442469
- url
443470
properties:
444471
type:
445472
type: string
446-
enum: [streamable-http, sse]
447-
description: Transport protocol type
473+
enum: [streamable-http]
474+
description: Transport type
475+
example: "streamable-http"
476+
url:
477+
type: string
478+
description: URL template for the streamable-http transport. Variables in {curly_braces} reference argument valueHints, argument names, or environment variable names. After variable substitution, this should produce a valid URI.
479+
example: "https://api.example.com/mcp"
480+
headers:
481+
type: array
482+
description: HTTP headers to include
483+
items:
484+
$ref: '#/components/schemas/KeyValueInput'
485+
486+
SseTransport:
487+
type: object
488+
required:
489+
- type
490+
- url
491+
properties:
492+
type:
493+
type: string
494+
enum: [sse]
495+
description: Transport type
448496
example: "sse"
449497
url:
450498
type: string
451499
format: uri
452-
description: Remote server URL
500+
description: Server-Sent Events endpoint URL
453501
example: "https://mcp-fs.example.com/sse"
454502
headers:
455503
type: array
@@ -459,7 +507,7 @@ components:
459507

460508
Icon:
461509
type: object
462-
description: An optionally-sized icon that can be displayed in a user interface
510+
description: An optionally-sized icon that can be displayed in a user interface.
463511
required:
464512
- src
465513
properties:
@@ -498,22 +546,31 @@ components:
498546
properties:
499547
name:
500548
type: string
501-
description: "Reverse DNS name of the MCP server"
502-
example: "io.github.modelcontextprotocol/filesystem"
549+
description: "Server name in reverse-DNS format. Must contain exactly one forward slash separating namespace from server name."
550+
example: "io.github.user/weather"
551+
minLength: 3
552+
maxLength: 200
553+
pattern: "^[a-zA-Z0-9.-]+/[a-zA-Z0-9._-]+$"
503554
description:
504555
type: string
505-
description: "Human-readable description of the server's functionality"
506-
example: "Node.js server implementing Model Context Protocol (MCP) for filesystem operations."
556+
description: "Clear human-readable explanation of server functionality. Should focus on capabilities, not implementation details."
557+
example: "MCP server providing weather data and forecasts via OpenWeatherMap API"
558+
minLength: 1
559+
maxLength: 100
507560
title:
508561
type: string
509562
description: "Optional human-readable title or display name for the MCP server. MCP subregistries or clients MAY choose to use this for display purposes."
510-
example: "Filesystem"
563+
example: "Weather API"
564+
minLength: 1
565+
maxLength: 100
511566
repository:
512567
$ref: '#/components/schemas/Repository'
568+
description: "Optional repository metadata for the MCP server source code. Recommended for transparency and security inspection."
513569
version:
514570
type: string
515571
example: "1.0.2"
516-
description: "Version string for this server. SHOULD follow semantic versioning (e.g., '1.0.2', '2.1.0-alpha'). Equivalent of Implementation.version in MCP specification."
572+
description: "Version string for this server. SHOULD follow semantic versioning (e.g., '1.0.2', '2.1.0-alpha'). Equivalent of Implementation.version in MCP specification. Non-semantic versions are allowed but may not sort predictably. Version ranges are rejected (e.g., '^1.2.3', '~1.2.3', '>=1.2.3', '1.x', '1.*')."
573+
maxLength: 255
517574
websiteUrl:
518575
type: string
519576
format: uri
@@ -536,14 +593,16 @@ components:
536593
remotes:
537594
type: array
538595
items:
539-
$ref: '#/components/schemas/Remote'
596+
anyOf:
597+
- $ref: '#/components/schemas/StreamableHttpTransport'
598+
- $ref: '#/components/schemas/SseTransport'
540599
_meta:
541600
type: object
542-
description: Extension metadata using reverse DNS namespacing
601+
description: "Extension metadata using reverse DNS namespacing for vendor-specific data"
543602
properties:
544603
io.modelcontextprotocol.registry/publisher-provided:
545604
type: object
546-
description: Publisher-specific metadata and build information
605+
description: "Publisher-provided metadata for downstream registries"
547606
additionalProperties: true
548607
example:
549608
tool: "publisher-cli"

0 commit comments

Comments
 (0)