Skip to content

Commit ac8e5f5

Browse files
authored
Merge branch 'main' into feature/elicitation
2 parents 2e113f8 + aaf64ba commit ac8e5f5

File tree

4 files changed

+10
-49
lines changed

4 files changed

+10
-49
lines changed

docs/examples.mdx

Lines changed: 6 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,11 @@ These official reference servers demonstrate core MCP features and SDK usage:
3838

3939
## Official integrations
4040

41-
These MCP servers are maintained by companies for their platforms:
42-
43-
- **[Apify](https://mcp.apify.com)** - Use thousands community Actors for web data extraction and automation jobs
44-
- **[Axiom](https://github.com/axiomhq/mcp-server-axiom)** - Query and analyze logs, traces, and event data using natural language
45-
- **[Browserbase](https://github.com/browserbase/mcp-server-browserbase)** - Automate browser interactions in the cloud
46-
- **[BrowserStack](https://github.com/browserstack/mcp-server)** - Access BrowserStack's [Test Platform](https://www.browserstack.com/test-platform) to debug, write and fix tests, do accessibility testing and more.
47-
- **[Cloudflare](https://github.com/cloudflare/mcp-server-cloudflare)** - Deploy and manage resources on the Cloudflare developer platform
48-
- **[E2B](https://github.com/e2b-dev/mcp-server)** - Execute code in secure cloud sandboxes
49-
- **[Neon](https://github.com/neondatabase/mcp-server-neon)** - Interact with the Neon serverless Postgres platform
50-
- **[Obsidian Markdown Notes](https://github.com/calclavia/mcp-obsidian)** - Read and search through Markdown notes in Obsidian vaults
51-
- **[Prisma](https://pris.ly/docs/mcp-server)** - Manage and interact with Prisma Postgres databases
52-
- **[Qdrant](https://github.com/qdrant/mcp-server-qdrant/)** - Implement semantic memory using the Qdrant vector search engine
53-
- **[Raygun](https://github.com/MindscapeHQ/mcp-server-raygun)** - Access crash reporting and monitoring data
54-
- **[Search1API](https://github.com/fatwang2/search1api-mcp)** - Unified API for search, crawling, and sitemaps
55-
- **[Snyk](https://github.com/snyk/snyk-ls/tree/main/mcp_extension)** - Enhance security posture by embedding [Snyk](https://snyk.io) vulnerability scanning directly into agentic workflows.
56-
- **[Stripe](https://github.com/stripe/agent-toolkit)** - Interact with the Stripe API
57-
- **[Tinybird](https://github.com/tinybirdco/mcp-tinybird)** - Interface with the Tinybird serverless ClickHouse platform
58-
- **[Weaviate](https://github.com/weaviate/mcp-server-weaviate)** - Enable Agentic RAG through your Weaviate collection(s)
59-
60-
## Community highlights
61-
62-
A growing ecosystem of community-developed servers extends MCP's capabilities:
63-
64-
- **[Docker](https://github.com/ckreiling/mcp-server-docker)** - Manage containers, images, volumes, and networks
65-
- **[Kubernetes](https://github.com/Flux159/mcp-server-kubernetes)** - Manage pods, deployments, and services
66-
- **[Linear](https://github.com/jerhadf/linear-mcp-server)** - Project management and issue tracking
67-
- **[Snowflake](https://github.com/datawiz168/mcp-snowflake-service)** - Interact with Snowflake databases
68-
- **[Spotify](https://github.com/varunneal/spotify-mcp)** - Control Spotify playback and manage playlists
69-
- **[Todoist](https://github.com/abhiz123/todoist-mcp-server)** - Task management integration
70-
71-
> **Note:** Community servers are untested and should be used at your own risk. They are not affiliated with or endorsed by Anthropic.
72-
73-
For a complete list of community servers, visit the [MCP Servers Repository](https://github.com/modelcontextprotocol/servers).
41+
Visit the [MCP Servers Repository (Official Integrations section)](https://github.com/modelcontextprotocol/servers?tab=readme-ov-file#%EF%B8%8F-official-integrations) for a list of MCP servers maintained by companies for their platforms.
42+
43+
## Community implementations
44+
45+
Visit the [MCP Servers Repository (Community section)](https://github.com/modelcontextprotocol/servers?tab=readme-ov-file#-community-servers) for a list of MCP servers maintained by community members.
7446

7547
## Getting started
7648

@@ -121,12 +93,6 @@ To use an MCP server with Claude, add it to your configuration:
12193

12294
## Additional resources
12395

124-
- [MCP Servers Repository](https://github.com/modelcontextprotocol/servers) - Complete collection of reference implementations and community servers
125-
- [Awesome MCP Servers](https://github.com/punkpeye/awesome-mcp-servers) - Curated list of MCP servers
126-
- [MCP CLI](https://github.com/wong2/mcp-cli) - Command-line inspector for testing MCP servers
127-
- [MCP Get](https://mcp-get.com) - Tool for installing and managing MCP servers
128-
- [Pipedream MCP](https://mcp.pipedream.com) - MCP servers with built-in auth for 3,000+ APIs and 10,000+ tools
129-
- [Supergateway](https://github.com/supercorp-ai/supergateway) - Run MCP stdio servers over SSE
130-
- [Zapier MCP](https://zapier.com/mcp) - MCP Server with over 7,000+ apps and 30,000+ actions
96+
Visit the [MCP Servers Repository (Resources section)](https://github.com/modelcontextprotocol/servers?tab=readme-ov-file#-resources) for a collection of other resources and projects related to MCP.
13197

13298
Visit our [GitHub Discussions](https://github.com/orgs/modelcontextprotocol/discussions) to engage with the MCP community.

docs/specification/draft/basic/index.mdx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@ The receiver **MUST NOT** send a response.
9191

9292
- Notifications **MUST NOT** include an ID.
9393

94-
### Batching
95-
96-
JSON-RPC also defines a means to
97-
[batch multiple requests and notifications](https://www.jsonrpc.org/specification#batch),
98-
by sending them in an array. MCP implementations **MAY** support sending JSON-RPC
99-
batches, but **MUST** support receiving JSON-RPC batches.
100-
10194
## Auth
10295

10396
MCP provides an [Authorization](/specification/draft/basic/authorization) framework for use with HTTP.

docs/specification/draft/changelog.mdx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ the previous revision, [2025-03-26](/specification/2025-03-26).
99

1010
1. Removed support for JSON-RPC **[batching](https://www.jsonrpc.org/specification#batch)**
1111
(PR [#416](https://github.com/modelcontextprotocol/specification/pull/416))
12-
2. Added support for **[elicitation](/specification/draft/client/elicitation)**, enabling
12+
2. Added support for [structured tool output](https://modelcontextprotocol.io/specification/draft/server/tools#structured-content)
13+
(PR [#371](https://github.com/modelcontextprotocol/modelcontextprotocol/pull/371))
14+
3. Added support for **[elicitation](/specification/draft/client/elicitation)**, enabling
1315
servers to request additional information from users during interactions. (PR [#382](https://github.com/modelcontextprotocol/modelcontextprotocol/pull/382))
1416

1517
## Other schema changes

docs/specification/draft/server/tools.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ For backwards compatibility, a tool that returns structured content SHOULD also
248248
#### Output Schema
249249

250250
Tools may also provide an output schema for validation of structured results.
251-
If an output schema provided:
251+
If an output schema is provided:
252252
* Servers **MUST** provide structured results that conform to this schema.
253253
* Clients **SHOULD** validate structured results against this schema.
254254

0 commit comments

Comments
 (0)