Merge branch 'main' into spec/sampling-includecontext

Author: LucaButBoring

docs/clients.mdx

@@ -45,6 +45,7 @@ This page provides an overview of applications that support the Model Context Pr
 | [Microsoft Copilot Studio]                  | ❌          | ❌        | ✅      | ❓                     | ❌          | ❌    | Supports tools                                                              |
 | [MindPal][MindPal]                          | ❌          | ❌        | ✅      | ❓                     | ❌          | ❌    | Supports tools for no-code AI agents and multi-agent workflows.             |
 | [Msty Studio][Msty Studio]                  | ❌          | ❌        | ✅      | ❓                     | ❌          | ❌    | Supports tools                                                              |
+| [NVIDIA Agent Intelligence toolkit][AIQ toolkit] | ❌     | ❌        | ✅      | ❓                     | ❌          | ❌    | Supports tools in agentic workflows.                                        |
 | [OpenSumi][OpenSumi]                        | ❌          | ❌        | ✅      | ❓                     | ❌          | ❌    | Supports tools in OpenSumi                                                  |
 | [oterm][oterm]                              | ❌          | ✅        | ✅      | ❓                     | ✅          | ❌    | Supports tools, prompts and sampling for Ollama.                                                 |
 | [Postman][postman]                          | ✅          | ✅        | ✅      | ❓                     | ❌          | ❌    | Supports tools, resources, prompts, and sampling                                                 |
@@ -64,6 +65,7 @@ This page provides an overview of applications that support the Model Context Pr
 [5ire]: https://github.com/nanbingxyz/5ire
 [AgentAI]: https://github.com/AdamStrojek/rust-agentai
 [AgenticFlow]: https://agenticflow.ai/mcp
+[AIQ toolkit]: https://github.com/NVIDIA/AIQToolkit
 [Amazon Q CLI]: https://github.com/aws/amazon-q-developer-cli
 [Apify MCP Tester]: https://apify.com/jiri.spilka/tester-mcp-client
 [BeeAI Framework]: https://i-am-bee.github.io/beeai-framework
@@ -116,6 +118,7 @@ This page provides an overview of applications that support the Model Context Pr
 [HyperAgent]: https://github.com/hyperbrowserai/HyperAgent
 [Discovery]: /docs/concepts/tools#tool-discovery-and-updates
 
+
 </div>
 
 ## Client details
@@ -448,6 +451,19 @@ Programmatically assemble prompts for LLMs using [GenAIScript](https://microsoft
 **Learn more:**
 - [Msty Studio Documentation](https://docs.msty.studio/features/toolbox/tools)
 
+### NVIDIA Agent Intelligence (AIQ) toolkit
+[NVIDIA Agent Intelligence (AIQ) toolkit](https://github.com/NVIDIA/AIQToolkit) is a flexible, lightweight, and unifying library that allows you to easily connect existing enterprise agents to data sources and tools across any framework.
+
+**Key features:**
+- Acts as an MCP **client** to consume remote tools
+- Acts as an MCP **server** to expose tools
+- Framework agnostic and compatible with LangChain, CrewAI, Semantic Kernel, and custom agents
+- Includes built-in observability and evaluation tools
+
+**Learn more:**
+- [AIQ toolkit GitHub repository](https://github.com/NVIDIA/AIQToolkit)
+- [AIQ toolkit MCP documentation](https://docs.nvidia.com/aiqtoolkit/latest/workflows/mcp/index.html)
+
 ### OpenSumi
 [OpenSumi](https://github.com/opensumi/core) is a framework helps you quickly build AI Native IDE products.
 

docs/examples.mdx

@@ -38,39 +38,11 @@ These official reference servers demonstrate core MCP features and SDK usage:
 
 ## Official integrations
 
-These MCP servers are maintained by companies for their platforms:
-
-- **[Apify](https://mcp.apify.com)** - Use thousands community Actors for web data extraction and automation jobs
-- **[Axiom](https://github.com/axiomhq/mcp-server-axiom)** - Query and analyze logs, traces, and event data using natural language
-- **[Browserbase](https://github.com/browserbase/mcp-server-browserbase)** - Automate browser interactions in the cloud
-- **[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.
-- **[Cloudflare](https://github.com/cloudflare/mcp-server-cloudflare)** - Deploy and manage resources on the Cloudflare developer platform
-- **[E2B](https://github.com/e2b-dev/mcp-server)** - Execute code in secure cloud sandboxes
-- **[Neon](https://github.com/neondatabase/mcp-server-neon)** - Interact with the Neon serverless Postgres platform
-- **[Obsidian Markdown Notes](https://github.com/calclavia/mcp-obsidian)** - Read and search through Markdown notes in Obsidian vaults
-- **[Prisma](https://pris.ly/docs/mcp-server)** - Manage and interact with Prisma Postgres databases
-- **[Qdrant](https://github.com/qdrant/mcp-server-qdrant/)** - Implement semantic memory using the Qdrant vector search engine
-- **[Raygun](https://github.com/MindscapeHQ/mcp-server-raygun)** - Access crash reporting and monitoring data
-- **[Search1API](https://github.com/fatwang2/search1api-mcp)** - Unified API for search, crawling, and sitemaps
-- **[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.
-- **[Stripe](https://github.com/stripe/agent-toolkit)** - Interact with the Stripe API
-- **[Tinybird](https://github.com/tinybirdco/mcp-tinybird)** - Interface with the Tinybird serverless ClickHouse platform
-- **[Weaviate](https://github.com/weaviate/mcp-server-weaviate)** - Enable Agentic RAG through your Weaviate collection(s)
-
-## Community highlights
-
-A growing ecosystem of community-developed servers extends MCP's capabilities:
-
-- **[Docker](https://github.com/ckreiling/mcp-server-docker)** - Manage containers, images, volumes, and networks
-- **[Kubernetes](https://github.com/Flux159/mcp-server-kubernetes)** - Manage pods, deployments, and services
-- **[Linear](https://github.com/jerhadf/linear-mcp-server)** - Project management and issue tracking
-- **[Snowflake](https://github.com/datawiz168/mcp-snowflake-service)** - Interact with Snowflake databases
-- **[Spotify](https://github.com/varunneal/spotify-mcp)** - Control Spotify playback and manage playlists
-- **[Todoist](https://github.com/abhiz123/todoist-mcp-server)** - Task management integration
-
-> **Note:** Community servers are untested and should be used at your own risk. They are not affiliated with or endorsed by Anthropic.
-
-For a complete list of community servers, visit the [MCP Servers Repository](https://github.com/modelcontextprotocol/servers).
+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.
+
+## Community implementations
+
+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.
 
 ## Getting started
 
@@ -121,12 +93,6 @@ To use an MCP server with Claude, add it to your configuration:
 
 ## Additional resources
 
-- [MCP Servers Repository](https://github.com/modelcontextprotocol/servers) - Complete collection of reference implementations and community servers
-- [Awesome MCP Servers](https://github.com/punkpeye/awesome-mcp-servers) - Curated list of MCP servers
-- [MCP CLI](https://github.com/wong2/mcp-cli) - Command-line inspector for testing MCP servers
-- [MCP Get](https://mcp-get.com) - Tool for installing and managing MCP servers
-- [Pipedream MCP](https://mcp.pipedream.com) - MCP servers with built-in auth for 3,000+ APIs and 10,000+ tools
-- [Supergateway](https://github.com/supercorp-ai/supergateway) - Run MCP stdio servers over SSE
-- [Zapier MCP](https://zapier.com/mcp) - MCP Server with over 7,000+ apps and 30,000+ actions
+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.
 
 Visit our [GitHub Discussions](https://github.com/orgs/modelcontextprotocol/discussions) to engage with the MCP community.

docs/specification/draft/basic/index.mdx

@@ -91,13 +91,6 @@ The receiver **MUST NOT** send a response.
 
 - Notifications **MUST NOT** include an ID.
 
-### Batching
-
-JSON-RPC also defines a means to
-[batch multiple requests and notifications](https://www.jsonrpc.org/specification#batch),
-by sending them in an array. MCP implementations **MAY** support sending JSON-RPC
-batches, but **MUST** support receiving JSON-RPC batches.
-
 ## Auth
 
 MCP provides an [Authorization](/specification/draft/basic/authorization) framework for use with HTTP.

docs/specification/draft/changelog.mdx

@@ -9,7 +9,9 @@ the previous revision, [2025-03-26](/specification/2025-03-26).
 
 1. Removed support for JSON-RPC **[batching](https://www.jsonrpc.org/specification#batch)**
    (PR [#416](https://github.com/modelcontextprotocol/specification/pull/416)) 
-2. TODO
+2. Added support for [structured tool output](https://modelcontextprotocol.io/specification/draft/server/tools#structured-content)
+   (PR [#371](https://github.com/modelcontextprotocol/modelcontextprotocol/pull/371))
+3. TODO
 
 ## Other schema changes
 

docs/specification/draft/server/tools.mdx

@@ -248,7 +248,7 @@ For backwards compatibility, a tool that returns structured content SHOULD also
 #### Output Schema
 
 Tools may also provide an output schema for validation of structured results.
-If an output schema provided:
+If an output schema is provided:
 * Servers **MUST** provide structured results that conform to this schema.
 * Clients **SHOULD** validate structured results against this schema.