Merge branch 'main' into feature/elicitation

Author: bug-ops

.github/instructions/fetch-mcp-doc.instructions.md

@@ -0,0 +1,74 @@
+---
+applyTo: '**'
+---
+
+When you need the information about the Model Context Protocol (MCP) specification, you can fetch the latest document from the official MCP website.
+
+# Overall
+#fetch https://modelcontextprotocol.io/specification/2025-06-18.md
+
+## Key Changes
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/changelog.md
+
+## Architecture
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/architecture.md
+
+# BaseProtocol
+## Overview
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/basic.md
+
+## Lifecycle
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/basic/lifecycle.md
+
+## Transports
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/basic/transports.md
+
+## Authorization
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/basic/authorization.md
+
+## Security Best Practices
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/basic/security_best_practices.md
+
+## Utilities
+### Cancellation
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/basic/utilities/cancellation.md
+
+### Ping
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/basic/utilities/ping.md
+
+### Progress
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/basic/utilities/progress.md
+
+# Client Features
+## Roots
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/client/roots.md
+
+## Sampling
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/client/sampling.md
+
+## Elicitation
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/client/elicitation.md
+
+# Server Features
+## Overview
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/server.md
+
+## Prompts
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/server/prompts.md
+
+## Resources
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/server/resources.md
+
+## Tools
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/server/tools.md
+
+## Utilities
+### Completion
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/server/utilities/completion.md
+### Logging
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/server/utilities/logging.md
+### Pagination
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/server/utilities/pagination.md
+
+# Schema Reference
+#fetch https://modelcontextprotocol.io/specification/2025-06-18/schema.md

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -39,7 +39,7 @@ jobs:
     name: Code Formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Rust fmt
         run: rustup toolchain install nightly --component rustfmt
@@ -51,7 +51,7 @@ jobs:
     name: Lint with Clippy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
@@ -65,15 +65,15 @@ jobs:
     name: spell check with typos
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Spell Check Repo
       uses: crate-ci/typos@master
 
   test:
     name: Run Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       # install nodejs
       - name: Setup Node.js
@@ -104,7 +104,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       # install nodejs
       - name: Setup Node.js
@@ -139,7 +139,7 @@ jobs:
     name: Example test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       # install nodejs
       - name: Setup Node.js
@@ -195,7 +195,7 @@ jobs:
     name: Security Audit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
@@ -212,7 +212,7 @@ jobs:
     name: Generate Documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@nightly
@@ -239,7 +239,7 @@ jobs:
       # This happened recently in the attack on `tj-actions/changed-files`, but
       # has happened many times before as well.
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Update Rust
         run: | 

.github/workflows/release-plz.yml

@@ -20,7 +20,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Install Rust toolchain
@@ -46,7 +46,7 @@ jobs:
       cancel-in-progress: false
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Install Rust toolchain

Cargo.toml

@@ -5,12 +5,12 @@ members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
 resolver = "2"
 
 [workspace.dependencies]
-rmcp = { version = "0.3.0", path = "./crates/rmcp" }
-rmcp-macros = { version = "0.3.0", path = "./crates/rmcp-macros" }
+rmcp = { version = "0.5.0", path = "./crates/rmcp" }
+rmcp-macros = { version = "0.5.0", path = "./crates/rmcp-macros" }
 
 [workspace.package]
 edition = "2024"
-version = "0.3.0"
+version = "0.5.0"
 authors = ["4t145 <[email protected]>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/modelcontextprotocol/rust-sdk/"

README.md

@@ -12,8 +12,8 @@ An official Rust Model Context Protocol SDK implementation with tokio async runt
 
 This repository contains the following crates:
 
-- [rmcp](crates/rmcp): The core crate providing the RMCP protocol implementation( If you want to get more information, please visit [rmcp](crates/rmcp/README.md))
-- [rmcp-macros](crates/rmcp-macros): A procedural macro crate for generating RMCP tool implementations(If you want to get more information, please visit [rmcp-macros](crates/rmcp-macros/README.md))
+- [rmcp](crates/rmcp): The core crate providing the RMCP protocol implementation (If you want to get more information, please visit [rmcp](crates/rmcp/README.md))
+- [rmcp-macros](crates/rmcp-macros): A procedural macro crate for generating RMCP tool implementations (If you want to get more information, please visit [rmcp-macros](crates/rmcp-macros/README.md))
 
 ## Usage
 
@@ -129,4 +129,4 @@ See [docs/CONTRIBUTE.MD](docs/CONTRIBUTE.MD) to get some tips for contributing.
 
 ### Using Dev Container
 
-If you want to use dev container, see [docs/DEVCONTAINER.md](docs/DEVCONTAINER.md) for instructions on using Dev Container for development.
+If you want to use dev container, see [docs/DEVCONTAINER.md](docs/DEVCONTAINER.md) for instructions on using Dev Container for development.

crates/rmcp-macros/CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.0](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-macros-v0.3.2...rmcp-macros-v0.4.0) - 2025-08-05
+
+### Added
+
+- [**breaking**] Add support for `Tool.outputSchema` and `CallToolResult.structuredContent` ([#316](https://github.com/modelcontextprotocol/rust-sdk/pull/316))
+
+### Other
+
+- README.md codeblock terminator ([#348](https://github.com/modelcontextprotocol/rust-sdk/pull/348))
+
+## [0.3.1](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-macros-v0.3.0...rmcp-macros-v0.3.1) - 2025-07-29
+
+### Other
+
+- Fix formatting in crate descriptions in README.md ([#333](https://github.com/modelcontextprotocol/rust-sdk/pull/333))
+
 ## [0.3.0](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-macros-v0.2.1...rmcp-macros-v0.3.0) - 2025-07-15
 
 ### Added

crates/rmcp-macros/README.md

@@ -98,7 +98,7 @@ impl MyToolHandler {
         }
     }
 }
-
+```
 
 ### tool_handler
 
@@ -159,4 +159,4 @@ impl ServerHandler for MyToolHandler {
 
 ## License
 
-Please refer to the LICENSE file in the project root directory. 
+Please refer to the LICENSE file in the project root directory. 

crates/rmcp-macros/src/tool.rs

@@ -10,6 +10,8 @@ pub struct ToolAttribute {
     pub description: Option<String>,
     /// A JSON Schema object defining the expected parameters for the tool
     pub input_schema: Option<Expr>,
+    /// An optional JSON Schema object defining the structure of the tool's output
+    pub output_schema: Option<Expr>,
     /// Optional additional tool information.
     pub annotations: Option<ToolAnnotationsAttribute>,
 }
@@ -18,6 +20,7 @@ pub struct ResolvedToolAttribute {
     pub name: String,
     pub description: Option<String>,
     pub input_schema: Expr,
+    pub output_schema: Option<Expr>,
     pub annotations: Expr,
 }
 
@@ -27,19 +30,26 @@ impl ResolvedToolAttribute {
             name,
             description,
             input_schema,
+            output_schema,
             annotations,
         } = self;
         let description = if let Some(description) = description {
             quote! { Some(#description.into()) }
         } else {
             quote! { None }
         };
+        let output_schema = if let Some(output_schema) = output_schema {
+            quote! { Some(#output_schema) }
+        } else {
+            quote! { None }
+        };
         let tokens = quote! {
             pub fn #fn_ident() -> rmcp::model::Tool {
                 rmcp::model::Tool {
                     name: #name.into(),
                     description: #description,
                     input_schema: #input_schema,
+                    output_schema: #output_schema,
                     annotations: #annotations,
                 }
             }
@@ -89,6 +99,63 @@ fn none_expr() -> Expr {
     syn::parse2::<Expr>(quote! { None }).unwrap()
 }
 
+/// Check if a type is Json<T> and extract the inner type T
+fn extract_json_inner_type(ty: &syn::Type) -> Option<&syn::Type> {
+    if let syn::Type::Path(type_path) = ty {
+        if let Some(last_segment) = type_path.path.segments.last() {
+            if last_segment.ident == "Json" {
+                if let syn::PathArguments::AngleBracketed(args) = &last_segment.arguments {
+                    if let Some(syn::GenericArgument::Type(inner_type)) = args.args.first() {
+                        return Some(inner_type);
+                    }
+                }
+            }
+        }
+    }
+    None
+}
+
+/// Extract schema expression from a function's return type
+/// Handles patterns like Json<T> and Result<Json<T>, E>
+fn extract_schema_from_return_type(ret_type: &syn::Type) -> Option<Expr> {
+    // First, try direct Json<T>
+    if let Some(inner_type) = extract_json_inner_type(ret_type) {
+        return syn::parse2::<Expr>(quote! {
+            rmcp::handler::server::tool::cached_schema_for_type::<#inner_type>()
+        })
+        .ok();
+    }
+
+    // Then, try Result<Json<T>, E>
+    let type_path = match ret_type {
+        syn::Type::Path(path) => path,
+        _ => return None,
+    };
+
+    let last_segment = type_path.path.segments.last()?;
+
+    if last_segment.ident != "Result" {
+        return None;
+    }
+
+    let args = match &last_segment.arguments {
+        syn::PathArguments::AngleBracketed(args) => args,
+        _ => return None,
+    };
+
+    let ok_type = match args.args.first()? {
+        syn::GenericArgument::Type(ty) => ty,
+        _ => return None,
+    };
+
+    let inner_type = extract_json_inner_type(ok_type)?;
+
+    syn::parse2::<Expr>(quote! {
+        rmcp::handler::server::tool::cached_schema_for_type::<#inner_type>()
+    })
+    .ok()
+}
+
 // extract doc line from attribute
 fn extract_doc_line(existing_docs: Option<String>, attr: &syn::Attribute) -> Option<String> {
     if !attr.path().is_ident("doc") {
@@ -192,12 +259,22 @@ pub fn tool(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
     } else {
         none_expr()
     };
+    // Handle output_schema - either explicit or generated from return type
+    let output_schema_expr = attribute.output_schema.or_else(|| {
+        // Try to generate schema from return type
+        match &fn_item.sig.output {
+            syn::ReturnType::Type(_, ret_type) => extract_schema_from_return_type(ret_type),
+            _ => None,
+        }
+    });
+
     let resolved_tool_attr = ResolvedToolAttribute {
         name: attribute.name.unwrap_or_else(|| fn_ident.to_string()),
         description: attribute
             .description
             .or_else(|| fn_item.attrs.iter().fold(None, extract_doc_line)),
         input_schema: input_schema_expr,
+        output_schema: output_schema_expr,
         annotations: annotations_expr,
     };
     let tool_attr_fn = resolved_tool_attr.into_fn(tool_attr_fn_ident)?;