Added _meta field to prompts, resources and paginated results#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jokemanfire merged 1 commit into from
Dec 4, 2025
Merged

Added _meta field to prompts, resources and paginated results #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions crates/rmcp-macros/src/prompt.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,8 @@ pub struct PromptAttribute {
pub arguments: Option<Expr>,
/// Optional icons for the prompt
pub icons: Option<Expr>,
/// Optional metadata for the prompt
pub meta: Option<Expr>,
}

pub struct ResolvedPromptAttribute {
Expand All@@ -26,6 +28,7 @@ pub struct ResolvedPromptAttribute {
pub description: Option<Expr>,
pub arguments: Expr,
pub icons: Option<Expr>,
pub meta: Option<Expr>,
}

impl ResolvedPromptAttribute {
Expand All@@ -36,6 +39,7 @@ impl ResolvedPromptAttribute {
arguments,
title,
icons,
meta,
} = self;
let description = if let Some(description) = description {
quote! { Some(#description.into()) }
Expand All@@ -52,6 +56,11 @@ impl ResolvedPromptAttribute {
} else {
quote! { None }
};
let meta = if let Some(meta) = meta {
quote! { Some(#meta) }
} else {
quote! { None }
};
let tokens = quote! {
pub fn #fn_ident() -> rmcp::model::Prompt {
rmcp::model::Prompt {
Expand All@@ -60,6 +69,7 @@ impl ResolvedPromptAttribute {
arguments: #arguments,
title: #title,
icons: #icons,
meta: #meta,
}
}
};
Expand DownExpand Up@@ -114,6 +124,7 @@ pub fn prompt(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream>
arguments: arguments.clone(),
title: attribute.title,
icons: attribute.icons,
meta: attribute.meta,
};
let prompt_attr_fn = resolved_prompt_attr.into_fn(prompt_attr_fn_ident.clone())?;

Expand Down
8 changes: 8 additions & 0 deletions crates/rmcp-macros/src/prompt_handler.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl, parse_quote};
#[darling(default)]
pub struct PromptHandlerAttribute {
pub router: Option<Expr>,
pub meta: Option<Expr>,
}

pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
Expand DownExpand Up@@ -40,6 +41,12 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
}
};

let meta = if let Some(meta) = attribute.meta {
quote! { Some(#meta) }
} else {
quote! { None }
};

// Add list_prompts implementation
let list_prompts_impl: ImplItem = parse_quote! {
async fn list_prompts(
Expand All@@ -50,6 +57,7 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
let prompts = #router_expr.list_all();
Ok(ListPromptsResult {
prompts,
meta: #meta,
next_cursor: None,
})
}
Expand Down
17 changes: 15 additions & 2 deletions crates/rmcp-macros/src/tool_handler.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl};
#[darling(default)]
pub struct ToolHandlerAttribute {
pub router: Expr,
pub meta: Option<Expr>,
}

impl Default for ToolHandlerAttribute {
Expand All@@ -16,13 +17,14 @@ impl Default for ToolHandlerAttribute {
self.tool_router
})
.unwrap(),
meta: None,
}
}
}

pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
let attr_args = NestedMeta::parse_meta_list(attr)?;
let ToolHandlerAttribute { router } = ToolHandlerAttribute::from_list(&attr_args)?;
let ToolHandlerAttribute { router, meta } = ToolHandlerAttribute::from_list(&attr_args)?;
let mut item_impl = syn::parse2::<ItemImpl>(input.clone())?;
let tool_call_fn = quote! {
async fn call_tool(
Expand All@@ -34,13 +36,24 @@ pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
#router.call(tcc).await
}
};

let result_meta = if let Some(meta) = meta {
quote! { Some(#meta) }
} else {
quote! { None }
};

let tool_list_fn = quote! {
async fn list_tools(
&self,
_request: Option<rmcp::model::PaginatedRequestParam>,
_context: rmcp::service::RequestContext<rmcp::RoleServer>,
) -> Result<rmcp::model::ListToolsResult, rmcp::ErrorData> {
Ok(rmcp::model::ListToolsResult::with_all_items(#router.list_all()))
Ok(rmcp::model::ListToolsResult{
tools: #router.list_all(),
meta: #result_meta,
next_cursor: None,
})
}
};
let tool_call_fn = syn::parse2::<ImplItem>(tool_call_fn)?;
Expand Down
4 changes: 2 additions & 2 deletions crates/rmcp/src/handler/server/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ where
let tools = self.tool_router.list_all();
Ok(ServerResult::ListToolsResult(ListToolsResult {
tools,
next_cursor: None,
..Default::default()
}))
}
ClientRequest::GetPromptRequest(request) => {
Expand All@@ -125,7 +125,7 @@ where
let prompts = self.prompt_router.list_all();
Ok(ServerResult::ListPromptsResult(ListPromptsResult {
prompts,
next_cursor: None,
..Default::default()
}))
}
rest => self.service.handle_request(rest, context).await,
Expand Down
3 changes: 3 additions & 0 deletions crates/rmcp/src/model.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -828,6 +828,8 @@ macro_rules! paginated_result {
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
pub struct $t {
#[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
Comment on lines +831 to +832

CopilotAINov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Field ordering inconsistency: The meta field is placed first in paginated result structs, but in entity structs like Tool, Resource, and Prompt, the meta field is placed last (after icons). For consistency, consider placing meta last in this macro as well, after next_cursor and the items field. This would match the convention used in other structs throughout the codebase.

Copilot uses AI. Check for mistakes.
#[serde(skip_serializing_if = "Option::is_none")]
pub next_cursor: Option<Cursor>,
pub $i_item: $t_item,
Expand All@@ -838,6 +840,7 @@ macro_rules! paginated_result {
items: $t_item,
) -> Self {
Self {
meta: None,
next_cursor: None,
$i_item: items,
}
Expand Down
1 change: 1 addition & 0 deletions crates/rmcp/src/model/content.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ mod tests {
mime_type: Some("text/plain".to_string()),
size: Some(100),
icons: None,
meta: None,
});

let json = serde_json::to_string(&resource_link).unwrap();
Expand Down
6 changes: 5 additions & 1 deletion crates/rmcp/src/model/prompt.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use base64::engine::{Engine, general_purpose::STANDARD as BASE64_STANDARD};
use serde::{Deserialize, Serialize};

use super::{
AnnotateAble, Annotations, Icon, RawEmbeddedResource, RawImageContent,
AnnotateAble, Annotations, Icon, Meta, RawEmbeddedResource, RawImageContent,
content::{EmbeddedResource, ImageContent},
resource::ResourceContents,
};
Expand All@@ -25,6 +25,9 @@ pub struct Prompt {
/// Optional list of icons for the prompt
#[serde(skip_serializing_if = "Option::is_none")]
pub icons: Option<Vec<Icon>>,
/// Optional additional metadata for this prompt
#[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
}

impl Prompt {
Expand All@@ -44,6 +47,7 @@ impl Prompt {
description: description.map(Into::into),
arguments,
icons: None,
meta: None,
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions crates/rmcp/src/model/resource.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ pub struct RawResource {
/// Optional list of icons for the resource
#[serde(skip_serializing_if = "Option::is_none")]
pub icons: Option<Vec<Icon>>,
/// Optional additional metadata for this resource
#[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>,
}

pub type Resource = Annotated<RawResource>;
Expand DownExpand Up@@ -95,6 +98,7 @@ impl RawResource {
mime_type: None,
size: None,
icons: None,
meta: None,
}
}
}
Expand All@@ -115,6 +119,7 @@ mod tests {
mime_type: Some("text/plain".to_string()),
size: Some(100),
icons: None,
meta: None,
};

let json = serde_json::to_string(&resource).unwrap();
Expand Down
8 changes: 8 additions & 0 deletions crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
"description": "Represents a resource in the extension with metadata",
"type": "object",
"properties": {
"_meta": {
"description": "Optional additional metadata for this resource",
"type": [
"object",
"null"
],
"additionalProperties": true
},
"description": {
"description": "Optional description of the resource",
"type": [
Expand Down
8 changes: 8 additions & 0 deletions crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema_current.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
"description": "Represents a resource in the extension with metadata",
"type": "object",
"properties": {
"_meta": {
"description": "Optional additional metadata for this resource",
"type": [
"object",
"null"
],
"additionalProperties": true
},
"description": {
"description": "Optional description of the resource",
"type": [
Expand Down
60 changes: 60 additions & 0 deletions crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,14 @@
"description": "Represents a resource in the extension with metadata",
"type": "object",
"properties": {
"_meta": {
"description": "Optional additional metadata for this resource",
"type": [
"object",
"null"
],
"additionalProperties": true
},
"annotations": {
"anyOf": [
{
Expand DownExpand Up@@ -1031,6 +1039,13 @@
"ListPromptsResult": {
"type": "object",
"properties": {
"_meta": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"nextCursor": {
"type": [
"string",
Expand All@@ -1051,6 +1066,13 @@
"ListResourceTemplatesResult": {
"type": "object",
"properties": {
"_meta": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"nextCursor": {
"type": [
"string",
Expand All@@ -1071,6 +1093,13 @@
"ListResourcesResult": {
"type": "object",
"properties": {
"_meta": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"nextCursor": {
"type": [
"string",
Expand All@@ -1096,6 +1125,13 @@
"ListToolsResult": {
"type": "object",
"properties": {
"_meta": {
"type": [
"object",
"null"
],
"additionalProperties": true
},
"nextCursor": {
"type": [
"string",
Expand DownExpand Up@@ -1472,6 +1508,14 @@
"description": "A prompt that can be used to generate text from a model",
"type": "object",
"properties": {
"_meta": {
"description": "Optional additional metadata for this prompt",
"type": [
"object",
"null"
],
"additionalProperties": true
},
"arguments": {
"description": "Optional arguments that can be passed to customize the prompt",
"type": [
Expand DownExpand Up@@ -1660,6 +1704,14 @@
"description": "A link to a resource that can be fetched separately",
"type": "object",
"properties": {
"_meta": {
"description": "Optional additional metadata for this resource",
"type": [
"object",
"null"
],
"additionalProperties": true
},
"annotations": {
"anyOf": [
{
Expand DownExpand Up@@ -1816,6 +1868,14 @@
"description": "Represents a resource in the extension with metadata",
"type": "object",
"properties": {
"_meta": {
"description": "Optional additional metadata for this resource",
"type": [
"object",
"null"
],
"additionalProperties": true
},
"description": {
"description": "Optional description of the resource",
"type": [
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Added _meta field to prompts, resources and paginated results#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jokemanfire
merged 1 commit into

from

Dec 4, 2025
 Merged


Added _meta field to prompts, resources and paginated results
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
crates/rmcp-macros/src/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,8 @@ pub struct PromptAttribute {
 pub arguments: Option<Expr>,
 /// Optional icons for the prompt
 pub icons: Option<Expr>,
 /// Optional metadata for the prompt
 pub meta: Option<Expr>,
}

pub struct ResolvedPromptAttribute {
Expand All@@ -26,6 +28,7 @@ pub struct ResolvedPromptAttribute {
 pub description: Option<Expr>,
 pub arguments: Expr,
 pub icons: Option<Expr>,
 pub meta: Option<Expr>,
}

impl ResolvedPromptAttribute {
Expand All@@ -36,6 +39,7 @@ impl ResolvedPromptAttribute {
 arguments,
 title,
 icons,
 meta,
 } = self;
 let description = if let Some(description) = description {
 quote! { Some(#description.into()) }
Expand All@@ -52,6 +56,11 @@ impl ResolvedPromptAttribute {
 } else {
 quote! { None }
 };
 let meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };
 let tokens = quote! {
 pub fn #fn_ident() -> rmcp::model::Prompt {
 rmcp::model::Prompt {
Expand All@@ -60,6 +69,7 @@ impl ResolvedPromptAttribute {
 arguments: #arguments,
 title: #title,
 icons: #icons,
 meta: #meta,
 }
 }
 };
Expand DownExpand Up@@ -114,6 +124,7 @@ pub fn prompt(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream>
 arguments: arguments.clone(),
 title: attribute.title,
 icons: attribute.icons,
 meta: attribute.meta,
 };
 let prompt_attr_fn = resolved_prompt_attr.into_fn(prompt_attr_fn_ident.clone())?;

Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp-macros/src/prompt_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl, parse_quote};
#[darling(default)]
pub struct PromptHandlerAttribute {
 pub router: Option<Expr>,
 pub meta: Option<Expr>,
}

pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
Expand DownExpand Up@@ -40,6 +41,12 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 }
 };

 let meta = if let Some(meta) = attribute.meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 // Add list_prompts implementation
 let list_prompts_impl: ImplItem = parse_quote! {
 async fn list_prompts(
Expand All@@ -50,6 +57,7 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 let prompts = #router_expr.list_all();
 Ok(ListPromptsResult {
 prompts,
 meta: #meta,
 next_cursor: None,
 })
 }
Expand Down

17 changes: 15 additions & 2 deletions
crates/rmcp-macros/src/tool_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl};
#[darling(default)]
pub struct ToolHandlerAttribute {
 pub router: Expr,
 pub meta: Option<Expr>,
}

impl Default for ToolHandlerAttribute {
Expand All@@ -16,13 +17,14 @@ impl Default for ToolHandlerAttribute {
 self.tool_router
 })
 .unwrap(),
 meta: None,
 }
 }
}

pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
 let attr_args = NestedMeta::parse_meta_list(attr)?;
 let ToolHandlerAttribute { router } = ToolHandlerAttribute::from_list(&attr_args)?;
 let ToolHandlerAttribute { router, meta } = ToolHandlerAttribute::from_list(&attr_args)?;
 let mut item_impl = syn::parse2::<ItemImpl>(input.clone())?;
 let tool_call_fn = quote! {
 async fn call_tool(
Expand All@@ -34,13 +36,24 @@ pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 #router.call(tcc).await
 }
 };

 let result_meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 let tool_list_fn = quote! {
 async fn list_tools(
 &self,
 _request: Option<rmcp::model::PaginatedRequestParam>,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::ListToolsResult, rmcp::ErrorData> {
 Ok(rmcp::model::ListToolsResult::with_all_items(#router.list_all()))
 Ok(rmcp::model::ListToolsResult{
 tools: #router.list_all(),
 meta: #result_meta,
 next_cursor: None,
 })
 }
 };
 let tool_call_fn = syn::parse2::<ImplItem>(tool_call_fn)?;
Expand Down

4 changes: 2 additions & 2 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ where
 let tools = self.tool_router.list_all();
 Ok(ServerResult::ListToolsResult(ListToolsResult {
 tools,
next_cursor: None,
..Default::default()
 }))
 }
 ClientRequest::GetPromptRequest(request) => {
Expand All@@ -125,7 +125,7 @@ where
 let prompts = self.prompt_router.list_all();
 Ok(ServerResult::ListPromptsResult(ListPromptsResult {
 prompts,
next_cursor: None,
..Default::default()
 }))
 }
 rest => self.service.handle_request(rest, context).await,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -828,6 +828,8 @@ macro_rules! paginated_result {
 #[serde(rename_all = "camelCase")]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct $t {
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,

Comment on lines

+831
 to 
+832

CopilotAINov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Field ordering inconsistency: The meta field is placed first in paginated result structs, but in entity structs like Tool, Resource, and Prompt, the meta field is placed last (after icons). For consistency, consider placing meta last in this macro as well, after next_cursor and the items field. This would match the convention used in other structs throughout the codebase.
Copilot uses AI. Check for mistakes.

 #[serde(skip_serializing_if = "Option::is_none")]
 pub next_cursor: Option<Cursor>,
 pub $i_item: $t_item,
Expand All@@ -838,6 +840,7 @@ macro_rules! paginated_result {
 items: $t_item,
 ) -> Self {
 Self {
 meta: None,
 next_cursor: None,
 $i_item: items,
 }
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 });

 let json = serde_json::to_string(&resource_link).unwrap();
Expand Down

6 changes: 5 additions & 1 deletion
crates/rmcp/src/model/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use base64::engine::{Engine, general_purpose::STANDARD as BASE64_STANDARD};
use serde::{Deserialize, Serialize};

use super::{
 AnnotateAble, Annotations, Icon, RawEmbeddedResource, RawImageContent,
 AnnotateAble, Annotations, Icon, Meta, RawEmbeddedResource, RawImageContent,
 content::{EmbeddedResource, ImageContent},
 resource::ResourceContents,
};
Expand All@@ -25,6 +25,9 @@ pub struct Prompt {
 /// Optional list of icons for the prompt
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this prompt
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

impl Prompt {
Expand All@@ -44,6 +47,7 @@ impl Prompt {
 description: description.map(Into::into),
 arguments,
 icons: None,
 meta: None,
 }
 }
}
Expand Down

5 changes: 5 additions & 0 deletions
crates/rmcp/src/model/resource.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ pub struct RawResource {
 /// Optional list of icons for the resource
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this resource
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

pub type Resource = Annotated<RawResource>;
Expand DownExpand Up@@ -95,6 +98,7 @@ impl RawResource {
 mime_type: None,
 size: None,
 icons: None,
 meta: None,
 }
 }
}
Expand All@@ -115,6 +119,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 };

 let json = serde_json::to_string(&resource).unwrap();
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema_current.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

60 changes: 60 additions & 0 deletions
crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1031,6 +1039,13 @@
 "ListPromptsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1051,6 +1066,13 @@
 "ListResourceTemplatesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1071,6 +1093,13 @@
 "ListResourcesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1096,6 +1125,13 @@
 "ListToolsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand DownExpand Up@@ -1472,6 +1508,14 @@
 "description": "A prompt that can be used to generate text from a model",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this prompt",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "arguments": {
 "description": "Optional arguments that can be passed to customize the prompt",
 "type": [
Expand DownExpand Up@@ -1660,6 +1704,14 @@
 "description": "A link to a resource that can be fetched separately",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1816,6 +1868,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added _meta field to prompts, resources and paginated results#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jokemanfire
merged 1 commit into

from

Dec 4, 2025
 Merged


Added _meta field to prompts, resources and paginated results
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
crates/rmcp-macros/src/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,8 @@ pub struct PromptAttribute {
 pub arguments: Option<Expr>,
 /// Optional icons for the prompt
 pub icons: Option<Expr>,
 /// Optional metadata for the prompt
 pub meta: Option<Expr>,
}

pub struct ResolvedPromptAttribute {
Expand All@@ -26,6 +28,7 @@ pub struct ResolvedPromptAttribute {
 pub description: Option<Expr>,
 pub arguments: Expr,
 pub icons: Option<Expr>,
 pub meta: Option<Expr>,
}

impl ResolvedPromptAttribute {
Expand All@@ -36,6 +39,7 @@ impl ResolvedPromptAttribute {
 arguments,
 title,
 icons,
 meta,
 } = self;
 let description = if let Some(description) = description {
 quote! { Some(#description.into()) }
Expand All@@ -52,6 +56,11 @@ impl ResolvedPromptAttribute {
 } else {
 quote! { None }
 };
 let meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };
 let tokens = quote! {
 pub fn #fn_ident() -> rmcp::model::Prompt {
 rmcp::model::Prompt {
Expand All@@ -60,6 +69,7 @@ impl ResolvedPromptAttribute {
 arguments: #arguments,
 title: #title,
 icons: #icons,
 meta: #meta,
 }
 }
 };
Expand DownExpand Up@@ -114,6 +124,7 @@ pub fn prompt(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream>
 arguments: arguments.clone(),
 title: attribute.title,
 icons: attribute.icons,
 meta: attribute.meta,
 };
 let prompt_attr_fn = resolved_prompt_attr.into_fn(prompt_attr_fn_ident.clone())?;

Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp-macros/src/prompt_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl, parse_quote};
#[darling(default)]
pub struct PromptHandlerAttribute {
 pub router: Option<Expr>,
 pub meta: Option<Expr>,
}

pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
Expand DownExpand Up@@ -40,6 +41,12 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 }
 };

 let meta = if let Some(meta) = attribute.meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 // Add list_prompts implementation
 let list_prompts_impl: ImplItem = parse_quote! {
 async fn list_prompts(
Expand All@@ -50,6 +57,7 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 let prompts = #router_expr.list_all();
 Ok(ListPromptsResult {
 prompts,
 meta: #meta,
 next_cursor: None,
 })
 }
Expand Down

17 changes: 15 additions & 2 deletions
crates/rmcp-macros/src/tool_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl};
#[darling(default)]
pub struct ToolHandlerAttribute {
 pub router: Expr,
 pub meta: Option<Expr>,
}

impl Default for ToolHandlerAttribute {
Expand All@@ -16,13 +17,14 @@ impl Default for ToolHandlerAttribute {
 self.tool_router
 })
 .unwrap(),
 meta: None,
 }
 }
}

pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
 let attr_args = NestedMeta::parse_meta_list(attr)?;
 let ToolHandlerAttribute { router } = ToolHandlerAttribute::from_list(&attr_args)?;
 let ToolHandlerAttribute { router, meta } = ToolHandlerAttribute::from_list(&attr_args)?;
 let mut item_impl = syn::parse2::<ItemImpl>(input.clone())?;
 let tool_call_fn = quote! {
 async fn call_tool(
Expand All@@ -34,13 +36,24 @@ pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 #router.call(tcc).await
 }
 };

 let result_meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 let tool_list_fn = quote! {
 async fn list_tools(
 &self,
 _request: Option<rmcp::model::PaginatedRequestParam>,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::ListToolsResult, rmcp::ErrorData> {
 Ok(rmcp::model::ListToolsResult::with_all_items(#router.list_all()))
 Ok(rmcp::model::ListToolsResult{
 tools: #router.list_all(),
 meta: #result_meta,
 next_cursor: None,
 })
 }
 };
 let tool_call_fn = syn::parse2::<ImplItem>(tool_call_fn)?;
Expand Down

4 changes: 2 additions & 2 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ where
 let tools = self.tool_router.list_all();
 Ok(ServerResult::ListToolsResult(ListToolsResult {
 tools,
next_cursor: None,
..Default::default()
 }))
 }
 ClientRequest::GetPromptRequest(request) => {
Expand All@@ -125,7 +125,7 @@ where
 let prompts = self.prompt_router.list_all();
 Ok(ServerResult::ListPromptsResult(ListPromptsResult {
 prompts,
next_cursor: None,
..Default::default()
 }))
 }
 rest => self.service.handle_request(rest, context).await,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -828,6 +828,8 @@ macro_rules! paginated_result {
 #[serde(rename_all = "camelCase")]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct $t {
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,

Comment on lines

+831
 to 
+832

CopilotAINov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Field ordering inconsistency: The meta field is placed first in paginated result structs, but in entity structs like Tool, Resource, and Prompt, the meta field is placed last (after icons). For consistency, consider placing meta last in this macro as well, after next_cursor and the items field. This would match the convention used in other structs throughout the codebase.
Copilot uses AI. Check for mistakes.

 #[serde(skip_serializing_if = "Option::is_none")]
 pub next_cursor: Option<Cursor>,
 pub $i_item: $t_item,
Expand All@@ -838,6 +840,7 @@ macro_rules! paginated_result {
 items: $t_item,
 ) -> Self {
 Self {
 meta: None,
 next_cursor: None,
 $i_item: items,
 }
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 });

 let json = serde_json::to_string(&resource_link).unwrap();
Expand Down

6 changes: 5 additions & 1 deletion
crates/rmcp/src/model/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use base64::engine::{Engine, general_purpose::STANDARD as BASE64_STANDARD};
use serde::{Deserialize, Serialize};

use super::{
 AnnotateAble, Annotations, Icon, RawEmbeddedResource, RawImageContent,
 AnnotateAble, Annotations, Icon, Meta, RawEmbeddedResource, RawImageContent,
 content::{EmbeddedResource, ImageContent},
 resource::ResourceContents,
};
Expand All@@ -25,6 +25,9 @@ pub struct Prompt {
 /// Optional list of icons for the prompt
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this prompt
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

impl Prompt {
Expand All@@ -44,6 +47,7 @@ impl Prompt {
 description: description.map(Into::into),
 arguments,
 icons: None,
 meta: None,
 }
 }
}
Expand Down

5 changes: 5 additions & 0 deletions
crates/rmcp/src/model/resource.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ pub struct RawResource {
 /// Optional list of icons for the resource
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this resource
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

pub type Resource = Annotated<RawResource>;
Expand DownExpand Up@@ -95,6 +98,7 @@ impl RawResource {
 mime_type: None,
 size: None,
 icons: None,
 meta: None,
 }
 }
}
Expand All@@ -115,6 +119,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 };

 let json = serde_json::to_string(&resource).unwrap();
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema_current.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

60 changes: 60 additions & 0 deletions
crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1031,6 +1039,13 @@
 "ListPromptsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1051,6 +1066,13 @@
 "ListResourceTemplatesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1071,6 +1093,13 @@
 "ListResourcesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1096,6 +1125,13 @@
 "ListToolsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand DownExpand Up@@ -1472,6 +1508,14 @@
 "description": "A prompt that can be used to generate text from a model",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this prompt",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "arguments": {
 "description": "Optional arguments that can be passed to customize the prompt",
 "type": [
Expand DownExpand Up@@ -1660,6 +1704,14 @@
 "description": "A link to a resource that can be fetched separately",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1816,6 +1868,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added _meta field to prompts, resources and paginated results#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jokemanfire
merged 1 commit into

from

Dec 4, 2025
 Merged


Added _meta field to prompts, resources and paginated results
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
crates/rmcp-macros/src/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,8 @@ pub struct PromptAttribute {
 pub arguments: Option<Expr>,
 /// Optional icons for the prompt
 pub icons: Option<Expr>,
 /// Optional metadata for the prompt
 pub meta: Option<Expr>,
}

pub struct ResolvedPromptAttribute {
Expand All@@ -26,6 +28,7 @@ pub struct ResolvedPromptAttribute {
 pub description: Option<Expr>,
 pub arguments: Expr,
 pub icons: Option<Expr>,
 pub meta: Option<Expr>,
}

impl ResolvedPromptAttribute {
Expand All@@ -36,6 +39,7 @@ impl ResolvedPromptAttribute {
 arguments,
 title,
 icons,
 meta,
 } = self;
 let description = if let Some(description) = description {
 quote! { Some(#description.into()) }
Expand All@@ -52,6 +56,11 @@ impl ResolvedPromptAttribute {
 } else {
 quote! { None }
 };
 let meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };
 let tokens = quote! {
 pub fn #fn_ident() -> rmcp::model::Prompt {
 rmcp::model::Prompt {
Expand All@@ -60,6 +69,7 @@ impl ResolvedPromptAttribute {
 arguments: #arguments,
 title: #title,
 icons: #icons,
 meta: #meta,
 }
 }
 };
Expand DownExpand Up@@ -114,6 +124,7 @@ pub fn prompt(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream>
 arguments: arguments.clone(),
 title: attribute.title,
 icons: attribute.icons,
 meta: attribute.meta,
 };
 let prompt_attr_fn = resolved_prompt_attr.into_fn(prompt_attr_fn_ident.clone())?;

Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp-macros/src/prompt_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl, parse_quote};
#[darling(default)]
pub struct PromptHandlerAttribute {
 pub router: Option<Expr>,
 pub meta: Option<Expr>,
}

pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
Expand DownExpand Up@@ -40,6 +41,12 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 }
 };

 let meta = if let Some(meta) = attribute.meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 // Add list_prompts implementation
 let list_prompts_impl: ImplItem = parse_quote! {
 async fn list_prompts(
Expand All@@ -50,6 +57,7 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 let prompts = #router_expr.list_all();
 Ok(ListPromptsResult {
 prompts,
 meta: #meta,
 next_cursor: None,
 })
 }
Expand Down

17 changes: 15 additions & 2 deletions
crates/rmcp-macros/src/tool_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl};
#[darling(default)]
pub struct ToolHandlerAttribute {
 pub router: Expr,
 pub meta: Option<Expr>,
}

impl Default for ToolHandlerAttribute {
Expand All@@ -16,13 +17,14 @@ impl Default for ToolHandlerAttribute {
 self.tool_router
 })
 .unwrap(),
 meta: None,
 }
 }
}

pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
 let attr_args = NestedMeta::parse_meta_list(attr)?;
 let ToolHandlerAttribute { router } = ToolHandlerAttribute::from_list(&attr_args)?;
 let ToolHandlerAttribute { router, meta } = ToolHandlerAttribute::from_list(&attr_args)?;
 let mut item_impl = syn::parse2::<ItemImpl>(input.clone())?;
 let tool_call_fn = quote! {
 async fn call_tool(
Expand All@@ -34,13 +36,24 @@ pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 #router.call(tcc).await
 }
 };

 let result_meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 let tool_list_fn = quote! {
 async fn list_tools(
 &self,
 _request: Option<rmcp::model::PaginatedRequestParam>,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::ListToolsResult, rmcp::ErrorData> {
 Ok(rmcp::model::ListToolsResult::with_all_items(#router.list_all()))
 Ok(rmcp::model::ListToolsResult{
 tools: #router.list_all(),
 meta: #result_meta,
 next_cursor: None,
 })
 }
 };
 let tool_call_fn = syn::parse2::<ImplItem>(tool_call_fn)?;
Expand Down

4 changes: 2 additions & 2 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ where
 let tools = self.tool_router.list_all();
 Ok(ServerResult::ListToolsResult(ListToolsResult {
 tools,
next_cursor: None,
..Default::default()
 }))
 }
 ClientRequest::GetPromptRequest(request) => {
Expand All@@ -125,7 +125,7 @@ where
 let prompts = self.prompt_router.list_all();
 Ok(ServerResult::ListPromptsResult(ListPromptsResult {
 prompts,
next_cursor: None,
..Default::default()
 }))
 }
 rest => self.service.handle_request(rest, context).await,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -828,6 +828,8 @@ macro_rules! paginated_result {
 #[serde(rename_all = "camelCase")]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct $t {
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,

Comment on lines

+831
 to 
+832

CopilotAINov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Field ordering inconsistency: The meta field is placed first in paginated result structs, but in entity structs like Tool, Resource, and Prompt, the meta field is placed last (after icons). For consistency, consider placing meta last in this macro as well, after next_cursor and the items field. This would match the convention used in other structs throughout the codebase.
Copilot uses AI. Check for mistakes.

 #[serde(skip_serializing_if = "Option::is_none")]
 pub next_cursor: Option<Cursor>,
 pub $i_item: $t_item,
Expand All@@ -838,6 +840,7 @@ macro_rules! paginated_result {
 items: $t_item,
 ) -> Self {
 Self {
 meta: None,
 next_cursor: None,
 $i_item: items,
 }
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 });

 let json = serde_json::to_string(&resource_link).unwrap();
Expand Down

6 changes: 5 additions & 1 deletion
crates/rmcp/src/model/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use base64::engine::{Engine, general_purpose::STANDARD as BASE64_STANDARD};
use serde::{Deserialize, Serialize};

use super::{
 AnnotateAble, Annotations, Icon, RawEmbeddedResource, RawImageContent,
 AnnotateAble, Annotations, Icon, Meta, RawEmbeddedResource, RawImageContent,
 content::{EmbeddedResource, ImageContent},
 resource::ResourceContents,
};
Expand All@@ -25,6 +25,9 @@ pub struct Prompt {
 /// Optional list of icons for the prompt
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this prompt
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

impl Prompt {
Expand All@@ -44,6 +47,7 @@ impl Prompt {
 description: description.map(Into::into),
 arguments,
 icons: None,
 meta: None,
 }
 }
}
Expand Down

5 changes: 5 additions & 0 deletions
crates/rmcp/src/model/resource.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ pub struct RawResource {
 /// Optional list of icons for the resource
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this resource
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

pub type Resource = Annotated<RawResource>;
Expand DownExpand Up@@ -95,6 +98,7 @@ impl RawResource {
 mime_type: None,
 size: None,
 icons: None,
 meta: None,
 }
 }
}
Expand All@@ -115,6 +119,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 };

 let json = serde_json::to_string(&resource).unwrap();
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema_current.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

60 changes: 60 additions & 0 deletions
crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1031,6 +1039,13 @@
 "ListPromptsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1051,6 +1066,13 @@
 "ListResourceTemplatesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1071,6 +1093,13 @@
 "ListResourcesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1096,6 +1125,13 @@
 "ListToolsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand DownExpand Up@@ -1472,6 +1508,14 @@
 "description": "A prompt that can be used to generate text from a model",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this prompt",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "arguments": {
 "description": "Optional arguments that can be passed to customize the prompt",
 "type": [
Expand DownExpand Up@@ -1660,6 +1704,14 @@
 "description": "A link to a resource that can be fetched separately",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1816,6 +1868,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Added _meta field to prompts, resources and paginated results#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jokemanfire
merged 1 commit into

from

Dec 4, 2025
 Merged


Added _meta field to prompts, resources and paginated results
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
crates/rmcp-macros/src/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,8 @@ pub struct PromptAttribute {
 pub arguments: Option<Expr>,
 /// Optional icons for the prompt
 pub icons: Option<Expr>,
 /// Optional metadata for the prompt
 pub meta: Option<Expr>,
}

pub struct ResolvedPromptAttribute {
Expand All@@ -26,6 +28,7 @@ pub struct ResolvedPromptAttribute {
 pub description: Option<Expr>,
 pub arguments: Expr,
 pub icons: Option<Expr>,
 pub meta: Option<Expr>,
}

impl ResolvedPromptAttribute {
Expand All@@ -36,6 +39,7 @@ impl ResolvedPromptAttribute {
 arguments,
 title,
 icons,
 meta,
 } = self;
 let description = if let Some(description) = description {
 quote! { Some(#description.into()) }
Expand All@@ -52,6 +56,11 @@ impl ResolvedPromptAttribute {
 } else {
 quote! { None }
 };
 let meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };
 let tokens = quote! {
 pub fn #fn_ident() -> rmcp::model::Prompt {
 rmcp::model::Prompt {
Expand All@@ -60,6 +69,7 @@ impl ResolvedPromptAttribute {
 arguments: #arguments,
 title: #title,
 icons: #icons,
 meta: #meta,
 }
 }
 };
Expand DownExpand Up@@ -114,6 +124,7 @@ pub fn prompt(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream>
 arguments: arguments.clone(),
 title: attribute.title,
 icons: attribute.icons,
 meta: attribute.meta,
 };
 let prompt_attr_fn = resolved_prompt_attr.into_fn(prompt_attr_fn_ident.clone())?;

Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp-macros/src/prompt_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl, parse_quote};
#[darling(default)]
pub struct PromptHandlerAttribute {
 pub router: Option<Expr>,
 pub meta: Option<Expr>,
}

pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
Expand DownExpand Up@@ -40,6 +41,12 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 }
 };

 let meta = if let Some(meta) = attribute.meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 // Add list_prompts implementation
 let list_prompts_impl: ImplItem = parse_quote! {
 async fn list_prompts(
Expand All@@ -50,6 +57,7 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 let prompts = #router_expr.list_all();
 Ok(ListPromptsResult {
 prompts,
 meta: #meta,
 next_cursor: None,
 })
 }
Expand Down

17 changes: 15 additions & 2 deletions
crates/rmcp-macros/src/tool_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl};
#[darling(default)]
pub struct ToolHandlerAttribute {
 pub router: Expr,
 pub meta: Option<Expr>,
}

impl Default for ToolHandlerAttribute {
Expand All@@ -16,13 +17,14 @@ impl Default for ToolHandlerAttribute {
 self.tool_router
 })
 .unwrap(),
 meta: None,
 }
 }
}

pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
 let attr_args = NestedMeta::parse_meta_list(attr)?;
 let ToolHandlerAttribute { router } = ToolHandlerAttribute::from_list(&attr_args)?;
 let ToolHandlerAttribute { router, meta } = ToolHandlerAttribute::from_list(&attr_args)?;
 let mut item_impl = syn::parse2::<ItemImpl>(input.clone())?;
 let tool_call_fn = quote! {
 async fn call_tool(
Expand All@@ -34,13 +36,24 @@ pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 #router.call(tcc).await
 }
 };

 let result_meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 let tool_list_fn = quote! {
 async fn list_tools(
 &self,
 _request: Option<rmcp::model::PaginatedRequestParam>,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::ListToolsResult, rmcp::ErrorData> {
 Ok(rmcp::model::ListToolsResult::with_all_items(#router.list_all()))
 Ok(rmcp::model::ListToolsResult{
 tools: #router.list_all(),
 meta: #result_meta,
 next_cursor: None,
 })
 }
 };
 let tool_call_fn = syn::parse2::<ImplItem>(tool_call_fn)?;
Expand Down

4 changes: 2 additions & 2 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ where
 let tools = self.tool_router.list_all();
 Ok(ServerResult::ListToolsResult(ListToolsResult {
 tools,
next_cursor: None,
..Default::default()
 }))
 }
 ClientRequest::GetPromptRequest(request) => {
Expand All@@ -125,7 +125,7 @@ where
 let prompts = self.prompt_router.list_all();
 Ok(ServerResult::ListPromptsResult(ListPromptsResult {
 prompts,
next_cursor: None,
..Default::default()
 }))
 }
 rest => self.service.handle_request(rest, context).await,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -828,6 +828,8 @@ macro_rules! paginated_result {
 #[serde(rename_all = "camelCase")]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct $t {
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,

Comment on lines

+831
 to 
+832

CopilotAINov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Field ordering inconsistency: The meta field is placed first in paginated result structs, but in entity structs like Tool, Resource, and Prompt, the meta field is placed last (after icons). For consistency, consider placing meta last in this macro as well, after next_cursor and the items field. This would match the convention used in other structs throughout the codebase.
Copilot uses AI. Check for mistakes.

 #[serde(skip_serializing_if = "Option::is_none")]
 pub next_cursor: Option<Cursor>,
 pub $i_item: $t_item,
Expand All@@ -838,6 +840,7 @@ macro_rules! paginated_result {
 items: $t_item,
 ) -> Self {
 Self {
 meta: None,
 next_cursor: None,
 $i_item: items,
 }
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 });

 let json = serde_json::to_string(&resource_link).unwrap();
Expand Down

6 changes: 5 additions & 1 deletion
crates/rmcp/src/model/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use base64::engine::{Engine, general_purpose::STANDARD as BASE64_STANDARD};
use serde::{Deserialize, Serialize};

use super::{
 AnnotateAble, Annotations, Icon, RawEmbeddedResource, RawImageContent,
 AnnotateAble, Annotations, Icon, Meta, RawEmbeddedResource, RawImageContent,
 content::{EmbeddedResource, ImageContent},
 resource::ResourceContents,
};
Expand All@@ -25,6 +25,9 @@ pub struct Prompt {
 /// Optional list of icons for the prompt
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this prompt
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

impl Prompt {
Expand All@@ -44,6 +47,7 @@ impl Prompt {
 description: description.map(Into::into),
 arguments,
 icons: None,
 meta: None,
 }
 }
}
Expand Down

5 changes: 5 additions & 0 deletions
crates/rmcp/src/model/resource.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ pub struct RawResource {
 /// Optional list of icons for the resource
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this resource
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

pub type Resource = Annotated<RawResource>;
Expand DownExpand Up@@ -95,6 +98,7 @@ impl RawResource {
 mime_type: None,
 size: None,
 icons: None,
 meta: None,
 }
 }
}
Expand All@@ -115,6 +119,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 };

 let json = serde_json::to_string(&resource).unwrap();
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema_current.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

60 changes: 60 additions & 0 deletions
crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1031,6 +1039,13 @@
 "ListPromptsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1051,6 +1066,13 @@
 "ListResourceTemplatesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1071,6 +1093,13 @@
 "ListResourcesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1096,6 +1125,13 @@
 "ListToolsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand DownExpand Up@@ -1472,6 +1508,14 @@
 "description": "A prompt that can be used to generate text from a model",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this prompt",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "arguments": {
 "description": "Optional arguments that can be passed to customize the prompt",
 "type": [
Expand DownExpand Up@@ -1660,6 +1704,14 @@
 "description": "A link to a resource that can be fetched separately",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1816,6 +1868,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added _meta field to prompts, resources and paginated results#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jokemanfire
merged 1 commit into

from

Dec 4, 2025
 Merged


Added _meta field to prompts, resources and paginated results
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
crates/rmcp-macros/src/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,8 @@ pub struct PromptAttribute {
 pub arguments: Option<Expr>,
 /// Optional icons for the prompt
 pub icons: Option<Expr>,
 /// Optional metadata for the prompt
 pub meta: Option<Expr>,
}

pub struct ResolvedPromptAttribute {
Expand All@@ -26,6 +28,7 @@ pub struct ResolvedPromptAttribute {
 pub description: Option<Expr>,
 pub arguments: Expr,
 pub icons: Option<Expr>,
 pub meta: Option<Expr>,
}

impl ResolvedPromptAttribute {
Expand All@@ -36,6 +39,7 @@ impl ResolvedPromptAttribute {
 arguments,
 title,
 icons,
 meta,
 } = self;
 let description = if let Some(description) = description {
 quote! { Some(#description.into()) }
Expand All@@ -52,6 +56,11 @@ impl ResolvedPromptAttribute {
 } else {
 quote! { None }
 };
 let meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };
 let tokens = quote! {
 pub fn #fn_ident() -> rmcp::model::Prompt {
 rmcp::model::Prompt {
Expand All@@ -60,6 +69,7 @@ impl ResolvedPromptAttribute {
 arguments: #arguments,
 title: #title,
 icons: #icons,
 meta: #meta,
 }
 }
 };
Expand DownExpand Up@@ -114,6 +124,7 @@ pub fn prompt(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream>
 arguments: arguments.clone(),
 title: attribute.title,
 icons: attribute.icons,
 meta: attribute.meta,
 };
 let prompt_attr_fn = resolved_prompt_attr.into_fn(prompt_attr_fn_ident.clone())?;

Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp-macros/src/prompt_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl, parse_quote};
#[darling(default)]
pub struct PromptHandlerAttribute {
 pub router: Option<Expr>,
 pub meta: Option<Expr>,
}

pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
Expand DownExpand Up@@ -40,6 +41,12 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 }
 };

 let meta = if let Some(meta) = attribute.meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 // Add list_prompts implementation
 let list_prompts_impl: ImplItem = parse_quote! {
 async fn list_prompts(
Expand All@@ -50,6 +57,7 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 let prompts = #router_expr.list_all();
 Ok(ListPromptsResult {
 prompts,
 meta: #meta,
 next_cursor: None,
 })
 }
Expand Down

17 changes: 15 additions & 2 deletions
crates/rmcp-macros/src/tool_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl};
#[darling(default)]
pub struct ToolHandlerAttribute {
 pub router: Expr,
 pub meta: Option<Expr>,
}

impl Default for ToolHandlerAttribute {
Expand All@@ -16,13 +17,14 @@ impl Default for ToolHandlerAttribute {
 self.tool_router
 })
 .unwrap(),
 meta: None,
 }
 }
}

pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
 let attr_args = NestedMeta::parse_meta_list(attr)?;
 let ToolHandlerAttribute { router } = ToolHandlerAttribute::from_list(&attr_args)?;
 let ToolHandlerAttribute { router, meta } = ToolHandlerAttribute::from_list(&attr_args)?;
 let mut item_impl = syn::parse2::<ItemImpl>(input.clone())?;
 let tool_call_fn = quote! {
 async fn call_tool(
Expand All@@ -34,13 +36,24 @@ pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 #router.call(tcc).await
 }
 };

 let result_meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 let tool_list_fn = quote! {
 async fn list_tools(
 &self,
 _request: Option<rmcp::model::PaginatedRequestParam>,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::ListToolsResult, rmcp::ErrorData> {
 Ok(rmcp::model::ListToolsResult::with_all_items(#router.list_all()))
 Ok(rmcp::model::ListToolsResult{
 tools: #router.list_all(),
 meta: #result_meta,
 next_cursor: None,
 })
 }
 };
 let tool_call_fn = syn::parse2::<ImplItem>(tool_call_fn)?;
Expand Down

4 changes: 2 additions & 2 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ where
 let tools = self.tool_router.list_all();
 Ok(ServerResult::ListToolsResult(ListToolsResult {
 tools,
next_cursor: None,
..Default::default()
 }))
 }
 ClientRequest::GetPromptRequest(request) => {
Expand All@@ -125,7 +125,7 @@ where
 let prompts = self.prompt_router.list_all();
 Ok(ServerResult::ListPromptsResult(ListPromptsResult {
 prompts,
next_cursor: None,
..Default::default()
 }))
 }
 rest => self.service.handle_request(rest, context).await,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -828,6 +828,8 @@ macro_rules! paginated_result {
 #[serde(rename_all = "camelCase")]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct $t {
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,

Comment on lines

+831
 to 
+832

CopilotAINov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Field ordering inconsistency: The meta field is placed first in paginated result structs, but in entity structs like Tool, Resource, and Prompt, the meta field is placed last (after icons). For consistency, consider placing meta last in this macro as well, after next_cursor and the items field. This would match the convention used in other structs throughout the codebase.
Copilot uses AI. Check for mistakes.

 #[serde(skip_serializing_if = "Option::is_none")]
 pub next_cursor: Option<Cursor>,
 pub $i_item: $t_item,
Expand All@@ -838,6 +840,7 @@ macro_rules! paginated_result {
 items: $t_item,
 ) -> Self {
 Self {
 meta: None,
 next_cursor: None,
 $i_item: items,
 }
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 });

 let json = serde_json::to_string(&resource_link).unwrap();
Expand Down

6 changes: 5 additions & 1 deletion
crates/rmcp/src/model/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use base64::engine::{Engine, general_purpose::STANDARD as BASE64_STANDARD};
use serde::{Deserialize, Serialize};

use super::{
 AnnotateAble, Annotations, Icon, RawEmbeddedResource, RawImageContent,
 AnnotateAble, Annotations, Icon, Meta, RawEmbeddedResource, RawImageContent,
 content::{EmbeddedResource, ImageContent},
 resource::ResourceContents,
};
Expand All@@ -25,6 +25,9 @@ pub struct Prompt {
 /// Optional list of icons for the prompt
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this prompt
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

impl Prompt {
Expand All@@ -44,6 +47,7 @@ impl Prompt {
 description: description.map(Into::into),
 arguments,
 icons: None,
 meta: None,
 }
 }
}
Expand Down

5 changes: 5 additions & 0 deletions
crates/rmcp/src/model/resource.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ pub struct RawResource {
 /// Optional list of icons for the resource
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this resource
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

pub type Resource = Annotated<RawResource>;
Expand DownExpand Up@@ -95,6 +98,7 @@ impl RawResource {
 mime_type: None,
 size: None,
 icons: None,
 meta: None,
 }
 }
}
Expand All@@ -115,6 +119,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 };

 let json = serde_json::to_string(&resource).unwrap();
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema_current.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

60 changes: 60 additions & 0 deletions
crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1031,6 +1039,13 @@
 "ListPromptsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1051,6 +1066,13 @@
 "ListResourceTemplatesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1071,6 +1093,13 @@
 "ListResourcesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1096,6 +1125,13 @@
 "ListToolsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand DownExpand Up@@ -1472,6 +1508,14 @@
 "description": "A prompt that can be used to generate text from a model",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this prompt",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "arguments": {
 "description": "Optional arguments that can be passed to customize the prompt",
 "type": [
Expand DownExpand Up@@ -1660,6 +1704,14 @@
 "description": "A link to a resource that can be fetched separately",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1816,6 +1868,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added _meta field to prompts, resources and paginated results#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jokemanfire
merged 1 commit into

from

Dec 4, 2025
 Merged


Added _meta field to prompts, resources and paginated results
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
crates/rmcp-macros/src/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,8 @@ pub struct PromptAttribute {
 pub arguments: Option<Expr>,
 /// Optional icons for the prompt
 pub icons: Option<Expr>,
 /// Optional metadata for the prompt
 pub meta: Option<Expr>,
}

pub struct ResolvedPromptAttribute {
Expand All@@ -26,6 +28,7 @@ pub struct ResolvedPromptAttribute {
 pub description: Option<Expr>,
 pub arguments: Expr,
 pub icons: Option<Expr>,
 pub meta: Option<Expr>,
}

impl ResolvedPromptAttribute {
Expand All@@ -36,6 +39,7 @@ impl ResolvedPromptAttribute {
 arguments,
 title,
 icons,
 meta,
 } = self;
 let description = if let Some(description) = description {
 quote! { Some(#description.into()) }
Expand All@@ -52,6 +56,11 @@ impl ResolvedPromptAttribute {
 } else {
 quote! { None }
 };
 let meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };
 let tokens = quote! {
 pub fn #fn_ident() -> rmcp::model::Prompt {
 rmcp::model::Prompt {
Expand All@@ -60,6 +69,7 @@ impl ResolvedPromptAttribute {
 arguments: #arguments,
 title: #title,
 icons: #icons,
 meta: #meta,
 }
 }
 };
Expand DownExpand Up@@ -114,6 +124,7 @@ pub fn prompt(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream>
 arguments: arguments.clone(),
 title: attribute.title,
 icons: attribute.icons,
 meta: attribute.meta,
 };
 let prompt_attr_fn = resolved_prompt_attr.into_fn(prompt_attr_fn_ident.clone())?;

Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp-macros/src/prompt_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl, parse_quote};
#[darling(default)]
pub struct PromptHandlerAttribute {
 pub router: Option<Expr>,
 pub meta: Option<Expr>,
}

pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
Expand DownExpand Up@@ -40,6 +41,12 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 }
 };

 let meta = if let Some(meta) = attribute.meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 // Add list_prompts implementation
 let list_prompts_impl: ImplItem = parse_quote! {
 async fn list_prompts(
Expand All@@ -50,6 +57,7 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 let prompts = #router_expr.list_all();
 Ok(ListPromptsResult {
 prompts,
 meta: #meta,
 next_cursor: None,
 })
 }
Expand Down

17 changes: 15 additions & 2 deletions
crates/rmcp-macros/src/tool_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl};
#[darling(default)]
pub struct ToolHandlerAttribute {
 pub router: Expr,
 pub meta: Option<Expr>,
}

impl Default for ToolHandlerAttribute {
Expand All@@ -16,13 +17,14 @@ impl Default for ToolHandlerAttribute {
 self.tool_router
 })
 .unwrap(),
 meta: None,
 }
 }
}

pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
 let attr_args = NestedMeta::parse_meta_list(attr)?;
 let ToolHandlerAttribute { router } = ToolHandlerAttribute::from_list(&attr_args)?;
 let ToolHandlerAttribute { router, meta } = ToolHandlerAttribute::from_list(&attr_args)?;
 let mut item_impl = syn::parse2::<ItemImpl>(input.clone())?;
 let tool_call_fn = quote! {
 async fn call_tool(
Expand All@@ -34,13 +36,24 @@ pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 #router.call(tcc).await
 }
 };

 let result_meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 let tool_list_fn = quote! {
 async fn list_tools(
 &self,
 _request: Option<rmcp::model::PaginatedRequestParam>,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::ListToolsResult, rmcp::ErrorData> {
 Ok(rmcp::model::ListToolsResult::with_all_items(#router.list_all()))
 Ok(rmcp::model::ListToolsResult{
 tools: #router.list_all(),
 meta: #result_meta,
 next_cursor: None,
 })
 }
 };
 let tool_call_fn = syn::parse2::<ImplItem>(tool_call_fn)?;
Expand Down

4 changes: 2 additions & 2 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ where
 let tools = self.tool_router.list_all();
 Ok(ServerResult::ListToolsResult(ListToolsResult {
 tools,
next_cursor: None,
..Default::default()
 }))
 }
 ClientRequest::GetPromptRequest(request) => {
Expand All@@ -125,7 +125,7 @@ where
 let prompts = self.prompt_router.list_all();
 Ok(ServerResult::ListPromptsResult(ListPromptsResult {
 prompts,
next_cursor: None,
..Default::default()
 }))
 }
 rest => self.service.handle_request(rest, context).await,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -828,6 +828,8 @@ macro_rules! paginated_result {
 #[serde(rename_all = "camelCase")]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct $t {
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,

Comment on lines

+831
 to 
+832

CopilotAINov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Field ordering inconsistency: The meta field is placed first in paginated result structs, but in entity structs like Tool, Resource, and Prompt, the meta field is placed last (after icons). For consistency, consider placing meta last in this macro as well, after next_cursor and the items field. This would match the convention used in other structs throughout the codebase.
Copilot uses AI. Check for mistakes.

 #[serde(skip_serializing_if = "Option::is_none")]
 pub next_cursor: Option<Cursor>,
 pub $i_item: $t_item,
Expand All@@ -838,6 +840,7 @@ macro_rules! paginated_result {
 items: $t_item,
 ) -> Self {
 Self {
 meta: None,
 next_cursor: None,
 $i_item: items,
 }
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 });

 let json = serde_json::to_string(&resource_link).unwrap();
Expand Down

6 changes: 5 additions & 1 deletion
crates/rmcp/src/model/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use base64::engine::{Engine, general_purpose::STANDARD as BASE64_STANDARD};
use serde::{Deserialize, Serialize};

use super::{
 AnnotateAble, Annotations, Icon, RawEmbeddedResource, RawImageContent,
 AnnotateAble, Annotations, Icon, Meta, RawEmbeddedResource, RawImageContent,
 content::{EmbeddedResource, ImageContent},
 resource::ResourceContents,
};
Expand All@@ -25,6 +25,9 @@ pub struct Prompt {
 /// Optional list of icons for the prompt
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this prompt
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

impl Prompt {
Expand All@@ -44,6 +47,7 @@ impl Prompt {
 description: description.map(Into::into),
 arguments,
 icons: None,
 meta: None,
 }
 }
}
Expand Down

5 changes: 5 additions & 0 deletions
crates/rmcp/src/model/resource.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ pub struct RawResource {
 /// Optional list of icons for the resource
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this resource
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

pub type Resource = Annotated<RawResource>;
Expand DownExpand Up@@ -95,6 +98,7 @@ impl RawResource {
 mime_type: None,
 size: None,
 icons: None,
 meta: None,
 }
 }
}
Expand All@@ -115,6 +119,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 };

 let json = serde_json::to_string(&resource).unwrap();
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema_current.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

60 changes: 60 additions & 0 deletions
crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1031,6 +1039,13 @@
 "ListPromptsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1051,6 +1066,13 @@
 "ListResourceTemplatesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1071,6 +1093,13 @@
 "ListResourcesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1096,6 +1125,13 @@
 "ListToolsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand DownExpand Up@@ -1472,6 +1508,14 @@
 "description": "A prompt that can be used to generate text from a model",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this prompt",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "arguments": {
 "description": "Optional arguments that can be passed to customize the prompt",
 "type": [
Expand DownExpand Up@@ -1660,6 +1704,14 @@
 "description": "A link to a resource that can be fetched separately",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1816,6 +1868,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Added _meta field to prompts, resources and paginated results#558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jokemanfire
merged 1 commit into

from

Dec 4, 2025
 Merged


Added _meta field to prompts, resources and paginated results
#558
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


11 changes: 11 additions & 0 deletions
crates/rmcp-macros/src/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,8 @@ pub struct PromptAttribute {
 pub arguments: Option<Expr>,
 /// Optional icons for the prompt
 pub icons: Option<Expr>,
 /// Optional metadata for the prompt
 pub meta: Option<Expr>,
}

pub struct ResolvedPromptAttribute {
Expand All@@ -26,6 +28,7 @@ pub struct ResolvedPromptAttribute {
 pub description: Option<Expr>,
 pub arguments: Expr,
 pub icons: Option<Expr>,
 pub meta: Option<Expr>,
}

impl ResolvedPromptAttribute {
Expand All@@ -36,6 +39,7 @@ impl ResolvedPromptAttribute {
 arguments,
 title,
 icons,
 meta,
 } = self;
 let description = if let Some(description) = description {
 quote! { Some(#description.into()) }
Expand All@@ -52,6 +56,11 @@ impl ResolvedPromptAttribute {
 } else {
 quote! { None }
 };
 let meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };
 let tokens = quote! {
 pub fn #fn_ident() -> rmcp::model::Prompt {
 rmcp::model::Prompt {
Expand All@@ -60,6 +69,7 @@ impl ResolvedPromptAttribute {
 arguments: #arguments,
 title: #title,
 icons: #icons,
 meta: #meta,
 }
 }
 };
Expand DownExpand Up@@ -114,6 +124,7 @@ pub fn prompt(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream>
 arguments: arguments.clone(),
 title: attribute.title,
 icons: attribute.icons,
 meta: attribute.meta,
 };
 let prompt_attr_fn = resolved_prompt_attr.into_fn(prompt_attr_fn_ident.clone())?;

Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp-macros/src/prompt_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl, parse_quote};
#[darling(default)]
pub struct PromptHandlerAttribute {
 pub router: Option<Expr>,
 pub meta: Option<Expr>,
}

pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
Expand DownExpand Up@@ -40,6 +41,12 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 }
 };

 let meta = if let Some(meta) = attribute.meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 // Add list_prompts implementation
 let list_prompts_impl: ImplItem = parse_quote! {
 async fn list_prompts(
Expand All@@ -50,6 +57,7 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
 let prompts = #router_expr.list_all();
 Ok(ListPromptsResult {
 prompts,
 meta: #meta,
 next_cursor: None,
 })
 }
Expand Down

17 changes: 15 additions & 2 deletions
crates/rmcp-macros/src/tool_handler.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ use syn::{Expr, ImplItem, ItemImpl};
#[darling(default)]
pub struct ToolHandlerAttribute {
 pub router: Expr,
 pub meta: Option<Expr>,
}

impl Default for ToolHandlerAttribute {
Expand All@@ -16,13 +17,14 @@ impl Default for ToolHandlerAttribute {
 self.tool_router
 })
 .unwrap(),
 meta: None,
 }
 }
}

pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenStream> {
 let attr_args = NestedMeta::parse_meta_list(attr)?;
 let ToolHandlerAttribute { router } = ToolHandlerAttribute::from_list(&attr_args)?;
 let ToolHandlerAttribute { router, meta } = ToolHandlerAttribute::from_list(&attr_args)?;
 let mut item_impl = syn::parse2::<ItemImpl>(input.clone())?;
 let tool_call_fn = quote! {
 async fn call_tool(
Expand All@@ -34,13 +36,24 @@ pub fn tool_handler(attr: TokenStream, input: TokenStream) -> syn::Result<TokenS
 #router.call(tcc).await
 }
 };

 let result_meta = if let Some(meta) = meta {
 quote! { Some(#meta) }
 } else {
 quote! { None }
 };

 let tool_list_fn = quote! {
 async fn list_tools(
 &self,
 _request: Option<rmcp::model::PaginatedRequestParam>,
 _context: rmcp::service::RequestContext<rmcp::RoleServer>,
 ) -> Result<rmcp::model::ListToolsResult, rmcp::ErrorData> {
 Ok(rmcp::model::ListToolsResult::with_all_items(#router.list_all()))
 Ok(rmcp::model::ListToolsResult{
 tools: #router.list_all(),
 meta: #result_meta,
 next_cursor: None,
 })
 }
 };
 let tool_call_fn = syn::parse2::<ImplItem>(tool_call_fn)?;
Expand Down

4 changes: 2 additions & 2 deletions
crates/rmcp/src/handler/server/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -102,7 +102,7 @@ where
 let tools = self.tool_router.list_all();
 Ok(ServerResult::ListToolsResult(ListToolsResult {
 tools,
next_cursor: None,
..Default::default()
 }))
 }
 ClientRequest::GetPromptRequest(request) => {
Expand All@@ -125,7 +125,7 @@ where
 let prompts = self.prompt_router.list_all();
 Ok(ServerResult::ListPromptsResult(ListPromptsResult {
 prompts,
next_cursor: None,
..Default::default()
 }))
 }
 rest => self.service.handle_request(rest, context).await,
Expand Down

3 changes: 3 additions & 0 deletions
crates/rmcp/src/model.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -828,6 +828,8 @@ macro_rules! paginated_result {
 #[serde(rename_all = "camelCase")]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 pub struct $t {
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,

Comment on lines

+831
 to 
+832

CopilotAINov 24, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Field ordering inconsistency: The meta field is placed first in paginated result structs, but in entity structs like Tool, Resource, and Prompt, the meta field is placed last (after icons). For consistency, consider placing meta last in this macro as well, after next_cursor and the items field. This would match the convention used in other structs throughout the codebase.
Copilot uses AI. Check for mistakes.

 #[serde(skip_serializing_if = "Option::is_none")]
 pub next_cursor: Option<Cursor>,
 pub $i_item: $t_item,
Expand All@@ -838,6 +840,7 @@ macro_rules! paginated_result {
 items: $t_item,
 ) -> Self {
 Self {
 meta: None,
 next_cursor: None,
 $i_item: items,
 }
Expand Down

1 change: 1 addition & 0 deletions
crates/rmcp/src/model/content.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -258,6 +258,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 });

 let json = serde_json::to_string(&resource_link).unwrap();
Expand Down

6 changes: 5 additions & 1 deletion
crates/rmcp/src/model/prompt.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ use base64::engine::{Engine, general_purpose::STANDARD as BASE64_STANDARD};
use serde::{Deserialize, Serialize};

use super::{
 AnnotateAble, Annotations, Icon, RawEmbeddedResource, RawImageContent,
 AnnotateAble, Annotations, Icon, Meta, RawEmbeddedResource, RawImageContent,
 content::{EmbeddedResource, ImageContent},
 resource::ResourceContents,
};
Expand All@@ -25,6 +25,9 @@ pub struct Prompt {
 /// Optional list of icons for the prompt
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this prompt
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

impl Prompt {
Expand All@@ -44,6 +47,7 @@ impl Prompt {
 description: description.map(Into::into),
 arguments,
 icons: None,
 meta: None,
 }
 }
}
Expand Down

5 changes: 5 additions & 0 deletions
crates/rmcp/src/model/resource.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,9 @@ pub struct RawResource {
 /// Optional list of icons for the resource
 #[serde(skip_serializing_if = "Option::is_none")]
 pub icons: Option<Vec<Icon>>,
 /// Optional additional metadata for this resource
 #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
 pub meta: Option<Meta>,
}

pub type Resource = Annotated<RawResource>;
Expand DownExpand Up@@ -95,6 +98,7 @@ impl RawResource {
 mime_type: None,
 size: None,
 icons: None,
 meta: None,
 }
 }
}
Expand All@@ -115,6 +119,7 @@ mod tests {
 mime_type: Some("text/plain".to_string()),
 size: Some(100),
 icons: None,
 meta: None,
 };

 let json = serde_json::to_string(&resource).unwrap();
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

8 changes: 8 additions & 0 deletions
crates/rmcp/tests/test_message_schema/client_json_rpc_message_schema_current.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -992,6 +992,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down

60 changes: 60 additions & 0 deletions
crates/rmcp/tests/test_message_schema/server_json_rpc_message_schema.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -172,6 +172,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1031,6 +1039,13 @@
 "ListPromptsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1051,6 +1066,13 @@
 "ListResourceTemplatesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1071,6 +1093,13 @@
 "ListResourcesResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand All@@ -1096,6 +1125,13 @@
 "ListToolsResult": {
 "type": "object",
 "properties": {
 "_meta": {
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "nextCursor": {
 "type": [
 "string",
Expand DownExpand Up@@ -1472,6 +1508,14 @@
 "description": "A prompt that can be used to generate text from a model",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this prompt",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "arguments": {
 "description": "Optional arguments that can be passed to customize the prompt",
 "type": [
Expand DownExpand Up@@ -1660,6 +1704,14 @@
 "description": "A link to a resource that can be fetched separately",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "annotations": {
 "anyOf": [
 {
Expand DownExpand Up@@ -1816,6 +1868,14 @@
 "description": "Represents a resource in the extension with metadata",
 "type": "object",
 "properties": {
 "_meta": {
 "description": "Optional additional metadata for this resource",
 "type": [
 "object",
 "null"
 ],
 "additionalProperties": true
 },
 "description": {
 "description": "Optional description of the resource",
 "type": [
Expand Down
Loading
Loading