feat(model): add title field to various structs

Author: 4t145

crates/rmcp-macros/src/prompt.rs

@@ -10,6 +10,8 @@ use crate::common::{extract_doc_line, none_expr};
 pub struct PromptAttribute {
     /// The name of the prompt
     pub name: Option<String>,
+    /// Human readable title of prompt
+    pub title: Option<String>,
     /// Optional description of what the prompt does
     pub description: Option<String>,
     /// Arguments that can be passed to the prompt
@@ -18,6 +20,7 @@ pub struct PromptAttribute {
 
 pub struct ResolvedPromptAttribute {
     pub name: String,
+    pub title: Option<String>,
     pub description: Option<String>,
     pub arguments: Expr,
 }
@@ -28,18 +31,25 @@ impl ResolvedPromptAttribute {
             name,
             description,
             arguments,
+            title,
         } = self;
         let description = if let Some(description) = description {
             quote! { Some(#description.into()) }
         } else {
             quote! { None }
         };
+        let title = if let Some(title) = title {
+            quote! { Some(#title.into()) }
+        } else {
+            quote! { None }
+        };
         let tokens = quote! {
             pub fn #fn_ident() -> rmcp::model::Prompt {
                 rmcp::model::Prompt {
                     name: #name.into(),
                     description: #description,
                     arguments: #arguments,
+                    title: #title,
                 }
             }
         };
@@ -87,6 +97,7 @@ pub fn prompt(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream>
         name: name.clone(),
         description: description.clone(),
         arguments: arguments.clone(),
+        title: attribute.title,
     };
     let prompt_attr_fn = resolved_prompt_attr.into_fn(prompt_attr_fn_ident.clone())?;
 

crates/rmcp-macros/src/tool.rs

@@ -66,6 +66,8 @@ fn extract_schema_from_return_type(ret_type: &syn::Type) -> Option<Expr> {
 pub struct ToolAttribute {
     /// The name of the tool
     pub name: Option<String>,
+    /// Human readable title of tool
+    pub title: Option<String>,
     pub description: Option<String>,
     /// A JSON Schema object defining the expected parameters for the tool
     pub input_schema: Option<Expr>,
@@ -77,6 +79,7 @@ pub struct ToolAttribute {
 
 pub struct ResolvedToolAttribute {
     pub name: String,
+    pub title: Option<String>,
     pub description: Option<String>,
     pub input_schema: Expr,
     pub output_schema: Option<Expr>,
@@ -88,6 +91,7 @@ impl ResolvedToolAttribute {
         let Self {
             name,
             description,
+            title,
             input_schema,
             output_schema,
             annotations,
@@ -102,10 +106,16 @@ impl ResolvedToolAttribute {
         } else {
             quote! { None }
         };
+        let title = if let Some(title) = title {
+            quote! { Some(#title.into()) }
+        } else {
+            quote! { None }
+        };
         let tokens = quote! {
             pub fn #fn_ident() -> rmcp::model::Tool {
                 rmcp::model::Tool {
                     name: #name.into(),
+                    title: #title,
                     description: #description,
                     input_schema: #input_schema,
                     output_schema: #output_schema,
@@ -229,6 +239,7 @@ pub fn tool(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
         input_schema: input_schema_expr,
         output_schema: output_schema_expr,
         annotations: annotations_expr,
+        title: attribute.title,
     };
     let tool_attr_fn = resolved_tool_attr.into_fn(tool_attr_fn_ident)?;
     // modify the the input function

crates/rmcp/src/handler/server/prompt.rs

@@ -350,6 +350,7 @@ pub fn cached_arguments_from_schema<T: schemars::JsonSchema + std::any::Any>()
 
             arguments.push(crate::model::PromptArgument {
                 name: name.clone(),
+                title: None,
                 description,
                 required: Some(required.contains(name.as_str())),
             });

crates/rmcp/src/model.rs

@@ -493,7 +493,7 @@ impl ErrorData {
 /// Represents any JSON-RPC message that can be sent or received.
 ///
 /// This enum covers all possible message types in the JSON-RPC protocol:
-/// individual requests/responses, notifications, batch operations, and errors.
+/// individual requests/responses, notifications, and errors.
 /// It serves as the top-level message container for MCP communication.
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
 #[serde(untagged)]
@@ -686,6 +686,8 @@ impl Default for ClientInfo {
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct Implementation {
     pub name: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
     pub version: String,
 }
 
@@ -699,6 +701,7 @@ impl Implementation {
     pub fn from_build_env() -> Self {
         Implementation {
             name: env!("CARGO_CRATE_NAME").to_owned(),
+            title: None,
             version: env!("CARGO_PKG_VERSION").to_owned(),
         }
     }
@@ -1104,6 +1107,8 @@ pub struct ResourceReference {
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct PromptReference {
     pub name: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
 }
 
 const_string!(CompleteRequestMethod = "completion/complete");
@@ -1441,6 +1446,7 @@ macro_rules! ts_union {
         export type $U: ident =
             $(|)?$($V: ident)|*;
     ) => {
+        #[allow(clippy::large_enum_variant)]
         #[derive(Debug, Serialize, Deserialize, Clone)]
         #[serde(untagged)]
         #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]

crates/rmcp/src/model/content.rs

@@ -59,7 +59,7 @@ pub enum RawContent {
     Text(RawTextContent),
     Image(RawImageContent),
     Resource(RawEmbeddedResource),
-    Audio(AudioContent),
+    Audio(RawAudioContent),
     ResourceLink(super::resource::RawResource),
 }
 
@@ -241,6 +241,7 @@ mod tests {
         let resource_link = RawContent::ResourceLink(RawResource {
             uri: "file:///test.txt".to_string(),
             name: "test.txt".to_string(),
+            title: None,
             description: Some("A test file".to_string()),
             mime_type: Some("text/plain".to_string()),
             size: Some(100),

crates/rmcp/src/model/meta.rs

@@ -1,13 +1,22 @@
-use std::ops::{Deref, DerefMut};
+use std::{
+    borrow::Cow,
+    collections::HashMap,
+    ops::{Deref, DerefMut, Range},
+};
 
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
 use super::{
-    ClientNotification, ClientRequest, Extensions, JsonObject, JsonRpcMessage, NumberOrString,
-    ProgressToken, ServerNotification, ServerRequest,
+    ClientNotification, ClientRequest, Extensions, JsonRpcMessage, NumberOrString, ProgressToken,
+    ServerNotification, ServerRequest,
 };
 
+pub struct MetaKey {
+    pub raw: Cow<'static, [u8]>,
+    pub prefix: Range<usize>,
+}
+
 pub trait GetMeta {
     fn get_meta_mut(&mut self) -> &mut Meta;
     fn get_meta(&self) -> &Meta;
@@ -101,11 +110,11 @@ variant_extension! {
 #[derive(Debug, Serialize, Deserialize, Clone, Default, PartialEq)]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[serde(transparent)]
-pub struct Meta(pub JsonObject);
+pub struct Meta(pub HashMap<String, Value>);
 const PROGRESS_TOKEN_FIELD: &str = "progressToken";
 impl Meta {
     pub fn new() -> Self {
-        Self(JsonObject::new())
+        Self(HashMap::new())
     }
 
     pub(crate) fn static_empty() -> &'static Self {
@@ -143,7 +152,7 @@ impl Meta {
 }
 
 impl Deref for Meta {
-    type Target = JsonObject;
+    type Target = HashMap<String, Value>;
 
     fn deref(&self) -> &Self::Target {
         &self.0

crates/rmcp/src/model/prompt.rs

@@ -14,6 +14,8 @@ use super::{
 pub struct Prompt {
     /// The name of the prompt
     pub name: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
     /// Optional description of what the prompt does
     #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
@@ -35,6 +37,7 @@ impl Prompt {
     {
         Prompt {
             name: name.into(),
+            title: None,
             description: description.map(Into::into),
             arguments,
         }
@@ -47,6 +50,9 @@ impl Prompt {
 pub struct PromptArgument {
     /// The name of the argument
     pub name: String,
+    /// A human-readable title for the argument
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
     /// A description of what the argument is used for
     #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,

crates/rmcp/src/model/resource.rs

@@ -11,6 +11,9 @@ pub struct RawResource {
     pub uri: String,
     /// Name of the resource
     pub name: String,
+    /// Human-readable title of the resource
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
     /// Optional description of the resource
     #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
@@ -34,6 +37,8 @@ pub struct RawResourceTemplate {
     pub uri_template: String,
     pub name: String,
     #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub mime_type: Option<String>,
@@ -82,6 +87,7 @@ impl RawResource {
         Self {
             uri: uri.into(),
             name: name.into(),
+            title: None,
             description: None,
             mime_type: None,
             size: None,
@@ -99,6 +105,7 @@ mod tests {
     fn test_resource_serialization() {
         let resource = RawResource {
             uri: "file:///test.txt".to_string(),
+            title: None,
             name: "test".to_string(),
             description: Some("Test resource".to_string()),
             mime_type: Some("text/plain".to_string()),

crates/rmcp/src/model/tool.rs

@@ -15,6 +15,9 @@ use super::JsonObject;
 pub struct Tool {
     /// The name of the tool
     pub name: Cow<'static, str>,
+    /// A human-readable title for the tool
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
     /// A description of what the tool does
     #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<Cow<'static, str>>,
@@ -138,6 +141,7 @@ impl Tool {
     {
         Tool {
             name: name.into(),
+            title: None,
             description: Some(description.into()),
             input_schema: input_schema.into(),
             output_schema: None,

crates/rmcp/tests/test_elicitation.rs

@@ -892,6 +892,7 @@ async fn test_initialize_request_with_elicitation() {
         client_info: Implementation {
             name: "test-client".to_string(),
             version: "1.0.0".to_string(),
+            title: None,
         },
     };
 
@@ -933,6 +934,7 @@ async fn test_capability_checking_logic() {
         client_info: Implementation {
             name: "test-client".to_string(),
             version: "1.0.0".to_string(),
+            title: None,
         },
     };
 
@@ -950,6 +952,7 @@ async fn test_capability_checking_logic() {
         client_info: Implementation {
             name: "test-client".to_string(),
             version: "1.0.0".to_string(),
+            title: None,
         },
     };