Skip to content

docs(discovery): rename Catalog Entry mediaType field to type (ADR 0014)#32

Merged
SamMorrowDrums merged 1 commit into
mainfrom
adopt-catalog-entry-type
Jul 13, 2026
Merged

docs(discovery): rename Catalog Entry mediaType field to type (ADR 0014)#32
SamMorrowDrums merged 1 commit into
mainfrom
adopt-catalog-entry-type

Conversation

@tadasant

@tadasant tadasant commented Jun 18, 2026

Copy link
Copy Markdown
Member

What

Adapts the MCP Catalog Entry in docs/discovery.md to AI Catalog PR #37 / ADR 0014, which renames the CatalogEntry.mediaType member to type and reframes its description as an open-text type identifier rather than a strict IANA media type.

Changes (docs-only, docs/discovery.md):

  • Renames the mediaType member to type in the Catalog Entry table.
  • Updates the member description to mirror ADR 0014: "An identifier specifying the type of the referenced artifact."
  • Updates the type key in all four example catalog entries.
  • Updates the client-validation prose (type set to … / "ignore entries with unrecognized types").

Rebase / conflict resolution

This branch was rebased onto the current main to resolve a merge conflict in docs/discovery.md. The conflict came from changes that landed on main after this branch was cut:

The resolved diff is exactly the mediaTypetype rename (table row, four examples, validation prose) applied on top of main — nothing from either side's intent was dropped.

Scope decision — value deliberately kept as application/mcp-server-card+json

This PR renames the field only. The value stays application/mcp-server-card+json and is not changed to ADR 0014's known-type application/mcp-server+json. Rationale:

Flag for maintainers: AI Catalog's ADR 0014 known-types list uses application/mcp-server+json for MCP. Whether this repo should also adopt that value (reversing issue #9 / PR #18 and re-introducing the server.json naming collision) is a separate, more consequential decision and is intentionally out of scope here. Happy to file a cross-repo issue if maintainers want to pursue it.

What is intentionally NOT changed

  • The Server Card document's own HTTP media type (Accept / Content-Type negotiation, the reserved /server-card location prose). That is a genuine IANA media type, not the renamed catalog field, and ADR 0014 does not touch it.
  • schema.ts / schema.json — the Server Card schema has no mediaType/type member; this convention lives only in the discovery doc.

Verification

  • Rebased onto latest main; merge conflict in docs/discovery.md resolved, preserving both docs(discovery): adopt AI Catalog urn:air: identifier convention (ADR 0015) #31 (urn:air:) and docs(discovery): drop displayName from MCP Catalog entries (#14) #39 (displayName removal). PR now reports MERGEABLE.
  • npm run checkschema.json up to date, tsc --noEmit clean
  • npm run validate — all 7 examples pass
  • npm run format:checkdocs/discovery.md clean, including markdown table re-alignment
  • Verified zero mediaType field tokens remain (git grep mediaType → no matches)
  • Verified the Server Card HTTP media-type prose was left intact (no over-reach)
  • CI greenbuild, Analyze (actions), and CodeQL all pass on the rebased head (run)
  • Independent fresh-eyes subagent review: APPROVE (rename complete & correct; no displayName reintroduced; value unchanged; Server Card media-type prose intact; no stray mediaType; no conflict markers)

🤖 Generated with Claude Code

@tadasant

Copy link
Copy Markdown
Member Author

Let's hold on merging until the AI Catalog PR lands

@tadasant

Copy link
Copy Markdown
Member Author

@SamMorrowDrums it's landed so let's get this in

Adapt the MCP Catalog Entry to AI Catalog PR #37 / ADR 0014, which renames
the CatalogEntry `mediaType` member to `type` and reframes its description
as an open-text type identifier rather than a strict IANA media type.

Scoped to the field rename only. The value remains
`application/mcp-server-card+json` (this repo's deliberate choice per issue
ADR 0014's known-type `application/mcp-server+json`. The Server Card's own
HTTP media type (Accept/Content-Type) is unchanged.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@tadasant
tadasant force-pushed the adopt-catalog-entry-type branch from 0867422 to 72ed0fe Compare July 13, 2026 19:31
@SamMorrowDrums
SamMorrowDrums merged commit 3b2d974 into main Jul 13, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants