Merge branch 'main' into add-systemprompt-client

Ejb503 · web-flow · commit 2f7e2a63fa54 · 2025-06-14T07:48:12.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,8 +18,8 @@ jobs:
 
       - run: npm ci
 
-      - run: npm run validate:schema
+      - name: Check TypeScript definitions
+        run: npm run check:schema:ts
 
-      - run: npm run generate:json
       - name: Verify that `npm run generate:json` did not change outputs (if it did, please re-run it and re-commit!)
-        run: git diff --exit-code
+        run: npm run check:schema:json
diff --git a/.github/workflows/markdown-format.yml b/.github/workflows/markdown-format.yml
@@ -25,4 +25,7 @@ jobs:
         run: npm ci
 
       - name: Check markdown formatting
-        run: npm run format:check
+        run: npm run check:docs:format
+
+      - name: Check markdown links
+        run: npm run check:docs:links
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -33,39 +33,34 @@ npm install  # install dependencies
 ## Making Changes
 
 Note that schema changes are made to `schema.ts`, and `schema.json` is generated from
-`schema.ts`. You should validate your `schema.ts` changes first and then generate the
-`schema.json`.
+`schema.ts`.
 
 1. Create a new branch:
 
 ```bash
 git checkout -b feature/your-feature-name
 ```
 
-2. Make your changes
-3. Validate your changes:
+2. Make your changes.
 
-```bash
-npm run validate:schema    # validate schema
-```
-
-4. Generate the `schema.json`:
+3. Validate schema changes and generate `schema.json`:
 
 ```bash
-npm run generate:json      # generate JSON schema
+npm run check:schema:ts
+npm run generate:json
 ```
 
-5. Run docs locally (optional):
+4. Validate documentation changes and apply formatting:
 
 ```bash
-npm run serve:docs
+npm run check:docs
+npm run format
 ```
 
-6. Format/lint your changes:
+5. Preview documentation locally (optional):
 
 ```bash
-npm run format:check   # check formatting
-npm run format         # apply formatting
+npm run serve:docs
 ```
 
 ### Documentation Guidelines
@@ -77,7 +72,7 @@ When contributing to the documentation:
 - Include code examples where appropriate
 - Use proper MDX formatting and components
 - Test all links and code samples
-  - You may run `npm run check-links` to look for broken internal links.
+  - You may run `npm run check:docs:links` to look for broken internal links.
 - Use appropriate headings: "When to use", "Steps", and "Tips" for tutorials
 - Place new pages in appropriate sections (concepts, tutorials, etc.)
 - Update `docs.json` when adding new pages
diff --git a/docs/clients.mdx b/docs/clients.mdx
diff --git a/docs/docs.json b/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",
diff --git a/docs/docs/concepts/transports.mdx b/docs/docs/concepts/transports.mdx
@@ -129,15 +129,7 @@ Use stdio when:
 
 ### Streamable HTTP
 
-<Warning>
-
-The SSE Transport has been [**replaced**](http://modelcontextprotocol.io/specification/2025-03-26/changelog#major-changes) with a more
-flexible [Streamable HTTP](http://modelcontextprotocol.io/specification/2025-03-26/basic/transports) transport. Refer to the [Specification](http://modelcontextprotocol.io/specification/2025-03-26/basic/transports)
-and latest SDKs for the most recent information.
-
-</Warning>
-
-SSE transport enables server-to-client streaming with HTTP POST requests for client-to-server communication.
+The Streamable HTTP transport uses HTTP POST requests for client-to-server communication and optional Server-Sent Events (SSE) streams for server-to-client communication.
 
 Use Streamable HTTP when:
 
diff --git a/docs/quickstart/client.mdx b/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
diff --git a/docs/quickstart/server.mdx b/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>
 
diff --git a/docs/sdk/java/mcp-server.mdx b/docs/sdk/java/mcp-server.mdx
@@ -42,11 +42,11 @@ The server supports both synchronous and asynchronous APIs, allowing for flexibl
 McpSyncServer syncServer = McpServer.sync(transportProvider)
     .serverInfo("my-server", "1.0.0")
     .capabilities(ServerCapabilities.builder()
-        .resources(true)     // Enable resource support
-        .tools(true)         // Enable tool support
-        .prompts(true)       // Enable prompt support
-        .logging()           // Enable logging support
-        .completions()      // Enable completions support
+        .resources(false, true)  // Enable resource support
+        .tools(true)             // Enable tool support
+        .prompts(true)           // Enable prompt support
+        .logging()               // Enable logging support
+        .completions()           // Enable completions support
         .build())
     .build();
 
@@ -68,10 +68,11 @@ syncServer.close();
 McpAsyncServer asyncServer = McpServer.async(transportProvider)
     .serverInfo("my-server", "1.0.0")
     .capabilities(ServerCapabilities.builder()
-        .resources(true)     // Enable resource support
-        .tools(true)         // Enable tool support
-        .prompts(true)       // Enable prompt support
-        .logging()           // Enable logging support
+        .resources(false, true)     // Enable resource support
+        .tools(true)                // Enable tool support
+        .prompts(true)              // Enable prompt support
+        .logging()                  // Enable logging support
+        .completions()              // Enable completions support
         .build())
     .build();
 
@@ -507,7 +508,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.
diff --git a/docs/specification/2025-03-26/basic/lifecycle.mdx b/docs/specification/2025-03-26/basic/lifecycle.mdx
@@ -144,17 +144,17 @@ available during the session.
 
 Key capabilities include:
 
-| Category | Capability     | Description                                                                              |
-| -------- | -------------- | ---------------------------------------------------------------------------------------- |
-| Client   | `roots`        | Ability to provide filesystem [roots](/specification/2025-03-26/client/roots)            |
-| Client   | `sampling`     | Support for LLM [sampling](/specification/2025-03-26/client/sampling) requests           |
-| Client   | `experimental` | Describes support for non-standard experimental features                                 |
-| Server   | `prompts`      | Offers [prompt templates](/specification/2025-03-26/server/prompts)                      |
-| Server   | `resources`    | Provides readable [resources](/specification/2025-03-26/server/resources)                |
-| Server   | `tools`        | Exposes callable [tools](/specification/2025-03-26/server/tools)                         |
-| Server   | `logging`      | Emits structured [log messages](/specification/2025-03-26/server/utilities/logging)      |
-| Server   | `completions`  | Supports argument [autocompletion](/specification/2025-03-26/server/utilites/completion) |
-| Server   | `experimental` | Describes support for non-standard experimental features                                 |
+| Category | Capability     | Description                                                                               |
+| -------- | -------------- | ----------------------------------------------------------------------------------------- |
+| Client   | `roots`        | Ability to provide filesystem [roots](/specification/2025-03-26/client/roots)             |
+| Client   | `sampling`     | Support for LLM [sampling](/specification/2025-03-26/client/sampling) requests            |
+| Client   | `experimental` | Describes support for non-standard experimental features                                  |
+| Server   | `prompts`      | Offers [prompt templates](/specification/2025-03-26/server/prompts)                       |
+| Server   | `resources`    | Provides readable [resources](/specification/2025-03-26/server/resources)                 |
+| Server   | `tools`        | Exposes callable [tools](/specification/2025-03-26/server/tools)                          |
+| Server   | `logging`      | Emits structured [log messages](/specification/2025-03-26/server/utilities/logging)       |
+| Server   | `completions`  | Supports argument [autocompletion](/specification/2025-03-26/server/utilities/completion) |
+| Server   | `experimental` | Describes support for non-standard experimental features                                  |
 
 Capability objects can describe sub-capabilities like:
 
diff --git a/docs/specification/draft/basic/authorization.mdx b/docs/specification/draft/basic/authorization.mdx
@@ -257,7 +257,7 @@ requests that appear legitimate to resource servers.
 Clients and servers **MUST** implement secure token storage and follow OAuth best practices,
 as outlined in [OAuth 2.1, Section 7.1](https://datatracker.ietf.org/doc/html/draft-ietf-oauth-v2-1-12#section-7.1).
 
-MCP authorization servers SHOULD issue short-lived access tokens token to reduce the impact of leaked tokens.
+MCP authorization servers SHOULD issue short-lived access tokens to reduce the impact of leaked tokens.
 For public clients, MCP authorization servers **MUST** rotate refresh tokens as described in [OAuth 2.1 Section 4.3.1 "Refresh Token Grant"](https://datatracker.ietf.org/doc/html/draft-ietf-oauth-v2-1-12#section-4.3.1).
 
 ### Communication Security
@@ -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)
 
diff --git a/docs/specification/draft/basic/lifecycle.mdx b/docs/specification/draft/basic/lifecycle.mdx
@@ -68,6 +68,7 @@ The client **MUST** initiate this phase by sending an `initialize` request conta
     },
     "clientInfo": {
       "name": "ExampleClient",
+      "title": "Example Client Display Name",
       "version": "1.0.0"
     }
   }
@@ -97,6 +98,7 @@ The server **MUST** respond with its own capabilities and information:
     },
     "serverInfo": {
       "name": "ExampleServer",
+      "title": "Example Server Display Name",
       "version": "1.0.0"
     },
     "instructions": "Optional instructions for the client"
diff --git a/docs/specification/draft/changelog.mdx b/docs/specification/draft/changelog.mdx
@@ -11,14 +11,14 @@ 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. Added support for [structured tool output](server/tools#structured-content)
+2. Added support for [structured tool output](/specification/draft/server/tools#structured-content)
    (PR [#371](https://github.com/modelcontextprotocol/modelcontextprotocol/pull/371))
-3. Classified MCP servers as [OAuth Resource Servers](basic/authorization#authorization-server-discovery),
+3. Classified MCP servers as [OAuth Resource Servers](/specification/draft/basic/authorization#authorization-server-discovery),
    adding protected resource metadata to discover the corresponding Authorization server.
    (PR [#338](https://github.com/modelcontextprotocol/modelcontextprotocol/pull/338))
-4. Clarified [security considerations](basic/authorization#security-considerations) and best practices
-   in the authorization spec and in a new [security best practices page](basic/security_best_practices).
-5. Added support for **[elicitation](client/elicitation)**, enabling servers to request additional
+4. Clarified [security considerations](/specification/draft/basic/authorization#security-considerations) and best practices
+   in the authorization spec and in a new [security best practices page](/specification/draft/basic/security_best_practices).
+5. Added support for **[elicitation](/specification/draft/client/elicitation)**, enabling servers to request additional
    information from users during interactions.
    (PR [#382](https://github.com/modelcontextprotocol/modelcontextprotocol/pull/382))
 6. Added support for **[resource links](/specification/draft/server/tools#resource-links)** in
diff --git a/docs/specification/draft/server/prompts.mdx b/docs/specification/draft/server/prompts.mdx
@@ -75,6 +75,7 @@ supports [pagination](/specification/draft/server/utilities/pagination).
     "prompts": [
       {
         "name": "code_review",
+        "title": "Request Code Review",
         "description": "Asks the LLM to analyze code quality and suggest improvements",
         "arguments": [
           {
@@ -174,6 +175,7 @@ sequenceDiagram
 A prompt definition includes:
 
 - `name`: Unique identifier for the prompt
+- `title`: Optional human-readable name of the prompt for display purposes.
 - `description`: Optional human-readable description
 - `arguments`: Optional list of arguments for customization
 
@@ -236,6 +238,8 @@ Embedded resources allow referencing server-side resources directly in messages:
   "type": "resource",
   "resource": {
     "uri": "resource://example",
+    "name": "example",
+    "title": "My Example Resource",
     "mimeType": "text/plain",
     "text": "Resource content"
   }
diff --git a/docs/specification/draft/server/resources.mdx b/docs/specification/draft/server/resources.mdx
@@ -113,6 +113,7 @@ supports [pagination](/specification/draft/server/utilities/pagination).
       {
         "uri": "file:///project/src/main.rs",
         "name": "main.rs",
+        "title": "Rust Software Application Main File",
         "description": "Primary application entry point",
         "mimeType": "text/x-rust"
       }
@@ -149,6 +150,8 @@ To retrieve resource contents, clients send a `resources/read` request:
     "contents": [
       {
         "uri": "file:///project/src/main.rs",
+        "name": "main.rs",
+        "title": "Rust Software Application Main File",
         "mimeType": "text/x-rust",
         "text": "fn main() {\n    println!(\"Hello world!\");\n}"
       }
@@ -184,6 +187,7 @@ auto-completed through [the completion API](/specification/draft/server/utilitie
       {
         "uriTemplate": "file:///{path}",
         "name": "Project Files",
+        "title": "📁 Project Files",
         "description": "Access files in the project directory",
         "mimeType": "application/octet-stream"
       }
@@ -229,7 +233,8 @@ to specific resources and receive notifications when they change:
   "jsonrpc": "2.0",
   "method": "notifications/resources/updated",
   "params": {
-    "uri": "file:///project/src/main.rs"
+    "uri": "file:///project/src/main.rs",
+    "title": "Rust Software Application Main File"
   }
 }
 ```
@@ -266,7 +271,8 @@ sequenceDiagram
 A resource definition includes:
 
 - `uri`: Unique identifier for the resource
-- `name`: Human-readable name
+- `name`: The name of the resource.
+- `title`: Optional human-readable name of the resource for display purposes.
 - `description`: Optional description
 - `mimeType`: Optional MIME type
 - `size`: Optional size in bytes
@@ -280,6 +286,8 @@ Resources can contain either text or binary data:
 ```json
 {
   "uri": "file:///example.txt",
+  "name": "example.txt",
+  "title": "Example Text File",
   "mimeType": "text/plain",
   "text": "Resource content"
 }
@@ -290,6 +298,8 @@ Resources can contain either text or binary data:
 ```json
 {
   "uri": "file:///example.png",
+  "name": "example.png",
+  "title": "Example Image",
   "mimeType": "image/png",
   "blob": "base64-encoded-data"
 }
diff --git a/docs/specification/draft/server/tools.mdx b/docs/specification/draft/server/tools.mdx
diff --git a/package.json b/package.json
diff --git a/schema/draft/schema.json b/schema/draft/schema.json
diff --git a/schema/draft/schema.ts b/schema/draft/schema.ts

Original file line number	Diff line number	Diff line change
`@@ -58,21 +58,7 @@`
`58`	`58`	`]`
`59`	`59`	`}`
`60`	`60`	`]`
`61`		`- },`
`62`		`- {`
`63`		`- "tab": "SDKs",`
`64`		`- "icon": "book-open",`
`65`		`- "groups": [`
`66`		`- {`
`67`		`- "group": "Java",`
`68`		`- "pages": [`
`69`		`- "sdk/java/mcp-overview",`
`70`		`- "sdk/java/mcp-client",`
`71`		`- "sdk/java/mcp-server"`
`72`		`- ]`
`73`		`- }`
`74`		`- ]`
`75`		`- },`
	`61`	`+ },`
`76`	`62`	`{`
`77`	`63`	`"tab": "Specification",`
`78`	`64`	`"icon": "book",`