Merge branch 'main' into docs/tool-name-conflicts

Author: LucaButBoring

docs/clients.mdx

@@ -35,6 +35,7 @@ This page provides an overview of applications that support the Model Context Pr
 | [Goose][Goose]                                   | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | Supports tools.                                                                                 |
 | [gptme][gptme]                                   | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | Supports tools.                                                                                 |
 | [HyperAgent][HyperAgent]                         | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | Supports tools.                                                                                 |
+| [JetBrains AI Assistant][JetBrains AI Assistant] | ❌          | ❌        | ✅      | ❌                     | ❌         | ❌    | Supports tools for all JetBrains IDEs.                                                          |
 | [Klavis AI Slack/Discord/Web][Klavis AI]         | ✅          | ❌        | ✅      | ❓                     | ❌         | ❌    | Supports tools and resources.                                                                   |
 | [LibreChat][LibreChat]                           | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | Supports tools for Agents                                                                       |
 | [Lutra][Lutra]                                   | ✅          | ✅        | ✅      | ❓                     | ❌         | ❌    | Supports any MCP server for reusable playbook creation.                                         |
@@ -58,9 +59,9 @@ This page provides an overview of applications that support the Model Context Pr
 | [TheiaAI/TheiaIDE][TheiaAI/TheiaIDE]             | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | Supports tools for Agents in Theia AI and the AI-powered Theia IDE                              |
 | [Tome][Tome]                                     | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | Supports tools, manages MCP servers.                                                            |
 | [TypingMind App][TypingMind App]                 | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | Supports tools at app-level (appear as plugins) or when assigned to Agents                      |
-| [VS Code GitHub Copilot][VS Code]                | ❌          | ❌        | ✅      | ✅                     | ❌         | ✅    | Supports dynamic tool/roots discovery, secure secret configuration, and explicit tool prompting |
+| [VS Code GitHub Copilot][VS Code]                | ✅          | ✅        | ✅      | ✅                     | ✅         | ✅    | Supports dynamic tool/roots discovery, secure secret configuration, and explicit tool prompting |
 | [Warp][Warp]                                     | ✅          | ❌        | ✅      | ✅                     | ❌         | ❌    | Supports tools, resources, and most of the discovery criteria                                   |
-| [WhatsMPC][WhatsMPC]                             | ❌          | ❌        | ✅      | ❌                     | ❌         | ❌    | Supports tools for Remote MCP Servers in WhatsApp                                               |
+| [WhatsMCP][WhatsMCP]                             | ❌          | ❌        | ✅      | ❌                     | ❌         | ❌    | Supports tools for Remote MCP Servers in WhatsApp                                               |
 | [Windsurf Editor][Windsurf]                      | ❌          | ❌        | ✅      | ✅                     | ❌         | ❌    | Supports tools with AI Flow for collaborative development.                                      |
 | [Witsy][Witsy]                                   | ❌          | ❌        | ✅      | ❓                     | ❌         | ❌    | Supports tools in Witsy.                                                                        |
 | [Zed][Zed]                                       | ❌          | ✅        | ❌      | ❌                     | ❌         | ❌    | Prompts appear as slash commands                                                                |
@@ -90,6 +91,7 @@ This page provides an overview of applications that support the Model Context Pr
 [Genkit]: https://github.com/firebase/genkit
 [GenAIScript]: https://microsoft.github.io/genaiscript/reference/scripts/mcp-tools/
 [Goose]: https://block.github.io/goose/docs/goose-architecture/#interoperability-with-extensions
+[JetBrains AI Assistant]: https://plugins.jetbrains.com/plugin/22282-jetbrains-ai-assistant
 [LibreChat]: https://github.com/danny-avila/LibreChat
 [Lutra]: https://lutra.ai
 [mcp-agent]: https://github.com/lastmile-ai/mcp-agent
@@ -115,7 +117,7 @@ This page provides an overview of applications that support the Model Context Pr
 [Windsurf]: https://codeium.com/windsurf
 [gptme]: https://github.com/gptme/gptme
 [Warp]: https://www.warp.dev/
-[WhatsMPC]: https://wassist.app/mcp/
+[WhatsMCP]: https://wassist.app/mcp/
 [Witsy]: https://github.com/nbonamy/witsy
 [Zed]: https://zed.dev
 [Zencoder]: https://zencoder.ai
@@ -407,6 +409,18 @@ Programmatically assemble prompts for LLMs using [GenAIScript](https://microsoft
 - Cloud Ready – Instantly scale to hundreds of sessions via [Hyperbrowser](https://www.hyperbrowser.ai/)
 - MCP Client – Connect to tools like Composio for full workflows (e.g. writing web data to Google Sheets)
 
+### JetBrains AI Assistant
+
+[JetBrains AI Assistant](https://plugins.jetbrains.com/plugin/22282-jetbrains-ai-assistant) plugin provides AI-powered features for software development available in all JetBrains IDEs.
+
+**Key features:**
+
+- Unlimited code completion powered by Mellum, JetBrains’ proprietary AI model.
+- Context-aware AI chat that understands your code and helps you in real time.
+- Access to top-tier models from OpenAI, Anthropic, and Google.
+- Offline mode with connected local LLMs via Ollama or LM Studio.
+- Deep integration into IDE workflows, including code suggestions in the editor, VCS assistance, runtime error explanation, and more.
+
 ### Klavis AI Slack/Discord/Web
 
 [Klavis AI](https://www.klavis.ai/) is an Open-Source Infra to Use, Build & Scale MCPs with ease.
@@ -590,7 +604,7 @@ Programmatically assemble prompts for LLMs using [GenAIScript](https://microsoft
 - Full support of all major MCP features (tools, prompts, resources, and subscriptions)
 - Fast, seamless UI for debugging MCP capabilities
 - MCP config integration (Claude, VSCode, etc.) for fast first-time experience in testing MCPs
-- Integration with history, varibles, and collections for re-use and collaboration
+- Integration with history, variables, and collections for reuse and collaboration
 
 ### Slack MCP Client
 
@@ -710,9 +724,9 @@ Theia AI and Theia IDE's MCP integration provide users with flexibility, making
 - **Live tool/resource discovery**: view tools and resources from each running MCP server
 - **Configurable startup**: set MCP servers to start automatically with Warp or launch them manually as needed
 
-### WhatsMPC
+### WhatsMCP
 
-[WhatsMPC](https://wassist.app/mcp/) is an MCP client for WhatsApp. WhatsMCP lets you interact with your AI stack from the comfort of a WhatsApp chat.
+[WhatsMCP](https://wassist.app/mcp/) is an MCP client for WhatsApp. WhatsMCP lets you interact with your AI stack from the comfort of a WhatsApp chat.
 
 **Key features:**
 
@@ -735,7 +749,7 @@ Theia AI and Theia IDE's MCP integration provide users with flexibility, making
 
 ### Witsy
 
-[Witsy](https://github.com/nbonamy/witsy) is an AI desktop assistant, supoorting Anthropic models and MCP servers as LLM tools.
+[Witsy](https://github.com/nbonamy/witsy) is an AI desktop assistant, supporting Anthropic models and MCP servers as LLM tools.
 
 **Key features:**
 

docs/docs.json

@@ -58,21 +58,7 @@
             ]
           }
         ]
-      },
-      {
-        "tab": "SDKs",
-        "icon": "book-open",
-        "groups": [
-          {
-            "group": "Java",
-            "pages": [
-              "sdk/java/mcp-overview",
-              "sdk/java/mcp-client",
-              "sdk/java/mcp-server"
-            ]
-          }
-        ]
-      },
+      },     
       {
         "tab": "Specification",
         "icon": "book",

docs/quickstart/client.mdx

@@ -3,7 +3,7 @@ title: "For Client Developers"
 description: "Get started building your own client that can integrate with all MCP servers."
 ---
 
-In this tutorial, you'll learn how to build a LLM-powered chatbot client that connects to MCP servers. It helps to have gone through the [Server quickstart](/quickstart/server) that guides you through the basic of building your first server.
+In this tutorial, you'll learn how to build an LLM-powered chatbot client that connects to MCP servers. It helps to have gone through the [Server quickstart](/quickstart/server) that guides you through the basics of building your first server.
 
 <Tabs>
 <Tab title="Python">
@@ -598,7 +598,7 @@ async connectToServer(serverScriptPath: string) {
       command,
       args: [serverScriptPath],
     });
-    this.mcp.connect(this.transport);
+    await this.mcp.connect(this.transport);
 
     const toolsResult = await this.mcp.listTools();
     this.tools = toolsResult.tools.map((tool) => {
@@ -640,7 +640,6 @@ async processQuery(query: string) {
   });
 
   const finalText = [];
-  const toolResults = [];
 
   for (const content of response.content) {
     if (content.type === "text") {
@@ -653,7 +652,6 @@ async processQuery(query: string) {
         name: toolName,
         arguments: toolArgs,
       });
-      toolResults.push(result);
       finalText.push(
         `[Calling tool ${toolName} with args ${JSON.stringify(toolArgs)}]`
       );
@@ -1474,6 +1472,7 @@ Then, add the required dependencies to your project:
 dotnet add package ModelContextProtocol --prerelease
 dotnet add package Anthropic.SDK
 dotnet add package Microsoft.Extensions.Hosting
+dotnet add package Microsoft.Extensions.AI
 ```
 
 ## Setting up your API key

docs/quickstart/server.mdx

@@ -1085,7 +1085,7 @@ Create a new boot starter application using the `spring-ai-starter-mcp-client` d
 ```
 
 and set the `spring.ai.mcp.client.stdio.servers-configuration` property to point to your `claude_desktop_config.json`.
-You can re-use the existing Anthropic Desktop configuration:
+You can reuse the existing Anthropic Desktop configuration:
 
 ```properties
 spring.ai.mcp.client.stdio.servers-configuration=file:PATH/TO/claude_desktop_config.json
@@ -1573,7 +1573,7 @@ await app.RunAsync();
 
 <Note>
 
-When creating the `ApplicationHostBuilder`, ensure you use `CreateEmptyApplicationBuilder` instead of `CreateDefaultBuilder`. This ensures that the server does not write any additional messages to the console. This is only neccessary for servers using STDIO transport.
+When creating the `ApplicationHostBuilder`, ensure you use `CreateEmptyApplicationBuilder` instead of `CreateDefaultBuilder`. This ensures that the server does not write any additional messages to the console. This is only necessary for servers using STDIO transport.
 
 </Note>
 

docs/sdk/java/mcp-client.mdx

@@ -1,8 +1,10 @@
 ---
-title: MCP Client
+title: Java MCP Client
 description: Learn how to use the Model Context Protocol (MCP) client to interact with MCP servers
 ---
 
+Go to the [Java MCP Server](/sdk/java/mcp-server) to learn how to build MCP servers or the [Java MCP Overview](/sdk/java/mcp-overview) to understand the overall architecture.
+
 # Model Context Protocol Client
 
 The MCP Client is a key component in the Model Context Protocol (MCP) architecture, responsible for establishing and managing connections with MCP servers. It implements the client-side of the protocol, handling:
@@ -16,13 +18,17 @@ The MCP Client is a key component in the Model Context Protocol (MCP) architectu
 - Optional features like roots management and sampling support
 
 <Tip>
-
 The core `io.modelcontextprotocol.sdk:mcp` module provides STDIO and SSE client transport implementations without requiring external web frameworks.
 
 Spring-specific transport implementations are available as an **optional** dependency `io.modelcontextprotocol.sdk:mcp-spring-webflux` for [Spring Framework](https://docs.spring.io/spring-ai/reference/api/mcp/mcp-client-boot-starter-docs.html) users.
 
 </Tip>
 
+<Tip>
+  This [quickstart demo](/quickstart/client), based on Spring AI MCP, will show
+  you how to build an AI client that connects to MCP servers.
+</Tip>
+
 The client provides both synchronous and asynchronous APIs for flexibility in different application contexts.
 
 <Tabs>

docs/sdk/java/mcp-overview.mdx

@@ -1,19 +1,18 @@
 ---
-title: Overview
+title: Java SDK Overview
 description: Introduction to the Model Context Protocol (MCP) Java SDK
 ---
 
 Java SDK for the [Model Context Protocol](https://modelcontextprotocol.org/docs/concepts/architecture)
 enables standardized integration between AI models and tools.
 
-<Note>
+## Content
 
-### Breaking Changes in 0.8.x ⚠️
-
-**Note:** Version 0.8.x introduces several breaking changes including a new session-based architecture.
-If you're upgrading from 0.7.0, please refer to the [Migration Guide](https://github.com/modelcontextprotocol/java-sdk/blob/main/migration-0.8.0.md) for detailed instructions.
-
-</Note>
+- [Introduction](/sdk/java/mcp-overview#features) - Overview of the Model Context Protocol (MCP) Java SDK and its features.
+  - [Architecture](/sdk/java/mcp-overview#architecture) - The Java MCP SDK architecture overview.
+  - [Java Dependencies](/sdk/java/mcp-overview#dependencies) - Java dependencies required to use the MCP SDK.
+- [Java MCP Client](/sdk/java/mcp-client) - Learn how to use the MCP client to interact with MCP servers.
+- [Java MCP Server](/sdk/java/mcp-server) - Learn how to implement and configure an MCP server.
 
 ## Features
 
@@ -55,12 +54,12 @@ The SDK follows a layered architecture with clear separation of concerns:
   - StdioTransport (stdin/stdout) in the core module
   - HTTP SSE transports in dedicated transport modules (Java HttpClient, Spring WebFlux, Spring WebMVC)
 
-The MCP Client is a key component in the Model Context Protocol (MCP) architecture, responsible for establishing and managing connections with MCP servers.
+The [MCP Client](/sdk/java/mcp-client) is a key component in the Model Context Protocol (MCP) architecture, responsible for establishing and managing connections with MCP servers.
 It implements the client-side of the protocol.
 
 ![Java MCP Client Architecture](/images/java/java-mcp-client-architecture.jpg)
 
-The MCP Server is a foundational component in the Model Context Protocol (MCP) architecture that provides tools, resources, and capabilities to clients.
+The [MCP Server](/sdk/java/mcp-server) is a foundational component in the Model Context Protocol (MCP) architecture that provides tools, resources, and capabilities to clients.
 It implements the server-side of the protocol.
 
 ![Java MCP Server Architecture](/images/java/java-mcp-server-architecture.jpg)
@@ -154,7 +153,7 @@ Add the BOM to your project:
         <dependency>
             <groupId>io.modelcontextprotocol.sdk</groupId>
             <artifactId>mcp-bom</artifactId>
-            <version>0.9.0</version>
+            <version>0.10.0</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
@@ -168,7 +167,7 @@ Add the BOM to your project:
 
 ```groovy
 dependencies {
-  implementation platform("io.modelcontextprotocol.sdk:mcp-bom:0.9.0")
+  implementation platform("io.modelcontextprotocol.sdk:mcp-bom:0.10.0")
   //...
 }
 ```

docs/sdk/java/mcp-server.mdx

@@ -1,16 +1,9 @@
 ---
-title: MCP Server
+title: Java MCP Server
 description: Learn how to implement and configure a Model Context Protocol (MCP) server
 ---
 
-<Note>
-
-### Breaking Changes in 0.8.x ⚠️
-
-**Note:** Version 0.8.x introduces several breaking changes including a new session-based architecture.
-If you're upgrading from 0.7.0, please refer to the [Migration Guide](https://github.com/modelcontextprotocol/java-sdk/blob/main/migration-0.8.0.md) for detailed instructions.
-
-</Note>
+Go to the [Java MCP Client](/sdk/java/mcp-client) to learn how to build MCP clients or [Java MCP Overview](/sdk/java/mcp-overview) for a general overview of the Model Context Protocol (MCP) in Java.
 
 ## Overview
 
@@ -32,6 +25,11 @@ Spring-specific transport implementations are available as an **optional** depen
 
 </Tip>
 
+<Tip>
+  This [quickstart demo](/quickstart/server), based on Spring AI MCP, will show
+  you how to build an MCP server.
+</Tip>
+
 The server supports both synchronous and asynchronous APIs, allowing for flexible integration in different application contexts.
 
 <Tabs>
@@ -508,7 +506,7 @@ var mcpServer = McpServer.async(mcpServerTransportProvider)
 </Tabs>
 
 The `McpSchema.CompletionReference` definition defines the type (`PromptRefernce` or `ResourceRefernce`) and the identifier for the completion specification (e.g handler).
-The handler function processes requests and returns the complition response.
+The handler function processes requests and returns the completion response.
 The first argument is `McpAsyncServerExchange` for client interaction, and the second argument is a `CompleteRequest` instance.
 
 Check the [using completion](/sdk/java/mcp-client#using-completion) to learn how to use the completion capabilities on the client side.

docs/specification/draft/basic/authorization.mdx

@@ -214,7 +214,7 @@ even if they are part of the same logical session.
 Example request:
 
 ```http
-GET /v1/contexts HTTP/1.1
+GET /mcp HTTP/1.1
 Host: mcp.example.com
 Authorization: Bearer eyJhbGciOiJIUzI1NiIs...
 ```
@@ -286,7 +286,7 @@ MCP clients **MUST** have redirect URIs registered with the authorization server
 Authorization servers **MUST** validate exact redirect URIs against pre-registered values to prevent redirection attacks.
 
 MCP clients **SHOULD** use and verify state parameters in the authorization code flow
-and discard any results that do not include or have a mis-match with the original state.
+and discard any results that do not include or have a mismatch with the original state.
 
 Authorization servers **MUST** take precautions to prevent redirecting user agents to untrusted URI's, following suggestions laid out in [OAuth 2.1 Section 7.12.2](https://datatracker.ietf.org/doc/html/draft-ietf-oauth-v2-1-12#section-7.12.2)
 

docs/specification/draft/basic/index.mdx

@@ -2,6 +2,8 @@
 title: Overview
 ---
 
+<div id="enable-section-numbers" />
+
 <Info>**Protocol Revision**: draft</Info>
 
 The Model Context Protocol consists of several key components that work together:
@@ -116,3 +118,29 @@ There is also a
 [JSON Schema](https://github.com/modelcontextprotocol/specification/blob/main/schema/draft/schema.json),
 which is automatically generated from the TypeScript source of truth, for use with
 various automated tooling.
+
+### General fields
+
+#### `_meta`
+
+The `_meta` property/parameter is reserved by MCP to allow clients and servers
+to attach additional metadata to their interactions.
+
+Certain key names are reserved by MCP for protocol-level metadata, as specified below;
+implementations must not make assumptions about values at these keys.
+
+Additionally, definitions in the [schema](https://github.com/modelcontextprotocol/specification/blob/main/schema/draft/schema.ts)
+may reserve particular names for purpose-specific metadata, as declared in those definitions.
+
+**Key name format:** valid `_meta` key names have two segments: an optional **prefix**, and a **name**.
+
+**Prefix:**
+
+- If specified, must be a series of labels separated by dots (`.`), followed by a slash (`/`).
+  - Labels must start with a letter and end with a letter or digit; interior characters can be letters, digits, or hyphens (`-`).
+- The `modelcontextprotocol.[*]/` and `mcp.[*]/` prefixes are reserved for MCP use (where `[*]` stands for any top-level domain).
+
+**Name:**
+
+- Unless empty, must begin and end with an alphanumeric character (`[a-z0-9A-Z]`).
+- Could contain hyphens (`-`), underscores (`_`), dots (`.`), and alphanumerics in between.