Merge branch 'main' into spec/sampling-includecontext

Author: LucaButBoring

docs/clients.mdx

@@ -54,6 +54,7 @@ This page provides an overview of applications that support the Model Context Pr
 | [Sourcegraph Cody][Cody]                    | ✅          | ❌        | ❌      | ❓                     | ❌          | ❌    | Supports resources through OpenCTX                                          |
 | [SpinAI][SpinAI]                            | ❌          | ❌        | ✅      | ❓                     | ❌          | ❌    | Supports tools for Typescript AI Agents                                     |
 | [Superinterface][Superinterface]            | ❌          | ❌        | ✅      | ❓                     | ❌          | ❌    | Supports tools                                                              |
+| [Superjoin][Superjoin]                      | ❌          | ❌        | ✅      | ❓                     | ❌          | ❌    | Supports tools and multiple servers.                                        |
 | [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  |
@@ -104,6 +105,7 @@ This page provides an overview of applications that support the Model Context Pr
 [Cody]: https://sourcegraph.com/cody
 [SpinAI]: https://spinai.dev
 [Superinterface]: https://superinterface.ai
+[Superjoin]: https://superjoin.ai
 [TheiaAI/TheiaIDE]: https://eclipsesource.com/blogs/2024/12/19/theia-ide-and-theia-ai-support-mcp/
 [Tome]: https://github.com/runebookai/tome
 [TypingMind App]: https://www.typingmind.com
@@ -214,6 +216,15 @@ Claude Code is an interactive agentic coding tool from Anthropic that helps you
 - Tool and prompt support for MCP servers
 - Offers its own tools through an MCP server for integrating with other MCP clients
 
+### Claude.ai
+[Claude.ai](https://claude.ai) is Anthropic's web-based AI assistant that provides MCP support for remote servers.
+
+**Key features:**
+- Support for remote MCP servers via integrations UI in settings
+- Access to tools, prompts, and resources from configured MCP servers
+- Seamless integration with Claude's conversational interface
+- Enterprise-grade security and compliance features
+
 ### Claude Desktop App
 The Claude desktop application provides comprehensive support for MCP, enabling deep integration with local tools and data sources.
 
@@ -223,8 +234,6 @@ The Claude desktop application provides comprehensive support for MCP, enabling
 - Tool integration for executing commands and scripts
 - Local server connections for enhanced privacy and security
 
-> ⓘ Note: The Claude.ai web application does not currently support MCP. MCP features are only available in the desktop application.
-
 ### Cline
 [Cline](https://github.com/cline/cline) is an autonomous coding agent in VS Code that edits files, runs commands, uses a browser, and more–with your permission at each step.
 
@@ -532,6 +541,15 @@ Programmatically assemble prompts for LLMs using [GenAIScript](https://microsoft
 - SSE transport support
 - Use any AI model from any AI provider (OpenAI, Anthropic, Ollama, others)
 
+### Superjoin
+[Superjoin](https://superjoin.ai) brings the power of MCP directly into Google Sheets extension. With Superjoin, users can access and invoke MCP tools and agents without leaving their spreadsheets, enabling powerful AI workflows and automation right where their data lives.
+
+**Key features:**
+- Native Google Sheets add-on providing effortless access to MCP capabilities
+- Supports OAuth 2.1 and header-based authentication for secure and flexible connections
+- Compatible with both SSE and Streamable HTTP transport for efficient, real-time streaming communication
+- Fully web-based, cross-platform client requiring no additional software installation
+
 ### TheiaAI/TheiaIDE
 [Theia AI](https://eclipsesource.com/blogs/2024/10/07/introducing-theia-ai/) is a framework for building AI-enhanced tools and IDEs. The [AI-powered Theia IDE](https://eclipsesource.com/blogs/2024/10/08/introducting-ai-theia-ide/) is an open and flexible development environment built on Theia AI.
 

docs/development/updates.mdx

@@ -53,7 +53,6 @@
           {
             "group": "Development",
             "pages": [
-              "development/updates",
               "development/roadmap",
               "development/contributing"
             ]
@@ -258,7 +257,7 @@
         {
           "anchor": "Ruby SDK",
           "href": "https://github.com/modelcontextprotocol/ruby-sdk",
-          "icon": "ruby"
+          "icon": "gem"
         },
         {
           "anchor": "Swift SDK",

docs/docs.json

@@ -9,32 +9,38 @@ This page showcases various Model Context Protocol (MCP) servers that demonstrat
 
 These official reference servers demonstrate core MCP features and SDK usage:
 
-### Data and file systems
+### Current reference servers
 - **[Filesystem](https://github.com/modelcontextprotocol/servers/tree/main/src/filesystem)** - Secure file operations with configurable access controls
-- **[PostgreSQL](https://github.com/modelcontextprotocol/servers/tree/main/src/postgres)** - Read-only database access with schema inspection capabilities
-- **[SQLite](https://github.com/modelcontextprotocol/servers/tree/main/src/sqlite)** - Database interaction and business intelligence features
-- **[Google Drive](https://github.com/modelcontextprotocol/servers/tree/main/src/gdrive)** - File access and search capabilities for Google Drive
-
-### Development tools
-- **[Git](https://github.com/modelcontextprotocol/servers/tree/main/src/git)** - Tools to read, search, and manipulate Git repositories
-- **[GitHub](https://github.com/modelcontextprotocol/servers/tree/main/src/github)** - Repository management, file operations, and GitHub API integration
-- **[GitLab](https://github.com/modelcontextprotocol/servers/tree/main/src/gitlab)** - GitLab API integration enabling project management
-- **[Sentry](https://github.com/modelcontextprotocol/servers/tree/main/src/sentry)** - Retrieving and analyzing issues from Sentry.io
-
-### Web and browser automation
-- **[Brave Search](https://github.com/modelcontextprotocol/servers/tree/main/src/brave-search)** - Web and local search using Brave's Search API
 - **[Fetch](https://github.com/modelcontextprotocol/servers/tree/main/src/fetch)** - Web content fetching and conversion optimized for LLM usage
-- **[Puppeteer](https://github.com/modelcontextprotocol/servers/tree/main/src/puppeteer)** - Browser automation and web scraping capabilities
-
-### Productivity and communication
-- **[Slack](https://github.com/modelcontextprotocol/servers/tree/main/src/slack)** - Channel management and messaging capabilities
-- **[Google Maps](https://github.com/modelcontextprotocol/servers/tree/main/src/google-maps)** - Location services, directions, and place details
 - **[Memory](https://github.com/modelcontextprotocol/servers/tree/main/src/memory)** - Knowledge graph-based persistent memory system
-
-### AI and specialized tools
-- **[EverArt](https://github.com/modelcontextprotocol/servers/tree/main/src/everart)** - AI image generation using various models
 - **[Sequential Thinking](https://github.com/modelcontextprotocol/servers/tree/main/src/sequentialthinking)** - Dynamic problem-solving through thought sequences
-- **[AWS KB Retrieval](https://github.com/modelcontextprotocol/servers/tree/main/src/aws-kb-retrieval-server)** - Retrieval from AWS Knowledge Base using Bedrock Agent Runtime
+
+### Archived servers (historical reference)
+
+⚠️ **Note**: The following servers have been moved to the [servers-archived repository](https://github.com/modelcontextprotocol/servers-archived) and are no longer actively maintained. They are provided for historical reference only.
+
+#### Data and file systems
+- **[PostgreSQL](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/postgres)** - Read-only database access with schema inspection capabilities
+- **[SQLite](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/sqlite)** - Database interaction and business intelligence features
+- **[Google Drive](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/gdrive)** - File access and search capabilities for Google Drive
+
+#### Development tools
+- **[Git](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/git)** - Tools to read, search, and manipulate Git repositories
+- **[GitHub](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/github)** - Repository management, file operations, and GitHub API integration
+- **[GitLab](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/gitlab)** - GitLab API integration enabling project management
+- **[Sentry](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/sentry)** - Retrieving and analyzing issues from Sentry.io
+
+#### Web and browser automation
+- **[Brave Search](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/brave-search)** - Web and local search using Brave's Search API
+- **[Puppeteer](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/puppeteer)** - Browser automation and web scraping capabilities
+
+#### Productivity and communication
+- **[Slack](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/slack)** - Channel management and messaging capabilities
+- **[Google Maps](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/google-maps)** - Location services, directions, and place details
+
+#### AI and specialized tools
+- **[EverArt](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/everart)** - AI image generation using various models
+- **[AWS KB Retrieval](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/aws-kb-retrieval-server)** - Retrieval from AWS Knowledge Base using Bedrock Agent Runtime
 
 ## Official integrations
 

docs/examples.mdx

@@ -3,8 +3,6 @@ title: Introduction
 description: 'Get started with the Model Context Protocol (MCP)'
 ---
 
-<Note>C# SDK released! Check out [what else is new.](/development/updates)</Note>
-
 MCP is an open protocol that standardizes how applications provide context to LLMs. Think of MCP like a USB-C port for AI applications. Just as USB-C provides a standardized way to connect your devices to various peripherals and accessories, MCP provides a standardized way to connect AI models to different data sources and tools.
 
 ## Why MCP?

docs/introduction.mdx

@@ -804,7 +804,7 @@ This is a quickstart demo based on Spring AI MCP auto-configuration and boot sta
 To learn how to create sync and async MCP Clients manually, consult the [Java SDK Client](/sdk/java/mcp-client) documentation
 </Note>
 
-This example demonstrates how to build an interactive chatbot that combines Spring AI's Model Context Protocol (MCP) with the [Brave Search MCP Server](https://github.com/modelcontextprotocol/servers/tree/main/src/brave-search). The application creates a conversational interface powered by Anthropic's Claude AI model that can perform internet searches through Brave Search, enabling natural language interactions with real-time web data.
+This example demonstrates how to build an interactive chatbot that combines Spring AI's Model Context Protocol (MCP) with the [Brave Search MCP Server](https://github.com/modelcontextprotocol/servers-archived/tree/main/src/brave-search). The application creates a conversational interface powered by Anthropic's Claude AI model that can perform internet searches through Brave Search, enabling natural language interactions with real-time web data.
 [You can find the complete code for this tutorial here.](https://github.com/spring-projects/spring-ai-examples/tree/main/model-context-protocol/web-search/brave-chatbot)
 
 ## System Requirements

docs/quickstart/client.mdx

@@ -1484,12 +1484,29 @@ When creating the `ApplicationHostBuilder`, ensure you use `CreateEmptyApplicati
 This code sets up a basic console application that uses the Model Context Protocol SDK to create an MCP server with standard I/O transport.
 
 ### Weather API helper functions
+
+Create an extension class for `HttpClient` which helps simplify JSON request handling:
+
+```csharp
+using System.Text.Json;
+
+internal static class HttpClientExt
+{
+    public static async Task<JsonDocument> ReadJsonDocumentAsync(this HttpClient client, string requestUri)
+    {
+        using var response = await client.GetAsync(requestUri);
+        response.EnsureSuccessStatusCode();
+        return await JsonDocument.ParseAsync(await response.Content.ReadAsStreamAsync());
+    }
+}
+```
+
 Next, define a class with the tool execution handlers for querying and converting responses from the National Weather Service API:
 
 ```csharp
 using ModelContextProtocol.Server;
 using System.ComponentModel;
-using System.Net.Http.Json;
+using System.Globalization;
 using System.Text.Json;
 
 namespace QuickstartWeatherServer.Tools;
@@ -1502,7 +1519,8 @@ public static class WeatherTools
         HttpClient client,
         [Description("The US state to get alerts for.")] string state)
     {
-        var jsonElement = await client.GetFromJsonAsync<JsonElement>($"/alerts/active/area/{state}");
+        using var jsonDocument = await client.ReadJsonDocumentAsync($"/alerts/active/area/{state}");
+        var jsonElement = jsonDocument.RootElement;
         var alerts = jsonElement.GetProperty("features").EnumerateArray();
 
         if (!alerts.Any())
@@ -1529,8 +1547,13 @@ public static class WeatherTools
         [Description("Latitude of the location.")] double latitude,
         [Description("Longitude of the location.")] double longitude)
     {
-        var jsonElement = await client.GetFromJsonAsync<JsonElement>($"/points/{latitude},{longitude}");
-        var periods = jsonElement.GetProperty("properties").GetProperty("periods").EnumerateArray();
+        var pointUrl = string.Create(CultureInfo.InvariantCulture, $"/points/{latitude},{longitude}");
+        using var jsonDocument = await client.ReadJsonDocumentAsync(pointUrl);
+        var forecastUrl = jsonDocument.RootElement.GetProperty("properties").GetProperty("forecast").GetString()
+            ?? throw new Exception($"No forecast URL provided by {client.BaseAddress}points/{latitude},{longitude}");
+
+        using var forecastDocument = await client.ReadJsonDocumentAsync(forecastUrl);
+        var periods = forecastDocument.RootElement.GetProperty("properties").GetProperty("periods").EnumerateArray();
 
         return string.Join("\n---\n", periods.Select(period => $"""
                 {period.GetProperty("name").GetString()}

docs/quickstart/server.mdx

@@ -25,7 +25,7 @@ If you already have Claude for Desktop, make sure it's on the latest version by
 
 ## 2. Add the Filesystem MCP Server
 
-To add this filesystem functionality, we will be installing a pre-built [Filesystem MCP Server](https://github.com/modelcontextprotocol/servers/tree/main/src/filesystem) to Claude for Desktop. This is one of dozens of [servers](https://github.com/modelcontextprotocol/servers/tree/main) created by Anthropic and the community.
+To add this filesystem functionality, we will be installing a pre-built [Filesystem MCP Server](https://github.com/modelcontextprotocol/servers/tree/main/src/filesystem) to Claude for Desktop. This is one of several current [reference servers](https://github.com/modelcontextprotocol/servers/tree/main) and many community-created servers.
 
 Get started by opening up the Claude menu on your computer and select "Settings..." Please note that these are not the Claude Account Settings found in the app window itself.
 

docs/quickstart/user.mdx

@@ -56,7 +56,7 @@ The client **MUST** initiate this phase by sending an `initialize` request conta
   "id": 1,
   "method": "initialize",
   "params": {
-    "protocolVersion": "2024-11-05",
+    "protocolVersion": "2025-03-26",
     "capabilities": {
       "roots": {
         "listChanged": true
@@ -84,7 +84,7 @@ The server **MUST** respond with its own capabilities and information:
   "jsonrpc": "2.0",
   "id": 1,
   "result": {
-    "protocolVersion": "2024-11-05",
+    "protocolVersion": "2025-03-26",
     "capabilities": {
       "logging": {},
       "prompts": {