fix: add meta field to CallToolResult struct and update constructors

- Add meta field to CallToolResult struct definition
- Update all CallToolResult constructor methods to include missing fields:
  - Add structured_content field to success(), error(), success_with_meta(), and error_with_meta()
  - Add meta field to structured() and structured_error()
- Update CallToolResultHelper deserializer to include meta field
- Regenerate server_json_rpc_message_schema_current.json with updated schema

BREAKING CHANGE: CallToolResult struct now includes meta field

Author: aharvard

.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

.gitignore

@@ -13,9 +13,16 @@ Cargo.lock
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
 .vscode/
+
+# Python artifacts (for test directories)
+*.egg-info/
+__pycache__/
+*.pyc
+*.pyo
+
 # RustRover
 #  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+#.idea/

Cargo.toml

@@ -1,18 +1,16 @@
-
-
 [workspace]
 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.6.0", path = "./crates/rmcp" }
+rmcp-macros = { version = "0.6.0", path = "./crates/rmcp-macros" }
 
 [workspace.package]
 edition = "2024"
-version = "0.3.0"
+version = "0.6.0"
 authors = ["4t145 <u4t145@163.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT"
 repository = "https://github.com/modelcontextprotocol/rust-sdk/"
 description = "Rust SDK for Model Context Protocol"
 keywords = ["mcp", "sdk", "tokio", "modelcontextprotocol"]

README.md

@@ -119,6 +119,7 @@ See [oauth_support](docs/OAUTH_SUPPORT.md) for details.
 - [Schema](https://github.com/modelcontextprotocol/specification/blob/main/schema/2024-11-05/schema.ts)
 
 ## Related Projects
+- [rustfs-mcp](https://github.com/rustfs/rustfs/tree/main/crates/mcp) - High-performance MCP server providing S3-compatible object storage operations for AI/LLM integration
 - [containerd-mcp-server](https://github.com/jokemanfire/mcp-containerd) - A containerd-based MCP server implementation
 
 ## Development

crates/rmcp-macros/CHANGELOG.md

@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.0](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-macros-v0.5.0...rmcp-macros-v0.6.0) - 2025-08-19
+
+### Other
+
+- add related project rustfs-mcp ([#378](https://github.com/modelcontextprotocol/rust-sdk/pull/378))
+
+## [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/common.rs

@@ -0,0 +1,65 @@
+//! Common utilities shared between different macro implementations
+
+use quote::quote;
+use syn::{Attribute, Expr, FnArg, ImplItemFn, Signature, Type};
+
+/// Parse a None expression
+pub fn none_expr() -> syn::Result<Expr> {
+    syn::parse2::<Expr>(quote! { None })
+}
+
+/// Extract documentation from doc attributes
+pub fn extract_doc_line(existing_docs: Option<String>, attr: &Attribute) -> Option<String> {
+    if !attr.path().is_ident("doc") {
+        return None;
+    }
+
+    let syn::Meta::NameValue(name_value) = &attr.meta else {
+        return None;
+    };
+
+    let syn::Expr::Lit(expr_lit) = &name_value.value else {
+        return None;
+    };
+
+    let syn::Lit::Str(lit_str) = &expr_lit.lit else {
+        return None;
+    };
+
+    let content = lit_str.value().trim().to_string();
+    match (existing_docs, content) {
+        (Some(mut existing_docs), content) if !content.is_empty() => {
+            existing_docs.push('\n');
+            existing_docs.push_str(&content);
+            Some(existing_docs)
+        }
+        (Some(existing_docs), _) => Some(existing_docs),
+        (None, content) if !content.is_empty() => Some(content),
+        _ => None,
+    }
+}
+
+/// Find Parameters<T> type in function signature
+/// Returns the full Parameters<T> type if found
+pub fn find_parameters_type_in_sig(sig: &Signature) -> Option<Box<Type>> {
+    sig.inputs.iter().find_map(|input| {
+        if let FnArg::Typed(pat_type) = input {
+            if let Type::Path(type_path) = &*pat_type.ty {
+                if type_path
+                    .path
+                    .segments
+                    .last()
+                    .is_some_and(|type_name| type_name.ident == "Parameters")
+                {
+                    return Some(pat_type.ty.clone());
+                }
+            }
+        }
+        None
+    })
+}
+
+/// Find Parameters<T> type in ImplItemFn
+pub fn find_parameters_type_impl(fn_item: &ImplItemFn) -> Option<Box<Type>> {
+    find_parameters_type_in_sig(&fn_item.sig)
+}